eventespresso / event-espresso-core

caffeinated/admin/extend/events/help_tabs/import_page.help_tab.php

Spacing +8 added lines, -8 removed lines

@@ -2,19 +2,19 @@
 <p>
 <?php _e('The importer can be used to import event information into Event Espresso using a CSV file.', 'event_espresso'); ?>
 </p>
-<h3><?php _e("Importing from other Event Espresso 4 Sites", 'event_espresso');?></h3>
+<h3><?php _e("Importing from other Event Espresso 4 Sites", 'event_espresso'); ?></h3>
 <p>
 <?php _e('To import Event Espresso data from another Event Espresso 4 install, export a CSV file from the admin Events overview page, or anywhere you can generate a CSV export file from. Then upload that file here (regardless of what type of information was exported).', 'event_espresso'); ?>
 </p>
 <p>
 <?php _e('Note: its possible that data from the other site have the same IDs as data in this site. The importer recognizes that this data is from a different database and inserts new items for each item in the CSV file, regardless of whether its ID matches that of an item in this site\'s database or not. However, the importer also remembers the mapping from the old site\'s database to this site\'s database, and on subsequent CSV importers from that site, the data in this database will be updated instead of re-inserting new items.', 'event_espresso'); ?>
 </p>
-<h3><?php _e("Importing from this Site", 'event_espresso');?></h3>
-<p><?php _e("You may want to export data from this site, modify it (or modify the database), and re-import it. When this is done, the importer recognizes that the data is from this site\'s database and updates the records (instead of inserting new items like it would have, had the CSV data been from a different site).", 'event_espresso');?></p>
+<h3><?php _e("Importing from this Site", 'event_espresso'); ?></h3>
+<p><?php _e("You may want to export data from this site, modify it (or modify the database), and re-import it. When this is done, the importer recognizes that the data is from this site\'s database and updates the records (instead of inserting new items like it would have, had the CSV data been from a different site).", 'event_espresso'); ?></p>
 
-	<h3><?php _e("Notes about Generating your own CSV Import Files", "event_espresso");?></h3>
-	<p><?php _e("If you think you could save time entering data into a CSV file, you can use the sample import file below. Note that creating your own CSV file is more complicated than in Event Espresso 3.1 because of the more advanced data structure, and so we recommend creating/editing your events using the normal web-interface.", "event_espresso");?></p>
-	<p><?php _e("The export file is just an export of an event, or if you do not have any events in your system, it will only contain column headers. Do not change those column headers. Add as many rows as you like. ", "event_espresso");?></p>
+	<h3><?php _e("Notes about Generating your own CSV Import Files", "event_espresso"); ?></h3>
+	<p><?php _e("If you think you could save time entering data into a CSV file, you can use the sample import file below. Note that creating your own CSV file is more complicated than in Event Espresso 3.1 because of the more advanced data structure, and so we recommend creating/editing your events using the normal web-interface.", "event_espresso"); ?></p>
+	<p><?php _e("The export file is just an export of an event, or if you do not have any events in your system, it will only contain column headers. Do not change those column headers. Add as many rows as you like. ", "event_espresso"); ?></p>
 	<p><?php _e("In the ID columns (columns ending in '_ID'), you should enter 'temporary IDs', which are unique numbers/words that identify that item, which can be used later when you want to refer to that item. (For example,
-		if you assign an event's EVT_ID to be a temporary id of 'my-event-1', then use that same phrase 'my-event-1' to refer to that event in the Datetime model's EVT_ID column)", "event_espresso");?></p>
-	<p><?php _e("Also note, you do NOT have to enter info in for each model. (You can, for example, only enter in Term_Taxonomies and Term model data)", "event_espresso");?></p>
\ No newline at end of file
+		if you assign an event's EVT_ID to be a temporary id of 'my-event-1', then use that same phrase 'my-event-1' to refer to that event in the Datetime model's EVT_ID column)", "event_espresso"); ?></p>
+	<p><?php _e("Also note, you do NOT have to enter info in for each model. (You can, for example, only enter in Term_Taxonomies and Term model data)", "event_espresso"); ?></p>
\ No newline at end of file

caffeinated/admin/extend/events/qtips/EE_Event_Editor_Tips.lib.php

Spacing +9 added lines, -9 removed lines

@@ -83,7 +83,7 @@ 
 				),
 			7 => array(
 				'content_id' => 'tkt-status-archived',
-				'target' => '.ticket-row .tkt-status-' . EE_Ticket::archived,
+				'target' => '.ticket-row .tkt-status-'.EE_Ticket::archived,
 				'content' => $this->_ticket_status_legend(EE_Ticket::archived),
 				'options' => array(
 					'position' => array(
@@ -96,7 +96,7 @@ 
 				),
 			8 => array(
 				'content_id' => 'tkt-status-expired',
-				'target' => '.ticket-row .tkt-status-' . EE_Ticket::expired,
+				'target' => '.ticket-row .tkt-status-'.EE_Ticket::expired,
 				'content' => $this->_ticket_status_legend(EE_Ticket::expired),
 				'options' => array(
 					'position' => array(
@@ -109,7 +109,7 @@ 
 				),
 			9 => array(
 				'content_id' => 'tkt-status-sold_out',
-				'target' => '.ticket-row .tkt-status-' . EE_Ticket::sold_out,
+				'target' => '.ticket-row .tkt-status-'.EE_Ticket::sold_out,
 				'content' => $this->_ticket_status_legend(EE_Ticket::sold_out),
 				'options' => array(
 					'position' => array(
@@ -122,7 +122,7 @@ 
 				),
 			10 => array(
 				'content_id' => 'tkt-status-pending',
-				'target' => '.ticket-row .tkt-status-' . EE_Ticket::pending,
+				'target' => '.ticket-row .tkt-status-'.EE_Ticket::pending,
 				'content' => $this->_ticket_status_legend(EE_Ticket::pending),
 				'options' => array(
 					'position' => array(
@@ -135,7 +135,7 @@ 
 				),
 			11 => array(
 				'content_id' => 'tkt-status-onsale',
-				'target' => '.ticket-row .tkt-status-' . EE_Ticket::onsale,
+				'target' => '.ticket-row .tkt-status-'.EE_Ticket::onsale,
 				'content' => $this->_ticket_status_legend(EE_Ticket::onsale),
 				'options' => array(
 					'position' => array(
@@ -178,8 +178,8 @@ 
 
 
 	private function _get_taxable_info_content() {
-		$price_admin_link = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default'), PRICING_ADMIN_URL );
-		return '<p>' . sprintf( __('Clicking the taxable ticket toggle checkbox has enabled taxes for this ticket. What this means is that when a person purchases this ticket, the tax will be applied to all prices on this ticket. You can edit the existing tax price modifier that was setup in Event Espresso by going to  %sDefault Pricing Admin Page%s (labelled "Pricing" in the Event Espresso Menu)', 'event_espresso'), '<a href="' . $price_admin_link . '" title="' . esc_attr__('Pricing Admin Page', 'event_espresso') . '">', '</a>' ) . '</p>';
+		$price_admin_link = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default'), PRICING_ADMIN_URL);
+		return '<p>'.sprintf(__('Clicking the taxable ticket toggle checkbox has enabled taxes for this ticket. What this means is that when a person purchases this ticket, the tax will be applied to all prices on this ticket. You can edit the existing tax price modifier that was setup in Event Espresso by going to  %sDefault Pricing Admin Page%s (labelled "Pricing" in the Event Espresso Menu)', 'event_espresso'), '<a href="'.$price_admin_link.'" title="'.esc_attr__('Pricing Admin Page', 'event_espresso').'">', '</a>').'</p>';
 	}
 
 	/**
@@ -187,7 +187,7 @@ 
 	 * @param  EE_Ticket constant $status What status is set (by class)
 	 * @return string         The status legend with the related status highlighted
 	 */
-	private function _ticket_status_legend( $status ) {
+	private function _ticket_status_legend($status) {
 
 		$status_array = array(
 			'archived' => EE_Ticket::archived,
@@ -197,6 +197,6 @@ 
 			'onsale' => EE_Ticket::onsale
 			);
 
-		return EEH_Template::status_legend( $status_array, $status );
+		return EEH_Template::status_legend($status_array, $status);
 	}
 }

caffeinated/admin/extend/events/templates/event_datetime_metabox_clone_button.template.php

Spacing +1 added lines, -1 removed lines

@@ -1,3 +1,3 @@
 <a class='clone-date-time dtm-inp-btn' rel='<?php echo $row; ?>' title='<?php esc_attr_e('Clone this Event Date and Time', 'event_espresso'); ?>' style='position:relative; top:5px; margin:0 0 0 10px; font-size:.9em; cursor:pointer;'>
-	<img src='<?php echo EE_IMAGES_URL;?>clone-trooper-16x16.png' width='16' height='16' alt='<?php esc_attr_e('clone', 'event_espresso'); ?>'/>
+	<img src='<?php echo EE_IMAGES_URL; ?>clone-trooper-16x16.png' width='16' height='16' alt='<?php esc_attr_e('clone', 'event_espresso'); ?>'/>
 </a>

caffeinated/admin/extend/events/templates/event_datetime_timezones.template.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php if ( EE_Registry::instance()->CFG->admin->use_event_timezones ) : ?>
+<?php if (EE_Registry::instance()->CFG->admin->use_event_timezones) : ?>
 <div id="timezones-datetimes-dv" class="">
 	<span class="run-in"> <?php _e('Current Time for Event Timezone:', 'event_espresso'); ?> </span>
 	<span class="current-date"> <?php echo $current_date; ?></span>

caffeinated/admin/extend/events/templates/event_registration_options.template.php

Spacing +10 added lines, -10 removed lines

@@ -6,27 +6,27 @@
 <?php
 	$settings_array = array(
 		'max_registrants' => '<p>
-			<label for="max-registrants">' .  __('Maximum number of tickets allowed per order for this event: ', 'event_espresso') . '</label>
-			<input class="ee-numeric" type="text" id="max-registrants" name="additional_limit" value="' . $additional_limit . '" size="4" />
+			<label for="max-registrants">' .  __('Maximum number of tickets allowed per order for this event: ', 'event_espresso').'</label>
+			<input class="ee-numeric" type="text" id="max-registrants" name="additional_limit" value="' . $additional_limit.'" size="4" />
 			</p>',
 		'additional_registration_options' => $additional_registration_options,
 		'display_ticket_selector' => '<p>
-			<label>' . __('Display Ticket Selector', 'event_espresso') . '</label>' . $display_ticket_selector . '</p>',
+			<label>' . __('Display Ticket Selector', 'event_espresso').'</label>'.$display_ticket_selector.'</p>',
 		'alternative_registration_page' => '<p>
-			<label>' . __('Alternative Registration Page', 'event_espresso') . '</label>
-			<input name="externalURL" size="20" type="text" value="' . $_event->external_url() . '">
+			<label>' . __('Alternative Registration Page', 'event_espresso').'</label>
+			<input name="externalURL" size="20" type="text" value="' . $_event->external_url().'">
 			</p>',
 		'event_phone_number' => '<p>
-			<label>' . __('Event Phone Number', 'event_espresso') . '</label>
-			<input name="event_phone" size="20" type="text" value="' . $_event->phone() . '">
+			<label>' . __('Event Phone Number', 'event_espresso').'</label>
+			<input name="event_phone" size="20" type="text" value="' . $_event->phone().'">
 			</p>',
 		'default_registration_status' => '<p>
-			<label>' . __('Default Registration Status', 'event_espresso') . '</label>' . $EVT_default_registration_status . '</p>'
+			<label>' . __('Default Registration Status', 'event_espresso').'</label>'.$EVT_default_registration_status.'</p>'
 		);
 	//filter
-	$settings_array = apply_filters( 'FHEE__caffeinated_event_registration_options__template__settings', $settings_array );
+	$settings_array = apply_filters('FHEE__caffeinated_event_registration_options__template__settings', $settings_array);
 
 	//echo
-	foreach ( $settings_array as $item ) {
+	foreach ($settings_array as $item) {
 		echo $item;
 	}

caffeinated/admin/extend/events/templates/import_page.template.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <div class="import-area">
 	<div class="important-notice">
-		<?php _e( 'The import feature has been disabled because of bugs. It is expected to be put back in place soon.', 'event_espresso' );?>
+		<?php _e('The import feature has been disabled because of bugs. It is expected to be put back in place soon.', 'event_espresso'); ?>
 	</div>
 <?php // echo $form?>
 </div>

caffeinated/admin/extend/general_settings/templates/debug_log_settings.template.php

Spacing +4 added lines, -4 removed lines

@@ -11,12 +11,12 @@ 
 				<?php echo EEH_Template::get_help_tab_link('full_logging_info'); ?>
 			</th>
 			<td>
-				<?php echo EEH_Form_Fields::select_input('use_full_logging', $values, $use_full_logging ); ?>
+				<?php echo EEH_Form_Fields::select_input('use_full_logging', $values, $use_full_logging); ?>
 				<p class="description">
 					<span class="reminder-spn">
 						<?php _e('Please use caution when using this feature. These files may be publicly available.', 'event_espresso'); ?>
 					</span><br/>
-					<?php echo sprintf( __('Once saved, this file will be available at: %s', 'event_espresso'), '<br /><b>/wp-content/uploads/espresso/logs/' . EE_Registry::instance()->CFG->admin->log_file_name() . '</b>' ); ?>
+					<?php echo sprintf(__('Once saved, this file will be available at: %s', 'event_espresso'), '<br /><b>/wp-content/uploads/espresso/logs/'.EE_Registry::instance()->CFG->admin->log_file_name().'</b>'); ?>
 				</p>
 
 			</td>
@@ -28,7 +28,7 @@ 
 				<?php echo EEH_Template::get_help_tab_link('remote_logging_info'); ?>
 			</th>
 			<td>
-				<?php echo EEH_Form_Fields::select_input('use_remote_logging', $values, $use_remote_logging ); ?>
+				<?php echo EEH_Form_Fields::select_input('use_remote_logging', $values, $use_remote_logging); ?>
 				<p class="description">
 					<?php _e('Send debugging data to the remote URL below.', 'event_espresso'); ?>
 				</p>
@@ -41,7 +41,7 @@ 
 				<?php echo EEH_Template::get_help_tab_link('remote_logging_url_info'); ?>
 			</th>
 			<td>
-				<input name="remote_logging_url" id="remote_logging_url" size="20" class="regular-text" type="text" value="<?php echo $remote_logging_url;?>" />
+				<input name="remote_logging_url" id="remote_logging_url" size="20" class="regular-text" type="text" value="<?php echo $remote_logging_url; ?>" />
 				<p class="description">
 					<?php _e('Example: http://requestb.in/MY_UNIQUE_ID', 'event_espresso'); ?>
 

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

Spacing +65 added lines, -65 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,7 +30,7 @@ 
 class Custom_Messages_Template_List_Table extends EE_Admin_List_Table {
 
 
-	public function __construct( $admin_page ) {
+	public function __construct($admin_page) {
 		//Set parent defaults
 		parent::__construct($admin_page);
 	}
@@ -39,8 +39,8 @@ 
 
 
 	protected function _setup_data() {
-		$this->_data = $this->_admin_page->get_message_templates( $this->_per_page, $this->_view, FALSE, FALSE, FALSE );
-		$this->_all_data_count = $this->_admin_page->get_message_templates( $this->_per_page, $this->_view, TRUE, TRUE, FALSE );
+		$this->_data = $this->_admin_page->get_message_templates($this->_per_page, $this->_view, FALSE, FALSE, FALSE);
+		$this->_all_data_count = $this->_admin_page->get_message_templates($this->_per_page, $this->_view, TRUE, TRUE, FALSE);
 	}
 
 
@@ -49,8 +49,8 @@ 
 
 	protected function _set_properties() {
 		$this->_wp_list_args = array(
-			'singular' => __('Message Template Group', 'event_espresso' ),
-			'plural' => __('Message Template', 'event_espresso' ),
+			'singular' => __('Message Template Group', 'event_espresso'),
+			'plural' => __('Message Template', 'event_espresso'),
 			'ajax' => TRUE, //for now,
 			'screen' => $this->_admin_page->get_current_screen()->id
 			);
@@ -59,15 +59,15 @@ 
 			'cb' => '<input type="checkbox" />',
 			'name' => __('Template Name', 'event_espresso'),
 			'message_type' => __('Message Type', 'event_espresso'),
-			'messenger' => __( 'Messenger', 'event_espresso'),
-			'description' => __( 'Description', 'event_espresso' ),
-			'events' => __( 'Events', 'event_espresso'), //count of events using this template.
+			'messenger' => __('Messenger', 'event_espresso'),
+			'description' => __('Description', 'event_espresso'),
+			'events' => __('Events', 'event_espresso'), //count of events using this template.
 			'actions' => ''
 			//'messages_sent' => __( 'Total Sent', 'event_espresso' ) //todo this will come later when we've got message tracking in place.
 			);
 
 		$this->_sortable_columns = array(
-			'messenger' => array( 'MTP_messenger' => TRUE ),
+			'messenger' => array('MTP_messenger' => TRUE),
 			//'message_type' => array( 'MTP_message_type' => FALSE )
 			);
 
@@ -86,16 +86,16 @@ 
 	 *
 	 * @return string
 	 */
-	public function single_row( $item ) {
+	public function single_row($item) {
 		$message_type = $item->message_type_obj();
 		$messenger = $item->messenger_obj();
 
-		if ( ! $message_type instanceof EE_message_type || ! $messenger instanceof EE_messenger ) {
+		if ( ! $message_type instanceof EE_message_type || ! $messenger instanceof EE_messenger) {
 			echo '';
 			return;
 		}
 
-		parent::single_row( $item );
+		parent::single_row($item);
 	}
 
 
@@ -103,29 +103,29 @@ 
 
 	protected function _get_table_filters() {
 		$filters = array();
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
+		EE_Registry::instance()->load_helper('Form_Fields');
 		$messengers = $this->_admin_page->get_active_messengers();
 		$message_types = $this->_admin_page->get_installed_message_types();
 
 
 		//setup messengers for selects
-		$i=1;
+		$i = 1;
 		$m_values[0]['id'] = 'all';
-		$m_values[0]['text'] = __('All Messengers', 'event_espresso' );
-		foreach ( $messengers as $messenger => $args ) {
+		$m_values[0]['text'] = __('All Messengers', 'event_espresso');
+		foreach ($messengers as $messenger => $args) {
 			$m_values[$i]['id'] = $messenger;
 			$m_values[$i]['text'] = ucwords($args['obj']->label['singular']);
 			$i++;
 		}
-		foreach ( $messengers as $messenger => $args ) {
+		foreach ($messengers as $messenger => $args) {
 			$m_values[$i]['id'] = $messenger;
 			$m_values[$i]['text'] = ucwords($args['obj']->label['singular']);
 			$i++;
 		}
 
 		//lets do the same for message types
-		$i=1;
-		foreach ( $message_types as $message_type => $args ) {
+		$i = 1;
+		foreach ($message_types as $message_type => $args) {
 			$mt_values[$i]['id'] = $message_type;
 			$mt_values[$i]['text'] = ucwords($args['obj']->label['singular']);
 			$i++;
@@ -141,28 +141,28 @@ 
 			'text' => __('Show All', 'event_espresso')
 			);
 
-		$msgr_filters = !empty($m_values) ? array_merge( $msgr_default, $m_values ) : array();
-		$mt_filters = !empty($mt_values) ? array_merge( $mt_default, $mt_values ) : array();
+		$msgr_filters = ! empty($m_values) ? array_merge($msgr_default, $m_values) : array();
+		$mt_filters = ! empty($mt_values) ? array_merge($mt_default, $mt_values) : array();
 
-		if ( empty( $m_values ) )
+		if (empty($m_values))
 			$msgr_filters[0] = array(
 				'id' => 'no_messenger_options',
 				'text' => __('No Messengers active', 'event_espresso')
 				);
 
-		if ( empty($mt_values) )
+		if (empty($mt_values))
 			$mt_filters[0] = array(
 				'id' => 'no_message_type_options',
 				'text' => __('No Message Types active', 'event_espresso')
 				);
 
-		if ( count( $messengers ) >= 1  && !empty( $m_values ) ) {
-			unset( $msgr_filters[0] );
-			$msgr_filters = array_values( $msgr_filters ); //reindex keys
+		if (count($messengers) >= 1 && ! empty($m_values)) {
+			unset($msgr_filters[0]);
+			$msgr_filters = array_values($msgr_filters); //reindex keys
 		}
 
-		$filters[] = EEH_Form_Fields::select_input('ee_messenger_filter_by', $msgr_filters, isset($this->_req_data['ee_messenger_filter_by']) ? sanitize_key( $this->_req_data['ee_messenger_filter_by']) : '' );
-		$filters[] = EEH_Form_Fields::select_input('ee_message_type_filter_by', $mt_filters, isset($this->_req_data['ee_message_type_filter_by']) ? sanitize_key( $this->_req_data['ee_message_type_filter_by']) : '');
+		$filters[] = EEH_Form_Fields::select_input('ee_messenger_filter_by', $msgr_filters, isset($this->_req_data['ee_messenger_filter_by']) ? sanitize_key($this->_req_data['ee_messenger_filter_by']) : '');
+		$filters[] = EEH_Form_Fields::select_input('ee_message_type_filter_by', $mt_filters, isset($this->_req_data['ee_message_type_filter_by']) ? sanitize_key($this->_req_data['ee_message_type_filter_by']) : '');
 		return $filters;
 	}
 
@@ -170,14 +170,14 @@ 
 	 * we're just removing the search box for message templates, not needed.
 	 * @return string (empty);
 	 */
-	function search_box( $text, $input_id ) {
+	function search_box($text, $input_id) {
 		return '';
 	}
 
 
 	protected function _add_view_counts() {
-		foreach ( $this->_views as $view => $args )  {
-			$this->_views[$view]['count'] = $this->_admin_page->get_message_templates( $this->_per_page, $view, TRUE, TRUE, FALSE );
+		foreach ($this->_views as $view => $args) {
+			$this->_views[$view]['count'] = $this->_admin_page->get_message_templates($this->_per_page, $view, TRUE, TRUE, FALSE);
 		}
 	}
 
@@ -191,16 +191,16 @@ 
 	 * @return string
 	 */
 	public function no_items() {
-		if ( $this->_view !== 'trashed' )
-			printf( __('%sNo Custom Templates found.%s To create your first custom message template, go to the "Default Message Templates" tab and click the "Create Custom" button next to the template you want to use as a base for the new one.', 'event_espresso'), '<strong>', '</strong>' );
+		if ($this->_view !== 'trashed')
+			printf(__('%sNo Custom Templates found.%s To create your first custom message template, go to the "Default Message Templates" tab and click the "Create Custom" button next to the template you want to use as a base for the new one.', 'event_espresso'), '<strong>', '</strong>');
 		else
 			parent::no_items();
 	}
 
 
 
-	public function column_cb( $item ) {
-		return sprintf( '<input type="checkbox" name="checkbox[%s] value="1" />', $item->GRP_ID() );
+	public function column_cb($item) {
+		return sprintf('<input type="checkbox" name="checkbox[%s] value="1" />', $item->GRP_ID());
 	}
 
 
@@ -208,29 +208,29 @@ 
 
 
 
-	function column_name( $item ) {
-		return '<p>' . $item->name() . '</p>';
+	function column_name($item) {
+		return '<p>'.$item->name().'</p>';
 	}
 
 
 
 
-	function column_description( $item ) {
-		return '<p>' . $item->description() . '</p>';
+	function column_description($item) {
+		return '<p>'.$item->description().'</p>';
 	}
 
 
 
-	function column_actions( $item ) {
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_messages', 'espresso_messages_add_new_message_template' ) ) {
+	function column_actions($item) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_messages', 'espresso_messages_add_new_message_template')) {
 			$create_args = array(
 				'GRP_ID' => $item->ID(),
 				'messenger' => $item->messenger(),
 				'message_type' => $item->message_type(),
 				'action' => 'add_new_message_template'
 				);
-			$create_link = EE_Admin_Page::add_query_args_and_nonce( $create_args, EE_MSG_ADMIN_URL );
-			return sprintf( '<p><a href="%s" class="button button-small">%s</a></p>', $create_link, __('Create Custom', 'event_espresso') );
+			$create_link = EE_Admin_Page::add_query_args_and_nonce($create_args, EE_MSG_ADMIN_URL);
+			return sprintf('<p><a href="%s" class="button button-small">%s</a></p>', $create_link, __('Create Custom', 'event_espresso'));
 		}
 		return '';
 	}
@@ -247,27 +247,27 @@ 
 		$actions = array();
 
 		// edit link but only if item isn't trashed.
-		if ( !$item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can( 'ee_edit_message', 'espresso_messages_edit_message_template', $item->ID() ) ) {
-			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit_message_template', 'id'=>$item->GRP_ID() ), EE_MSG_ADMIN_URL );
-			$actions['edit'] = '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'Edit Template', 'event_espresso' ) . '">' . __( 'Edit', 'event_espresso' ) . '</a>';
+		if ( ! $item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can('ee_edit_message', 'espresso_messages_edit_message_template', $item->ID())) {
+			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit_message_template', 'id'=>$item->GRP_ID()), EE_MSG_ADMIN_URL);
+			$actions['edit'] = '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Template', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>';
 		}
 
-		$name_link = ! $item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can( 'ee_edit_message', 'espresso_messages_edit_message_template', $item->ID() )? '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'Edit Template', 'event_espresso' ) . '">' . ucwords( $item->messenger_obj()->label['singular'] ) . '</a>' : ucwords( $item->messenger_obj()->label['singular'] );
-		$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'trash_message_template', 'id'=>$item->GRP_ID(), 'noheader' => TRUE ), EE_MSG_ADMIN_URL );
+		$name_link = ! $item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can('ee_edit_message', 'espresso_messages_edit_message_template', $item->ID()) ? '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Template', 'event_espresso').'">'.ucwords($item->messenger_obj()->label['singular']).'</a>' : ucwords($item->messenger_obj()->label['singular']);
+		$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'trash_message_template', 'id'=>$item->GRP_ID(), 'noheader' => TRUE), EE_MSG_ADMIN_URL);
 		// restore link
-		$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'restore_message_template', 'id'=>$item->GRP_ID(), 'noheader' => TRUE ), EE_MSG_ADMIN_URL );
+		$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'restore_message_template', 'id'=>$item->GRP_ID(), 'noheader' => TRUE), EE_MSG_ADMIN_URL);
 		// delete price link
-		$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'delete_message_template', 'id'=>$item->GRP_ID(), 'noheader' => TRUE ), EE_MSG_ADMIN_URL );
+		$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'delete_message_template', 'id'=>$item->GRP_ID(), 'noheader' => TRUE), EE_MSG_ADMIN_URL);
 
-		if ( !$item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can( 'ee_delete_message', 'espresso_messages_trash_message_template', $item->ID() ) ) {
-			$actions['trash'] = '<a href="'.$trash_lnk_url.'" title="' . esc_attr__( 'Move Template Group to Trash', 'event_espresso' ) . '">' . __( 'Move to Trash', 'event_espresso' ) . '</a>';
+		if ( ! $item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can('ee_delete_message', 'espresso_messages_trash_message_template', $item->ID())) {
+			$actions['trash'] = '<a href="'.$trash_lnk_url.'" title="'.esc_attr__('Move Template Group to Trash', 'event_espresso').'">'.__('Move to Trash', 'event_espresso').'</a>';
 		} else {
-			if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_message', 'espresso_messages_restore_message_template', $item->ID() ) ) {
-				$actions['restore'] = '<a href="'.$restore_lnk_url.'" title="' . esc_attr__( 'Restore Message Template', 'event_espresso' ) . '">' . __( 'Restore', 'event_espresso' ) . '</a>';
+			if (EE_Registry::instance()->CAP->current_user_can('ee_delete_message', 'espresso_messages_restore_message_template', $item->ID())) {
+				$actions['restore'] = '<a href="'.$restore_lnk_url.'" title="'.esc_attr__('Restore Message Template', 'event_espresso').'">'.__('Restore', 'event_espresso').'</a>';
 			}
 
-			if ( $this->_view == 'trashed' && EE_Registry::instance()->CAP->current_user_can( 'ee_delete_message', 'espresso_messages_delete_message_template', $item->ID() ) ) {
-				$actions['delete'] = '<a href="'.$delete_lnk_url.'" title="' . esc_attr__( 'Delete Template Group Permanently', 'event_espresso' ) . '">' . __( 'Delete Permanently', 'event_espresso' ) . '</a>';
+			if ($this->_view == 'trashed' && EE_Registry::instance()->CAP->current_user_can('ee_delete_message', 'espresso_messages_delete_message_template', $item->ID())) {
+				$actions['delete'] = '<a href="'.$delete_lnk_url.'" title="'.esc_attr__('Delete Template Group Permanently', 'event_espresso').'">'.__('Delete Permanently', 'event_espresso').'</a>';
 			}
 		}
 
@@ -276,15 +276,15 @@ 
 		$c_configs = $item->contexts_config();
 		$ctxt = array();
 		$context_templates = $item->context_templates();
-		foreach ( $context_templates as $context => $template_fields ) {
-			$mtp_to = !empty( $context_templates[$context]['to'] ) && $context_templates[$context]['to'] instanceof EE_Message_Template ? $context_templates[$context]['to']->get('MTP_content') : NULL;
-			$inactive = empty( $mtp_to ) && !empty( $context_templates[$context]['to'] ) ? ' class="mtp-inactive"' : '';
+		foreach ($context_templates as $context => $template_fields) {
+			$mtp_to = ! empty($context_templates[$context]['to']) && $context_templates[$context]['to'] instanceof EE_Message_Template ? $context_templates[$context]['to']->get('MTP_content') : NULL;
+			$inactive = empty($mtp_to) && ! empty($context_templates[$context]['to']) ? ' class="mtp-inactive"' : '';
 			$context_title = ucwords($c_configs[$context]['label']);
-			$edit_link = EE_Admin_Page::add_query_args_and_nonce( array('action'=>'edit_message_template', 'id'=>$item->GRP_ID(), 'context' => $context), EE_MSG_ADMIN_URL );
-			$ctxt[] = EE_Registry::instance()->CAP->current_user_can( 'ee_edit_message', 'espresso_messages_edit_message_template', $item->ID() ) ? '<a' . $inactive . ' href="'. $edit_link . '" title="' . esc_attr__('Edit Context', 'event_espresso') . '">' . $context_title . '</a>' : $context_title;
+			$edit_link = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit_message_template', 'id'=>$item->GRP_ID(), 'context' => $context), EE_MSG_ADMIN_URL);
+			$ctxt[] = EE_Registry::instance()->CAP->current_user_can('ee_edit_message', 'espresso_messages_edit_message_template', $item->ID()) ? '<a'.$inactive.' href="'.$edit_link.'" title="'.esc_attr__('Edit Context', 'event_espresso').'">'.$context_title.'</a>' : $context_title;
 		}
 
-		$ctx_content = !$item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can( 'ee_edit_message', 'espresso_messages_edit_message_template', $item->ID() ) ? sprintf( __('<strong>%s:</strong> ', 'event_espresso'), ucwords($c_label['plural']) ) . implode(' | ', $ctxt) : '';
+		$ctx_content = ! $item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can('ee_edit_message', 'espresso_messages_edit_message_template', $item->ID()) ? sprintf(__('<strong>%s:</strong> ', 'event_espresso'), ucwords($c_label['plural'])).implode(' | ', $ctxt) : '';
 
 
 		//Return the name contents
@@ -292,7 +292,7 @@ 
 										/* $1%s */ $name_link,
 										/* $2%s */ $item->GRP_ID(),
 										/* %4$s */ $ctx_content,
-										/* $3%s */ $this->row_actions( $actions )
+										/* $3%s */ $this->row_actions($actions)
 		);
 	}
 
@@ -313,7 +313,7 @@ 
 	 * @return string       message_type name
 	 */
 	function column_message_type($item) {
-		return ucwords($item->message_type_obj()->label['singular'] );
+		return ucwords($item->message_type_obj()->label['singular']);
 	}
 
 

Braces +13 added lines, -9 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -144,17 +145,19 @@ 
 		$msgr_filters = !empty($m_values) ? array_merge( $msgr_default, $m_values ) : array();
 		$mt_filters = !empty($mt_values) ? array_merge( $mt_default, $mt_values ) : array();
 
-		if ( empty( $m_values ) )
-			$msgr_filters[0] = array(
+		if ( empty( $m_values ) ) {
+					$msgr_filters[0] = array(
 				'id' => 'no_messenger_options',
 				'text' => __('No Messengers active', 'event_espresso')
 				);
+		}
 
-		if ( empty($mt_values) )
-			$mt_filters[0] = array(
+		if ( empty($mt_values) ) {
+					$mt_filters[0] = array(
 				'id' => 'no_message_type_options',
 				'text' => __('No Message Types active', 'event_espresso')
 				);
+		}
 
 		if ( count( $messengers ) >= 1  && !empty( $m_values ) ) {
 			unset( $msgr_filters[0] );
@@ -191,10 +194,11 @@ 
 	 * @return string
 	 */
 	public function no_items() {
-		if ( $this->_view !== 'trashed' )
-			printf( __('%sNo Custom Templates found.%s To create your first custom message template, go to the "Default Message Templates" tab and click the "Create Custom" button next to the template you want to use as a base for the new one.', 'event_espresso'), '<strong>', '</strong>' );
-		else
-			parent::no_items();
+		if ( $this->_view !== 'trashed' ) {
+					printf( __('%sNo Custom Templates found.%s To create your first custom message template, go to the "Default Message Templates" tab and click the "Create Custom" button next to the template you want to use as a base for the new one.', 'event_espresso'), '<strong>', '</strong>' );
+		} else {
+					parent::no_items();
+		}
 	}
 
 

caffeinated/admin/extend/messages/Extend_Messages_Admin_Page.core.php

Spacing +22 added lines, -22 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -31,18 +31,18 @@ 
 
 
 
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
-		if ( !defined( 'EE_MSG_CAF_ASSETS_PATH' ) ) {
-			define( 'EE_MSG_CAF_ASSETS_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'messages/assets/' );
-			define( 'EE_MSG_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'messages/assets/' );
-			define( 'EE_MSG_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'messages/templates/' );
-			define( 'EE_MSG_CAF_TEMPLATE_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'messages/templates/' );
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
+		if ( ! defined('EE_MSG_CAF_ASSETS_PATH')) {
+			define('EE_MSG_CAF_ASSETS_PATH', EE_CORE_CAF_ADMIN_EXTEND.'messages/assets/');
+			define('EE_MSG_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'messages/assets/');
+			define('EE_MSG_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'messages/templates/');
+			define('EE_MSG_CAF_TEMPLATE_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'messages/templates/');
 		}
 	}
 
 	protected function _extend_page_config() {
-		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'messages';
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'messages';
 		$this->_page_routes['custom_mtps'] = array(
 			'func' => '_ee_custom_messages_overview_list_table',
 			'capability' => 'ee_read_messages' );
@@ -70,7 +70,7 @@ 
 				'require_nonce' => FALSE
 				);
 
-		add_action( 'current_screen', array( $this, 'dynamic_screen_hooks' ), 10 );
+		add_action('current_screen', array($this, 'dynamic_screen_hooks'), 10);
 	}
 
 
@@ -87,12 +87,12 @@ 
 	public function dynamic_screen_hooks() {
 		global $admin_page_hooks;
 
-		if ( !empty( $admin_page_hooks['espresso_events'] ) ) {
+		if ( ! empty($admin_page_hooks['espresso_events'])) {
 			//we're on a EE specific page... good stuff!
 			$hook_prefix = $admin_page_hooks['espresso_events'];
-			$filter_ref = $hook_prefix . '_page_' . $this->page_slug;
-			add_filter( 'FHEE_manage_' . $filter_ref . '_columns', array( $this, 'add_custom_mtps_columns' ), 10, 2 );
-			add_action( 'AHEE__EE_Admin_List_Table__column_actions__' . $filter_ref, array( $this, 'custom_mtp_create_button_column'), 10, 2 );
+			$filter_ref = $hook_prefix.'_page_'.$this->page_slug;
+			add_filter('FHEE_manage_'.$filter_ref.'_columns', array($this, 'add_custom_mtps_columns'), 10, 2);
+			add_action('AHEE__EE_Admin_List_Table__column_actions__'.$filter_ref, array($this, 'custom_mtp_create_button_column'), 10, 2);
 		}
 	}
 
@@ -106,8 +106,8 @@ 
 	 * @param array  $columns   Original defined list of columns
 	 * @param string $screen_id The unique screen id for the page.
 	 */
-	public function add_custom_mtps_columns( $columns, $screen_id ) {
-		if ( $screen_id !== 'espresso_messages_default' ) {
+	public function add_custom_mtps_columns($columns, $screen_id) {
+		if ($screen_id !== 'espresso_messages_default') {
 			return $columns;
 		}
 
@@ -128,13 +128,13 @@ 
 	 *
 	 * @return string html content for the page.
 	 */
-	public function custom_mtp_create_button_column( $item, $screen_id ) {
-		if ( $screen_id !== 'espresso_messages_default' || ! EE_Registry::instance()->CAP->current_user_can( 'ee_edit_messages', 'espresso_messages_add_new_message_template' ) ) {
+	public function custom_mtp_create_button_column($item, $screen_id) {
+		if ($screen_id !== 'espresso_messages_default' || ! EE_Registry::instance()->CAP->current_user_can('ee_edit_messages', 'espresso_messages_add_new_message_template')) {
 			return '';
 		}
 
 		//first we consider whether this template has override set.  If it does then that means no custom templates can be created from this template as a base.  So let's just skip the button creation.
-		if ( $item->get('MTP_is_override' ) )
+		if ($item->get('MTP_is_override'))
 			return '';
 
 
@@ -144,8 +144,8 @@ 
 			'message_type' => $item->message_type(),
 			'action' => 'add_new_message_template'
 			);
-		$create_link = EE_Admin_Page::add_query_args_and_nonce( $create_args, EE_MSG_ADMIN_URL );
-		echo sprintf( '<a href="%s" class="button button-small">%s</a>', $create_link, __('Create Custom', 'event_espresso') );
+		$create_link = EE_Admin_Page::add_query_args_and_nonce($create_args, EE_MSG_ADMIN_URL);
+		echo sprintf('<a href="%s" class="button button-small">%s</a>', $create_link, __('Create Custom', 'event_espresso'));
 	}
 
 
@@ -178,7 +178,7 @@ 
 				)
 			)
 		);
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_messages', 'espresso_messages_trash_message_template' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_messages', 'espresso_messages_trash_message_template')) {
 			$this->_views['trashed'] = array(
 				'slug' => 'trashed',
 				'label' => __('Trash', 'event_espresso'),

Braces +5 added lines, -3 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -134,8 +135,9 @@ 
 		}
 
 		//first we consider whether this template has override set.  If it does then that means no custom templates can be created from this template as a base.  So let's just skip the button creation.
-		if ( $item->get('MTP_is_override' ) )
-			return '';
+		if ( $item->get('MTP_is_override' ) ) {
+					return '';
+		}
 
 
 		$create_args = array(