eventespresso / event-espresso-core

core/db_models/helpers/EE_Secondary_Table.php

Spacing +20 added lines, -20 removed lines

@@ -1,17 +1,17 @@ 
 <?php
-require_once( EE_MODELS . 'helpers/EE_Table_Base.php');
-class EE_Secondary_Table extends EE_Table_Base{
+require_once(EE_MODELS.'helpers/EE_Table_Base.php');
+class EE_Secondary_Table extends EE_Table_Base {
 	protected $_extra_join_conditions;
 	
-	function __construct($table_name, $pk_column,  $fk_column = null, $extra_join_conditions = null){
+	function __construct($table_name, $pk_column, $fk_column = null, $extra_join_conditions = null) {
 		$this->_fk_on_table = $fk_column;
 		$this->_extra_join_conditions = $extra_join_conditions;
 		parent::__construct($table_name, $pk_column);
 	}
-	function get_fk_on_table(){
+	function get_fk_on_table() {
 		return $this->_fk_on_table;
 	}
-	function _construct_finalize_set_table_to_join_with(EE_Table_Base $table){
+	function _construct_finalize_set_table_to_join_with(EE_Table_Base $table) {
 		$this->_table_to_join_with = $table;
 	}
 	/**
@@ -19,14 +19,14 @@ 
 	 * @return string of sql like "Event.post_type = 'event'", which gets added to
 	 * the end of the join statement with the primary table
 	 */
-	function get_extra_join_conditions(){
+	function get_extra_join_conditions() {
 		return $this->_extra_join_conditions;
 	}
 	/**
 	 * 
 	 * @return EE_Primary_Table
 	 */
-	function get_table_to_join_with(){
+	function get_table_to_join_with() {
 		return $this->_table_to_join_with;
 	}
 	/**
@@ -36,15 +36,15 @@ 
 	 * @param string $table allows us to set special conditions on the $table_name portion of the join query (i.e. doing a subquery)
 	 * @return string of SQL
 	 */
-	function get_join_sql( $primary_table_alias_with_model_chain_prefix  ){
+	function get_join_sql($primary_table_alias_with_model_chain_prefix) {
 		
 		$table_name = $this->get_table_name();
-		$secondary_table_alias = EE_Model_Parser::get_prefix_from_table_alias_with_model_relation_chain_prefix($primary_table_alias_with_model_chain_prefix) . $this->get_table_alias();
+		$secondary_table_alias = EE_Model_Parser::get_prefix_from_table_alias_with_model_relation_chain_prefix($primary_table_alias_with_model_chain_prefix).$this->get_table_alias();
 		$other_table_pk = $this->get_table_to_join_with()->get_pk_column();
 		$fk = $this->get_fk_on_table();
 		$join_sql = " LEFT JOIN $table_name AS $secondary_table_alias ON $primary_table_alias_with_model_chain_prefix.$other_table_pk = $secondary_table_alias.$fk ";
-		if($this->get_extra_join_conditions()){
-			$join_sql.="AND ".$this->get_extra_join_conditions();
+		if ($this->get_extra_join_conditions()) {
+			$join_sql .= "AND ".$this->get_extra_join_conditions();
 		}
 		return $join_sql;
 	}
@@ -58,14 +58,14 @@ 
 	 * This is useful if the secondary table is already included in the SQL, but the primary table is not yet.
 	 * @return string
 	 */
-	function get_inverse_join_sql($secondary_table_alias_with_model_chain_prefix){
-		$primary_table_name =$this->get_table_to_join_with()->get_table_name();
-		$primary_table_alias = EE_Model_Parser::get_prefix_from_table_alias_with_model_relation_chain_prefix($secondary_table_alias_with_model_chain_prefix) . $this->get_table_to_join_with()->get_table_alias();
-		$primary_table_pk = $this->get_table_to_join_with()->get_pk_column();//$this->get_pk_column();
+	function get_inverse_join_sql($secondary_table_alias_with_model_chain_prefix) {
+		$primary_table_name = $this->get_table_to_join_with()->get_table_name();
+		$primary_table_alias = EE_Model_Parser::get_prefix_from_table_alias_with_model_relation_chain_prefix($secondary_table_alias_with_model_chain_prefix).$this->get_table_to_join_with()->get_table_alias();
+		$primary_table_pk = $this->get_table_to_join_with()->get_pk_column(); //$this->get_pk_column();
 		$fk = $this->get_fk_on_table();
 		$join_sql = " LEFT JOIN $primary_table_name AS $primary_table_alias ON $primary_table_alias.$primary_table_pk = $secondary_table_alias_with_model_chain_prefix.$fk ";
-		if($this->get_extra_join_conditions()){
-			$join_sql.="AND ".$this->get_extra_join_conditions();
+		if ($this->get_extra_join_conditions()) {
+			$join_sql .= "AND ".$this->get_extra_join_conditions();
 		}
 		return $join_sql;
 	}
@@ -78,7 +78,7 @@ 
 	public function get_select_join_limit_join($limit) {
 		//first get the select
 		$select = $this->get_select_join_limit($limit);
-		$join_sql = $this->get_join_sql( $select );
+		$join_sql = $this->get_join_sql($select);
 		return $join_sql;
 	}
 
@@ -87,12 +87,12 @@ 
 	function get_fully_qualified_fk_column() {
 		$table_alias = $this->get_table_alias();
 		$fk = $this->get_fk_on_table();
-		return $table_alias . '.' . $fk;
+		return $table_alias.'.'.$fk;
 	}
 
 	function get_fully_qualified_pk_on_fk_table() {
 		$table_alias = $this->get_table_to_join_with()->get_table_alias();
 		$pk = $this->get_table_to_join_with()->get_pk_column();
-		return $table_alias . '.' . $pk;
+		return $table_alias.'.'.$pk;
 	}
 }
\ No newline at end of file

core/db_models/helpers/EE_Table_Base.php

Spacing +13 added lines, -13 removed lines

@@ -4,7 +4,7 @@ 
  * Base class for defining the tables that comprise models. This is used to store information
  * about the table\s alias, private key, etc.
  */
-abstract class EE_Table_Base{
+abstract class EE_Table_Base {
 	var $_table_name;
 	var $_table_alias;
 	/**
@@ -13,21 +13,21 @@ 
 	 */
 	protected $_pk_column;
 	
-	function __construct($table_name, $pk_column){
+	function __construct($table_name, $pk_column) {
 		global $wpdb;
-		$this->_table_name = $wpdb->prefix . $table_name;
+		$this->_table_name = $wpdb->prefix.$table_name;
 		$this->_pk_column = $pk_column;
 	}
 	
-	function _construct_finalize_with_alias($table_alias){
+	function _construct_finalize_with_alias($table_alias) {
 		$this->_table_alias = $table_alias;
 	}
 	
-	function get_table_name(){
+	function get_table_name() {
 		return $this->_table_name;
 	}
-	function get_table_alias(){
-		if( ! $this->_table_alias){
+	function get_table_alias() {
+		if ( ! $this->_table_alias) {
 			throw new EE_Error("You must call _construct_finalize_with_alias before using the EE_Table_Base. Did you forget to call parent::__construct at the end of your EEMerimental_Base child's __construct?");
 		}
 		return $this->_table_alias;
@@ -37,7 +37,7 @@ 
 	 * 
 	 * @return string name of column of PK
 	 */
-	function get_pk_column(){
+	function get_pk_column() {
 		return $this->_pk_column;
 	}
 	
@@ -47,8 +47,8 @@ 
 	 * returns a string with the table alias, a period, and the private key's column.
 	 * @return string
 	 */
-	function get_fully_qualified_pk_column(){
-		$sql =  $this->get_table_alias().".".$this->get_pk_column();
+	function get_fully_qualified_pk_column() {
+		$sql = $this->get_table_alias().".".$this->get_pk_column();
 		return $sql;
 	}
 
@@ -57,9 +57,9 @@ 
 	 * returns the special sql for a inner select with a limit.
 	 * @return string    SQL select
 	 */
-	public function get_select_join_limit( $limit ) {
-		$limit = is_array( $limit ) ? 'LIMIT ' . implode(',', array_map( 'intval', $limit ) ) : 'LIMIT ' . (int) $limit;
-		$SQL = SP . '(SELECT * FROM ' . $this->_table_name . SP . $limit . ') AS ' . $this->_table_alias;
+	public function get_select_join_limit($limit) {
+		$limit = is_array($limit) ? 'LIMIT '.implode(',', array_map('intval', $limit)) : 'LIMIT '.(int) $limit;
+		$SQL = SP.'(SELECT * FROM '.$this->_table_name.SP.$limit.') AS '.$this->_table_alias;
 		return $SQL;
 	}
 }

core/libraries/form_sections/inputs/EE_Credit_Card_Input.input.php

Spacing +3 added lines, -3 removed lines

@@ -7,16 +7,16 @@
  * @subpackage
  * @author				Mike Nelson
  */
-class EE_Credit_Card_Input extends EE_Form_Input_Base{
+class EE_Credit_Card_Input extends EE_Form_Input_Base {
 
 	/**
 	 * @param array $input_settings
 	 */
-	function __construct($input_settings = array()){
+	function __construct($input_settings = array()) {
 		$input_settings['required'] = TRUE;
 		$this->_set_display_strategy(new EE_Text_Input_Display_Strategy());
 		$this->_set_normalization_strategy(new EE_Text_Normalization());
-		$this->_add_validation_strategy(new EE_Credit_Card_Validation_Strategy( isset( $input_settings[ 'validation_error_message' ] ) ? $input_settings[ 'validation_error_message' ] : NULL ));
+		$this->_add_validation_strategy(new EE_Credit_Card_Validation_Strategy(isset($input_settings['validation_error_message']) ? $input_settings['validation_error_message'] : NULL));
 		$this->set_sensitive_data_removal_strategy(new EE_Credit_Card_Sensitive_Data_Removal());
 		parent::__construct($input_settings);
 	}

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

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
  * @subpackage	Expression package is undefined on line 19, column 19 in Templates/Scripting/PHPClass.php.
  * @author				Mike Nelson
  */
-class EE_Text_Validation_Strategy extends EE_Validation_Strategy_Base{
+class EE_Text_Validation_Strategy extends EE_Validation_Strategy_Base {
 
 	/**
 	 * @param $normalized_value

core/libraries/messages/EE_messenger.lib.php

Spacing +90 added lines, -90 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -289,7 +289,7 @@ 
 	 * @return void
 	 */
 	public function enqueue_scripts_styles() {
-		do_action( 'AHEE__EE_messenger__enqueue_scripts_styles');
+		do_action('AHEE__EE_messenger__enqueue_scripts_styles');
 	}
 
 
@@ -325,7 +325,7 @@ 
 
 		$this->_supports_labels->template_variation_description = __('These are different styles to choose from for the selected template structure.  Usually these affect things like font style, color, borders etc.  In some cases the styles will also make minor layout changes.');
 
-		$this->_supports_labels = apply_filters( 'FHEE__EE_messenger___set_supports_labels_defaults___supports_labels', $this->_supports_labels, $this );
+		$this->_supports_labels = apply_filters('FHEE__EE_messenger___set_supports_labels_defaults___supports_labels', $this->_supports_labels, $this);
 	}
 
 
@@ -340,10 +340,10 @@ 
 	 * @return stdClass
 	 */
 	public function get_supports_labels() {
-		if ( empty( $this->_supports_labels->template_pack ) || empty( $this->_supports_labels->template_variation) ) {
+		if (empty($this->_supports_labels->template_pack) || empty($this->_supports_labels->template_variation)) {
 			$this->_set_supports_labels_defaults();
 		}
-		return apply_filters( 'FHEE__EE_messenger__get_supports_labels', $this->_supports_labels, $this );
+		return apply_filters('FHEE__EE_messenger__get_supports_labels', $this->_supports_labels, $this);
 	}
 
 
@@ -363,10 +363,10 @@ 
 	 *
 	 * @return string                    path or url for the requested variation.
 	 */
-	public function get_variation( EE_Messages_Template_Pack $pack, $message_type_name, $url = FALSE, $type = 'main', $variation = 'default', $skip_filters = FALSE ) {
+	public function get_variation(EE_Messages_Template_Pack $pack, $message_type_name, $url = FALSE, $type = 'main', $variation = 'default', $skip_filters = FALSE) {
 		$this->_tmp_pack = $pack;
-		$variation_path = apply_filters( 'EE_messenger__get_variation__variation', false, $pack, $this->name, $message_type_name, $url, $type, $variation, $skip_filters );
-		$variation_path = empty( $variation_path ) ? $this->_tmp_pack->get_variation( $this->name, $message_type_name, $type, $variation, $url, '.css', $skip_filters ) : $variation_path;
+		$variation_path = apply_filters('EE_messenger__get_variation__variation', false, $pack, $this->name, $message_type_name, $url, $type, $variation, $skip_filters);
+		$variation_path = empty($variation_path) ? $this->_tmp_pack->get_variation($this->name, $message_type_name, $type, $variation, $url, '.css', $skip_filters) : $variation_path;
 		return $variation_path;
 
 	}
@@ -384,13 +384,13 @@ 
 	 * @return array
 	 */
 	public function get_default_message_types() {
-		$class = get_class( $this );
+		$class = get_class($this);
 
 		//messenger specific filter
-		$default_types = apply_filters( 'FHEE__' . $class . '__get_default_message_types__default_types', $this->_default_message_types, $this );
+		$default_types = apply_filters('FHEE__'.$class.'__get_default_message_types__default_types', $this->_default_message_types, $this);
 
 		//all messengers filter
-		$default_types = apply_filters( 'FHEE__EE_messenger__get_default_message_types__default_types', $default_types, $this );
+		$default_types = apply_filters('FHEE__EE_messenger__get_default_message_types__default_types', $default_types, $this);
 		return $default_types;
 	}
 
@@ -405,14 +405,14 @@ 
 	 * @return array
 	 */
 	public function get_valid_message_types() {
-		$class = get_class( $this );
+		$class = get_class($this);
 
 		//messenger specific filter
 		//messenger specific filter
-		$valid_types = apply_filters( 'FHEE__' . $class . '__get_valid_message_types__valid_types', $this->_valid_message_types, $this );
+		$valid_types = apply_filters('FHEE__'.$class.'__get_valid_message_types__valid_types', $this->_valid_message_types, $this);
 
 		//all messengers filter
-		$valid_types = apply_filters( 'FHEE__EE_messenger__get_valid_message_types__valid_types', $valid_types, $this );
+		$valid_types = apply_filters('FHEE__EE_messenger__get_valid_message_types__valid_types', $valid_types, $this);
 		return $valid_types;
 	}
 
@@ -426,7 +426,7 @@ 
 	 * @access public
 	 * @param array $new_config Whatever is put in here will reset the _validator_config property
 	 */
-	public function set_validator_config( $new_config ) {
+	public function set_validator_config($new_config) {
 		$this->_validator_config = $new_config;
 	}
 
@@ -442,8 +442,8 @@ 
 	public function get_validator_config() {
 		$class = get_class($this);
 
-		$config = apply_filters( 'FHEE__' . $class . '__get_validator_config', $this->_validator_config, $this );
-		$config = apply_filters( 'FHEE__EE_messenger__get_validator_config', $config, $this );
+		$config = apply_filters('FHEE__'.$class.'__get_validator_config', $this->_validator_config, $this);
+		$config = apply_filters('FHEE__EE_messenger__get_validator_config', $config, $this);
 		return $config;
 	}
 
@@ -460,8 +460,8 @@ 
 	 * @access public
 	 * @return string content for page
 	 */
-	public function get_messenger_admin_page_content( $page, $action = null, $extra = array(), $message_types = array() ) {
-		return $this->_get_admin_page_content( $page, $action, $extra, $message_types );
+	public function get_messenger_admin_page_content($page, $action = null, $extra = array(), $message_types = array()) {
+		return $this->_get_admin_page_content($page, $action, $extra, $message_types);
 	}
 
 
@@ -470,76 +470,76 @@ 
 
 
 
-	protected function _get_admin_content_events_edit( $message_types, $extra ) {
+	protected function _get_admin_content_events_edit($message_types, $extra) {
 		//defaults
 		$template_args = array();
 		$custom_templates = array();
 		$selector_rows = '';
 
 		//we don't need message types here so we're just going to ignore. we do, however, expect the event id here. The event id is needed to provide a link to setup a custom template for this event.
-		$event_id = isset( $extra['event'] ) ? $extra['event'] : NULL;
+		$event_id = isset($extra['event']) ? $extra['event'] : NULL;
 
-		$template_wrapper_path = EE_LIBRARIES . 'messages/messenger/admin_templates/event_switcher_wrapper.template.php';
-		$template_row_path = EE_LIBRARIES . 'messages/messenger/admin_templates/event_switcher_row.template.php';
+		$template_wrapper_path = EE_LIBRARIES.'messages/messenger/admin_templates/event_switcher_wrapper.template.php';
+		$template_row_path = EE_LIBRARIES.'messages/messenger/admin_templates/event_switcher_row.template.php';
 
 		//array of template objects for global and custom (non-trashed) (but remember just for this messenger!)
-		$global_templates = EEM_Message_Template_Group::instance()->get_all( array( array('MTP_messenger' => $this->name, 'MTP_is_global' => TRUE, 'MTP_is_active' => TRUE ) ) );
-		$templates_for_event = EEM_Message_Template_Group::instance()->get_all_custom_templates_by_event( $event_id, array( 'MTP_messenger' => $this->name, 'MTP_is_active' => TRUE ) );
-		$templates_for_event = !empty( $templates_for_event ) ? $templates_for_event : array();
+		$global_templates = EEM_Message_Template_Group::instance()->get_all(array(array('MTP_messenger' => $this->name, 'MTP_is_global' => TRUE, 'MTP_is_active' => TRUE)));
+		$templates_for_event = EEM_Message_Template_Group::instance()->get_all_custom_templates_by_event($event_id, array('MTP_messenger' => $this->name, 'MTP_is_active' => TRUE));
+		$templates_for_event = ! empty($templates_for_event) ? $templates_for_event : array();
 
 		//so we need to setup the rows for the selectors and we use the global mtpgs (cause those will the active message template groups)
-		foreach ( $global_templates as $mtpgID => $mtpg ) {
+		foreach ($global_templates as $mtpgID => $mtpg) {
 			//verify this message type is supposed to show on this page
 			$mtp_obj = $mtpg->message_type_obj();
-			if ( ! $mtp_obj instanceof EE_message_type ) {
+			if ( ! $mtp_obj instanceof EE_message_type) {
 				continue;
 			}
 			$mtp_obj->admin_registered_pages = (array) $mtp_obj->admin_registered_pages;
-			if ( ! in_array( 'events_edit', $mtp_obj->admin_registered_pages ) )
+			if ( ! in_array('events_edit', $mtp_obj->admin_registered_pages))
 				continue;
 			$stargs = array();
 			$default_value = '';
 			$select_values = array();
 			$select_values[$mtpgID] = __('Global', 'event_espresso');
-			$default_value = array_key_exists( $mtpgID, $templates_for_event ) && ! $mtpg->get('MTP_is_override' ) ? $mtpgID : NULL;
+			$default_value = array_key_exists($mtpgID, $templates_for_event) && ! $mtpg->get('MTP_is_override') ? $mtpgID : NULL;
 
 			//if the override has been set for the global template, then that means even if there are custom templates already created we ignore them because of the set override.
 
-			if ( ! $mtpg->get('MTP_is_override' ) ) {
+			if ( ! $mtpg->get('MTP_is_override')) {
 				//any custom templates for this message type?
-				$custom_templates = EEM_Message_Template_Group::instance()->get_custom_message_template_by_m_and_mt( $this->name, $mtpg->message_type() );
+				$custom_templates = EEM_Message_Template_Group::instance()->get_custom_message_template_by_m_and_mt($this->name, $mtpg->message_type());
 
-				foreach( $custom_templates as $cmtpgID => $cmtpg ) {
+				foreach ($custom_templates as $cmtpgID => $cmtpg) {
 					$select_values[$cmtpgID] = $cmtpg->name();
-					$default_value = array_key_exists( $cmtpgID, $templates_for_event ) ? $cmtpgID : $default_value;
+					$default_value = array_key_exists($cmtpgID, $templates_for_event) ? $cmtpgID : $default_value;
 				}
 			}
 
 			//if there is no $default_value then we set it as the global
-			$default_value = empty( $default_value ) ? $mtpgID : $default_value;
+			$default_value = empty($default_value) ? $mtpgID : $default_value;
 
-			$edit_url = EEH_URL::add_query_args_and_nonce( array('page' => 'espresso_messages', 'action' => 'edit_message_template', 'id' => $default_value), admin_url('admin.php') );
-			$create_url = EEH_URL::add_query_args_and_nonce( array('page' => 'espresso_messages', 'action' => 'add_new_message_template', 'GRP_ID' => $default_value ) );
+			$edit_url = EEH_URL::add_query_args_and_nonce(array('page' => 'espresso_messages', 'action' => 'edit_message_template', 'id' => $default_value), admin_url('admin.php'));
+			$create_url = EEH_URL::add_query_args_and_nonce(array('page' => 'espresso_messages', 'action' => 'add_new_message_template', 'GRP_ID' => $default_value));
 
-			$st_args['mt_name'] = ucwords( $mtp_obj->label['singular'] );
+			$st_args['mt_name'] = ucwords($mtp_obj->label['singular']);
 			$st_args['mt_slug'] = $mtpg->message_type();
 			$st_args['messenger_slug'] = $this->name;
-			$st_args['selector'] = EEH_Form_Fields::select_input( 'event_message_templates_relation[' . $mtpgID . ']', $select_values, $default_value, 'data-messenger="' . $this->name . '" data-messagetype="' . $mtpg->message_type() . '"', 'message-template-selector' );
+			$st_args['selector'] = EEH_Form_Fields::select_input('event_message_templates_relation['.$mtpgID.']', $select_values, $default_value, 'data-messenger="'.$this->name.'" data-messagetype="'.$mtpg->message_type().'"', 'message-template-selector');
 
 			//note that  message template group that has override_all_custom set will remove the ability to set a custom message template based off of the global (and that also in turn overrides any other custom templates).
-			$st_args['create_button'] =  $mtpg->get('MTP_is_override') ? '' : '<a data-messenger="' . $this->name . '" data-messagetype="' . $mtpg->message_type() . '" data-grpid="' . $default_value . '" target="_blank" href="' . $create_url . '" class="button button-small create-mtpg-button">' . __('Create New Custom', 'event_espresso') . '</a>';
-			$st_args['create_button'] = EE_Registry::instance()->CAP->current_user_can( 'ee_edit_messages', 'espresso_messsages_add_new_message_template' ) ? $st_args['create_button'] : '';
-			$st_args['edit_button'] = EE_Registry::instance()->CAP->current_user_can( 'ee_edit_message', 'espresso_messages_edit_message_template', $mtpgID ) ?  '<a data-messagetype="' . $mtpg->message_type() . '" data-grpid="' . $default_value . '" target="_blank" href="' . $edit_url . '" class="button button-small edit-mtpg-button">' . __('Edit', 'event_espresso') . '</a>' : '';
-			$selector_rows .= EEH_Template::display_template( $template_row_path, $st_args, TRUE );
+			$st_args['create_button'] = $mtpg->get('MTP_is_override') ? '' : '<a data-messenger="'.$this->name.'" data-messagetype="'.$mtpg->message_type().'" data-grpid="'.$default_value.'" target="_blank" href="'.$create_url.'" class="button button-small create-mtpg-button">'.__('Create New Custom', 'event_espresso').'</a>';
+			$st_args['create_button'] = EE_Registry::instance()->CAP->current_user_can('ee_edit_messages', 'espresso_messsages_add_new_message_template') ? $st_args['create_button'] : '';
+			$st_args['edit_button'] = EE_Registry::instance()->CAP->current_user_can('ee_edit_message', 'espresso_messages_edit_message_template', $mtpgID) ? '<a data-messagetype="'.$mtpg->message_type().'" data-grpid="'.$default_value.'" target="_blank" href="'.$edit_url.'" class="button button-small edit-mtpg-button">'.__('Edit', 'event_espresso').'</a>' : '';
+			$selector_rows .= EEH_Template::display_template($template_row_path, $st_args, TRUE);
 		}
 
 		//if no selectors present then get out.
-		if ( empty( $selector_rows ) ) {
+		if (empty($selector_rows)) {
 			return '';
 		}
 
 		$template_args['selector_rows'] = $selector_rows;
-		return EEH_Template::display_template( $template_wrapper_path, $template_args, TRUE );
+		return EEH_Template::display_template($template_wrapper_path, $template_args, TRUE);
 	}
 
 
@@ -554,8 +554,8 @@ 
 	 * @return array $this->_template_fields
 	 */
 	public function get_template_fields() {
-		$template_fields = apply_filters( 'FHEE__' . get_class($this) . '__get_template_fields', $this->_template_fields, $this );
-		$template_fields = apply_filters( 'FHEE__EE_messenger__get_template_fields', $template_fields, $this );
+		$template_fields = apply_filters('FHEE__'.get_class($this).'__get_template_fields', $this->_template_fields, $this);
+		$template_fields = apply_filters('FHEE__EE_messenger__get_template_fields', $template_fields, $this);
 		return $template_fields;
 	}
 
@@ -568,9 +568,9 @@ 
 	 * The following method doesn't NEED to be used by child classes but might be modified by the specific messenger
 	 */
 	protected function _set_template_value($item, $value) {
-		if ( array_key_exists($item, $this->_template_fields) ) {
-			$prop = '_' . $item;
-			$this->$prop= $value;
+		if (array_key_exists($item, $this->_template_fields)) {
+			$prop = '_'.$item;
+			$this->$prop = $value;
 		}
 	}
 
@@ -580,8 +580,8 @@ 
 	 * @param EE_message_type $message_type The message type object used in combination with this messenger to generate the provided message.
 	 * @return bool | WP_Error
 	 */
-	public function send_message( $message, EE_message_type $message_type ) {
-		$this->_validate_and_setup( $message );
+	public function send_message($message, EE_message_type $message_type) {
+		$this->_validate_and_setup($message);
 		$this->_incoming_message_type = $message_type;
 		return $this->_send_message();
 	}
@@ -595,26 +595,26 @@ 
 	 * @param  bool   $send    true we will actually use the _send method (for test sends). FALSE we just return preview
 	 * @return string          return the message html content
 	 */
-	public function get_preview( $message, EE_message_type $message_type, $send = FALSE ) {
-		$this->_validate_and_setup( $message );
+	public function get_preview($message, EE_message_type $message_type, $send = FALSE) {
+		$this->_validate_and_setup($message);
 
 		$this->_incoming_message_type = $message_type;
 
-		if ( $send ) {
+		if ($send) {
 			//are we overriding any existing template fields?
 			$settings = $this->get_existing_test_settings();
-			if ( !empty( $settings ) ) {
-				foreach( $settings as $field => $value ) {
-					$this->_set_template_value( $field, $value );
+			if ( ! empty($settings)) {
+				foreach ($settings as $field => $value) {
+					$this->_set_template_value($field, $value);
 				}
 			}
 		}
 
 		//enqueue preview js so that any links/buttons on the page are disabled.
-		if ( ! $send ) {
+		if ( ! $send) {
 			//the below may seem liks duplication.  However, typically if a messenger enqueues scripts/styles, it deregisters all existing wp scripts and styles first.  So the second hook ensures our previewer still gets setup.
-			add_action( 'wp_enqueue_scripts', array( $this, 'add_preview_script' ), 10 );
-			add_action( 'AHEE__EE_messenger__enqueue_scripts_styles', array( $this, 'add_preview_script' ), 10 );
+			add_action('wp_enqueue_scripts', array($this, 'add_preview_script'), 10);
+			add_action('AHEE__EE_messenger__enqueue_scripts_styles', array($this, 'add_preview_script'), 10);
 		}
 
 		return $send ? $this->_send_message() : $this->_preview();
@@ -631,12 +631,12 @@ 
 	 * @return void
 	 */
 	public function add_preview_script() {
-		wp_register_script( 'ee-messages-preview-js', EE_LIBRARIES_URL . 'messages/messenger/assets/js/ee-messages-preview.js', array( 'jquery' ), EVENT_ESPRESSO_VERSION, true );
+		wp_register_script('ee-messages-preview-js', EE_LIBRARIES_URL.'messages/messenger/assets/js/ee-messages-preview.js', array('jquery'), EVENT_ESPRESSO_VERSION, true);
 
 		//error message
 		EE_Registry::$i18n_js_strings['links_disabled'] = __('All the links on this page have been disabled because this is a generated preview message for the purpose of ensuring layout, style, and content setup.  To test generated links, you must trigger an actual message notification.', 'event_espresso');
-		wp_localize_script( 'ee-messages-preview-js', 'eei18n', EE_Registry::$i18n_js_strings );
-		wp_enqueue_script( 'ee-messages-preview-js' );
+		wp_localize_script('ee-messages-preview-js', 'eei18n', EE_Registry::$i18n_js_strings);
+		wp_enqueue_script('ee-messages-preview-js');
 	}
 
 
@@ -647,23 +647,23 @@ 
 	 * @param  object $message message object
 	 * @return void
 	 */
-	protected function _validate_and_setup( $message ) {
-		if ( !is_object( $message ) )
-			throw new EE_Error( __('Incoming "$message" must be an object', 'event_espresso' ) );
+	protected function _validate_and_setup($message) {
+		if ( ! is_object($message))
+			throw new EE_Error(__('Incoming "$message" must be an object', 'event_espresso'));
 
 		//verify we have the required template pack value on the $message object.
-		if ( empty( $message->template_pack ) || ! $message->template_pack instanceof EE_Messages_Template_Pack ) {
-			throw new EE_Error( __('Incoming $message object must have a EE_Messages_Template_Pack object assigned to the template_pack property', 'event_espresso' ) );
+		if (empty($message->template_pack) || ! $message->template_pack instanceof EE_Messages_Template_Pack) {
+			throw new EE_Error(__('Incoming $message object must have a EE_Messages_Template_Pack object assigned to the template_pack property', 'event_espresso'));
 		}
 
 		$this->_tmp_pack = $message->template_pack;
 
-		$this->_variation = !empty ( $message->variation ) ? $message->variation : 'default';
+		$this->_variation = ! empty ($message->variation) ? $message->variation : 'default';
 
 		$template_fields = $this->get_template_fields();
 
-		foreach ( $template_fields as $template => $value ) {
-			if ( $template !== 'extra' )
+		foreach ($template_fields as $template => $value) {
+			if ($template !== 'extra')
 				$this->_set_template_value($template, $message->$template);
 		}
 	}
@@ -679,21 +679,21 @@ 
 	 * @param  bool 	$preview if true we use the preview wrapper otherwise we use main wrapper.
 	 * @return string
 	 */
-	protected function _get_main_template( $preview = FALSE ) {
+	protected function _get_main_template($preview = FALSE) {
 		$type = $preview ? 'preview' : 'main';
 
 		//first get inline css (will be empty if the messenger doesn't use it)
-		$this->_template_args['inline_style'] = file_get_contents( $this->get_variation( $this->_tmp_pack, $this->_incoming_message_type->name, FALSE, $type, $this->_variation ), TRUE );
+		$this->_template_args['inline_style'] = file_get_contents($this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, FALSE, $type, $this->_variation), TRUE);
 
-		$wrapper_template = $this->_tmp_pack->get_wrapper( $this->name, $type );
+		$wrapper_template = $this->_tmp_pack->get_wrapper($this->name, $type);
 
 		//check file exists and is readable
-		if ( !is_readable( $wrapper_template ) )
-			throw new EE_Error( sprintf( __('Unable to access the template file for the %s messenger main content wrapper.  The location being attempted is %s.', 'event_espresso' ), ucwords($this->label['singular']) , $wrapper_template ) );
+		if ( ! is_readable($wrapper_template))
+			throw new EE_Error(sprintf(__('Unable to access the template file for the %s messenger main content wrapper.  The location being attempted is %s.', 'event_espresso'), ucwords($this->label['singular']), $wrapper_template));
 
 		//require template helper
-		EE_Registry::instance()->load_helper( 'Template' );
-		return EEH_Template::display_template( $wrapper_template, $this->_template_args, TRUE );
+		EE_Registry::instance()->load_helper('Template');
+		return EEH_Template::display_template($wrapper_template, $this->_template_args, TRUE);
 	}
 
 
@@ -729,7 +729,7 @@ 
 	 */
 	public function get_existing_test_settings() {
 		$settings = EEH_MSG_Template::get_active_messengers_in_db();
-		return isset( $settings[$this->name]['test_settings'] ) ? $settings[$this->name]['test_settings'] : array();
+		return isset($settings[$this->name]['test_settings']) ? $settings[$this->name]['test_settings'] : array();
 	}
 
 
@@ -740,10 +740,10 @@ 
 	 * @access public
 	 * @return bool 	success/fail
 	 */
-	public function set_existing_test_settings( $settings ) {
+	public function set_existing_test_settings($settings) {
 		$existing = EEH_MSG_Template::get_active_messengers_in_db();
 		$existing[$this->name]['test_settings'] = $settings;
-		return EEH_MSG_Template::update_active_messengers_in_db( $existing );
+		return EEH_MSG_Template::update_active_messengers_in_db($existing);
 	}
 
 
@@ -756,21 +756,21 @@ 
 	 * @param string $field The field to retrieve the label for
 	 * @return string        	  The label
 	 */
-	public function get_field_label( $field ) {
+	public function get_field_label($field) {
 		//first let's see if the field requests is in the top level array.
-		if ( isset( $this->_template_fields[$field] ) && !empty( $this->_template_fields[$field]['label'] ) )
+		if (isset($this->_template_fields[$field]) && ! empty($this->_template_fields[$field]['label']))
 			return $this->_template[$field]['label'];
 
 		//nope so let's look in the extra array to see if it's there HOWEVER if the field exists as a top level index in the extra array then we know the label is in the 'main' index.
-		if ( isset( $this->_template_fields['extra'] ) && !empty( $this->_template_fields['extra'][$field] ) && !empty( $this->_template_fields['extra'][$field]['main']['label'] )  )
+		if (isset($this->_template_fields['extra']) && ! empty($this->_template_fields['extra'][$field]) && ! empty($this->_template_fields['extra'][$field]['main']['label']))
 			return $this->_template_fields['extra'][$field]['main']['label'];
 
 		//now it's possible this field may just be existing in any of the extra array items.
-		if ( !empty( $this->_template_fields['extra'] ) && is_array( $this->_template_fields['extra'] ) ) {
-			foreach ( $this->_template_fields['extra'] as $main_field => $subfields ) {
-				if ( !is_array( $subfields ) )
+		if ( ! empty($this->_template_fields['extra']) && is_array($this->_template_fields['extra'])) {
+			foreach ($this->_template_fields['extra'] as $main_field => $subfields) {
+				if ( ! is_array($subfields))
 					continue;
-				if ( isset( $subfields[$field] ) && !empty( $subfields[$field]['label'] ) )
+				if (isset($subfields[$field]) && ! empty($subfields[$field]['label']))
 					return $subfields[$field]['label'];
 			}
 		}
@@ -791,7 +791,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function do_secondary_messenger_hooks( $sending_messenger_name ) {
+	public function do_secondary_messenger_hooks($sending_messenger_name) {
 		return;
 	}
 

Braces +26 added lines, -17 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
@@ -495,8 +496,9 @@ 
 				continue;
 			}
 			$mtp_obj->admin_registered_pages = (array) $mtp_obj->admin_registered_pages;
-			if ( ! in_array( 'events_edit', $mtp_obj->admin_registered_pages ) )
-				continue;
+			if ( ! in_array( 'events_edit', $mtp_obj->admin_registered_pages ) ) {
+							continue;
+			}
 			$stargs = array();
 			$default_value = '';
 			$select_values = array();
@@ -648,8 +650,9 @@ 
 	 * @return void
 	 */
 	protected function _validate_and_setup( $message ) {
-		if ( !is_object( $message ) )
-			throw new EE_Error( __('Incoming "$message" must be an object', 'event_espresso' ) );
+		if ( !is_object( $message ) ) {
+					throw new EE_Error( __('Incoming "$message" must be an object', 'event_espresso' ) );
+		}
 
 		//verify we have the required template pack value on the $message object.
 		if ( empty( $message->template_pack ) || ! $message->template_pack instanceof EE_Messages_Template_Pack ) {
@@ -663,8 +666,9 @@ 
 		$template_fields = $this->get_template_fields();
 
 		foreach ( $template_fields as $template => $value ) {
-			if ( $template !== 'extra' )
-				$this->_set_template_value($template, $message->$template);
+			if ( $template !== 'extra' ) {
+							$this->_set_template_value($template, $message->$template);
+			}
 		}
 	}
 
@@ -688,8 +692,9 @@ 
 		$wrapper_template = $this->_tmp_pack->get_wrapper( $this->name, $type );
 
 		//check file exists and is readable
-		if ( !is_readable( $wrapper_template ) )
-			throw new EE_Error( sprintf( __('Unable to access the template file for the %s messenger main content wrapper.  The location being attempted is %s.', 'event_espresso' ), ucwords($this->label['singular']) , $wrapper_template ) );
+		if ( !is_readable( $wrapper_template ) ) {
+					throw new EE_Error( sprintf( __('Unable to access the template file for the %s messenger main content wrapper.  The location being attempted is %s.', 'event_espresso' ), ucwords($this->label['singular']) , $wrapper_template ) );
+		}
 
 		//require template helper
 		EE_Registry::instance()->load_helper( 'Template' );
@@ -758,20 +763,24 @@ 
 	 */
 	public function get_field_label( $field ) {
 		//first let's see if the field requests is in the top level array.
-		if ( isset( $this->_template_fields[$field] ) && !empty( $this->_template_fields[$field]['label'] ) )
-			return $this->_template[$field]['label'];
+		if ( isset( $this->_template_fields[$field] ) && !empty( $this->_template_fields[$field]['label'] ) ) {
+					return $this->_template[$field]['label'];
+		}
 
 		//nope so let's look in the extra array to see if it's there HOWEVER if the field exists as a top level index in the extra array then we know the label is in the 'main' index.
-		if ( isset( $this->_template_fields['extra'] ) && !empty( $this->_template_fields['extra'][$field] ) && !empty( $this->_template_fields['extra'][$field]['main']['label'] )  )
-			return $this->_template_fields['extra'][$field]['main']['label'];
+		if ( isset( $this->_template_fields['extra'] ) && !empty( $this->_template_fields['extra'][$field] ) && !empty( $this->_template_fields['extra'][$field]['main']['label'] )  ) {
+					return $this->_template_fields['extra'][$field]['main']['label'];
+		}
 
 		//now it's possible this field may just be existing in any of the extra array items.
 		if ( !empty( $this->_template_fields['extra'] ) && is_array( $this->_template_fields['extra'] ) ) {
 			foreach ( $this->_template_fields['extra'] as $main_field => $subfields ) {
-				if ( !is_array( $subfields ) )
-					continue;
-				if ( isset( $subfields[$field] ) && !empty( $subfields[$field]['label'] ) )
-					return $subfields[$field]['label'];
+				if ( !is_array( $subfields ) ) {
+									continue;
+				}
+				if ( isset( $subfields[$field] ) && !empty( $subfields[$field]['label'] ) ) {
+									return $subfields[$field]['label'];
+				}
 			}
 		}
 

core/libraries/messages/messenger/EE_Email_messenger.class.php

Spacing +50 added lines, -50 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -29,7 +29,7 @@ 
 /**
  * This sets up the email messenger for the EE_messages (notifications) subsystem in EE.
  */
-class EE_Email_messenger extends EE_messenger  {
+class EE_Email_messenger extends EE_messenger {
 
 	/**
 	 * The following are the properties that email requires for the message going out.
@@ -75,7 +75,7 @@ 
 	protected function _set_valid_shortcodes() {
 		//remember by leaving the other fields not set, those fields will inherit the valid shortcodes from the message type.
 		$this->_valid_shortcodes = array(
-			'to' => array('email','event_author', 'primary_registration_details', 'recipient_details'),
+			'to' => array('email', 'event_author', 'primary_registration_details', 'recipient_details'),
 			'from' => array('email', 'event_author', 'primary_registration_details', 'recipient_details')
 			);
 	}
@@ -109,7 +109,7 @@ 
 				'shortcodes' => array('organization', 'primary_registration_details', 'event_author', 'primary_registration_details', 'recipient_details')
 				),
 			'content' => array(
-				'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'primary_registration_details', 'primary_registration_list', 'event_author', 'recipient_details', 'recipient_list', 'transaction', 'messenger')
+				'shortcodes' => array('event_list', 'attendee_list', 'ticket_list', 'organization', 'primary_registration_details', 'primary_registration_list', 'event_author', 'recipient_details', 'recipient_list', 'transaction', 'messenger')
 				),
 			'attendee_list' => array(
 				'shortcodes' => array('attendee', 'event_list', 'ticket_list'),
@@ -120,7 +120,7 @@ 
 				'required' => array('[EVENT_LIST]')
 				),
 			'ticket_list' => array(
-				'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list','primary_registration_details', 'recipient_details'),
+				'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'primary_registration_details', 'recipient_details'),
 				'required' => array('[TICKET_LIST]')
 				),
 			'datetime_list' => array(
@@ -139,21 +139,21 @@ 
 	 *
 	 * @since 4.5.0
 	 */
-	public function do_secondary_messenger_hooks( $sending_messenger_name ) {
-		if ( $sending_messenger_name = 'html' ) {
-			add_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', array( $this, 'add_email_css' ), 10, 8 );
+	public function do_secondary_messenger_hooks($sending_messenger_name) {
+		if ($sending_messenger_name = 'html') {
+			add_filter('FHEE__EE_Messages_Template_Pack__get_variation', array($this, 'add_email_css'), 10, 8);
 		}
 	}
 
 
 
 
-	public function add_email_css( $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack ) {
+	public function add_email_css($variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack) {
 		//prevent recursion on this callback.
-		remove_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', array( $this, 'add_email_css' ), 10 );
-		$variation = $this->get_variation( $template_pack, $message_type, $url, 'main', $variation, FALSE  );
+		remove_filter('FHEE__EE_Messages_Template_Pack__get_variation', array($this, 'add_email_css'), 10);
+		$variation = $this->get_variation($template_pack, $message_type, $url, 'main', $variation, FALSE);
 
-		add_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', array( $this, 'add_email_css' ), 10, 8 );
+		add_filter('FHEE__EE_Messages_Template_Pack__get_variation', array($this, 'add_email_css'), 10, 8);
 		return $variation;
 	}
 
@@ -185,7 +185,7 @@ 
 				'required' => FALSE,
 				'validation' => FALSE,
 				'format' => '%s',
-				'value' => sprintf( __('Test email sent from %s', 'event_espresso'), get_bloginfo('name') ),
+				'value' => sprintf(__('Test email sent from %s', 'event_espresso'), get_bloginfo('name')),
 				'default'=> '',
 				'css_class' => ''
 				)
@@ -347,8 +347,8 @@ 
 	 */
 	protected function _send_message() {
 		return wp_mail(
-			html_entity_decode( $this->_to, ENT_QUOTES, "UTF-8" ),
-			stripslashes( html_entity_decode( $this->_subject, ENT_QUOTES, "UTF-8" )),
+			html_entity_decode($this->_to, ENT_QUOTES, "UTF-8"),
+			stripslashes(html_entity_decode($this->_subject, ENT_QUOTES, "UTF-8")),
 			$this->_body(),
 			$this->_headers()
 		);
@@ -362,7 +362,7 @@ 
 	 * @return string html body of the message content and the related css.
 	 */
 	protected function _preview() {
-		return $this->_body( TRUE );
+		return $this->_body(TRUE);
 	}
 
 
@@ -376,17 +376,17 @@ 
 	 * @return string formatted header for email
 	 */
 	protected function _headers() {
-		$from = stripslashes_deep( html_entity_decode($this->_from,  ENT_QUOTES,"UTF-8" ) );
+		$from = stripslashes_deep(html_entity_decode($this->_from, ENT_QUOTES, "UTF-8"));
 		$headers = array(
 			'MIME-Version: 1.0',
-			'From:' . $from,
-			'Reply-To:' . $from,
+			'From:'.$from,
+			'Reply-To:'.$from,
 			'Content-Type:text/html; charset=utf-8'
 			);
 
 		//but wait!  Header's for the from is NOT reliable because some plugins don't respect From: as set in the header.
-		add_filter( 'wp_mail_from',  array( $this, 'set_from_address' ), 100 );
-		add_filter( 'wp_mail_from_name', array( $this, 'set_from_name' ), 100 );
+		add_filter('wp_mail_from', array($this, 'set_from_address'), 100);
+		add_filter('wp_mail_from_name', array($this, 'set_from_name'), 100);
 		return $headers;
 	}
 
@@ -403,19 +403,19 @@ 
 	 * @return array
 	 */
 	private function _parse_from() {
-		if ( strpos( $this->_from, '<' ) !== false ) {
-			$from_name = substr( $this->_from, 0, strpos( $this->_from, '<' ) - 1 );
-			$from_name = str_replace( '"', '', $from_name );
-			$from_name = trim( $from_name );
-
-			$from_email = substr( $this->_from, strpos( $this->_from, '<' ) + 1 );
-			$from_email = str_replace( '>', '', $from_email );
-			$from_email = trim( $from_email );
+		if (strpos($this->_from, '<') !== false) {
+			$from_name = substr($this->_from, 0, strpos($this->_from, '<') - 1);
+			$from_name = str_replace('"', '', $from_name);
+			$from_name = trim($from_name);
+
+			$from_email = substr($this->_from, strpos($this->_from, '<') + 1);
+			$from_email = str_replace('>', '', $from_email);
+			$from_email = trim($from_email);
 		} else {
 			$from_name = '';
-			$from_email = trim( $this->_from );
+			$from_email = trim($this->_from);
 		}
-		return array( $from_name, $from_email );
+		return array($from_name, $from_email);
 	}
 
 
@@ -428,7 +428,7 @@ 
 	 *
 	 * @param string $from_email What the original from_email is.
 	 */
-	public function set_from_address( $from_email ) {
+	public function set_from_address($from_email) {
 		$parsed_from = $this->_parse_from();
 		return $parsed_from[1];
 	}
@@ -443,13 +443,13 @@ 
 	 *
 	 * @param string $from_name The original from_name.
 	 */
-	public function set_from_name( $from_name ) {
+	public function set_from_name($from_name) {
 		$parsed_from = $this->_parse_from();
-		if ( is_array( $parsed_from) && ! empty( $parsed_from[0] ) ) {
-			$from_name =  $parsed_from[0];
+		if (is_array($parsed_from) && ! empty($parsed_from[0])) {
+			$from_name = $parsed_from[0];
 		}
 
-		return stripslashes_deep( html_entity_decode($from_name,  ENT_QUOTES,"UTF-8" ) );
+		return stripslashes_deep(html_entity_decode($from_name, ENT_QUOTES, "UTF-8"));
 	}
 
 
@@ -460,26 +460,26 @@ 
 	 * @param bool $preview will etermine whether this is preview template or not.
 	 * @return string formatted body for email.
 	 */
-	protected function _body( $preview = FALSE ) {
+	protected function _body($preview = FALSE) {
 		//setup template args!
 		$this->_template_args = array(
 			'subject' => $this->_subject,
 			'from' => $this->_from,
-			'main_body' => wpautop(stripslashes_deep( html_entity_decode($this->_content,  ENT_QUOTES,"UTF-8" ) ))
+			'main_body' => wpautop(stripslashes_deep(html_entity_decode($this->_content, ENT_QUOTES, "UTF-8")))
 			);
-		$body =  $this->_get_main_template( $preview );
+		$body = $this->_get_main_template($preview);
 
 		//now if this isn't a preview, let's setup the body so it has inline styles
-		if ( !$preview ) {
-			require_once EE_LIBRARIES . 'messages/messenger/assets/email/CssToInlineStyles.php';
-			$CSS = new CssToInlineStyles( $body );
+		if ( ! $preview) {
+			require_once EE_LIBRARIES.'messages/messenger/assets/email/CssToInlineStyles.php';
+			$CSS = new CssToInlineStyles($body);
 			$CSS->setUseInlineStylesBlock();
-			$body = ltrim( $CSS->convert(), ">\n" ); //for some reason the library has a bracket and new line at the beginning.  This takes care of that.
-		} else if ( $preview && defined('DOING_AJAX' ) ) {
-			require_once EE_LIBRARIES . 'messages/messenger/assets/email/CssToInlineStyles.php';
-			$style = file_get_contents( $this->get_variation( $this->_tmp_pack,  $this->_incoming_message_type->name, FALSE, 'main', $this->_variation ) );
-			$CSS = new CssToInlineStyles( utf8_decode($body), $style );
-			$body = ltrim( $CSS->convert(), ">\n" );
+			$body = ltrim($CSS->convert(), ">\n"); //for some reason the library has a bracket and new line at the beginning.  This takes care of that.
+		} else if ($preview && defined('DOING_AJAX')) {
+			require_once EE_LIBRARIES.'messages/messenger/assets/email/CssToInlineStyles.php';
+			$style = file_get_contents($this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, FALSE, 'main', $this->_variation));
+			$CSS = new CssToInlineStyles(utf8_decode($body), $style);
+			$body = ltrim($CSS->convert(), ">\n");
 
 			//let's attempt to fix width's for ajax preview
 			/*$i_width = '/width:[ 0-9%]+;|width:[ 0-9px]+;/';
@@ -502,8 +502,8 @@ 
 	public function get_existing_test_settings() {
 		$settings = parent::get_existing_test_settings();
 		//override subject if present because we always want it to be fresh.
-		if ( is_array( $settings ) && ! empty( $settings['subject'] ) ) {
-			$settings['subject'] = sprintf( __('Test email sent from %s', 'event_espresso'), get_bloginfo('name') );
+		if (is_array($settings) && ! empty($settings['subject'])) {
+			$settings['subject'] = sprintf(__('Test email sent from %s', 'event_espresso'), get_bloginfo('name'));
 		}
 		return $settings;
 	}

Braces +2 added lines, -1 removed lines

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

core/libraries/messages/messenger/assets/email/CssToInlineStyles.php

Indentation +708 added lines, -708 removed lines

@@ -11,712 +11,712 @@
  */
 class CssToInlineStyles
 {
-    /**
-     * The CSS to use
-     *
-     * @var	string
-     */
-    private $css;
-
-    /**
-     * The processed CSS rules
-     *
-     * @var	array
-     */
-    private $cssRules;
-
-    /**
-     * Should the generated HTML be cleaned
-     *
-     * @var	bool
-     */
-    private $cleanup = false;
-
-    /**
-     * The encoding to use.
-     *
-     * @var	string
-     */
-    private $encoding = 'UTF-8';
-
-    /**
-     * The HTML to process
-     *
-     * @var	string
-     */
-    private $html;
-
-    /**
-     * Use inline-styles block as CSS
-     *
-     * @var	bool
-     */
-    private $useInlineStylesBlock = false;
-
-    /**
-     * Strip original style tags
-     *
-     * @var bool
-     */
-    private $stripOriginalStyleTags = false;
-
-    /**
-     * Exclude the media queries from the inlined styles
-     *
-     * @var bool
-     */
-    private $excludeMediaQueries = false;
-
-    /**
-     * Creates an instance, you could set the HTML and CSS here, or load it
-     * later.
-     *
-     * @return void
-     * @param  string[optional] $html The HTML to process.
-     * @param  string[optional] $css  The CSS to use.
-     */
-    public function __construct($html = null, $css = null)
-    {
-        if($html !== null) $this->setHTML($html);
-        if($css !== null) $this->setCSS($css);
-    }
-
-    /**
-     * Convert a CSS-selector into an xPath-query
-     *
-     * @return string
-     * @param  string $selector The CSS-selector.
-     */
-    private function buildXPathQuery($selector)
-    {
-        // redefine
-        $selector = (string) $selector;
-
-        // the CSS selector
-        $cssSelector = array(
-            // E F, Matches any F element that is a descendant of an E element
-            '/(\w)\s+([\w\*])/',
-            // E > F, Matches any F element that is a child of an element E
-            '/(\w)\s*>\s*([\w\*])/',
-            // E:first-child, Matches element E when E is the first child of its parent
-            '/(\w):first-child/',
-            // E + F, Matches any F element immediately preceded by an element
-            '/(\w)\s*\+\s*(\w)/',
-            // E[foo], Matches any E element with the "foo" attribute set (whatever the value)
-            '/(\w)\[([\w\-]+)]/',
-            // E[foo="warning"], Matches any E element whose "foo" attribute value is exactly equal to "warning"
-            '/(\w)\[([\w\-]+)\=\"(.*)\"]/',
-            // div.warning, HTML only. The same as DIV[class~="warning"]
-            '/(\w+|\*)+\.([\w\-]+)+/',
-            // .warning, HTML only. The same as *[class~="warning"]
-            '/\.([\w\-]+)/',
-            // E#myid, Matches any E element with id-attribute equal to "myid"
-            '/(\w+)+\#([\w\-]+)/',
-            // #myid, Matches any element with id-attribute equal to "myid"
-            '/\#([\w\-]+)/'
-        );
-
-        // the xPath-equivalent
-        $xPathQuery = array(
-            // E F, Matches any F element that is a descendant of an E element
-            '\1//\2',
-            // E > F, Matches any F element that is a child of an element E
-            '\1/\2',
-            // E:first-child, Matches element E when E is the first child of its parent
-            '*[1]/self::\1',
-            // E + F, Matches any F element immediately preceded by an element
-            '\1/following-sibling::*[1]/self::\2',
-            // E[foo], Matches any E element with the "foo" attribute set (whatever the value)
-            '\1 [ @\2 ]',
-            // E[foo="warning"], Matches any E element whose "foo" attribute value is exactly equal to "warning"
-            '\1[ contains( concat( " ", @\2, " " ), concat( " ", "\3", " " ) ) ]',
-            // div.warning, HTML only. The same as DIV[class~="warning"]
-            '\1[ contains( concat( " ", @class, " " ), concat( " ", "\2", " " ) ) ]',
-            // .warning, HTML only. The same as *[class~="warning"]
-            '*[ contains( concat( " ", @class, " " ), concat( " ", "\1", " " ) ) ]',
-            // E#myid, Matches any E element with id-attribute equal to "myid"
-            '\1[ @id = "\2" ]',
-            // #myid, Matches any element with id-attribute equal to "myid"
-            '*[ @id = "\1" ]'
-        );
-
-        // return
-        $xPath = (string) '//' . preg_replace($cssSelector, $xPathQuery, $selector);
-
-        return str_replace('] *', ']//*', $xPath);
-    }
-
-    /**
-     * Calculate the specifity for the CSS-selector
-     *
-     * @return int
-     * @param  string $selector The selector to calculate the specifity for.
-     */
-    private function calculateCSSSpecifity($selector)
-    {
-        // cleanup selector
-        $selector = str_replace(array('>', '+'), array(' > ', ' + '), $selector);
-
-        // init var
-        $specifity = 0;
-
-        // split the selector into chunks based on spaces
-        $chunks = explode(' ', $selector);
-
-        // loop chunks
-        foreach ($chunks as $chunk) {
-            // an ID is important, so give it a high specifity
-            if(strstr($chunk, '#') !== false) $specifity += 100;
-
-            // classes are more important than a tag, but less important then an ID
-            elseif(strstr($chunk, '.')) $specifity += 10;
-
-            // anything else isn't that important
-            else $specifity += 1;
-        }
-
-        // return
-        return $specifity;
-    }
-
-
-    /**
-     * Cleanup the generated HTML
-     *
-     * @return string
-     * @param  string $html The HTML to cleanup.
-     */
-    private function cleanupHTML($html)
-    {
-        // remove classes
-        $html = preg_replace('/(\s)+class="(.*)"(\s)+/U', ' ', $html);
-
-        // remove IDs
-        $html = preg_replace('/(\s)+id="(.*)"(\s)+/U', ' ', $html);
-
-        // return
-        return $html;
-    }
-
-
-    /**
-     * Converts the loaded HTML into an HTML-string with inline styles based on the loaded CSS
-     *
-     * @return string
-     * @param  bool[optional] $outputXHTML Should we output valid XHTML?
-     */
-    public function convert($outputXHTML = false)
-    {
-        // redefine
-        $outputXHTML = (bool) $outputXHTML;
-
-        // validate
-        if($this->html == null) throw new Exception('No HTML provided.');
-
-        // should we use inline style-block
-        if ($this->useInlineStylesBlock) {
-            // init var
-            $matches = array();
-
-            // match the style blocks
-            preg_match_all('|<style(.*)>(.*)</style>|isU', $this->html, $matches);
-
-            // any style-blocks found?
-            if (!empty($matches[2])) {
-                // add
-                foreach($matches[2] as $match) $this->css .= trim($match) ."\n";
-            }
-        }
-
-        // process css
-        $this->processCSS();
-
-        // create new DOMDocument
-        $document = new DOMDocument('1.0', $this->getEncoding());
-
-        // set error level
-        libxml_use_internal_errors(true);
-
-        // load HTML
-        $document->loadHTML($this->html);
-
-        // create new XPath
-        $xPath = new DOMXPath($document);
-
-        // any rules?
-        if (!empty($this->cssRules)) {
-            // loop rules
-            foreach ($this->cssRules as $rule) {
-                // init var
-                $query = $this->buildXPathQuery($rule['selector']);
-
-                // validate query
-                if($query === false) continue;
-
-                // search elements
-                $elements = $xPath->query($query);
-
-                // validate elements
-                if($elements === false) continue;
-
-                // loop found elements
-                foreach ($elements as $element) {
-                    // no styles stored?
-                    if ($element->attributes->getNamedItem(
-                        'data-css-to-inline-styles-original-styles'
-                    ) == null) {
-                        // init var
-                        $originalStyle = '';
-                        if ($element->attributes->getNamedItem('style') !== null) {
-                            $originalStyle = $element->attributes->getNamedItem('style')->value;
-                        }
-
-                        // store original styles
-                        $element->setAttribute(
-                            'data-css-to-inline-styles-original-styles',
-                            $originalStyle
-                        );
-
-                        // clear the styles
-                        $element->setAttribute('style', '');
-                    }
-
-                    // init var
-                    $properties = array();
-
-                    // get current styles
-                    $stylesAttribute = $element->attributes->getNamedItem('style');
-
-                    // any styles defined before?
-                    if ($stylesAttribute !== null) {
-                        // get value for the styles attribute
-                        $definedStyles = (string) $stylesAttribute->value;
-
-                        // split into properties
-                        $definedProperties = (array) explode(';', $definedStyles);
-
-                        // loop properties
-                        foreach ($definedProperties as $property) {
-                            // validate property
-                            if($property == '') continue;
-
-                            // split into chunks
-                            $chunks = (array) explode(':', trim($property), 2);
-
-                            // validate
-                            if(!isset($chunks[1])) continue;
-
-                            // loop chunks
-                            $properties[$chunks[0]] = trim($chunks[1]);
-                        }
-                    }
-
-                    // add new properties into the list
-                    foreach ($rule['properties'] as $key => $value) {
-                        $properties[$key] = $value;
-                    }
-
-                    // build string
-                    $propertyChunks = array();
-
-                    // build chunks
-                    foreach ($properties as $key => $values) {
-                        foreach ((array) $values as $value) {
-                            $propertyChunks[] = $key . ': ' . $value . ';';
-                        }
-                    }
-
-                    // build properties string
-                    $propertiesString = implode(' ', $propertyChunks);
-
-                    // set attribute
-                    if ($propertiesString != '') {
-                        $element->setAttribute('style', $propertiesString);
-                    }
-                }
-            }
-
-            // reapply original styles
-            $query = $this->buildXPathQuery(
-                '*[@data-css-to-inline-styles-original-styles]'
-            );
-
-            // validate query
-            if($query === false) return;
-
-            // search elements
-            $elements = $xPath->query($query);
-
-            // loop found elements
-            foreach ($elements as $element) {
-                // get the original styles
-                $originalStyle = $element->attributes->getNamedItem(
-                    'data-css-to-inline-styles-original-styles'
-                )->value;
-
-                if ($originalStyle != '') {
-                    $originalProperties = array();
-                    $originalStyles = (array) explode(';', $originalStyle);
-
-                    foreach ($originalStyles as $property) {
-                        // validate property
-                        if($property == '') continue;
-
-                        // split into chunks
-                        $chunks = (array) explode(':', trim($property), 2);
-
-                        // validate
-                        if(!isset($chunks[1])) continue;
-
-                        // loop chunks
-                        $originalProperties[$chunks[0]] = trim($chunks[1]);
-                    }
-
-                    // get current styles
-                    $stylesAttribute = $element->attributes->getNamedItem('style');
-                    $properties = array();
-
-                    // any styles defined before?
-                    if ($stylesAttribute !== null) {
-                        // get value for the styles attribute
-                        $definedStyles = (string) $stylesAttribute->value;
-
-                        // split into properties
-                        $definedProperties = (array) explode(';', $definedStyles);
-
-                        // loop properties
-                        foreach ($definedProperties as $property) {
-                            // validate property
-                            if($property == '') continue;
-
-                            // split into chunks
-                            $chunks = (array) explode(':', trim($property), 2);
-
-                            // validate
-                            if(!isset($chunks[1])) continue;
-
-                            // loop chunks
-                            $properties[$chunks[0]] = trim($chunks[1]);
-                        }
-                    }
-
-                    // add new properties into the list
-                    foreach ($originalProperties as $key => $value) {
-                        $properties[$key] = $value;
-                    }
-
-                    // build string
-                    $propertyChunks = array();
-
-                    // build chunks
-                    foreach ($properties as $key => $values) {
-                        foreach ((array) $values as $value) {
-                            $propertyChunks[] = $key . ': ' . $value . ';';
-                        }
-                    }
-
-                    // build properties string
-                    $propertiesString = implode(' ', $propertyChunks);
-
-                    // set attribute
-                    if($propertiesString != '') $element->setAttribute(
-                        'style', $propertiesString
-                    );
-                }
-
-                // remove placeholder
-                $element->removeAttribute(
-                    'data-css-to-inline-styles-original-styles'
-                );
-            }
-        }
-
-        // should we output XHTML?
-        if ($outputXHTML) {
-            // set formating
-            $document->formatOutput = true;
-
-            // get the HTML as XML
-            $html = $document->saveXML(null, LIBXML_NOEMPTYTAG);
-
-            // get start of the XML-declaration
-            $startPosition = strpos($html, '<?xml');
-
-            // valid start position?
-            if ($startPosition !== false) {
-                // get end of the xml-declaration
-                $endPosition = strpos($html, '?>', $startPosition);
-
-                // remove the XML-header
-                $html = ltrim(substr($html, $endPosition + 1));
-            }
-        }
-
-        // just regular HTML 4.01 as it should be used in newsletters
-        else {
-            // get the HTML
-            $html = $document->saveHTML();
-        }
-
-        // cleanup the HTML if we need to
-        if($this->cleanup) $html = $this->cleanupHTML($html);
-
-        // strip original style tags if we need to
-        if ($this->stripOriginalStyleTags) {
-            $html = $this->stripOriginalStyleTags($html);
-        }
-
-        // return
-        return $html;
-    }
-
-
-    /**
-     * Get the encoding to use
-     *
-     * @return string
-     */
-    private function getEncoding()
-    {
-        return $this->encoding;
-    }
-
-
-    /**
-     * Process the loaded CSS
-     *
-     * @return void
-     */
-    private function processCSS()
-    {
-        // init vars
-        $css = (string) $this->css;
-
-        // remove newlines
-        $css = str_replace(array("\r", "\n"), '', $css);
-
-        // replace double quotes by single quotes
-        $css = str_replace('"', '\'', $css);
-
-        // remove comments
-        $css = preg_replace('|/\*.*?\*/|', '', $css);
-
-        // remove spaces
-        $css = preg_replace('/\s\s+/', ' ', $css);
-
-        if ($this->excludeMediaQueries) {
-            $css = preg_replace('/@media [^{]*{([^{}]|{[^{}]*})*}/', '', $css);
-        }
-
-        // rules are splitted by }
-        $rules = (array) explode('}', $css);
-
-        // init var
-        $i = 1;
-
-        // loop rules
-        foreach ($rules as $rule) {
-            // split into chunks
-            $chunks = explode('{', $rule);
-
-            // invalid rule?
-            if(!isset($chunks[1])) continue;
-
-            // set the selectors
-            $selectors = trim($chunks[0]);
-
-            // get cssProperties
-            $cssProperties = trim($chunks[1]);
-
-            // split multiple selectors
-            $selectors = (array) explode(',', $selectors);
-
-            // loop selectors
-            foreach ($selectors as $selector) {
-                // cleanup
-                $selector = trim($selector);
-
-                // build an array for each selector
-                $ruleSet = array();
-
-                // store selector
-                $ruleSet['selector'] = $selector;
-
-                // process the properties
-                $ruleSet['properties'] = $this->processCSSProperties(
-                    $cssProperties
-                );
-
-                // calculate specifity
-                $ruleSet['specifity'] = $this->calculateCSSSpecifity(
-                    $selector
-                ) + $i;
-
-                // add into global rules
-                $this->cssRules[] = $ruleSet;
-            }
-
-            // increment
-            $i++;
-        }
-
-        // sort based on specifity
-        if (!empty($this->cssRules)) {
-            usort($this->cssRules, array(__CLASS__, 'sortOnSpecifity'));
-        }
-    }
-
-    /**
-     * Process the CSS-properties
-     *
-     * @return array
-     * @param  string $propertyString The CSS-properties.
-     */
-    private function processCSSProperties($propertyString)
-    {
-        // split into chunks
-        $properties = (array) explode(';', $propertyString);
-
-        // init var
-        $pairs = array();
-
-        // loop properties
-        foreach ($properties as $property) {
-            // split into chunks
-            $chunks = (array) explode(':', $property, 2);
-
-            // validate
-            if(!isset($chunks[1])) continue;
-
-            // cleanup
-            $chunks[0] = trim($chunks[0]);
-            $chunks[1] = trim($chunks[1]);
-
-            // add to pairs array
-            if(!isset($pairs[$chunks[0]]) ||
-               !in_array($chunks[1], $pairs[$chunks[0]])) {
-                $pairs[$chunks[0]][] = $chunks[1];
-            }
-        }
-
-        // sort the pairs
-        ksort($pairs);
-
-        // return
-        return $pairs;
-    }
-
-    /**
-     * Should the IDs and classes be removed?
-     *
-     * @return void
-     * @param  bool[optional] $on Should we enable cleanup?
-     */
-    public function setCleanup($on = true)
-    {
-        $this->cleanup = (bool) $on;
-    }
-
-    /**
-     * Set CSS to use
-     *
-     * @return void
-     * @param  string $css The CSS to use.
-     */
-    public function setCSS($css)
-    {
-        $this->css = (string) $css;
-    }
-
-    /**
-     * Set the encoding to use with the DOMDocument
-     *
-     * @return void
-     * @param  string $encoding The encoding to use.
-     */
-    public function setEncoding($encoding)
-    {
-        $this->encoding = (string) $encoding;
-    }
-
-    /**
-     * Set HTML to process
-     *
-     * @return void
-     * @param  string $html The HTML to process.
-     */
-    public function setHTML($html)
-    {
-        $this->html = (string) $html;
-    }
-
-    /**
-     * Set use of inline styles block
-     * If this is enabled the class will use the style-block in the HTML.
-     *
-     * @return void
-     * @param  bool[optional] $on Should we process inline styles?
-     */
-    public function setUseInlineStylesBlock($on = true)
-    {
-        $this->useInlineStylesBlock = (bool) $on;
-    }
-
-    /**
-     * Set strip original style tags
-     * If this is enabled the class will remove all style tags in the HTML.
-     *
-     * @return void
-     * @param  bool[optional] $on Should we process inline styles?
-     */
-    public function setStripOriginalStyleTags($on = true)
-    {
-        $this->stripOriginalStyleTags = (bool) $on;
-    }
-
-    /**
-     * Set exclude media queries
-     *
-     * If this is enabled the media queries will be removed before inlining the rules
-     *
-     * @return void
-     * @param bool[optional] $on
-     */
-    public function setExcludeMediaQueries($on = true)
-    {
-        $this->excludeMediaQueries = (bool) $on;
-    }
-
-    /**
-     * Strip style tags into the generated HTML
-     *
-     * @return string
-     * @param  string $html The HTML to strip style tags.
-     */
-    private function stripOriginalStyleTags($html)
-    {
-        return preg_replace('|<style(.*)>(.*)</style>|isU', '', $html);
-    }
-
-    /**
-     * Sort an array on the specifity element
-     *
-     * @return int
-     * @param  array $e1 The first element.
-     * @param  array $e2 The second element.
-     */
-    private static function sortOnSpecifity($e1, $e2)
-    {
-        // validate
-        if(!isset($e1['specifity']) || !isset($e2['specifity'])) return 0;
-
-        // lower
-        if($e1['specifity'] < $e2['specifity']) return -1;
-
-        // higher
-        if($e1['specifity'] > $e2['specifity']) return 1;
-
-        // fallback
-        return 0;
-    }
+	/**
+	 * The CSS to use
+	 *
+	 * @var	string
+	 */
+	private $css;
+
+	/**
+	 * The processed CSS rules
+	 *
+	 * @var	array
+	 */
+	private $cssRules;
+
+	/**
+	 * Should the generated HTML be cleaned
+	 *
+	 * @var	bool
+	 */
+	private $cleanup = false;
+
+	/**
+	 * The encoding to use.
+	 *
+	 * @var	string
+	 */
+	private $encoding = 'UTF-8';
+
+	/**
+	 * The HTML to process
+	 *
+	 * @var	string
+	 */
+	private $html;
+
+	/**
+	 * Use inline-styles block as CSS
+	 *
+	 * @var	bool
+	 */
+	private $useInlineStylesBlock = false;
+
+	/**
+	 * Strip original style tags
+	 *
+	 * @var bool
+	 */
+	private $stripOriginalStyleTags = false;
+
+	/**
+	 * Exclude the media queries from the inlined styles
+	 *
+	 * @var bool
+	 */
+	private $excludeMediaQueries = false;
+
+	/**
+	 * Creates an instance, you could set the HTML and CSS here, or load it
+	 * later.
+	 *
+	 * @return void
+	 * @param  string[optional] $html The HTML to process.
+	 * @param  string[optional] $css  The CSS to use.
+	 */
+	public function __construct($html = null, $css = null)
+	{
+		if($html !== null) $this->setHTML($html);
+		if($css !== null) $this->setCSS($css);
+	}
+
+	/**
+	 * Convert a CSS-selector into an xPath-query
+	 *
+	 * @return string
+	 * @param  string $selector The CSS-selector.
+	 */
+	private function buildXPathQuery($selector)
+	{
+		// redefine
+		$selector = (string) $selector;
+
+		// the CSS selector
+		$cssSelector = array(
+			// E F, Matches any F element that is a descendant of an E element
+			'/(\w)\s+([\w\*])/',
+			// E > F, Matches any F element that is a child of an element E
+			'/(\w)\s*>\s*([\w\*])/',
+			// E:first-child, Matches element E when E is the first child of its parent
+			'/(\w):first-child/',
+			// E + F, Matches any F element immediately preceded by an element
+			'/(\w)\s*\+\s*(\w)/',
+			// E[foo], Matches any E element with the "foo" attribute set (whatever the value)
+			'/(\w)\[([\w\-]+)]/',
+			// E[foo="warning"], Matches any E element whose "foo" attribute value is exactly equal to "warning"
+			'/(\w)\[([\w\-]+)\=\"(.*)\"]/',
+			// div.warning, HTML only. The same as DIV[class~="warning"]
+			'/(\w+|\*)+\.([\w\-]+)+/',
+			// .warning, HTML only. The same as *[class~="warning"]
+			'/\.([\w\-]+)/',
+			// E#myid, Matches any E element with id-attribute equal to "myid"
+			'/(\w+)+\#([\w\-]+)/',
+			// #myid, Matches any element with id-attribute equal to "myid"
+			'/\#([\w\-]+)/'
+		);
+
+		// the xPath-equivalent
+		$xPathQuery = array(
+			// E F, Matches any F element that is a descendant of an E element
+			'\1//\2',
+			// E > F, Matches any F element that is a child of an element E
+			'\1/\2',
+			// E:first-child, Matches element E when E is the first child of its parent
+			'*[1]/self::\1',
+			// E + F, Matches any F element immediately preceded by an element
+			'\1/following-sibling::*[1]/self::\2',
+			// E[foo], Matches any E element with the "foo" attribute set (whatever the value)
+			'\1 [ @\2 ]',
+			// E[foo="warning"], Matches any E element whose "foo" attribute value is exactly equal to "warning"
+			'\1[ contains( concat( " ", @\2, " " ), concat( " ", "\3", " " ) ) ]',
+			// div.warning, HTML only. The same as DIV[class~="warning"]
+			'\1[ contains( concat( " ", @class, " " ), concat( " ", "\2", " " ) ) ]',
+			// .warning, HTML only. The same as *[class~="warning"]
+			'*[ contains( concat( " ", @class, " " ), concat( " ", "\1", " " ) ) ]',
+			// E#myid, Matches any E element with id-attribute equal to "myid"
+			'\1[ @id = "\2" ]',
+			// #myid, Matches any element with id-attribute equal to "myid"
+			'*[ @id = "\1" ]'
+		);
+
+		// return
+		$xPath = (string) '//' . preg_replace($cssSelector, $xPathQuery, $selector);
+
+		return str_replace('] *', ']//*', $xPath);
+	}
+
+	/**
+	 * Calculate the specifity for the CSS-selector
+	 *
+	 * @return int
+	 * @param  string $selector The selector to calculate the specifity for.
+	 */
+	private function calculateCSSSpecifity($selector)
+	{
+		// cleanup selector
+		$selector = str_replace(array('>', '+'), array(' > ', ' + '), $selector);
+
+		// init var
+		$specifity = 0;
+
+		// split the selector into chunks based on spaces
+		$chunks = explode(' ', $selector);
+
+		// loop chunks
+		foreach ($chunks as $chunk) {
+			// an ID is important, so give it a high specifity
+			if(strstr($chunk, '#') !== false) $specifity += 100;
+
+			// classes are more important than a tag, but less important then an ID
+			elseif(strstr($chunk, '.')) $specifity += 10;
+
+			// anything else isn't that important
+			else $specifity += 1;
+		}
+
+		// return
+		return $specifity;
+	}
+
+
+	/**
+	 * Cleanup the generated HTML
+	 *
+	 * @return string
+	 * @param  string $html The HTML to cleanup.
+	 */
+	private function cleanupHTML($html)
+	{
+		// remove classes
+		$html = preg_replace('/(\s)+class="(.*)"(\s)+/U', ' ', $html);
+
+		// remove IDs
+		$html = preg_replace('/(\s)+id="(.*)"(\s)+/U', ' ', $html);
+
+		// return
+		return $html;
+	}
+
+
+	/**
+	 * Converts the loaded HTML into an HTML-string with inline styles based on the loaded CSS
+	 *
+	 * @return string
+	 * @param  bool[optional] $outputXHTML Should we output valid XHTML?
+	 */
+	public function convert($outputXHTML = false)
+	{
+		// redefine
+		$outputXHTML = (bool) $outputXHTML;
+
+		// validate
+		if($this->html == null) throw new Exception('No HTML provided.');
+
+		// should we use inline style-block
+		if ($this->useInlineStylesBlock) {
+			// init var
+			$matches = array();
+
+			// match the style blocks
+			preg_match_all('|<style(.*)>(.*)</style>|isU', $this->html, $matches);
+
+			// any style-blocks found?
+			if (!empty($matches[2])) {
+				// add
+				foreach($matches[2] as $match) $this->css .= trim($match) ."\n";
+			}
+		}
+
+		// process css
+		$this->processCSS();
+
+		// create new DOMDocument
+		$document = new DOMDocument('1.0', $this->getEncoding());
+
+		// set error level
+		libxml_use_internal_errors(true);
+
+		// load HTML
+		$document->loadHTML($this->html);
+
+		// create new XPath
+		$xPath = new DOMXPath($document);
+
+		// any rules?
+		if (!empty($this->cssRules)) {
+			// loop rules
+			foreach ($this->cssRules as $rule) {
+				// init var
+				$query = $this->buildXPathQuery($rule['selector']);
+
+				// validate query
+				if($query === false) continue;
+
+				// search elements
+				$elements = $xPath->query($query);
+
+				// validate elements
+				if($elements === false) continue;
+
+				// loop found elements
+				foreach ($elements as $element) {
+					// no styles stored?
+					if ($element->attributes->getNamedItem(
+						'data-css-to-inline-styles-original-styles'
+					) == null) {
+						// init var
+						$originalStyle = '';
+						if ($element->attributes->getNamedItem('style') !== null) {
+							$originalStyle = $element->attributes->getNamedItem('style')->value;
+						}
+
+						// store original styles
+						$element->setAttribute(
+							'data-css-to-inline-styles-original-styles',
+							$originalStyle
+						);
+
+						// clear the styles
+						$element->setAttribute('style', '');
+					}
+
+					// init var
+					$properties = array();
+
+					// get current styles
+					$stylesAttribute = $element->attributes->getNamedItem('style');
+
+					// any styles defined before?
+					if ($stylesAttribute !== null) {
+						// get value for the styles attribute
+						$definedStyles = (string) $stylesAttribute->value;
+
+						// split into properties
+						$definedProperties = (array) explode(';', $definedStyles);
+
+						// loop properties
+						foreach ($definedProperties as $property) {
+							// validate property
+							if($property == '') continue;
+
+							// split into chunks
+							$chunks = (array) explode(':', trim($property), 2);
+
+							// validate
+							if(!isset($chunks[1])) continue;
+
+							// loop chunks
+							$properties[$chunks[0]] = trim($chunks[1]);
+						}
+					}
+
+					// add new properties into the list
+					foreach ($rule['properties'] as $key => $value) {
+						$properties[$key] = $value;
+					}
+
+					// build string
+					$propertyChunks = array();
+
+					// build chunks
+					foreach ($properties as $key => $values) {
+						foreach ((array) $values as $value) {
+							$propertyChunks[] = $key . ': ' . $value . ';';
+						}
+					}
+
+					// build properties string
+					$propertiesString = implode(' ', $propertyChunks);
+
+					// set attribute
+					if ($propertiesString != '') {
+						$element->setAttribute('style', $propertiesString);
+					}
+				}
+			}
+
+			// reapply original styles
+			$query = $this->buildXPathQuery(
+				'*[@data-css-to-inline-styles-original-styles]'
+			);
+
+			// validate query
+			if($query === false) return;
+
+			// search elements
+			$elements = $xPath->query($query);
+
+			// loop found elements
+			foreach ($elements as $element) {
+				// get the original styles
+				$originalStyle = $element->attributes->getNamedItem(
+					'data-css-to-inline-styles-original-styles'
+				)->value;
+
+				if ($originalStyle != '') {
+					$originalProperties = array();
+					$originalStyles = (array) explode(';', $originalStyle);
+
+					foreach ($originalStyles as $property) {
+						// validate property
+						if($property == '') continue;
+
+						// split into chunks
+						$chunks = (array) explode(':', trim($property), 2);
+
+						// validate
+						if(!isset($chunks[1])) continue;
+
+						// loop chunks
+						$originalProperties[$chunks[0]] = trim($chunks[1]);
+					}
+
+					// get current styles
+					$stylesAttribute = $element->attributes->getNamedItem('style');
+					$properties = array();
+
+					// any styles defined before?
+					if ($stylesAttribute !== null) {
+						// get value for the styles attribute
+						$definedStyles = (string) $stylesAttribute->value;
+
+						// split into properties
+						$definedProperties = (array) explode(';', $definedStyles);
+
+						// loop properties
+						foreach ($definedProperties as $property) {
+							// validate property
+							if($property == '') continue;
+
+							// split into chunks
+							$chunks = (array) explode(':', trim($property), 2);
+
+							// validate
+							if(!isset($chunks[1])) continue;
+
+							// loop chunks
+							$properties[$chunks[0]] = trim($chunks[1]);
+						}
+					}
+
+					// add new properties into the list
+					foreach ($originalProperties as $key => $value) {
+						$properties[$key] = $value;
+					}
+
+					// build string
+					$propertyChunks = array();
+
+					// build chunks
+					foreach ($properties as $key => $values) {
+						foreach ((array) $values as $value) {
+							$propertyChunks[] = $key . ': ' . $value . ';';
+						}
+					}
+
+					// build properties string
+					$propertiesString = implode(' ', $propertyChunks);
+
+					// set attribute
+					if($propertiesString != '') $element->setAttribute(
+						'style', $propertiesString
+					);
+				}
+
+				// remove placeholder
+				$element->removeAttribute(
+					'data-css-to-inline-styles-original-styles'
+				);
+			}
+		}
+
+		// should we output XHTML?
+		if ($outputXHTML) {
+			// set formating
+			$document->formatOutput = true;
+
+			// get the HTML as XML
+			$html = $document->saveXML(null, LIBXML_NOEMPTYTAG);
+
+			// get start of the XML-declaration
+			$startPosition = strpos($html, '<?xml');
+
+			// valid start position?
+			if ($startPosition !== false) {
+				// get end of the xml-declaration
+				$endPosition = strpos($html, '?>', $startPosition);
+
+				// remove the XML-header
+				$html = ltrim(substr($html, $endPosition + 1));
+			}
+		}
+
+		// just regular HTML 4.01 as it should be used in newsletters
+		else {
+			// get the HTML
+			$html = $document->saveHTML();
+		}
+
+		// cleanup the HTML if we need to
+		if($this->cleanup) $html = $this->cleanupHTML($html);
+
+		// strip original style tags if we need to
+		if ($this->stripOriginalStyleTags) {
+			$html = $this->stripOriginalStyleTags($html);
+		}
+
+		// return
+		return $html;
+	}
+
+
+	/**
+	 * Get the encoding to use
+	 *
+	 * @return string
+	 */
+	private function getEncoding()
+	{
+		return $this->encoding;
+	}
+
+
+	/**
+	 * Process the loaded CSS
+	 *
+	 * @return void
+	 */
+	private function processCSS()
+	{
+		// init vars
+		$css = (string) $this->css;
+
+		// remove newlines
+		$css = str_replace(array("\r", "\n"), '', $css);
+
+		// replace double quotes by single quotes
+		$css = str_replace('"', '\'', $css);
+
+		// remove comments
+		$css = preg_replace('|/\*.*?\*/|', '', $css);
+
+		// remove spaces
+		$css = preg_replace('/\s\s+/', ' ', $css);
+
+		if ($this->excludeMediaQueries) {
+			$css = preg_replace('/@media [^{]*{([^{}]|{[^{}]*})*}/', '', $css);
+		}
+
+		// rules are splitted by }
+		$rules = (array) explode('}', $css);
+
+		// init var
+		$i = 1;
+
+		// loop rules
+		foreach ($rules as $rule) {
+			// split into chunks
+			$chunks = explode('{', $rule);
+
+			// invalid rule?
+			if(!isset($chunks[1])) continue;
+
+			// set the selectors
+			$selectors = trim($chunks[0]);
+
+			// get cssProperties
+			$cssProperties = trim($chunks[1]);
+
+			// split multiple selectors
+			$selectors = (array) explode(',', $selectors);
+
+			// loop selectors
+			foreach ($selectors as $selector) {
+				// cleanup
+				$selector = trim($selector);
+
+				// build an array for each selector
+				$ruleSet = array();
+
+				// store selector
+				$ruleSet['selector'] = $selector;
+
+				// process the properties
+				$ruleSet['properties'] = $this->processCSSProperties(
+					$cssProperties
+				);
+
+				// calculate specifity
+				$ruleSet['specifity'] = $this->calculateCSSSpecifity(
+					$selector
+				) + $i;
+
+				// add into global rules
+				$this->cssRules[] = $ruleSet;
+			}
+
+			// increment
+			$i++;
+		}
+
+		// sort based on specifity
+		if (!empty($this->cssRules)) {
+			usort($this->cssRules, array(__CLASS__, 'sortOnSpecifity'));
+		}
+	}
+
+	/**
+	 * Process the CSS-properties
+	 *
+	 * @return array
+	 * @param  string $propertyString The CSS-properties.
+	 */
+	private function processCSSProperties($propertyString)
+	{
+		// split into chunks
+		$properties = (array) explode(';', $propertyString);
+
+		// init var
+		$pairs = array();
+
+		// loop properties
+		foreach ($properties as $property) {
+			// split into chunks
+			$chunks = (array) explode(':', $property, 2);
+
+			// validate
+			if(!isset($chunks[1])) continue;
+
+			// cleanup
+			$chunks[0] = trim($chunks[0]);
+			$chunks[1] = trim($chunks[1]);
+
+			// add to pairs array
+			if(!isset($pairs[$chunks[0]]) ||
+			   !in_array($chunks[1], $pairs[$chunks[0]])) {
+				$pairs[$chunks[0]][] = $chunks[1];
+			}
+		}
+
+		// sort the pairs
+		ksort($pairs);
+
+		// return
+		return $pairs;
+	}
+
+	/**
+	 * Should the IDs and classes be removed?
+	 *
+	 * @return void
+	 * @param  bool[optional] $on Should we enable cleanup?
+	 */
+	public function setCleanup($on = true)
+	{
+		$this->cleanup = (bool) $on;
+	}
+
+	/**
+	 * Set CSS to use
+	 *
+	 * @return void
+	 * @param  string $css The CSS to use.
+	 */
+	public function setCSS($css)
+	{
+		$this->css = (string) $css;
+	}
+
+	/**
+	 * Set the encoding to use with the DOMDocument
+	 *
+	 * @return void
+	 * @param  string $encoding The encoding to use.
+	 */
+	public function setEncoding($encoding)
+	{
+		$this->encoding = (string) $encoding;
+	}
+
+	/**
+	 * Set HTML to process
+	 *
+	 * @return void
+	 * @param  string $html The HTML to process.
+	 */
+	public function setHTML($html)
+	{
+		$this->html = (string) $html;
+	}
+
+	/**
+	 * Set use of inline styles block
+	 * If this is enabled the class will use the style-block in the HTML.
+	 *
+	 * @return void
+	 * @param  bool[optional] $on Should we process inline styles?
+	 */
+	public function setUseInlineStylesBlock($on = true)
+	{
+		$this->useInlineStylesBlock = (bool) $on;
+	}
+
+	/**
+	 * Set strip original style tags
+	 * If this is enabled the class will remove all style tags in the HTML.
+	 *
+	 * @return void
+	 * @param  bool[optional] $on Should we process inline styles?
+	 */
+	public function setStripOriginalStyleTags($on = true)
+	{
+		$this->stripOriginalStyleTags = (bool) $on;
+	}
+
+	/**
+	 * Set exclude media queries
+	 *
+	 * If this is enabled the media queries will be removed before inlining the rules
+	 *
+	 * @return void
+	 * @param bool[optional] $on
+	 */
+	public function setExcludeMediaQueries($on = true)
+	{
+		$this->excludeMediaQueries = (bool) $on;
+	}
+
+	/**
+	 * Strip style tags into the generated HTML
+	 *
+	 * @return string
+	 * @param  string $html The HTML to strip style tags.
+	 */
+	private function stripOriginalStyleTags($html)
+	{
+		return preg_replace('|<style(.*)>(.*)</style>|isU', '', $html);
+	}
+
+	/**
+	 * Sort an array on the specifity element
+	 *
+	 * @return int
+	 * @param  array $e1 The first element.
+	 * @param  array $e2 The second element.
+	 */
+	private static function sortOnSpecifity($e1, $e2)
+	{
+		// validate
+		if(!isset($e1['specifity']) || !isset($e2['specifity'])) return 0;
+
+		// lower
+		if($e1['specifity'] < $e2['specifity']) return -1;
+
+		// higher
+		if($e1['specifity'] > $e2['specifity']) return 1;
+
+		// fallback
+		return 0;
+	}
 }

Spacing +30 added lines, -30 removed lines

@@ -77,8 +77,8 @@ 
      */
     public function __construct($html = null, $css = null)
     {
-        if($html !== null) $this->setHTML($html);
-        if($css !== null) $this->setCSS($css);
+        if ($html !== null) $this->setHTML($html);
+        if ($css !== null) $this->setCSS($css);
     }
 
     /**
@@ -141,7 +141,7 @@ 
         );
 
         // return
-        $xPath = (string) '//' . preg_replace($cssSelector, $xPathQuery, $selector);
+        $xPath = (string) '//'.preg_replace($cssSelector, $xPathQuery, $selector);
 
         return str_replace('] *', ']//*', $xPath);
     }
@@ -166,10 +166,10 @@ 
         // loop chunks
         foreach ($chunks as $chunk) {
             // an ID is important, so give it a high specifity
-            if(strstr($chunk, '#') !== false) $specifity += 100;
+            if (strstr($chunk, '#') !== false) $specifity += 100;
 
             // classes are more important than a tag, but less important then an ID
-            elseif(strstr($chunk, '.')) $specifity += 10;
+            elseif (strstr($chunk, '.')) $specifity += 10;
 
             // anything else isn't that important
             else $specifity += 1;
@@ -211,7 +211,7 @@ 
         $outputXHTML = (bool) $outputXHTML;
 
         // validate
-        if($this->html == null) throw new Exception('No HTML provided.');
+        if ($this->html == null) throw new Exception('No HTML provided.');
 
         // should we use inline style-block
         if ($this->useInlineStylesBlock) {
@@ -222,9 +222,9 @@ 
             preg_match_all('|<style(.*)>(.*)</style>|isU', $this->html, $matches);
 
             // any style-blocks found?
-            if (!empty($matches[2])) {
+            if ( ! empty($matches[2])) {
                 // add
-                foreach($matches[2] as $match) $this->css .= trim($match) ."\n";
+                foreach ($matches[2] as $match) $this->css .= trim($match)."\n";
             }
         }
 
@@ -244,20 +244,20 @@ 
         $xPath = new DOMXPath($document);
 
         // any rules?
-        if (!empty($this->cssRules)) {
+        if ( ! empty($this->cssRules)) {
             // loop rules
             foreach ($this->cssRules as $rule) {
                 // init var
                 $query = $this->buildXPathQuery($rule['selector']);
 
                 // validate query
-                if($query === false) continue;
+                if ($query === false) continue;
 
                 // search elements
                 $elements = $xPath->query($query);
 
                 // validate elements
-                if($elements === false) continue;
+                if ($elements === false) continue;
 
                 // loop found elements
                 foreach ($elements as $element) {
@@ -298,13 +298,13 @@ 
                         // loop properties
                         foreach ($definedProperties as $property) {
                             // validate property
-                            if($property == '') continue;
+                            if ($property == '') continue;
 
                             // split into chunks
                             $chunks = (array) explode(':', trim($property), 2);
 
                             // validate
-                            if(!isset($chunks[1])) continue;
+                            if ( ! isset($chunks[1])) continue;
 
                             // loop chunks
                             $properties[$chunks[0]] = trim($chunks[1]);
@@ -322,7 +322,7 @@ 
                     // build chunks
                     foreach ($properties as $key => $values) {
                         foreach ((array) $values as $value) {
-                            $propertyChunks[] = $key . ': ' . $value . ';';
+                            $propertyChunks[] = $key.': '.$value.';';
                         }
                     }
 
@@ -342,7 +342,7 @@ 
             );
 
             // validate query
-            if($query === false) return;
+            if ($query === false) return;
 
             // search elements
             $elements = $xPath->query($query);
@@ -360,13 +360,13 @@ 
 
                     foreach ($originalStyles as $property) {
                         // validate property
-                        if($property == '') continue;
+                        if ($property == '') continue;
 
                         // split into chunks
                         $chunks = (array) explode(':', trim($property), 2);
 
                         // validate
-                        if(!isset($chunks[1])) continue;
+                        if ( ! isset($chunks[1])) continue;
 
                         // loop chunks
                         $originalProperties[$chunks[0]] = trim($chunks[1]);
@@ -387,13 +387,13 @@ 
                         // loop properties
                         foreach ($definedProperties as $property) {
                             // validate property
-                            if($property == '') continue;
+                            if ($property == '') continue;
 
                             // split into chunks
                             $chunks = (array) explode(':', trim($property), 2);
 
                             // validate
-                            if(!isset($chunks[1])) continue;
+                            if ( ! isset($chunks[1])) continue;
 
                             // loop chunks
                             $properties[$chunks[0]] = trim($chunks[1]);
@@ -411,7 +411,7 @@ 
                     // build chunks
                     foreach ($properties as $key => $values) {
                         foreach ((array) $values as $value) {
-                            $propertyChunks[] = $key . ': ' . $value . ';';
+                            $propertyChunks[] = $key.': '.$value.';';
                         }
                     }
 
@@ -419,7 +419,7 @@ 
                     $propertiesString = implode(' ', $propertyChunks);
 
                     // set attribute
-                    if($propertiesString != '') $element->setAttribute(
+                    if ($propertiesString != '') $element->setAttribute(
                         'style', $propertiesString
                     );
                 }
@@ -459,7 +459,7 @@ 
         }
 
         // cleanup the HTML if we need to
-        if($this->cleanup) $html = $this->cleanupHTML($html);
+        if ($this->cleanup) $html = $this->cleanupHTML($html);
 
         // strip original style tags if we need to
         if ($this->stripOriginalStyleTags) {
@@ -520,7 +520,7 @@ 
             $chunks = explode('{', $rule);
 
             // invalid rule?
-            if(!isset($chunks[1])) continue;
+            if ( ! isset($chunks[1])) continue;
 
             // set the selectors
             $selectors = trim($chunks[0]);
@@ -561,7 +561,7 @@ 
         }
 
         // sort based on specifity
-        if (!empty($this->cssRules)) {
+        if ( ! empty($this->cssRules)) {
             usort($this->cssRules, array(__CLASS__, 'sortOnSpecifity'));
         }
     }
@@ -586,15 +586,15 @@ 
             $chunks = (array) explode(':', $property, 2);
 
             // validate
-            if(!isset($chunks[1])) continue;
+            if ( ! isset($chunks[1])) continue;
 
             // cleanup
             $chunks[0] = trim($chunks[0]);
             $chunks[1] = trim($chunks[1]);
 
             // add to pairs array
-            if(!isset($pairs[$chunks[0]]) ||
-               !in_array($chunks[1], $pairs[$chunks[0]])) {
+            if ( ! isset($pairs[$chunks[0]]) ||
+               ! in_array($chunks[1], $pairs[$chunks[0]])) {
                 $pairs[$chunks[0]][] = $chunks[1];
             }
         }
@@ -708,13 +708,13 @@ 
     private static function sortOnSpecifity($e1, $e2)
     {
         // validate
-        if(!isset($e1['specifity']) || !isset($e2['specifity'])) return 0;
+        if ( ! isset($e1['specifity']) || ! isset($e2['specifity'])) return 0;
 
         // lower
-        if($e1['specifity'] < $e2['specifity']) return -1;
+        if ($e1['specifity'] < $e2['specifity']) return -1;
 
         // higher
-        if($e1['specifity'] > $e2['specifity']) return 1;
+        if ($e1['specifity'] > $e2['specifity']) return 1;
 
         // fallback
         return 0;

Braces +69 added lines, -23 removed lines

@@ -77,8 +77,12 @@ 
      */
     public function __construct($html = null, $css = null)
     {
-        if($html !== null) $this->setHTML($html);
-        if($css !== null) $this->setCSS($css);
+        if($html !== null) {
+        	$this->setHTML($html);
+        }
+        if($css !== null) {
+        	$this->setCSS($css);
+        }
     }
 
     /**
@@ -166,13 +170,19 @@ 
         // loop chunks
         foreach ($chunks as $chunk) {
             // an ID is important, so give it a high specifity
-            if(strstr($chunk, '#') !== false) $specifity += 100;
+            if(strstr($chunk, '#') !== false) {
+            	$specifity += 100;
+            }
 
             // classes are more important than a tag, but less important then an ID
-            elseif(strstr($chunk, '.')) $specifity += 10;
+            elseif(strstr($chunk, '.')) {
+            	$specifity += 10;
+            }
 
             // anything else isn't that important
-            else $specifity += 1;
+            else {
+            	$specifity += 1;
+            }
         }
 
         // return
@@ -211,7 +221,9 @@ 
         $outputXHTML = (bool) $outputXHTML;
 
         // validate
-        if($this->html == null) throw new Exception('No HTML provided.');
+        if($this->html == null) {
+        	throw new Exception('No HTML provided.');
+        }
 
         // should we use inline style-block
         if ($this->useInlineStylesBlock) {
@@ -224,7 +236,9 @@ 
             // any style-blocks found?
             if (!empty($matches[2])) {
                 // add
-                foreach($matches[2] as $match) $this->css .= trim($match) ."\n";
+                foreach($matches[2] as $match) {
+                	$this->css .= trim($match) ."\n";
+                }
             }
         }
 
@@ -251,13 +265,17 @@ 
                 $query = $this->buildXPathQuery($rule['selector']);
 
                 // validate query
-                if($query === false) continue;
+                if($query === false) {
+                	continue;
+                }
 
                 // search elements
                 $elements = $xPath->query($query);
 
                 // validate elements
-                if($elements === false) continue;
+                if($elements === false) {
+                	continue;
+                }
 
                 // loop found elements
                 foreach ($elements as $element) {
@@ -298,13 +316,17 @@ 
                         // loop properties
                         foreach ($definedProperties as $property) {
                             // validate property
-                            if($property == '') continue;
+                            if($property == '') {
+                            	continue;
+                            }
 
                             // split into chunks
                             $chunks = (array) explode(':', trim($property), 2);
 
                             // validate
-                            if(!isset($chunks[1])) continue;
+                            if(!isset($chunks[1])) {
+                            	continue;
+                            }
 
                             // loop chunks
                             $properties[$chunks[0]] = trim($chunks[1]);
@@ -342,7 +364,9 @@ 
             );
 
             // validate query
-            if($query === false) return;
+            if($query === false) {
+            	return;
+            }
 
             // search elements
             $elements = $xPath->query($query);
@@ -360,13 +384,17 @@ 
 
                     foreach ($originalStyles as $property) {
                         // validate property
-                        if($property == '') continue;
+                        if($property == '') {
+                        	continue;
+                        }
 
                         // split into chunks
                         $chunks = (array) explode(':', trim($property), 2);
 
                         // validate
-                        if(!isset($chunks[1])) continue;
+                        if(!isset($chunks[1])) {
+                        	continue;
+                        }
 
                         // loop chunks
                         $originalProperties[$chunks[0]] = trim($chunks[1]);
@@ -387,13 +415,17 @@ 
                         // loop properties
                         foreach ($definedProperties as $property) {
                             // validate property
-                            if($property == '') continue;
+                            if($property == '') {
+                            	continue;
+                            }
 
                             // split into chunks
                             $chunks = (array) explode(':', trim($property), 2);
 
                             // validate
-                            if(!isset($chunks[1])) continue;
+                            if(!isset($chunks[1])) {
+                            	continue;
+                            }
 
                             // loop chunks
                             $properties[$chunks[0]] = trim($chunks[1]);
@@ -419,9 +451,11 @@ 
                     $propertiesString = implode(' ', $propertyChunks);
 
                     // set attribute
-                    if($propertiesString != '') $element->setAttribute(
+                    if($propertiesString != '') {
+                    	$element->setAttribute(
                         'style', $propertiesString
                     );
+                    }
                 }
 
                 // remove placeholder
@@ -459,7 +493,9 @@ 
         }
 
         // cleanup the HTML if we need to
-        if($this->cleanup) $html = $this->cleanupHTML($html);
+        if($this->cleanup) {
+        	$html = $this->cleanupHTML($html);
+        }
 
         // strip original style tags if we need to
         if ($this->stripOriginalStyleTags) {
@@ -520,7 +556,9 @@ 
             $chunks = explode('{', $rule);
 
             // invalid rule?
-            if(!isset($chunks[1])) continue;
+            if(!isset($chunks[1])) {
+            	continue;
+            }
 
             // set the selectors
             $selectors = trim($chunks[0]);
@@ -586,7 +624,9 @@ 
             $chunks = (array) explode(':', $property, 2);
 
             // validate
-            if(!isset($chunks[1])) continue;
+            if(!isset($chunks[1])) {
+            	continue;
+            }
 
             // cleanup
             $chunks[0] = trim($chunks[0]);
@@ -708,13 +748,19 @@ 
     private static function sortOnSpecifity($e1, $e2)
     {
         // validate
-        if(!isset($e1['specifity']) || !isset($e2['specifity'])) return 0;
+        if(!isset($e1['specifity']) || !isset($e2['specifity'])) {
+        	return 0;
+        }
 
         // lower
-        if($e1['specifity'] < $e2['specifity']) return -1;
+        if($e1['specifity'] < $e2['specifity']) {
+        	return -1;
+        }
 
         // higher
-        if($e1['specifity'] > $e2['specifity']) return 1;
+        if($e1['specifity'] > $e2['specifity']) {
+        	return 1;
+        }
 
         // fallback
         return 0;

core/libraries/payment_methods/EE_PMT_Base.lib.php

Spacing +103 added lines, -103 removed lines

@@ -14,7 +14,7 @@ 
  * @since 				$VID:$
  *
  */
-abstract class EE_PMT_Base{
+abstract class EE_PMT_Base {
 
 	const onsite = 'on-site';
 	const offsite = 'off-site';
@@ -90,27 +90,27 @@ 
 	 * @return EE_PMT_Base
 	 */
 	function __construct($pm_instance = NULL) {
-		if ( $pm_instance instanceof EE_Payment_Method ){
+		if ($pm_instance instanceof EE_Payment_Method) {
 			$this->set_instance($pm_instance);
 		}
 		$this->_set_file_folder();
 		$this->_set_file_url();
-		if($this->_gateway){
-			$this->_gateway->set_payment_model( EEM_Payment::instance() );
-			$this->_gateway->set_payment_log( EEM_Change_Log::instance() );
-			EE_Registry::instance()->load_helper( 'Template' );
-			$this->_gateway->set_template_helper( new EEH_Template() );
-			EE_Registry::instance()->load_helper( 'Line_Item' );
-			$this->_gateway->set_line_item_helper( new EEH_Line_Item() );
-			EE_Registry::instance()->load_helper( 'Money' );
-			$this->_gateway->set_money_helper( new EEH_Money() );
+		if ($this->_gateway) {
+			$this->_gateway->set_payment_model(EEM_Payment::instance());
+			$this->_gateway->set_payment_log(EEM_Change_Log::instance());
+			EE_Registry::instance()->load_helper('Template');
+			$this->_gateway->set_template_helper(new EEH_Template());
+			EE_Registry::instance()->load_helper('Line_Item');
+			$this->_gateway->set_line_item_helper(new EEH_Line_Item());
+			EE_Registry::instance()->load_helper('Money');
+			$this->_gateway->set_money_helper(new EEH_Money());
 		}
-		if( ! $this->_pretty_name){
+		if ( ! $this->_pretty_name) {
 			throw new EE_Error(sprintf(__("You must set the pretty name for the Payment Method Type in the constructor (_pretty_name), and please make it internationalized", "event_espresso")));
 		}
 		//if the child didn't specify a default button, use the credit card one
-		if( $this->_default_button_url === NULL){
-			$this->_default_button_url = EE_PLUGIN_DIR_URL . 'payment_methods' . DS . 'pay-by-credit-card.png';
+		if ($this->_default_button_url === NULL) {
+			$this->_default_button_url = EE_PLUGIN_DIR_URL.'payment_methods'.DS.'pay-by-credit-card.png';
 		}
 	}
 
@@ -119,10 +119,10 @@ 
 	/**
 	 * sets the file_folder property
 	 */
-	protected function _set_file_folder(){
+	protected function _set_file_folder() {
 		$reflector = new ReflectionClass(get_class($this));
 		$fn = $reflector->getFileName();
-		$this->_file_folder =  dirname($fn).DS;
+		$this->_file_folder = dirname($fn).DS;
 	}
 
 
@@ -130,10 +130,10 @@ 
 	/**
 	 * sets the file URL with a trailing slash for this PMT
 	 */
-	protected function _set_file_url(){
-		$plugins_dir_fixed = str_replace('\\',DS,WP_PLUGIN_DIR);
-		$file_folder_fixed = str_replace('\\',DS,$this->file_folder());
-		$file_path = str_replace($plugins_dir_fixed,WP_PLUGIN_URL,$file_folder_fixed);
+	protected function _set_file_url() {
+		$plugins_dir_fixed = str_replace('\\', DS, WP_PLUGIN_DIR);
+		$file_folder_fixed = str_replace('\\', DS, $this->file_folder());
+		$file_path = str_replace($plugins_dir_fixed, WP_PLUGIN_URL, $file_folder_fixed);
 		$this->_file_url = $file_path;
 	}
 
@@ -141,7 +141,7 @@ 
 	 * Gets the default description on all payment methods of this type
 	 * @return string
 	 */
-	public function default_description(){
+	public function default_description() {
 		return $this->_default_description;
 	}
 
@@ -151,7 +151,7 @@ 
 	 * Returns the folder containing the PMT child class, with a trailing slash
 	 * @return string
 	 */
-	public function file_folder(){
+	public function file_folder() {
 		return $this->_file_folder;
 	}
 
@@ -160,7 +160,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function file_url(){
+	public function file_url() {
 		return $this->_file_url;
 	}
 
@@ -171,14 +171,14 @@ 
 	 * Its important teh payment method instance is set before
 	 * @param EE_Payment_Method $payment_method_instance
 	 */
-	function set_instance($payment_method_instance){
+	function set_instance($payment_method_instance) {
 		$this->_pm_instance = $payment_method_instance;
 		//if they have already requested the settings form, make sure its
 		//data matches this model object
-		if($this->_settings_form){
+		if ($this->_settings_form) {
 			$this->settings_form()->populate_model_obj($payment_method_instance);
 		}
-		if($this->_gateway && $this->_gateway instanceof EE_Gateway){
+		if ($this->_gateway && $this->_gateway instanceof EE_Gateway) {
 			$this->_gateway->set_settings($payment_method_instance->settings_array());
 		}
 	}
@@ -189,14 +189,14 @@ 
 	 * Gets teh form for displaying to admins where they setup the payment method
 	 * @return EE_Payment_Method_Form
 	 */
-	function settings_form(){
-		if( ! $this->_settings_form){
+	function settings_form() {
+		if ( ! $this->_settings_form) {
 			$this->_settings_form = $this->generate_new_settings_form();
-			$this->_settings_form->set_payment_method_type( $this );
-			$this->_settings_form->_construct_finalize(NULL, NULL );
+			$this->_settings_form->set_payment_method_type($this);
+			$this->_settings_form->_construct_finalize(NULL, NULL);
 			//if we have already assigned a model object to this pmt, make
 			//sure its reflected in teh form we just generated
-			if($this->_pm_instance){
+			if ($this->_pm_instance) {
 				$this->_settings_form->populate_model_obj($this->_pm_instance);
 			}
 		}
@@ -222,7 +222,7 @@ 
 	 * this payment method type's settings form later in the request
 	 * @param EE_Payment_Method_Form $form
 	 */
-	public function set_settings_form($form){
+	public function set_settings_form($form) {
 		$this->_settings_form = $form;
 	}
 
@@ -235,18 +235,18 @@ 
 	 * @param \EE_Transaction $transaction
 	 * @return \EE_Billing_Attendee_Info_Form|\EE_Billing_Info_Form
 	 */
-	public function billing_form( EE_Transaction $transaction = NULL ){
+	public function billing_form(EE_Transaction $transaction = NULL) {
 		// has billing form already been regenerated ? or overwrite cache?
-		if( ! $this->_billing_form || ! $this->_cache_billing_form ){
-			$this->_billing_form = $this->generate_new_billing_form( $transaction );
+		if ( ! $this->_billing_form || ! $this->_cache_billing_form) {
+			$this->_billing_form = $this->generate_new_billing_form($transaction);
 		}
 		//if we know who the attendee is, and this is a billing form
 		//that uses attendee info, populate it
-		if( $this->_billing_form instanceof EE_Billing_Attendee_Info_Form &&
+		if ($this->_billing_form instanceof EE_Billing_Attendee_Info_Form &&
 				$transaction instanceof EE_Transaction &&
 				$transaction->primary_registration() instanceof EE_Registration &&
-				$transaction->primary_registration()->attendee() instanceof EE_Attendee ){
-			$this->_billing_form->populate_from_attendee( $transaction->primary_registration()->attendee() );
+				$transaction->primary_registration()->attendee() instanceof EE_Attendee) {
+			$this->_billing_form->populate_from_attendee($transaction->primary_registration()->attendee());
 		}
 		return $this->_billing_form;
 	}
@@ -257,7 +257,7 @@ 
 	 * @param \EE_Transaction $transaction
 	 * @return \EE_Billing_Info_Form
 	 */
-	abstract function generate_new_billing_form( EE_Transaction $transaction = NULL );
+	abstract function generate_new_billing_form(EE_Transaction $transaction = NULL);
 
 
 
@@ -268,7 +268,7 @@ 
 	 * @param \EE_Billing_Info_Form $billing_form
 	 * @return \EE_Billing_Info_Form
 	 */
-	public function apply_billing_form_debug_settings( EE_Billing_Info_Form $billing_form ) {
+	public function apply_billing_form_debug_settings(EE_Billing_Info_Form $billing_form) {
 		return $billing_form;
 	}
 
@@ -279,7 +279,7 @@ 
 	 * if you have form
 	 * @param EE_Payment_Method $form
 	 */
-	public function set_billing_form($form){
+	public function set_billing_form($form) {
 		$this->_billing_form = $form;
 	}
 
@@ -289,7 +289,7 @@ 
 	 * Returns whether or not this payment method requires HTTPS to be used
 	 * @return boolean
 	 */
-	function requires_https(){
+	function requires_https() {
 		return $this->_requires_https;
 	}
 
@@ -307,9 +307,9 @@ 
 	 * @return \EE_Base_Class|\EE_Payment|null
 	 * @throws EE_Error
 	 */
-	function process_payment( EE_Transaction $transaction, $amount = NULL, $billing_info = NULL, $return_url = NULL,$fail_url = NULL, $method = 'CART', $by_admin = FALSE ){
+	function process_payment(EE_Transaction $transaction, $amount = NULL, $billing_info = NULL, $return_url = NULL, $fail_url = NULL, $method = 'CART', $by_admin = FALSE) {
 		// @todo: add surcharge for the payment method, if any
-		if ( $this->_gateway ) {
+		if ($this->_gateway) {
 			//there is a gateway, so we're going to make a payment object
 			//but wait! do they already have a payment in progress that we thought was failed?
 			$duplicate_properties = array(
@@ -320,15 +320,15 @@ 
 				'PMD_ID' => $this->_pm_instance->ID(),
 				'PAY_gateway_response'=>NULL,
 			);
-			$payment = EEM_Payment::instance()->get_one( array( $duplicate_properties ));
+			$payment = EEM_Payment::instance()->get_one(array($duplicate_properties));
 			//if we didn't already have a payment in progress for the same thing,
 			//then we actually want to make a new payment
-			if ( ! $payment instanceof EE_Payment ){
+			if ( ! $payment instanceof EE_Payment) {
 				$payment = EE_Payment::new_instance(
 					array_merge(
 						$duplicate_properties,
 						array(
-							'PAY_timestamp' => current_time( 'mysql' ),
+							'PAY_timestamp' => current_time('mysql'),
 							'PAY_txn_id_chq_nmbr' => NULL,
 							'PAY_po_number' => NULL,
 							'PAY_extra_accntng' => NULL,
@@ -339,10 +339,10 @@ 
 			}
 			//make sure the payment has been saved to show we started it, and so it has an ID should the gateway try to log it
 			$payment->save();
-			$billing_values = $this->_get_billing_values_from_form( $billing_info );
+			$billing_values = $this->_get_billing_values_from_form($billing_info);
 
 			//  Offsite Gateway
-			if( $this->_gateway instanceof EE_Offsite_Gateway ){
+			if ($this->_gateway instanceof EE_Offsite_Gateway) {
 
 				$payment = $this->_gateway->set_redirection_info(
 					$payment,
@@ -358,17 +358,17 @@ 
 				);
 
 			//  Onsite Gateway
-			} elseif ( $this->_gateway instanceof EE_Onsite_Gateway ) {
+			} elseif ($this->_gateway instanceof EE_Onsite_Gateway) {
 
-				$payment = $this->_gateway->do_direct_payment($payment,$billing_values);
+				$payment = $this->_gateway->do_direct_payment($payment, $billing_values);
 				$payment->save();
 
 			} else {
 				throw new EE_Error(
 					sprintf(
-						__('Gateway for payment method type "%s" is "%s", not a subclass of either EE_Offsite_Gateway or EE_Onsite_Gateway, or NULL (to indicate NO gateway)', 'event_espresso' ),
+						__('Gateway for payment method type "%s" is "%s", not a subclass of either EE_Offsite_Gateway or EE_Onsite_Gateway, or NULL (to indicate NO gateway)', 'event_espresso'),
 						get_class($this),
-						gettype( $this->_gateway )
+						gettype($this->_gateway)
 					)
 				);
 			}
@@ -380,8 +380,8 @@ 
 		}
 
 		// if there is billing info, clean it and save it now
-		if( $billing_info instanceof EE_Billing_Attendee_Info_Form ){
-			$this->_save_billing_info_to_attendee( $billing_info, $transaction );
+		if ($billing_info instanceof EE_Billing_Attendee_Info_Form) {
+			$this->_save_billing_info_to_attendee($billing_info, $transaction);
 		}
 
 		return $payment;
@@ -394,10 +394,10 @@ 
 	 * @param EE_Billing_Info_Form $billing_form
 	 * @return array
 	 */
-	protected function _get_billing_values_from_form( $billing_form ){
-		if($billing_form instanceof EE_Form_Section_Proper ){
+	protected function _get_billing_values_from_form($billing_form) {
+		if ($billing_form instanceof EE_Form_Section_Proper) {
 			return $billing_form->input_pretty_values();
-		}else{
+		} else {
 			return NULL;
 		}
 	}
@@ -411,13 +411,13 @@ 
 	 * @return EE_Payment
 	 * @throws EE_Error
 	 */
-	public function handle_ipn($req_data,$transaction){
+	public function handle_ipn($req_data, $transaction) {
 		$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
-		if( ! $this->_gateway instanceof EE_Offsite_Gateway){
-			throw new EE_Error(sprintf(__("Could not handle IPN because '%s' is not an offsite gateway", "event_espresso"), print_r( $this->_gateway, TRUE )));
+		if ( ! $this->_gateway instanceof EE_Offsite_Gateway) {
+			throw new EE_Error(sprintf(__("Could not handle IPN because '%s' is not an offsite gateway", "event_espresso"), print_r($this->_gateway, TRUE)));
 
 		}
-		$payment = $this->_gateway->handle_payment_update( $req_data, $transaction );
+		$payment = $this->_gateway->handle_payment_update($req_data, $transaction);
 		return $payment;
 	}
 
@@ -430,22 +430,22 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return boolean success
 	 */
-	protected function _save_billing_info_to_attendee($billing_form, $transaction){
-		if( ! $transaction || ! $transaction instanceof EE_Transaction){
+	protected function _save_billing_info_to_attendee($billing_form, $transaction) {
+		if ( ! $transaction || ! $transaction instanceof EE_Transaction) {
 			EE_Error::add_error(__("Cannot save billing info because no transaction was specified", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		$primary_reg = $transaction->primary_registration();
-		if( ! $primary_reg ){
+		if ( ! $primary_reg) {
 			EE_Error::add_error(__("Cannot save billing info because the transaction has no primary registration", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		$attendee = $primary_reg->attendee();
-		if( ! $attendee ){
+		if ( ! $attendee) {
 			EE_Error::add_error(__("Cannot save billing info because the transaction's primary registration has no attendee!", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		return $attendee->save_and_clean_billing_info_for_payment_method($billing_form, $transaction->payment_method() );
+		return $attendee->save_and_clean_billing_info_for_payment_method($billing_form, $transaction->payment_method());
 
 	}
 
@@ -458,7 +458,7 @@ 
 	 * @param array $req_data
 	 * @return EE_Payment
 	 */
-	protected function find_payment_for_ipn( EE_Transaction $transaction, $req_data = array() ){
+	protected function find_payment_for_ipn(EE_Transaction $transaction, $req_data = array()) {
 		return $transaction->last_payment();
 	}
 
@@ -475,8 +475,8 @@ 
 	 * and identifies the IPN as being for this payment method (not just fo ra payment method of this type)
 	 * @throws EE_Error
 	 */
-	public function handle_unclaimed_ipn( $req_data = array() ){
-		throw new EE_Error(sprintf(__("Payment Method '%s' cannot handle unclaimed IPNs", "event_espresso"), get_class($this) ));
+	public function handle_unclaimed_ipn($req_data = array()) {
+		throw new EE_Error(sprintf(__("Payment Method '%s' cannot handle unclaimed IPNs", "event_espresso"), get_class($this)));
 	}
 
 
@@ -492,7 +492,7 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return EE_Payment
 	 */
-	public function finalize_payment_for($transaction){
+	public function finalize_payment_for($transaction) {
 		return $transaction->last_payment();
 	}
 
@@ -502,10 +502,10 @@ 
 	 * Whether or not this payment method's gateway supports sending refund requests
 	 * @return boolean
 	 */
-	public function supports_sending_refunds(){
-		if($this->_gateway && $this->_gateway instanceof EE_Gateway){
+	public function supports_sending_refunds() {
+		if ($this->_gateway && $this->_gateway instanceof EE_Gateway) {
 			return $this->_gateway->supports_sending_refunds();
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -519,11 +519,11 @@ 
 	 * @throws EE_Error
 	 * @return EE_Payment
 	 */
-	public function process_refund($payment, $refund_info = array()){
-		if($this->_gateway && $this->_gateway instanceof EE_Gateway){
-			return $this->_gateway->do_direct_refund( $payment, $refund_info );
-		}else{
-			throw new EE_Error(sprintf(__("Payment Method Type '%s' does not support sending refund requests", "event_espresso"),get_class($this)));
+	public function process_refund($payment, $refund_info = array()) {
+		if ($this->_gateway && $this->_gateway instanceof EE_Gateway) {
+			return $this->_gateway->do_direct_refund($payment, $refund_info);
+		} else {
+			throw new EE_Error(sprintf(__("Payment Method Type '%s' does not support sending refund requests", "event_espresso"), get_class($this)));
 		}
 	}
 
@@ -535,15 +535,15 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	public function payment_occurs(){
-		if( ! $this->_gateway){
+	public function payment_occurs() {
+		if ( ! $this->_gateway) {
 			return EE_PMT_Base::offline;
-		}elseif($this->_gateway instanceof EE_Onsite_Gateway){
+		}elseif ($this->_gateway instanceof EE_Onsite_Gateway) {
 			return EE_PMT_Base::onsite;
-		}elseif($this->_gateway instanceof EE_Offsite_Gateway){
+		}elseif ($this->_gateway instanceof EE_Offsite_Gateway) {
 			return EE_PMT_Base::offsite;
-		}else{
-			throw new EE_Error(sprintf(__("Payment method type '%s's gateway isn't an instance of EE_Onsite_Gateway, EE_Offsite_Gateway, or null. It must be one of those", "event_espresso"),get_class($this)));
+		} else {
+			throw new EE_Error(sprintf(__("Payment method type '%s's gateway isn't an instance of EE_Onsite_Gateway, EE_Offsite_Gateway, or null. It must be one of those", "event_espresso"), get_class($this)));
 		}
 	}
 
@@ -556,9 +556,9 @@ 
 	 * @param EE_Payment $payment
 	 * @return string
 	 */
-	public function payment_overview_content(EE_Payment $payment){
+	public function payment_overview_content(EE_Payment $payment) {
 		EE_Registry::instance()->load_helper('Template');
-		return EEH_Template::display_template(EE_LIBRARIES.'payment_methods'.DS.'templates'.DS.'payment_details_content.template.php', array('payment_method'=>$this->_pm_instance,'payment'=>$payment) , true);
+		return EEH_Template::display_template(EE_LIBRARIES.'payment_methods'.DS.'templates'.DS.'payment_details_content.template.php', array('payment_method'=>$this->_pm_instance, 'payment'=>$payment), true);
 	}
 
 
@@ -566,7 +566,7 @@ 
 	/**
 	 * @return array exactly like EE_Admin_Page _page_config's 'help_tabs' attribute. @see EE_Admin_Page::_set_page_config()
 	 */
-	public function help_tabs_config(){
+	public function help_tabs_config() {
 		return array();
 	}
 
@@ -577,9 +577,9 @@ 
 	 * the payment method's table's PMT_type column)
 	 * @return string
 	 */
-	public function system_name(){
+	public function system_name() {
 		$classname = get_class($this);
-		return str_replace("EE_PMT_",'',$classname);
+		return str_replace("EE_PMT_", '', $classname);
 	}
 
 
@@ -588,7 +588,7 @@ 
 	 * A pretty i18n version of the PMT name
 	 * @return string
 	 */
-	public function pretty_name(){
+	public function pretty_name() {
 		return $this->_pretty_name;
 	}
 
@@ -598,7 +598,7 @@ 
 	 * Gets the default absolute URL to the payment method type's button
 	 * @return string
 	 */
-	public function default_button_url(){
+	public function default_button_url() {
 		return $this->_default_button_url;
 	}
 
@@ -608,7 +608,7 @@ 
 	 * Gets the gateway used by this payment method (if any)
 	 * @return EE_Gateway
 	 */
-	public function get_gateway(){
+	public function get_gateway() {
 		return $this->_gateway;
 	}
 
@@ -617,9 +617,9 @@ 
 	/**
 	 * @return string html for the link to a help tab
 	 */
-	public function get_help_tab_link(){
-		EE_Registry::instance()->load_helper( 'Template' );
-		return EEH_Template::get_help_tab_link( $this->get_help_tab_name() );
+	public function get_help_tab_link() {
+		EE_Registry::instance()->load_helper('Template');
+		return EEH_Template::get_help_tab_link($this->get_help_tab_name());
 	}
 
 
@@ -628,8 +628,8 @@ 
 	 * Returns the name of the help tab for this PMT
 	 * @return string
 	 */
-	public function get_help_tab_name(){
-		return 'ee_' . strtolower( $this->system_name() ) . '_help_tab';
+	public function get_help_tab_name() {
+		return 'ee_'.strtolower($this->system_name()).'_help_tab';
 	}
 
 	/**
@@ -637,8 +637,8 @@ 
 	 * this PMT by an admin
 	 * @return string
 	 */
-	public function cap_name(){
-		return 'ee_payment_method_' . strtolower( $this->system_name() );
+	public function cap_name() {
+		return 'ee_payment_method_'.strtolower($this->system_name());
 	}
 
 	/**
@@ -650,9 +650,9 @@ 
 	 * @param EE_Payment $payment
 	 * @return void
 	 */
-	public function update_txn_based_on_payment( $payment ){
-		if( $this->_gateway instanceof EE_Gateway ){
-			$this->_gateway->update_txn_based_on_payment( $payment );
+	public function update_txn_based_on_payment($payment) {
+		if ($this->_gateway instanceof EE_Gateway) {
+			$this->_gateway->update_txn_based_on_payment($payment);
 		}
 	}
 

Braces +6 added lines, -6 removed lines

@@ -397,7 +397,7 @@ 
 	protected function _get_billing_values_from_form( $billing_form ){
 		if($billing_form instanceof EE_Form_Section_Proper ){
 			return $billing_form->input_pretty_values();
-		}else{
+		} else{
 			return NULL;
 		}
 	}
@@ -505,7 +505,7 @@ 
 	public function supports_sending_refunds(){
 		if($this->_gateway && $this->_gateway instanceof EE_Gateway){
 			return $this->_gateway->supports_sending_refunds();
-		}else{
+		} else{
 			return false;
 		}
 	}
@@ -522,7 +522,7 @@ 
 	public function process_refund($payment, $refund_info = array()){
 		if($this->_gateway && $this->_gateway instanceof EE_Gateway){
 			return $this->_gateway->do_direct_refund( $payment, $refund_info );
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__("Payment Method Type '%s' does not support sending refund requests", "event_espresso"),get_class($this)));
 		}
 	}
@@ -538,11 +538,11 @@ 
 	public function payment_occurs(){
 		if( ! $this->_gateway){
 			return EE_PMT_Base::offline;
-		}elseif($this->_gateway instanceof EE_Onsite_Gateway){
+		} elseif($this->_gateway instanceof EE_Onsite_Gateway){
 			return EE_PMT_Base::onsite;
-		}elseif($this->_gateway instanceof EE_Offsite_Gateway){
+		} elseif($this->_gateway instanceof EE_Offsite_Gateway){
 			return EE_PMT_Base::offsite;
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__("Payment method type '%s's gateway isn't an instance of EE_Onsite_Gateway, EE_Offsite_Gateway, or null. It must be one of those", "event_espresso"),get_class($this)));
 		}
 	}

core/libraries/shortcodes/EE_Primary_Registration_Details_Shortcodes.lib.php

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -45,7 +45,7 @@ 
 			'[PRIMARY_REGISTRANT_ADDRESS2]' => __('Whatever was in the address 2 field for the primary registrant for the transaction.', 'event_espresso'),
 			'[PRIMARY_REGISTRANT_CITY]' => __('The city for the primary registrant for the transaction.', 'event_espresso'),
 			'[PRIMARY_REGISTRANT_ZIP_PC]' => __('The ZIP (or Postal) Code for the primary registrant for the transaction.', 'event_espresso'),
-			'[PRIMARY_REGISTRANT_ADDRESS_STATE]' => __('The state/province for the primary registrant for the transaction.', 'event_espresso' ),
+			'[PRIMARY_REGISTRANT_ADDRESS_STATE]' => __('The state/province for the primary registrant for the transaction.', 'event_espresso'),
 			'[PRIMARY_REGISTRANT_COUNTRY]' => __('The country for the primary registrant for the transaction.', 'event_espresso'),
 			'[PRIMARY_REGISTRANT_REGISTRATION_DATE]' => __('The date the registration occured for the primary registration.', 'event_espresso'),
 			'[PRIMARY_REGISTRANT_FRONTEND_EDIT_REG_LINK]' => __('Generates a link for the given registration to edit this registration details on the frontend.', 'event_espresso')
@@ -54,21 +54,21 @@ 
 
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 		//make sure we end up with a copy of the EE_Messages_Addressee object
 		$primary_registration = $this->_data instanceof EE_Messages_Addressee ? $this->_data : NULL;
-		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && is_array($this->_data) && isset( $this->_data['data'] ) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $primary_registration;
-		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && !empty( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $primary_registration;
+		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && is_array($this->_data) && isset($this->_data['data']) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $primary_registration;
+		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && ! empty($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $primary_registration;
 
-		if ( ! $primary_registration instanceof EE_Messages_Addressee )
+		if ( ! $primary_registration instanceof EE_Messages_Addressee)
 			return '';
 
 		$attendee = $primary_registration->primary_att_obj;
 
-		if ( ! $attendee instanceof EE_Attendee )
+		if ( ! $attendee instanceof EE_Attendee)
 			return '';
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[PRIMARY_REGISTRANT_FNAME]' :
 				return $attendee->fname();
 				break;
@@ -82,7 +82,7 @@ 
 				break;
 
 			case '[PRIMARY_REGISTRANT_REGISTRATION_CODE]' :
-				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration )
+				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration)
 					return '';
 				return $primary_registration->primary_reg_obj->reg_code();
 				break;
@@ -118,13 +118,13 @@ 
 				break;
 
 			case '[PRIMARY_REGISTRANT_REGISTRATION_DATE]' :
-				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration )
+				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration)
 					return '';
-				return date_i18n( get_option( 'date_format'), strtotime( $primary_registration->primary_reg_obj->date() ) );
+				return date_i18n(get_option('date_format'), strtotime($primary_registration->primary_reg_obj->date()));
 				break;
 
 			case '[PRIMARY_REGISTRANT_FRONTEND_EDIT_REG_LINK]' :
-				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration )
+				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration)
 					return '';
 				return $primary_registration->primary_reg_obj->edit_attendee_information_url();
 				break;

Braces +17 added lines, -11 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -60,13 +61,15 @@ 
 		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && is_array($this->_data) && isset( $this->_data['data'] ) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $primary_registration;
 		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && !empty( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $primary_registration;
 
-		if ( ! $primary_registration instanceof EE_Messages_Addressee )
-			return '';
+		if ( ! $primary_registration instanceof EE_Messages_Addressee ) {
+					return '';
+		}
 
 		$attendee = $primary_registration->primary_att_obj;
 
-		if ( ! $attendee instanceof EE_Attendee )
-			return '';
+		if ( ! $attendee instanceof EE_Attendee ) {
+					return '';
+		}
 
 		switch ( $shortcode ) {
 			case '[PRIMARY_REGISTRANT_FNAME]' :
@@ -82,8 +85,9 @@ 
 				break;
 
 			case '[PRIMARY_REGISTRANT_REGISTRATION_CODE]' :
-				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration )
-					return '';
+				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration ) {
+									return '';
+				}
 				return $primary_registration->primary_reg_obj->reg_code();
 				break;
 
@@ -118,14 +122,16 @@ 
 				break;
 
 			case '[PRIMARY_REGISTRANT_REGISTRATION_DATE]' :
-				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration )
-					return '';
+				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration ) {
+									return '';
+				}
 				return date_i18n( get_option( 'date_format'), strtotime( $primary_registration->primary_reg_obj->date() ) );
 				break;
 
 			case '[PRIMARY_REGISTRANT_FRONTEND_EDIT_REG_LINK]' :
-				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration )
-					return '';
+				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration ) {
+									return '';
+				}
 				return $primary_registration->primary_reg_obj->edit_attendee_information_url();
 				break;