eventespresso / event-espresso-core

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

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

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

Spacing +35 added lines, -35 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -31,7 +31,7 @@ 
 
 class Venues_Admin_List_Table extends EE_Admin_List_Table {
 
-	public function __construct( $admin_page ) {
+	public function __construct($admin_page) {
 		parent::__construct($admin_page);
 	}
 
@@ -39,8 +39,8 @@ 
 
 
 	protected function _setup_data() {
-		$this->_data = $this->_admin_page->get_venues( $this->_per_page);
-		$this->_all_data_count = $this->_admin_page->get_venues( $this->_per_page, TRUE );
+		$this->_data = $this->_admin_page->get_venues($this->_per_page);
+		$this->_all_data_count = $this->_admin_page->get_venues($this->_per_page, TRUE);
 	}
 
 
@@ -49,8 +49,8 @@ 
 
 	protected function _set_properties() {
 		$this->_wp_list_args = array(
-			'singular' => __('Event Venue', 'event_espresso' ),
-			'plural' => __('Event Venues', 'event_espresso' ),
+			'singular' => __('Event Venue', 'event_espresso'),
+			'plural' => __('Event Venues', 'event_espresso'),
 			'ajax' => TRUE, //for now,
 			'screen' => $this->_admin_page->get_current_screen()->id
 			);
@@ -66,10 +66,10 @@ 
 			);
 
 		$this->_sortable_columns = array(
-			'id' => array( 'id' => true ),
-			'name' => array( 'name' => false ),
-			'city' => array( 'city' => false ),
-			'capacity' => array( 'capacity' => false )
+			'id' => array('id' => true),
+			'name' => array('name' => false),
+			'city' => array('city' => false),
+			'capacity' => array('capacity' => false)
 			);
 
 		$this->_hidden_columns = array();
@@ -91,7 +91,7 @@ 
 
 	protected function _add_view_counts() {
 		$this->_views['all']['count'] = EEM_Venue::instance()->count();
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_venues', 'espresso_venues_trash_venues' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_venues', 'espresso_venues_trash_venues')) {
 			$this->_views['trash']['count'] = EEM_Venue::instance()->count_deleted();
 		}
 	}
@@ -103,7 +103,7 @@ 
 
 	public function column_cb($item) {
 
-		return $item->count_related('Event') > 0 && $item->get( 'status' ) === 'trash' ? '<span class="ee-lock-icon"></span>' : sprintf( '<input type="checkbox" name="venue_id[]" value="%s" />', $item->ID());
+		return $item->count_related('Event') > 0 && $item->get('status') === 'trash' ? '<span class="ee-lock-icon"></span>' : sprintf('<input type="checkbox" name="venue_id[]" value="%s" />', $item->ID());
 	}
 
 
@@ -120,12 +120,12 @@ 
 			'post' => $item->ID()
 		);
 
-		$edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EE_VENUES_ADMIN_URL );
+		$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_VENUES_ADMIN_URL);
 
 		$statuses = EEM_Venue::instance()->get_status_array();
-		$actions = $this->_column_name_action_setup( $item );
-		$content = EE_Registry::instance()->CAP->current_user_can( 'ee_edit_venue', 'espresso_venues_edit', $item->ID() ) ? '<strong><a class="row-title" href="' . $edit_link . '">' . stripslashes_deep($item->name()) . '</a></strong>' : $item->name();
-		$content .= $item->status() == 'draft' ? ' - <span class="post-state">' . $statuses['draft'] . '</span>' : '';
+		$actions = $this->_column_name_action_setup($item);
+		$content = EE_Registry::instance()->CAP->current_user_can('ee_edit_venue', 'espresso_venues_edit', $item->ID()) ? '<strong><a class="row-title" href="'.$edit_link.'">'.stripslashes_deep($item->name()).'</a></strong>' : $item->name();
+		$content .= $item->status() == 'draft' ? ' - <span class="post-state">'.$statuses['draft'].'</span>' : '';
 		$content .= $this->row_actions($actions);
 		return $content;
 	}
@@ -136,59 +136,59 @@ 
 	 * @param EE_Venue $item
 	 * @return array()
 	 */
