eventespresso / event-espresso-core

caffeinated/admin/new/pricing/templates/pricing_details_main_meta_box.template.php

Spacing +5 added lines, -5 removed lines

@@ -3,9 +3,9 @@ 
 	<table class="form-table">
 		<tbody>
 			<tr valign="top">
-				<th><label for="PRT_ID"><?php _e('Type', 'event_espresso'); ?></label> <?php echo EEH_Template::get_help_tab_link('type_field_info');?></th>
+				<th><label for="PRT_ID"><?php _e('Type', 'event_espresso'); ?></label> <?php echo EEH_Template::get_help_tab_link('type_field_info'); ?></th>
 				<td>
-					<?php if ( $price->type_obj() && $price->type_obj()->base_type() === 1 ) : ?>
+					<?php if ($price->type_obj() && $price->type_obj()->base_type() === 1) : ?>
 						<input type="hidden" name="PRT_ID" id="PRT_ID" value="<?php echo $price->type(); ?>" />
 						<p><strong><?php _e('Price', 'event_espresso'); ?></strong></p>
 						<p class="description"><?php _e('This is the default base price. Every new ticket created will start off with this base price.', 'event_espresso'); ?></p>
@@ -16,13 +16,13 @@ 
 				</td>
 			</tr>
 			<tr valign="top">
-				<th><label for="PRC_name"><?php _e('Name', 'event_espresso'); ?></label> <?php echo EEH_Template::get_help_tab_link('name_field_info');?></th>
+				<th><label for="PRC_name"><?php _e('Name', 'event_espresso'); ?></label> <?php echo EEH_Template::get_help_tab_link('name_field_info'); ?></th>
 				<td>
 					<input class="regular-text" type="text" id="PRC_name" name="PRC_name" value="<?php echo htmlentities($price->name()); ?>"/>
 				</td>
 			</tr>
 			<tr valign="top">
-				<th><label for="PRC_desc"><?php _e('Description', 'event_espresso'); ?></label> <?php echo EEH_Template::get_help_tab_link('description_field_info');?></th>
+				<th><label for="PRC_desc"><?php _e('Description', 'event_espresso'); ?></label> <?php echo EEH_Template::get_help_tab_link('description_field_info'); ?></th>
 				<td>
 					<textarea class="regular-text" id="PRC_desc" name="PRC_desc" rows="5" ><?php
 					 echo $price->desc(); 
@@ -30,7 +30,7 @@ 
 				</td>							
 			</tr>
 			<tr valign="top">
