eventespresso / event-espresso-core

core/db_models/EEM_Extra_Join.model.php

Spacing +9 added lines, -9 removed lines

@@ -21,26 +21,26 @@
  * @since		 	   $VID:$
  *
  */
-if (!defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 
-class EEM_Extra_Join extends EEM_Base{
+class EEM_Extra_Join extends EEM_Base {
 	// private instance of the Extra Join object
 	protected static $_instance = NULL;
 	
 	public function __construct($timezone = NULL) {
-		$models_this_can_join = array_keys( EE_Registry::instance()->non_abstract_db_models );
+		$models_this_can_join = array_keys(EE_Registry::instance()->non_abstract_db_models);
 		$this->_tables = array(
-			'Extra_Join' => new EE_Primary_Table( 'esp_extra_join', 'EXJ_ID' ),
+			'Extra_Join' => new EE_Primary_Table('esp_extra_join', 'EXJ_ID'),
 		);
 		$this->_fields = array(
 			'Extra_Join' => array(
-				'EXJ_ID' => new EE_Primary_Key_Int_Field( 'EXJ_ID', __( 'Extra Join ID', 'event_espresso' ) ),
-				'EXJ_first_model_ID' => new EE_Foreign_Key_String_Field( 'EXJ_first_model_ID', __( 'First Model ID', 'event_espresso' ), true, 0, $models_this_can_join ),
-				'EXJ_first_model_name' => new EE_Any_Foreign_Model_Name_Field( 'EXJ_first_model_name', __( 'First Model Name', 'event_espresso'), true, '', $models_this_can_join ),
-				'EXJ_second_model_ID' => new EE_Foreign_Key_String_Field( 'EXJ_second_model_ID', __( 'Second Model ID', 'event_espresso' ), true, 0, $models_this_can_join ),
-				'EXJ_second_model_name' => new EE_Any_Foreign_Model_Name_Field( 'EXJ_second_model_name', __( 'Second Model Name', 'event_espresso'), true, '', $models_this_can_join ),
+				'EXJ_ID' => new EE_Primary_Key_Int_Field('EXJ_ID', __('Extra Join ID', 'event_espresso')),
+				'EXJ_first_model_ID' => new EE_Foreign_Key_String_Field('EXJ_first_model_ID', __('First Model ID', 'event_espresso'), true, 0, $models_this_can_join),
+				'EXJ_first_model_name' => new EE_Any_Foreign_Model_Name_Field('EXJ_first_model_name', __('First Model Name', 'event_espresso'), true, '', $models_this_can_join),
+				'EXJ_second_model_ID' => new EE_Foreign_Key_String_Field('EXJ_second_model_ID', __('Second Model ID', 'event_espresso'), true, 0, $models_this_can_join),
+				'EXJ_second_model_name' => new EE_Any_Foreign_Model_Name_Field('EXJ_second_model_name', __('Second Model Name', 'event_espresso'), true, '', $models_this_can_join),
 				
 			)
 		);

core/data_migration_scripts/4_9_0_stages/EE_DMS_4_9_0_Answers_With_No_Registration.dmsstage.php

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 
@@ -14,7 +14,7 @@ 
  * @author				Brent Christensen
  *
  */
-class EE_DMS_4_9_0_Answers_With_No_Registration extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_9_0_Answers_With_No_Registration extends EE_Data_Migration_Script_Stage {
 
 
 
@@ -24,7 +24,7 @@ 
 	 * @return EE_DMS_4_9_0_Answers_With_No_Registration
 	 */
 	public function __construct() {
-		$this->_pretty_name = __( 'Answer Cleanup', 'event_espresso' );
+		$this->_pretty_name = __('Answer Cleanup', 'event_espresso');
 		parent::__construct();
 	}
 
@@ -48,9 +48,9 @@ 
 	protected function _migration_step($num_items_to_migrate = 50) {
 		global $wpdb;
 		$wpdb->delete(
-			$wpdb->prefix . 'esp_answer',
-			array( 'REG_ID' => 0 ),
-			array( '%d' )
+			$wpdb->prefix.'esp_answer',
+			array('REG_ID' => 0),
+			array('%d')
 		);
 		$this->set_completed();
 		return 1;

core/db_models/EEM_Extra_Meta.model.php

Spacing +8 added lines, -8 removed lines

@@ -26,16 +26,16 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
 
 class EEM_Extra_Meta extends EEM_Base {
 
   	// private instance of the Attendee object
 	protected static $_instance = NULL;
 
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Extra Meta','event_espresso');
-		$this->plural_item = __('Extra Metas','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Extra Meta', 'event_espresso');
+		$this->plural_item = __('Extra Metas', 'event_espresso');
 		$this->_tables = array(
 			'Extra_Meta'=> new EE_Primary_Table('esp_extra_meta', 'EXM_ID')
 		);
@@ -50,13 +50,13 @@ 
 
 			));
 		$this->_model_relations = array();
-		foreach($models_this_can_attach_to as $model){
+		foreach ($models_this_can_attach_to as $model) {
 			$this->_model_relations[$model] = new EE_Belongs_To_Any_Relation();
 		}
-		foreach( $this->cap_contexts_to_cap_action_map() as $cap_context => $action ) {
-			$this->_cap_restriction_generators[ $cap_context ] = new EE_Restriction_Generator_Meta( 'EXM_key', 'EXM_value' );
+		foreach ($this->cap_contexts_to_cap_action_map() as $cap_context => $action) {
+			$this->_cap_restriction_generators[$cap_context] = new EE_Restriction_Generator_Meta('EXM_key', 'EXM_value');
 		}
-		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/db_models/strategies/EE_Restriction_Generator_Meta.strategy.php

Spacing +13 added lines, -13 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -14,7 +14,7 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_Restriction_Generator_Meta extends EE_Restriction_Generator_Base{
+class EE_Restriction_Generator_Meta extends EE_Restriction_Generator_Base {
 
 	/**
 	 *
@@ -33,7 +33,7 @@ 
 	 * @param string $key_field_name
 	 * @param string $value_field_name
 	 */
-	public function __construct( $key_field_name, $value_field_name ) {
+	public function __construct($key_field_name, $value_field_name) {
 		$this->_key_field_name = $key_field_name;
 		$this->_value_field_name = $value_field_name;
 	}
@@ -45,21 +45,21 @@ 
 	 * @throws EE_Error
 	 */
 	protected function _generate_restrictions() {
-		$whitelisted_meta_keys = apply_filters( 'FHEE__EE_Restriction_Generator_Meta___generate_restrictions__whitelisted_meta_keys', array() );
-		$blacklisted_meta_keys = apply_filters( 'FHEE__EE_Restriction_Generator_Meta___generate_restrictions__blacklisted_meta_keys', array() );
+		$whitelisted_meta_keys = apply_filters('FHEE__EE_Restriction_Generator_Meta___generate_restrictions__whitelisted_meta_keys', array());
+		$blacklisted_meta_keys = apply_filters('FHEE__EE_Restriction_Generator_Meta___generate_restrictions__blacklisted_meta_keys', array());
 		$conditions = array(
-			$this->_key_field_name => array( 'NOT_LIKE', "\\\\_%" ),//each slash is escaped because we are using double quotes, and 
+			$this->_key_field_name => array('NOT_LIKE', "\\\\_%"), //each slash is escaped because we are using double quotes, and 
 			//stripslashes will be called on this because the models assume this is from user input
-			$this->_value_field_name => array( 'NOT_REGEXP', '^[aOs]:[\d]:.*$')					
+			$this->_value_field_name => array('NOT_REGEXP', '^[aOs]:[\d]:.*$')					
 		);
-		if( ! empty( $blacklisted_meta_keys ) ) {
-			$conditions[ $this->_key_field_name . '*blacklisted' ] = array( 'NOT_IN', $blacklisted_meta_keys );
+		if ( ! empty($blacklisted_meta_keys)) {
+			$conditions[$this->_key_field_name.'*blacklisted'] = array('NOT_IN', $blacklisted_meta_keys);
 		}
-		if( ! empty( $whitelisted_meta_keys ) ) {
+		if ( ! empty($whitelisted_meta_keys)) {
 			$conditions = array(
 				'OR*whitelisted-or-normal' => array(
 					'AND' => $conditions,
-					$this->_key_field_name . '*whitelisted' => array( 'IN', $whitelisted_meta_keys ) 
+					$this->_key_field_name.'*whitelisted' => array('IN', $whitelisted_meta_keys) 
 				)
 			);
 		}
@@ -67,7 +67,7 @@ 
 			//only allow access to non-protected metas if they're an admin
 			EE_Restriction_Generator_Base::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions(),
 			//don't allow access to protected metas to anyone. If they want that, don't apply caps to the query
-			'apply-to-all-queries-using-caps' => new EE_Default_Where_Conditions( $conditions ),
+			'apply-to-all-queries-using-caps' => new EE_Default_Where_Conditions($conditions),
 		);
 	}
 }

core/db_models/strategies/EE_CPT_Minimum_Where_Conditions.strategy.php

Doc Comments +4 added lines, -1 removed lines

@@ -7,6 +7,10 @@ 
 
 	protected $_post_type;
 	protected $_meta_field;
+
+	/**
+	 * @param string $post_type
+	 */
 	function __construct($post_type, $meta_field_to_chk = ''){
 		$this->_post_type = $post_type;
 		$this->_meta_field = $meta_field_to_chk;
@@ -27,7 +31,6 @@ 
 	}
 	/**
 	 * Gets the where default where conditions for a custom post type model
-	 * @param string $model_relation_path. Eg, from Event to Payment, this should be "Registration.Transaction.Payment"
 	 * @return array like EEM_Base::get_all's $query_params's index [0] (where conditions)
 	 */
 	protected function _get_default_where_conditions() {

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  *
@@ -15,11 +15,11 @@ 
  * @since		 	   4.8.29.rc.010
  *
  */
-class EE_CPT_Minimum_Where_Conditions extends EE_Default_Where_Conditions{
+class EE_CPT_Minimum_Where_Conditions extends EE_Default_Where_Conditions {
 
 	protected $_post_type;
 	protected $_meta_field;
-	function __construct($post_type, $meta_field_to_chk = ''){
+	function __construct($post_type, $meta_field_to_chk = '') {
 		$this->_post_type = $post_type;
 		$this->_meta_field = $meta_field_to_chk;
 	}
@@ -29,10 +29,10 @@ 
 	 * @param string $column column name
 	 * @return EE_Model_Field_Base
 	 */
-	protected function _get_field_on_column($column){
+	protected function _get_field_on_column($column) {
 		$all_fields = $this->_model->field_settings(true);
-		foreach($all_fields as $field_name => $field_obj){
-			if($column == $field_obj->get_table_column()){
+		foreach ($all_fields as $field_name => $field_obj) {
+			if ($column == $field_obj->get_table_column()) {
 				return $field_obj;
 			}
 		}

Indentation +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 /**
  *
  * Class EE_CPT_Minimum_Where_Conditions
-  * 
+ * 
  * Strategy specifically for adding where conditions specific to CPT models.
  * But only sets the minimum, so any row of the right type will get used
  *

core/db_models/strategies/EE_CPT_Where_Conditions.strategy.php

Doc Comments -1 removed lines

@@ -17,7 +17,6 @@
 class EE_CPT_Where_Conditions extends EE_CPT_Minimum_Where_Conditions{
 	/**
 	 * Gets the where default where conditions for a custom post type model
-	 * @param string $model_relation_path. Eg, from Event to Payment, this should be "Registration.Transaction.Payment"
 	 * @return array like EEM_Base::get_all's $query_params's index [0] (where conditions)
 	 */
 	protected function _get_default_where_conditions() {

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  *
@@ -14,7 +14,7 @@ 
  * * @since		 	   4.6.0
  *
  */
-class EE_CPT_Where_Conditions extends EE_CPT_Minimum_Where_Conditions{
+class EE_CPT_Where_Conditions extends EE_CPT_Minimum_Where_Conditions {
 	/**
 	 * Gets the where default where conditions for a custom post type model
 	 * @param string $model_relation_path. Eg, from Event to Payment, this should be "Registration.Transaction.Payment"
@@ -25,7 +25,7 @@ 
 		return array_merge( 
 			parent::_get_default_where_conditions(),
 			array( 
-				$status_field->get_name() => array('NOT IN',array('auto-draft','trash') )
+				$status_field->get_name() => array('NOT IN', array('auto-draft', 'trash'))
 			)
 		);
 	}

Indentation +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 /**
  *
  * Class EE_Default_Where_Conditions
-  * 
+ * 
  * Strategy specifically for adding where conditions specific to CPT models.
  *
  * @package         Event Espresso

caffeinated/modules/recaptcha/ReCaptcha/RequestMethod.php

Indentation +7 added lines, -7 removed lines

@@ -32,11 +32,11 @@
 interface RequestMethod
 {
 
-    /**
-     * Submit the request with the specified parameters.
-     *
-     * @param RequestParameters $params Request parameters
-     * @return string Body of the reCAPTCHA response
-     */
-    public function submit(RequestParameters $params);
+	/**
+	 * Submit the request with the specified parameters.
+	 *
+	 * @param RequestParameters $params Request parameters
+	 * @return string Body of the reCAPTCHA response
+	 */
+	public function submit(RequestParameters $params);
 }

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

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

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

core/db_models/EEM_Message_Template_Group.model.php

Doc Comments +2 added lines, -2 removed lines

@@ -84,7 +84,7 @@ 
 	 * @param        $messenger
 	 * @param string $orderby
 	 * @param string $order
-	 * @return array all (including trashed or inactive) message template group objects for the given messenger
+	 * @return EE_Base_Class[] all (including trashed or inactive) message template group objects for the given messenger
 	 */
 	public function get_all_message_templates_by_messenger($messenger, $orderby = 'GRP_ID', $order = 'ASC' ) {
 		return $this->get_all_deleted_and_undeleted(
@@ -343,7 +343,7 @@ 
 	/**
 	 * This sends things to the validator for the given messenger and message type.
 	 *
-	 * @param  array $fields the incoming fields to check.
+	 * @param  string $fields the incoming fields to check.
 	 *                       Note this array is in the formatted fields from the form fields setup.
 	 *                       So we need to reformat this into an array of expected field refs by the validator.
 	 *                       Note also that this is not only the fields for the Message Template Group

Indentation +8 added lines, -8 removed lines

@@ -1,14 +1,14 @@
 <?php if (!defined('EVENT_ESPRESSO_VERSION') )
 	exit('NO direct script access allowed');
 /**
- * EEM_Message_Template_Group
- *
- * @package		Event Espresso
- * @subpackage	includes/models/EEM_Message_Template_Group.model.php
- * @author		Darren Ethier
- *
- *
- */
+	 * EEM_Message_Template_Group
+	 *
+	 * @package		Event Espresso
+	 * @subpackage	includes/models/EEM_Message_Template_Group.model.php
+	 * @author		Darren Ethier
+	 *
+	 *
+	 */
 require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
 class EEM_Message_Template_Group extends EEM_Soft_Delete_Base {
 

Spacing +61 added lines, -61 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION') )
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 /**
  * EEM_Message_Template_Group
@@ -9,7 +9,7 @@ 
  *
  *
  */
-require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
+require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php');
 class EEM_Message_Template_Group extends EEM_Soft_Delete_Base {
 
 	// private instance of the EEM_Message_Template_Group object
@@ -17,7 +17,7 @@ 
 
 
 
-	protected function __construct( $timezone = NULL ) {
+	protected function __construct($timezone = NULL) {
 		$this->singular_item = __('Message Template Group', 'event_espresso');
 		$this->plural_item = __('Message Template Groups', 'event_espresso');
 		$this->_tables = array(
@@ -26,11 +26,11 @@ 
 		$this->_fields = array(
 			'Message_Template_Group' => array(
 				'GRP_ID' => new EE_Primary_Key_Int_Field('GRP_ID', __('Message Template Group ID', 'event_espresso')),
-				'MTP_name' => new EE_Plain_Text_Field( 'MTP_name', __('The name of the template group', 'event_espresso'), FALSE, '' ),
-				'MTP_description' => new EE_Simple_HTML_Field( 'MTP_description', __('A brief description about this template.', 'event_espresso' ), FALSE, '' ),
-				'MTP_user_id'=> new EE_WP_User_Field('MTP_user_id', __('Template Creator ID', 'event_espresso'), FALSE, get_current_user_id() ),
-				'MTP_messenger'=>new EE_Plain_Text_Field('MTP_messenger', __('Messenger Used for Template', 'event_espresso'), FALSE, 'email' ),
-				'MTP_message_type'=>new EE_Plain_Text_Field('MTP_message_type', __('Message Type', 'event_espresso'),false,'registration'),
+				'MTP_name' => new EE_Plain_Text_Field('MTP_name', __('The name of the template group', 'event_espresso'), FALSE, ''),
+				'MTP_description' => new EE_Simple_HTML_Field('MTP_description', __('A brief description about this template.', 'event_espresso'), FALSE, ''),
+				'MTP_user_id'=> new EE_WP_User_Field('MTP_user_id', __('Template Creator ID', 'event_espresso'), FALSE, get_current_user_id()),
+				'MTP_messenger'=>new EE_Plain_Text_Field('MTP_messenger', __('Messenger Used for Template', 'event_espresso'), FALSE, 'email'),
+				'MTP_message_type'=>new EE_Plain_Text_Field('MTP_message_type', __('Message Type', 'event_espresso'), false, 'registration'),
 				'MTP_is_global'=>new EE_Boolean_Field('MTP_is_global', __('Flag indicating if Template Group is Global', 'event_espresso'), false, true),
 				'MTP_is_override'=>new EE_Boolean_Field('MTP_is_override', __('Flag indicating if Template Group overrides any other Templates for the messenger/messagetype combination', 'event_espresso'), false, false),
 				'MTP_deleted'=>new EE_Trashed_Flag_Field('MTP_deleted', __('Flag indicating whether this has been trashed', 'event_espresso'), false, false),
@@ -43,12 +43,12 @@ 
 			'Event' => new EE_HABTM_Relation('Event_Message_Template'),
 			'WP_User' => new EE_Belongs_To_Relation()
 		);
-		foreach( $this->_cap_contexts_to_cap_action_map as $context => $action ){
-			$this->_cap_restriction_generators[ $context ] = new EE_Restriction_Generator_Global( 'MTP_is_global');
+		foreach ($this->_cap_contexts_to_cap_action_map as $context => $action) {
+			$this->_cap_restriction_generators[$context] = new EE_Restriction_Generator_Global('MTP_is_global');
 		}
 		$this->_caps_slug = 'messages';
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -71,8 +71,8 @@ 
 		$limit = null,
 		$count = false
 	) {
-		$query_params = array( array('Event.EVT_ID' => $EVT_ID), 'order_by' => array($orderby => $order), 'limit' => $limit );
-		return $count ? $this->count_deleted( $query_params, 'GRP_ID', TRUE ) : $this->get_all_deleted( $query_params );
+		$query_params = array(array('Event.EVT_ID' => $EVT_ID), 'order_by' => array($orderby => $order), 'limit' => $limit);
+		return $count ? $this->count_deleted($query_params, 'GRP_ID', TRUE) : $this->get_all_deleted($query_params);
 	}
 
 
@@ -86,9 +86,9 @@ 
 	 * @param string $order
 	 * @return array all (including trashed or inactive) message template group objects for the given messenger
 	 */
-	public function get_all_message_templates_by_messenger($messenger, $orderby = 'GRP_ID', $order = 'ASC' ) {
+	public function get_all_message_templates_by_messenger($messenger, $orderby = 'GRP_ID', $order = 'ASC') {
 		return $this->get_all_deleted_and_undeleted(
-			array( array( 'MTP_messenger' => $messenger ), 'order_by' => array( $orderby => $order ) )
+			array(array('MTP_messenger' => $messenger), 'order_by' => array($orderby => $order))
 		);
 	}
 
@@ -99,18 +99,18 @@ 
 	 * @param  array  $_where any existing where conditions to append these to.
 	 * @return array          original where conditions or original with additional filters.
 	 */
-	protected function _maybe_mtp_filters( $_where = array() ) {
+	protected function _maybe_mtp_filters($_where = array()) {
 		//account for messenger or message type filters
 		if (
-			isset( $_REQUEST[ 'ee_messenger_filter_by' ] )
-			&& $_REQUEST[ 'ee_messenger_filter_by' ] != 'none_selected'
-			&& $_REQUEST[ 'ee_messenger_filter_by' ] != 'all'
+			isset($_REQUEST['ee_messenger_filter_by'])
+			&& $_REQUEST['ee_messenger_filter_by'] != 'none_selected'
+			&& $_REQUEST['ee_messenger_filter_by'] != 'all'
 		) {
-			$_where['MTP_messenger'] =  $_REQUEST['ee_messenger_filter_by'] ;
+			$_where['MTP_messenger'] = $_REQUEST['ee_messenger_filter_by'];
 		}
 
 		if (
-			isset( $_REQUEST['ee_message_type_filter_by'])
+			isset($_REQUEST['ee_message_type_filter_by'])
 			&& $_REQUEST['ee_message_type_filter_by'] != 'none_selected'
 		) {
 			$_where['MTP_message_type'] = $_REQUEST['ee_message_type_filter_by'];
@@ -141,7 +141,7 @@ 
 		$global = true,
 		$user_check = false
 	) {
-		$_where = $global ? array('MTP_is_global' => TRUE ) : array('MTP_is_global' => FALSE );
+		$_where = $global ? array('MTP_is_global' => TRUE) : array('MTP_is_global' => FALSE);
 		$_where['MTP_is_active'] = TRUE;
 		$_where = $this->_maybe_mtp_filters($_where);
 
@@ -156,9 +156,9 @@ 
 			$_where['MTP_user_id'] = get_current_user_id();
 		}
 
-		$query_params = array( $_where, 'order_by' => array($orderby => $order), 'limit' => $limit );
+		$query_params = array($_where, 'order_by' => array($orderby => $order), 'limit' => $limit);
 
-		return $count ? $this->count($query_params, 'GRP_ID', TRUE ) : $this->get_all($query_params);
+		return $count ? $this->count($query_params, 'GRP_ID', TRUE) : $this->get_all($query_params);
 	}
 
 
@@ -173,14 +173,14 @@ 
 	 * @param bool   $count
 	 * @return mixed array on success, FALSE on fail
 	 */
-	public function get_all_message_templates( $orderby = 'GRP_ID', $order = 'ASC', $limit = null, $count = false ) {
+	public function get_all_message_templates($orderby = 'GRP_ID', $order = 'ASC', $limit = null, $count = false) {
 		$_where = $this->_maybe_mtp_filters();
 
-		$query_params = array( $_where, 'order_by' => array($orderby => $order), 'limit' => $limit );
+		$query_params = array($_where, 'order_by' => array($orderby => $order), 'limit' => $limit);
 
 		$r_templates = $count
-			? $this->count_deleted_and_undeleted($query_params, 'GRP_ID', TRUE )
-			: $this->get_all_deleted_and_undeleted( $query_params );
+			? $this->count_deleted_and_undeleted($query_params, 'GRP_ID', TRUE)
+			: $this->get_all_deleted_and_undeleted($query_params);
 
 		return $r_templates;
 	}
@@ -194,10 +194,10 @@ 
 	 * @param  array  $query_params same as EEM_Base::get_all()
 	 * @return  EE_Message_Template_Group[]
 	 */
-	public function get_all_custom_templates_by_event( $EVT_ID, $query_params = array() ) {
-		$where = array_merge( $query_params, array( 'Event.EVT_ID' => $EVT_ID ) );
+	public function get_all_custom_templates_by_event($EVT_ID, $query_params = array()) {
+		$where = array_merge($query_params, array('Event.EVT_ID' => $EVT_ID));
 		return $this->get_all(
-			array( $where )
+			array($where)
 		);
 	}
 
@@ -222,13 +222,13 @@ 
 		$count = false,
 		$global = true
 	) {
-		$_where = $global ? array('MTP_is_global' => TRUE ) : array('MTP_is_global' => FALSE );
+		$_where = $global ? array('MTP_is_global' => TRUE) : array('MTP_is_global' => FALSE);
 		$_where['MTP_is_active'] = TRUE;
 		$_where = $this->_maybe_mtp_filters($_where);
 
-		$query_params = array( $_where, 'order_by' => array($orderby => $order), 'limit' => $limit );
+		$query_params = array($_where, 'order_by' => array($orderby => $order), 'limit' => $limit);
 
-		return $count ? $this->count_deleted($query_params, 'GRP_ID', TRUE ) : $this->get_all_deleted( $query_params );
+		return $count ? $this->count_deleted($query_params, 'GRP_ID', TRUE) : $this->get_all_deleted($query_params);
 	}
 
 
@@ -264,9 +264,9 @@ 
 			'MTP_is_active' => $active
 		);
 
-		$query_params = array( $_where, 'order_by' => array($orderby=>$order), 'limit' => $limit );
+		$query_params = array($_where, 'order_by' => array($orderby=>$order), 'limit' => $limit);
 
-		return $count ? $this->count($query_params, 'GRP_ID', TRUE ) : $this->get_all( $query_params );
+		return $count ? $this->count($query_params, 'GRP_ID', TRUE) : $this->get_all($query_params);
 	}
 
 
@@ -300,13 +300,13 @@ 
 			'MTP_is_global' => TRUE,
 		);
 
-		if ( $active != 'all' ) {
+		if ($active != 'all') {
 			$_where['MTP_is_active'] = $active;
 		}
 
-		$query_params = array( $_where, 'order_by' => array( $orderby => $order ), 'limit' => $limit );
+		$query_params = array($_where, 'order_by' => array($orderby => $order), 'limit' => $limit);
 
-		return $count ? $this->count( $query_params, 'GRP_ID', TRUE ) : $this->get_all( $query_params );
+		return $count ? $this->count($query_params, 'GRP_ID', TRUE) : $this->get_all($query_params);
 	}
 
 
@@ -319,7 +319,7 @@ 
 	 * @param  array  $query_params same as EEM_Base->get_all()
 	 * @return EE_Message_Template_Group[]
 	 */
-	public function get_custom_message_template_by_m_and_mt( $messenger, $message_type, $query_params = array() ) {
+	public function get_custom_message_template_by_m_and_mt($messenger, $message_type, $query_params = array()) {
 		return $this->get_all(
 			array_merge(
 				$query_params,
@@ -356,14 +356,14 @@ 
 		$assembled_fields = array();
 
 		//let's loop through all the fields and set them up in the right format
-		foreach ( $fields as $index => $value ) {
+		foreach ($fields as $index => $value) {
 			// first let's figure out if the value['content'] in the current index is an array.
 			//  If it is then this is special fields that are used in parsing special shortcodes (i.e. 'attendee_list').
-			if ( is_array($value['content']) ) {
+			if (is_array($value['content'])) {
 				$assembled_fields[$value['name']] = $value['content']['main'];
 				//loop through the content and get the other fields.
-				foreach ( $value['content'] as $name => $val ) {
-					if ( $name == 'main' ) continue;
+				foreach ($value['content'] as $name => $val) {
+					if ($name == 'main') continue;
 					$assembled_fields[$name] = $val;
 				}
 				continue;
@@ -375,15 +375,15 @@ 
 
 		// now we've got the assembled_fields.
 		// We need to setup the string for the appropriate validator class and call that.
-		$m_ref = ucwords( str_replace('_',' ', $messenger ) );
-		$m_ref = str_replace( ' ', '_', $m_ref );
-		$mt_ref = ucwords( str_replace('_', ' ', $message_type ) );
-		$mt_ref = str_replace( ' ', '_', $mt_ref );
+		$m_ref = ucwords(str_replace('_', ' ', $messenger));
+		$m_ref = str_replace(' ', '_', $m_ref);
+		$mt_ref = ucwords(str_replace('_', ' ', $message_type));
+		$mt_ref = str_replace(' ', '_', $mt_ref);
 
-		$classname = 'EE_Messages_' . $m_ref . '_' . $mt_ref . '_Validator';
+		$classname = 'EE_Messages_'.$m_ref.'_'.$mt_ref.'_Validator';
 
-		if ( !class_exists( $classname ) ) {
-			$msg[] = __( 'The Validator class was unable to load', 'event_espresso');
+		if ( ! class_exists($classname)) {
+			$msg[] = __('The Validator class was unable to load', 'event_espresso');
 			$msg[] = sprintf(
 				__(
 					'The class name compiled was %s. Please check and make sure the spelling and case is correct for the class name and that there is an autoloader in place for this class',
@@ -391,11 +391,11 @@ 
 				),
 				$classname
 			);
-			throw new EE_Error( implode( '||', $msg ) );
+			throw new EE_Error(implode('||', $msg));
 		}
 
-		$a = new ReflectionClass( $classname );
-		$_VLD = $a->newInstance( $assembled_fields, $context );
+		$a = new ReflectionClass($classname);
+		$_VLD = $a->newInstance($assembled_fields, $context);
 		$result = $_VLD->validate();
 		return $result;
 	}
@@ -414,18 +414,18 @@ 
 	 *
 	 * @return int  count of updated records.
 	 */
-	public function deactivate_message_template_groups_for( $messenger_names = array(), $message_type_names = array() ) {
+	public function deactivate_message_template_groups_for($messenger_names = array(), $message_type_names = array()) {
 		$query_args = array();
-		if ( empty( $messenger_names ) && empty( $message_type_names ) ) {
+		if (empty($messenger_names) && empty($message_type_names)) {
 			return 0;
 		}
-		if ( ! empty( $messenger_names ) ) {
-			$query_args[ 0 ][ 'MTP_messenger' ] = array( 'IN', (array) $messenger_names );
+		if ( ! empty($messenger_names)) {
+			$query_args[0]['MTP_messenger'] = array('IN', (array) $messenger_names);
 		}
-		if ( ! empty( $message_type_names ) ) {
-			$query_args[ 0 ][ 'MTP_message_type' ] = array( 'IN', (array) $message_type_names );
+		if ( ! empty($message_type_names)) {
+			$query_args[0]['MTP_message_type'] = array('IN', (array) $message_type_names);
 		}
-		return $this->update( array( 'MTP_is_active' => false ), $query_args );
+		return $this->update(array('MTP_is_active' => false), $query_args);
 	}
 
 

Braces +5 added lines, -2 removed lines

@@ -1,5 +1,6 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION') )
+<?php if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 /**
  * EEM_Message_Template_Group
  *
@@ -363,7 +364,9 @@ 
 				$assembled_fields[$value['name']] = $value['content']['main'];
 				//loop through the content and get the other fields.
 				foreach ( $value['content'] as $name => $val ) {
-					if ( $name == 'main' ) continue;
+					if ( $name == 'main' ) {
+						continue;
+					}
 					$assembled_fields[$name] = $val;
 				}
 				continue;