eventespresso / event-espresso-core

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

Spacing +59 added lines, -59 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);
 	}
@@ -49,8 +49,8 @@ 
 
 
 	protected function _setup_data() {
-		$this->_data = $this->get_admin_page()->get_message_templates( $this->_per_page, $this->_view, FALSE, FALSE, FALSE );
-		$this->_all_data_count = $this->get_admin_page()->get_message_templates( $this->_per_page, $this->_view, TRUE, TRUE, FALSE );
+		$this->_data = $this->get_admin_page()->get_message_templates($this->_per_page, $this->_view, FALSE, FALSE, FALSE);
+		$this->_all_data_count = $this->get_admin_page()->get_message_templates($this->_per_page, $this->_view, TRUE, TRUE, FALSE);
 	}
 
 
@@ -59,8 +59,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->get_admin_page()->get_current_screen()->id
 			);
@@ -69,15 +69,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 )
 			);
 
@@ -96,16 +96,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);
 	}
 
 
@@ -123,8 +123,8 @@ 
 		);
 
 		//set filters to select inputs if they aren't empty
-		foreach ( $select_inputs as $select_input ) {
-			if ( $select_input ) {
+		foreach ($select_inputs as $select_input) {
+			if ($select_input) {
 				$filters[] = $select_input;
 			}
 		}
@@ -135,14 +135,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->get_admin_page()->get_message_templates( $this->_per_page, $view, TRUE, TRUE, FALSE );
+		foreach ($this->_views as $view => $args) {
+			$this->_views[$view]['count'] = $this->get_admin_page()->get_message_templates($this->_per_page, $view, TRUE, TRUE, FALSE);
 		}
 	}
 
@@ -156,16 +156,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());
 	}
 
 
@@ -173,29 +173,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 '';
 	}
@@ -212,27 +212,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>';
 			}
 		}
 
@@ -241,15 +241,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
@@ -257,7 +257,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)
 		);
 	}
 
@@ -278,7 +278,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']);
 	}
 
 
@@ -305,16 +305,16 @@ 
 			)
 		);
 
-		foreach ( $active_message_template_groups_grouped_by_messenger as $active_message_template_group ) {
-			if ( $active_message_template_group instanceof EE_Message_Template_Group ) {
+		foreach ($active_message_template_groups_grouped_by_messenger as $active_message_template_group) {
+			if ($active_message_template_group instanceof EE_Message_Template_Group) {
 				$messenger = $active_message_template_group->messenger_obj();
 				$messenger_label = $messenger instanceof EE_messenger
 					? $messenger->label['singular']
 					: $active_message_template_group->messenger();
-				$messenger_options[ $active_message_template_group->messenger() ] = ucwords( $messenger_label );
+				$messenger_options[$active_message_template_group->messenger()] = ucwords($messenger_label);
 			}
 		}
-		return $this->get_admin_page()->get_messengers_select_input( $messenger_options );
+		return $this->get_admin_page()->get_messengers_select_input($messenger_options);
 	}
 
 
@@ -334,16 +334,16 @@ 
 			)
 		);
 
-		foreach ( $active_message_template_groups_grouped_by_message_type as $active_message_template_group ) {
-			if ( $active_message_template_group instanceof EE_Message_Template_Group ) {
+		foreach ($active_message_template_groups_grouped_by_message_type as $active_message_template_group) {
+			if ($active_message_template_group instanceof EE_Message_Template_Group) {
 				$message_type = $active_message_template_group->message_type_obj();
 				$message_type_label = $message_type instanceof EE_message_type
 					? $message_type->label['singular']
 					: $active_message_template_group->message_type();
-				$message_type_options[ $active_message_template_group->message_type() ] = ucwords( $message_type_label );
+				$message_type_options[$active_message_template_group->message_type()] = ucwords($message_type_label);
 			}
 		}
-		return $this->get_admin_page()->get_message_types_select_input( $message_type_options );
+		return $this->get_admin_page()->get_message_types_select_input($message_type_options);
 	}
 
 }

Braces +7 added lines, -5 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -156,10 +157,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();
+		}
 	}
 
 

admin_pages/messages/Messages_Template_List_Table.class.php