-	protected function _column_name_action_setup( EE_Venue $item ) {
+	protected function _column_name_action_setup(EE_Venue $item) {
 		$actions = array();
 
-		if ( EE_Registry::instance()->CAP->current_user_can('ee_edit_venue', 'espresso_venues_edit', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_venue', 'espresso_venues_edit', $item->ID())) {
 			$edit_query_args = array(
 				'action' => 'edit',
 				'post' => $item->ID()
 			);
-			$edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EE_VENUES_ADMIN_URL );
-			$actions['edit'] = '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Venue', 'event_espresso') . '">' . __('Edit', 'event_espresso') . '</a>';
+			$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_VENUES_ADMIN_URL);
+			$actions['edit'] = '<a href="'.$edit_link.'" title="'.esc_attr__('Edit Venue', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>';
 
 		}
 
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_venue', 'espresso_venues_trash_venue', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_venue', 'espresso_venues_trash_venue', $item->ID())) {
 			$trash_event_query_arg = array(
 				'action' => 'trash_venue',
 				'VNU_ID' => $item->ID()
 			);
-			$trash_venue_link = EE_Admin_Page::add_query_args_and_nonce( $trash_event_query_arg, EE_VENUES_ADMIN_URL );
+			$trash_venue_link = EE_Admin_Page::add_query_args_and_nonce($trash_event_query_arg, EE_VENUES_ADMIN_URL);
 		}
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_venue', 'espresso_venues_restore_venue', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_venue', 'espresso_venues_restore_venue', $item->ID())) {
 			$restore_venue_query_args = array(
 				'action' => 'restore_venue',
 				'VNU_ID' => $item->ID()
 			);
-			$restore_venue_link = EE_Admin_Page::add_query_args_and_nonce( $restore_venue_query_args, EE_VENUES_ADMIN_URL );
+			$restore_venue_link = EE_Admin_Page::add_query_args_and_nonce($restore_venue_query_args, EE_VENUES_ADMIN_URL);
 		}
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_venue', 'espresso_venues_delete_venue', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_venue', 'espresso_venues_delete_venue', $item->ID())) {
 			$delete_venue_query_args = array(
 				'action' => 'delete_venue',
 				'VNU_ID' => $item->ID()
 			);
-			$delete_venue_link = EE_Admin_Page::add_query_args_and_nonce( $delete_venue_query_args, EE_VENUES_ADMIN_URL );
+			$delete_venue_link = EE_Admin_Page::add_query_args_and_nonce($delete_venue_query_args, EE_VENUES_ADMIN_URL);
 		}
 
 		$view_link = get_permalink($item->ID());
 
-		switch ( $item->get( 'status' ) ) {
+		switch ($item->get('status')) {
 			case 'trash' :
-				if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_venue', 'espresso_venues_restore_venue', $item->ID() ) ) {
-					$actions['restore_from_trash'] = '<a href="' . $restore_venue_link . '" title="' . esc_attr__('Restore from Trash', 'event_espresso') . '">' . __('Restore from Trash', 'event_espresso') . '</a>';
+				if (EE_Registry::instance()->CAP->current_user_can('ee_delete_venue', 'espresso_venues_restore_venue', $item->ID())) {
+					$actions['restore_from_trash'] = '<a href="'.$restore_venue_link.'" title="'.esc_attr__('Restore from Trash', 'event_espresso').'">'.__('Restore from Trash', 'event_espresso').'</a>';
 				}
-				if (  $item->count_related('Event') === 0 && EE_Registry::instance()->CAP->current_user_can( 'ee_delete_venue', 'espresso_venues_delete_venue', $item->ID() ) ) {
-					$actions['delete permanently'] = '<a href="' . $delete_venue_link . '" title="' . esc_attr__('Delete Permanently', 'event_espresso') . '">' . __('Delete Permanently', 'event_espresso') . '</a>';
+				if ($item->count_related('Event') === 0 && EE_Registry::instance()->CAP->current_user_can('ee_delete_venue', 'espresso_venues_delete_venue', $item->ID())) {
+					$actions['delete permanently'] = '<a href="'.$delete_venue_link.'" title="'.esc_attr__('Delete Permanently', 'event_espresso').'">'.__('Delete Permanently', 'event_espresso').'</a>';
 				}
 				break;
 			default :
-				$actions['view'] = '<a href="' . $view_link . '" title="' . esc_attr__('View Venue', 'event_espresso') . '">' . __('View', 'event_espresso') . '</a>';
-				if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_venue', 'espresso_venues_trash_venue', $item->ID() ) ) {
-					$actions['move to trash'] = '<a href="' . $trash_venue_link . '" title="' . esc_attr__('Trash Event', 'event_espresso') . '">' . __('Trash', 'event_espresso') . '</a>';
+				$actions['view'] = '<a href="'.$view_link.'" title="'.esc_attr__('View Venue', 'event_espresso').'">'.__('View', 'event_espresso').'</a>';
+				if (EE_Registry::instance()->CAP->current_user_can('ee_delete_venue', 'espresso_venues_trash_venue', $item->ID())) {
+					$actions['move to trash'] = '<a href="'.$trash_venue_link.'" title="'.esc_attr__('Trash Event', 'event_espresso').'">'.__('Trash', 'event_espresso').'</a>';
 				}
 		}
 		return $actions;
@@ -215,7 +215,7 @@ 
 
 
 	public function column_shortcode($item) {
-		$content = '[ESPRESSO_VENUE id=' . $item->ID() . ']';
+		$content = '[ESPRESSO_VENUE id='.$item->ID().']';
 		return $content;
 	}
 

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

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

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

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

Spacing +37 added lines, -37 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,69 +109,69 @@ 
 		$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 = $evt_venues && is_array( $evt_venues ) ? reset( $evt_venues ) : null;
+		$evt_venues = ! empty($evt_id) ? $evt_obj->venues() : array();
+		$evt_venue = $evt_venues && is_array($evt_venues) ? reset($evt_venues) : null;
 		$evt_venue_id = $evt_venue instanceof EE_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, 'order_by' => array( 'VNU_name' => 'ASC' ) ) );
