eventespresso / event-espresso-core

admin_pages/about/templates/whats_new.template.php

Spacing +9 added lines, -9 removed lines

@@ -1,25 +1,25 @@
 <div class="changelog point-releases">
-	<h3><?php echo _n( 'Minor Release Information', 'Minor Releases', 1 ); ?></h3>
-	<!-- <h3><?php echo _n( 'Major Release Information', 'Major Releases', 1 ); ?></h3>-->
+	<h3><?php echo _n('Minor Release Information', 'Minor Releases', 1); ?></h3>
+	<!-- <h3><?php echo _n('Major Release Information', 'Major Releases', 1); ?></h3>-->
 	<?php $type = 'minor'; ?>
 	<?php //$type = 'major'; ?>
-	<p><?php printf( __( '<strong>Version %1$s</strong> is a %2$s bug fix/enhancement release.', 'event_espresso'), EVENT_ESPRESSO_VERSION, $type ); ?>
+	<p><?php printf(__('<strong>Version %1$s</strong> is a %2$s bug fix/enhancement release.', 'event_espresso'), EVENT_ESPRESSO_VERSION, $type); ?>
 		<?php
-			$ver = explode( '.', EVENT_ESPRESSO_VERSION );
-			array_pop( $ver );
-			$ver = implode( '.', $ver );
+			$ver = explode('.', EVENT_ESPRESSO_VERSION);
+			array_pop($ver);
+			$ver = implode('.', $ver);
 		?>
-		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'http://eventespresso.com/wiki/ee4-changelog/#' . $ver ); ?>
+		<?php printf(__('For more information, see <a href="%s">the release notes</a>.'), 'http://eventespresso.com/wiki/ee4-changelog/#'.$ver); ?>
  	</p>
 </div>
 
 <div class="changelog">
 	<?php
 	//maintenance mode on?