-				<th><label for="PRC_amount"><?php _e('Amount', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('amount_field_info');?></label></th>
+				<th><label for="PRC_amount"><?php _e('Amount', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('amount_field_info'); ?></label></th>
 				<td>
 					<input class="small-text ee-numeric" type="text" id="PRC_amount" name="PRC_amount" value="<?php echo $price->amount(); ?>"/>
 				</td>

Braces +5 added lines, -2 removed lines

@@ -9,8 +9,11 @@
 						<input type="hidden" name="PRT_ID" id="PRT_ID" value="<?php echo $price->type(); ?>" />
 						<p><strong><?php _e('Price', 'event_espresso'); ?></strong></p>
 						<p class="description"><?php _e('This is the default base price. Every new ticket created will start off with this base price.', 'event_espresso'); ?></p>
-					<?php else : ?>
-						<?php echo EEH_Form_Fields::select_input('PRT_ID', $price_types, $price->type(), 'id="PRT_ID"'); ?>
+					<?php else {
+	: ?>
+						<?php echo EEH_Form_Fields::select_input('PRT_ID', $price_types, $price->type(), 'id="PRT_ID"');
+}
+?>
 						<p class="description"><?php _e('Price Modifier. Default items will apply to ALL new events you create.', 'event_espresso'); ?></p>
 					<?php endif; ?>
 				</td>

caffeinated/admin/new/pricing/templates/pricing_type_details_main_meta_box.template.php

Spacing +7 added lines, -7 removed lines

@@ -18,7 +18,7 @@ 
 					<label for="PRT_name"><?php _e('Price Type Name', 'event_espresso'); ?></label>
 				</th>
 				<td>
-					<input class="regular-text" type="text" id="PRT_name" name="PRT_name" value="<?php echo htmlentities($price_type->name()) ;?>"/>
+					<input class="regular-text" type="text" id="PRT_name" name="PRT_name" value="<?php echo htmlentities($price_type->name()); ?>"/>
 					<p class="description"><?php _e('A name for this Price Type.', 'event_espresso'); ?></p>
 				</td>
 			</tr>
@@ -29,18 +29,18 @@ 
 				</th>
 				<td>
 					<?php $yes_checked = $price_type->is_percent() ? ' checked="checked"' : ''; ?>
-					<label style="margin-right:15px;"><input type="radio" name="PRT_is_percent" value="1"<?php echo $yes_checked;?> style="margin-right:5px;">
-						<?php _e('Percentage', 'event_espresso');?>
+					<label style="margin-right:15px;"><input type="radio" name="PRT_is_percent" value="1"<?php echo $yes_checked; ?> style="margin-right:5px;">
+						<?php _e('Percentage', 'event_espresso'); ?>
 					</label>
 					<?php $no_checked = $price_type->is_percent() ? '' : ' checked="checked"'; ?>
-					<label style="margin-right:15px;"><input type="radio" name="PRT_is_percent" value="0"<?php echo $no_checked;?> style="margin-right:5px;">
-						<?php _e('Fixed', 'event_espresso');?>
+					<label style="margin-right:15px;"><input type="radio" name="PRT_is_percent" value="0"<?php echo $no_checked; ?> style="margin-right:5px;">
+						<?php _e('Fixed', 'event_espresso'); ?>
 					</label>
 					<p class="description"><?php _e('Whether this Price Type will be applied as a percentage or applied as a set fixed amount.', 'event_espresso'); ?></p>
-					<?php if ( $price_type->base_type() == EEM_Price_Type::base_type_tax ) :
+					<?php if ($price_type->base_type() == EEM_Price_Type::base_type_tax) :
 						//base type is tax so let's just let the user know that taxes are always percentage.
 						?>
-						<p class="description" style="color:#E44064"><?php _e( 'The selected base type for this price type is "Tax".  Taxes are always assumed to be a percentage.  If you want to use a fixed value for a tax then please change the base type to a surcharge.', 'event_espresso' ); ?></p>
+						<p class="description" style="color:#E44064"><?php _e('The selected base type for this price type is "Tax".  Taxes are always assumed to be a percentage.  If you want to use a fixed value for a tax then please change the base type to a surcharge.', 'event_espresso'); ?></p>
 					<?php endif; ?>
 				</td>
 			</tr>

caffeinated/admin/new/tickets/Tickets_Admin_Page.core.php

Spacing +45 added lines, -45 removed lines

@@ -52,7 +52,7 @@ 
 
 	protected function _set_page_routes() {
 
-		$tkt_id = ! empty( $this->_req_data['TKT_ID'] )  && ! is_array( $this->_req_data['TKT_ID'] ) ? $this->_req_data['TKT_ID'] : 0;
+		$tkt_id = ! empty($this->_req_data['TKT_ID']) && ! is_array($this->_req_data['TKT_ID']) ? $this->_req_data['TKT_ID'] : 0;
 
 		$this->_page_routes = array(
 			'default' => array(
@@ -62,14 +62,14 @@ 
 			'trash_ticket' => array(
 				'func' => '_trash_or_restore_ticket',
 				'noheader' => TRUE,
-				'args' => array( 'trash' => TRUE ),
+				'args' => array('trash' => TRUE),
 				'capability' => 'ee_delete_default_ticket',
 				'obj_id' => $tkt_id
 				),
 			'trash_tickets' => array(
 				'func' => '_trash_or_restore_ticket',
 				'noheader' => TRUE,
-				'args' => array( 'trash' => TRUE ),
+				'args' => array('trash' => TRUE),
 				'capability' => 'ee_delete_default_tickets'
 				),
 			'restore_ticket' => array(
@@ -143,7 +143,7 @@ 
 				'label' => __('Trash', 'event_espresso'),
 				'count' => 0,
 				'bulk_action' => array(
-					'restore_tickets' => __('Restore from Trash' , 'event_espresso'),
+					'restore_tickets' => __('Restore from Trash', 'event_espresso'),
 					'delete_tickets' => __('Delete Permanently', 'event_espresso')
 					)
 				)
@@ -161,53 +161,53 @@ 
 
 
 
-	public function get_default_tickets( $per_page = 10, $count = FALSE, $trashed = FALSE ) {
+	public function get_default_tickets($per_page = 10, $count = FALSE, $trashed = FALSE) {
 
-		$orderby= empty( $this->_req_data['orderby'] ) ? 'TKT_name' : $this->_req_data['orderby'];
-		$order = empty( $this->_req_data['order'] ) ? 'ASC' : $order;
+		$orderby = empty($this->_req_data['orderby']) ? 'TKT_name' : $this->_req_data['orderby'];
+		$order = empty($this->_req_data['order']) ? 'ASC' : $order;
 
-		switch ( $orderby ) {
+		switch ($orderby) {
 			case 'TKT_name' :
-				$orderby = array( 'TKT_name' => $order );
+				$orderby = array('TKT_name' => $order);
 				break;
 
 			case 'TKT_price' :
-				$orderby = array( 'TKT_price' => $order );
+				$orderby = array('TKT_price' => $order);
 				break;
 
 			case 'TKT_uses' :
-				$orderby = array( 'TKT_uses' => $order );
+				$orderby = array('TKT_uses' => $order);
 				break;
 
 			case 'TKT_min' :
-				$orderby = array( 'TKT_min' => $order );
+				$orderby = array('TKT_min' => $order);
 				break;
 
 			case 'TKT_max' :
-				$orderby = array( 'TKT_max' => $order );
+				$orderby = array('TKT_max' => $order);
 				break;
 
 			case 'TKT_qty' :
-				$orderby = array( 'TKT_qty' => $order );
+				$orderby = array('TKT_qty' => $order);
 				break;
 		}
 
-		$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(
 			'TKT_is_default' => 1,
 			'TKT_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(
-				'TKT_name' => array('LIKE',$sstr ),
-				'TKT_description' => array('LIKE',$sstr )
+				'TKT_name' => array('LIKE', $sstr),
+				'TKT_description' => array('LIKE', $sstr)
 				);
 		}
 
@@ -218,9 +218,9 @@ 
 			'group_by'=>'TKT_ID'
 			);
 
-		if($count){
+		if ($count) {
 			return EEM_Ticket::instance()->count_deleted_and_undeleted(array($_where));
-		}else{
+		} else {
 			return EEM_Ticket::instance()->get_all_deleted_and_undeleted($query_params);
 		}
 
@@ -230,41 +230,41 @@ 
 
 
 
-	protected function _trash_or_restore_ticket(  $trash = FALSE ) {
+	protected function _trash_or_restore_ticket($trash = FALSE) {
 		$success = 1;
 
 		$TKT = EEM_Ticket::instance();
 
 		//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 then 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 the boxes
-			while ( list( $TKT_ID, $value ) = each( $this->_req_data['checkbox'] ) ) {
-				if ( $trash ) {
-					if ( ! $TKT->delete_by_ID( $TKT_ID ) )
+			while (list($TKT_ID, $value) = each($this->_req_data['checkbox'])) {
+				if ($trash) {
+					if ( ! $TKT->delete_by_ID($TKT_ID))
 						$success = 0;
 				} else {
-					if ( ! $TKT->restore_by_ID( $TKT_ID ) )
+					if ( ! $TKT->restore_by_ID($TKT_ID))
 						$success = 0;
 				}
 			}
 		} else {
 			//grab single id and trash
-			$TKT_ID = absint( $this->_req_data['TKT_ID'] );
+			$TKT_ID = absint($this->_req_data['TKT_ID']);
 
-			if ( $trash ) {
-				if ( ! $TKT->delete_by_ID( $TKT_ID ) )
+			if ($trash) {
+				if ( ! $TKT->delete_by_ID($TKT_ID))
 					$success = 0;
 			} else {
-				if ( ! $TKT->restore_by_ID( $TKT_ID ) )
+				if ( ! $TKT->restore_by_ID($TKT_ID))
 					$success = 0;
 			}
 		}
 
 		$action_desc = $trash ? 'moved to the trash' : 'restored';
-		$this->_redirect_after_action( $success, 'Tickets', $action_desc, array() );
+		$this->_redirect_after_action($success, 'Tickets', $action_desc, array());
 	}
 
 
@@ -277,34 +277,34 @@ 
 		$TKT = EEM_Ticket::instance();
 
 		//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 then 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 the boxes
-			while ( list( $TKT_ID, $value ) = each( $this->_req_data['checkbox'] ) ) {
+			while (list($TKT_ID, $value) = each($this->_req_data['checkbox'])) {
 				//delete
-				if ( ! $this->_delete_the_ticket( $TKT_ID ) ) {
+				if ( ! $this->_delete_the_ticket($TKT_ID)) {
 					$success = 0;
 				}
 			}
 		} else {
 			//grab single id and trash
-			$TKT_ID = absint( $this->_req_data['TKT_ID'] );
-			if ( ! $this->_delete_the_ticket( $TKT_ID ) ) {
+			$TKT_ID = absint($this->_req_data['TKT_ID']);
+			if ( ! $this->_delete_the_ticket($TKT_ID)) {
 					$success = 0;
 				}
 		}
 
 		$action_desc = 'deleted';
-		$this->_redirect_after_action( $success, 'Tickets', $action_desc, array() );
+		$this->_redirect_after_action($success, 'Tickets', $action_desc, array());
 	}
 
 
 
 
-	protected function _delete_the_ticket( $TKT_ID ) {
-		$tkt = EEM_Ticket::instance()->get_one_by_ID( $TKT_ID );
+	protected function _delete_the_ticket($TKT_ID) {
+		$tkt = EEM_Ticket::instance()->get_one_by_ID($TKT_ID);
 
 		//delete all related prices first
 		$tkt->delete_related_permanently('Price');

Braces +16 added lines, -10 removed lines

@@ -1,4 +1,6 @@ 
-<?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
  *
@@ -220,7 +222,7 @@ 
 
 		if($count){
 			return EEM_Ticket::instance()->count_deleted_and_undeleted(array($_where));
-		}else{
+		} else{
 			return EEM_Ticket::instance()->get_all_deleted_and_undeleted($query_params);
 		}
 
@@ -243,11 +245,13 @@ 
 			//cycle thru the boxes
 			while ( list( $TKT_ID, $value ) = each( $this->_req_data['checkbox'] ) ) {
 				if ( $trash ) {
-					if ( ! $TKT->delete_by_ID( $TKT_ID ) )
-						$success = 0;
+					if ( ! $TKT->delete_by_ID( $TKT_ID ) ) {
+											$success = 0;
+					}
 				} else {
-					if ( ! $TKT->restore_by_ID( $TKT_ID ) )
-						$success = 0;
+					if ( ! $TKT->restore_by_ID( $TKT_ID ) ) {
+											$success = 0;
+					}
 				}
 			}
 		} else {
@@ -255,11 +259,13 @@ 
 			$TKT_ID = absint( $this->_req_data['TKT_ID'] );
 
 			if ( $trash ) {
-				if ( ! $TKT->delete_by_ID( $TKT_ID ) )
-					$success = 0;
+				if ( ! $TKT->delete_by_ID( $TKT_ID ) ) {
+									$success = 0;
+				}
 			} else {
-				if ( ! $TKT->restore_by_ID( $TKT_ID ) )
-					$success = 0;
+				if ( ! $TKT->restore_by_ID( $TKT_ID ) ) {
+									$success = 0;
+				}
 			}
 		}
 

caffeinated/admin/new/tickets/Tickets_Admin_Page_Init.core.php

Spacing +12 added lines, -12 removed lines

@@ -23,7 +23,7 @@ 
 *
 * ------------------------------------------------------------------------
 */
-class Tickets_Admin_Page_Init extends EE_Admin_Page_Init  {
+class Tickets_Admin_Page_Init extends EE_Admin_Page_Init {
 
 
 
@@ -36,19 +36,19 @@ 
 	 */
 	public function __construct() {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		define( 'TICKETS_PG_SLUG', 'tickets' );
-		define( 'TICKETS_LABEL', __('Default Tickets', 'event_espresso'));
-		define( 'TICKETS_ADMIN', EE_CORE_CAF_ADMIN . 'new' . DS . TICKETS_PG_SLUG . DS );
-		define( 'TICKETS_ADMIN_URL', admin_url( 'admin.php?page=' . TICKETS_PG_SLUG ));
-		define( 'TICKETS_ASSETS_PATH', TICKETS_ADMIN . 'assets' . DS );
-		define( 'TICKETS_ASSETS_URL', EE_CORE_CAF_ADMIN_URL . 'new' . DS . TICKETS_PG_SLUG .'/assets/' );
-		define( 'TICKETS_TEMPLATE_PATH', TICKETS_ADMIN . 'templates' . DS );
-		define( 'TICKETS_TEMPLATE_URL', EE_CORE_CAF_ADMIN_URL . 'new' . DS . TICKETS_PG_SLUG . DS . 'templates/' );
+		define('TICKETS_PG_SLUG', 'tickets');
+		define('TICKETS_LABEL', __('Default Tickets', 'event_espresso'));
+		define('TICKETS_ADMIN', EE_CORE_CAF_ADMIN.'new'.DS.TICKETS_PG_SLUG.DS);
+		define('TICKETS_ADMIN_URL', admin_url('admin.php?page='.TICKETS_PG_SLUG));
+		define('TICKETS_ASSETS_PATH', TICKETS_ADMIN.'assets'.DS);
+		define('TICKETS_ASSETS_URL', EE_CORE_CAF_ADMIN_URL.'new'.DS.TICKETS_PG_SLUG.'/assets/');
+		define('TICKETS_TEMPLATE_PATH', TICKETS_ADMIN.'templates'.DS);
+		define('TICKETS_TEMPLATE_URL', EE_CORE_CAF_ADMIN_URL.'new'.DS.TICKETS_PG_SLUG.DS.'templates/');
 
 		parent::__construct();
-		$this->_folder_path = EE_CORE_CAF_ADMIN . 'new' . DS . $this->_folder_name . DS;
+		$this->_folder_path = EE_CORE_CAF_ADMIN.'new'.DS.$this->_folder_name.DS;
 
 	}
 
@@ -62,7 +62,7 @@ 
 
 
 	protected function _set_menu_map() {
-		$this->_menu_map = new EE_Admin_Page_Sub_Menu( array(
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(array(
 			'menu_group' => 'management',
 			'menu_order' => 15,
 			'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?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
 *

caffeinated/admin/new/tickets/Tickets_List_Table.class.php

Indentation +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
 				'TKT_taxable' => __('Taxable', 'event_espresso')
 			);
 
-        $this->_sortable_columns = array(
+		$this->_sortable_columns = array(
 				// TRUE means its already sorted
 				'TKT_name' => array( 'TKT_name', TRUE ),
 				'TKT_description' => array( 'TKT_description', FALSE ),
@@ -68,9 +68,9 @@ 
 				'TKT_min' => array( 'TKT_min', FALSE ),
 				'TKT_max' => array( 'TKT_max', FALSE ),
 				'TKT_price' => array( 'TKT_price', FALSE )
-	        	);
+				);
 
-        $this->_hidden_columns = array(
+		$this->_hidden_columns = array(
 			);
 
 	}

Spacing +24 added lines, -24 removed lines

@@ -31,9 +31,9 @@ 
 
 	protected function _setup_data() {
 		$trashed = $this->_admin_page->get_view() == 'trashed' ? TRUE : FALSE;
-		$this->_data = $this->_admin_page->get_default_tickets( $this->_per_page, FALSE, $trashed );
-		$this->_all_data_count = $this->_admin_page->get_default_tickets( $this->_per_page, TRUE, FALSE );
-		$this->_trashed_count = $this->_admin_page->get_default_tickets( $this->_per_page, TRUE, TRUE );
+		$this->_data = $this->_admin_page->get_default_tickets($this->_per_page, FALSE, $trashed);
+		$this->_all_data_count = $this->_admin_page->get_default_tickets($this->_per_page, TRUE, FALSE);
+		$this->_trashed_count = $this->_admin_page->get_default_tickets($this->_per_page, TRUE, TRUE);
 	}
 
 
@@ -61,13 +61,13 @@ 
 
         $this->_sortable_columns = array(
 				// TRUE means its already sorted
-				'TKT_name' => array( 'TKT_name', TRUE ),
-				'TKT_description' => array( 'TKT_description', FALSE ),
-				'TKT_qty' => array( 'TKT_qty', FALSE ),
-				'TKT_uses' => array( 'TKT_uses', FALSE ),
-				'TKT_min' => array( 'TKT_min', FALSE ),
-				'TKT_max' => array( 'TKT_max', FALSE ),
-				'TKT_price' => array( 'TKT_price', FALSE )
+				'TKT_name' => array('TKT_name', TRUE),
+				'TKT_description' => array('TKT_description', FALSE),
+				'TKT_qty' => array('TKT_qty', FALSE),
+				'TKT_uses' => array('TKT_uses', FALSE),
+				'TKT_min' => array('TKT_min', FALSE),
+				'TKT_max' => array('TKT_max', FALSE),
+				'TKT_price' => array('TKT_price', FALSE)
 	        	);
 
         $this->_hidden_columns = array(
@@ -87,14 +87,14 @@ 
 
 	protected function _add_view_counts() {
 		$this->_views['all']['count'] = $this->_all_data_count;
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_tickets', 'trash_ticket'))
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_tickets', 'trash_ticket'))
 		$this->_views['trashed']['count'] = $this->_trashed_count;
 	}
 
 
 
 	function column_cb($item) {
-		return $item->ID() === 1 ? '<span class="ee-lock-icon"></span>' : sprintf( '<input type="checkbox" name="checkbox[%1$s]" value="%1$s" />', /* $1%s */ $item->ID() );
+		return $item->ID() === 1 ? '<span class="ee-lock-icon"></span>' : sprintf('<input type="checkbox" name="checkbox[%1$s]" value="%1$s" />', /* $1%s */ $item->ID());
 
 	}
 
@@ -105,21 +105,21 @@ 
 		$actions = array();
 
 		//trash links
-		if ( $item->ID() !== 1 ) {
-			if ( $this->_view == 'all' ) {
-				$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'trash_ticket', 'TKT_ID' => $item->ID() ), TICKETS_ADMIN_URL );
-				$actions['trash'] = '<a href="' . $trash_lnk_url . '" title="' . esc_attr__('Move Ticket to trash', 'event_espresso') . '">' . __('Trash', 'event_espresso') . '</a>';
+		if ($item->ID() !== 1) {
+			if ($this->_view == 'all') {
+				$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'trash_ticket', 'TKT_ID' => $item->ID()), TICKETS_ADMIN_URL);
+				$actions['trash'] = '<a href="'.$trash_lnk_url.'" title="'.esc_attr__('Move Ticket to trash', 'event_espresso').'">'.__('Trash', 'event_espresso').'</a>';
 			} else {
 				// restore price link
-				$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'restore_ticket', 'TKT_ID'=>$item->ID() ), TICKETS_ADMIN_URL );
-				$actions['restore'] = '<a href="'.$restore_lnk_url.'" title="' . esc_attr__( 'Restore Ticket', 'event_espresso' ) . '">' . __( 'Restore', 'event_espresso' ) . '</a>';
+				$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'restore_ticket', 'TKT_ID'=>$item->ID()), TICKETS_ADMIN_URL);
+				$actions['restore'] = '<a href="'.$restore_lnk_url.'" title="'.esc_attr__('Restore Ticket', 'event_espresso').'">'.__('Restore', 'event_espresso').'</a>';
 				// delete price link
-				$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'delete_ticket', 'TKT_ID'=>$item->ID() ), TICKETS_ADMIN_URL );
-				$actions['delete'] = '<a href="'.$delete_lnk_url.'" title="' . esc_attr__( 'Delete Ticket Permanently', 'event_espresso' ) . '">' . __( 'Delete Permanently', 'event_espresso' ) . '</a>';
+				$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'delete_ticket', 'TKT_ID'=>$item->ID()), TICKETS_ADMIN_URL);
+				$actions['delete'] = '<a href="'.$delete_lnk_url.'" title="'.esc_attr__('Delete Ticket Permanently', 'event_espresso').'">'.__('Delete Permanently', 'event_espresso').'</a>';
 			}
 		}
 
-		return $item->get('TKT_name') . $this->row_actions( $actions );
+		return $item->get('TKT_name').$this->row_actions($actions);
 	}
 
 
@@ -132,13 +132,13 @@ 
 
 
 	function column_TKT_qty($item) {
-		return $item->get_pretty('TKT_qty','text');
+		return $item->get_pretty('TKT_qty', 'text');
 	}
 
 
 
 	function column_TKT_uses($item) {
-		return $item->get_pretty('TKT_uses','text');
+		return $item->get_pretty('TKT_uses', 'text');
 	}
 
 
@@ -149,7 +149,7 @@ 
 
 
 	function column_TKT_max($item) {
-		return $item->get_pretty('TKT_max','text');
+		return $item->get_pretty('TKT_max', 'text');
 	}
 
 

Braces +6 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?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
@@ -87,8 +89,9 @@ 
 
 	protected function _add_view_counts() {
 		$this->_views['all']['count'] = $this->_all_data_count;
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_tickets', 'trash_ticket'))
-		$this->_views['trashed']['count'] = $this->_trashed_count;
+		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_tickets', 'trash_ticket')) {
+				$this->_views['trashed']['count'] = $this->_trashed_count;
+		}
 	}
 
 

caffeinated/admin/new/venues/Venue_Categories_Admin_List_Table.class.php

Spacing +18 added lines, -18 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -35,8 +35,8 @@ 
 
 
 	protected function _setup_data() {
-		$this->_data = $this->_admin_page->get_categories( $this->_per_page, $this->_current_page);
-		$this->_all_data_count = $this->_admin_page->get_categories( $this->_per_page, $this->_current_page, TRUE );
+		$this->_data = $this->_admin_page->get_categories($this->_per_page, $this->_current_page);
+		$this->_all_data_count = $this->_admin_page->get_categories($this->_per_page, $this->_current_page, TRUE);
 	}
 
 
@@ -45,8 +45,8 @@ 
 
 	protected function _set_properties() {
 		$this->_wp_list_args = array(
-			'singular' => __('venue category', 'event_espresso' ),
-			'plural' => __('venue categories', 'event_espresso' ),
+			'singular' => __('venue category', 'event_espresso'),
+			'plural' => __('venue categories', 'event_espresso'),
 			'ajax' => TRUE, //for now,
 			'screen' => $this->_admin_page->get_current_screen()->id
 			);
@@ -60,9 +60,9 @@ 
 			);
 
 		$this->_sortable_columns = array(
-			'id' => array( 'Term.term_id' => true ),
-			'name' => array( 'Term.slug' => false ),
-			'count' => array( 'term_count' => false )
+			'id' => array('Term.term_id' => true),
+			'name' => array('Term.slug' => false),
+			'count' => array('term_count' => false)
 			);
 
 		$this->_hidden_columns = array();
@@ -92,7 +92,7 @@ 
 
 
 	public function column_cb($item) {
-		return sprintf( '<input type="checkbox" name="VEN_CAT_ID[]" value="%s" />', $item->get('term_id') );
+		return sprintf('<input type="checkbox" name="VEN_CAT_ID[]" value="%s" />', $item->get('term_id'));
 	}
 
 
@@ -120,17 +120,17 @@ 
 			'VEN_CAT_ID' => $item->get('term_id')
 		);
 
-		$edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EE_VENUES_ADMIN_URL );
-		$delete_link = EE_Admin_Page::add_query_args_and_nonce( $delete_query_args, EE_VENUES_ADMIN_URL );
+		$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_VENUES_ADMIN_URL);
+		$delete_link = EE_Admin_Page::add_query_args_and_nonce($delete_query_args, EE_VENUES_ADMIN_URL);
 
 		$actions = array(
-			'edit' => '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Category', 'event_espresso') . '">' . __('Edit', 'event_espresso') . '</a>'
+			'edit' => '<a href="'.$edit_link.'" title="'.esc_attr__('Edit Category', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>'
 			);
 
 
-		$actions['delete'] = '<a href="' . $delete_link . '" title="' . esc_attr__('Delete Category', 'event_espresso') . '">' . __('Delete', 'event_espresso') . '</a>';
+		$actions['delete'] = '<a href="'.$delete_link.'" title="'.esc_attr__('Delete Category', 'event_espresso').'">'.__('Delete', 'event_espresso').'</a>';
 
-		$content = '<strong><a class="row-title" href="' . $edit_link . '">' . $item->get_first_related('Term')->get('name') . '</a></strong>';
+		$content = '<strong><a class="row-title" href="'.$edit_link.'">'.$item->get_first_related('Term')->get('name').'</a></strong>';
 		$content .= $this->row_actions($actions);
 		return $content;
 	}
@@ -139,20 +139,20 @@ 
 
 
 	public function column_shortcode($item) {
-		$content = '[EVENT_ESPRESSO_CATEGORY category_id="' . $item->get_first_related('Term')->get('slug') . '"]';
+		$content = '[EVENT_ESPRESSO_CATEGORY category_id="'.$item->get_first_related('Term')->get('slug').'"]';
 		return $content;
 	}
 
 
 
 
-	public function column_count( $item ) {
+	public function column_count($item) {
 		$e_args = array(
 			'action' => 'default',
 			'category' => $item->get_first_related('Term')->ID()
 			);
-		$e_link = EE_Admin_Page::add_query_args_and_nonce( $e_args, EE_VENUES_ADMIN_URL );
-		$content = '<a href="' . $e_link . '">' . $item->get('term_count') . '</a>';
+		$e_link = EE_Admin_Page::add_query_args_and_nonce($e_args, EE_VENUES_ADMIN_URL);
+		$content = '<a href="'.$e_link.'">'.$item->get('term_count').'</a>';
 		return $content;
 	}
 }

Braces +2 added lines, -1 removed lines

@@ -1,6 +1,7 @@
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso

caffeinated/admin/new/venues/Venues_Admin_Page.core.php

Braces +12 added lines, -7 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -893,8 +894,9 @@ 
 		}
 		$action = $venue_status == 'trash' ? 'moved to the trash' : 'restored from the trash';
 
-		if ( $redirect_after )
-			$this->_redirect_after_action($success, 'Venue', $action, array('action' => 'default'));
+		if ( $redirect_after ) {
+					$this->_redirect_after_action($success, 'Venue', $action, array('action' => 'default'));
+		}
 
 	}
 
@@ -1013,8 +1015,9 @@ 
 			$msg = __('An error occurred. An venue could not be deleted because a valid venue ID was not not supplied.', 'event_espresso');
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
-		if ( $redirect_after )
-			$this->_redirect_after_action($success, 'Venue', 'deleted', array('action' => 'default'));
+		if ( $redirect_after ) {
+					$this->_redirect_after_action($success, 'Venue', 'deleted', array('action' => 'default'));
+		}
 	}
 
 