+		$vnumdl = EE_Registry::instance()->load_model('Venue');
+		$venues = $vnumdl->get_all(array($vnu_where, 'order_by' => array('VNU_name' => 'ASC')));
 
 		$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();
 		}
 
 		//if $ven_select does not have the existing venue attached to event then let's add that because we'll always
 		//show existing attached venues even if it's trashed (or some other restricted status).
 
-		if ( $evt_venue_id && ! isset( $ven_select[$evt_venue_id] ) ) {
+		if ($evt_venue_id && ! isset($ven_select[$evt_venue_id])) {
 			$ven_select[$evt_venue_id] = $evt_venue->name();
-			$venues = array_merge( $venues, array( $evt_venue ) );
+			$venues = array_merge($venues, array($evt_venue));
 		}
 
 		$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;
 	}
 
 

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' );

caffeinated/admin/new/venues/help_tabs/venues_editor_physical_location_google_map_virtual_location.help_tab.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <h3><?php _e('Physical Location', 'event_espresso'); ?></h3>
 <p>
 <?php _e('Enter the physical address for this venue. This field is optional.', 'event_espresso'); ?><br />
-<?php echo sprintf(__('The countries that are shown in the dropdown are controlled through the "Country Appears in Dropdown Select Lists" setting which is in the %sCountries tab%s on the General Settings page. Once on this page, you can specify whether to show a country in this dropdown by selecting yes or no and saving changes.', 'event_espresso'),'<a href="admin.php?page=espresso_general_settings&action=country_settings">','</a>'); ?>
+<?php echo sprintf(__('The countries that are shown in the dropdown are controlled through the "Country Appears in Dropdown Select Lists" setting which is in the %sCountries tab%s on the General Settings page. Once on this page, you can specify whether to show a country in this dropdown by selecting yes or no and saving changes.', 'event_espresso'), '<a href="admin.php?page=espresso_general_settings&action=country_settings">', '</a>'); ?>
 </p>
 </p>
 <h3><?php _e('Google Map', 'event_espresso'); ?></h3>

caffeinated/admin/new/venues/help_tours/Google_Maps_Help_Tour.class.php

Spacing +6 added lines, -6 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -71,21 +71,21 @@ 
 
 
 	protected function _start() {
-		$content = '<h3>' . __('Google Maps Settings', 'event_espresso') . '</h3>';
-		$content .= '<p>' . __('This tour of the Google Maps page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>';
+		$content = '<h3>'.__('Google Maps Settings', 'event_espresso').'</h3>';
+		$content .= '<p>'.__('This tour of the Google Maps page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso').'</p>';
 		return $content;
 	}
 
 	protected function _use_google_maps_stop() {
-		return '<p>' . __('Turn Google maps on or off site wide for Event Espresso.', 'event_espresso') . '</p>';
+		return '<p>'.__('Turn Google maps on or off site wide for Event Espresso.', 'event_espresso').'</p>';
 	}
 
 	protected function _reg_page_map_settings_stop() {
-		return '<p>' . __('These settings affect the single registration page maps only.', 'event_espresso') . '</p>';
+		return '<p>'.__('These settings affect the single registration page maps only.', 'event_espresso').'</p>';
 	}
 
 	protected function _event_list_map_stop() {
-		return '<p>' . __('These setting affect the event list page maps.', 'event_espresso') . '</p>';
+		return '<p>'.__('These setting affect the event list page maps.', 'event_espresso').'</p>';
 	}
 
 }
\ No newline at end of file

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *