eventespresso / event-espresso-core

core/db_classes/EE_Event.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -1006,7 +1006,7 @@
 	 *
 	 * @access public
 	 * @param boolean $echo     whether to return (FALSE), or echo out the result (TRUE)
-	 * @return mixed void|string
+	 * @return string void|string
 	 */
 	public function pretty_active_status( $echo = TRUE ) {
 		$active_status = $this->get_active_status();

Braces +3 added lines, -6 removed lines

@@ -352,8 +352,7 @@ 
 		$short_desc = $this->get( 'EVT_short_desc' );
 		if ( !empty( $short_desc ) || $not_full_desc ) {
 			return $short_desc;
-		}
-		else {
+		} else {
 			$full_desc = $this->get( 'EVT_desc' );
 			return wp_trim_words( $full_desc, $num_words, $more );
 		}
@@ -965,8 +964,7 @@ 
 	public function is_sold_out( $actual = FALSE ) {
 		if ( ! $actual ) {
 			return $this->status() == EEM_Event::sold_out;
-		}
-		else {
+		} else {
 			return $this->perform_sold_out_status_check();
 		}
 	}
@@ -1158,8 +1156,7 @@ 
 	public function get_permalink() {
 		if ( $this->external_url() ) {
 			return $this->external_url();
-		}
-		else {
+		} else {
 			return parent::get_permalink();
 		}
 	}

Spacing +216 added lines, -216 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -35,9 +35,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Event
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -48,8 +48,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Event
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -61,13 +61,13 @@ 
 	 * @param mixed  $field_value
 	 * @param bool   $use_default
 	 */
-	public function set( $field_name, $field_value, $use_default = false ) {
-		switch ( $field_name ) {
+	public function set($field_name, $field_value, $use_default = false) {
+		switch ($field_name) {
 			case 'status' :
-				$this->set_status( $field_value, $use_default );
+				$this->set_status($field_value, $use_default);
 				break;
 			default :
-				parent::set( $field_name, $field_value, $use_default );
+				parent::set($field_name, $field_value, $use_default);
 		}
 	}
 
@@ -86,29 +86,29 @@ 
 	 * @return bool|void
 	 * @throws \EE_Error
 	 */
-	public function set_status( $new_status = null, $use_default = false ) {
+	public function set_status($new_status = null, $use_default = false) {
 		// get current Event status
 		$old_status = $this->status();
 		// if status has changed
-		if ( $old_status != $new_status ) {
+		if ($old_status != $new_status) {
 			// TO sold_out
-			if ( $new_status == EEM_Event::sold_out ) {
+			if ($new_status == EEM_Event::sold_out) {
 				// save the previous event status so that we can revert if the event is no longer sold out
-				$this->add_post_meta( '_previous_event_status', $old_status );
-				do_action( 'AHEE__EE_Event__set_status__to_sold_out', $this, $old_status, $new_status );
+				$this->add_post_meta('_previous_event_status', $old_status);
+				do_action('AHEE__EE_Event__set_status__to_sold_out', $this, $old_status, $new_status);
 				// OR FROM  sold_out
-			} else if ( $old_status == EEM_Event::sold_out ) {
-				$this->delete_post_meta( '_previous_event_status' );
-				do_action( 'AHEE__EE_Event__set_status__from_sold_out', $this, $old_status, $new_status );
+			} else if ($old_status == EEM_Event::sold_out) {
+				$this->delete_post_meta('_previous_event_status');
+				do_action('AHEE__EE_Event__set_status__from_sold_out', $this, $old_status, $new_status);
 			}
 			// update status
-			parent::set( 'status', $new_status, $use_default );
-			do_action( 'AHEE__EE_Event__set_status__after_update', $this );
+			parent::set('status', $new_status, $use_default);
+			do_action('AHEE__EE_Event__set_status__after_update', $this);
 			return true;
 		} else {
 			// even though the old value matches the new value, it's still good to
 			// allow the parent set method to have a say
-			parent::set( 'status', $new_status, $use_default );
+			parent::set('status', $new_status, $use_default);
 			return true;
 		}
 	}
@@ -121,8 +121,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Datetime[]
 	 */
-	public function datetimes( $query_params = array() ) {
-		return $this->get_many_related( 'Datetime', $query_params );
+	public function datetimes($query_params = array()) {
+		return $this->get_many_related('Datetime', $query_params);
 	}
 
 
@@ -133,7 +133,7 @@ 
 	 * @return EE_Datetime[]
 	 */
 	public function datetimes_in_chronological_order() {
-		return $this->get_many_related( 'Datetime', array( 'order_by' => array( 'DTT_EVT_start' => 'ASC' ) ) );
+		return $this->get_many_related('Datetime', array('order_by' => array('DTT_EVT_start' => 'ASC')));
 	}
 
 
@@ -149,8 +149,8 @@ 
 	 * @param null $limit
 	 * @return \EE_Datetime[]
 	 */
-	public function datetimes_ordered( $show_expired = true, $show_deleted = false, $limit = null ) {
-		return EEM_Datetime::instance( $this->_timezone )->get_datetimes_for_event_ordered_by_DTT_order( $this->ID(), $show_expired, $show_deleted, $limit );
+	public function datetimes_ordered($show_expired = true, $show_deleted = false, $limit = null) {
+		return EEM_Datetime::instance($this->_timezone)->get_datetimes_for_event_ordered_by_DTT_order($this->ID(), $show_expired, $show_deleted, $limit);
 	}
 
 
@@ -160,7 +160,7 @@ 
 	 * @return EE_Datetime
 	 */
 	public function first_datetime() {
-		return $this->get_first_related( 'Datetime' );
+		return $this->get_first_related('Datetime');
 	}
 
 
@@ -171,11 +171,11 @@ 
 	 * @param bool $try_to_exclude_deleted
 	 * @return EE_Datetime
 	 */
-	public function primary_datetime( $try_to_exclude_expired = TRUE, $try_to_exclude_deleted = TRUE ) {
-		if ( !empty ( $this->_Primary_Datetime ) ) {
+	public function primary_datetime($try_to_exclude_expired = TRUE, $try_to_exclude_deleted = TRUE) {
+		if ( ! empty ($this->_Primary_Datetime)) {
 			return $this->_Primary_Datetime;
 		}
-		$this->_Primary_Datetime = EEM_Datetime::instance( $this->_timezone )->get_primary_datetime_for_event( $this->ID(), $try_to_exclude_expired, $try_to_exclude_deleted );
+		$this->_Primary_Datetime = EEM_Datetime::instance($this->_timezone)->get_primary_datetime_for_event($this->ID(), $try_to_exclude_expired, $try_to_exclude_deleted);
 		return $this->_Primary_Datetime;
 	}
 
@@ -186,30 +186,30 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Ticket[]
 	 */
-	public function tickets( $query_params = array() ) {
+	public function tickets($query_params = array()) {
 		//first get all datetimes
 		$datetimes = $this->datetimes_ordered();
-		if ( ! $datetimes ) {
+		if ( ! $datetimes) {
 			return array();
 		}
 
 		$datetime_ids = array();
-		foreach ( $datetimes as $datetime ) {
+		foreach ($datetimes as $datetime) {
 			$datetime_ids[] = $datetime->ID();
 		}
 
-		$where_params = array( 'Datetime.DTT_ID' => array( 'IN', $datetime_ids ) );
+		$where_params = array('Datetime.DTT_ID' => array('IN', $datetime_ids));
 
 		//if incoming $query_params has where conditions let's merge but not override existing.
-		if ( is_array( $query_params ) && isset( $query_params[0]) ) {
-			$where_params = array_merge( $query_params[0], $where_params );
-			unset( $query_params[0] );
+		if (is_array($query_params) && isset($query_params[0])) {
+			$where_params = array_merge($query_params[0], $where_params);
+			unset($query_params[0]);
 		}
 
 		//now add $where_params to $query_params
 		$query_params[0] = $where_params;
 
-		return EEM_Ticket::instance()->get_all( $query_params );
+		return EEM_Ticket::instance()->get_all($query_params);
 	}
 
 
@@ -218,7 +218,7 @@ 
 	 * @return bool
 	 */
 	function additional_limit() {
-		return $this->get( 'EVT_additional_limit' );
+		return $this->get('EVT_additional_limit');
 	}
 
 
@@ -227,7 +227,7 @@ 
 	 * @return bool
 	 */
 	function allow_overflow() {
-		return $this->get( 'EVT_allow_overflow' );
+		return $this->get('EVT_allow_overflow');
 	}
 
 
@@ -236,7 +236,7 @@ 
 	 * @return bool
 	 */
 	function created() {
-		return $this->get( 'EVT_created' );
+		return $this->get('EVT_created');
 	}
 
 
@@ -245,7 +245,7 @@ 
 	 * @return bool
 	 */
 	function description() {
-		return $this->get( 'EVT_desc' );
+		return $this->get('EVT_desc');
 	}
 
 
@@ -255,7 +255,7 @@ 
 	 * @return string of html
 	 */
 	function description_filtered() {
-		return $this->get_pretty( 'EVT_desc' );
+		return $this->get_pretty('EVT_desc');
 	}
 
 
@@ -264,7 +264,7 @@ 
 	 * @return bool
 	 */
 	function display_description() {
-		return $this->get( 'EVT_display_desc' );
+		return $this->get('EVT_display_desc');
 	}
 
 
@@ -273,7 +273,7 @@ 
 	 * @return bool
 	 */
 	function display_ticket_selector() {
-		return (bool)$this->get( 'EVT_display_ticket_selector' );
+		return (bool) $this->get('EVT_display_ticket_selector');
 	}
 
 
@@ -282,7 +282,7 @@ 
 	 * @return bool
 	 */
 	function external_url() {
-		return $this->get( 'EVT_external_URL' );
+		return $this->get('EVT_external_URL');
 	}
 
 
@@ -291,7 +291,7 @@ 
 	 * @return bool
 	 */
 	function member_only() {
-		return $this->get( 'EVT_member_only' );
+		return $this->get('EVT_member_only');
 	}
 
 
@@ -300,7 +300,7 @@ 
 	 * @return bool
 	 */
 	function phone() {
-		return $this->get( 'EVT_phone' );
+		return $this->get('EVT_phone');
 	}
 
 
@@ -309,7 +309,7 @@ 
 	 * @return bool
 	 */
 	function modified() {
-		return $this->get( 'EVT_modified' );
+		return $this->get('EVT_modified');
 	}
 
 
@@ -318,7 +318,7 @@ 
 	 * @return bool
 	 */
 	function name() {
-		return $this->get( 'EVT_name' );
+		return $this->get('EVT_name');
 	}
 
 
@@ -327,7 +327,7 @@ 
 	 * @return bool
 	 */
 	function order() {
-		return $this->get( 'EVT_order' );
+		return $this->get('EVT_order');
 	}
 
 
@@ -336,8 +336,8 @@ 
 	 * @return bool|string
 	 */
 	function default_registration_status() {
-		$event_default_registration_status = $this->get( 'EVT_default_registration_status' );
-		return !empty( $event_default_registration_status ) ? $event_default_registration_status : EE_Registry::instance()->CFG->registration->default_STS_ID;
+		$event_default_registration_status = $this->get('EVT_default_registration_status');
+		return ! empty($event_default_registration_status) ? $event_default_registration_status : EE_Registry::instance()->CFG->registration->default_STS_ID;
 	}
 
 
@@ -348,14 +348,14 @@ 
 	 * @param bool $not_full_desc
 	 * @return bool|string
 	 */
-	function short_description( $num_words = 55, $more = NULL, $not_full_desc = FALSE ) {
-		$short_desc = $this->get( 'EVT_short_desc' );
-		if ( !empty( $short_desc ) || $not_full_desc ) {
+	function short_description($num_words = 55, $more = NULL, $not_full_desc = FALSE) {
+		$short_desc = $this->get('EVT_short_desc');
+		if ( ! empty($short_desc) || $not_full_desc) {
 			return $short_desc;
 		}
 		else {
-			$full_desc = $this->get( 'EVT_desc' );
-			return wp_trim_words( $full_desc, $num_words, $more );
+			$full_desc = $this->get('EVT_desc');
+			return wp_trim_words($full_desc, $num_words, $more);
 		}
 	}
 
@@ -365,7 +365,7 @@ 
 	 * @return bool
 	 */
 	function slug() {
-		return $this->get( 'EVT_slug' );
+		return $this->get('EVT_slug');
 	}
 
 
@@ -374,7 +374,7 @@ 
 	 * @return bool
 	 */
 	function timezone_string() {
-		return $this->get( 'EVT_timezone_string' );
+		return $this->get('EVT_timezone_string');
 	}
 
 
@@ -383,7 +383,7 @@ 
 	 * @return bool
 	 */
 	function visible_on() {
-		return $this->get( 'EVT_visible_on' );
+		return $this->get('EVT_visible_on');
 	}
 
 
@@ -392,7 +392,7 @@ 
 	 * @return int
 	 */
 	function wp_user() {
-		return $this->get( 'EVT_wp_user' );
+		return $this->get('EVT_wp_user');
 	}
 
 
@@ -401,7 +401,7 @@ 
 	 * @return bool
 	 */
 	function donations() {
-		return $this->get( 'EVT_donations' );
+		return $this->get('EVT_donations');
 	}
 
 
@@ -409,8 +409,8 @@ 
 	/**
 	 * @param $limit
 	 */
-	function set_additional_limit( $limit ) {
-		$this->set( 'EVT_additional_limit', $limit );
+	function set_additional_limit($limit) {
+		$this->set('EVT_additional_limit', $limit);
 	}
 
 
@@ -418,8 +418,8 @@ 
 	/**
 	 * @param $created
 	 */
-	function set_created( $created ) {
-		$this->set( 'EVT_created', $created );
+	function set_created($created) {
+		$this->set('EVT_created', $created);
 	}
 
 
@@ -427,8 +427,8 @@ 
 	/**
 	 * @param $desc
 	 */
-	function set_description( $desc ) {
-		$this->set( 'EVT_desc', $desc );
+	function set_description($desc) {
+		$this->set('EVT_desc', $desc);
 	}
 
 
@@ -436,8 +436,8 @@ 
 	/**
 	 * @param $display_desc
 	 */
-	function set_display_description( $display_desc ) {
-		$this->set( 'EVT_display_desc', $display_desc );
+	function set_display_description($display_desc) {
+		$this->set('EVT_display_desc', $display_desc);
 	}
 
 
@@ -445,8 +445,8 @@ 
 	/**
 	 * @param $display_ticket_selector
 	 */
-	function set_display_ticket_selector( $display_ticket_selector ) {
-		$this->set( 'EVT_display_ticket_selector', $display_ticket_selector );
+	function set_display_ticket_selector($display_ticket_selector) {
+		$this->set('EVT_display_ticket_selector', $display_ticket_selector);
 	}
 
 
@@ -454,8 +454,8 @@ 
 	/**
 	 * @param $external_url
 	 */
-	function set_external_url( $external_url ) {
-		$this->set( 'EVT_external_URL', $external_url );
+	function set_external_url($external_url) {
+		$this->set('EVT_external_URL', $external_url);
 	}
 
 
@@ -463,8 +463,8 @@ 
 	/**
 	 * @param $member_only
 	 */
-	function set_member_only( $member_only ) {
-		$this->set( 'EVT_member_only', $member_only );
+	function set_member_only($member_only) {
+		$this->set('EVT_member_only', $member_only);
 	}
 
 
@@ -472,8 +472,8 @@ 
 	/**
 	 * @param $event_phone
 	 */
-	function set_event_phone( $event_phone ) {
-		$this->set( 'EVT_phone', $event_phone );
+	function set_event_phone($event_phone) {
+		$this->set('EVT_phone', $event_phone);
 	}
 
 
@@ -481,8 +481,8 @@ 
 	/**
 	 * @param $modified
 	 */
-	function set_modified( $modified ) {
-		$this->set( 'EVT_modified', $modified );
+	function set_modified($modified) {
+		$this->set('EVT_modified', $modified);
 	}
 
 
@@ -490,8 +490,8 @@ 
 	/**
 	 * @param $name
 	 */
-	function set_name( $name ) {
-		$this->set( 'EVT_name', $name );
+	function set_name($name) {
+		$this->set('EVT_name', $name);
 	}
 
 
@@ -499,8 +499,8 @@ 
 	/**
 	 * @param $order
 	 */
-	function set_order( $order ) {
-		$this->set( 'EVT_order', $order );
+	function set_order($order) {
+		$this->set('EVT_order', $order);
 	}
 
 
@@ -508,8 +508,8 @@ 
 	/**
 	 * @param $short_desc
 	 */
-	function set_short_description( $short_desc ) {
-		$this->set( 'EVT_short_desc', $short_desc );
+	function set_short_description($short_desc) {
+		$this->set('EVT_short_desc', $short_desc);
 	}
 
 
@@ -517,8 +517,8 @@ 
 	/**
 	 * @param $slug
 	 */
-	function set_slug( $slug ) {
-		$this->set( 'EVT_slug', $slug );
+	function set_slug($slug) {
+		$this->set('EVT_slug', $slug);
 	}
 
 
@@ -526,8 +526,8 @@ 
 	/**
 	 * @param $timezone_string
 	 */
-	function set_timezone_string( $timezone_string ) {
-		$this->set( 'EVT_timezone_string', $timezone_string );
+	function set_timezone_string($timezone_string) {
+		$this->set('EVT_timezone_string', $timezone_string);
 	}
 
 
@@ -535,8 +535,8 @@ 
 	/**
 	 * @param $visible_on
 	 */
-	function set_visible_on( $visible_on ) {
-		$this->set( 'EVT_visible_on', $visible_on );
+	function set_visible_on($visible_on) {
+		$this->set('EVT_visible_on', $visible_on);
 	}
 
 
@@ -544,8 +544,8 @@ 
 	/**
 	 * @param $wp_user
 	 */
-	function set_wp_user( $wp_user ) {
-		$this->set( 'EVT_wp_user', $wp_user );
+	function set_wp_user($wp_user) {
+		$this->set('EVT_wp_user', $wp_user);
 	}
 
 
@@ -553,8 +553,8 @@ 
 	/**
 	 * @param $default_registration_status
 	 */
-	function set_default_registration_status( $default_registration_status ) {
-		$this->set( 'EVT_default_registration_status', $default_registration_status );
+	function set_default_registration_status($default_registration_status) {
+		$this->set('EVT_default_registration_status', $default_registration_status);
 	}
 
 
@@ -562,8 +562,8 @@ 
 	/**
 	 * @param $donations
 	 */
-	function set_donations( $donations ) {
-		$this->set( 'EVT_donations', $donations );
+	function set_donations($donations) {
+		$this->set('EVT_donations', $donations);
 	}
 
 
@@ -573,8 +573,8 @@ 
 	 * @param EE_Venue /int $venue_id_or_obj
 	 * @return EE_Venue
 	 */
-	function add_venue( $venue_id_or_obj ) {
-		return $this->_add_relation_to( $venue_id_or_obj, 'Venue' );
+	function add_venue($venue_id_or_obj) {
+		return $this->_add_relation_to($venue_id_or_obj, 'Venue');
 	}
 
 
@@ -584,8 +584,8 @@ 
 	 * @param EE_Venue /int $venue_id_or_obj
 	 * @return EE_Venue
 	 */
-	function remove_venue( $venue_id_or_obj ) {
-		return $this->_remove_relation_to( $venue_id_or_obj, 'Venue' );
+	function remove_venue($venue_id_or_obj) {
+		return $this->_remove_relation_to($venue_id_or_obj, 'Venue');
 	}
 
 
@@ -595,8 +595,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all's $query_params
 	 * @return EE_Venue[]
 	 */
-	function venues( $query_params = array() ) {
-		return $this->get_many_related( 'Venue', $query_params );
+	function venues($query_params = array()) {
+		return $this->get_many_related('Venue', $query_params);
 	}
 
 
@@ -608,7 +608,7 @@ 
 	 */
 	private function _has_ID_and_is_published() {
 		// first check if event id is present and not NULL, then check if this event is published (or any of the equivalent "published" statuses)
-		return ( $this->ID() && $this->ID() !== NULL && ( $this->status() == 'publish' || $this->status() == EEM_Event::sold_out || $this->status() == EEM_Event::postponed || $this->status() == EEM_Event::cancelled ) ) ? TRUE : FALSE;
+		return ($this->ID() && $this->ID() !== NULL && ($this->status() == 'publish' || $this->status() == EEM_Event::sold_out || $this->status() == EEM_Event::postponed || $this->status() == EEM_Event::cancelled)) ? TRUE : FALSE;
 	}
 
 
@@ -620,21 +620,21 @@ 
 	 */
 	public function is_upcoming() {
 		// check if event id is present and if this event is published
-		if ( $this->is_inactive() ) {
+		if ($this->is_inactive()) {
 			return FALSE;
 		}
 		// set initial value
 		$upcoming = FALSE;
 		//next let's get all datetimes and loop through them
 		$datetimes = $this->datetimes_in_chronological_order();
-		foreach ( $datetimes as $datetime ) {
-			if ( $datetime instanceof EE_Datetime ) {
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
 				//if this dtt is expired then we continue cause one of the other datetimes might be upcoming.
-				if ( $datetime->is_expired() ) {
+				if ($datetime->is_expired()) {
 					continue;
 				}
 				//if this dtt is active then we return false.
-				if ( $datetime->is_active() ) {
+				if ($datetime->is_active()) {
 					return FALSE;
 				}
 				//otherwise let's check upcoming status
@@ -651,21 +651,21 @@ 
 	 */
 	public function is_active() {
 		// check if event id is present and if this event is published
-		if ( $this->is_inactive() ) {
+		if ($this->is_inactive()) {
 			return FALSE;
 		}
 		// set initial value
 		$active = FALSE;
 		//next let's get all datetimes and loop through them
 		$datetimes = $this->datetimes_in_chronological_order();
-		foreach ( $datetimes as $datetime ) {
-			if ( $datetime instanceof EE_Datetime ) {
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
 				//if this dtt is expired then we continue cause one of the other datetimes might be active.
-				if ( $datetime->is_expired() ) {
+				if ($datetime->is_expired()) {
 					continue;
 				}
 				//if this dtt is upcoming then we return false.
-				if ( $datetime->is_upcoming() ) {
+				if ($datetime->is_upcoming()) {
 					return FALSE;
 				}
 				//otherwise let's check active status
@@ -682,17 +682,17 @@ 
 	 */
 	public function is_expired() {
 		// check if event id is present and if this event is published
-		if ( $this->is_inactive() ) {
+		if ($this->is_inactive()) {
 			return FALSE;
 		}
 		// set initial value
 		$expired = FALSE;
 		//first let's get all datetimes and loop through them
 		$datetimes = $this->datetimes_in_chronological_order();
-		foreach ( $datetimes as $datetime ) {
-			if ( $datetime instanceof EE_Datetime ) {
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
 				//if this dtt is upcoming or active then we return false.
-				if ( $datetime->is_upcoming() || $datetime->is_active() ) {
+				if ($datetime->is_upcoming() || $datetime->is_active()) {
 					return FALSE;
 				}
 				//otherwise let's check active status
@@ -709,7 +709,7 @@ 
 	 */
 	public function is_inactive() {
 		// check if event id is present and if this event is published
-		if ( $this->_has_ID_and_is_published() ) {
+		if ($this->_has_ID_and_is_published()) {
 			return FALSE;
 		}
 		return TRUE;
@@ -727,37 +727,37 @@ 
 	 */
 	public function perform_sold_out_status_check() {
 		// get all unexpired untrashed tickets
-		$tickets = $this->tickets( array(
+		$tickets = $this->tickets(array(
 			array(
-				'TKT_end_date'   => array( '>=', EEM_Ticket::instance()->current_time_for_query( 'TKT_end_date' ) ),
+				'TKT_end_date'   => array('>=', EEM_Ticket::instance()->current_time_for_query('TKT_end_date')),
 				'TKT_deleted'    => false
 			)
 		));
 		// if all the tickets are just expired, then don't update the event status to sold out
-		if ( empty( $tickets )) {
+		if (empty($tickets)) {
 			return true;
 		}
 		// set initial value
 		$spaces_remaining = 0;
-		foreach( $tickets as $ticket ) {
-			if ( $ticket instanceof EE_Ticket ) {
-				$spaces_remaining += $ticket->qty( 'saleable' );
+		foreach ($tickets as $ticket) {
+			if ($ticket instanceof EE_Ticket) {
+				$spaces_remaining += $ticket->qty('saleable');
 			}
 		}
-		if ( $spaces_remaining === 0 ) {
-			$this->set_status( EEM_Event::sold_out );
-			if ( !is_admin() || ( is_admin() && defined( 'DOING_AJAX' ) ) ) {
+		if ($spaces_remaining === 0) {
+			$this->set_status(EEM_Event::sold_out);
+			if ( ! is_admin() || (is_admin() && defined('DOING_AJAX'))) {
 				$this->save();
 			}
 			$sold_out = TRUE;
 		} else {
 			$sold_out = FALSE;
 			// was event previously marked as sold out ?
-			if ( $this->status() == EEM_Event::sold_out ) {
+			if ($this->status() == EEM_Event::sold_out) {
 				// revert status to previous value, if it was set
-				$previous_event_status = $this->get_post_meta( '_previous_event_status', true );
-				if ( $previous_event_status ) {
-					$this->set_status( $previous_event_status );
+				$previous_event_status = $this->get_post_meta('_previous_event_status', true);
+				if ($previous_event_status) {
+					$this->set_status($previous_event_status);
 				}
 			}
 		}
@@ -781,15 +781,15 @@ 
 	 */
 	public function spaces_remaining_for_sale() {
 		//first get total available spaces including consideration for tickets that have already sold.
-		$spaces_available = $this->total_available_spaces( true );
+		$spaces_available = $this->total_available_spaces(true);
 
 		//if total available = 0, then exit right away because that means everything is expired.
-		if ( $spaces_available === 0 ) {
+		if ($spaces_available === 0) {
 			return 0;
 		}
 
 		//subtract total approved registrations from spaces available to get how many are remaining.
-		$spots_taken = EEM_Registration::instance()->count( array( array( 'EVT_ID' => $this->ID(), 'STS_ID' => EEM_Registration::status_id_approved ) ), 'REG_ID', true );
+		$spots_taken = EEM_Registration::instance()->count(array(array('EVT_ID' => $this->ID(), 'STS_ID' => EEM_Registration::status_id_approved)), 'REG_ID', true);
 		$spaces_remaining = $spaces_available - $spots_taken;
 
 		return $spaces_remaining > 0 ? $spaces_remaining : 0;
@@ -822,29 +822,29 @@ 
 	 *
 	 * @return  int|float  (Note: if EE_INF is returned its considered a float by PHP)
 	 */
-	public function total_available_spaces( $current_total_available = false ) {
+	public function total_available_spaces($current_total_available = false) {
 		$spaces_available = 0;
 
 		//first get all tickets on the event and include expired tickets
-		$tickets = $this->tickets( array( 'default_where_conditions' => 'none' ) );
+		$tickets = $this->tickets(array('default_where_conditions' => 'none'));
 		$ticket_sums = array();
 		$datetime_limits = array();
 
 		//loop through tickets and normalize them
-		foreach ( $tickets as $ticket ) {
-			$datetimes = $ticket->datetimes( array( 'order_by' => array( 'DTT_reg_limit' => 'ASC' ) ) );
+		foreach ($tickets as $ticket) {
+			$datetimes = $ticket->datetimes(array('order_by' => array('DTT_reg_limit' => 'ASC')));
 
-			if ( empty( $datetimes ) ) {
+			if (empty($datetimes)) {
 				continue;
 			}
 
 			//first datetime should be the lowest datetime
-			$least_datetime = reset( $datetimes );
+			$least_datetime = reset($datetimes);
 
 			//lets reset the ticket quantity to be the lower of either the lowest datetime reg limit or the ticket quantity
 			//IF datetimes sold (and we're not doing current live total available, then use spaces remaining for datetime, not reg_limit.
-			if ( $current_total_available ) {
-				if ( $ticket->is_remaining() ) {
+			if ($current_total_available) {
+				if ($ticket->is_remaining()) {
 					$remaining = $ticket->remaining();
 				} else {
 					$spaces_available += $ticket->sold();
@@ -852,23 +852,23 @@ 
 					continue;
 				}
 			} else {
-				$remaining = min( $ticket->qty(), $least_datetime->reg_limit() );
+				$remaining = min($ticket->qty(), $least_datetime->reg_limit());
 			}
 
 			//if $ticket_limit == infinity then let's drop out right away and just return that because any infinity amount trumps all other "available" amounts.
-			if ( $remaining === EE_INF ) {
+			if ($remaining === EE_INF) {
 				return EE_INF;
 			}
 
 			//multiply normalized $tkt quantity by the number of datetimes on the ticket as the "sum"
 			//also include the sum of all the datetime reg limits on the ticket for breaking ties.
-			$ticket_sums[$ticket->ID()]['sum'] = $remaining * count( $datetimes );
+			$ticket_sums[$ticket->ID()]['sum'] = $remaining * count($datetimes);
 			$ticket_sums[$ticket->ID()]['datetime_sums'] = 0;
-			foreach ( $datetimes as $datetime ) {
-				if ( $datetime->reg_limit() === EE_INF ) {
+			foreach ($datetimes as $datetime) {
+				if ($datetime->reg_limit() === EE_INF) {
 					$ticket_sums[$ticket->ID()]['datetime_sums'] = EE_INF;
 				} else {
-					$ticket_sums[ $ticket->ID() ]['datetime_sums'] += $current_total_available ? $datetime->spaces_remaining() : $datetime->reg_limit();
+					$ticket_sums[$ticket->ID()]['datetime_sums'] += $current_total_available ? $datetime->spaces_remaining() : $datetime->reg_limit();
 				}
 				$datetime_limits[$datetime->ID()] = $current_total_available ? $datetime->spaces_remaining() : $datetime->reg_limit();
 			}
@@ -879,74 +879,74 @@ 
 		//ticket quantity by the number of datetimes on the ticket).  For tie-breakers, then the next sort is based on the
 		//ticket with the greatest sum of all remaining datetime->spaces_remaining() ( or $datetime->reg_limit() if not
 		//$current_total_available ) for the datetimes on the ticket.
-		usort( $ticket_sums, function( $a, $b ) {
-			if ( $a['sum'] == $b['sum'] ) {
-				if ( $a['datetime_sums'] == $b['datetime_sums'] ) {
+		usort($ticket_sums, function($a, $b) {
+			if ($a['sum'] == $b['sum']) {
+				if ($a['datetime_sums'] == $b['datetime_sums']) {
 					return 0;
 				}
 
 				return $a['datetime_sums'] < $b['datetime_sums'] ? 1 : -1;
 			}
-			return ( $a['sum'] < $b['sum'] ) ? -1 : 1;
+			return ($a['sum'] < $b['sum']) ? -1 : 1;
 		});
 
 		//now let's loop through the sorted tickets and simulate sellouts
-		foreach ( $ticket_sums as $ticket_info ) {
-			if ( $ticket_info['ticket'] instanceof EE_Ticket ) {
+		foreach ($ticket_sums as $ticket_info) {
+			if ($ticket_info['ticket'] instanceof EE_Ticket) {
 
-				$datetimes = $ticket_info['ticket']->datetimes( array( 'order_by' => array( 'DTT_reg_limit' => 'ASC' ) ) );
+				$datetimes = $ticket_info['ticket']->datetimes(array('order_by' => array('DTT_reg_limit' => 'ASC')));
 				//need to sort these $datetimes by remaining (only if $current_total_available)
 				//setup datetimes for simulation
 				$ticket_datetimes_remaining = array();
-				foreach( $datetimes as $datetime ) {
+				foreach ($datetimes as $datetime) {
 					$ticket_datetimes_remaining[$datetime->ID()]['rem'] = $datetime_limits[$datetime->ID()];
 					$ticket_datetimes_remaining[$datetime->ID()]['datetime'] = $datetime;
 				}
-				usort( $ticket_datetimes_remaining, function( $a, $b ) {
-					if ( $a['rem'] == $b['rem'] ) {
+				usort($ticket_datetimes_remaining, function($a, $b) {
+					if ($a['rem'] == $b['rem']) {
 						return 0;
 					}
-					return ( $a['rem'] < $b['rem'] ) ? -1 : 1;
+					return ($a['rem'] < $b['rem']) ? -1 : 1;
 				});
 
 
 				//get the remaining on the first datetime (which should be the one with the least remaining) and that is
 				//what we add to the spaces_available running total.  Then we need to decrease the remaining on our datetime tracker.
-				$lowest_datetime = reset( $ticket_datetimes_remaining );
+				$lowest_datetime = reset($ticket_datetimes_remaining);
 
 				//need to get the lower of; what the remaining is on the lowest datetime, and the remaining on the ticket.
 				// If this ends up being 0 (because of previous tickets in our simulation selling out), then it has already
 				// been tracked on $spaces available and this ticket is now sold out for the simulation, so we can continue
 				// to the next ticket.
-				if ( $current_total_available ) {
-					$remaining = min( $lowest_datetime['rem'], $ticket_info['ticket']->remaining() );
+				if ($current_total_available) {
+					$remaining = min($lowest_datetime['rem'], $ticket_info['ticket']->remaining());
 				} else {
-					$remaining = min( $lowest_datetime['rem'], $ticket_info['ticket']->qty() );
+					$remaining = min($lowest_datetime['rem'], $ticket_info['ticket']->qty());
 				}
 
 				//if $remaining is infinite that means that all datetimes on this ticket are infinite but we've made it here because all
 				//tickets have a quantity.  So we don't have to track datetimes, we can just use ticket quantities for total
 				//available.
-				if ( $remaining === EE_INF ) {
+				if ($remaining === EE_INF) {
 					$spaces_available += $ticket_info['ticket']->qty();
 					continue;
 				}
 
 				//if ticket has sold amounts then we also need to add that (but only if doing live counts)
-				if ( $current_total_available ) {
+				if ($current_total_available) {
 					$spaces_available += $ticket_info['ticket']->sold();
 				}
 
-				if ( $remaining <= 0 ) {
+				if ($remaining <= 0) {
 					continue;
 				} else {
 					$spaces_available += $remaining;
 				}
 
 				//loop through the datetimes and sell them out!
-				foreach ( $ticket_datetimes_remaining as $datetime_info ) {
-					if ( $datetime_info['datetime'] instanceof EE_Datetime ) {
-						$datetime_limits[ $datetime_info['datetime']->ID() ] += - $remaining;
+				foreach ($ticket_datetimes_remaining as $datetime_info) {
+					if ($datetime_info['datetime'] instanceof EE_Datetime) {
+						$datetime_limits[$datetime_info['datetime']->ID()] += - $remaining;
 					}
 				}
 			}
@@ -962,8 +962,8 @@ 
 	 * @param  bool $actual whether or not to perform calculations to not only figure the actual status but also to flip the status if necessary to sold out If false, we just check the existing status of the event
 	 * @return boolean
 	 */
-	public function is_sold_out( $actual = FALSE ) {
-		if ( ! $actual ) {
+	public function is_sold_out($actual = FALSE) {
+		if ( ! $actual) {
 			return $this->status() == EEM_Event::sold_out;
 		}
 		else {
@@ -1008,30 +1008,30 @@ 
 	 *
 	 * @return bool | string - based on EE_Datetime active constants or FALSE if error.
 	 */
-	public function get_active_status( $reset = false ) {
+	public function get_active_status($reset = false) {
 		// if the active status has already been set, then just use that value (unless we are resetting it)
-		if ( ! empty( $this->_active_status ) && ! $reset ) {
+		if ( ! empty($this->_active_status) && ! $reset) {
 			return $this->_active_status;
 		}
 		//first check if event id is present on this object
-		if ( ! $this->ID() ) {
+		if ( ! $this->ID()) {
 			return false;
 		}
 
-		$where_params_for_event  = array( array( 'EVT_ID' => $this->ID() ) );
+		$where_params_for_event = array(array('EVT_ID' => $this->ID()));
 
 		//if event is published:
-		if ( $this->status() === 'publish' ) {
+		if ($this->status() === 'publish') {
 			//active?
-			if ( EEM_Datetime::instance()->get_datetime_count_for_status( EE_Datetime::active, $where_params_for_event ) > 0 ) {
+			if (EEM_Datetime::instance()->get_datetime_count_for_status(EE_Datetime::active, $where_params_for_event) > 0) {
 				$this->_active_status = EE_Datetime::active;
 			} else {
 				//upcoming?
-				if ( EEM_Datetime::instance()->get_datetime_count_for_status( EE_Datetime::upcoming, $where_params_for_event  ) > 0 ) {
+				if (EEM_Datetime::instance()->get_datetime_count_for_status(EE_Datetime::upcoming, $where_params_for_event) > 0) {
 					$this->_active_status = EE_Datetime::upcoming;
 				} else {
 					//expired?
-					if ( EEM_Datetime::instance()->get_datetime_count_for_status( EE_Datetime::expired, $where_params_for_event  ) > 0 ) {
+					if (EEM_Datetime::instance()->get_datetime_count_for_status(EE_Datetime::expired, $where_params_for_event) > 0) {
 						$this->_active_status = EE_Datetime::expired;
 					} else {
 						//it would be odd if things make it this far because it basically means there are no datetime's
@@ -1042,7 +1042,7 @@ 
 			}
 		} else {
 			//the event is not published, so let's just set it's active status according to its' post status
-			switch ( $this->status() ) {
+			switch ($this->status()) {
 				case EEM_Event::sold_out :
 					$this->_active_status = EE_Datetime::sold_out;
 					break;
@@ -1068,10 +1068,10 @@ 
 	 * @param boolean $echo     whether to return (FALSE), or echo out the result (TRUE)
 	 * @return mixed void|string
 	 */
-	public function pretty_active_status( $echo = TRUE ) {
+	public function pretty_active_status($echo = TRUE) {
 		$active_status = $this->get_active_status();
-		$status = '<span class="ee-status event-active-status-' . $active_status . '">' . EEH_Template::pretty_status( $active_status, FALSE, 'sentence' ) . '</span>';
-		if ( $echo ) {
+		$status = '<span class="ee-status event-active-status-'.$active_status.'">'.EEH_Template::pretty_status($active_status, FALSE, 'sentence').'</span>';
+		if ($echo) {
 			echo $status;
 			return '';
 		}
@@ -1085,12 +1085,12 @@ 
 	 */
 	public function get_number_of_tickets_sold() {
 		$tkt_sold = 0;
-		if ( !$this->ID() ) {
+		if ( ! $this->ID()) {
 			return 0;
 		}
 		$datetimes = $this->datetimes();
-		foreach ( $datetimes as $datetime ) {
-			if ( $datetime instanceof EE_Datetime ) {
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
 				$tkt_sold += $datetime->sold();
 			}
 		}
@@ -1105,7 +1105,7 @@ 
 	 * @return int
 	 */
 	public function get_count_of_all_registrations() {
-		return EEM_Event::instance()->count_related( $this, 'Registration' );
+		return EEM_Event::instance()->count_related($this, 'Registration');
 	}
 
 
@@ -1115,9 +1115,9 @@ 
 	 * @return EE_Ticket
 	 */
 	public function get_ticket_with_earliest_start_time() {
-		$where[ 'Datetime.EVT_ID' ] = $this->ID();
-		$query_params = array( $where, 'order_by' => array( 'TKT_start_date' => 'ASC' ) );
-		return EE_Registry::instance()->load_model( 'Ticket' )->get_one( $query_params );
+		$where['Datetime.EVT_ID'] = $this->ID();
+		$query_params = array($where, 'order_by' => array('TKT_start_date' => 'ASC'));
+		return EE_Registry::instance()->load_model('Ticket')->get_one($query_params);
 	}
 
 
@@ -1127,9 +1127,9 @@ 
 	 * @return EE_Ticket
 	 */
 	public function get_ticket_with_latest_end_time() {
-		$where[ 'Datetime.EVT_ID' ] = $this->ID();
-		$query_params = array( $where, 'order_by' => array( 'TKT_end_date' => 'DESC' ) );
-		return EE_Registry::instance()->load_model( 'Ticket' )->get_one( $query_params );
+		$where['Datetime.EVT_ID'] = $this->ID();
+		$query_params = array($where, 'order_by' => array('TKT_end_date' => 'DESC'));
+		return EE_Registry::instance()->load_model('Ticket')->get_one($query_params);
 	}
 
 
@@ -1141,11 +1141,11 @@ 
 	public function tickets_on_sale() {
 		$earliest_ticket = $this->get_ticket_with_earliest_start_time();
 		$latest_ticket = $this->get_ticket_with_latest_end_time();
-		if ( !$latest_ticket instanceof EE_Ticket && !$earliest_ticket instanceof EE_Ticket ) {
+		if ( ! $latest_ticket instanceof EE_Ticket && ! $earliest_ticket instanceof EE_Ticket) {
 			return FALSE;
 		}
 		//check on sale for these two tickets.
-		if ( $latest_ticket->is_on_sale() || $earliest_ticket->is_on_sale() ) {
+		if ($latest_ticket->is_on_sale() || $earliest_ticket->is_on_sale()) {
 			return TRUE;
 		}
 		return FALSE;
@@ -1159,7 +1159,7 @@ 
 	 * @return string
 	 */
 	public function get_permalink() {
-		if ( $this->external_url() ) {
+		if ($this->external_url()) {
 			return $this->external_url();
 		}
 		else {
@@ -1174,10 +1174,10 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Term
 	 */
-	public function first_event_category( $query_params = array() ) {
-		$query_params[ 0 ][ 'Term_Taxonomy.taxonomy' ] = 'espresso_event_categories';
-		$query_params[ 0 ][ 'Term_Taxonomy.Event.EVT_ID' ] = $this->ID();
-		return EEM_Term::instance()->get_one( $query_params );
+	public function first_event_category($query_params = array()) {
+		$query_params[0]['Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
+		$query_params[0]['Term_Taxonomy.Event.EVT_ID'] = $this->ID();
+		return EEM_Term::instance()->get_one($query_params);
 	}
 
 
@@ -1187,10 +1187,10 @@ 
 	 * @param array $query_params
 	 * @return EE_Term[]
 	 */
-	public function get_all_event_categories( $query_params = array() ) {
-		$query_params[ 0 ][ 'Term_Taxonomy.taxonomy' ] = 'espresso_event_categories';
-		$query_params[ 0 ][ 'Term_Taxonomy.Event.EVT_ID' ] = $this->ID();
-		return EEM_Term::instance()->get_all( $query_params );
+	public function get_all_event_categories($query_params = array()) {
+		$query_params[0]['Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
+		$query_params[0]['Term_Taxonomy.Event.EVT_ID'] = $this->ID();
+		return EEM_Term::instance()->get_all($query_params);
 	}
 
 	/**
@@ -1198,8 +1198,8 @@ 
 	 * @param array $query_params @see EEM_Base::get_all
 	 * @return EE_Question_Group[]
 	 */
-	public function question_groups($query_params = array()){
-		$query_params = ! empty( $query_params ) ? $query_params : array( 'order_by' => array( 'QSG_order' => 'ASC' ));
+	public function question_groups($query_params = array()) {
+		$query_params = ! empty($query_params) ? $query_params : array('order_by' => array('QSG_order' => 'ASC'));
 		return $this->get_many_related('Question_Group', $query_params);
 	}
 
@@ -1239,12 +1239,12 @@ 
 	 */
 	public function get_admin_edit_link() {
 		EE_Registry::instance()->load_helper('URL');
-		return EEH_URL::add_query_args_and_nonce( array(
+		return EEH_URL::add_query_args_and_nonce(array(
 			'page' => 'espresso_events',
 			'action' => 'edit',
 			'post' => $this->ID()
 			),
-			admin_url( 'admin.php' )
+			admin_url('admin.php')
 		);
 	}
 
@@ -1257,11 +1257,11 @@ 
 	 */
 	public function get_admin_settings_link() {
 		EE_Registry::instance()->load_helper('URL');
-		return EEH_URL::add_query_args_and_nonce( array(
+		return EEH_URL::add_query_args_and_nonce(array(
 			'page' => 'espresso_events',
 			'action' => 'default_event_settings'
 			),
-			admin_url( 'admin.php' )
+			admin_url('admin.php')
 		);
 	}
 
@@ -1277,11 +1277,11 @@ 
 	public function get_admin_overview_link() {
 
 		EE_Registry::instance()->load_helper('URL');
-		return EEH_URL::add_query_args_and_nonce( array(
+		return EEH_URL::add_query_args_and_nonce(array(
 			'page' => 'espresso_events',
 			'action' => 'default'
 		),
-			admin_url( 'admin.php' )
+			admin_url('admin.php')
 		);
 	}
 

admin_pages/events/help_tabs/event_editor_venue_details.help_tab.php

Spacing +1 added lines, -1 removed lines

@@ -3,5 +3,5 @@
 <?php _e('A venue is the place or location that is hosting your event. This setting is optional which means that you are not required to select a venue for your event.', 'event_espresso'); ?>
 </p>
 <p>
-<?php echo sprintf(__('Venues can be managed through the %sVenues page%s.', 'event_espresso'),'<a href="admin.php?page=espresso_venues">','</a>'); ?>
+<?php echo sprintf(__('Venues can be managed through the %sVenues page%s.', 'event_espresso'), '<a href="admin.php?page=espresso_venues">', '</a>'); ?>
 </p>
\ No newline at end of file

admin_pages/events/templates/event_tickets_metabox_main.template.php

Spacing +4 added lines, -4 removed lines

@@ -1,4 +1,4 @@ 
-<?php do_action( 'AHEE__event_tickets_metabox_main__before_content' ); ?>
+<?php do_action('AHEE__event_tickets_metabox_main__before_content'); ?>
 <div id="event-and-ticket-form-content">
 	<h4 class="event-tickets-datetimes-title"><?php _e('Event Datetime', 'event_espresso'); ?></h4><?php echo $event_datetime_help_link; ?>
 	<div class="event-datetimes-container">
@@ -29,11 +29,11 @@ 
 						</td>
 						<td class="event-datetime-column reg-limit-column">
 							<?php
-								$reg_limit = $time->get_pretty('DTT_reg_limit','input');
+								$reg_limit = $time->get_pretty('DTT_reg_limit', 'input');
 							?>
 							<input type="text" name="edit_event_datetimes[1][DTT_reg_limit]" id="event-datetime-DTT_reg_limit-1" class="ee-small-text-inp ee-inp-right event-datetime-DTT_reg_limit" value="<?php echo $reg_limit; ?>">
 						</td>
-						<td class="datetime-tickets-sold"><?php printf( __('Tickets Sold: %s', 'event_espresso'), $time->get('DTT_sold') ); ?></td>
+						<td class="datetime-tickets-sold"><?php printf(__('Tickets Sold: %s', 'event_espresso'), $time->get('DTT_sold')); ?></td>
 					</tr>
 				</tbody>
 			</table>
@@ -71,7 +71,7 @@ 
 	<div style="clear:both"></div>
 </div> <!-- end #event-and-ticket-form-content -->
 
-<?php do_action( 'AHEE__event_tickets_metabox_main__after_content' ); ?>
+<?php do_action('AHEE__event_tickets_metabox_main__after_content'); ?>
 
 <table id="new-ticket-row-form" class="hidden">
 	<tbody><?php echo $ticket_js_structure; ?></tbody>

admin_pages/general_settings/help_tabs/general_settings_critical_pages.help_tab.php

Spacing +10 added lines, -10 removed lines

@@ -6,41 +6,41 @@
 <ul>
 <li>
 <strong><?php _e('Registration Checkout Page', 'event_espresso'); ?></strong><br />
-<?php printf( __('This page displays all your events and is required. It is important that this page always contain the %s shortcode. It is not required to be in your navigation menu.', 'event_espresso'), '<strong>[ESPRESSO_CHECKOUT]</strong>' ); ?>
+<?php printf(__('This page displays all your events and is required. It is important that this page always contain the %s shortcode. It is not required to be in your navigation menu.', 'event_espresso'), '<strong>[ESPRESSO_CHECKOUT]</strong>'); ?>
 </li>
 <li>
 <strong><?php _e('Transactions Page', 'event_espresso'); ?></strong><br />
-<?php printf( __('This page processes the payments and is required. It should only contain the %s shortcode. No other content should be added and it should be hidden from your navigation menu.', 'event_espresso'), '<strong>[ESPRESSO_TXN_PAGE]</strong>' ); ?>
+<?php printf(__('This page processes the payments and is required. It should only contain the %s shortcode. No other content should be added and it should be hidden from your navigation menu.', 'event_espresso'), '<strong>[ESPRESSO_TXN_PAGE]</strong>'); ?>
 </li>
 <li>
 <strong><?php _e('Thank You Page', 'event_espresso'); ?></strong><br />
-<?php printf( __('This page is displayed after a successful transaction and is required. It should contain the %s shortcode. Additionally, you may customize this page by adding extra content to the page. It should be hidden from your navigation menu.', 'event_espresso'), '<strong>[ESPRESSO_THANK_YOU]</strong>' ); ?>
+<?php printf(__('This page is displayed after a successful transaction and is required. It should contain the %s shortcode. Additionally, you may customize this page by adding extra content to the page. It should be hidden from your navigation menu.', 'event_espresso'), '<strong>[ESPRESSO_THANK_YOU]</strong>'); ?>
 </li>
 <li>
 <strong><?php _e('Cancel / Return Page', 'event_espresso'); ?></strong><br />
-<?php printf( __('This page is displayed after an unsuccessful transaction and is required.  It should contain the %s shortcode. Additionally, you may customize this page by adding extra content to the page. It should be hidden from your navigation menu.', 'event_espresso'), '<strong>[ESPRESSO_CANCELLED]</strong>' ); ?>
+<?php printf(__('This page is displayed after an unsuccessful transaction and is required.  It should contain the %s shortcode. Additionally, you may customize this page by adding extra content to the page. It should be hidden from your navigation menu.', 'event_espresso'), '<strong>[ESPRESSO_CANCELLED]</strong>'); ?>
 </li>
 <li>
 <strong><?php _e('Event List', 'event_espresso'); ?></strong><br />
-<?php printf(__('If you would like to style the look of your events archive page, then follow the WordPress instructions for %1$screating a custom template for archive pages%2$s.', 'event_espresso'), '<a href="http://codex.wordpress.org/Post_Type_Templates">','</a>'); ?>
+<?php printf(__('If you would like to style the look of your events archive page, then follow the WordPress instructions for %1$screating a custom template for archive pages%2$s.', 'event_espresso'), '<a href="http://codex.wordpress.org/Post_Type_Templates">', '</a>'); ?>
 <ul>
 <li style="list-style-type: circle;">
-<?php printf( __('Build a template for your events - create a theme template named %1$s Then place it in your theme\'s root directory. For the default WordPress Twenty Thirteen theme, this location will be %2$s.', 'event_espresso'), '<strong>archive-espresso_events.php</strong>','wp-content/themes/twenty-fourteen' ); ?>
+<?php printf(__('Build a template for your events - create a theme template named %1$s Then place it in your theme\'s root directory. For the default WordPress Twenty Thirteen theme, this location will be %2$s.', 'event_espresso'), '<strong>archive-espresso_events.php</strong>', 'wp-content/themes/twenty-fourteen'); ?>
 </li>
 <li style="list-style-type: circle;">
-<?php printf( __('Build a template for a single event - create a theme template named %1$s Then place it in your theme\'s root directory. For the default WordPress Twenty Thirteen theme, this location will be %2$s.', 'event_espresso'), '<strong>single-espresso_events.php</strong>','wp-content/themes/twenty-fourteen' ); ?>
+<?php printf(__('Build a template for a single event - create a theme template named %1$s Then place it in your theme\'s root directory. For the default WordPress Twenty Thirteen theme, this location will be %2$s.', 'event_espresso'), '<strong>single-espresso_events.php</strong>', 'wp-content/themes/twenty-fourteen'); ?>
 </li>
 </ul>
 </li>
 <li>
 <strong><?php _e('Venue List', 'event_espresso'); ?></strong><br />
-<?php printf(__('If you would like to style the look of your venues archive page, then follow the WordPress instructions for %1$screating a custom template for archive pages%2$s.', 'event_espresso'), '<a href="http://codex.wordpress.org/Post_Type_Templates">','</a>'); ?>
+<?php printf(__('If you would like to style the look of your venues archive page, then follow the WordPress instructions for %1$screating a custom template for archive pages%2$s.', 'event_espresso'), '<a href="http://codex.wordpress.org/Post_Type_Templates">', '</a>'); ?>
 <ul>
 <li style="list-style-type: circle;">
-<?php printf( __('Build a template for your events - create a theme template named %1$s Then place it in your theme\'s root directory. For the default WordPress Twenty Thirteen theme, this location will be %2$s.', 'event_espresso'), '<strong>archive-espresso_venues.php</strong>','wp-content/themes/twenty-fourteen' ); ?>
+<?php printf(__('Build a template for your events - create a theme template named %1$s Then place it in your theme\'s root directory. For the default WordPress Twenty Thirteen theme, this location will be %2$s.', 'event_espresso'), '<strong>archive-espresso_venues.php</strong>', 'wp-content/themes/twenty-fourteen'); ?>
 </li>
 <li style="list-style-type: circle;">
-<?php printf( __('Build a template for a single event - create a theme template named %1$s Then place it in your theme\'s root directory. For the default WordPress Twenty Thirteen theme, this location will be %2$s.', 'event_espresso'), '<strong>single-espresso_venues.php</strong>','wp-content/themes/twenty-fourteen' ); ?>
+<?php printf(__('Build a template for a single event - create a theme template named %1$s Then place it in your theme\'s root directory. For the default WordPress Twenty Thirteen theme, this location will be %2$s.', 'event_espresso'), '<strong>single-espresso_venues.php</strong>', 'wp-content/themes/twenty-fourteen'); ?>
 </li>
 </ul>
 </li>

admin_pages/general_settings/templates/espresso_page_settings.template.php

Spacing +19 added lines, -19 removed lines

@@ -24,7 +24,7 @@ 
 						</strong>
 						<?php echo EEH_Template::get_help_tab_link('registration_page_info'); ?>
 						<br />
-						<?php echo General_Settings_Admin_Page::edit_view_links( $reg_page_id );?>
+						<?php echo General_Settings_Admin_Page::edit_view_links($reg_page_id); ?>
 					</label>
 				</th>
 				<td>
@@ -32,10 +32,10 @@ 
 						<option value="0">
 							<?php _e('Main Page', 'event_espresso'); ?>
 						</option>
-						<?php General_Settings_Admin_Page::page_settings_dropdown( $reg_page_id ); ?>
+						<?php General_Settings_Admin_Page::page_settings_dropdown($reg_page_id); ?>
 					</select>
 					<span>
-						<?php echo General_Settings_Admin_Page::page_and_shortcode_status( $reg_page_obj, '[ESPRESSO_CHECKOUT]' ); ?>
+						<?php echo General_Settings_Admin_Page::page_and_shortcode_status($reg_page_obj, '[ESPRESSO_CHECKOUT]'); ?>
 					</span>
 					<br />
 					<p class="description">
@@ -59,7 +59,7 @@ 
 						<?php echo EEH_Template::get_help_tab_link('notify_url_info'); ?>
 						<br />
 						<span class="lt-grey-text"><?php _e('Notify URL (processes payments)', 'event_espresso'); ?></span><br/>
-						<?php echo General_Settings_Admin_Page::edit_view_links( $txn_page_id );?>
+						<?php echo General_Settings_Admin_Page::edit_view_links($txn_page_id); ?>
 					</label>
 				</th>
 				<td>
@@ -67,16 +67,16 @@ 
 						<option value="0">
 							<?php _e('Main Page', 'event_espresso'); ?>
 						</option>
-						<?php General_Settings_Admin_Page::page_settings_dropdown( $txn_page_id ); ?>
+						<?php General_Settings_Admin_Page::page_settings_dropdown($txn_page_id); ?>
 					</select>
 					<span>
-						<?php echo General_Settings_Admin_Page::page_and_shortcode_status( $txn_page_obj, '[ESPRESSO_TXN_PAGE]' ); ?>
+						<?php echo General_Settings_Admin_Page::page_and_shortcode_status($txn_page_obj, '[ESPRESSO_TXN_PAGE]'); ?>
 					</span>
 					<br />
 					<p class="description">
 						<?php
 						echo sprintf(
-							__( 'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain the %s shortcode.', 'event_espresso' ),
+							__('This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain the %s shortcode.', 'event_espresso'),
 							'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_TXN_PAGE]</span>'
 						);
 						?>
@@ -93,7 +93,7 @@ 
 						</strong>
 						<?php echo EEH_Template::get_help_tab_link('return_url_info'); ?>
 						<br />
-						<?php echo General_Settings_Admin_Page::edit_view_links( $thank_you_page_id );?>
+						<?php echo General_Settings_Admin_Page::edit_view_links($thank_you_page_id); ?>
 					</label>
 				</th>
 				<td>
@@ -101,16 +101,16 @@ 
 						<option value="0">
 							<?php _e('Main Page', 'event_espresso'); ?>
 						</option>
-						<?php General_Settings_Admin_Page::page_settings_dropdown( $thank_you_page_id ); ?>
+						<?php General_Settings_Admin_Page::page_settings_dropdown($thank_you_page_id); ?>
 					</select>
 					<span>
-						<?php echo General_Settings_Admin_Page::page_and_shortcode_status( $thank_you_page_obj, '[ESPRESSO_THANK_YOU]' ); ?>
+						<?php echo General_Settings_Admin_Page::page_and_shortcode_status($thank_you_page_obj, '[ESPRESSO_THANK_YOU]'); ?>
 					</span>
 					<br />
 					<p class="description">
 						<?php
 						echo sprintf(
-							__( 'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain the %s shortcode.', 'event_espresso' ),
+							__('This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain the %s shortcode.', 'event_espresso'),
 							'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_THANK_YOU]</span>'
 						);
 						?>
@@ -127,7 +127,7 @@ 
 						</strong>
 						<?php echo EEH_Template::get_help_tab_link('cancel_return_info'); ?>
 						<br />
-						<?php echo General_Settings_Admin_Page::edit_view_links( $cancel_page_id );?>
+						<?php echo General_Settings_Admin_Page::edit_view_links($cancel_page_id); ?>
 					</label>
 				</th>
 				<td>
@@ -135,16 +135,16 @@ 
 						<option value="0">
 							<?php _e('Main Page', 'event_espresso'); ?>
 						</option>
-						<?php General_Settings_Admin_Page::page_settings_dropdown( $cancel_page_id ); ?>
+						<?php General_Settings_Admin_Page::page_settings_dropdown($cancel_page_id); ?>
 					</select>
 					<span>
-						<?php echo General_Settings_Admin_Page::page_and_shortcode_status( $cancel_page_obj, '[ESPRESSO_CANCELLED]' ); ?>
+						<?php echo General_Settings_Admin_Page::page_and_shortcode_status($cancel_page_obj, '[ESPRESSO_CANCELLED]'); ?>
 					</span>
 					<br />
 					<p class="description">
 						<?php
 						echo sprintf(
-							__( 'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain a "cancelled transaction" message and the %s shortcode.', 'event_espresso' ),
+							__('This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain a "cancelled transaction" message and the %s shortcode.', 'event_espresso'),
 							'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_CANCELLED]</span>'
 						);
 						?>
@@ -161,7 +161,7 @@ 
 						</strong>
 						<?php echo EEH_Template::get_help_tab_link('event_list_cpt_info'); ?>
 						<br />
-						<a href='<?php echo get_post_type_archive_link('espresso_events') ?>'><?php	_e('View', 'event_espresso');?></a>
+						<a href='<?php echo get_post_type_archive_link('espresso_events') ?>'><?php	_e('View', 'event_espresso'); ?></a>
 					</label>
 				</th>
 				<td>
@@ -169,7 +169,7 @@ 
 						<?php echo __('Events are custom post types and use WordPress\' normal archive pages for displaying events.', 'event_espresso') ?>
 					</p>
 					<p class="description">
-						<?php printf(__('If you would still like your events on a page like in Event Espresso 3.1 or earlier, simply create a page and place a shortcode to display them on the page, as described %s here %s', 'event_espresso'),'<a href="admin.php?page=espresso_support">','</a>') ?>
+						<?php printf(__('If you would still like your events on a page like in Event Espresso 3.1 or earlier, simply create a page and place a shortcode to display them on the page, as described %s here %s', 'event_espresso'), '<a href="admin.php?page=espresso_support">', '</a>') ?>
 					</p>
 					<br/><br/>
 				</td>
@@ -183,7 +183,7 @@ 
 						</strong>
 						<?php echo EEH_Template::get_help_tab_link('venue_list_cpt_info'); ?>
 						<br />
-						<a href='<?php echo get_post_type_archive_link('espresso_venues') ?>'><?php	_e('View', 'event_espresso');?></a>
+						<a href='<?php echo get_post_type_archive_link('espresso_venues') ?>'><?php	_e('View', 'event_espresso'); ?></a>
 					</label>
 				</th>
 				<td>
@@ -191,7 +191,7 @@ 
 						<?php echo __('Venues are custom post types and use WordPress\' normal archive pages for displaying events.', 'event_espresso') ?>
 					</p>
 					<p class="description">
-						<?php printf(__('If you would still like your venues on a page like in Event Espresso 3.1 or earlier, simply create a page and place a shortcode to display them on the page, as described %s here %s', 'event_espresso'),'<a href="admin.php?page=espresso_support">','</a>') ?>
+						<?php printf(__('If you would still like your venues on a page like in Event Espresso 3.1 or earlier, simply create a page and place a shortcode to display them on the page, as described %s here %s', 'event_espresso'), '<a href="admin.php?page=espresso_support">', '</a>') ?>
 					</p>
 				</td>
 			</tr>

admin_pages/messages/templates/shortcode_selector_skeleton.template.php

Spacing +4 added lines, -4 removed lines

@@ -7,14 +7,14 @@
  * @type    string  $fieldname  The name of the field the chooser is associated with.
  * @type    string  $linked_input_id The name of the input that the shortcode gets inserted to.
  */
-if ( ! empty( $shortcodes ) ) : ?>
+if ( ! empty($shortcodes)) : ?>
 <span class="ee-messages-shortcodes-chooser js-open-list-trigger dashicons dashicons-menu">
 	<ul id="ee_shortcode_chooser_<?php echo $fieldname; ?>" class="ee_shortcode_chooser_container hidden">
-		<?php foreach( $shortcodes as $shortcode => $label ) : ?>
+		<?php foreach ($shortcodes as $shortcode => $label) : ?>
 			<li>
-				<span class="js-shortcode-selection" data-value="<?php echo esc_attr( $shortcode ); ?>" data-linked-input-id="<?php echo esc_attr( $linked_input_id ); ?>"><?php echo $shortcode; ?></span>
+				<span class="js-shortcode-selection" data-value="<?php echo esc_attr($shortcode); ?>" data-linked-input-id="<?php echo esc_attr($linked_input_id); ?>"><?php echo $shortcode; ?></span>
 			</li>
 		<?php endforeach; ?>
 	</ul>
 </span>
-<?php endif ; ?>
\ No newline at end of file
+<?php endif; ?>
\ No newline at end of file

admin_pages/venues/Venue_Categories_Admin_List_Table.class.php

Spacing +19 added lines, -19 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'));
 	}
 
 
@@ -102,7 +102,7 @@ 
 
 	public function column_id($item) {
 		$content = $item->get('term_id');
-		$content .= '  <span class="show-on-mobile-view-only">' . $item->get_first_related('Term')->get('name') . '</span>';
+		$content .= '  <span class="show-on-mobile-view-only">'.$item->get_first_related('Term')->get('name').'</span>';
 		return $content;
 	}
 
@@ -122,17 +122,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;
 	}
@@ -141,20 +141,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');
+}
 
 /**
  *

admin_pages/venues/Venues_Admin_List_Table.class.php

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');
 
 /**
@@ -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());
 	}
 
 
@@ -111,7 +111,7 @@ 
 
 	public function column_id($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;
 	}
 
@@ -122,12 +122,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;
 	}
@@ -138,59 +138,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;
@@ -217,7 +217,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');
+}
 
 /**
  *

admin_pages/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_ADMIN_PAGES_URL . 'venues/assets/');
-		define( 'EE_VENUES_TEMPLATE_PATH', EE_ADMIN_PAGES . '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_ADMIN_PAGES_URL.'venues/assets/');
+		define('EE_VENUES_TEMPLATE_PATH', EE_ADMIN_PAGES.'venues/templates/');
 
 		parent::__construct();
-		$this->_folder_path = EE_ADMIN_PAGES . $this->_folder_name . DS;
+		$this->_folder_path = EE_ADMIN_PAGES.$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');
+}
 
 /**
  *