eventespresso / event-espresso-core

core/db_models/relations/EE_HABTM_Any_Relation.php

Doc Comments -1 removed lines

@@ -32,7 +32,6 @@
 	/**
 	 * 
 	 * @param string $model_name
-	 * @param string $comparison_model_name
 	 * @param string $id_or_name_field should be the string 'ID' or 'name' only
 	 * @return EE_Model_Field_Base
 	 */

Spacing +35 added lines, -35 removed lines

@@ -3,7 +3,7 @@ 
  * Joins any two models together via a has-and-belongs-to-many relation, using 
  * the esp_extra_join table.
  */
-class EE_HABTM_Any_Relation extends EE_HABTM_Relation{	
+class EE_HABTM_Any_Relation extends EE_HABTM_Relation {	
 	/**
 	 *
 	 * @var string
@@ -17,16 +17,16 @@ 
 	 * @param boolean $block_deletes for this type of relation, we block by default for now. if there are related models across this relation, block (prevent and add an error) the deletion of this model
 	 * @param type $blocking_delete_error_message a customized error message on blocking deletes instead of the default
 	 */
-	function __construct( $block_deletes = true, $blocking_delete_error_message =''){
-		parent::__construct( 'Extra_Join', $block_deletes, $blocking_delete_error_message);
+	function __construct($block_deletes = true, $blocking_delete_error_message = '') {
+		parent::__construct('Extra_Join', $block_deletes, $blocking_delete_error_message);
 	}
-	function _construct_finalize_set_models($this_model_name, $other_model_name){
-		if( $this_model_name < $other_model_name ) {
+	function _construct_finalize_set_models($this_model_name, $other_model_name) {
+		if ($this_model_name < $other_model_name) {
 			$this->_alphabetically_first_model_name = $this_model_name;
-		} else{
+		} else {
 			$this->_alphabetically_first_model_name = $other_model_name;
 		}
-		return parent::_construct_finalize_set_models( $this_model_name, $other_model_name );
+		return parent::_construct_finalize_set_models($this_model_name, $other_model_name);
 	}
 	
 	/**
@@ -36,21 +36,21 @@ 
 	 * @param string $id_or_name_field should be the string 'ID' or 'name' only
 	 * @return EE_Model_Field_Base
 	 */
-	function get_join_table_fk_field_to( $model_name, $id_or_name_field ) {
+	function get_join_table_fk_field_to($model_name, $id_or_name_field) {
 		$order = null;
-		if( $model_name === $this->_alphabetically_first_model_name ) {
+		if ($model_name === $this->_alphabetically_first_model_name) {
 			$order = 'first';
 		} else {
 			$order = 'second';
 		}
-		return $this->get_join_model()->field_settings_for( 'EXJ_' . $order . '_model_' . $id_or_name_field );
+		return $this->get_join_model()->field_settings_for('EXJ_'.$order.'_model_'.$id_or_name_field);
 	}
 	/**
 	 * Gets the SQL string for joining the main model's table containing the pk to the join table. Eg "LEFT JOIN real_join_table AS join_table_alias ON this_table_alias.pk = join_table_alias.fk_to_this_table"
 	 * @param string $model_relation_chain like 'Event.Event_Venue.Venue'
 	 * @return string of SQL
 	 */
-	function get_join_to_intermediate_model_statement($model_relation_chain){
+	function get_join_to_intermediate_model_statement($model_relation_chain) {
 		//create sql like
 		//LEFT JOIN join_table AS join_table_alias ON this_table_alias.this_table_pk = join_table_alias.join_table_fk_to_this
 		//LEFT JOIN other_table AS other_table_alias ON join_table_alias.join_table_fk_to_other = other_table_alias.other_table_pk
@@ -64,8 +64,8 @@ 
 		$field_with_model_name = $this->get_join_table_fk_field_to( 
 				$this->get_this_model()->get_this_model_name(), 
 				'name' );
-		$this_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model()->get_this_model_name()) . $this_table_pk_field->get_table_alias();
-		$join_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_join_model()->get_this_model_name()) . $join_table_fk_field_to_this_table->get_table_alias();
+		$this_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model()->get_this_model_name()).$this_table_pk_field->get_table_alias();
+		$join_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_join_model()->get_this_model_name()).$join_table_fk_field_to_this_table->get_table_alias();
 		$join_table = $this->get_join_model()->get_table_for_alias($join_table_alias);
 		//phew! ok, we have all the info we need, now we can create the SQL join string
 		$SQL = $this->_left_join(
@@ -74,7 +74,7 @@ 
 					$join_table_fk_field_to_this_table->get_table_column(), 
 					$this_table_alias, 
 					$this_table_pk_field->get_table_column(),
-					$field_with_model_name->get_qualified_column()."='".$this->get_this_model()->get_this_model_name()."'" ) .
+					$field_with_model_name->get_qualified_column()."='".$this->get_this_model()->get_this_model_name()."'" ).
 				$this->get_join_model()->_construct_internal_join_to_table_with_alias($join_table_alias);
 
 		return $SQL;
@@ -87,9 +87,9 @@ 
 	 * @param string $model_relation_chain like 'Event.Event_Venue.Venue'
 	 * @return string of SQL
 	 */
-	function get_join_statement($model_relation_chain){
-		if( $this->_model_relation_chain_to_join_model === NULL ){
-			throw new EE_Error( sprintf( __( 'When using EE_HABTM_Relation to create a join, you must call get_join_to_intermediate_model_statement BEFORE get_join_statement', 'event_espresso' )));
+	function get_join_statement($model_relation_chain) {
+		if ($this->_model_relation_chain_to_join_model === NULL) {
+			throw new EE_Error(sprintf(__('When using EE_HABTM_Relation to create a join, you must call get_join_to_intermediate_model_statement BEFORE get_join_statement', 'event_espresso')));
 		}
 		$join_table_fk_field_to_this_table = $this->get_join_table_fk_field_to( 
 				$this->get_this_model()->get_this_model_name(), 
@@ -101,10 +101,10 @@ 
 				$this->get_other_model()->get_this_model_name(), 
 				'name' );
 		
-		$join_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($this->_model_relation_chain_to_join_model, $this->get_join_model()->get_this_model_name()) . $join_table_fk_field_to_this_table->get_table_alias();
+		$join_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($this->_model_relation_chain_to_join_model, $this->get_join_model()->get_this_model_name()).$join_table_fk_field_to_this_table->get_table_alias();
 		
 		$other_table_pk_field = $this->get_other_model()->get_primary_key_field();
-		$other_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_other_model()->get_this_model_name()) . $other_table_pk_field->get_table_alias();
+		$other_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_other_model()->get_this_model_name()).$other_table_pk_field->get_table_alias();
 		$other_table = $this->get_other_model()->get_table_for_alias($other_table_alias);
 
 		$SQL = $this->_left_join(
@@ -114,7 +114,7 @@ 
 					$join_table_alias, 
 					$join_table_fk_field_to_other_table->get_table_column(),
 					$field_with_other_model_name->get_qualified_column()."='".$this->get_other_model()->get_this_model_name()."'" 
-				) . 
+				). 
 				$this->get_other_model()->_construct_internal_join_to_table_with_alias($other_table_alias);
 		return $SQL;
 	}
@@ -126,7 +126,7 @@ 
 	 * @param array             $extra_join_model_fields_n_values col=>val pairs that are used as extra conditions for checking existing values and for setting new rows if no exact matches.
 	 * @return EE_Base_Class
 	 */
-	 function add_relation_to($this_obj_or_id, $other_obj_or_id, $extra_join_model_fields_n_values = array() ){
+	 function add_relation_to($this_obj_or_id, $other_obj_or_id, $extra_join_model_fields_n_values = array()) {
 		 $this_model_obj = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
 		 $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
 		//check if such a relationship already exists
@@ -143,31 +143,31 @@ 
 				$this->get_other_model()->get_this_model_name(),
 				'name' );
 
-		$cols_n_values =  array(
+		$cols_n_values = array(
 				$join_model_fk_to_this_model->get_name() => $this_model_obj->ID(),
 				$join_model_name_field_to_this_model->get_name() => $this_model_obj->get_model()->get_this_model_name(),
 				$join_model_fk_to_other_model->get_name() => $other_model_obj->ID(),
 				$join_model_name_field_to_other_model->get_name() => $other_model_obj->get_model()->get_this_model_name() );
 
 		//if $where_query exists lets add them to the query_params.
-		if ( !empty( $extra_join_model_fields_n_values ) ) {
+		if ( ! empty($extra_join_model_fields_n_values)) {
 		   //make sure we strip any of the join model names from the $where_query cause we don't need that in here (why? because client code may have used the same conditionals for get_all_related which DOES need the join model name)
 		   //make sure we strip THIS models name from the query param
-		   foreach ( $extra_join_model_fields_n_values as $query_param => $val ) {
-			   $query_param = str_replace($this->get_join_model()->get_this_model_name().".","", $query_param);
+		   foreach ($extra_join_model_fields_n_values as $query_param => $val) {
+			   $query_param = str_replace($this->get_join_model()->get_this_model_name().".", "", $query_param);
 			   $parsed_query[$query_param] = $val;
 		   }
-		   $cols_n_values = array_merge( $cols_n_values, $parsed_query );
+		   $cols_n_values = array_merge($cols_n_values, $parsed_query);
 		}
 
-		$query_params = array( $cols_n_values );
+		$query_params = array($cols_n_values);
 
 
 		$existing_entry_in_join_table = $this->get_join_model()->get_one($query_params);
 		//if there is already an entry in the join table, indicating a relationship, we're done
 		 //again, if you want more sophisticated logic or insertions (handling more columns than just 2 foreign keys to
 		 //the other tables, use the joining model directly!
-		if( ! $existing_entry_in_join_table ){
+		if ( ! $existing_entry_in_join_table) {
 			$this->get_join_model()->insert($cols_n_values);
 		}
 		return $other_model_obj;
@@ -179,7 +179,7 @@ 
 	 * * @param array           $where_query col=>val pairs that are used as extra conditions for checking existing values and for removing existing rows if exact matches exist.
 	 * @return EE_Base_Class
 	 */
-	 function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array() ){
+	 function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array()) {
 		 $this_model_obj = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
 		 $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
 		//check if such a relationship already exists
@@ -196,24 +196,24 @@ 
 				$this->get_other_model()->get_this_model_name(), 
 				'name' );
 
-		$cols_n_values =  array(
+		$cols_n_values = array(
 				$join_model_fk_to_this_model->get_name() => $this_model_obj->ID(),
 				$join_model_name_field_to_this_model->get_name() => $this_model_obj->get_model()->get_this_model_name(),
 				$join_model_fk_to_other_model->get_name() => $other_model_obj->ID(),
 				$join_model_name_field_to_other_model->get_name() => $other_model_obj->get_model()->get_this_model_name() );
 
 		//if $where_query exists lets add them to the query_params.
-		if ( !empty( $where_query ) ) {
+		if ( ! empty($where_query)) {
 		 	//make sure we strip any of the join model names from the $where_query cause we don't need that in here (why? because client code may have used the same conditionals for get_all_related which DOES need the join model name)
 		 	//make sure we strip THIS models name from the query param
-		 	foreach ( $where_query as $query_param => $val ) {
-				$query_param = str_replace($this->get_join_model()->get_this_model_name().".","", $query_param);
+		 	foreach ($where_query as $query_param => $val) {
+				$query_param = str_replace($this->get_join_model()->get_this_model_name().".", "", $query_param);
 				$parsed_query[$query_param] = $val;
 			}
-		 	$cols_n_values = array_merge( $cols_n_values, $parsed_query );
+		 	$cols_n_values = array_merge($cols_n_values, $parsed_query);
 		}
 
-		$existing_entry_in_join_table = $this->get_join_model()->delete( array($cols_n_values) );
+		$existing_entry_in_join_table = $this->get_join_model()->delete(array($cols_n_values));
 		return $other_model_obj;
 	 }
 }

core/db_models/relations/EE_Model_Relation_Base.php

Doc Comments +7 added lines, -7 removed lines

@@ -67,7 +67,7 @@ 
 
 	/**
 	 * Gets the model where this relation is defined.
-	 * @return EEM_Base
+	 * @return boolean
 	 */
 	function get_this_model(){
 		return $this->_get_model($this->_this_model_name);
@@ -78,7 +78,7 @@ 
 	/**
 	 * Gets the model which this relation establishes the relation TO (ie,
 	 * this relation object was defined on get_this_model(), get_other_model() is the other one)
-	 * @return EEM_Base
+	 * @return boolean
 	 */
 	function get_other_model(){
 		return $this->_get_model($this->_other_model_name);
@@ -89,7 +89,7 @@ 
 	/**
 	 * Internally used by get_this_model() and get_other_model()
 	 * @param string $model_name like Event, Question_Group, etc. omit the EEM_
-	 * @return EEM_Base
+	 * @return boolean
 	 */
 	protected function _get_model($model_name){
 		$modelInstance = EE_Registry::instance()->load_model( $model_name );
@@ -112,9 +112,9 @@ 
 
 	/**
 	 * @param        $other_table
-	 * @param        $other_table_alias
+	 * @param        string $other_table_alias
 	 * @param        $other_table_column
-	 * @param        $this_table_alias
+	 * @param        string $this_table_alias
 	 * @param        $this_table_join_column
 	 * @param string $extra_join_sql
 	 * @return string
@@ -168,7 +168,7 @@ 
 	 * parameters are specified, then all related model objects will be deleted.
 	 * Note: If the related model is extends EEM_Soft_Delete_Base, then the related
 	 * model objects will only be soft-deleted.
-	 * @param EE_Base_Class|int|string $model_object_or_id
+	 * @param EE_Base_Class $model_object_or_id
 	 * @param array $query_params
 	 * @return int of how many related models got deleted
 	 */
@@ -196,7 +196,7 @@ 
 	 * parameters are specified, then all related model objects will be deleted.
 	 * Note: If the related model is extends EEM_Soft_Delete_Base, then the related
 	 * model objects will only be soft-deleted.
-	 * @param EE_Base_Class|int|string $model_object_or_id
+	 * @param EE_Base_Class $model_object_or_id
 	 * @param array $query_params
 	 * @return int of how many related models got deleted
 	 */

core/db_classes/EE_Extra_Join.class.php

Spacing +5 added lines, -5 removed lines

@@ -22,9 +22,9 @@ 
 	 * @param null  $timezone
 	 * @return EE_Event_Message_Template|mixed
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = NULL ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone );
-		return $has_object ? $has_object : new self( $props_n_values, FALSE, $timezone );
+	public static function new_instance($props_n_values = array(), $timezone = NULL) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone);
+		return $has_object ? $has_object : new self($props_n_values, FALSE, $timezone);
 	}
 
 
@@ -34,8 +34,8 @@ 
 	 * @param null  $timezone
 	 * @return EE_Event_Message_Template
 	 */
-	public static function new_instance_from_db ( $props_n_values = array(), $timezone = NULL ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = NULL) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 }

admin_pages/transactions/EE_Admin_Transactions_List_Table.class.php

Indentation +34 added lines, -34 removed lines

@@ -1,26 +1,26 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package	Event Espresso
- * @ author		Seth Shoultes
- * @ copyright	(c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license	{@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
- * @ link		{@link http://www.eventespresso.com}
- * @ since		4.0
- *
- * ------------------------------------------------------------------------
- *
- * Transactions Table class
- *
- * @package				Event Espresso
- * @subpackage			includes/admin_screens/Transactions_List_Table.class.php
- * @author					Brent Christensen
- *
- * ------------------------------------------------------------------------
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package	Event Espresso
+	 * @ author		Seth Shoultes
+	 * @ copyright	(c) 2008-2011 Event Espresso  All Rights Reserved.
+	 * @ license	{@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
+	 * @ link		{@link http://www.eventespresso.com}
+	 * @ since		4.0
+	 *
+	 * ------------------------------------------------------------------------
+	 *
+	 * Transactions Table class
+	 *
+	 * @package				Event Espresso
+	 * @subpackage			includes/admin_screens/Transactions_List_Table.class.php
+	 * @author					Brent Christensen
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 
 
 class EE_Admin_Transactions_List_Table extends EE_Admin_List_Table {
@@ -140,7 +140,7 @@ 
 	 * @return string
 	 */
    function column_TXN_ID( EE_Transaction $item ){
-    	$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
+		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
 	   $content = '<a href="' . $view_lnk_url . '" title="' . esc_attr__( 'Go to Transaction Details', 'event_espresso' ) . '">' . $item->ID() . '</a>';
 
 	   //txn timestamp
@@ -275,8 +275,8 @@ 
 	 * @param \EE_Transaction $item
 	 * @return string|void
 	 */
-    function column_event_name( EE_Transaction $item ){
-    	$actions = array();
+	function column_event_name( EE_Transaction $item ){
+		$actions = array();
 		$event = $item->primary_registration()->get_first_related('Event');
 		if ( !empty( $event ) ) {
 			$edit_event_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit', 'post'=>$event->ID() ), EVENTS_ADMIN_URL );
@@ -300,21 +300,21 @@ 
 	 * @param \EE_Transaction $item
 	 * @return string
 	 */
-    function column_actions( EE_Transaction $item ){
+	function column_actions( EE_Transaction $item ){
 
-    	$registration = $item->primary_registration();
-    	$attendee = $registration->attendee();
+		$registration = $item->primary_registration();
+		$attendee = $registration->attendee();
 		EE_Registry::instance()->load_helper( 'MSG_Template' );
 
-        //Build row actions
+		//Build row actions
 		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
 		$dl_invoice_lnk_url = $registration->invoice_url();
 		$dl_receipt_lnk_url = $registration->receipt_url();
 		$view_reg_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_registration', '_REG_ID'=>$registration->ID() ), REG_ADMIN_URL );
 		$send_pay_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'send_payment_reminder', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
-	    $related_messages_link = EEH_MSG_Template::get_message_action_link( 'see_notifications_for', null, array(
-		    'TXN_ID' => $item->ID()
-	    ));
+		$related_messages_link = EEH_MSG_Template::get_message_action_link( 'see_notifications_for', null, array(
+			'TXN_ID' => $item->ID()
+		));
 
 		//Build row actions
 		$view_lnk = '
@@ -349,8 +349,8 @@ 
 		$dl_receipt_lnk = '';
 	}
 
-      		//only show payment reminder link if the message type is active.
-      		if ( EEH_MSG_Template::is_mt_active( 'payment_reminder' ) ) {
+	  		//only show payment reminder link if the message type is active.
+	  		if ( EEH_MSG_Template::is_mt_active( 'payment_reminder' ) ) {
 		$send_pay_lnk = $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_transactions_send_payment_reminder' ) ? '
 			<li>
 				<a href="'.$send_pay_lnk_url.'" title="' . esc_attr__( 'Send Payment Reminder', 'event_espresso' ) . '" class="tiny-text">
@@ -376,7 +376,7 @@ 
 		}
 
 		return $this->_action_string( $view_lnk . $dl_invoice_lnk . $dl_receipt_lnk . $view_reg_lnk . $send_pay_lnk . $view_related_messages_lnk, $item, 'ul', 'txn-overview-actions-ul' );
-    }
+	}
 
 
 }

Spacing +87 added lines, -87 removed lines

@@ -33,8 +33,8 @@ 
 	 * @param \EE_Admin_Page $admin_page
 	 * @return EE_Admin_Transactions_List_Table
 	 */
-	function __construct( EE_Admin_Page $admin_page ){
-   		parent::__construct( $admin_page );
+	function __construct(EE_Admin_Page $admin_page) {
+   		parent::__construct($admin_page);
    		$this->_status = $this->_admin_page->get_transaction_status_array();
 
 	}
@@ -44,9 +44,9 @@ 
 
 
 	protected function _setup_data() {
-		$this->_data = $this->_admin_page->get_transactions( $this->_per_page );
-		$status = ! empty( $this->_req_data['status'] )? $this->_req_data['status'] : 'all';
-		$this->_all_data_count = $this->_admin_page->get_transactions( $this->_per_page, TRUE, $status );
+		$this->_data = $this->_admin_page->get_transactions($this->_per_page);
+		$status = ! empty($this->_req_data['status']) ? $this->_req_data['status'] : 'all';
+		$this->_all_data_count = $this->_admin_page->get_transactions($this->_per_page, TRUE, $status);
 	}
 
 
@@ -65,20 +65,20 @@ 
 			);
 
 		$this->_columns = array(
-			'TXN_ID' => __( 'ID', 'event_espresso' ),
-			'TXN_timestamp'	=> __( 'Transaction Date', 'event_espresso' ),
-			'TXN_total' => __( 'Total', 'event_espresso' ),
-			'TXN_paid' => __( 'Paid', 'event_espresso' ),
-			'ATT_fname' => __( 'Primary Registrant', 'event_espresso' ),
-			'event_name' => __( 'Event', 'event_espresso' ),
-			'actions' => __( 'Actions', 'event_espresso' )
+			'TXN_ID' => __('ID', 'event_espresso'),
+			'TXN_timestamp'	=> __('Transaction Date', 'event_espresso'),
+			'TXN_total' => __('Total', 'event_espresso'),
+			'TXN_paid' => __('Paid', 'event_espresso'),
+			'ATT_fname' => __('Primary Registrant', 'event_espresso'),
+			'event_name' => __('Event', 'event_espresso'),
+			'actions' => __('Actions', 'event_espresso')
 		);
 
 		$this->_sortable_columns = array(
-			'TXN_ID' => array( 'TXN_ID' => FALSE ),
-			'event_name' => array( 'event_name'=> FALSE ),
-			'ATT_fname'	=> array( 'ATT_fname'=> FALSE ),
-			'TXN_timestamp'	=> array( 'TXN_timestamp'=> TRUE ) //true means its already sorted
+			'TXN_ID' => array('TXN_ID' => FALSE),
+			'event_name' => array('event_name'=> FALSE),
+			'ATT_fname'	=> array('ATT_fname'=> FALSE),
+			'TXN_timestamp'	=> array('TXN_timestamp'=> TRUE) //true means its already sorted
 		);
 
 		$this->_primary_column = 'TXN_ID';
@@ -88,11 +88,11 @@ 
 
 
 
-	protected function _get_row_class( $item ) {
-		$class = parent::_get_row_class( $item );
+	protected function _get_row_class($item) {
+		$class = parent::_get_row_class($item);
 		//add status class
-		$class .= ' ee-status-strip txn-status-' . $item->status_ID();
-		if ( $this->_has_checkbox_column ) {
+		$class .= ' ee-status-strip txn-status-'.$item->status_ID();
+		if ($this->_has_checkbox_column) {
 			$class .= ' has-checkbox-column';
 		}
 		return $class;
@@ -109,8 +109,8 @@ 
 	 */
 	protected function _get_table_filters() {
 		$filters = array();
-		$start_date = isset( $this->_req_data['txn-filter-start-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-start-date'] ) : date( 'm/d/Y', strtotime( '-10 year' ));
-		$end_date = isset( $this->_req_data['txn-filter-end-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-end-date'] ) : date( 'm/d/Y' );
+		$start_date = isset($this->_req_data['txn-filter-start-date']) ? wp_strip_all_tags($this->_req_data['txn-filter-start-date']) : date('m/d/Y', strtotime('-10 year'));
+		$end_date = isset($this->_req_data['txn-filter-end-date']) ? wp_strip_all_tags($this->_req_data['txn-filter-end-date']) : date('m/d/Y');
 		ob_start();
 		?>
 		<label for="txn-filter-start-date">Display Transactions from </label>
@@ -128,9 +128,9 @@ 
 
 
 	protected function _add_view_counts() {
-		$this->_views['all']['count'] = $this->_admin_page->get_transactions( $this->_per_page, TRUE, 'all' );
-		$this->_views['abandoned']['count'] = $this->_admin_page->get_transactions( $this->_per_page, TRUE, 'abandoned' );
-		$this->_views['failed']['count'] = $this->_admin_page->get_transactions( $this->_per_page, TRUE, 'failed' );
+		$this->_views['all']['count'] = $this->_admin_page->get_transactions($this->_per_page, TRUE, 'all');
+		$this->_views['abandoned']['count'] = $this->_admin_page->get_transactions($this->_per_page, TRUE, 'abandoned');
+		$this->_views['failed']['count'] = $this->_admin_page->get_transactions($this->_per_page, TRUE, 'failed');
 	}
 
 
@@ -139,29 +139,29 @@ 
 	 * @param \EE_Transaction $item
 	 * @return string
 	 */
-   function column_TXN_ID( EE_Transaction $item ){
-    	$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
-	   $content = '<a href="' . $view_lnk_url . '" title="' . esc_attr__( 'Go to Transaction Details', 'event_espresso' ) . '">' . $item->ID() . '</a>';
+   function column_TXN_ID(EE_Transaction $item) {
+    	$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$item->ID()), TXN_ADMIN_URL);
+	   $content = '<a href="'.$view_lnk_url.'" title="'.esc_attr__('Go to Transaction Details', 'event_espresso').'">'.$item->ID().'</a>';
 
 	   //txn timestamp
-	   $content .= '  <span class="show-on-mobile-view-only">' . $this->_get_txn_timestamp( $item ) . '</span>';
+	   $content .= '  <span class="show-on-mobile-view-only">'.$this->_get_txn_timestamp($item).'</span>';
 	   return $content;
 	}
 
 
 
-	protected function _get_txn_timestamp( EE_Transaction $item ) {
+	protected function _get_txn_timestamp(EE_Transaction $item) {
 		//txn timestamp
 		// is TXN less than 2 hours old ?
 		if (
-			( ( time() - EE_Registry::instance()->SSN->lifespan() )
-			< $item->datetime( false, true )
+			((time() - EE_Registry::instance()->SSN->lifespan())
+			< $item->datetime(false, true)
 			)
-		&& ( $item->failed() || $item->is_abandoned() )
+		&& ($item->failed() || $item->is_abandoned())
 		) {
-			$timestamp = __( 'TXN in progress...', 'event_espresso' );
+			$timestamp = __('TXN in progress...', 'event_espresso');
 	   } else {
-			$timestamp = $item->get_i18n_datetime( 'TXN_timestamp' );
+			$timestamp = $item->get_i18n_datetime('TXN_timestamp');
 		}
 		return $timestamp;
 	}
@@ -173,8 +173,8 @@ 
 	 * @param \EE_Transaction $item
 	 * @return string
 	 */
-	function column_cb($item ){
-		return sprintf( '<input type="checkbox" name="%1$s[]" value="%2$s" />', $this->_wp_list_args['singular'],  $item->ID());
+	function column_cb($item) {
+		return sprintf('<input type="checkbox" name="%1$s[]" value="%2$s" />', $this->_wp_list_args['singular'], $item->ID());
 	}
 
 
@@ -185,11 +185,11 @@ 
 	 * @param \EE_Transaction $item
 	 * @return string
 	 */
-	function column_TXN_timestamp( EE_Transaction $item ){
-		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
-		$txn_date = '<a href="'.$view_lnk_url.'" title="' . esc_attr__( 'View Transaction Details for TXN #', 'event_espresso' ) . $item->ID() . '">' . $this->_get_txn_timestamp( $item ) . '</a>';
+	function column_TXN_timestamp(EE_Transaction $item) {
+		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$item->ID()), TXN_ADMIN_URL);
+		$txn_date = '<a href="'.$view_lnk_url.'" title="'.esc_attr__('View Transaction Details for TXN #', 'event_espresso').$item->ID().'">'.$this->_get_txn_timestamp($item).'</a>';
 		//status
-		$txn_date .= '<br><span class="ee-status-text-small">' . EEH_Template::pretty_status( $item->status_ID(), false, 'sentence' ) . '</span>';
+		$txn_date .= '<br><span class="ee-status-text-small">'.EEH_Template::pretty_status($item->status_ID(), false, 'sentence').'</span>';
 		return $txn_date;
 	}
 
@@ -199,11 +199,11 @@ 
 	 * @param \EE_Transaction $item
 	 * @return string
 	 */
-	function column_TXN_total( EE_Transaction $item ){
-		if ( $item->get('TXN_total') > 0 ) {
-			return '<span class="txn-pad-rght">' . apply_filters( 'FHEE__EE_Admin_Transactions_List_Table__column_TXN_total__TXN_total', $item->get_pretty('TXN_total'), $item ) . '</span>';
+	function column_TXN_total(EE_Transaction $item) {
+		if ($item->get('TXN_total') > 0) {
+			return '<span class="txn-pad-rght">'.apply_filters('FHEE__EE_Admin_Transactions_List_Table__column_TXN_total__TXN_total', $item->get_pretty('TXN_total'), $item).'</span>';
 		} else {
-			return '<span class="txn-overview-free-event-spn">' . __( 'free', 'event_espresso' ) . '</span>';
+			return '<span class="txn-overview-free-event-spn">'.__('free', 'event_espresso').'</span>';
 		}
 	}
 
@@ -213,19 +213,19 @@ 
 	 * @param \EE_Transaction $item
 	 * @return mixed|string
 	 */
-	function column_TXN_paid( EE_Transaction $item ){
+	function column_TXN_paid(EE_Transaction $item) {
 		$transaction_total = $item->get('TXN_total');
 		$transaction_paid = $item->get('TXN_paid');
 
-		if (( $transaction_total > 0 ) && ( $transaction_paid >= $transaction_total )) {
+		if (($transaction_total > 0) && ($transaction_paid >= $transaction_total)) {
 			// paid in full
 			$span_class = 'txn-overview-full-payment-spn';
 
-		} elseif (( $transaction_total > 0 ) && ( $transaction_paid > 0 )) {
+		} elseif (($transaction_total > 0) && ($transaction_paid > 0)) {
 			// monies owing
 			$span_class = 'txn-overview-part-payment-spn';
 
-		} elseif (( $transaction_total > 0 ) && ( $transaction_paid == 0 )) {
+		} elseif (($transaction_total > 0) && ($transaction_paid == 0)) {
 			// no payments made
 			$span_class = 'txn-overview-no-payment-spn';
 
@@ -235,11 +235,11 @@ 
 		}
 
 		$payment_method = $item->payment_method();
-		$payment_method_name = $payment_method instanceof EE_Payment_Method ? $payment_method->admin_name() : __( 'Unknown', 'event_espresso' );
+		$payment_method_name = $payment_method instanceof EE_Payment_Method ? $payment_method->admin_name() : __('Unknown', 'event_espresso');
 
-		$content = '<span class="' . $span_class . ' txn-pad-rght">' . $transaction_paid !== 0 ? $item->get_pretty('TXN_paid') : $transaction_paid . '</span>';
-		if ( $transaction_paid > 0 ) {
-			$content .= '<br><span class="ee-status-text-small">' . sprintf( __( '...via %s', 'event_espresso' ), $payment_method_name ) . '</span>';
+		$content = '<span class="'.$span_class.' txn-pad-rght">'.$transaction_paid !== 0 ? $item->get_pretty('TXN_paid') : $transaction_paid.'</span>';
+		if ($transaction_paid > 0) {
+			$content .= '<br><span class="ee-status-text-small">'.sprintf(__('...via %s', 'event_espresso'), $payment_method_name).'</span>';
 		}
 		return $content;
 	}
@@ -250,13 +250,13 @@ 
 	 * @param \EE_Transaction $item
 	 * @return string|void
 	 */
-	function column_ATT_fname( EE_Transaction $item ){
+	function column_ATT_fname(EE_Transaction $item) {
 		$primary_reg = $item->primary_registration();
 		$attendee = $primary_reg->get_first_related('Attendee');
-		if ( $attendee instanceof EE_Attendee ) {
-			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_registration', '_REG_ID'=>$primary_reg->ID() ), REG_ADMIN_URL );
-			$content = EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $primary_reg->ID() ) ? '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'View Registration Details', 'event_espresso' ) . '">' . $attendee->full_name() . '</a>' : $attendee->full_name();
-			$content .= '<br>' . $attendee->email();
+		if ($attendee instanceof EE_Attendee) {
+			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_registration', '_REG_ID'=>$primary_reg->ID()), REG_ADMIN_URL);
+			$content = EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $primary_reg->ID()) ? '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('View Registration Details', 'event_espresso').'">'.$attendee->full_name().'</a>' : $attendee->full_name();
+			$content .= '<br>'.$attendee->email();
 			return $content;
 		}
 		return $item->failed() || $item->is_abandoned() ? __('no contact record.', 'event_espresso') : __('No contact record, because the transaction was abandoned or the registration process failed.', 'event_espresso');
@@ -268,10 +268,10 @@ 
 	 * @param \EE_Transaction $item
 	 * @return string|void
 	 */
-	function column_ATT_email( EE_Transaction $item ){
+	function column_ATT_email(EE_Transaction $item) {
 		$attendee = $item->primary_registration()->get_first_related('Attendee');
-		if ( !empty( $attendee ) )
-			return '<a href="mailto:' . $attendee->get('ATT_email') . '">' . $attendee->get('ATT_email') . '</a>';
+		if ( ! empty($attendee))
+			return '<a href="mailto:'.$attendee->get('ATT_email').'">'.$attendee->get('ATT_email').'</a>';
 		else
 			return $item->failed() || $item->is_abandoned() ? __('no contact record.', 'event_espresso') : __('No contact record, because the transaction was abandoned or the registration process failed.', 'event_espresso');
 		;
@@ -283,20 +283,20 @@ 
 	 * @param \EE_Transaction $item
 	 * @return string|void
 	 */
-    function column_event_name( EE_Transaction $item ){
+    function column_event_name(EE_Transaction $item) {
     	$actions = array();
 		$event = $item->primary_registration()->get_first_related('Event');
-		if ( !empty( $event ) ) {
-			$edit_event_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit', 'post'=>$event->ID() ), EVENTS_ADMIN_URL );
+		if ( ! empty($event)) {
+			$edit_event_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit', 'post'=>$event->ID()), EVENTS_ADMIN_URL);
 			$event_name = $event->get('EVT_name');
 
 			//filter this view by transactions for this event
-			$txn_by_event_lnk = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'default', 'EVT_ID' => $event->ID() ) );
-			if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'espresso_events_edit', $event->ID() ) ) {
-				$actions['filter_by_event'] = '<a href="' . $txn_by_event_lnk . '" title="' . esc_attr__('Filter transactions by this event', 'event_espresso') . '">' . __('View Transactions for this event', 'event_espresso') . '</a>';
+			$txn_by_event_lnk = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default', 'EVT_ID' => $event->ID()));
+			if (EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $event->ID())) {
+				$actions['filter_by_event'] = '<a href="'.$txn_by_event_lnk.'" title="'.esc_attr__('Filter transactions by this event', 'event_espresso').'">'.__('View Transactions for this event', 'event_espresso').'</a>';
 			}
 
-			return sprintf('%1$s %2$s', EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'espresso_events_edit', $event->ID() ) ? '<a href="' . $edit_event_url . '" title="' . sprintf( esc_attr__( 'Edit Event: %s', 'event_espresso' ), $event->get('EVT_name') ) .'">' .  wp_trim_words( $event_name, 30, '...' ) . '</a>' : wp_trim_words( $event_name, 30, '...' ), $this->row_actions($actions) );
+			return sprintf('%1$s %2$s', EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $event->ID()) ? '<a href="'.$edit_event_url.'" title="'.sprintf(esc_attr__('Edit Event: %s', 'event_espresso'), $event->get('EVT_name')).'">'.wp_trim_words($event_name, 30, '...').'</a>' : wp_trim_words($event_name, 30, '...'), $this->row_actions($actions));
 		} else {
 			return __('The event associated with this transaction via the primary registration cannot be retrieved.', 'event_espresso');
 		}
@@ -308,36 +308,36 @@ 
 	 * @param \EE_Transaction $item
 	 * @return string
 	 */
-    function column_actions( EE_Transaction $item ){
+    function column_actions(EE_Transaction $item) {
 
     	$registration = $item->primary_registration();
     	$attendee = $registration->attendee();
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+		EE_Registry::instance()->load_helper('MSG_Template');
 
         //Build row actions
-		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
+		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$item->ID()), TXN_ADMIN_URL);
 		$dl_invoice_lnk_url = $registration->invoice_url();
 		$dl_receipt_lnk_url = $registration->receipt_url();
-		$view_reg_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_registration', '_REG_ID'=>$registration->ID() ), REG_ADMIN_URL );
-		$send_pay_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'send_payment_reminder', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
-	    $related_messages_link = EEH_MSG_Template::get_message_action_link( 'see_notifications_for', null, array(
+		$view_reg_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_registration', '_REG_ID'=>$registration->ID()), REG_ADMIN_URL);
+		$send_pay_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'send_payment_reminder', 'TXN_ID'=>$item->ID()), TXN_ADMIN_URL);
+	    $related_messages_link = EEH_MSG_Template::get_message_action_link('see_notifications_for', null, array(
 		    'TXN_ID' => $item->ID()
 	    ));
 
 		//Build row actions
 		$view_lnk = '
 			<li>
-				<a href="'.$view_lnk_url.'" title="' . esc_attr__( 'View Transaction Details', 'event_espresso' ) . '" class="tiny-text">
+				<a href="'.$view_lnk_url.'" title="'.esc_attr__('View Transaction Details', 'event_espresso').'" class="tiny-text">
 					<span class="dashicons dashicons-cart"></span>
 				</a>
 			</li>';
 
 
 	//only show invoice link if message type is active.
-	if ( $attendee instanceof EE_Attendee && EEH_MSG_Template::is_mt_active( 'invoice' ) ) {
+	if ($attendee instanceof EE_Attendee && EEH_MSG_Template::is_mt_active('invoice')) {
 		$dl_invoice_lnk = '
 		<li>
-			<a title="' . esc_attr__( 'View Transaction Invoice', 'event_espresso' ) . '" target="_blank" href="'.$dl_invoice_lnk_url.'" class="tiny-text">
+			<a title="' . esc_attr__('View Transaction Invoice', 'event_espresso').'" target="_blank" href="'.$dl_invoice_lnk_url.'" class="tiny-text">
 				<span class="dashicons dashicons-media-spreadsheet ee-icon-size-18"></span>
 			</a>
 		</li>';
@@ -346,10 +346,10 @@ 
 	}
 
 	//only show receipt link if message type is active.
-	if ( $attendee instanceof EE_Attendee && EEH_MSG_Template::is_mt_active( 'receipt' ) ) {
+	if ($attendee instanceof EE_Attendee && EEH_MSG_Template::is_mt_active('receipt')) {
 		$dl_receipt_lnk = '
 		<li>
-			<a title="' . esc_attr__( 'View Transaction Receipt', 'event_espresso' ) . '" target="_blank" href="'.$dl_receipt_lnk_url.'" class="tiny-text">
+			<a title="' . esc_attr__('View Transaction Receipt', 'event_espresso').'" target="_blank" href="'.$dl_receipt_lnk_url.'" class="tiny-text">
 				<span class="dashicons dashicons-media-default ee-icon-size-18"></span>
 			</a>
 		</li>';
@@ -358,10 +358,10 @@ 
 	}
 
       		//only show payment reminder link if the message type is active.
-      		if ( EEH_MSG_Template::is_mt_active( 'payment_reminder' ) ) {
-		$send_pay_lnk = $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_transactions_send_payment_reminder' ) ? '
+      		if (EEH_MSG_Template::is_mt_active('payment_reminder')) {
+		$send_pay_lnk = $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_transactions_send_payment_reminder') ? '
 			<li>
-				<a href="'.$send_pay_lnk_url.'" title="' . esc_attr__( 'Send Payment Reminder', 'event_espresso' ) . '" class="tiny-text">
+				<a href="'.$send_pay_lnk_url.'" title="'.esc_attr__('Send Payment Reminder', 'event_espresso').'" class="tiny-text">
 					<span class="dashicons dashicons-email-alt"></span>
 				</a>
 			</li>' : '';
@@ -370,20 +370,20 @@ 
 			$send_pay_lnk = '';
 		}
 
-		$view_reg_lnk = EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $registration->ID() ) ? '
+		$view_reg_lnk = EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $registration->ID()) ? '
 			<li>
-				<a href="'.$view_reg_lnk_url.'" title="' . esc_attr__( 'View Registration Details', 'event_espresso' ) . '" class="tiny-text">
+				<a href="'.$view_reg_lnk_url.'" title="'.esc_attr__('View Registration Details', 'event_espresso').'" class="tiny-text">
 					<span class="dashicons dashicons-clipboard"></span>
 				</a>
 			</li>' : '';
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_messages', 'view_filtered_messages' ) ) {
-			$view_related_messages_lnk = '<li>' . $related_messages_link . '</li>';
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_messages', 'view_filtered_messages')) {
+			$view_related_messages_lnk = '<li>'.$related_messages_link.'</li>';
 		} else {
 			$view_related_messages_lnk = '';
 		}
 
-		return $this->_action_string( $view_lnk . $dl_invoice_lnk . $dl_receipt_lnk . $view_reg_lnk . $send_pay_lnk . $view_related_messages_lnk, $item, 'ul', 'txn-overview-actions-ul' );
+		return $this->_action_string($view_lnk.$dl_invoice_lnk.$dl_receipt_lnk.$view_reg_lnk.$send_pay_lnk.$view_related_messages_lnk, $item, 'ul', 'txn-overview-actions-ul');
     }
 
 

core/libraries/form_sections/strategies/validation/EE_Max_Length_Validation_Strategy.strategy.php

Spacing +12 added lines, -12 removed lines

@@ -8,36 +8,36 @@
  * @subpackage	Expression package is undefined on line 19, column 19 in Templates/Scripting/PHPClass.php.
  * @author				Mike Nelson
  */
-class EE_Max_Length_Validation_Strategy extends EE_Validation_Strategy_Base{
+class EE_Max_Length_Validation_Strategy extends EE_Validation_Strategy_Base {
 
 	protected $_max_length;
 
-	public function __construct( $validation_error_message = NULL, $max_length = EE_INF ) {
+	public function __construct($validation_error_message = NULL, $max_length = EE_INF) {
 		$this->_max_length = $max_length;
-		if( $validation_error_message === null ) {
-			$validation_error_message = sprintf( __( 'Input is too long. Maximum number of characters is %1$s', 'event_espresso' ), $max_length );
+		if ($validation_error_message === null) {
+			$validation_error_message = sprintf(__('Input is too long. Maximum number of characters is %1$s', 'event_espresso'), $max_length);
 		}
-		parent::__construct( $validation_error_message );
+		parent::__construct($validation_error_message);
 	}
 
 	/**
 	 * @param $normalized_value
 	 */
 	public function validate($normalized_value) {
-		if( $this->_max_length !== EE_INF &&
+		if ($this->_max_length !== EE_INF &&
 				$normalized_value &&
-				is_string( $normalized_value ) &&
-				 strlen( $normalized_value ) > $this->_max_length){
-			throw new EE_Validation_Error( $this->get_validation_error_message(), 'maxlength' );
+				is_string($normalized_value) &&
+				 strlen($normalized_value) > $this->_max_length) {
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'maxlength');
 		}
 	}
 
 	/**
 	 * @return array
 	 */
-	function get_jquery_validation_rule_array(){
-		if( $this->_max_length !== EE_INF ) {
-			return array( 'maxlength'=> $this->_max_length, 'messages' => array( 'maxlength' => $this->get_validation_error_message() ) );
+	function get_jquery_validation_rule_array() {
+		if ($this->_max_length !== EE_INF) {
+			return array('maxlength'=> $this->_max_length, 'messages' => array('maxlength' => $this->get_validation_error_message()));
 		} else {
 			return array();
 		}

core/libraries/batch/JobHandlerBaseClasses/JobHandler.php

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php
 /**
- *
- * Class JobHandler
- *
- * Base class for common implementations of JobHandlerInterface.
- *
- * @package         Event Espresso
- * @subpackage    batch
- * @author				Mike Nelson
- * @since		 	   4.8.26
- *
- */
+	 *
+	 * Class JobHandler
+	 *
+	 * Base class for common implementations of JobHandlerInterface.
+	 *
+	 * @package         Event Espresso
+	 * @subpackage    batch
+	 * @author				Mike Nelson
+	 * @since		 	   4.8.26
+	 *
+	 */
 namespace EventEspressoBatchRequest\JobHandlerBaseClasses;
 
 use EventEspressoBatchRequest\Helpers\BatchRequestException;

Spacing +2 added lines, -2 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');
 }
 /**
  * Class EE_Line_Item_Filter_Collection

core/libraries/form_sections/payment_methods/EE_Payment_Method_Form.form.php

Spacing +32 added lines, -32 removed lines

@@ -4,7 +4,7 @@ 
  * Specialized form for payment methods, allowing for easy setting and retrieving of meta fields.
  * Uses EEM_Payment_Method as the model
  */
-class EE_Payment_Method_Form extends EE_Model_Form_Section{
+class EE_Payment_Method_Form extends EE_Model_Form_Section {
 
 	/**
 	 * All the subsection inputs that correspond ot extra meta rows
@@ -39,37 +39,37 @@ 
 	 *	@see EE_Model_Form_Section::__construct() for more
 	 * }
 	 */
-	public function __construct($options_array = array()){
+	public function __construct($options_array = array()) {
 		$this->_model = EEM_Payment_Method::instance();
 		$this->_options_array = $options_array;
-		if(isset($options_array['payment_method_type'])){
+		if (isset($options_array['payment_method_type'])) {
 			$this->_payment_method_type = $options_array['payment_method_type'];
 		}
 		$options_array = $this->_options_array;
-		if(isset($options_array['extra_meta_inputs'])){
-			$this->_extra_meta_inputs = array_merge($this->_extra_meta_inputs,$options_array['extra_meta_inputs']);
+		if (isset($options_array['extra_meta_inputs'])) {
+			$this->_extra_meta_inputs = array_merge($this->_extra_meta_inputs, $options_array['extra_meta_inputs']);
 		}
-		if($this->_extra_meta_inputs){
-			$this->_subsections = array_merge($this->_subsections,$this->_extra_meta_inputs);
+		if ($this->_extra_meta_inputs) {
+			$this->_subsections = array_merge($this->_subsections, $this->_extra_meta_inputs);
 		}
 		$this->_subsections['PMD_button_url'] = new EE_Admin_File_Uploader_Input(
-			array( 'html_label_text'=>  __( 'Button URL', 'event_espresso' ))
+			array('html_label_text'=>  __('Button URL', 'event_espresso'))
 		);
 		$this->_subsections['PMD_scope'] = new EE_Checkbox_Multi_Input(
 			EEM_Payment_Method::instance()->scopes(),
-			array( 'html_label_text' => $this->_model->field_settings_for('PMD_scope')->get_nicename() . EEH_Template::get_help_tab_link( 'payment_methods_overview' ))
+			array('html_label_text' => $this->_model->field_settings_for('PMD_scope')->get_nicename().EEH_Template::get_help_tab_link('payment_methods_overview'))
 		);
 		//setup the currency options
 		$this->_subsections['Currency'] = new EE_Select_Multi_Model_Input(
-			EEM_Currency::instance()->get_all_currencies_usable_by( $this->_payment_method_type ),
+			EEM_Currency::instance()->get_all_currencies_usable_by($this->_payment_method_type),
 			array(
-				'html_label_text'=>  __( 'Currencies Supported', 'event_espresso' ),
+				'html_label_text'=>  __('Currencies Supported', 'event_espresso'),
 				'required'=>TRUE
 			)
 		);
-		$this->_subsections['PMD_order'] = new EE_Text_Input( array(
-			'html_label_text' => __( 'Order', 'event_espresso' ),
-			'html_help_text' => __( 'Lowest numbers will be shown first', 'event_espresso' ),
+		$this->_subsections['PMD_order'] = new EE_Text_Input(array(
+			'html_label_text' => __('Order', 'event_espresso'),
+			'html_help_text' => __('Lowest numbers will be shown first', 'event_espresso'),
 			'normalization_strategy' => new EE_Int_Normalization(),
 			'validation_strategies' => array(
 				new EE_Int_Validation_Strategy()
@@ -88,15 +88,15 @@ 
 	 * @param string 	$name
 	 * @throws EE_Error
 	 */
-	public function _construct_finalize( $parent_form_section, $name ) {
-		if( ! $this->_payment_method_type instanceof EE_PMT_Base ){
-			throw new EE_Error( sprintf( __( 'Payment Method forms must have set their payment method type BEFORE calling _construct_finalize', 'event_espresso' )));
+	public function _construct_finalize($parent_form_section, $name) {
+		if ( ! $this->_payment_method_type instanceof EE_PMT_Base) {
+			throw new EE_Error(sprintf(__('Payment Method forms must have set their payment method type BEFORE calling _construct_finalize', 'event_espresso')));
 		}
 		//set the name of this form based on the payment method type
-		if( ! $this->_name && ! $name ){
-			$name = str_replace(" ","_",ucwords(str_replace("_"," ",($this->_payment_method_type->system_name()))))."_Settings_Form";
+		if ( ! $this->_name && ! $name) {
+			$name = str_replace(" ", "_", ucwords(str_replace("_", " ", ($this->_payment_method_type->system_name()))))."_Settings_Form";
 		}
-		parent::_construct_finalize( $parent_form_section, $name );
+		parent::_construct_finalize($parent_form_section, $name);
 	}
 
 
@@ -105,8 +105,8 @@ 
 	 * @param $payment_method_type
 	 * @throws EE_Error
 	 */
-	public function set_payment_method_type( $payment_method_type ){
-		if( ! $payment_method_type instanceof EE_PMT_Base){
+	public function set_payment_method_type($payment_method_type) {
+		if ( ! $payment_method_type instanceof EE_PMT_Base) {
 			throw new EE_Error(sprintf(__("Payment Method forms MUST set a payment method type by using _set_payment_method_type", "event_espresso")));
 		}
 		$this->_payment_method_type = $payment_method_type;
@@ -118,10 +118,10 @@ 
 	 * extends the model form section's save method to also save the extra meta field values
 	 * @return int ID of the payment method inserted, or true on update
 	 */
-	public function save(){
+	public function save() {
 		$parent_save_val = parent::save();
-		if( $this->_model_object && $this->_model_object->ID()){
-			foreach($this->_extra_meta_inputs as $input_name => $input){
+		if ($this->_model_object && $this->_model_object->ID()) {
+			foreach ($this->_extra_meta_inputs as $input_name => $input) {
 				$this->_model_object->update_extra_meta($input_name, $input->normalized_value());
 			}
 		}
@@ -138,8 +138,8 @@ 
 		$model_obj = $this->_model->ensure_is_obj($model_obj);
 		parent::populate_model_obj($model_obj);
 		$extra_meta = $model_obj->all_extra_meta_array();
-		foreach($this->_extra_meta_inputs as $input_name => $extra_meta_input){
-			if(isset($extra_meta[$input_name])){
+		foreach ($this->_extra_meta_inputs as $input_name => $extra_meta_input) {
+			if (isset($extra_meta[$input_name])) {
 				$extra_meta_input->set_default($extra_meta[$input_name]);
 			}
 		}
@@ -151,10 +151,10 @@ 
 	 * gets the default name of this form section if none is specified
 	 * @return string
 	 */
-	protected function _set_default_name_if_empty(){
-		if( ! $this->_name ){
-			$default_name = str_replace("EEM_", "", get_class($this->_model)) . "_Model_Form";
-			$this->_name =  $default_name;
+	protected function _set_default_name_if_empty() {
+		if ( ! $this->_name) {
+			$default_name = str_replace("EEM_", "", get_class($this->_model))."_Model_Form";
+			$this->_name = $default_name;
 		}
 	}
 
@@ -164,7 +164,7 @@ 
 	 * Gets all the extra meta inputs in this form
 	 * @return EE_Form_Input_Base[]
 	 */
-	public function extra_meta_inputs(){
+	public function extra_meta_inputs() {
 		return $this->_extra_meta_inputs;
 	}
 }

admin_pages/registration_form/Registration_Form_Admin_Page.core.php

Braces +9 added lines, -13 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
@@ -330,14 +331,9 @@ 
 			else if ( $fieldName == 'QST_admin_label' && ( isset( $this->_req_data['QST_admin_label'] ) && empty( $this->_req_data['QST_admin_label'] )  )) {
 				$QST_text = isset( $this->_req_data['QST_display_text'] ) ? $this->_req_data['QST_display_text'] : '' ;
 				$set_column_values[$fieldName] = sanitize_title(wp_trim_words($QST_text,10));
-			}
-
-
-			else if ( $fieldName == 'QST_admin_only' && ( !isset( $this->_req_data['QST_admin_only'] ) ) ) {
+			} else if ( $fieldName == 'QST_admin_only' && ( !isset( $this->_req_data['QST_admin_only'] ) ) ) {
 				$set_column_values[$fieldName] = 0;
-			}
-
-			else if ( $fieldName == 'QST_max' ) {
+			} else if ( $fieldName == 'QST_max' ) {
 				$qst_system = EEM_Question::instance()->get_var(
 					array(
 						array(
@@ -390,7 +386,7 @@ 
 			$question=$this->_question_model->get_one_by_ID($ID);
 			$additional_hidden_fields=array('QST_ID'=>array('type'=>'hidden','value'=>$ID));
 			$this->_set_add_edit_form_tags('update_question', $additional_hidden_fields);
-		}else{
+		} else{
 			$question= EE_Question::new_instance();
 			$question->set_order_to_latest();
 			$this->_set_add_edit_form_tags('insert_question');
@@ -421,7 +417,7 @@ 
 			$ID=$this->_question_model->insert($set_column_values);
 			$success = $ID ? true : false;
 			$action_desc = 'added';
-		}else{
+		} else{
 			$ID=absint($this->_req_data['QST_ID']);
 			$pk=$this->_question_model->primary_key_name();
 			$wheres=array($pk=>$ID);
@@ -442,7 +438,7 @@ 
 					$option_req_index=$this->_get_option_req_data_index($option_ID);
 					if($option_req_index!==FALSE){
 						$option->save($this->_req_data['question_options'][$option_req_index]);
-					}else{
+					} else{
 						//not found, remove it
 						$option->delete();
 					}
@@ -519,7 +515,7 @@ 
 						'QSG_name'=>array('LIKE',"%$search_string%"),
 						'QSG_desc'=>array('LIKE',"%$search_string%"))
 					);
-			}else{
+			} else{
 				$query_params[0]=array(
 					'QST_display_text'=>array('LIKE',"%$search_string%")
 					);
@@ -575,7 +571,7 @@ 
 		if ($count){
 			$where = isset( $query_params[0] ) ? array( $query_params[0] ) : array();
 			$results = $QST->count($where);
-		}else{
+		} else{
 			$results = $QST->get_all($query_params);
 		}
 		return $results;

Spacing +145 added lines, -145 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -58,12 +58,12 @@ 
 
 
 
-	public function __construct( $routing = TRUE ) {
-		require_once( EE_MODELS . 'EEM_Question.model.php' );
-		require_once( EE_MODELS . 'EEM_Question_Group.model.php' );
-		$this->_question_model=  EEM_Question::instance();
-		$this->_question_group_model=EEM_Question_Group::instance();
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		require_once(EE_MODELS.'EEM_Question.model.php');
+		require_once(EE_MODELS.'EEM_Question_Group.model.php');
+		$this->_question_model = EEM_Question::instance();
+		$this->_question_group_model = EEM_Question_Group::instance();
+		parent::__construct($routing);
 	}
 
 
@@ -97,7 +97,7 @@ 
 
 
 	protected function _set_page_routes() {
-		$qst_id = ! empty( $this->_req_data['QST_ID'] ) ? $this->_req_data['QST_ID'] : 0;
+		$qst_id = ! empty($this->_req_data['QST_ID']) ? $this->_req_data['QST_ID'] : 0;
 		$this->_page_routes = array(
 			'default' => array(
 				'func' => '_questions_overview_list_table',
@@ -118,7 +118,7 @@ 
 
 			'update_question' => array(
 				'func' => '_insert_or_update_question',
-				'args' => array('new_question' => FALSE ),
+				'args' => array('new_question' => FALSE),
 				'capability' => 'ee_edit_question',
 				'obj_id' => $qst_id,
 				'noheader' => TRUE,
@@ -153,7 +153,7 @@ 
 						'filename' => 'registration_form_questions_overview_views_bulk_actions_search'
 						)
 					),
-				'help_tour' => array( 'Registration_Form_Questions_Overview_Help_Tour'),
+				'help_tour' => array('Registration_Form_Questions_Overview_Help_Tour'),
 				'require_nonce' => FALSE,
 				'qtips' => array(
 					'EE_Registration_Form_Tips'
@@ -172,7 +172,7 @@ 
 						'filename' => 'registration_form_question_groups'
 						),
 					),
-				'help_tour' => array( 'Registration_Form_Question_Groups_Help_Tour'),
+				'help_tour' => array('Registration_Form_Question_Groups_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 
@@ -181,16 +181,16 @@ 
 					'label' => __('Edit Question', 'event_espresso'),
 					'order' => 15,
 					'persistent' => FALSE,
-					'url' => isset($this->_req_data['question_id']) ? add_query_arg(array('question_id' => $this->_req_data['question_id'] ), $this->_current_page_view_url )  : $this->_admin_base_url
+					'url' => isset($this->_req_data['question_id']) ? add_query_arg(array('question_id' => $this->_req_data['question_id']), $this->_current_page_view_url) : $this->_admin_base_url
 					),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 				'help_tabs' => array(
 					'registration_form_edit_question_group_help_tab' => array(
 						'title' => __('Edit Question', 'event_espresso'),
 						'filename' => 'registration_form_edit_question'
 						),
 					),
-                'help_tour' => array( 'Registration_Form_Edit_Question_Help_Tour'),
+                'help_tour' => array('Registration_Form_Edit_Question_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 			);
@@ -218,7 +218,7 @@ 
 	//none of the below group are currently used for Event Categories
 	protected function _add_feature_pointers() {}
 	public function load_scripts_styles() {
-		wp_register_style( 'espresso_registration', REGISTRATION_FORM_ASSETS_URL . 'espresso_registration_form_admin.css', array(), EVENT_ESPRESSO_VERSION );
+		wp_register_style('espresso_registration', REGISTRATION_FORM_ASSETS_URL.'espresso_registration_form_admin.css', array(), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('espresso_registration');
 	}
 	public function admin_init() {}
@@ -234,20 +234,20 @@ 
 
 	public function load_scripts_styles_add_question() {
 		$this->load_scripts_styles_forms();
-		wp_register_script( 'espresso_registration_form_single', REGISTRATION_FORM_ASSETS_URL . 'espresso_registration_form_admin.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_enqueue_script( 'espresso_registration_form_single' );
+		wp_register_script('espresso_registration_form_single', REGISTRATION_FORM_ASSETS_URL.'espresso_registration_form_admin.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_enqueue_script('espresso_registration_form_single');
 	}
 	public function load_scripts_styles_edit_question() {
 		$this->load_scripts_styles_forms();
-		wp_register_script( 'espresso_registration_form_single', REGISTRATION_FORM_ASSETS_URL . 'espresso_registration_form_admin.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_enqueue_script( 'espresso_registration_form_single' );
+		wp_register_script('espresso_registration_form_single', REGISTRATION_FORM_ASSETS_URL.'espresso_registration_form_admin.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_enqueue_script('espresso_registration_form_single');
 	}
 
 
 
 
 	public function recaptcha_info_help_tab() {
-		$template = REGISTRATION_FORM_TEMPLATE_PATH . 'recaptcha_info_help_tab.template.php';
+		$template = REGISTRATION_FORM_TEMPLATE_PATH.'recaptcha_info_help_tab.template.php';
 		EEH_Template::display_template($template, array());
 	}
 
@@ -279,7 +279,7 @@ 
 				)
 		);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_questions', 'espresso_registration_form_trash_questions' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_questions', 'espresso_registration_form_trash_questions')) {
 			$this->_views['trash'] = array(
 				'slug' => 'trash',
 				'label' => __('Trash', 'event_espresso'),
@@ -297,9 +297,9 @@ 
 	 */
 	protected function _questions_groups_preview() {
 		$this->_admin_page_title = __('Question Groups (Preview)', 'event_espresso');
-		$this->_template_args['preview_img'] = '<img src="' . REGISTRATION_FORM_ASSETS_URL . 'caf_reg_form_preview.jpg" alt="' . esc_attr__( 'Preview Question Groups Overview List Table screenshot', 'event_espresso' ) . '" />';
-		$this->_template_args['preview_text'] = '<strong>'.__( 'Question Groups is a feature that is only available in the Caffeinated version of Event Espresso.  With the Question Groups feature you are able to: create new question groups, edit existing question groups, and also create and edit new questions and add them to question groups.', 'event_espresso' ).'</strong>';
-		$this->display_admin_caf_preview_page( 'question_groups_tab' );
+		$this->_template_args['preview_img'] = '<img src="'.REGISTRATION_FORM_ASSETS_URL.'caf_reg_form_preview.jpg" alt="'.esc_attr__('Preview Question Groups Overview List Table screenshot', 'event_espresso').'" />';
+		$this->_template_args['preview_text'] = '<strong>'.__('Question Groups is a feature that is only available in the Caffeinated version of Event Espresso.  With the Question Groups feature you are able to: create new question groups, edit existing question groups, and also create and edit new questions and add them to question groups.', 'event_espresso').'</strong>';
+		$this->display_admin_caf_preview_page('question_groups_tab');
 	}
 
 
@@ -310,58 +310,58 @@ 
 	 * @param \EEM_Base $model
 	 * @return array where each key is the name of a model's field/db column, and each value is its value.
 	 */
-	protected function _set_column_values_for(EEM_Base $model){
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$set_column_values=array();
+	protected function _set_column_values_for(EEM_Base $model) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$set_column_values = array();
 
 		//some initial checks for proper values.
 		//if QST_admin_only, then no matter what QST_required is we disable.
-		if ( !empty( $this->_req_data['QST_admin_only'] ) ) {
+		if ( ! empty($this->_req_data['QST_admin_only'])) {
 			$this->_req_data['QST_required'] = 0;
 		}
-		foreach($model->field_settings() as $fieldName=>$settings){
+		foreach ($model->field_settings() as $fieldName=>$settings) {
 			// basically if QSG_identifier is empty or not set
-			if ( $fieldName == 'QSG_identifier' && ( isset( $this->_req_data['QSG_identifier'] ) && empty( $this->_req_data['QSG_identifier'] ) )) {
-				$QSG_name = isset( $this->_req_data['QSG_name'] ) ? $this->_req_data['QSG_name'] : '' ;
-				$set_column_values[$fieldName] = sanitize_title($QSG_name ) . '-' . uniqid();
+			if ($fieldName == 'QSG_identifier' && (isset($this->_req_data['QSG_identifier']) && empty($this->_req_data['QSG_identifier']))) {
+				$QSG_name = isset($this->_req_data['QSG_name']) ? $this->_req_data['QSG_name'] : '';
+				$set_column_values[$fieldName] = sanitize_title($QSG_name).'-'.uniqid();
 //				dd($set_column_values);
 			}
 			//if the admin label is blank, use a slug version of the question text
-			else if ( $fieldName == 'QST_admin_label' && ( isset( $this->_req_data['QST_admin_label'] ) && empty( $this->_req_data['QST_admin_label'] )  )) {
-				$QST_text = isset( $this->_req_data['QST_display_text'] ) ? $this->_req_data['QST_display_text'] : '' ;
-				$set_column_values[$fieldName] = sanitize_title(wp_trim_words($QST_text,10));
+			else if ($fieldName == 'QST_admin_label' && (isset($this->_req_data['QST_admin_label']) && empty($this->_req_data['QST_admin_label']))) {
+				$QST_text = isset($this->_req_data['QST_display_text']) ? $this->_req_data['QST_display_text'] : '';
+				$set_column_values[$fieldName] = sanitize_title(wp_trim_words($QST_text, 10));
 			}
 
 
-			else if ( $fieldName == 'QST_admin_only' && ( !isset( $this->_req_data['QST_admin_only'] ) ) ) {
+			else if ($fieldName == 'QST_admin_only' && ( ! isset($this->_req_data['QST_admin_only']))) {
 				$set_column_values[$fieldName] = 0;
 			}
 
-			else if ( $fieldName == 'QST_max' ) {
+			else if ($fieldName == 'QST_max') {
 				$qst_system = EEM_Question::instance()->get_var(
 					array(
 						array(
-							'QST_ID' => isset( $this->_req_data[ 'QST_ID' ] ) ? $this->_req_data[ 'QST_ID' ] : 0
+							'QST_ID' => isset($this->_req_data['QST_ID']) ? $this->_req_data['QST_ID'] : 0
 						)
 					),
 					'QST_system' );
-				$max_max = EEM_Question::instance()->absolute_max_for_system_question( $qst_system );
-				if( empty( $this->_req_data[ 'QST_max' ] ) ||
-					 $this->_req_data[ 'QST_max' ] > $max_max ) {
-					$set_column_values[ $fieldName ] = $max_max;
+				$max_max = EEM_Question::instance()->absolute_max_for_system_question($qst_system);
+				if (empty($this->_req_data['QST_max']) ||
+					 $this->_req_data['QST_max'] > $max_max) {
+					$set_column_values[$fieldName] = $max_max;
 				}
 			}
 
 
 			//only add a property to the array if it's not null (otherwise the model should just use the default value)
-			if(
-				! isset( $set_column_values[ $fieldName ] ) &&
-				isset($this->_req_data[$fieldName] ) ){
-				$set_column_values[$fieldName]=$this->_req_data[$fieldName];
+			if (
+				! isset($set_column_values[$fieldName]) &&
+				isset($this->_req_data[$fieldName]) ) {
+				$set_column_values[$fieldName] = $this->_req_data[$fieldName];
 			}
 
 		}
-		return $set_column_values;//validation fo this data to be performed by the model before insertion.
+		return $set_column_values; //validation fo this data to be performed by the model before insertion.
 	}
 
 
@@ -379,30 +379,30 @@ 
 	/**
 	 * @param string $action
 	 */
-	protected function _edit_question( $action= 'add' ) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$ID=isset( $this->_req_data['QST_ID'] ) && ! empty( $this->_req_data['QST_ID'] ) ? absint( $this->_req_data['QST_ID'] ) : FALSE;
+	protected function _edit_question($action = 'add') {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$ID = isset($this->_req_data['QST_ID']) && ! empty($this->_req_data['QST_ID']) ? absint($this->_req_data['QST_ID']) : FALSE;
 
-		$this->_admin_page_title = ucwords( str_replace( '_', ' ', $this->_req_action ));
+		$this->_admin_page_title = ucwords(str_replace('_', ' ', $this->_req_action));
 		// add PRC_ID to title if editing
-		$this->_admin_page_title = $ID ? $this->_admin_page_title . ' # ' . $ID : $this->_admin_page_title;
-		if($ID){
-			$question=$this->_question_model->get_one_by_ID($ID);
-			$additional_hidden_fields=array('QST_ID'=>array('type'=>'hidden','value'=>$ID));
+		$this->_admin_page_title = $ID ? $this->_admin_page_title.' # '.$ID : $this->_admin_page_title;
+		if ($ID) {
+			$question = $this->_question_model->get_one_by_ID($ID);
+			$additional_hidden_fields = array('QST_ID'=>array('type'=>'hidden', 'value'=>$ID));
 			$this->_set_add_edit_form_tags('update_question', $additional_hidden_fields);
-		}else{
-			$question= EE_Question::new_instance();
+		} else {
+			$question = EE_Question::new_instance();
 			$question->set_order_to_latest();
 			$this->_set_add_edit_form_tags('insert_question');
 		}
-		$question_types = $question->has_answers() ?  $this->_question_model->question_types_in_same_category( $question->type() ) : $this->_question_model->allowed_question_types();
-		$this->_template_args['QST_ID']=$ID;
-		$this->_template_args['question']=$question;
-		$this->_template_args['question_types']= $question_types;
-		$this->_template_args['max_max'] = EEM_Question::instance()->absolute_max_for_system_question( $question->system_ID() );
+		$question_types = $question->has_answers() ? $this->_question_model->question_types_in_same_category($question->type()) : $this->_question_model->allowed_question_types();
+		$this->_template_args['QST_ID'] = $ID;
+		$this->_template_args['question'] = $question;
+		$this->_template_args['question_types'] = $question_types;
+		$this->_template_args['max_max'] = EEM_Question::instance()->absolute_max_for_system_question($question->system_ID());
 
-		$this->_set_publish_post_box_vars( 'id', $ID );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( REGISTRATION_FORM_TEMPLATE_PATH . 'questions_main_meta_box.template.php', $this->_template_args, TRUE );
+		$this->_set_publish_post_box_vars('id', $ID);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(REGISTRATION_FORM_TEMPLATE_PATH.'questions_main_meta_box.template.php', $this->_template_args, TRUE);
 
 		// the details template wrapper
 		$this->display_admin_page_with_sidebar();
@@ -414,58 +414,58 @@ 
 	 * @param bool|true $new_question
 	 * @throws \EE_Error
 	 */
-	protected function _insert_or_update_question( $new_question = TRUE) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$set_column_values=$this->_set_column_values_for($this->_question_model);
-		if($new_question){
-			$ID=$this->_question_model->insert($set_column_values);
+	protected function _insert_or_update_question($new_question = TRUE) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$set_column_values = $this->_set_column_values_for($this->_question_model);
+		if ($new_question) {
+			$ID = $this->_question_model->insert($set_column_values);
 			$success = $ID ? true : false;
 			$action_desc = 'added';
-		}else{
-			$ID=absint($this->_req_data['QST_ID']);
-			$pk=$this->_question_model->primary_key_name();
-			$wheres=array($pk=>$ID);
+		} else {
+			$ID = absint($this->_req_data['QST_ID']);
+			$pk = $this->_question_model->primary_key_name();
+			$wheres = array($pk=>$ID);
 			unset($set_column_values[$pk]);
-			$success= $this->_question_model->update($set_column_values,array($wheres));
-			$action_desc='updated';
+			$success = $this->_question_model->update($set_column_values, array($wheres));
+			$action_desc = 'updated';
 		}
 
-		if ($ID){
+		if ($ID) {
 			//save the related options
 			//trash removed options, save old ones
 			//get list of all options
 			/** @type EE_Question $question */
-			$question=$this->_question_model->get_one_by_ID($ID);
-			$options=$question->options();
-			if(! empty($options)){
-				foreach($options as $option_ID=>$option){
-					$option_req_index=$this->_get_option_req_data_index($option_ID);
-					if($option_req_index!==FALSE){
+			$question = $this->_question_model->get_one_by_ID($ID);
+			$options = $question->options();
+			if ( ! empty($options)) {
+				foreach ($options as $option_ID=>$option) {
+					$option_req_index = $this->_get_option_req_data_index($option_ID);
+					if ($option_req_index !== FALSE) {
 						$option->save($this->_req_data['question_options'][$option_req_index]);
-					}else{
+					} else {
 						//not found, remove it
 						$option->delete();
 					}
 				}
 			}
 			//save new related options
-			foreach($this->_req_data['question_options'] as $index=>$option_req_data){
-				if( empty($option_req_data['QSO_ID'] ) && (  ( isset( $option_req_data['QSO_value'] ) && $option_req_data['QSO_value'] !== '' ) || ! empty( $option_req_data['QSO_desc'] ) ) ) {//no ID! save it!
-					if( ! isset( $option_req_data['QSO_value'] ) || $option_req_data['QSO_value'] === ''  ){
-						$option_req_data['QSO_value']=$option_req_data['QSO_desc'];
+			foreach ($this->_req_data['question_options'] as $index=>$option_req_data) {
+				if (empty($option_req_data['QSO_ID']) && ((isset($option_req_data['QSO_value']) && $option_req_data['QSO_value'] !== '') || ! empty($option_req_data['QSO_desc']))) {//no ID! save it!
+					if ( ! isset($option_req_data['QSO_value']) || $option_req_data['QSO_value'] === '') {
+						$option_req_data['QSO_value'] = $option_req_data['QSO_desc'];
 					}
-					$new_option=EE_Question_Option::new_instance( array( 'QSO_value' => $option_req_data['QSO_value'], 'QSO_desc' => $option_req_data['QSO_desc'], 'QSO_order' => $option_req_data['QSO_order'], 'QST_ID' => $question->ID()));
+					$new_option = EE_Question_Option::new_instance(array('QSO_value' => $option_req_data['QSO_value'], 'QSO_desc' => $option_req_data['QSO_desc'], 'QSO_order' => $option_req_data['QSO_order'], 'QST_ID' => $question->ID()));
 					$new_option->save();
 				}
 			}
 		}
-		$query_args = array( 'action' => 'edit_question', 'QST_ID' => $ID );
-		if ( $success !== FALSE ) {
-			$msg = $new_question ? sprintf( __('The %s has been created', 'event_espresso'), $this->_question_model->item_name() ) : sprintf( __('The %s has been updated', 'event_espresso' ), $this->_question_model->item_name() );
-			EE_Error::add_success( $msg );
+		$query_args = array('action' => 'edit_question', 'QST_ID' => $ID);
+		if ($success !== FALSE) {
+			$msg = $new_question ? sprintf(__('The %s has been created', 'event_espresso'), $this->_question_model->item_name()) : sprintf(__('The %s has been updated', 'event_espresso'), $this->_question_model->item_name());
+			EE_Error::add_success($msg);
 		}
 
-		$this->_redirect_after_action( FALSE, '', $action_desc, $query_args, TRUE);
+		$this->_redirect_after_action(FALSE, '', $action_desc, $query_args, TRUE);
 	}
 
 
@@ -478,10 +478,10 @@ 
 	 * @param int $ID of the question option to find
 	 * @return int index in question_options array if successful, FALSE if unsuccessful
 	 */
-	protected function _get_option_req_data_index($ID){
-		$req_data_for_question_options=$this->_req_data['question_options'];
-		foreach($req_data_for_question_options as $num=>$option_data){
-			if(array_key_exists('QSO_ID',$option_data) && intval($option_data['QSO_ID'])==$ID){
+	protected function _get_option_req_data_index($ID) {
+		$req_data_for_question_options = $this->_req_data['question_options'];
+		foreach ($req_data_for_question_options as $num=>$option_data) {
+			if (array_key_exists('QSO_ID', $option_data) && intval($option_data['QSO_ID']) == $ID) {
 				return $num;
 			}
 		}
@@ -503,25 +503,25 @@ 
 	 * @param int      $current_page
 	 * @return array lik EEM_Base::get_all's $query_params parameter
 	 */
-	protected function get_query_params($model, $per_page=10,$current_page=10){
+	protected function get_query_params($model, $per_page = 10, $current_page = 10) {
 		$query_params = array();
-		$offset=($current_page-1)*$per_page;
-		$query_params['limit']=array($offset,$per_page);
-		$order = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'ASC';
+		$offset = ($current_page - 1) * $per_page;
+		$query_params['limit'] = array($offset, $per_page);
+		$order = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'ASC';
 		$orderby_field = $model instanceof EEM_Question ? 'QST_ID' : 'QSG_order';
 		$field_to_order_by = empty($this->_req_data['orderby']) ? $orderby_field : $this->_req_data['orderby'];
-		$query_params['order_by']=array( $field_to_order_by => $order );
-		$search_string = array_key_exists('s',$this->_req_data) ? $this->_req_data['s'] : null;
-		if(! empty($search_string)){
-			if($model instanceof EEM_Question_Group){
-				$query_params[0]=array(
+		$query_params['order_by'] = array($field_to_order_by => $order);
+		$search_string = array_key_exists('s', $this->_req_data) ? $this->_req_data['s'] : null;
+		if ( ! empty($search_string)) {
+			if ($model instanceof EEM_Question_Group) {
+				$query_params[0] = array(
 					'OR'=>array(
-						'QSG_name'=>array('LIKE',"%$search_string%"),
-						'QSG_desc'=>array('LIKE',"%$search_string%"))
+						'QSG_name'=>array('LIKE', "%$search_string%"),
+						'QSG_desc'=>array('LIKE', "%$search_string%"))
 					);
-			}else{
-				$query_params[0]=array(
-					'QST_display_text'=>array('LIKE',"%$search_string%")
+			} else {
+				$query_params[0] = array(
+					'QST_display_text'=>array('LIKE', "%$search_string%")
 					);
 			}
 		}
@@ -569,13 +569,13 @@ 
 	 * @param bool|false $count
 	 * @return \EE_Soft_Delete_Base_Class[]|int
 	 */
-	public function get_questions( $per_page=10, $current_page = 1, $count = FALSE ) {
+	public function get_questions($per_page = 10, $current_page = 1, $count = FALSE) {
 		$QST = EEM_Question::instance();
 		$query_params = $this->get_query_params($QST, $per_page, $current_page);
-		if ($count){
-			$where = isset( $query_params[0] ) ? array( $query_params[0] ) : array();
+		if ($count) {
+			$where = isset($query_params[0]) ? array($query_params[0]) : array();
 			$results = $QST->count($where);
-		}else{
+		} else {
 			$results = $QST->get_all($query_params);
 		}
 		return $results;
@@ -590,10 +590,10 @@ 
 	 * @param bool|false $count
 	 * @return \EE_Soft_Delete_Base_Class[]|int
 	 */
-	public function get_trashed_questions( $per_page, $current_page = 1, $count = FALSE ) {
-		$query_params =$this->get_query_params( EEM_Question::instance(), $per_page, $current_page);
-		$where        = isset( $query_params[0] ) ? array($query_params[0]) : array();
-		$questions    =$count ? EEM_Question::instance()->count_deleted($where) : EEM_Question::instance()->get_all_deleted($query_params);
+	public function get_trashed_questions($per_page, $current_page = 1, $count = FALSE) {
+		$query_params = $this->get_query_params(EEM_Question::instance(), $per_page, $current_page);
+		$where        = isset($query_params[0]) ? array($query_params[0]) : array();
+		$questions    = $count ? EEM_Question::instance()->count_deleted($where) : EEM_Question::instance()->get_all_deleted($query_params);
 		return $questions;
 	}
 
@@ -605,11 +605,11 @@ 
 	 * @param bool|false $count
 	 * @return \EE_Soft_Delete_Base_Class[]
 	 */
-	public function get_question_groups( $per_page, $current_page = 1, $count = FALSE ) {
+	public function get_question_groups($per_page, $current_page = 1, $count = FALSE) {
 		/** @type EEM_Question_Group $questionGroupModel */
-		$questionGroupModel=EEM_Question_Group::instance();
-		$query_params=$this->get_query_params( $questionGroupModel, $per_page, $current_page );
-		$questionGroups=$questionGroupModel->get_all($query_params);//note: this a subclass of EEM_Soft_Delete_Base, so this is actually only getting non-trashed items
+		$questionGroupModel = EEM_Question_Group::instance();
+		$query_params = $this->get_query_params($questionGroupModel, $per_page, $current_page);
+		$questionGroups = $questionGroupModel->get_all($query_params); //note: this a subclass of EEM_Soft_Delete_Base, so this is actually only getting non-trashed items
 		return $questionGroups;
 	}
 
@@ -626,36 +626,36 @@ 
 
 		$this->_template_args['values'] = $this->_yes_no_values;
 
-		$this->_template_args['use_captcha'] = isset( EE_Registry::instance()->CFG->registration->use_captcha ) ? EE_Registry::instance()->CFG->registration->use_captcha : FALSE;
-		$this->_template_args['show_captcha_settings'] = $this->_template_args['use_captcha'] ? 'style="display:table-row;"': '';
+		$this->_template_args['use_captcha'] = isset(EE_Registry::instance()->CFG->registration->use_captcha) ? EE_Registry::instance()->CFG->registration->use_captcha : FALSE;
+		$this->_template_args['show_captcha_settings'] = $this->_template_args['use_captcha'] ? 'style="display:table-row;"' : '';
 
-		$this->_template_args['recaptcha_publickey'] = isset( EE_Registry::instance()->CFG->registration->recaptcha_publickey ) ? stripslashes( EE_Registry::instance()->CFG->registration->recaptcha_publickey ) : '';
-		$this->_template_args['recaptcha_privatekey'] = isset( EE_Registry::instance()->CFG->registration->recaptcha_privatekey ) ? stripslashes( EE_Registry::instance()->CFG->registration->recaptcha_privatekey ) : '';
-		$this->_template_args['recaptcha_width'] = isset( EE_Registry::instance()->CFG->registration->recaptcha_width ) ? absint( EE_Registry::instance()->CFG->registration->recaptcha_width ) : 500;
+		$this->_template_args['recaptcha_publickey'] = isset(EE_Registry::instance()->CFG->registration->recaptcha_publickey) ? stripslashes(EE_Registry::instance()->CFG->registration->recaptcha_publickey) : '';
+		$this->_template_args['recaptcha_privatekey'] = isset(EE_Registry::instance()->CFG->registration->recaptcha_privatekey) ? stripslashes(EE_Registry::instance()->CFG->registration->recaptcha_privatekey) : '';
+		$this->_template_args['recaptcha_width'] = isset(EE_Registry::instance()->CFG->registration->recaptcha_width) ? absint(EE_Registry::instance()->CFG->registration->recaptcha_width) : 500;
 
 		$this->_template_args['recaptcha_theme_options'] = array(
-				array('id'  => 'red','text'=> __('Red', 'event_espresso')),
-				array('id'  => 'white','text'=> __('White', 'event_espresso')),
-				array('id'  => 'blackglass','text'=> __('Blackglass', 'event_espresso')),
-				array('id'  => 'clean','text'=> __('Clean', 'event_espresso'))
+				array('id'  => 'red', 'text'=> __('Red', 'event_espresso')),
+				array('id'  => 'white', 'text'=> __('White', 'event_espresso')),
+				array('id'  => 'blackglass', 'text'=> __('Blackglass', 'event_espresso')),
+				array('id'  => 'clean', 'text'=> __('Clean', 'event_espresso'))
 			);
-		$this->_template_args['recaptcha_theme'] = isset( EE_Registry::instance()->CFG->registration->recaptcha_theme ) ? EE_Registry::instance()->CFG->registration->get_pretty( 'recaptcha_theme' ) : 'clean';
+		$this->_template_args['recaptcha_theme'] = isset(EE_Registry::instance()->CFG->registration->recaptcha_theme) ? EE_Registry::instance()->CFG->registration->get_pretty('recaptcha_theme') : 'clean';
 
 		$this->_template_args['recaptcha_language_options'] = array(
-				array('id'  => 'en','text'=> __('English', 'event_espresso')),
-				array('id'  => 'es','text'=> __('Spanish', 'event_espresso')),
-				array('id'  => 'nl','text'=> __('Dutch', 'event_espresso')),
-				array('id'  => 'fr','text'=> __('French', 'event_espresso')),
-				array('id'  => 'de','text'=> __('German', 'event_espresso')),
-				array('id'  => 'pt','text'=> __('Portuguese', 'event_espresso')),
-				array('id'  => 'ru','text'=> __('Russian', 'event_espresso')),
-				array('id'  => 'tr','text'=> __('Turkish', 'event_espresso'))
+				array('id'  => 'en', 'text'=> __('English', 'event_espresso')),
+				array('id'  => 'es', 'text'=> __('Spanish', 'event_espresso')),
+				array('id'  => 'nl', 'text'=> __('Dutch', 'event_espresso')),
+				array('id'  => 'fr', 'text'=> __('French', 'event_espresso')),
+				array('id'  => 'de', 'text'=> __('German', 'event_espresso')),
+				array('id'  => 'pt', 'text'=> __('Portuguese', 'event_espresso')),
+				array('id'  => 'ru', 'text'=> __('Russian', 'event_espresso')),
+				array('id'  => 'tr', 'text'=> __('Turkish', 'event_espresso'))
 			);
-		$this->_template_args['recaptcha_language'] = isset( EE_Registry::instance()->CFG->registration->recaptcha_language ) ? EE_Registry::instance()->CFG->registration->recaptcha_language : 'en';
+		$this->_template_args['recaptcha_language'] = isset(EE_Registry::instance()->CFG->registration->recaptcha_language) ? EE_Registry::instance()->CFG->registration->recaptcha_language : 'en';
 
-		$this->_set_add_edit_form_tags( 'update_reg_form_settings' );
-		$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( REGISTRATION_FORM_TEMPLATE_PATH . 'reg_form_settings.template.php', $this->_template_args, TRUE );
+		$this->_set_add_edit_form_tags('update_reg_form_settings');
+		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(REGISTRATION_FORM_TEMPLATE_PATH.'reg_form_settings.template.php', $this->_template_args, TRUE);
 		$this->display_admin_page_with_sidebar();
 	}
 

core/libraries/payment_methods/EE_Payment_Method_Manager.lib.php

Spacing +73 added lines, -73 removed lines

@@ -35,7 +35,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated, and instantiated properly
-		if ( ! self::$_instance instanceof EE_Payment_Method_Manager ) {
+		if ( ! self::$_instance instanceof EE_Payment_Method_Manager) {
 			self::$_instance = new self();
 		}
 		EE_Registry::instance()->load_lib('PMT_Base');
@@ -46,7 +46,7 @@ 
 	 * Resets the instance and returns a new one
 	 * @return EE_Payment_Method_Manager
 	 */
-	public static function reset(){
+	public static function reset() {
 		self::$_instance = NULL;
 		return self::instance();
 	}
@@ -57,12 +57,12 @@ 
 	 * or just re-use the PMTs we found last time we checked during this request (if
 	 * we have not yet checked during this request, then we need to check anyways)
 	 */
-	public function maybe_register_payment_methods( $force_recheck = FALSE ){
-		if( ! $this->_payment_method_types || $force_recheck ){
+	public function maybe_register_payment_methods($force_recheck = FALSE) {
+		if ( ! $this->_payment_method_types || $force_recheck) {
 			$this->_register_payment_methods();
 			//if in admin lets ensure caps are set.
-			if ( is_admin() ) {
-				add_filter( 'FHEE__EE_Capabilities__init_caps_map__caps', array( $this, 'add_payment_method_caps' ) );
+			if (is_admin()) {
+				add_filter('FHEE__EE_Capabilities__init_caps_map__caps', array($this, 'add_payment_method_caps'));
 				EE_Registry::instance()->CAP->init_caps();
 			}
 		}
@@ -75,19 +75,19 @@ 
 	 */
 	protected function _register_payment_methods() {
 		// grab list of installed modules
-		$pm_to_register = glob( EE_PAYMENT_METHODS . '*', GLOB_ONLYDIR );
+		$pm_to_register = glob(EE_PAYMENT_METHODS.'*', GLOB_ONLYDIR);
 		// filter list of modules to register
-		$pm_to_register = apply_filters( 'FHEE__EE_Payment_Method_Manager__register_payment_methods__payment_methods_to_register', $pm_to_register );
+		$pm_to_register = apply_filters('FHEE__EE_Payment_Method_Manager__register_payment_methods__payment_methods_to_register', $pm_to_register);
 
 		// loop through folders
-		foreach ( $pm_to_register as $pm_path ) {
-				$this->register_payment_method( $pm_path );
+		foreach ($pm_to_register as $pm_path) {
+				$this->register_payment_method($pm_path);
 		}
-		do_action( 'FHEE__EE_Payment_Method_Manager__register_payment_methods__registered_payment_methods' );
+		do_action('FHEE__EE_Payment_Method_Manager__register_payment_methods__registered_payment_methods');
 		// filter list of installed modules
 		//keep them organized alphabetically by the payment method type's name
-		ksort( $this->_payment_method_types );
-		return apply_filters( 'FHEE__EE_Payment_Method_Manager__register_payment_methods__installed_payment_methods', $this->_payment_method_types );
+		ksort($this->_payment_method_types);
+		return apply_filters('FHEE__EE_Payment_Method_Manager__register_payment_methods__installed_payment_methods', $this->_payment_method_types);
 	}
 
 
@@ -99,35 +99,35 @@ 
 	 * @param string $payment_method_path - full path up to and including payment method folder
 	 * @return boolean
 	 */
-	public function register_payment_method( $payment_method_path = '' ) {
-		do_action( 'AHEE__EE_Payment_Method_Manager__register_payment_method__begin',$payment_method_path );
+	public function register_payment_method($payment_method_path = '') {
+		do_action('AHEE__EE_Payment_Method_Manager__register_payment_method__begin', $payment_method_path);
 		$module_ext = '.pm.php';
 		// make all separators match
-		$payment_method_path = rtrim( str_replace( '/\\', DS, $payment_method_path ), DS );
+		$payment_method_path = rtrim(str_replace('/\\', DS, $payment_method_path), DS);
 		// grab and sanitize module name
-		$module_dir = basename( $payment_method_path );
+		$module_dir = basename($payment_method_path);
 		// create classname from module directory name
-		$module = str_replace( ' ', '_', str_replace( '_', ' ', $module_dir ));
+		$module = str_replace(' ', '_', str_replace('_', ' ', $module_dir));
 		// add class prefix
-		$module_class = 'EE_PMT_' . $module;
+		$module_class = 'EE_PMT_'.$module;
 		// does the module exist ?
-		if ( ! is_readable( $payment_method_path . DS . $module_class . $module_ext )) {
-			$msg = sprintf( __( 'The requested %s payment method file could not be found or is not readable due to file permissions.', 'event_espresso' ), $module );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! is_readable($payment_method_path.DS.$module_class.$module_ext)) {
+			$msg = sprintf(__('The requested %s payment method file could not be found or is not readable due to file permissions.', 'event_espresso'), $module);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		if ( WP_DEBUG === TRUE ) { EEH_Debug_Tools::instance()->start_timer(); }
+		if (WP_DEBUG === TRUE) { EEH_Debug_Tools::instance()->start_timer(); }
 		// load the module class file
-		require_once( $payment_method_path . DS . $module_class . $module_ext );
-		if ( WP_DEBUG === TRUE ) { EEH_Debug_Tools::instance()->stop_timer("Requiring payment method $module_class"); }
+		require_once($payment_method_path.DS.$module_class.$module_ext);
+		if (WP_DEBUG === TRUE) { EEH_Debug_Tools::instance()->stop_timer("Requiring payment method $module_class"); }
 		// verify that class exists
-		if ( ! class_exists( $module_class )) {
-			$msg = sprintf( __( 'The requested %s module class does not exist.', 'event_espresso' ), $module_class );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! class_exists($module_class)) {
+			$msg = sprintf(__('The requested %s module class does not exist.', 'event_espresso'), $module_class);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// add to array of registered modules
-		$this->_payment_method_types[ $module ] = $payment_method_path . DS . $module_class . $module_ext;
+		$this->_payment_method_types[$module] = $payment_method_path.DS.$module_class.$module_ext;
 		return TRUE;
 	}
 	/**
@@ -136,15 +136,15 @@ 
 	 * @param boolean $force_recheck whether to force re-checking for new payment method types
 	 * @return boolean
 	 */
-	public function payment_method_type_exists($payment_method_name, $force_recheck = FALSE){
-		if ( ! is_array( $this->_payment_method_types ) || ! isset( $this->_payment_method_types[$payment_method_name] )
-				|| $force_recheck ) {
+	public function payment_method_type_exists($payment_method_name, $force_recheck = FALSE) {
+		if ( ! is_array($this->_payment_method_types) || ! isset($this->_payment_method_types[$payment_method_name])
+				|| $force_recheck) {
 			$this->maybe_register_payment_methods($force_recheck);
 		}
-		if(isset($this->_payment_method_types[$payment_method_name])){
+		if (isset($this->_payment_method_types[$payment_method_name])) {
 			require_once($this->_payment_method_types[$payment_method_name]);
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -155,16 +155,16 @@ 
 	 * @param boolean $force_recheck whether to force re-checking for new payment method types
 	 * @return array
 	 */
-	public function payment_method_type_names($with_prefixes = FALSE, $force_recheck = FALSE ){
+	public function payment_method_type_names($with_prefixes = FALSE, $force_recheck = FALSE) {
 		$this->maybe_register_payment_methods($force_recheck);
-		if($with_prefixes){
+		if ($with_prefixes) {
 			$classnames = array_keys($this->_payment_method_types);
 			$payment_methods = array();
-			foreach($classnames as $classname){
+			foreach ($classnames as $classname) {
 				$payment_methods[] = $this->payment_method_class_from_type($classname);
 			}
 			return $payment_methods;
-		}else{
+		} else {
 			return array_keys($this->_payment_method_types);
 		}
 	}
@@ -174,10 +174,10 @@ 
 	 * @param boolean $force_recheck whether to force re-checking for new payment method types
 	 * @return EE_PMT_Base[]
 	 */
-	public function payment_method_types( $force_recheck = FALSE ){
+	public function payment_method_types($force_recheck = FALSE) {
 		$this->maybe_register_payment_methods($force_recheck);
 		$pmt_objs = array();
-		foreach($this->payment_method_type_names(true) as $classname){
+		foreach ($this->payment_method_type_names(true) as $classname) {
 			$pmt_objs[] = new $classname;
 		}
 		return $pmt_objs;
@@ -189,8 +189,8 @@ 
 	 * @param string $classname
 	 * @return string
 	 */
-	public function payment_method_type_sans_class_prefix($classname){
-		$pmt_name = str_replace("EE_PMT_","",$classname);
+	public function payment_method_type_sans_class_prefix($classname) {
+		$pmt_name = str_replace("EE_PMT_", "", $classname);
 		return $pmt_name;
 	}
 
@@ -199,7 +199,7 @@ 
 	 * @param string $type
 	 * @return string
 	 */
-	public function payment_method_class_from_type($type){
+	public function payment_method_class_from_type($type) {
 		$this->maybe_register_payment_methods();
 		return "EE_PMT_".$type;
 	}
@@ -213,38 +213,38 @@ 
 	 * @return \EE_Payment_Method
 	 * @throws \EE_Error
 	 */
-	public function activate_a_payment_method_of_type( $payment_method_type ){
+	public function activate_a_payment_method_of_type($payment_method_type) {
 		$payment_method = EEM_Payment_Method::instance()->get_one_of_type($payment_method_type);
-		if( ! $payment_method instanceof EE_Payment_Method ){
+		if ( ! $payment_method instanceof EE_Payment_Method) {
 			$pm_type_class = $this->payment_method_class_from_type($payment_method_type);
-			if(class_exists($pm_type_class)){
+			if (class_exists($pm_type_class)) {
 				/** @var $pm_type_obj EE_PMT_Base */
 				$pm_type_obj = new $pm_type_class;
 				$payment_method = EEM_Payment_Method::instance()->get_one_by_slug($pm_type_obj->system_name());
-				if( ! $payment_method){
-					$payment_method = $this->create_payment_method_of_type( $pm_type_obj );
+				if ( ! $payment_method) {
+					$payment_method = $this->create_payment_method_of_type($pm_type_obj);
 				}
-				$payment_method->set_type( $payment_method_type );
-				$this->initialize_payment_method( $payment_method );
+				$payment_method->set_type($payment_method_type);
+				$this->initialize_payment_method($payment_method);
 			} else {
 				throw new EE_Error(
 					sprintf(
-						__( 'There is no payment method of type %1$s, so it could not be activated', 'event_espresso'),
+						__('There is no payment method of type %1$s, so it could not be activated', 'event_espresso'),
 						$pm_type_class )
 				);
 			}
 		}
 		$payment_method->set_active();
 		$payment_method->save();
-		$this->set_usable_currencies_on_payment_method( $payment_method );
-		if( $payment_method->type() == 'Invoice' ){
-			$messages = EE_Registry::instance()->load_lib( 'messages' );
-			$messages->ensure_message_type_is_active( 'invoice', 'html' );
-			$messages->ensure_messenger_is_active( 'pdf' );
+		$this->set_usable_currencies_on_payment_method($payment_method);
+		if ($payment_method->type() == 'Invoice') {
+			$messages = EE_Registry::instance()->load_lib('messages');
+			$messages->ensure_message_type_is_active('invoice', 'html');
+			$messages->ensure_messenger_is_active('pdf');
 			EE_Error::add_attention(
 				sprintf(
-					__( 'Note, when the invoice payment method is activated, the invoice message type, html messenger, and pdf messenger are activated as well for the %1$smessages system%2$s.', 'event_espresso' ),
-					'<a href="' . admin_url( 'admin.php?page=espresso_messages') . '">',
+					__('Note, when the invoice payment method is activated, the invoice message type, html messenger, and pdf messenger are activated as well for the %1$smessages system%2$s.', 'event_espresso'),
+					'<a href="'.admin_url('admin.php?page=espresso_messages').'">',
 					'</a>'
 				)
 			);
@@ -258,17 +258,17 @@ 
 	 * @param EE_PMT_Base $pm_type_obj
 	 * @return EE_Payment_Method
 	 */
-	public function create_payment_method_of_type( $pm_type_obj ) {
+	public function create_payment_method_of_type($pm_type_obj) {
 		global $current_user;
 		$payment_method = EE_Payment_Method::new_instance(
 			array(
 				'PMD_type' 		 => $pm_type_obj->system_name(),
 				'PMD_name' 		 => $pm_type_obj->pretty_name(),
 				'PMD_admin_name' => $pm_type_obj->pretty_name(),
-				'PMD_slug' 		 => $pm_type_obj->system_name(),//automatically converted to slug
+				'PMD_slug' 		 => $pm_type_obj->system_name(), //automatically converted to slug
 				'PMD_wp_user' 	 => $current_user->ID,
 				'PMD_order' 	 => EEM_Payment_Method::instance()->count(
-						array( array( 'PMD_type' => array( '!=', 'Admin_Only' )))
+						array(array('PMD_type' => array('!=', 'Admin_Only')))
 					) * 10,
 			)
 		);
@@ -280,16 +280,16 @@ 
 	 * @param EE_Payment_Method $payment_method
 	 * @return EE_Payment_Method
 	 */
-	public function initialize_payment_method( $payment_method ) {
+	public function initialize_payment_method($payment_method) {
 		$pm_type_obj = $payment_method->type_obj();
-		$payment_method->set_description( $pm_type_obj->default_description() );
-		if( ! $payment_method->button_url() ){
-			$payment_method->set_button_url( $pm_type_obj->default_button_url() );
+		$payment_method->set_description($pm_type_obj->default_description());
+		if ( ! $payment_method->button_url()) {
+			$payment_method->set_button_url($pm_type_obj->default_button_url());
 		}	
 		//now add setup its default extra meta properties
 		$extra_metas = $pm_type_obj->settings_form()->extra_meta_inputs();
-		foreach( $extra_metas as $meta_name => $input ){
-			$payment_method->update_extra_meta($meta_name, $input->raw_value() );
+		foreach ($extra_metas as $meta_name => $input) {
+			$payment_method->update_extra_meta($meta_name, $input->raw_value());
 		}
 		return $payment_method;
 	}
@@ -299,8 +299,8 @@ 
 	 * @param EE_Payment_Method $payment_method
 	 * @return EE_Payment_Method
 	 */
-	public function set_usable_currencies_on_payment_method( $payment_method ) {
-		foreach($payment_method->get_all_usable_currencies() as $currency_obj){
+	public function set_usable_currencies_on_payment_method($payment_method) {
+		foreach ($payment_method->get_all_usable_currencies() as $currency_obj) {
 			$payment_method->_add_relation_to($currency_obj, 'Currency');
 		}
 		return $payment_method;
@@ -318,8 +318,8 @@ 
 	 *
 	 * @return int count of rows updated.
 	 */
-	public function deactivate_payment_method( $payment_method_slug ) {
-		$count_updated = EEM_Payment_Method::instance()->update(array('PMD_scope'=>array()),array(array('PMD_slug'=>$payment_method_slug)));
+	public function deactivate_payment_method($payment_method_slug) {
+		$count_updated = EEM_Payment_Method::instance()->update(array('PMD_scope'=>array()), array(array('PMD_slug'=>$payment_method_slug)));
 		return $count_updated;
 	}
 
@@ -332,7 +332,7 @@ 
 	 * @param array $caps capabilities being filtered
 	 * @return array
 	 */
-	public function add_payment_method_caps( $caps ) {
+	public function add_payment_method_caps($caps) {
 		/* add dynamic caps from payment methods
 		 * at the time of writing, october 20 2014, these are the caps added:
 		 * ee_payment_method_admin_only
@@ -347,7 +347,7 @@ 
 		 * their related capability automatically added too, so long as they are
 		 * registered properly using EE_Register_Payment_Method::register()
 		 */
-		foreach( $this->payment_method_types() as $payment_method_type_obj ){
+		foreach ($this->payment_method_types() as $payment_method_type_obj) {
 			$caps['administrator'][] = $payment_method_type_obj->cap_name();
 		}
 		return $caps;