Spacing +39 added lines, -39 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -41,8 +41,8 @@ 
 
 
 	protected function _setup_data() {
-		$this->_data = $this->get_admin_page()->get_message_templates( $this->_per_page, $this->_view, FALSE);
-		$this->_all_data_count = $this->get_admin_page()->get_message_templates( $this->_per_page, $this->_view, TRUE, TRUE );
+		$this->_data = $this->get_admin_page()->get_message_templates($this->_per_page, $this->_view, FALSE);
+		$this->_all_data_count = $this->get_admin_page()->get_message_templates($this->_per_page, $this->_view, TRUE, TRUE);
 	}
 
 
@@ -51,21 +51,21 @@ 
 
 	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->get_admin_page()->get_current_screen()->id
 			);
 		$this->_columns = array(
 			//'cb' => '<input type="checkbox" />', //no deleting default (global) templates!
 			'message_type' => __('Message Type', 'event_espresso'),
-			'messenger' => __( 'Messenger', 'event_espresso'),
-			'description' => __( 'Description', 'event_espresso' ),
+			'messenger' => __('Messenger', 'event_espresso'),
+			'description' => __('Description', 'event_espresso'),
 			//'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 )
 			);
 
@@ -84,16 +84,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);
 	}
 
 
@@ -111,8 +111,8 @@ 
 		);
 
 		//set filters to select inputs if they aren't empty
-		foreach ( $select_inputs as $select_input ) {
-			if ( $select_input ) {
+		foreach ($select_inputs as $select_input) {
+			if ($select_input) {
 				$filters[] = $select_input;
 			}
 		}
@@ -123,20 +123,20 @@ 
 	 * 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->get_admin_page()->get_message_templates( $this->_per_page, $view, TRUE, TRUE );
+		foreach ($this->_views as $view => $args) {
+			$this->_views[$view]['count'] = $this->get_admin_page()->get_message_templates($this->_per_page, $view, TRUE, TRUE);
 		}
 	}
 
 
 
-	public function column_cb( $item ) {
+	public function column_cb($item) {
 		return '';
 	}
 
@@ -144,8 +144,8 @@ 
 
 
 
-	function column_description( $item ) {
-		return '<p>' . $item->message_type_obj()->description . '</p>';
+	function column_description($item) {
+		return '<p>'.$item->message_type_obj()->description.'</p>';
 	}
 
 
@@ -160,27 +160,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 Group', '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 Group', '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 Group', 'event_espresso' ) . '">' . ucwords( $item->messenger_obj()->label['singular'] ) . '</a>' : ucwords( $item->messenger_obj()->label['singular'] );
+		$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 Group', 'event_espresso').'">'.ucwords($item->messenger_obj()->label['singular']).'</a>' : ucwords($item->messenger_obj()->label['singular']);
 
 		//we want to display the contexts in here so we need to set them up
 		$c_label = $item->context_label();
 		$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
@@ -188,7 +188,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)
 		);
 	}
 
@@ -198,7 +198,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']);
 	}
 
 
@@ -225,16 +225,16 @@ 
 			)
 		);
 
-		foreach ( $active_message_template_groups_grouped_by_messenger as $active_message_template_group ) {
-			if ( $active_message_template_group instanceof EE_Message_Template_Group ) {
+		foreach ($active_message_template_groups_grouped_by_messenger as $active_message_template_group) {
+			if ($active_message_template_group instanceof EE_Message_Template_Group) {
 				$messenger = $active_message_template_group->messenger_obj();
 				$messenger_label = $messenger instanceof EE_messenger
 					? $messenger->label['singular']
 					: $active_message_template_group->messenger();
-				$messenger_options[ $active_message_template_group->messenger() ] = ucwords( $messenger_label );
+				$messenger_options[$active_message_template_group->messenger()] = ucwords($messenger_label);
 			}
 		}
-		return $this->get_admin_page()->get_messengers_select_input( $messenger_options );
+		return $this->get_admin_page()->get_messengers_select_input($messenger_options);
 	}
 
 
@@ -254,16 +254,16 @@ 
 			)
 		);
 