@@ -1185,8 +1188,10 @@ 
 	 * @return void
 	 */
 	private function _set_category_object() {
-		if ( isset( $this->_category->id ) && !empty( $this->_category->id ) )
-			return; //already have the category object so get out.
+		if ( isset( $this->_category->id ) && !empty( $this->_category->id ) ) {
+					return;
+		}
+		//already have the category object so get out.
 
 		//set default category object
 		$this->_set_empty_category_object();

Doc Comments +2 added lines, -3 removed lines

@@ -781,9 +781,8 @@
 	 * //todo this is pretty much the same as the corresponding change_event_status method in Events_Admin_Page.  We should probably abstract this up to the EE_Admin_Page_CPT (or even EE_Admin_Page) and make this a common method accepting a certain number of params.
 	 *
 	 * @access  private
-	 * @param  int $event_id
-	 * @param  string $event_status
-	 * @return void
+	 * @param  string $venue_status
+	 * @return boolean
 	 */
 	private function _change_venue_status( $VNU_ID = FALSE, $venue_status = FALSE ) {
 		// grab venue id

Spacing +182 added lines, -182 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -62,10 +62,10 @@ 
 
 
 	protected function _init_page_props() {
-		require_once( EE_MODELS . 'EEM_Venue.model.php' );
+		require_once(EE_MODELS.'EEM_Venue.model.php');
 		$this->page_slug = EE_VENUES_PG_SLUG;
 		$this->_admin_base_url = EE_VENUES_ADMIN_URL;
-		$this->_admin_base_path = EE_CORE_CAF_ADMIN . 'new/venues';
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN.'new/venues';
 		$this->page_label = __('Event Venues', 'event_espresso');
 		$this->_cpt_model_names = array(
 			'create_new' => 'EEM_Venue',
@@ -119,13 +119,13 @@ 
 	protected function _set_page_routes() {
 
 		//load formatter helper
-		EE_Registry::instance()->load_helper( 'Formatter' );
+		EE_Registry::instance()->load_helper('Formatter');
 		//load field generator helper
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
+		EE_Registry::instance()->load_helper('Form_Fields');
 
 		//is there a vnu_id in the request?
-		$vnu_id = ! empty( $this->_req_data['VNU_ID'] ) && ! is_array( $this->_req_data['VNU_ID'] ) ? $this->_req_data['VNU_ID'] : 0;
-		$vnu_id = ! empty( $this->_req_data['post'] ) ? $this->_req_data['post'] : $vnu_id;
+		$vnu_id = ! empty($this->_req_data['VNU_ID']) && ! is_array($this->_req_data['VNU_ID']) ? $this->_req_data['VNU_ID'] : 0;
+		$vnu_id = ! empty($this->_req_data['post']) ? $this->_req_data['post'] : $vnu_id;
 
 		$this->_page_routes = array(
 			'default' => array(
@@ -143,27 +143,27 @@ 
 				),
 			'trash_venue' => array(
 				'func' => '_trash_or_restore_venue',
-				'args' => array( 'venue_status' => 'trash' ),
+				'args' => array('venue_status' => 'trash'),
 				'noheader' => TRUE,
 				'capability' => 'ee_delete_venue',
 				'obj_id' => $vnu_id
 				),
 			'trash_venues' => array(
 				'func' => '_trash_or_restore_venues',
-				'args' => array( 'venue_status' => 'trash' ),
+				'args' => array('venue_status' => 'trash'),
 				'noheader' => TRUE,
 				'capability' => 'ee_delete_venues'
 				),
 			'restore_venue' => array(
 				'func' => '_trash_or_restore_venue',
-				'args' => array( 'venue_status' => 'draft' ),
+				'args' => array('venue_status' => 'draft'),
 				'noheader' => TRUE,
 				'capability' => 'ee_delete_venue',
 				'obj_id' => $vnu_id
 				),
 			'restore_venues' => array(
 				'func' => '_trash_or_restore_venues',
-				'args' => array( 'venue_status' => 'draft' ),
+				'args' => array('venue_status' => 'draft'),
 				'noheader' => TRUE,
 				'capability' => 'ee_delete_venues'
 				),
@@ -255,7 +255,7 @@ 
 						'filename' => 'venues_overview_views_bulk_actions_search'
 					)
 				),
-				'help_tour' => array( 'Venues_Overview_Help_Tour' ),
+				'help_tour' => array('Venues_Overview_Help_Tour'),
 				'metaboxes' => array('_espresso_news_post_box', '_espresso_links_post_box'),
 				'require_nonce' => FALSE
 			),
@@ -291,7 +291,7 @@ 
 						'filename' => 'venues_editor_other'
 					)
 				),
-				'help_tour' => array( 'Venues_Add_Venue_Help_Tour' ),
+				'help_tour' => array('Venues_Add_Venue_Help_Tour'),
 				'metaboxes' => array('_venue_editor_metaboxes'),
 				'require_nonce' => FALSE
 				),