-	if ( EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance ) {
+	if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
 		?>
 		<div class="ee-attention">
-			<h2 class="ee-maintenance-mode-callout"><?php  _e('Event Espresso is in full maintenance mode.' , 'event_espresso'); ?></h2>
+			<h2 class="ee-maintenance-mode-callout"><?php  _e('Event Espresso is in full maintenance mode.', 'event_espresso'); ?></h2>
 			<p>
 			<?php
 				printf(

admin_pages/events/Events_Admin_List_Table.class.php

Braces +8 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
@@ -150,8 +151,9 @@ 
 	 */
 	protected function _column_name_action_setup( EE_Event $item ) {
 		//todo: remove when attendees is active
-		if ( !defined('REG_ADMIN_URL') )
-			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
+		if ( !defined('REG_ADMIN_URL') ) {
+					define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
+		}
 
 		$actions = array();
 
@@ -293,8 +295,9 @@ 
 
 	public function column_actions($item) {
 		//todo: remove when attendees is active
-		if ( !defined('REG_ADMIN_URL') )
-			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
+		if ( !defined('REG_ADMIN_URL') ) {
+					define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
+		}
 		$actionlinks = array();
 
 		$view_link = get_permalink($item->ID());

Doc Comments +1 added lines, -1 removed lines

@@ -503,7 +503,7 @@
 	/**
 	 * @param $message_types
 	 * @param array $extra
-	 * @return mixed|string
+	 * @return string
 	 */
 	protected function _get_admin_content_events_edit( $message_types, $extra ) {
 		//defaults

Spacing +79 added lines, -79 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -43,9 +43,9 @@ 
 	 *
 	 * @param EE_Admin_Page $admin_page
 	 */
-	public function __construct( $admin_page ) {
+	public function __construct($admin_page) {
 		parent::__construct($admin_page);
-		require_once( EE_HELPERS . 'EEH_DTT_Helper.helper.php' );
+		require_once(EE_HELPERS.'EEH_DTT_Helper.helper.php');
 	}
 
 
@@ -54,7 +54,7 @@ 
 	 */
 	protected function _setup_data() {
 		$this->_data = $this->_admin_page->get_events($this->_per_page, $this->_current_page);
- 		$this->_all_data_count = $this->_admin_page->get_events(0,0, TRUE);
+ 		$this->_all_data_count = $this->_admin_page->get_events(0, 0, TRUE);
 	}
 
 
@@ -85,17 +85,17 @@ 
 
 
 		$this->_sortable_columns = array(
-			'id' => array( 'EVT_ID' => true ),
-			'name' => array( 'EVT_name' => false ),
-			'author' => array( 'EVT_wp_user' => false ),
-			'venue' => array( 'Venue.VNU_name' => false ),
+			'id' => array('EVT_ID' => true),
+			'name' => array('EVT_name' => false),
+			'author' => array('EVT_wp_user' => false),
+			'venue' => array('Venue.VNU_name' => false),
 			'start_date_time' => array('Datetime.DTT_EVT_start' => false),
 			'reg_begins' => array('Datetime.Ticket.TKT_start_date' => false),
 			);
 
 		$this->_primary_column = 'id';
 
-		$this->_hidden_columns = array( 'author' );
+		$this->_hidden_columns = array('author');
 	}
 
 
@@ -113,7 +113,7 @@ 
 	protected function _add_view_counts() {
 		$this->_views['all']['count'] = $this->_admin_page->total_events();
 		$this->_views['draft']['count'] = $this->_admin_page->total_events_draft();
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_events', 'espresso_events_trash_events' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_events', 'espresso_events_trash_events')) {
 			$this->_views['trash']['count'] = $this->_admin_page->total_trashed_events();
 		}
 	}
@@ -124,11 +124,11 @@ 
 	 *
 	 * @return string
 	 */
-	protected function _get_row_class( $item ) {
-		$class = parent::_get_row_class( $item );
+	protected function _get_row_class($item) {
+		$class = parent::_get_row_class($item);
 		//add status class
-		$class .= $item instanceof EE_Event ? ' ee-status-strip event-status-' . $item->get_active_status() : '';
-		if ( $this->_has_checkbox_column ) {
+		$class .= $item instanceof EE_Event ? ' ee-status-strip event-status-'.$item->get_active_status() : '';
+		if ($this->_has_checkbox_column) {
 			$class .= ' has-checkbox-column';
 		}
 		return $class;
@@ -140,8 +140,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function column_status( EE_Event $item ) {
-		return '<span class="ee-status-strip ee-status-strip-td event-status-' . $item->get_active_status() . '"></span>';
+	public function column_status(EE_Event $item) {
+		return '<span class="ee-status-strip ee-status-strip-td event-status-'.$item->get_active_status().'"></span>';
 	}/**/
 
 
@@ -150,14 +150,14 @@ 
 	 *
 	 * @return string
 	 */
-	public function column_cb( $item ) {
-		if ( ! $item instanceof EE_Event ) {
+	public function column_cb($item) {
+		if ( ! $item instanceof EE_Event) {
 			return '';
 		}
 		$this->_dtt = $item->primary_datetime(); //set this for use in other columns
 
 		//does event have any attached registrations?
-		$regs = $item->count_related( 'Registration' );
+		$regs = $item->count_related('Registration');
 		return $regs > 0 && $this->_view == 'trash' ? '<span class="ee-lock-icon"></span>' : sprintf(
 			'<input type="checkbox" name="EVT_IDs[]" value="%s" />', $item->ID()
 		);
@@ -169,9 +169,9 @@ 
 	 *
 	 * @return mixed|string
 	 */
-	public function column_id( EE_Event $item ) {
+	public function column_id(EE_Event $item) {
 		$content = $item->ID();
-		$content .= '  <span class="show-on-mobile-view-only">' . $item->name() . '</span>';
+		$content .= '  <span class="show-on-mobile-view-only">'.$item->name().'</span>';
 		return $content;
 	}
 
@@ -181,16 +181,16 @@ 
 	 *
 	 * @return string
 	 */
-	public function column_name( EE_Event $item ) {
+	public function column_name(EE_Event $item) {
 		$edit_query_args = array(
 				'action' => 'edit',
 				'post' => $item->ID()
 			);
-		$edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EVENTS_ADMIN_URL );
-		$actions = $this->_column_name_action_setup( $item );
+		$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL);
+		$actions = $this->_column_name_action_setup($item);
 		$status = ''; //$item->status() !== 'publish' ? ' (' . $item->status() . ')' : '';
-		$content = '<strong><a class="row-title" href="' . $edit_link . '">' . $item->name() . '</a></strong>' . $status;
-		$content .= '<br><span class="ee-status-text-small">' . EEH_Template::pretty_status( $item->get_active_status(), false, 'sentence' ) . '</span>';
+		$content = '<strong><a class="row-title" href="'.$edit_link.'">'.$item->name().'</a></strong>'.$status;
+		$content .= '<br><span class="ee-status-text-small">'.EEH_Template::pretty_status($item->get_active_status(), false, 'sentence').'</span>';
 		$content .= $this->row_actions($actions);
 		return $content;
 
@@ -207,72 +207,72 @@ 
 	 *
 	 * @return array array of actions
 	 */
-	protected function _column_name_action_setup( EE_Event $item ) {
+	protected function _column_name_action_setup(EE_Event $item) {
 		//todo: remove when attendees is active
-		if ( !defined('REG_ADMIN_URL') )
+		if ( ! defined('REG_ADMIN_URL'))
 			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
 
 		$actions = array();
 
-		if ( EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_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, EVENTS_ADMIN_URL );
-			$actions['edit'] = '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Event', 'event_espresso') . '">' . __('Edit', 'event_espresso') . '</a>';
+			$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL);
+			$actions['edit'] = '<a href="'.$edit_link.'" title="'.esc_attr__('Edit Event', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>';
 
 		}
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID())) {
 			$attendees_query_args = array(
 					'action' => 'default',
 					'event_id' => $item->ID()
 				);
-			$attendees_link = EE_Admin_Page::add_query_args_and_nonce( $attendees_query_args, REG_ADMIN_URL );
-			$actions['attendees'] = '<a href="' . $attendees_link . '" title="' . esc_attr__('View Registrations', 'event_espresso') . '">' . __('Registrations', 'event_espresso') . '</a>';
+			$attendees_link = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL);
+			$actions['attendees'] = '<a href="'.$attendees_link.'" title="'.esc_attr__('View Registrations', 'event_espresso').'">'.__('Registrations', 'event_espresso').'</a>';
 		}
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_trash_event', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_trash_event', $item->ID())) {
 			$trash_event_query_args = array(
 					'action' => 'trash_event',
 					'EVT_ID' => $item->ID()
 				);
-			$trash_event_link = EE_Admin_Page::add_query_args_and_nonce( $trash_event_query_args, EVENTS_ADMIN_URL );
+			$trash_event_link = EE_Admin_Page::add_query_args_and_nonce($trash_event_query_args, EVENTS_ADMIN_URL);
 		}
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_restore_event', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_restore_event', $item->ID())) {
 			$restore_event_query_args = array(
 					'action' => 'restore_event',
 					'EVT_ID' => $item->ID()
 				);
-			$restore_event_link = EE_Admin_Page::add_query_args_and_nonce( $restore_event_query_args, EVENTS_ADMIN_URL );
+			$restore_event_link = EE_Admin_Page::add_query_args_and_nonce($restore_event_query_args, EVENTS_ADMIN_URL);
 		}
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_delete_event', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_delete_event', $item->ID())) {
 			$delete_event_query_args = array(
 					'action' => 'delete_event',
 					'EVT_ID' => $item->ID()
 				);
-			$delete_event_link = EE_Admin_Page::add_query_args_and_nonce( $delete_event_query_args, EVENTS_ADMIN_URL );
+			$delete_event_link = EE_Admin_Page::add_query_args_and_nonce($delete_event_query_args, EVENTS_ADMIN_URL);
 		}
 
 		$view_link = get_permalink($item->ID());
 
-		$actions['view'] = '<a href="' . $view_link . '" title="' . esc_attr__('View Event', 'event_espresso') . '">' . __('View', 'event_espresso') . '</a>';
+		$actions['view'] = '<a href="'.$view_link.'" title="'.esc_attr__('View Event', 'event_espresso').'">'.__('View', 'event_espresso').'</a>';
 
-		switch ( $item->get( 'status' ) ) {
+		switch ($item->get('status')) {
 			case 'trash' :
-					if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_restore_event', $item->ID() ) ) {
-						$actions['restore_from_trash'] = '<a href="' . $restore_event_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_event', 'espresso_events_restore_event', $item->ID())) {
+						$actions['restore_from_trash'] = '<a href="'.$restore_event_link.'" title="'.esc_attr__('Restore from Trash', 'event_espresso').'">'.__('Restore from Trash', 'event_espresso').'</a>';
 					}
-					if ( $item->count_related('Registration') === 0 && EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_delete_event', $item->ID() ) ) {
-						$actions['delete'] = '<a href="' . $delete_event_link . '" title="' . esc_attr__('Delete Permanently', 'event_espresso') . '">' . __('Delete Permanently', 'event_espresso') . '</a>';
+					if ($item->count_related('Registration') === 0 && EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_delete_event', $item->ID())) {
+						$actions['delete'] = '<a href="'.$delete_event_link.'" title="'.esc_attr__('Delete Permanently', 'event_espresso').'">'.__('Delete Permanently', 'event_espresso').'</a>';
 					}
 				break;
 			default :
-					if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_trash_event', $item->ID() ) ) {
-						$actions['move to trash'] = '<a href="' . $trash_event_link . '" title="' . esc_attr__('Trash Event', 'event_espresso') . '">' . __('Trash', 'event_espresso') . '</a>';
+					if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_trash_event', $item->ID())) {
+						$actions['move to trash'] = '<a href="'.$trash_event_link.'" title="'.esc_attr__('Trash Event', 'event_espresso').'">'.__('Trash', 'event_espresso').'</a>';
 					}
 		}
 		return $actions;
@@ -284,17 +284,17 @@ 
 	 *
 	 * @return string
 	 */
-	public function column_author( EE_Event $item ) {
+	public function column_author(EE_Event $item) {
 		//user author info
-		$event_author = get_userdata( $item->wp_user() );
-		$gravatar = get_avatar( $item->wp_user(), '15' );
+		$event_author = get_userdata($item->wp_user());
+		$gravatar = get_avatar($item->wp_user(), '15');
 		//filter link
 		$query_args = array(
 			'action' => 'default',
 			'EVT_wp_user' => $item->wp_user()
 			);
-		$filter_url = EE_Admin_Page::add_query_args_and_nonce( $query_args, EVENTS_ADMIN_URL );
-		return $gravatar . '  <a href="' . $filter_url . '" title="' . esc_attr__('Click to filter events by this author.', 'event_espresso') . '">' . $event_author->display_name . '</a>';
+		$filter_url = EE_Admin_Page::add_query_args_and_nonce($query_args, EVENTS_ADMIN_URL);
+		return $gravatar.'  <a href="'.$filter_url.'" title="'.esc_attr__('Click to filter events by this author.', 'event_espresso').'">'.$event_author->display_name.'</a>';
 	}
 
 
@@ -303,9 +303,9 @@ 
 	 *
 	 * @return string
 	 */
-	public function column_venue( EE_Event $item ) {
-		$venue = $item->get_first_related( 'Venue' );
-		return !empty( $venue ) ? $venue->name() : '';
+	public function column_venue(EE_Event $item) {
+		$venue = $item->get_first_related('Venue');
+		return ! empty($venue) ? $venue->name() : '';
 	}
 
 
@@ -314,10 +314,10 @@ 
 	 *
 	 * @throws EE_Error
 	 */
-	public function column_start_date_time( EE_Event $item ) {
-		echo !empty( $this->_dtt ) ?  $this->_dtt->get_i18n_datetime('DTT_EVT_start') : __('No Date was saved for this Event', 'event_espresso');
+	public function column_start_date_time(EE_Event $item) {
+		echo ! empty($this->_dtt) ? $this->_dtt->get_i18n_datetime('DTT_EVT_start') : __('No Date was saved for this Event', 'event_espresso');
 		//display in user's timezone?
-		echo !empty( $this->_dtt ) ? $this->_dtt->display_in_my_timezone('DTT_EVT_start', 'get_i18n_datetime', '', 'My Timezone: ' ) : '';
+		echo ! empty($this->_dtt) ? $this->_dtt->display_in_my_timezone('DTT_EVT_start', 'get_i18n_datetime', '', 'My Timezone: ') : '';
 
 	}
 
@@ -327,11 +327,11 @@ 
 	 *
 	 * @throws EE_Error
 	 */
-	public function column_reg_begins( EE_Event $item ) {
+	public function column_reg_begins(EE_Event $item) {
 		$reg_start = $item->get_ticket_with_earliest_start_time();
-		echo !empty( $reg_start ) ? $reg_start->get_i18n_datetime('TKT_start_date') : __('No Tickets have been setup for this Event', 'event_espresso');
+		echo ! empty($reg_start) ? $reg_start->get_i18n_datetime('TKT_start_date') : __('No Tickets have been setup for this Event', 'event_espresso');
 		//display in user's timezone?
-		echo !empty( $reg_start ) ? $reg_start->display_in_my_timezone('TKT_start_date', 'get_i18n_datetime', '', 'My Timezone: ' ) : '';/**/
+		echo ! empty($reg_start) ? $reg_start->display_in_my_timezone('TKT_start_date', 'get_i18n_datetime', '', 'My Timezone: ') : ''; /**/
 	}
 
 
@@ -340,14 +340,14 @@ 
 	 *
 	 * @return int|string
 	 */
-	public function column_attendees( EE_Event $item ) {
+	public function column_attendees(EE_Event $item) {
 		$attendees_query_args = array(
 				'action' => 'default',
 				'event_id' => $item->ID()
 			);
-		$attendees_link = EE_Admin_Page::add_query_args_and_nonce( $attendees_query_args, REG_ADMIN_URL );
-		$registered_attendees = EEM_Registration::instance()->get_event_registration_count( $item->ID() );
-		return  EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $item->ID() ) ? '<a href="' . $attendees_link . '">' . $registered_attendees . '</a>' : $registered_attendees;
+		$attendees_link = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL);
+		$registered_attendees = EEM_Registration::instance()->get_event_registration_count($item->ID());
+		return  EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID()) ? '<a href="'.$attendees_link.'">'.$registered_attendees.'</a>' : $registered_attendees;
 	}
 
 
@@ -356,8 +356,8 @@ 
 	 *
 	 * @return float
 	 */
-	public function column_tkts_sold( EE_Event $item ) {
-		return EEM_Ticket::instance()->sum(array( array('Datetime.EVT_ID' => $item->ID() )), 'TKT_sold' );
+	public function column_tkts_sold(EE_Event $item) {
+		return EEM_Ticket::instance()->sum(array(array('Datetime.EVT_ID' => $item->ID())), 'TKT_sold');
 	}
 
 
@@ -366,38 +366,38 @@ 
 	 *
 	 * @return string
 	 */
-	public function column_actions( EE_Event $item ) {
+	public function column_actions(EE_Event $item) {
 		//todo: remove when attendees is active
-		if ( !defined('REG_ADMIN_URL') )
+		if ( ! defined('REG_ADMIN_URL'))
 			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
 		$actionlinks = array();
 
 		$view_link = get_permalink($item->ID());
 
-		$actionlinks[] = '<a href="' .  $view_link . '" title="' . esc_attr__('View Event', 'event_espresso') . '" target="_blank">';
+		$actionlinks[] = '<a href="'.$view_link.'" title="'.esc_attr__('View Event', 'event_espresso').'" target="_blank">';
 		$actionlinks[] = '<div class="dashicons dashicons-search"></div></a>';
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'espresso_events_edit', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_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, EVENTS_ADMIN_URL );
-			$actionlinks[] = '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Event', 'event_espresso') . '"><div class="ee-icon ee-icon-calendar-edit"></div></a>';
+			$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL);
+			$actionlinks[] = '<a href="'.$edit_link.'" title="'.esc_attr__('Edit Event', 'event_espresso').'"><div class="ee-icon ee-icon-calendar-edit"></div></a>';
 		}
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID())) {
 			$attendees_query_args = array(
 				'action' => 'default',
 				'event_id' => $item->ID()
 			);
-			$attendees_link = EE_Admin_Page::add_query_args_and_nonce( $attendees_query_args, REG_ADMIN_URL );
-			$actionlinks[] = '<a href="' . $attendees_link . '" title="' . esc_attr__('View Registrants', 'event_espresso') . '"><div class="dashicons dashicons-groups"></div></a>';
+			$attendees_link = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL);
+			$actionlinks[] = '<a href="'.$attendees_link.'" title="'.esc_attr__('View Registrants', 'event_espresso').'"><div class="dashicons dashicons-groups"></div></a>';
 		}
 
-		$actionlinks = apply_filters( 'FHEE__Events_Admin_List_Table__column_actions__action_links', $actionlinks, $item );
+		$actionlinks = apply_filters('FHEE__Events_Admin_List_Table__column_actions__action_links', $actionlinks, $item);
 
-		return $this->_action_string( implode( "\n\t", $actionlinks ), $item, 'div' );
+		return $this->_action_string(implode("\n\t", $actionlinks), $item, 'div');
 	}
 
 

admin_pages/events/Events_Admin_Page_Init.core.php

Spacing +8 added lines, -8 removed lines

@@ -33,13 +33,13 @@ 
 		 * define some events related constants but only if not defined (need to check because unit tests
 		 *  may load)
 		 */
-		if ( ! defined( 'EVENTS_PG_SLUG' ) ) {
-			define( 'EVENTS_PG_SLUG', 'espresso_events' );
-			define( 'EVENTS_LABEL', __('Events', 'event_espresso'));
-			define( 'EVENTS_ADMIN', EE_ADMIN_PAGES . 'events' . DS );
-			define( 'EVENTS_ADMIN_URL', admin_url( 'admin.php?page=' . EVENTS_PG_SLUG ));
-			define( 'EVENTS_TEMPLATE_PATH', EVENTS_ADMIN . 'templates' . DS );
-			define( 'EVENTS_ASSETS_URL', EE_ADMIN_PAGES_URL . 'events/assets/' );
+		if ( ! defined('EVENTS_PG_SLUG')) {
+			define('EVENTS_PG_SLUG', 'espresso_events');
+			define('EVENTS_LABEL', __('Events', 'event_espresso'));
+			define('EVENTS_ADMIN', EE_ADMIN_PAGES.'events'.DS);
+			define('EVENTS_ADMIN_URL', admin_url('admin.php?page='.EVENTS_PG_SLUG));
+			define('EVENTS_TEMPLATE_PATH', EVENTS_ADMIN.'templates'.DS);
+			define('EVENTS_ASSETS_URL', EE_ADMIN_PAGES_URL.'events/assets/');
 		}
 		parent::__construct();
 	}
@@ -49,7 +49,7 @@ 
 	}
 
 	protected function _set_menu_map() {
-		$this->_menu_map = new EE_Admin_Page_Main_Menu( array(
+		$this->_menu_map = new EE_Admin_Page_Main_Menu(array(
 			'menu_group' => 'main',
 			'menu_order' => 10,
 			'subtitle' => __('Events', 'event_espresso'),

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
  *

admin_pages/events/help_tabs/events_default_settings_status.help_tab.php

Spacing +6 added lines, -6 removed lines

@@ -1,13 +1,13 @@
 <h3><?php _e('Default Registration Status', 'event_espresso'); ?></h3>
 <p>
-<strong><?php echo EEH_Template::pretty_status( EEM_Registration::status_id_approved, FALSE, 'sentence' ); ?></strong><br />
-<?php printf( __('A status of %s means that a registration has been accepted as complete. The registration will count towards the registration limit, remaining tickets, and calculations for available seats. Payments (if necessary) can also be made by primary registrants with this status.', 'event_espresso'), EEH_Template::pretty_status( EEM_Registration::status_id_approved, FALSE, 'sentence' ) ); ?>
+<strong><?php echo EEH_Template::pretty_status(EEM_Registration::status_id_approved, FALSE, 'sentence'); ?></strong><br />
+<?php printf(__('A status of %s means that a registration has been accepted as complete. The registration will count towards the registration limit, remaining tickets, and calculations for available seats. Payments (if necessary) can also be made by primary registrants with this status.', 'event_espresso'), EEH_Template::pretty_status(EEM_Registration::status_id_approved, FALSE, 'sentence')); ?>
 </p>
 <p>
-<strong><?php echo EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, FALSE, 'sentence' ); ?></strong><br />
-<?php printf( __('A status of %1$s means that a registration has not paid but they ARE able to make payments (if necessary).  %2$s registrations do NOT count towards registration limits, remaining tickets, and calculations for available seats.  If registration for a free event occurs, then registrations are automatically set to %3$s. For paid tickets, %1$s registrations are set to %3$s when full payment is recorded.', 'event_espresso'), EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, FALSE, 'sentence' ), EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, FALSE, 'sentence'), EEH_Template::pretty_status( EEM_Registration::status_id_approved, FALSE, 'sentence' ) ); ?>
+<strong><?php echo EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, FALSE, 'sentence'); ?></strong><br />
+<?php printf(__('A status of %1$s means that a registration has not paid but they ARE able to make payments (if necessary).  %2$s registrations do NOT count towards registration limits, remaining tickets, and calculations for available seats.  If registration for a free event occurs, then registrations are automatically set to %3$s. For paid tickets, %1$s registrations are set to %3$s when full payment is recorded.', 'event_espresso'), EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, FALSE, 'sentence'), EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, FALSE, 'sentence'), EEH_Template::pretty_status(EEM_Registration::status_id_approved, FALSE, 'sentence')); ?>
 </p>
 <p>
-<strong><?php echo EEH_Template::pretty_status( EEM_Registration::status_id_not_approved, FALSE, 'sentence' ); ?></strong><br />
-<?php printf( __('A status of %1$s means that a registration has not paid and they cannot make payments for towards an event.  Un-approved registrations do NOT count towards registration limits, remaining tickets, and calculations for available seats.  This setting differs from the "%2$s" default in that free ticket registrations and paid in full ticket registrations do NOT automatically switch the Registration to %3$s.  Instead, the event admin must manually set the registration to either "%2$s" for registrations requiring payments, or "%3$s" for free events.', 'event_espresso'), EEH_Template::pretty_status( EEM_Registration::status_id_not_approved, FALSE, 'sentence' ), EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, FALSE, 'upper' ), EEH_Template::pretty_status( EEM_Registration::status_id_approved, FALSE, 'upper' ) ); ?>
+<strong><?php echo EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, FALSE, 'sentence'); ?></strong><br />
+<?php printf(__('A status of %1$s means that a registration has not paid and they cannot make payments for towards an event.  Un-approved registrations do NOT count towards registration limits, remaining tickets, and calculations for available seats.  This setting differs from the "%2$s" default in that free ticket registrations and paid in full ticket registrations do NOT automatically switch the Registration to %3$s.  Instead, the event admin must manually set the registration to either "%2$s" for registrations requiring payments, or "%3$s" for free events.', 'event_espresso'), EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, FALSE, 'sentence'), EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, FALSE, 'upper'), EEH_Template::pretty_status(EEM_Registration::status_id_approved, FALSE, 'upper')); ?>
 </p>
\ No newline at end of file

admin_pages/events/help_tabs/general_settings_templates.help_tab.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 </li>
 <li>
 <strong><?php _e('Display Descriptions', 'event_espresso'); ?></strong><br />
-<?php printf( __('Whether descriptions should be shown on the event list page.%sSelecting "none" will NOT display any of the text content you entered into the main text editor on the event admin page.%sSelecting "excerpt" will display the text you entered into the "Excerpt" textarea on the event admin page, OR, any text in the main text editor above the "' . htmlentities( '<!--more-->' ) . '" tag.%sSelecting "full description" will display ALL of the text content you entered into the main text editor on the event admin page.', 'event_espresso'), '<br/>', '<br/>', '<br/>' );?>
+<?php printf(__('Whether descriptions should be shown on the event list page.%sSelecting "none" will NOT display any of the text content you entered into the main text editor on the event admin page.%sSelecting "excerpt" will display the text you entered into the "Excerpt" textarea on the event admin page, OR, any text in the main text editor above the "'.htmlentities('<!--more-->').'" tag.%sSelecting "full description" will display ALL of the text content you entered into the main text editor on the event admin page.', 'event_espresso'), '<br/>', '<br/>', '<br/>'); ?>
 </li>
 <li>
 <strong><?php _e('Display Ticket Selector', 'event_espresso'); ?></strong><br />

admin_pages/events/help_tours/Event_Add_Category_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');
 
 /**
@@ -72,21 +72,21 @@ 
 
 
 	protected function _stop_one() {
-		$content = '<h3>' . __('Add New Event Category', 'event_espresso') . '</h3>';
-		$content .= '<p>' . __('This tour of the Add New Event Category page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>';
+		$content = '<h3>'.__('Add New Event Category', 'event_espresso').'</h3>';
+		$content .= '<p>'.__('This tour of the Add New Event Category 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 _stop_two() {
-		return '<p>' . __('Enter a name for your new category.', 'event_espresso') . '</p>';
+		return '<p>'.__('Enter a name for your new category.', 'event_espresso').'</p>';
 	}
 
 	protected function _stop_three() {
-		return '<p>' . __('Enter a unique ID for your new category.', 'event_espresso') . '</p>';
+		return '<p>'.__('Enter a unique ID for your new category.', 'event_espresso').'</p>';
 	}
 
 	protected function _stop_four() {
-		return '<p>' . __('The rich text editor can be used to add information about your category. Images and links can also be added along with your text.', 'event_espresso') . '</p>';
+		return '<p>'.__('The rich text editor can be used to add information about your category. Images and links can also be added along with your text.', 'event_espresso').'</p>';
 	}
 
 }
\ No newline at end of file

Indentation +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
 				'options' => array(
 					'tipLocation' => 'right',
 					'tipAdjustmentY' => -55,
-                    'tipAdjustmentX' => 5
+					'tipAdjustmentX' => 5
 					)
 				),
 			40 => array(
@@ -63,7 +63,7 @@ 
 				'options' => array(
 					'tipLocation' => 'top',
 					'tipAdjustmentY' => -75,
-                    'tipAdjustmentX' => 250
+					'tipAdjustmentX' => 250
 					)
 				)
 			);

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');
+}
 
 /**
  *

admin_pages/events/help_tours/Event_Categories_Help_Tour.class.php

Indentation +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 		$this->_slug = 'event-categories-joyride';
 	}
     
-    protected function _set_tour_stops() {
+	protected function _set_tour_stops() {
 		$this->_stops = array(
 			10 => array(
 				'content' => $this->_start(),

Spacing +10 added lines, -10 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -107,36 +107,36 @@ 
 
 
 	protected function _start() {
-		$content = '<h3>' . __('Event Categories', 'event_espresso') . '</h3>';
-		$content .= '<p>' . __('This tour of the Event Categories page will provide an overview of the different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>';
+		$content = '<h3>'.__('Event Categories', 'event_espresso').'</h3>';
+		$content .= '<p>'.__('This tour of the Event Categories page will provide an overview of the different areas of the screen to help you understand what they are used for.', 'event_espresso').'</p>';
 		return $content;
 	}
 	
 	protected function _id_stop() {
-		return '<p>' . __('View the event category ID. Can be sorted by ascending or descending order.', 'event_espresso') . '</p>';
+		return '<p>'.__('View the event category ID. Can be sorted by ascending or descending order.', 'event_espresso').'</p>';
 	}
 	
 	protected function _name_stop() {
-		return '<p>' . __('View the name of each event category. Can be sorted by ascending or descending order.', 'event_espresso') . '</p>';
+		return '<p>'.__('View the name of each event category. Can be sorted by ascending or descending order.', 'event_espresso').'</p>';
 	}
 
 	protected function _shortcode_stop() {
-		return '<p>' . __('View the shortcode for an event. This shortcode can be added to a WordPress post or WordPress page. ', 'event_espresso') . '</p>';
+		return '<p>'.__('View the shortcode for an event. This shortcode can be added to a WordPress post or WordPress page. ', 'event_espresso').'</p>';
 	}
 
 	protected function _count_stop() {
-		return '<p>' . __('View the number of events that are associated with an event category.', 'event_espresso') . '</p>';
+		return '<p>'.__('View the number of events that are associated with an event category.', 'event_espresso').'</p>';
 	}
 
 	protected function _bulk_actions_stop() {
-		return '<p>' . __('Perform bulk actions to multiple event categories.', 'event_espresso') . '</p>';
+		return '<p>'.__('Perform bulk actions to multiple event categories.', 'event_espresso').'</p>';
 	}
 
 	protected function _search_stop() {
-		return '<p>' . __('Search through event categories. The following sources will be searched: Event Category Name, Event Category Description.', 'event_espresso') . '</p>';
+		return '<p>'.__('Search through event categories. The following sources will be searched: Event Category Name, Event Category Description.', 'event_espresso').'</p>';
 	}
 	
 	protected function _new_category_stop() {
-		return '<p>' . __('Click here to add a new event category.', 'event_espresso') . '</p>';
+		return '<p>'.__('Click here to add a new event category.', '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');
+}
 
 /**
  *

admin_pages/events/help_tours/Event_Default_Settings_Help_Tour.class.php

Indentation +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 		return $content;
 	}
 
-    //Options below are showing in full caps. Manually adding statuses and leaving code as is.
+	//Options below are showing in full caps. Manually adding statuses and leaving code as is.
 	protected function _stop_two() {
 		return '<p>' . sprintf( __('Specify whether the default registration status be set to Approved, Not Approved, or Pending Payment.', 'event_espresso'), EEH_Template::pretty_status( EEM_Registration::status_id_not_approved, 'lowercase' ), EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, 'lowercase' ), EEH_Template::pretty_status( EEM_Registration::status_id_approved, 'lowercase' ) ) . '</p>';
 	}

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -54,14 +54,14 @@ 
 
 
 	protected function _stop_one() {
-		$content = '<h3>' . __('Event Default Settings', 'event_espresso') . '</h3>';
-		$content .= '<p>' . __('This tour of the Default Settings page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>';
+		$content = '<h3>'.__('Event Default Settings', 'event_espresso').'</h3>';
+		$content .= '<p>'.__('This tour of the Default Settings page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso').'</p>';
 		return $content;
 	}
 
     //Options below are showing in full caps. Manually adding statuses and leaving code as is.
 	protected function _stop_two() {
-		return '<p>' . sprintf( __('Specify whether the default registration status be set to Approved, Not Approved, or Pending Payment.', 'event_espresso'), EEH_Template::pretty_status( EEM_Registration::status_id_not_approved, 'lowercase' ), EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, 'lowercase' ), EEH_Template::pretty_status( EEM_Registration::status_id_approved, 'lowercase' ) ) . '</p>';
+		return '<p>'.sprintf(__('Specify whether the default registration status be set to Approved, Not Approved, or Pending Payment.', 'event_espresso'), EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, 'lowercase'), EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, 'lowercase'), EEH_Template::pretty_status(EEM_Registration::status_id_approved, 'lowercase')).'</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');
+}
 
 /**
  *

admin_pages/events/help_tours/Event_Edit_Category_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');
 
 /**
@@ -72,21 +72,21 @@ 
 
 
 	protected function _stop_one() {
-		$content = '<h3>' . __('Edit Event Category', 'event_espresso') . '</h3>';
-		$content .= '<p>' . __('This tour of the Edit Event Category page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>';
+		$content = '<h3>'.__('Edit Event Category', 'event_espresso').'</h3>';
+		$content .= '<p>'.__('This tour of the Edit Event Category 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 _stop_two() {
-		return '<p>' . __('Edit the name for your category.', 'event_espresso') . '</p>';
+		return '<p>'.__('Edit the name for your category.', 'event_espresso').'</p>';
 	}
 
 	protected function _stop_three() {
-		return '<p>' . __('The unique ID for your category cannot be changed.', 'event_espresso') . '</p>';
+		return '<p>'.__('The unique ID for your category cannot be changed.', 'event_espresso').'</p>';
 	}
 
 	protected function _stop_four() {
-		return '<p>' . __('The rich text editor can be used to edit information about your category. Images and links can also be added or removed along with your text.', 'event_espresso') . '</p>';
+		return '<p>'.__('The rich text editor can be used to edit information about your category. Images and links can also be added or removed along with your text.', 'event_espresso').'</p>';
 	}
 
 }
\ No newline at end of file

Indentation +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
 				'options' => array(
 					'tipLocation' => 'right',
 					'tipAdjustmentY' => -55,
-                    'tipAdjustmentX' => 5
+					'tipAdjustmentX' => 5
 					)
 				),
 			40 => array(
@@ -63,7 +63,7 @@ 
 				'options' => array(
 					'tipLocation' => 'top',
 					'tipAdjustmentY' => -75,
-                    'tipAdjustmentX' => 250
+					'tipAdjustmentX' => 250
 					)
 				)
 			);

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');
+}
 
 /**
  *