-		foreach ( $active_message_template_groups_grouped_by_message_type as $active_message_template_group ) {
-			if ( $active_message_template_group instanceof EE_Message_Template_Group ) {
+		foreach ($active_message_template_groups_grouped_by_message_type as $active_message_template_group) {
+			if ($active_message_template_group instanceof EE_Message_Template_Group) {
 				$message_type = $active_message_template_group->message_type_obj();
 				$message_type_label = $message_type instanceof EE_message_type
 					? $message_type->label['singular']
 					: $active_message_template_group->message_type();
-				$message_type_options[ $active_message_template_group->message_type() ] = ucwords( $message_type_label );
+				$message_type_options[$active_message_template_group->message_type()] = ucwords($message_type_label);
 			}
 		}
-		return $this->get_admin_page()->get_message_types_select_input( $message_type_options );
+		return $this->get_admin_page()->get_message_types_select_input($message_type_options);
 	}
 
 }

Braces +2 added lines, -1 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

core/db_models/EEM_Checkin.model.php

Spacing +8 added lines, -8 removed lines

@@ -23,8 +23,8 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
-require_once ( EE_CLASSES . 'EE_Checkin.class.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
+require_once (EE_CLASSES.'EE_Checkin.class.php');
 
 class EEM_Checkin extends EEM_Base {
 
@@ -40,12 +40,12 @@ 
 	 * 		@param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any incoming timezone data that gets saved).  Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
 	 * 		@return void
 	 */
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Check-In','event_espresso');
-		$this->plural_item = __('Check-Ins','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Check-In', 'event_espresso');
+		$this->plural_item = __('Check-Ins', 'event_espresso');
 
 		$this->_tables = array(
-			'Checkin'=>new EE_Primary_Table('esp_checkin','CHK_ID')
+			'Checkin'=>new EE_Primary_Table('esp_checkin', 'CHK_ID')
 		);
 		$this->_fields = array(
 			'Checkin'=> array(
@@ -53,7 +53,7 @@ 
 				'REG_ID'=>new EE_Foreign_Key_Int_Field('REG_ID', 'Registration Id', false, 0, 'Registration'),
 				'DTT_ID'=>new EE_Foreign_Key_Int_Field('DTT_ID', 'Datetime Id', false, 0, 'Datetime'),
 				'CHK_in'=>new EE_Boolean_Field('CHK_in', 'Whether a person has checked in or checked out', false, true),
-				'CHK_timestamp'=>new EE_Datetime_Field('CHK_timestamp', __('When the row was modified','event_espresso'), false, EE_Datetime_Field::now, $timezone )
+				'CHK_timestamp'=>new EE_Datetime_Field('CHK_timestamp', __('When the row was modified', 'event_espresso'), false, EE_Datetime_Field::now, $timezone)
 			)
 		);
 		$this->_model_relations = array(
@@ -61,7 +61,7 @@ 
 			'Datetime'=>new EE_Belongs_To_Relation()
 		);
 		$this->_model_chain_to_wp_user = 'Registration.Event';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 
 	}
 

Braces +3 added lines, -1 removed lines

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

core/libraries/form_sections/strategies/display/EE_Select2_Display_Strategy.strategy.php

Spacing +13 added lines, -13 removed lines

@@ -12,7 +12,7 @@ 
  * @since 				$VID:$
  *
  */
