eventespresso / event-espresso-core

admin_pages/venues/help_tours/Venues_Edit_Category_Help_Tour.class.php

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

Spacing +6 added lines, -6 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -71,21 +71,21 @@ 
 
 
 	protected function _stop_one() {
-		$content = '<h3>' . __('Edit Venue Category', 'event_espresso') . '</h3>';
-		$content .= '<p>' . __('This tour of the Edit Venue Category 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>'.__('Edit Venue Category', 'event_espresso').'</h3>';
+		$content .= '<p>'.__('This tour of the Edit Venue Category 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 _category_name_stop() {
-		return '<p>' . __('Edit the name for your venue category.', 'event_espresso') . '</p>';
+		return '<p>'.__('Edit the name for your venue category.', 'event_espresso').'</p>';
 	}
 
 	protected function _category_id_stop() {
-		return '<p>' . __('View the unique ID for your category (cannot be changed).', 'event_espresso') . '</p>';
+		return '<p>'.__('View the unique ID for your category (cannot be changed).', 'event_espresso').'</p>';
 	}
 
 	protected function _category_editor_stop() {
-		return '<p>' . __('The rich text editor can be used to edit information about your venue 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 venue category. Images and links can also be added or removed along with your text.', '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/venues/help_tours/Venues_Edit_Venue_Help_Tour.class.php

Spacing +11 added lines, -11 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -109,8 +109,8 @@ 
 
 
 	protected function _stop_one() {
-		$content = '<h3>' . __('Edit Venue', 'event_espresso') . '</h3>';
-		$content .= '<p>' . __('This tour of the Venue Editor 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>'.__('Edit Venue', 'event_espresso').'</h3>';
+		$content .= '<p>'.__('This tour of the Venue Editor 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;
 	}
 
@@ -119,35 +119,35 @@ 
 	}
 
 	protected function _venue_editor_stop() {
-		return '<p>' . __('The rich text editor can be used to edit information about your venue. 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 venue. Images and links can also be added or removed along with your text.', 'event_espresso').'</p>';
 	}
 	
 	protected function _venue_tags_stop() {
-		return '<p>' . __('Quickly edit tags for your venue.', 'event_espresso') . '</p>';
+		return '<p>'.__('Quickly edit tags for your venue.', 'event_espresso').'</p>';
 	}
 
 	protected function _venue_categories_stop() {
-		return '<p>' . __('Venues can also be categorized if you wish.', 'event_espresso') . '</p>';
+		return '<p>'.__('Venues can also be categorized if you wish.', 'event_espresso').'</p>';
 	}
 
 	protected function _venue_physical_location_stop() {
-		return '<p>' . __('Edit the physical address for your venue.', 'event_espresso') . '</p>';
+		return '<p>'.__('Edit the physical address for your venue.', 'event_espresso').'</p>';
 	}
 
 	protected function _venue_gmap_stop() {
-		return '<p>' . __('Enable or disable a Google Map for your venue.', 'event_espresso') . '</p>';
+		return '<p>'.__('Enable or disable a Google Map for your venue.', 'event_espresso').'</p>';
 	}
 
 	protected function _venue_virtual_location_stop() {
-		return '<p>' . __('Setup a virtual location for your venue.', 'event_espresso') . '</p>';
+		return '<p>'.__('Setup a virtual location for your venue.', 'event_espresso').'</p>';
 	}
 	
 	protected function _stop_featured_image() {
-		return '<p>' . __('Set a feature image for your venue here.', 'event_espresso') . '</p>';
+		return '<p>'.__('Set a feature image for your venue here.', 'event_espresso').'</p>';
 	}
 
 	protected function _stop_publish_box() {
-		return '<p>' . __('Easily control the status of your venue. The main options are Published, Pending Review, and Draft.', 'event_espresso') . '</p>';
+		return '<p>'.__('Easily control the status of your venue. The main options are Published, Pending Review, and Draft.', '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/venues/help_tours/Venues_Overview_Help_Tour.class.php

Spacing +12 added lines, -12 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -125,44 +125,44 @@ 
 
 
 	protected function _start() {
-		$content = '<h3>' . __('Venue Overview', 'event_espresso') . '</h3>';
-		$content .= '<p>' . __('This tour of the Venues Overview 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>'.__('Venue Overview', 'event_espresso').'</h3>';
+		$content .= '<p>'.__('This tour of the Venues Overview 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 venue ID. Can be sorted by ascending or descending order.', 'event_espresso') . '</p>';
+		return '<p>'.__('View the venue ID. Can be sorted by ascending or descending order.', 'event_espresso').'</p>';
 	}
 	
 	protected function _name_stop() {
-		return '<p>' . __('View the name of each venue. Can be sorted by ascending or descending order.', 'event_espresso') . '</p>';
+		return '<p>'.__('View the name of each venue. Can be sorted by ascending or descending order.', 'event_espresso').'</p>';
 	}
 	
 	protected function _address_stop() {
-		return '<p>' . __('View the address for each venue.', 'event_espresso') . '</p>';
+		return '<p>'.__('View the address for each venue.', 'event_espresso').'</p>';
 	}
 	
 	protected function _city_stop() {
-		return '<p>' . __('View the city for each venue. Can be sorted by ascending or descending order.', 'event_espresso') . '</p>';
+		return '<p>'.__('View the city for each venue. Can be sorted by ascending or descending order.', 'event_espresso').'</p>';
 	}
 	
 	protected function _capacity_stop() {
-		return '<p>' . __('View the capacity for each venue. Can be sorted by ascending or descending order.', 'event_espresso') . '</p>';
+		return '<p>'.__('View the capacity for each venue. Can be sorted by ascending or descending order.', 'event_espresso').'</p>';
 	}
 
 	protected function _shortcode_stop() {
-		return '<p>' . __('View the shortcode for a venue. This shortcode can be added to an event, WordPress post, or WordPress page. ', 'event_espresso') . '</p>';
+		return '<p>'.__('View the shortcode for a venue. This shortcode can be added to an event, WordPress post, or WordPress page. ', 'event_espresso').'</p>';
 	}
 
 	protected function _bulk_actions_stop() {
-		return '<p>' . __('Perform bulk actions to multiple venues.', 'event_espresso') . '</p>';
+		return '<p>'.__('Perform bulk actions to multiple venues.', 'event_espresso').'</p>';
 	}
 
 	protected function _search_stop() {
-		return '<p>' . __('Search through venues. The following sources will be searched: Venue Name, Venue Description, Venue Short Description, Venue Address, Venue City, Venue Zip/Postal Code, Venue Phone, Venue URL, Venue Virtual Phone, Venue Google Map link, Event Name, Event Description, Event Phone, and Event External URL.', 'event_espresso') . '</p>';
+		return '<p>'.__('Search through venues. The following sources will be searched: Venue Name, Venue Description, Venue Short Description, Venue Address, Venue City, Venue Zip/Postal Code, Venue Phone, Venue URL, Venue Virtual Phone, Venue Google Map link, Event Name, Event Description, Event Phone, and Event External URL.', 'event_espresso').'</p>';
 	}
 	
 	protected function _new_venue_stop() {
-		return '<p>' . __('Click here to add a new venue.', 'event_espresso') . '</p>';
+		return '<p>'.__('Click here to add a new venue.', '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/venues/templates/event_venues_metabox_content_from_manager.template.php

Spacing +5 added lines, -5 removed lines

@@ -3,11 +3,11 @@ 
 		<td valign="top" class="use-ven-manager">
 		<label><?php _e('Select from Venue Manager List', 'event_espresso'); ?></label>
 		<?php echo $venue_selector; ?>
-		<?php foreach ( $venues as $venue ) :
+		<?php foreach ($venues as $venue) :
 			$selected = $evt_venue_id == $venue->ID() ? '' : ' style="display:none;"';
-			$edit_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'edit', 'post' => $venue->ID() ), EE_VENUES_ADMIN_URL );
-			$state_name = is_object( $venue->state_obj() ) ? $venue->state_obj()->name() : NULL;
-			$country_name = is_object( $venue->country_obj() ) ? $venue->country_obj()->name() : NULL;
+			$edit_url = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'edit', 'post' => $venue->ID()), EE_VENUES_ADMIN_URL);
+			$state_name = is_object($venue->state_obj()) ? $venue->state_obj()->name() : NULL;
+			$country_name = is_object($venue->country_obj()) ? $venue->country_obj()->name() : NULL;
 			?>
 			<fieldset id="eebox_<?php echo $venue->ID(); ?>" class="eebox"<?php echo $selected; ?>>
 				<ul class="address-view">
@@ -18,7 +18,7 @@ 
 							<span><?php _e('State:', 'event_espresso'); ?></span> <?php echo $state_name; ?><br />
 							<span><?php _e('Country:', 'event_espresso'); ?></span> <?php echo $country_name; ?><br />
 							<span><?php _e('Venue ID:', 'event_espresso'); ?></span> <?php echo $venue->ID(); ?><br /></p>
-							<!-- <?php printf( __('This venue\'s shortcode: %s[ESPRESSO_VENUE id="%d"]%s', 'event_espresso'), '<strong class="highlight">', $venue->ID(), '</strong>' ); ?><br /> -->
+							<!-- <?php printf(__('This venue\'s shortcode: %s[ESPRESSO_VENUE id="%d"]%s', 'event_espresso'), '<strong class="highlight">', $venue->ID(), '</strong>'); ?><br /> -->
 							<a href="<?php echo $edit_url; ?>" target="_blank"><?php _e('Edit this Venue', 'event_espresso'); ?></a>
 					</li>	
 				</ul>

admin_pages/venues/templates/venue_gmap_metabox_content.template.php

Spacing +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 	<tr>
 		<td valign="top">
 			<fieldset>
-				<?php if( isset( EE_Registry::instance()->CFG->map_settings ) && isset( EE_Registry::instance()->CFG->map_settings->use_google_maps ) && EE_Registry::instance()->CFG->map_settings->use_google_maps ) { ?>
+				<?php if (isset(EE_Registry::instance()->CFG->map_settings) && isset(EE_Registry::instance()->CFG->map_settings->use_google_maps) && EE_Registry::instance()->CFG->map_settings->use_google_maps) { ?>
 				<p>
 					<label for="enable_for_gmap">
 						<?php _e('Display Google Map for this venue? ', 'event_espresso') ?>
@@ -14,11 +14,11 @@ 
 					<input type="text" name="vnu_google_map_link" value="<?php echo $vnu_google_map_link; ?>" class="all-options" /> 
 				</p> -->
 				<?php } ?>
-				<?php if( ! isset( EE_Registry::instance()->CFG->map_settings ) || ! isset( EE_Registry::instance()->CFG->map_settings->use_google_maps ) || ! EE_Registry::instance()->CFG->map_settings->use_google_maps ) { ?>
+				<?php if ( ! isset(EE_Registry::instance()->CFG->map_settings) || ! isset(EE_Registry::instance()->CFG->map_settings->use_google_maps) || ! EE_Registry::instance()->CFG->map_settings->use_google_maps) { ?>
 					<p class="ee-notice">
 						<?php
 							echo sprintf( 
-								__('To display a Google Map for event venues, go to %sEvent Espresso General Settings%sGoogle Maps%s, and set "Activate Google Maps" to "Yes"', 'event_espresso' ),
+								__('To display a Google Map for event venues, go to %sEvent Espresso General Settings%sGoogle Maps%s, and set "Activate Google Maps" to "Yes"', 'event_espresso'),
 								'<b>',
 								'</b> &raquo; <b>',
 								'</b>'

caffeinated/admin/extend/messages/espresso_events_Messages_Hooks_Extend.class.php

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

Doc Comments +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
 	 *
 	 * @param  EE_Event $event 	EE event object
 	 * @param  array    $data   The request data from the form
-	 * @return bool     		success or fail
+	 * @return integer     		success or fail
 	 */
 	public function attach_evt_message_templates( $event, $data ) {
 		//first we remove all existing relations on the Event for message types.

Spacing +41 added lines, -41 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -22,21 +22,21 @@ 
 	 *
 	 * @param \EE_Admin_Page $admin_page
 	 */
-	public function __construct( EE_Admin_Page $admin_page ) {
+	public function __construct(EE_Admin_Page $admin_page) {
 		/**
 		 * Add cap restriction ... metaboxes should not show if user does not have the ability to edit_custom_messages
 		 */
 		if (
-			! EE_Registry::instance()->CAP->current_user_can( 'ee_edit_messages', 'messages_events_editor_metabox' )
+			! EE_Registry::instance()->CAP->current_user_can('ee_edit_messages', 'messages_events_editor_metabox')
 		) {
 			return;
 		}
 		add_filter(
 			'FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks',
-			array( $this, 'caf_updates' ),
+			array($this, 'caf_updates'),
 			10
 		);
-		parent::__construct( $admin_page );
+		parent::__construct($admin_page);
 	}
 
 
@@ -49,13 +49,13 @@ 
 	 */
 	protected function _extend_properties() {
 
-		define( 'EE_MSGS_EXTEND_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'messages/assets/' );
+		define('EE_MSGS_EXTEND_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'messages/assets/');
 		$this->_ajax_func = array(
 			'ee_msgs_create_new_custom' => 'create_new_custom'
 			);
 		$this->_metaboxes = array(
 			0 => array(
-				'page_route' => array('edit','create_new'),
+				'page_route' => array('edit', 'create_new'),
 				'func' => 'messages_metabox',
 				'label' => __('Notifications', 'event_espresso'),
 				'priority' => 'high'
@@ -66,11 +66,11 @@ 
 		$this->_scripts_styles = array(
 			'registers' => array(
 				'events_msg_admin' => array(
-					'url' => EE_MSGS_EXTEND_ASSETS_URL . 'events_messages_admin.js',
+					'url' => EE_MSGS_EXTEND_ASSETS_URL.'events_messages_admin.js',
 					'depends' => array('ee-dialog', 'ee-parse-uri', 'ee-serialize-full-array')
 				),
 				'events_msg_admin_css' => array(
-					'url' => EE_MSGS_EXTEND_ASSETS_URL . 'ee_msg_events_admin.css',
+					'url' => EE_MSGS_EXTEND_ASSETS_URL.'ee_msg_events_admin.css',
 					'type' => 'css'
 				)
 			),
@@ -82,8 +82,8 @@ 
 	}
 
 
-	public function caf_updates( $update_callbacks ) {
-		$update_callbacks[] = array( $this, 'attach_evt_message_templates' );
+	public function caf_updates($update_callbacks) {
+		$update_callbacks[] = array($this, 'attach_evt_message_templates');
 		return $update_callbacks;
 	}
 
@@ -97,13 +97,13 @@ 
 	 * @param  array    $data   The request data from the form
 	 * @return bool     		success or fail
 	 */
-	public function attach_evt_message_templates( $event, $data ) {
+	public function attach_evt_message_templates($event, $data) {
 		//first we remove all existing relations on the Event for message types.
 		$event->_remove_relations('Message_Template_Group');
 		//now let's just loop through the selected templates and add relations!
-		if ( isset( $data[ 'event_message_templates_relation' ] ) ) {
-			foreach ( $data[ 'event_message_templates_relation' ] as $grp_ID ) {
-				$event->_add_relation_to( $grp_ID, 'Message_Template_Group' );
+		if (isset($data['event_message_templates_relation'])) {
+			foreach ($data['event_message_templates_relation'] as $grp_ID) {
+				$event->_add_relation_to($grp_ID, 'Message_Template_Group');
 			}
 		}
 		//now save
@@ -118,25 +118,25 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function messages_metabox( $event, $callback_args ) {
+	public function messages_metabox($event, $callback_args) {
 		//let's get the active messengers (b/c messenger objects have the active message templates)
 		//convert 'evt_id' to 'EVT_ID'
-		$this->_req_data['EVT_ID'] = isset( $this->_req_data['EVT_ID'] ) ? $this->_req_data['EVT_ID'] : NULL;
-		$this->_req_data['EVT_ID'] = isset( $this->_req_data['post'] ) && empty( $this->_req_data['EVT_ID'] )
+		$this->_req_data['EVT_ID'] = isset($this->_req_data['EVT_ID']) ? $this->_req_data['EVT_ID'] : NULL;
+		$this->_req_data['EVT_ID'] = isset($this->_req_data['post']) && empty($this->_req_data['EVT_ID'])
 			? $this->_req_data['post']
 			: $this->_req_data['EVT_ID'];
 
-		$this->_req_data['EVT_ID'] = empty($this->_req_data['EVT_ID'] ) && isset($this->_req_data['evt_id'] )
+		$this->_req_data['EVT_ID'] = empty($this->_req_data['EVT_ID']) && isset($this->_req_data['evt_id'])
 			? $this->_req_data['evt_id']
 			: $this->_req_data['EVT_ID'];
 		/** @type EE_Message_Resource_Manager $message_resource_manager */
-		$message_resource_manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
+		$message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
 		$active_messengers = $message_resource_manager->active_messengers();
 		$tabs = array();
 
 		//empty messengers?
 		//Note message types will always have at least one available because every messenger has a default message type associated with it (payment) if no other message types are selected.
-		if ( empty( $active_messengers ) ) {
+		if (empty($active_messengers)) {
 			$msg_activate_url = EE_Admin_Page::add_query_args_and_nonce(
 				array('action' => 'settings'),
 				EE_MSG_ADMIN_URL
@@ -145,11 +145,11 @@ 
 				__('There are no active messengers. So no notifications will go out for %1$sany%2$s events.  You will want to %3$sActivate a Messenger%4$s.', 'event_espresso'),
 				'<strong>',
 				'</strong>',
-				'<a href="' . $msg_activate_url . '">',
+				'<a href="'.$msg_activate_url.'">',
 				'</a>'
 			);
-			$error_content = '<div class="error"><p>' . $error_msg . '</p></div>';
-			$internal_content = '<div id="messages-error"><p>' . $error_msg . '</p></div>';
+			$error_content = '<div class="error"><p>'.$error_msg.'</p></div>';
+			$internal_content = '<div id="messages-error"><p>'.$error_msg.'</p></div>';
 
 			echo $error_content;
 			echo $internal_content;
@@ -158,20 +158,20 @@ 
 
 		$event_id = isset($this->_req_data['EVT_ID']) ? $this->_req_data['EVT_ID'] : NULL;
 		//get content for active messengers
-		foreach ( $active_messengers as $name => $messenger ) {
+		foreach ($active_messengers as $name => $messenger) {
 			//first check if there are any active message types for this messenger.
-			$active_mts = $message_resource_manager->get_active_message_types_for_messenger( $name );
-			if ( empty( $active_mts ) ) {
+			$active_mts = $message_resource_manager->get_active_message_types_for_messenger($name);
+			if (empty($active_mts)) {
 				continue;
 			}
 
 			$tab_content = $messenger->get_messenger_admin_page_content(
 				'events',
 				'edit',
-				array( 'event' => $event_id )
+				array('event' => $event_id)
 			);
 
-			if ( ! empty( $tab_content ) ) {
+			if ( ! empty($tab_content)) {
 				$tabs[$name] = $tab_content;
 			}
 		}
@@ -179,23 +179,23 @@ 
 
 		//we want this to be tabbed content so let's use the EEH_Tabbed_Content::display helper.
 		$tabbed_content = EEH_Tabbed_Content::display($tabs);
-		if ( $tabbed_content instanceof WP_Error ) {
+		if ($tabbed_content instanceof WP_Error) {
 			$tabbed_content = $tabbed_content->get_error_message();
 		}
 
 		$notices = '
 	<div id="espresso-ajax-loading" class="ajax-loader-grey">
-		<span class="ee-spinner ee-spin"></span><span class="hidden">' . __('loading...', 'event_espresso') . '</span>
+		<span class="ee-spinner ee-spin"></span><span class="hidden">' . __('loading...', 'event_espresso').'</span>
 	</div>
 	<div class="ee-notices"></div>';
 
-		if ( defined('DOING_AJAX' ) ) {
+		if (defined('DOING_AJAX')) {
 			return $tabbed_content;
 		}
 
-		do_action( 'AHEE__espresso_events_Messages_Hooks_Extend__messages_metabox__before_content' );
-		echo $notices . '<div class="messages-tabs-content">' . $tabbed_content . '</div>';
-		do_action( 'AHEE__espresso_events_Messages_Hooks_Extend__messages_metabox__after_content' );
+		do_action('AHEE__espresso_events_Messages_Hooks_Extend__messages_metabox__before_content');
+		echo $notices.'<div class="messages-tabs-content">'.$tabbed_content.'</div>';
+		do_action('AHEE__espresso_events_Messages_Hooks_Extend__messages_metabox__after_content');
 
 	}
 
@@ -210,15 +210,15 @@ 
 	 */
 	public function create_new_custom() {
 
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_edit_messages', 'create_new_custom_ajax' ) ) {
-			wp_die( __('You don\'t have privileges to do this action', 'event_espresso' ) );
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_edit_messages', 'create_new_custom_ajax')) {
+			wp_die(__('You don\'t have privileges to do this action', 'event_espresso'));
 		}
 
 		//let's clean up the _POST global a bit for downstream usage of name and description.
-		$_POST['templateName'] = !empty( $this->_req_data['custom_template_args']['MTP_name'] )
+		$_POST['templateName'] = ! empty($this->_req_data['custom_template_args']['MTP_name'])
 			? $this->_req_data['custom_template_args']['MTP_name']
 			: '';
-		$_POST['templateDescription'] = !empty( $this->_req_data['custom_template_args']['MTP_description'] )
+		$_POST['templateDescription'] = ! empty($this->_req_data['custom_template_args']['MTP_description'])
 			? $this->_req_data['custom_template_args']['MTP_description']
 			: '';
 
@@ -227,7 +227,7 @@ 
 		$this->_set_page_object();
 
 		// is this a template switch if so EE_Admin_Page child needs this object
-		$this->_page_object->set_hook_object( $this );
+		$this->_page_object->set_hook_object($this);
 
 		$this->_page_object->add_message_template(
 			$this->_req_data['messageType'],
@@ -251,7 +251,7 @@ 
 	 */
 	public function edit_admin_footer() {
 		EEH_Template::display_template(
-			EE_CORE_CAF_ADMIN_EXTEND . 'messages/templates/create_custom_template_form.template.php'
+			EE_CORE_CAF_ADMIN_EXTEND.'messages/templates/create_custom_template_form.template.php'
 		);
 	}
 

caffeinated/payment_methods/Mijireh/EEG_Mijireh.gateway.php

Indentation +31 added lines, -31 removed lines

@@ -99,45 +99,45 @@
 		'body'=>  json_encode($order)
 		);
 		$response = wp_remote_post( $this->_mijireh_api_orders_url, $args );
-                $problems_string = false;
+				$problems_string = false;
 		$this->log(array('get checkout url request_args' => $args, 'response' => $response ), $payment);
 		if( ! $response instanceof WP_Error ){
 			$response_body = json_decode($response['body']);
 			if($response_body && isset($response_body->checkout_url)){
-                            $payment->set_redirect_url($response_body->checkout_url);
-                            $payment->set_txn_id_chq_nmbr($response_body->order_number);
-                            $payment->set_details($response['body']);
+							$payment->set_redirect_url($response_body->checkout_url);
+							$payment->set_txn_id_chq_nmbr($response_body->order_number);
+							$payment->set_details($response['body']);
 			} else {
-                           if( is_array( $response_body ) || is_object( $response_body)){
-                                    $response_body_as_array = (array)$response_body;
-                                    foreach($response_body_as_array as $problem_parameter => $problems){
-                                            $problems_string.= sprintf(__('\nProblems with %s: %s','event_espresso'),$problem_parameter,implode(", ",$problems));
-                                    }
-                            }else{
-                                    $problems_string = $response['body'];
-                            }
-                            if( ! $problems_string ) {
-                                //no message to show? wack
-                                if( isset( $response[ 'headers' ][ 'status' ] ) ){
-                                        $problems_string = $response[ 'headers' ][ 'status' ];
-                                }else{
-                                        $problems_string = __( 'No response from Mijireh', 'event_espresso' );
-                                }
-                            }
-                        }
+						   if( is_array( $response_body ) || is_object( $response_body)){
+									$response_body_as_array = (array)$response_body;
+									foreach($response_body_as_array as $problem_parameter => $problems){
+											$problems_string.= sprintf(__('\nProblems with %s: %s','event_espresso'),$problem_parameter,implode(", ",$problems));
+									}
+							}else{
+									$problems_string = $response['body'];
+							}
+							if( ! $problems_string ) {
+								//no message to show? wack
+								if( isset( $response[ 'headers' ][ 'status' ] ) ){
+										$problems_string = $response[ 'headers' ][ 'status' ];
+								}else{
+										$problems_string = __( 'No response from Mijireh', 'event_espresso' );
+								}
+							}
+						}
 		}else{
-                    $problems_string = implode( ",", $response->get_error_messages() );
+					$problems_string = implode( ",", $response->get_error_messages() );
 		}
                 
-                if( $problems_string ) {
-                    $payment->set_gateway_response( sprintf( __( 'Errors occurred communicating with Mijireh: %1$s', 'event_espresso'), $problems_string ) );
-                    $payment->set_details( $response );
-                    $payment->set_redirect_url( null );
-                    //even though the payment's status is failed at this point anyways,
-                    //let's be explicit about it. The fact that the redirect url is null
-                    //should be enough to client code that they can't redirect the user
-                    $payment->set_status( $this->_pay_model->failed_status() );
-                }
+				if( $problems_string ) {
+					$payment->set_gateway_response( sprintf( __( 'Errors occurred communicating with Mijireh: %1$s', 'event_espresso'), $problems_string ) );
+					$payment->set_details( $response );
+					$payment->set_redirect_url( null );
+					//even though the payment's status is failed at this point anyways,
+					//let's be explicit about it. The fact that the redirect url is null
+					//should be enough to client code that they can't redirect the user
+					$payment->set_status( $this->_pay_model->failed_status() );
+				}
 		return $payment;
 	}
 

Braces +6 added lines, -6 removed lines

@@ -48,7 +48,7 @@ 
 					'quantity'=>$line_item->quantity()
 				);
 			}
-		}else{//its a partial payment
+		} else{//its a partial payment
 			$tax_total = 0;
 			//partial payment, so just add 1 item
 			$items[] = array(
@@ -113,19 +113,19 @@ 
                                     foreach($response_body_as_array as $problem_parameter => $problems){
                                             $problems_string.= sprintf(__('\nProblems with %s: %s','event_espresso'),$problem_parameter,implode(", ",$problems));
                                     }
-                            }else{
+                            } else{
                                     $problems_string = $response['body'];
                             }
                             if( ! $problems_string ) {
                                 //no message to show? wack
                                 if( isset( $response[ 'headers' ][ 'status' ] ) ){
                                         $problems_string = $response[ 'headers' ][ 'status' ];
-                                }else{
+                                } else{
                                         $problems_string = __( 'No response from Mijireh', 'event_espresso' );
                                 }
                             }
                         }
-		}else{
+		} else{
                     $problems_string = implode( ",", $response->get_error_messages() );
 		}
                 
@@ -156,9 +156,9 @@ 
 				$prepared_data[ $key ] = $this->_prepare_for_mijireh( $datum );
 			}
 			return $prepared_data;
-		}elseif(is_string( $data ) ){
+		} elseif(is_string( $data ) ){
 			return str_replace( '%', 'percent', $data );
-		}else{
+		} else{
 			return $data;
 		}
 	}

Spacing +59 added lines, -59 removed lines

@@ -8,7 +8,7 @@ 
  * @author				Mike Nelson
  *
  */
-class EEG_Mijireh extends EE_Offsite_Gateway{
+class EEG_Mijireh extends EE_Offsite_Gateway {
 
 	protected $_access_key;
 
@@ -37,14 +37,14 @@ 
 		$primary_attendee = $primary_registrant->attendee();
 		$items = array();
 		//if we're are charging for the full amount, show the normal line items
-		if( $this->_can_easily_itemize_transaction_for( $payment )){
+		if ($this->_can_easily_itemize_transaction_for($payment)) {
 			$total_line_item = $transaction->total_line_item();
 			$tax_total = $total_line_item->get_total_tax();
-			foreach($total_line_item->get_items() as $line_item){
+			foreach ($total_line_item->get_items() as $line_item) {
 				$items[] = array(
 					'name'=>apply_filters(
 						'FHEE__EEG_Mijireh__set_redirection_info__full_amount_line_item_name',
-						$this->_format_line_item_name( $line_item, $payment ),
+						$this->_format_line_item_name($line_item, $payment),
 						$line_item,
 						$payment,
 						$primary_registrant
@@ -54,13 +54,13 @@ 
 					'quantity'=>$line_item->quantity()
 				);
 			}
-		}else{//its a partial payment
+		} else {//its a partial payment
 			$tax_total = 0;
 			//partial payment, so just add 1 item
 			$items[] = array(
 				'name'=> apply_filters(
 					'FHEE__EEG_Mijireh__set_redirection_info__partial_amount_line_item_name',
-					$this->_format_partial_payment_line_item_name( $payment ),
+					$this->_format_partial_payment_line_item_name($payment),
 					$payment,
 					$primary_registrant
 				),
@@ -72,18 +72,18 @@ 
 		$order = array(
 			'total'=>$this->format_currency($payment->amount()),
 			'return_url'=>$return_url,
-			'items'=>$this->_prepare_for_mijireh( $items ),
+			'items'=>$this->_prepare_for_mijireh($items),
 			'email'=>$primary_attendee->email(),
 			'first_name'=>$primary_attendee->fname(),
 			'last_name'=>$primary_attendee->lname(),
 			'tax'=>$this->format_currency($tax_total),
 			'partner_id'=>'ee');
 		//setup address?
-		if(		$primary_attendee->address()  &&
-				$primary_attendee->city()  &&
-				$primary_attendee->state_ID()  &&
-				$primary_attendee->country_ID()  &&
-				$primary_attendee->zip()  ){
+		if ($primary_attendee->address() &&
+				$primary_attendee->city() &&
+				$primary_attendee->state_ID() &&
+				$primary_attendee->country_ID() &&
+				$primary_attendee->zip()) {
 			$shipping_address = array(
 				'first_name'=>$primary_attendee->fname(),
 				'last_name'=>$primary_attendee->lname(),
@@ -93,62 +93,62 @@ 
 				'zip_code' => $primary_attendee->zip(),
 				'country' => $primary_attendee->country_ID()
 			);
-			if( $primary_attendee->address2() ){
-				$shipping_address[ 'apt_suite' ] = $primary_attendee->address2();
+			if ($primary_attendee->address2()) {
+				$shipping_address['apt_suite'] = $primary_attendee->address2();
 			}
-			if( $primary_attendee->phone() ){
-				$shipping_address[ 'phone' ] = $primary_attendee->phone();
+			if ($primary_attendee->phone()) {
+				$shipping_address['phone'] = $primary_attendee->phone();
 			}
-			$order[ 'shipping_address' ] = $shipping_address;
+			$order['shipping_address'] = $shipping_address;
 		}
-		$order = apply_filters( 'FHEE__EEG_Mijireh__set_redirection_info__order_arguments', $order, $payment, $primary_registrant );
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, serialize(get_object_vars($this)) );
+		$order = apply_filters('FHEE__EEG_Mijireh__set_redirection_info__order_arguments', $order, $payment, $primary_registrant);
+		do_action('AHEE_log', __FILE__, __FUNCTION__, serialize(get_object_vars($this)));
 		$args = array(
 			'headers' => array(
-				'Authorization' => 'Basic ' . base64_encode( $this->_access_key . ':' ),
+				'Authorization' => 'Basic '.base64_encode($this->_access_key.':'),
 				'Accept'=>'application/json'
 			),
 			'body'=>  json_encode($order)
 		);
-		$response = wp_remote_post( $this->_mijireh_api_orders_url, $args );
+		$response = wp_remote_post($this->_mijireh_api_orders_url, $args);
                 $problems_string = false;
-		$this->log(array('get checkout url request_args' => $args, 'response' => $response ), $payment);
-		if( ! $response instanceof WP_Error ){
+		$this->log(array('get checkout url request_args' => $args, 'response' => $response), $payment);
+		if ( ! $response instanceof WP_Error) {
 			$response_body = json_decode($response['body']);
-			if($response_body && isset($response_body->checkout_url)){
+			if ($response_body && isset($response_body->checkout_url)) {
                             $payment->set_redirect_url($response_body->checkout_url);
                             $payment->set_txn_id_chq_nmbr($response_body->order_number);
                             $payment->set_details($response['body']);
 			} else {
-                           if( is_array( $response_body ) || is_object( $response_body)){
-                                    $response_body_as_array = (array)$response_body;
-                                    foreach($response_body_as_array as $problem_parameter => $problems){
-                                            $problems_string.= sprintf(__('\nProblems with %s: %s','event_espresso'),$problem_parameter,implode(", ",$problems));
+                           if (is_array($response_body) || is_object($response_body)) {
+                                    $response_body_as_array = (array) $response_body;
+                                    foreach ($response_body_as_array as $problem_parameter => $problems) {
+                                            $problems_string .= sprintf(__('\nProblems with %s: %s', 'event_espresso'), $problem_parameter, implode(", ", $problems));
                                     }
-                            }else{
+                            } else {
                                     $problems_string = $response['body'];
                             }
-                            if( ! $problems_string ) {
+                            if ( ! $problems_string) {
                                 //no message to show? wack
-                                if( isset( $response[ 'headers' ][ 'status' ] ) ){
-                                        $problems_string = $response[ 'headers' ][ 'status' ];
-                                }else{
-                                        $problems_string = __( 'No response from Mijireh', 'event_espresso' );
+                                if (isset($response['headers']['status'])) {
+                                        $problems_string = $response['headers']['status'];
+                                } else {
+                                        $problems_string = __('No response from Mijireh', 'event_espresso');
                                 }
                             }
                         }
-		}else{
-                    $problems_string = implode( ",", $response->get_error_messages() );
+		} else {
+                    $problems_string = implode(",", $response->get_error_messages());
 		}
                 
-                if( $problems_string ) {
-                    $payment->set_gateway_response( sprintf( __( 'Errors occurred communicating with Mijireh: %1$s', 'event_espresso'), $problems_string ) );
-                    $payment->set_details( $response );
-                    $payment->set_redirect_url( null );
+                if ($problems_string) {
+                    $payment->set_gateway_response(sprintf(__('Errors occurred communicating with Mijireh: %1$s', 'event_espresso'), $problems_string));
+                    $payment->set_details($response);
+                    $payment->set_redirect_url(null);
                     //even though the payment's status is failed at this point anyways,
                     //let's be explicit about it. The fact that the redirect url is null
                     //should be enough to client code that they can't redirect the user
-                    $payment->set_status( $this->_pay_model->failed_status() );
+                    $payment->set_status($this->_pay_model->failed_status());
                 }
 		return $payment;
 	}
@@ -161,16 +161,16 @@ 
 	 * @param mixed $data
 	 * @return mixed same type as $data
 	 */
-	private function _prepare_for_mijireh( $data ){
-		if( is_array( $data ) ){
+	private function _prepare_for_mijireh($data) {
+		if (is_array($data)) {
 			$prepared_data = array();
-			foreach($data as $key => $datum ){
-				$prepared_data[ $key ] = $this->_prepare_for_mijireh( $datum );
+			foreach ($data as $key => $datum) {
+				$prepared_data[$key] = $this->_prepare_for_mijireh($datum);
 			}
 			return $prepared_data;
-		}elseif(is_string( $data ) ){
-			return str_replace( '%', 'percent', $data );
-		}else{
+		}elseif (is_string($data)) {
+			return str_replace('%', 'percent', $data);
+		} else {
 			return $data;
 		}
 	}
@@ -191,30 +191,30 @@ 
 
 		$payment = $transaction instanceof EEI_Transaction ? $transaction->last_payment() : NULL;
 
-		if ( ! $payment instanceof EEI_Payment ){
-			throw new EE_Error( sprintf( __( "Could not find Mijireh payment for transaction %s", 'event_espresso' ), $transaction->ID() ) );
+		if ( ! $payment instanceof EEI_Payment) {
+			throw new EE_Error(sprintf(__("Could not find Mijireh payment for transaction %s", 'event_espresso'), $transaction->ID()));
 		}
 
 		$request_args = array(
 			'headers' => array(
-				'Authorization' => 'Basic ' . base64_encode( $this->_access_key . ':' ),
+				'Authorization' => 'Basic '.base64_encode($this->_access_key.':'),
 				'Accept'=>'application/json'
 			)
 		);
 
 		$response = wp_remote_get(
-			$this->_mijireh_api_orders_url . '/' . $payment->txn_id_chq_nmbr(),
+			$this->_mijireh_api_orders_url.'/'.$payment->txn_id_chq_nmbr(),
 			$request_args
 		);
 
 		$this->log(
-			array( 'get payment status request_args' => $request_args, 'response' => $response ),
+			array('get payment status request_args' => $request_args, 'response' => $response),
 			$payment
 		);
 		// validate response
-		$response_body = isset( $response[ 'body' ] ) ? json_decode( $response[ 'body' ] ) : '';
-		if( $response && $response_body ){
-			switch( $response_body->status ){
+		$response_body = isset($response['body']) ? json_decode($response['body']) : '';
+		if ($response && $response_body) {
+			switch ($response_body->status) {
 				case 'paid':
 					$payment->set_status($this->_pay_model->approved_status());
 					break;
@@ -226,9 +226,9 @@ 
 			}
 
 		} else {
-			$payment->set_gateway_response( __( 'Response from Mijireh could not be understood.', 'event_espresso' ) );
-			$payment->set_details( $response );
-			$payment->set_status( $this->_pay_model->failed_status() );
+			$payment->set_gateway_response(__('Response from Mijireh could not be understood.', 'event_espresso'));
+			$payment->set_details($response);
+			$payment->set_status($this->_pay_model->failed_status());
 		}
 		// the following is ONLY for testing the Mijireh IPN and should NEVER be uncommented for real usage
 //		$payment->set_status( $this->_pay_model->pending_status() );

caffeinated/payment_methods/Mijireh/templates/mijireh_settings_after_form.template.php

Indentation +6 added lines, -6 removed lines

@@ -1,12 +1,12 @@
 <?php if (!defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
- * mijireh_settings_after_form
- *
- * @package			Event Espresso
- * @subpackage
- * @author				Mike Nelson
- */
+	 * mijireh_settings_after_form
+	 *
+	 * @package			Event Espresso
+	 * @subpackage
+	 * @author				Mike Nelson
+	 */
 do_action('AHEE__EE_Mijireh__settings_end');
 ?><br/><?php
 // End of file mijireh_settings_after_form.template.php
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php if (!defined('EVENT_ESPRESSO_VERSION'))
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
  * mijireh_settings_after_form

Braces +2 added lines, -1 removed lines

@@ -1,5 +1,6 @@
-<?php if (!defined('EVENT_ESPRESSO_VERSION'))
+<?php if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 /**
  * mijireh_settings_after_form
  *

core/db_classes/EE_Post_Meta.class.php

Spacing +19 added lines, -19 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -30,9 +30,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Post_Meta|mixed
 	 */
-	public static function new_instance( $props_n_values = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values );
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values);
 	}
 
 
@@ -41,8 +41,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Post_Meta
 	 */
-	public static function new_instance_from_db( $props_n_values = array() ) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 
 
@@ -52,7 +52,7 @@ 
 	 * @return int
 	 */
 	function meta_id() {
-		return $this->get( 'meta_id' );
+		return $this->get('meta_id');
 	}
 
 
@@ -62,15 +62,15 @@ 
 	 * @param int $meta_id
 	 * @return boolean
 	 */
-	function set_meta_id( $meta_id) {
-		return $this->set( 'meta_id', $meta_id);
+	function set_meta_id($meta_id) {
+		return $this->set('meta_id', $meta_id);
 	}
 	/**
 	 * Gets post_id
 	 * @return int
 	 */
 	function post_id() {
-		return $this->get( 'post_id' );
+		return $this->get('post_id');
 	}
 
 
@@ -80,15 +80,15 @@ 
 	 * @param int $post_id
 	 * @return boolean
 	 */
-	function set_post_id( $post_id) {
-		return $this->set( 'post_id', $post_id);
+	function set_post_id($post_id) {
+		return $this->set('post_id', $post_id);
 	}
 	/**
 	 * Gets meta_key
 	 * @return string
 	 */
 	function meta_key() {
-		return $this->get( 'meta_key' );
+		return $this->get('meta_key');
 	}
 
 
@@ -98,15 +98,15 @@ 
 	 * @param string $meta_key
 	 * @return boolean
 	 */
-	function set_meta_key( $meta_key) {
-		return $this->set( 'meta_key', $meta_key);
+	function set_meta_key($meta_key) {
+		return $this->set('meta_key', $meta_key);
 	}
 	/**
 	 * Gets meta_value
 	 * @return mixed
 	 */
 	function meta_value() {
-		return $this->get( 'meta_value' );
+		return $this->get('meta_value');
 	}
 
 
@@ -116,8 +116,8 @@ 
 	 * @param mixed $meta_value
 	 * @return boolean
 	 */
-	function set_meta_value( $meta_value) {
-		return $this->set( 'meta_value', $meta_value);
+	function set_meta_value($meta_value) {
+		return $this->set('meta_value', $meta_value);
 	}
 
 

Doc Comments +4 added lines, -4 removed lines

@@ -60,7 +60,7 @@ 
 	/**
 	 * Sets meta_id
 	 * @param int $meta_id
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_meta_id( $meta_id) {
 		return $this->set( 'meta_id', $meta_id);
@@ -78,7 +78,7 @@ 
 	/**
 	 * Sets post_id
 	 * @param int $post_id
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_post_id( $post_id) {
 		return $this->set( 'post_id', $post_id);
@@ -96,7 +96,7 @@ 
 	/**
 	 * Sets meta_key
 	 * @param string $meta_key
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_meta_key( $meta_key) {
 		return $this->set( 'meta_key', $meta_key);
@@ -114,7 +114,7 @@ 
 	/**
 	 * Sets meta_value
 	 * @param mixed $meta_value
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_meta_value( $meta_value) {
 		return $this->set( 'meta_value', $meta_value);