@@ -300,7 +300,7 @@ 
 					'label' => __('Edit Venue', 'event_espresso'),
 					'order' => 5,
 					'persistent' => FALSE,
-					'url' => isset($this->_req_data['post']) ? add_query_arg(array('post' => $this->_req_data['post'] ), $this->_current_page_view_url )  : $this->_admin_base_url
+					'url' => isset($this->_req_data['post']) ? add_query_arg(array('post' => $this->_req_data['post']), $this->_current_page_view_url) : $this->_admin_base_url
 				),
 				'help_tabs' => array(
 					'venues_editor_help_tab' => array(
@@ -328,7 +328,7 @@ 
 						'filename' => 'venues_editor_other'
 					)
 				),
-				'help_tour' => array( 'Venues_Edit_Venue_Help_Tour' ),
+				'help_tour' => array('Venues_Edit_Venue_Help_Tour'),
 				'metaboxes' => array('_venue_editor_metaboxes'),
 				'require_nonce' => FALSE
 			),
@@ -345,7 +345,7 @@ 
 						'filename' => 'venues_add_category'
 					)
 				),
-				'help_tour' => array( 'Venues_Add_Category_Help_Tour' ),
+				'help_tour' => array('Venues_Add_Category_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 			'edit_category' => array(
@@ -353,7 +353,7 @@ 
 					'label' => __('Edit Category', 'event_espresso'),
 					'order' => 15,
 					'persistent' => FALSE,
-					'url' => isset($this->_req_data['EVT_CAT_ID']) ? add_query_arg(array('EVT_CAT_ID' => $this->_req_data['EVT_CAT_ID'] ), $this->_current_page_view_url )  : $this->_admin_base_url
+					'url' => isset($this->_req_data['EVT_CAT_ID']) ? add_query_arg(array('EVT_CAT_ID' => $this->_req_data['EVT_CAT_ID']), $this->_current_page_view_url) : $this->_admin_base_url
 					),
 				'metaboxes' => array('_publish_post_box'),
 				'help_tabs' => array(
@@ -362,7 +362,7 @@ 
 						'filename' => 'venues_edit_category'
 					)
 				),
-				'help_tour' => array( 'Venues_Edit_Category_Help_Tour' ),
+				'help_tour' => array('Venues_Edit_Category_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 			'category_list' => array(
@@ -389,7 +389,7 @@ 
 						'filename' => 'venues_categories_other'
 					)
 				),
-				'help_tour' => array( 'Venues_Categories_Help_Tour' ),
+				'help_tour' => array('Venues_Categories_Help_Tour'),
 				'metaboxes' => $this->_default_espresso_metaboxes,
 				'require_nonce' => FALSE
 				)
@@ -446,7 +446,7 @@ 
 
 
 	public function load_scripts_styles() {
-		wp_register_style('ee-cat-admin', EVENTS_ASSETS_URL . 'ee-cat-admin.css', array(), EVENT_ESPRESSO_VERSION );
+		wp_register_style('ee-cat-admin', EVENTS_ASSETS_URL.'ee-cat-admin.css', array(), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('ee-cat-admin');
 	}
 
@@ -469,7 +469,7 @@ 
 	public function load_scripts_styles_edit() {
 		//styles
 		wp_enqueue_style('espresso-ui-theme');
-		wp_register_style( 'espresso_venues', EE_VENUES_ASSETS_URL . 'ee-venues-admin.css', array(), EVENT_ESPRESSO_VERSION );
+		wp_register_style('espresso_venues', EE_VENUES_ASSETS_URL.'ee-venues-admin.css', array(), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('espresso_venues');
 	}
 
@@ -516,7 +516,7 @@ 
 
 
 	protected function _overview_list_table() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$this->_admin_page_title .= $this->get_action_link_or_button('create_new', 'add', array(), 'add-new-h2');
 		$this->_search_btn_label = __('Venues', 'event_espresso');
 		$this->display_admin_list_table_page_with_sidebar();
@@ -530,8 +530,8 @@ 
 			'vnu_url' => $this->_cpt_model_obj->venue_url(),
 			'vnu_phone' => $this->_cpt_model_obj->phone()
 			);
-		$template = EE_VENUES_TEMPLATE_PATH . 'venue_publish_box_extras.template.php';
-		EEH_Template::display_template( $template, $extra_rows );
+		$template = EE_VENUES_TEMPLATE_PATH.'venue_publish_box_extras.template.php';
+		EEH_Template::display_template($template, $extra_rows);
 	}
 
 
@@ -539,9 +539,9 @@ 
 	protected function _venue_editor_metaboxes() {
 		$this->verify_cpt_object();
 
-		add_meta_box( 'espresso_venue_address_options', __('Physical Location', 'event_espresso'), array( $this, 'venue_address_metabox'), $this->page_slug, 'side', 'default' );
-		add_meta_box( 'espresso_venue_gmap_options', __('Google Map', 'event_espresso'), array( $this, 'venue_gmap_metabox'), $this->page_slug, 'side', 'default' );
-		add_meta_box( 'espresso_venue_virtual_loc_options', __('Virtual Location', 'event_espresso'), array( $this, 'venue_virtual_loc_metabox'), $this->page_slug, 'side', 'default' );
+		add_meta_box('espresso_venue_address_options', __('Physical Location', 'event_espresso'), array($this, 'venue_address_metabox'), $this->page_slug, 'side', 'default');
+		add_meta_box('espresso_venue_gmap_options', __('Google Map', 'event_espresso'), array($this, 'venue_gmap_metabox'), $this->page_slug, 'side', 'default');
+		add_meta_box('espresso_venue_virtual_loc_options', __('Virtual Location', 'event_espresso'), array($this, 'venue_virtual_loc_metabox'), $this->page_slug, 'side', 'default');
 
 	}
 
@@ -549,23 +549,23 @@ 
 
 	public function venue_gmap_metabox() {
 		$template_args = array(
-			'vnu_enable_for_gmap' => EEH_Form_Fields::select_input('vnu_enable_for_gmap', $this->get_yes_no_values(), $this->_cpt_model_obj->enable_for_gmap() ),
+			'vnu_enable_for_gmap' => EEH_Form_Fields::select_input('vnu_enable_for_gmap', $this->get_yes_no_values(), $this->_cpt_model_obj->enable_for_gmap()),
 			'vnu_google_map_link' => $this->_cpt_model_obj->google_map_link(),
 			);
-		$template = EE_VENUES_TEMPLATE_PATH . 'venue_gmap_metabox_content.template.php';
-		EEH_Template::display_template( $template, $template_args );
+		$template = EE_VENUES_TEMPLATE_PATH.'venue_gmap_metabox_content.template.php';
+		EEH_Template::display_template($template, $template_args);
 	}
 
 
 
 	public function venue_address_metabox() {
 
-		$template_args['_venue'] =$this->_cpt_model_obj;
+		$template_args['_venue'] = $this->_cpt_model_obj;
 
 		$template_args['states_dropdown'] = EEH_Form_Fields::generate_form_input(
 			$QFI = new EE_Question_Form_Input(
-				EE_Question::new_instance( array( 'QST_display_text' => 'State', 'QST_system' => 'state' )),
-				EE_Answer::new_instance( array(  'ANS_value'=> $this->_cpt_model_obj->state_ID() )),
+				EE_Question::new_instance(array('QST_display_text' => 'State', 'QST_system' => 'state')),
+				EE_Answer::new_instance(array('ANS_value'=> $this->_cpt_model_obj->state_ID())),
 				array(
 					'input_name' =>  'sta_id',
 					'input_id' => 'sta_id',
@@ -577,8 +577,8 @@ 
 		);
 		$template_args['countries_dropdown'] = EEH_Form_Fields::generate_form_input(
 			$QFI = new EE_Question_Form_Input(
-				EE_Question::new_instance( array( 'QST_display_text' => 'Country', 'QST_system' => 'country' )),
-				EE_Answer::new_instance( array(  'ANS_value'=> $this->_cpt_model_obj->country_ID() )),
+				EE_Question::new_instance(array('QST_display_text' => 'Country', 'QST_system' => 'country')),
+				EE_Answer::new_instance(array('ANS_value'=> $this->_cpt_model_obj->country_ID())),
 				array(
 					'input_name' =>  'cnt_iso',
 					'input_id' => 'cnt_iso',
@@ -589,8 +589,8 @@ 
 			)
 		);
 
-		$template = EE_VENUES_TEMPLATE_PATH . 'venue_address_metabox_content.template.php';
-		EEH_Template::display_template( $template, $template_args );
+		$template = EE_VENUES_TEMPLATE_PATH.'venue_address_metabox_content.template.php';
+		EEH_Template::display_template($template, $template_args);
 	}
 
 
@@ -602,8 +602,8 @@ 
 		$template_args = array(
 			'_venue' => $this->_cpt_model_obj
 			);
-		$template = EE_VENUES_TEMPLATE_PATH . 'venue_virtual_location_metabox_content.template.php';
-		EEH_Template::display_template( $template, $template_args );
+		$template = EE_VENUES_TEMPLATE_PATH.'venue_virtual_location_metabox_content.template.php';
+		EEH_Template::display_template($template, $template_args);
 	}
 
 
@@ -626,47 +626,47 @@ 
 	 * @param  object $post    Post object (with "blessed" WP properties)
 	 * @return void
 	 */
-	protected function _insert_update_cpt_item( $post_id, $post ) {
-		$wheres = array( $this->_venue_model->primary_key_name() => $post_id );
+	protected function _insert_update_cpt_item($post_id, $post) {
+		$wheres = array($this->_venue_model->primary_key_name() => $post_id);
 
 		$venue_values = array(
-			'VNU_address' => !empty( $this->_req_data['vnu_address'] ) ? $this->_req_data['vnu_address'] : NULL,
-			'VNU_address2' => !empty( $this->_req_data['vnu_address2'] ) ? $this->_req_data['vnu_address2'] : NULL,
-			'VNU_city' => !empty( $this->_req_data['vnu_city'] ) ? $this->_req_data['vnu_city'] : NULL,
-			'STA_ID' => !empty( $this->_req_data['sta_id'] ) ? $this->_req_data['sta_id'] : NULL,
-			'CNT_ISO' => !empty( $this->_req_data['cnt_iso'] ) ? $this->_req_data['cnt_iso'] : NULL,
-			'VNU_zip' => !empty( $this->_req_data['vnu_zip'] ) ? $this->_req_data['vnu_zip'] : NULL,
-			'VNU_phone' => !empty( $this->_req_data['vnu_phone'] ) ? $this->_req_data['vnu_phone'] : NULL,
-			'VNU_capacity' => !empty( $this->_req_data['vnu_capacity'] ) ? str_replace( ',', '', $this->_req_data['vnu_capacity'] ) : INF,
-			'VNU_url' => !empty( $this->_req_data['vnu_url'] ) ? $this->_req_data['vnu_url'] : NULL,
-			'VNU_virtual_phone' => !empty( $this->_req_data['vnu_virtual_phone'] ) ? $this->_req_data['vnu_virtual_phone'] : NULL,
-			'VNU_virtual_url' => !empty( $this->_req_data['vnu_virtual_url'] ) ? $this->_req_data['vnu_virtual_url'] : NULL,
-			'VNU_enable_for_gmap' => !empty( $this->_req_data['vnu_enable_for_gmap'] ) ? TRUE : FALSE,
-			'VNU_google_map_link' => !empty( $this->_req_data['vnu_google_map_link'] ) ? $this->_req_data['vnu_google_map_link'] : NULL
+			'VNU_address' => ! empty($this->_req_data['vnu_address']) ? $this->_req_data['vnu_address'] : NULL,
+			'VNU_address2' => ! empty($this->_req_data['vnu_address2']) ? $this->_req_data['vnu_address2'] : NULL,
+			'VNU_city' => ! empty($this->_req_data['vnu_city']) ? $this->_req_data['vnu_city'] : NULL,
+			'STA_ID' => ! empty($this->_req_data['sta_id']) ? $this->_req_data['sta_id'] : NULL,
+			'CNT_ISO' => ! empty($this->_req_data['cnt_iso']) ? $this->_req_data['cnt_iso'] : NULL,
+			'VNU_zip' => ! empty($this->_req_data['vnu_zip']) ? $this->_req_data['vnu_zip'] : NULL,
+			'VNU_phone' => ! empty($this->_req_data['vnu_phone']) ? $this->_req_data['vnu_phone'] : NULL,
+			'VNU_capacity' => ! empty($this->_req_data['vnu_capacity']) ? str_replace(',', '', $this->_req_data['vnu_capacity']) : INF,
+			'VNU_url' => ! empty($this->_req_data['vnu_url']) ? $this->_req_data['vnu_url'] : NULL,
+			'VNU_virtual_phone' => ! empty($this->_req_data['vnu_virtual_phone']) ? $this->_req_data['vnu_virtual_phone'] : NULL,
+			'VNU_virtual_url' => ! empty($this->_req_data['vnu_virtual_url']) ? $this->_req_data['vnu_virtual_url'] : NULL,
+			'VNU_enable_for_gmap' => ! empty($this->_req_data['vnu_enable_for_gmap']) ? TRUE : FALSE,
+			'VNU_google_map_link' => ! empty($this->_req_data['vnu_google_map_link']) ? $this->_req_data['vnu_google_map_link'] : NULL
 			);
 
 		//update venue
-		$success = $this->_venue_model->update( $venue_values, array( $wheres ) );
+		$success = $this->_venue_model->update($venue_values, array($wheres));
 
 		//get venue_object for other metaboxes that might be added via the filter... though it would seem to make sense to just use $this->_venue_model->get_one_by_ID( $post_id ).. i have to setup where conditions to override the filters in the model that filter out autodraft and inherit statuses so we GET the inherit id!
-		$get_one_where = array( $this->_venue_model->primary_key_name() => $post_id, 'status' => $post->post_status  );
-		$venue = $this->_venue_model->get_one( array( $get_one_where ) );
+		$get_one_where = array($this->_venue_model->primary_key_name() => $post_id, 'status' => $post->post_status);
+		$venue = $this->_venue_model->get_one(array($get_one_where));
 
 		//notice we've applied a filter for venue metabox callbacks but we don't actually have any default venue metaboxes in use.  So this is just here for addons to more easily hook into venue saves.
-		$venue_update_callbacks = apply_filters( 'FHEE__Venues_Admin_Page___insert_update_cpt_item__venue_update_callbacks', array() );
+		$venue_update_callbacks = apply_filters('FHEE__Venues_Admin_Page___insert_update_cpt_item__venue_update_callbacks', array());
 
 		$att_success = TRUE;
 
-		foreach ( $venue_update_callbacks as $v_callback ) {
-			$_succ = call_user_func_array( $v_callback, array( $venue,  $this->_req_data ) );
-			$att_success = !$att_success ? $att_success : $_succ; //if ANY of these updates fail then we want the appropriate global error message
+		foreach ($venue_update_callbacks as $v_callback) {
+			$_succ = call_user_func_array($v_callback, array($venue, $this->_req_data));
+			$att_success = ! $att_success ? $att_success : $_succ; //if ANY of these updates fail then we want the appropriate global error message
 		}
 
 		//any errors?
-		if ( $success && !$att_success ) {
-			EE_Error::add_error( __('Venue Details saved successfully but something went wrong with saving attachments.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
-		} else if ( $success === FALSE ) {
-			EE_Error::add_error( __('Venue Details did not save successfully.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ($success && ! $att_success) {
+			EE_Error::add_error(__('Venue Details saved successfully but something went wrong with saving attachments.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
+		} else if ($success === FALSE) {
+			EE_Error::add_error(__('Venue Details did not save successfully.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -674,9 +674,9 @@ 
 
 
 
-	public function trash_cpt_item( $post_id ) {
+	public function trash_cpt_item($post_id) {
 		$this->_req_data['VNU_ID'] = $post_id;
-		$this->_trash_or_restore_venue( 'trash', FALSE );
+		$this->_trash_or_restore_venue('trash', FALSE);
 	}
 
 
@@ -684,18 +684,18 @@ 
 
 
 
-	public function restore_cpt_item( $post_id ) {
+	public function restore_cpt_item($post_id) {
 		$this->_req_data['VNU_ID'] = $post_id;
-		$this->_trash_or_restore_venue( 'draft', FALSE );
+		$this->_trash_or_restore_venue('draft', FALSE);
 	}
 
 
 
 
 
-	public function delete_cpt_item( $post_id ) {
+	public function delete_cpt_item($post_id) {
 		$this->_req_data['VNU_ID'] = $post_id;
-		$this->_delete_venue( FALSE );
+		$this->_delete_venue(FALSE);
 	}
 
 
@@ -710,15 +710,15 @@ 
 
 
 
-	protected function _trash_or_restore_venue( $venue_stats = 'trash', $redirect_after = TRUE ) {
-		$VNU_ID = isset( $this->_req_data['VNU_ID'] ) ? absint( $this->_req_data['VNU_ID'] ) : FALSE;
+	protected function _trash_or_restore_venue($venue_stats = 'trash', $redirect_after = TRUE) {
+		$VNU_ID = isset($this->_req_data['VNU_ID']) ? absint($this->_req_data['VNU_ID']) : FALSE;
 
 		//loop thru venues
-		if ( $VNU_ID ) {
+		if ($VNU_ID) {
 			//clean status
-			$venue_status = strtoupper( sanitize_key( $venue_status ) );
+			$venue_status = strtoupper(sanitize_key($venue_status));
 			// grab status
-			if (!empty($venue_status)) {
+			if ( ! empty($venue_status)) {
 				$success = $this->_change_venue_status($VNU_ID, $venue_status);
 			} else {
 				$success = FALSE;
@@ -732,7 +732,7 @@ 
 		}
 		$action = $venue_status == 'trash' ? 'moved to the trash' : 'restored from the trash';
 
-		if ( $redirect_after )
+		if ($redirect_after)
 			$this->_redirect_after_action($success, 'Venue', $action, array('action' => 'default'));
 
 	}
@@ -741,11 +741,11 @@ 
 
 
 
-	protected function _trash_or_restore_venues( $venue_status = 'trash' ) {
+	protected function _trash_or_restore_venues($venue_status = 'trash') {
 		// clean status
 		$venue_status = strtoupper(sanitize_key($venue_status));
 		// grab status
-		if (!empty($venue_status)) {
+		if ( ! empty($venue_status)) {
 			$success = TRUE;
 			//determine the event id and set to array.
 			$VNU_IDs = isset($this->_req_data['VNU_IDs']) ? (array) $this->_req_data['VNU_IDs'] : array();
@@ -785,15 +785,15 @@ 
 	 * @param  string $event_status
 	 * @return void
 	 */
-	private function _change_venue_status( $VNU_ID = FALSE, $venue_status = FALSE ) {
+	private function _change_venue_status($VNU_ID = FALSE, $venue_status = FALSE) {
 		// grab venue id
-		if (!$VNU_ID) {
+		if ( ! $VNU_ID) {
 			$msg = __('An error occurred. No Venue ID or an invalid Venue ID was received.', 'event_espresso');
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
-		$this->_set_model_object( $VNU_ID );
+		$this->_set_model_object($VNU_ID);
 
 		// clean status
 		$venue_status = strtoupper(sanitize_key($venue_status));
@@ -819,7 +819,7 @@ 
 				$hook = FALSE;
 		}
 		//use class to change status
-		$this->_cpt_model_obj->set_status( $venue_status );
+		$this->_cpt_model_obj->set_status($venue_status);
 		$success = $this->_cpt_model_obj->save();
 
 		if ($success === FALSE) {
@@ -838,21 +838,21 @@ 
 	 * @param  boolean $redirect_after [description]
 	 * @return [type]                  [description]
 	 */
-	protected function _delete_venue( $redirect_after = TRUE ) {
+	protected function _delete_venue($redirect_after = TRUE) {
 		//determine the venue id and set to array.
 		$VNU_ID = isset($this->_req_data['VNU_ID']) ? absint($this->_req_data['VNU_ID']) : NULL;
-		$VNU_ID = isset( $this->_req_data['post'] ) ? absint( $this->_req_data['post'] ) : NULL;
+		$VNU_ID = isset($this->_req_data['post']) ? absint($this->_req_data['post']) : NULL;
 
 
 		// loop thru venues
 		if ($VNU_ID) {
-			$success = $this->_delete_or_trash_venue( $VNU_ID );
+			$success = $this->_delete_or_trash_venue($VNU_ID);
 		} else {
 			$success = FALSE;
 			$msg = __('An error occurred. An venue could not be deleted because a valid venue ID was not not supplied.', 'event_espresso');
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
-		if ( $redirect_after )
+		if ($redirect_after)
 			$this->_redirect_after_action($success, 'Venue', 'deleted', array('action' => 'default'));
 	}
 
@@ -884,7 +884,7 @@ 
 	//todo: put in parent
 	private function _delete_or_trash_venue($VNU_ID = FALSE) {
 		// grab event id
-		if (!$VNU_ID = absint($VNU_ID)) {
+		if ( ! $VNU_ID = absint($VNU_ID)) {
 			$msg = __('An error occurred. No Venue ID or an invalid Venue ID was received.', 'event_espresso');
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
@@ -904,7 +904,7 @@ 
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		do_action( 'AHEE__Venues_Admin_Page___delete_or_trash_venue__after_venue_deleted' );
+		do_action('AHEE__Venues_Admin_Page___delete_or_trash_venue__after_venue_deleted');
 		return TRUE;
 	}
 
@@ -915,11 +915,11 @@ 
 	/* QUERIES */
 
 
-	public function get_venues( $per_page = 10, $count = FALSE ) {
+	public function get_venues($per_page = 10, $count = FALSE) {
 
-		$_orderby = !empty( $this->_req_data['orderby'] ) ? $this->_req_data['orderby'] : '';
+		$_orderby = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : '';
 
-		switch ( $_orderby ) {
+		switch ($_orderby) {
 			case 'id':
 				$orderby = 'VNU_ID';
 				break;
@@ -937,64 +937,64 @@ 
 		}
 
 
-		$sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'ASC';
+		$sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'ASC';
 
-		$current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1;
-		$per_page = isset( $per_page ) && !empty( $per_page ) ? $per_page : 10;
-		$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($per_page) && ! empty($per_page) ? $per_page : 10;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page;
 
 
-		$offset = ($current_page-1)*$per_page;
+		$offset = ($current_page - 1) * $per_page;
 		$limit = array($offset, $per_page);
 
-		$category = isset( $this->_req_data['category'] ) && $this->_req_data['category'] > 0 ? $this->_req_data['category'] : NULL;
+		$category = isset($this->_req_data['category']) && $this->_req_data['category'] > 0 ? $this->_req_data['category'] : NULL;
 
 		$where = array(
-			'status' => isset( $this->_req_data['venue_status'] ) && $this->_req_data['venue_status'] != '' ? $this->_req_data['venue_status'] : array('IN', array('publish', 'draft') )
+			'status' => isset($this->_req_data['venue_status']) && $this->_req_data['venue_status'] != '' ? $this->_req_data['venue_status'] : array('IN', array('publish', 'draft'))
 			//todo add filter by category
 			);
 
-		if ( $category ) {
+		if ($category) {
 			$where['Term_Taxonomy.taxonomy'] = 'espresso_venue_categories';
 			$where['Term_Taxonomy.term_id'] = $category;
 		}
 
 		//cap checks
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_private_venues', 'get_venue' ) ) {
-			if ( ! empty( $where['status'][0] ) && $where['status'][0] == 'IN' ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_private_venues', 'get_venue')) {
+			if ( ! empty($where['status'][0]) && $where['status'][0] == 'IN') {
 				$where['status'][1][] = 'private';
 			}
 		}
 
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_venues', 'get_venues' ) ) {
-			$where['VNU_wp_user'] =  get_current_user_id();
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_venues', 'get_venues')) {
+			$where['VNU_wp_user'] = get_current_user_id();
 		}
 
 
-		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(
-				'VNU_name' => array('LIKE',$sstr ),
-				'VNU_desc' => array('LIKE',$sstr ),
-				'VNU_short_desc' => array( 'LIKE',$sstr ),
-				'VNU_address' => array( 'LIKE', $sstr ),
-				'VNU_address2' => array( 'LIKE', $sstr ),
-				'VNU_city' => array( 'LIKE', $sstr ),
-				'VNU_zip' => array( 'LIKE', $sstr ),
-				'VNU_phone' => array( 'LIKE', $sstr ),
-				'VNU_url' => array( 'LIKE', $sstr ),
-				'VNU_virtual_phone' => array( 'LIKE', $sstr ),
-				'VNU_virtual_url' => array( 'LIKE', $sstr ),
-				'VNU_google_map_link' => array( 'LIKE', $sstr ),
-				'Event.EVT_name' => array('LIKE', $sstr ),
-				'Event.EVT_desc' => array('LIKE', $sstr ),
-				'Event.EVT_phone' => array('LIKE', $sstr ),
-				'Event.EVT_external_URL' => array('LIKE', $sstr ),
+				'VNU_name' => array('LIKE', $sstr),
+				'VNU_desc' => array('LIKE', $sstr),
+				'VNU_short_desc' => array('LIKE', $sstr),
+				'VNU_address' => array('LIKE', $sstr),
+				'VNU_address2' => array('LIKE', $sstr),
+				'VNU_city' => array('LIKE', $sstr),
+				'VNU_zip' => array('LIKE', $sstr),
+				'VNU_phone' => array('LIKE', $sstr),
+				'VNU_url' => array('LIKE', $sstr),
+				'VNU_virtual_phone' => array('LIKE', $sstr),
+				'VNU_virtual_url' => array('LIKE', $sstr),
+				'VNU_google_map_link' => array('LIKE', $sstr),
+				'Event.EVT_name' => array('LIKE', $sstr),
+				'Event.EVT_desc' => array('LIKE', $sstr),
+				'Event.EVT_phone' => array('LIKE', $sstr),
+				'Event.EVT_external_URL' => array('LIKE', $sstr),
 				);
 		}
 
 
-		$venues = $count ? $this->_venue_model->count( array($where), 'VNU_ID' ) : $this->_venue_model->get_all( array( $where, 'limit' => $limit, 'order_by' => $orderby, 'order' => $sort ) );
+		$venues = $count ? $this->_venue_model->count(array($where), 'VNU_ID') : $this->_venue_model->get_all(array($where, 'limit' => $limit, 'order_by' => $orderby, 'order' => $sort));
 
 		return $venues;
 
@@ -1012,22 +1012,22 @@ 
 	 * @return void
 	 */
 	private function _set_category_object() {
-		if ( isset( $this->_category->id ) && !empty( $this->_category->id ) )
+		if (isset($this->_category->id) && ! empty($this->_category->id))
 			return; //already have the category object so get out.
 
 		//set default category object
 		$this->_set_empty_category_object();
 
 		//only set if we've got an id
-		if ( !isset($this->_req_data['VEN_CAT_ID'] ) ) {
+		if ( ! isset($this->_req_data['VEN_CAT_ID'])) {
 			return;
 		}
 
 		$category_id = absint($this->_req_data['VEN_CAT_ID']);
-		$term = get_term( $category_id, 'espresso_venue_categories' );
+		$term = get_term($category_id, 'espresso_venue_categories');
 
 
-		if ( !empty( $term ) ) {
+		if ( ! empty($term)) {
 			$this->_category->category_name = $term->name;
 			$this->_category->category_identifier = $term->slug;
 			$this->_category->category_desc = $term->description;
@@ -1041,14 +1041,14 @@ 
 
 	private function _set_empty_category_object() {
 		$this->_category = new stdClass();
-		$this->_category->category_name = $this->_category->category_identifier = $this->_category->category_desc  = '';
+		$this->_category->category_name = $this->_category->category_identifier = $this->_category->category_desc = '';
 		$this->_category->id = $this->_category->parent = 0;
 	}
 
 
 
 	protected function _category_list_table() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$this->_admin_page_title .= $this->get_action_link_or_button('add_category', 'add_category', array(), 'add-new-h2');
 		$this->_search_btn_label = __('Venue Categories', 'event_espresso');
 		$this->display_admin_list_table_page_with_sidebar();
@@ -1058,21 +1058,21 @@ 
 	protected function _category_details($view) {
 
 		//load formatter helper
-		EE_Registry::instance()->load_helper( 'Formatter' );
+		EE_Registry::instance()->load_helper('Formatter');
 		//load field generator helper
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
+		EE_Registry::instance()->load_helper('Form_Fields');
 
 		$route = $view == 'edit' ? 'update_category' : 'insert_category';
 		$this->_set_add_edit_form_tags($route);
 
 		$this->_set_category_object();
-		$id = !empty($this->_category->id) ? $this->_category->id : '';
+		$id = ! empty($this->_category->id) ? $this->_category->id : '';
 
 		$delete_action = 'delete_category';
 
-		$redirect = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'category_list' ), $this->_admin_base_url );
+		$redirect = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'category_list'), $this->_admin_base_url);
 
-		$this->_set_publish_post_box_vars( 'VEN_CAT_ID', $id, $delete_action, $redirect );
+		$this->_set_publish_post_box_vars('VEN_CAT_ID', $id, $delete_action, $redirect);
 
 		//take care of contents
 		$this->_template_args['admin_page_content'] = $this->_category_details_content();
@@ -1086,25 +1086,25 @@ 
 			'type' => 'wp_editor',
 			'value' => EEH_Formatter::admin_format_content($this->_category->category_desc),
 			'class' => 'my_editor_custom',
-			'wpeditor_args' => array( 'media_buttons' => FALSE )
+			'wpeditor_args' => array('media_buttons' => FALSE)
 		);
-		$_wp_editor = $this->_generate_admin_form_fields( $editor_args, 'array' );
+		$_wp_editor = $this->_generate_admin_form_fields($editor_args, 'array');
 
-		$all_terms = get_terms( array('espresso_venue_categories' ), array( 'hide_empty' => 0, 'exclude' => array( $this->_category->id ) ) );
+		$all_terms = get_terms(array('espresso_venue_categories'), array('hide_empty' => 0, 'exclude' => array($this->_category->id)));
 
 		//setup category select for term parents.
 		$category_select_values[] = array(
 			'text' => __('No Parent', 'event_espresso'),
 			'id' => 0
 			);
-		foreach ( $all_terms as $term ) {
+		foreach ($all_terms as $term) {
 			$category_select_values[] = array(
 				'text' => $term->name,
 				'id' => $term->term_id
 				);
 		}
 
-		$category_select = EEH_Form_Fields::select_input( 'category_parent', $category_select_values, $this->_category->parent );
+		$category_select = EEH_Form_Fields::select_input('category_parent', $category_select_values, $this->_category->parent);
 		$template_args = array(
 			'category' => $this->_category,
 			'category_select' => $category_select,
@@ -1113,15 +1113,15 @@ 
 			'disable' => '',
 			'disabled_message' =>FALSE
 			);
-		$template = EVENTS_TEMPLATE_PATH . 'event_category_details.template.php';
-		return EEH_Template::display_template($template, $template_args, TRUE );
+		$template = EVENTS_TEMPLATE_PATH.'event_category_details.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
 	protected function _delete_categories() {
-		$cat_ids = isset( $this->_req_data['VEN_CAT_ID'] ) ? (array) $this->_req_data['VEN_CAT_ID'] : (array) $this->_req_data['category_id'];
+		$cat_ids = isset($this->_req_data['VEN_CAT_ID']) ? (array) $this->_req_data['VEN_CAT_ID'] : (array) $this->_req_data['category_id'];
 
-		foreach ( $cat_ids as $cat_id ) {
+		foreach ($cat_ids as $cat_id) {
 			$this->_delete_category($cat_id);
 		}
 
@@ -1129,7 +1129,7 @@ 
 		$query_args = array(
 			'action' => 'category_list'
 			);
-		$this->_redirect_after_action(0,'','',$query_args);
+		$this->_redirect_after_action(0, '', '', $query_args);
 
 	}
 
@@ -1138,58 +1138,58 @@ 
 
 
 	protected function _delete_category($cat_id) {
-		$cat_id = absint( $cat_id );
-		wp_delete_term( $cat_id, 'espresso_venue_categories' );
+		$cat_id = absint($cat_id);
+		wp_delete_term($cat_id, 'espresso_venue_categories');
 	}
 
 
 
 	protected function _insert_or_update_category($new_category) {
 
-		$cat_id = $new_category ? $this->_insert_category() : $this->_insert_category( TRUE );
+		$cat_id = $new_category ? $this->_insert_category() : $this->_insert_category(TRUE);
 		$success = 0; //we already have a success message so lets not send another.
-		if ( $cat_id ) {
+		if ($cat_id) {
 			$query_args = array(
 				'action'     => 'edit_category',
 				'EVT_CAT_ID' => $cat_id
 			);
 		} else {
-			$query_args = array( 'action' => 'add_category' );
+			$query_args = array('action' => 'add_category');
 		}
-		$this->_redirect_after_action( $success, '','', $query_args, TRUE );
+		$this->_redirect_after_action($success, '', '', $query_args, TRUE);
 
 	}
 
 
 
-	private function _insert_category( $update = FALSE ) {
+	private function _insert_category($update = FALSE) {
 		$cat_id = $update ? $this->_req_data['VEN_CAT_ID'] : '';
-		$category_name= isset( $this->_req_data['category_name'] ) ? $this->_req_data['category_name'] : '';
-		$category_desc= isset( $this->_req_data['category_desc'] ) ? $this->_req_data['category_desc'] : '';
-		$category_parent = isset( $this->_req_data['category_parent'] ) ? $this->_req_data['category_parent'] : 0;
+		$category_name = isset($this->_req_data['category_name']) ? $this->_req_data['category_name'] : '';
+		$category_desc = isset($this->_req_data['category_desc']) ? $this->_req_data['category_desc'] : '';
+		$category_parent = isset($this->_req_data['category_parent']) ? $this->_req_data['category_parent'] : 0;
 
-		if ( empty( $category_name ) ) {
-			$msg = __( 'You must add a name for the category.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($category_name)) {
+			$msg = __('You must add a name for the category.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
 
-		$term_args=array(
+		$term_args = array(
 			'name'=>$category_name,
 			'description'=>$category_desc,
 			'parent'=>$category_parent
 		);
 
-		$insert_ids = $update ? wp_update_term( $cat_id, 'espresso_venue_categories', $term_args ) :wp_insert_term( $category_name, 'espresso_venue_categories', $term_args );
+		$insert_ids = $update ? wp_update_term($cat_id, 'espresso_venue_categories', $term_args) : wp_insert_term($category_name, 'espresso_venue_categories', $term_args);
 
-		if ( !is_array( $insert_ids ) ) {
-			$msg = __( 'An error occurred and the category has not been saved to the database.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! is_array($insert_ids)) {
+			$msg = __('An error occurred and the category has not been saved to the database.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		} else {
 			$cat_id = $insert_ids['term_id'];
-			$msg = sprintf ( __('The category %s was successfuly created', 'event_espresso'), $category_name );
-			EE_Error::add_success( $msg );
+			$msg = sprintf(__('The category %s was successfuly created', 'event_espresso'), $category_name);
+			EE_Error::add_success($msg);
 		}
 
 		return $cat_id;
@@ -1209,12 +1209,12 @@ 
 			'category_ids' => $this->_req_data['VEN_CAT_ID']
 			);
 
-		$this->_req_data = array_merge( $this->_req_data, $new_request_args );
+		$this->_req_data = array_merge($this->_req_data, $new_request_args);
 
-		EE_Registry::instance()->load_helper( 'File' );
-		if ( is_readable( EE_CLASSES . 'EE_Export.class.php') ) {
-			require_once( EE_CLASSES . 'EE_Export.class.php');
-			$EE_Export = EE_Export::instance( $this->_req_data );
+		EE_Registry::instance()->load_helper('File');
+		if (is_readable(EE_CLASSES.'EE_Export.class.php')) {
+			require_once(EE_CLASSES.'EE_Export.class.php');
+			$EE_Export = EE_Export::instance($this->_req_data);
 			$EE_Export->export();
 		}
 
@@ -1226,7 +1226,7 @@ 
 
 	protected function _import_categories() {
 
-		require_once(EE_CLASSES . 'EE_Import.class.php');
+		require_once(EE_CLASSES.'EE_Import.class.php');
 		EE_Import::instance()->import();
 
 	}
@@ -1234,29 +1234,29 @@ 
 
 
 
-	public function get_categories( $per_page = 10, $current_page = 1, $count = FALSE ) {
+	public function get_categories($per_page = 10, $current_page = 1, $count = FALSE) {
 
 		//testing term stuff
-		$orderby = isset( $this->_req_data['orderby'] ) ? $this->_req_data['orderby'] : 'Term.term_id';
-		$order = isset( $this->_req_data['order'] ) ? $this->_req_data['order'] : 'DESC';
-		$limit = ($current_page-1)*$per_page;
-		$where = array( 'taxonomy' => 'espresso_venue_categories' );
-		if ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		$orderby = isset($this->_req_data['orderby']) ? $this->_req_data['orderby'] : 'Term.term_id';
+		$order = isset($this->_req_data['order']) ? $this->_req_data['order'] : 'DESC';
+		$limit = ($current_page - 1) * $per_page;
+		$where = array('taxonomy' => 'espresso_venue_categories');
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$where['OR'] = array(
-				'Term.name' => array( 'LIKE', $sstr),
-				'description' => array( 'LIKE', $sstr )
+				'Term.name' => array('LIKE', $sstr),
+				'description' => array('LIKE', $sstr)
 				);
 		}
 
 		$query_params = array(
 			$where,
-			'order_by' => array( $orderby => $order ),
-			'limit' => $limit . ',' . $per_page,
+			'order_by' => array($orderby => $order),
+			'limit' => $limit.','.$per_page,
 			'force_join' => array('Term')
 			);
 
-		$categories = $count ? EEM_Term_Taxonomy::instance()->count( $query_params, 'term_id' ) :EEM_Term_Taxonomy::instance()->get_all( $query_params );
+		$categories = $count ? EEM_Term_Taxonomy::instance()->count($query_params, 'term_id') : EEM_Term_Taxonomy::instance()->get_all($query_params);
 
 		return $categories;
 	}

caffeinated/admin/new/venues/Venues_Admin_Page_Init.core.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -32,13 +32,13 @@ 
 
 	public function __construct() {
 		//define some event categories related constants
-		define( 'EE_VENUES_PG_SLUG', 'espresso_venues' );
-		define( 'EE_VENUES_ADMIN_URL', admin_url('admin.php?page=' . EE_VENUES_PG_SLUG ));
-		define( 'EE_VENUES_ASSETS_URL', EE_CORE_CAF_ADMIN_URL . 'new/venues/assets/');
-		define( 'EE_VENUES_TEMPLATE_PATH', EE_CORE_CAF_ADMIN . 'new/venues/templates/' );
+		define('EE_VENUES_PG_SLUG', 'espresso_venues');
+		define('EE_VENUES_ADMIN_URL', admin_url('admin.php?page='.EE_VENUES_PG_SLUG));
+		define('EE_VENUES_ASSETS_URL', EE_CORE_CAF_ADMIN_URL.'new/venues/assets/');
+		define('EE_VENUES_TEMPLATE_PATH', EE_CORE_CAF_ADMIN.'new/venues/templates/');
 
 		parent::__construct();
-		$this->_folder_path = EE_CORE_CAF_ADMIN . 'new/' . $this->_folder_name . DS;
+		$this->_folder_path = EE_CORE_CAF_ADMIN.'new/'.$this->_folder_name.DS;
 	}
 
 	protected function _set_init_properties() {
@@ -49,7 +49,7 @@ 
 
 
 	protected function _set_menu_map() {
-		$this->_menu_map = new EE_Admin_Page_Sub_Menu( array(
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(array(
 			'menu_group' => 'management',
 			'menu_order' => 40,
 			'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,

Braces +2 added lines, -1 removed lines

@@ -1,6 +1,7 @@
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso

caffeinated/admin/new/venues/espresso_events_Venues_Hooks.class.php

Braces +9 added lines, -5 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -163,11 +164,14 @@ 
 		$evt_venue = $evtobj->venues();
 		$evt_venue = !empty( $evt_venue ) ? array_shift( $evt_venue ) : NULL;
 
-		if ( !empty( $evt_venue ) && $evt_venue->ID() != $venue_id )
-			$evtobj->_remove_relation_to( $evt_venue->ID(), 'Venue' );
+		if ( !empty( $evt_venue ) && $evt_venue->ID() != $venue_id ) {
+					$evtobj->_remove_relation_to( $evt_venue->ID(), 'Venue' );
+		}
 
-		if ( empty( $venue_id ) )
-			return TRUE; //no venue to attach
+		if ( empty( $venue_id ) ) {
+					return TRUE;
+		}
+		//no venue to attach
 
 		// this should take care of adding to revisions as well as main post object
 		$success = $evtobj->_add_relation_to( $venue_id, 'Venue' );

Spacing +36 added lines, -36 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -33,8 +33,8 @@ 
 	protected $_event;
 
 
-	public function __construct( EE_Admin_Page $admin_page ) {
-		parent::__construct( $admin_page );
+	public function __construct(EE_Admin_Page $admin_page) {
+		parent::__construct($admin_page);
 	}
 
 
@@ -42,11 +42,11 @@ 
 		$this->_name = 'venues';
 		$this->_remove_metaboxes = array(
 			0 => array(
-				'page_route' => array( 'create_new', 'edit' ),
+				'page_route' => array('create_new', 'edit'),
 				'id' => 'espresso_event_editor_venue',
 				'context' => 'normal'
 				)
-			);/**/
+			); /**/
 		$this->_metaboxes = array(
 			0 => array(
 				'page_route' => array('edit', 'create_new'),
@@ -55,18 +55,18 @@ 
 				'priority' => 'high',
 				'context' => 'normal'
 				)
-		);/**/
+		); /**/
 
 		$this->_scripts_styles = array(
 			'registers' => array(
 				'ee_event_venues' => array(
 					'type' => 'js',
-					'url' => EE_VENUES_ASSETS_URL . 'ee-event-venues-admin.js',
+					'url' => EE_VENUES_ASSETS_URL.'ee-event-venues-admin.js',
 					'depends' => array('jquery')
 					),
 				'ee_event_venues_css' => array(
 					'type' => 'css',
-					'url' => EE_VENUES_ASSETS_URL . 'ee-event-venues-admin.css',
+					'url' => EE_VENUES_ASSETS_URL.'ee-event-venues-admin.css',
 					)
 				),
 			'enqueues' => array(
@@ -76,24 +76,24 @@ 
 			);
 
 		//hook into the handler for saving venue
-		add_filter( 'FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks', array( $this, 'modify_callbacks' ), 10 );
+		add_filter('FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks', array($this, 'modify_callbacks'), 10);
 
 		//remove default ee_autosave returns for DECAF venues (not needed for CAF venues cause we have a dropdown selector)
-		add_filter( 'FHEE__Events_Admin_Page__ee_autosave_edit_do_decaf_venue_save', '__return_false' );
+		add_filter('FHEE__Events_Admin_Page__ee_autosave_edit_do_decaf_venue_save', '__return_false');
 
 	}
 
 
-	public function modify_callbacks( $callbacks ) {
+	public function modify_callbacks($callbacks) {
 		// first remove default venue callback
-		foreach ( $callbacks as $key => $callback ) {
-			if ( $callback[1] == '_default_venue_update' ) {
-				unset( $callbacks[$key] );
+		foreach ($callbacks as $key => $callback) {
+			if ($callback[1] == '_default_venue_update') {
+				unset($callbacks[$key]);
 			}
 		}
 
 		//now let's add the caf version
-		$callbacks[] = array( $this, 'caf_venue_update' );
+		$callbacks[] = array($this, 'caf_venue_update');
 		return $callbacks;
 	}
 
@@ -109,61 +109,61 @@ 
 		$evt_id = $evt_obj->ID();
 
 		//first let's see if we have a venue already
-		$evt_venues = !empty( $evt_id ) ? $evt_obj->venues() : array();
-		$evt_venue = !empty( $evt_venues ) ? array_shift( $evt_venues ) : NULL;
-		$evt_venue_id = !empty( $evt_venue ) ? $evt_venue->ID() : NULL;
+		$evt_venues = ! empty($evt_id) ? $evt_obj->venues() : array();
+		$evt_venue = ! empty($evt_venues) ? array_shift($evt_venues) : NULL;
+		$evt_venue_id = ! empty($evt_venue) ? $evt_venue->ID() : NULL;
 
 		//possibly private venues.
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_private_venues', 'get_venues' ) ) {
-			$vnu_where['status']= array( 'IN' , array( 'publish', 'private' ) );
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_private_venues', 'get_venues')) {
+			$vnu_where['status'] = array('IN', array('publish', 'private'));
 		} else {
 			$vnu_where['status'] = 'publish';
 		}
 
 		//cap checks
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_venues', 'get_venues' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_venues', 'get_venues')) {
 			$vnu_where['VNU_wp_user'] = get_current_user_id();
 		}
 
-		$vnumdl = EE_Registry::instance()->load_model( 'Venue' );
-		$venues = $vnumdl->get_all( array( $vnu_where ) );
+		$vnumdl = EE_Registry::instance()->load_model('Venue');
+		$venues = $vnumdl->get_all(array($vnu_where));
 
 		$ven_select = array();
 		$ven_select[0] = __('Select a Venue', 'event_espresso');
 		//setup venues for selector
-		foreach ( $venues as $venue ) {
+		foreach ($venues as $venue) {
 			$ven_select[$venue->ID()] = $venue->name();
 		}
 
 		$template_args['venues'] = $venues;
 		$template_args['evt_venue_id'] = $evt_venue_id;
-		$template_args['venue_selector'] = EEH_Form_Fields::select_input('venue_id', $ven_select, $evt_venue_id, 'id="venue_id"' );
-		$template_args['enable_for_gmap'] = EEH_Form_Fields::select_input('enable_for_gmap', $values, is_object( $evt_venue ) ? $evt_venue->enable_for_gmap() : NULL, 'id="enable_for_gmap"');
-		$template_path = empty( $venues ) ? EE_VENUES_TEMPLATE_PATH . 'event_venues_metabox_content.template.php' : EE_VENUES_TEMPLATE_PATH . 'event_venues_metabox_content_from_manager.template.php';
-		EEH_Template::display_template( $template_path, $template_args );
+		$template_args['venue_selector'] = EEH_Form_Fields::select_input('venue_id', $ven_select, $evt_venue_id, 'id="venue_id"');
+		$template_args['enable_for_gmap'] = EEH_Form_Fields::select_input('enable_for_gmap', $values, is_object($evt_venue) ? $evt_venue->enable_for_gmap() : NULL, 'id="enable_for_gmap"');
+		$template_path = empty($venues) ? EE_VENUES_TEMPLATE_PATH.'event_venues_metabox_content.template.php' : EE_VENUES_TEMPLATE_PATH.'event_venues_metabox_content_from_manager.template.php';
+		EEH_Template::display_template($template_path, $template_args);
 	}
 
 
 
 
-	public function caf_venue_update( $evtobj, $data ) {
+	public function caf_venue_update($evtobj, $data) {
 		EE_Registry::instance()->load_model('Venue');
-		$venue_id = !empty( $data['venue_id'] ) ? $data['venue_id'] : NULL;
+		$venue_id = ! empty($data['venue_id']) ? $data['venue_id'] : NULL;
 
 
 		//first let's check if the selected venue matches any existing venue attached to the event
 		$evt_venue = $evtobj->venues();
-		$evt_venue = !empty( $evt_venue ) ? array_shift( $evt_venue ) : NULL;
+		$evt_venue = ! empty($evt_venue) ? array_shift($evt_venue) : NULL;
 
-		if ( !empty( $evt_venue ) && $evt_venue->ID() != $venue_id )
-			$evtobj->_remove_relation_to( $evt_venue->ID(), 'Venue' );
+		if ( ! empty($evt_venue) && $evt_venue->ID() != $venue_id)
+			$evtobj->_remove_relation_to($evt_venue->ID(), 'Venue');
 
-		if ( empty( $venue_id ) )
+		if (empty($venue_id))
 			return TRUE; //no venue to attach
 
 		// this should take care of adding to revisions as well as main post object
-		$success = $evtobj->_add_relation_to( $venue_id, 'Venue' );
-		return !empty($success) ? TRUE : FALSE;
+		$success = $evtobj->_add_relation_to($venue_id, 'Venue');
+		return ! empty($success) ? TRUE : FALSE;
 	}