-class EE_Select2_Display_Strategy extends EE_Select_Display_Strategy{
+class EE_Select2_Display_Strategy extends EE_Select_Display_Strategy {
 
 	/**
 	 * Arguments that will be passed into the select2 javascript constructor
@@ -25,7 +25,7 @@ 
 	 * @param array $select2_js_args pass in the EXACT array of JS arguments you want
 	 * to pass into the select2 js/html input. See https://select2.github.io
 	 */
-	public function __construct( $select2_js_args = array() ) {
+	public function __construct($select2_js_args = array()) {
 		$this->_select2_js_args = $select2_js_args;
 		parent::__construct();
 	}
@@ -37,12 +37,12 @@ 
 	public function enqueue_js() {
 		// need to first deregister the select2 script in case some other plugin **cough cough Toolset Types cough**
 		// is carelessly registering an older version of Select2 on admin pages that don't even belong to them
-		wp_deregister_script( 'select2' );
-		wp_deregister_style( 'select2' );
-		wp_register_script( 'select2', EE_GLOBAL_ASSETS_URL . 'scripts/select2.min.js', array(), '4.0.2', true );
-		wp_register_style( 'select2', EE_GLOBAL_ASSETS_URL . 'css/select2.min.css', array(), '4.0.2', 'all' );
-		wp_enqueue_script( 'form_section_select2_init', EE_GLOBAL_ASSETS_URL . 'scripts/form_section_select2_init.js', array( 'select2' ), '1.0.0', true );
-		wp_enqueue_style( 'select2', EE_GLOBAL_ASSETS_URL . 'css/select2.min.css', array(), '4.0.2', 'all' );
+		wp_deregister_script('select2');
+		wp_deregister_style('select2');
+		wp_register_script('select2', EE_GLOBAL_ASSETS_URL.'scripts/select2.min.js', array(), '4.0.2', true);
+		wp_register_style('select2', EE_GLOBAL_ASSETS_URL.'css/select2.min.css', array(), '4.0.2', 'all');
+		wp_enqueue_script('form_section_select2_init', EE_GLOBAL_ASSETS_URL.'scripts/form_section_select2_init.js', array('select2'), '1.0.0', true);
+		wp_enqueue_style('select2', EE_GLOBAL_ASSETS_URL.'css/select2.min.css', array(), '4.0.2', 'all');
 	}
 
 	/**
@@ -57,7 +57,7 @@ 
 	 * Sets the exact js args which will be passed into the select2 js/html input
 	 * @param array $js_args
 	 */
-	public function set_js_args( $js_args ) {
+	public function set_js_args($js_args) {
 		$this->_select2_js_args = $js_args;
 	}
 
@@ -66,12 +66,12 @@ 
 	 * @param array $other_js_data
 	 * @return array
 	 */
-	public function get_other_js_data( $other_js_data = array() ) {
-		$other_js_data = parent::get_other_js_data( $other_js_data );
-		if( ! isset( $other_js_data[ 'select2s' ] ) ) {
+	public function get_other_js_data($other_js_data = array()) {
+		$other_js_data = parent::get_other_js_data($other_js_data);
+		if ( ! isset($other_js_data['select2s'])) {
 			$other_js_data['select2s'] = array();
 		}
-		$other_js_data[ 'select2s' ][ $this->_input->html_id() ] = $this->get_js_args();
+		$other_js_data['select2s'][$this->_input->html_id()] = $this->get_js_args();
 		return $other_js_data;
 	}
 }
\ No newline at end of file

core/services/commands/CommandHandler.php

Indentation +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 namespace EventEspresso\core\services\commands;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 

core/libraries/form_sections/inputs/EE_Country_Select_Input.php

Spacing +14 added lines, -14 removed lines

@@ -1,4 +1,4 @@ 
-<?php  if ( ! defined( 'EVENT_ESPRESSO_VERSION' )) { exit( 'No direct script access allowed' ); }
+<?php  if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
 /**
  * Class EE_Country_Select_Input
  *
@@ -11,23 +11,23 @@ 
  * @since 				$VID:$
  *
  */
-class EE_Country_Select_Input extends EE_Select_Input{
+class EE_Country_Select_Input extends EE_Select_Input {
 
 	/**
 	 * @param array $country_options
 	 * @param array $input_settings
 	 * @return EE_Country_Select_Input
 	 */
-	public function __construct( $country_options = NULL, $input_settings = array() ){
+	public function __construct($country_options = NULL, $input_settings = array()) {
 		$country_options = apply_filters(
 			'FHEE__EE_Country_Select_Input____construct__country_options',
-			$this->get_country_answer_options( $country_options ),
+			$this->get_country_answer_options($country_options),
 			$this
 		);
-		$input_settings['html_class'] = isset( $input_settings['html_class'] )
-			? $input_settings['html_class'] . ' ee-country-select-js'
+		$input_settings['html_class'] = isset($input_settings['html_class'])
+			? $input_settings['html_class'].' ee-country-select-js'
 			: 'ee-country-select-js';
-		parent::__construct( $country_options, $input_settings );
+		parent::__construct($country_options, $input_settings);
 	}
 
 
@@ -38,16 +38,16 @@ 
 	 * @param array $country_options
 	 * @return array
 	 */
-	public function get_country_answer_options( $country_options = NULL ){
+	public function get_country_answer_options($country_options = NULL) {
 		// if passed something that is NOT an array
-		if ( ! is_array( $country_options )) {
+		if ( ! is_array($country_options)) {
 			// get possibly cached list of countries
 			$countries = EEM_Country::instance()->get_all_active_countries();
-			if ( ! empty( $countries )) {
-				$country_options[ '' ] = '';
-				foreach( $countries as $country ){
-					if ( $country instanceof EE_Country ) {
-						$country_options[ $country->ID() ] = $country->name();
+			if ( ! empty($countries)) {
+				$country_options[''] = '';
+				foreach ($countries as $country) {
+					if ($country instanceof EE_Country) {
+						$country_options[$country->ID()] = $country->name();
 					}
 				}
 			} else {

core/libraries/form_sections/inputs/EE_State_Select_Input.php

Spacing +12 added lines, -12 removed lines

@@ -6,22 +6,22 @@ 
  * @subpackage
  * @author				Mike Nelson
  */
-class EE_State_Select_Input extends EE_Select_Input{
+class EE_State_Select_Input extends EE_Select_Input {
 
 	/**
 	 * @param array $state_options
 	 * @param array $input_settings
 	 */
-	function __construct( $state_options, $input_settings = array() ){
+	function __construct($state_options, $input_settings = array()) {
 		$state_options = apply_filters(
 			'FHEE__EE_State_Select_Input____construct__state_options',
-			$this->get_state_answer_options( $state_options ),
+			$this->get_state_answer_options($state_options),
 			$this
 		);
-		$input_settings['html_class'] = isset( $input_settings['html_class'] )
-			? $input_settings['html_class'] . ' ee-state-select-js'
+		$input_settings['html_class'] = isset($input_settings['html_class'])
+			? $input_settings['html_class'].' ee-state-select-js'
 			: 'ee-state-select-js';
-		parent::__construct( $state_options, $input_settings );
+		parent::__construct($state_options, $input_settings);
 	}
 
 
@@ -32,17 +32,17 @@ 
 	 * @param array $state_options
 	 * @return array
 	 */
-	public function get_state_answer_options( $state_options = NULL ){
+	public function get_state_answer_options($state_options = NULL) {
 		// if passed something that is NOT an array
-		if ( ! is_array( $state_options )) {
+		if ( ! is_array($state_options)) {
 			// get possibly cached list of states
 			$states = EEM_State::instance()->get_all_active_states();
-			if ( ! empty( $states )) {
+			if ( ! empty($states)) {
 				//set the default
 				$state_options[''][''] = '';
-				foreach( $states as $state ){
-					if ( $state instanceof EE_State ) {
-						$state_options[ $state->country()->name() ][ $state->ID() ] = $state->name();
+				foreach ($states as $state) {
+					if ($state instanceof EE_State) {
+						$state_options[$state->country()->name()][$state->ID()] = $state->name();
 					}
 				}
 			} else {

core/libraries/form_sections/strategies/normalization/EE_Many_Valued_Normalization.strategy.php

Spacing +16 added lines, -16 removed lines

@@ -6,7 +6,7 @@ 
  * @subpackage
  * @author				Mike Nelson
  */
-class EE_Many_Valued_Normalization extends EE_Normalization_Strategy_Base{
+class EE_Many_Valued_Normalization extends EE_Normalization_Strategy_Base {
 	protected $_individual_item_normalization_strategy = array();
 	/**
 	 *
@@ -23,16 +23,16 @@ 
 	 * @return array
 	 */
 	public function normalize($value_to_normalize) {
-		if ( is_array( $value_to_normalize )){
+		if (is_array($value_to_normalize)) {
 			$items_to_normalize = $value_to_normalize;
-		} else if( $value_to_normalize !== NULL ){
-			$items_to_normalize = array( $value_to_normalize );
+		} else if ($value_to_normalize !== NULL) {
+			$items_to_normalize = array($value_to_normalize);
 		} else {
 			$items_to_normalize = array();
 		}
 		$normalized_array_value = array();
-		foreach( $items_to_normalize as $key => $individual_item ){
-			$normalized_array_value[ $key ] = $this->normalize_one( $individual_item );
+		foreach ($items_to_normalize as $key => $individual_item) {
+			$normalized_array_value[$key] = $this->normalize_one($individual_item);
 		}
 		return $normalized_array_value;
 	}
@@ -42,8 +42,8 @@ 
 	 * @param string $individual_value_to_normalize but definitely NOT an array
 	 * @return mixed
 	 */
-	public function normalize_one( $individual_value_to_normalize ) {
-		return $this->_individual_item_normalization_strategy->normalize( $individual_value_to_normalize );
+	public function normalize_one($individual_value_to_normalize) {
+		return $this->_individual_item_normalization_strategy->normalize($individual_value_to_normalize);
 	}
 
 	/**
@@ -51,16 +51,16 @@ 
 	 * @param array $normalized_values
 	 * @return string[]
 	 */
-	public function unnormalize( $normalized_values ) {
-		if( $normalized_values === null ) {
+	public function unnormalize($normalized_values) {
+		if ($normalized_values === null) {
 			$normalized_values = array();
 		}
-		if( ! is_array( $normalized_values ) ){
-			$normalized_values = array( $normalized_values );
+		if ( ! is_array($normalized_values)) {
+			$normalized_values = array($normalized_values);
 		}
 		$non_normal_values = array();
-		foreach( $normalized_values as $key => $value ) {
-			$non_normal_values[ $key ] = $this->unnormalize_one( $value );
+		foreach ($normalized_values as $key => $value) {
+			$non_normal_values[$key] = $this->unnormalize_one($value);
 		}
 		return $non_normal_values;
 	}
@@ -70,8 +70,8 @@ 
 	 * @param mixed $individual_value_to_unnormalize but certainly NOT an array
 	 * @return string
 	 */
-	public function unnormalize_one( $individual_value_to_unnormalize ) {
-		return $this->_individual_item_normalization_strategy->unnormalize( $individual_value_to_unnormalize );
+	public function unnormalize_one($individual_value_to_unnormalize) {
+		return $this->_individual_item_normalization_strategy->unnormalize($individual_value_to_unnormalize);
 	}
 }
 

core/admin/templates/espresso_ratings_request_content.template.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@
 <div class="padding">
-	<p><?php _e( 'We need your help to continue maintaining and providing this plugin for free. You can help by leaving a positive review in the WordPress plugin directory. 5 star ratings bring Event Espresso Decaf to the attention of more users which increases our support and features for this version of Event Espresso.', 'event_espresso' ); ?></p>
-	<p><?php _e( 'Rate it five stars today!', 'event_espresso' ); ?></p><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span>
-	<p><a class="button button-primary" href="https://events.codebasehq.com/redirect?https://login.wordpress.org/?redirect_to=https%3A%2F%2Fwordpress.org%2Fsupport%2Fview%2Fplugin-reviews%2Fevent-espresso-decaf%3Frate%3D5%23postform"><?php _e( 'Rate It!', 'event_espresso' ); ?></a></p>
+	<p><?php _e('We need your help to continue maintaining and providing this plugin for free. You can help by leaving a positive review in the WordPress plugin directory. 5 star ratings bring Event Espresso Decaf to the attention of more users which increases our support and features for this version of Event Espresso.', 'event_espresso'); ?></p>
+	<p><?php _e('Rate it five stars today!', 'event_espresso'); ?></p><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span>
+	<p><a class="button button-primary" href="https://events.codebasehq.com/redirect?https://login.wordpress.org/?redirect_to=https%3A%2F%2Fwordpress.org%2Fsupport%2Fview%2Fplugin-reviews%2Fevent-espresso-decaf%3Frate%3D5%23postform"><?php _e('Rate It!', 'event_espresso'); ?></a></p>
 </div>
\ No newline at end of file