eventespresso / event-espresso-core

caffeinated/core/libraries/messages/message_type/newsletter/EE_Newsletter_message_type.class.php

Spacing +28 added lines, -28 removed lines

@@ -22,10 +22,10 @@ 
 
 	public function __construct() {
 		$this->name = 'newsletter';
-		$this->description = __( 'Batch message type messages are triggered manually by the admin for sending notifications to a selected group of recipients. This should only be used for more general notification type messages that contain information specific for the recipients. For "newsletter" type messages we recommend using an email list service like Mailchimp, because sending non-related mailouts to contacts increases the risk of your site domain getting added to spam lists, which will prevent messages getting to users.', 'event_espresso' );
+		$this->description = __('Batch message type messages are triggered manually by the admin for sending notifications to a selected group of recipients. This should only be used for more general notification type messages that contain information specific for the recipients. For "newsletter" type messages we recommend using an email list service like Mailchimp, because sending non-related mailouts to contacts increases the risk of your site domain getting added to spam lists, which will prevent messages getting to users.', 'event_espresso');
 		$this->label = array(
-			'singular' => __( 'batch', 'event_espresso' ),
-			'plural' => __( 'batches', 'event_espresso' )
+			'singular' => __('batch', 'event_espresso'),
+			'plural' => __('batches', 'event_espresso')
 			);
 		$this->_master_templates = array(
 			'email' => 'registration',
@@ -49,9 +49,9 @@ 
 
 
 
-	protected function _get_data_for_context( $context, EE_Registration $registration, $id ) {
+	protected function _get_data_for_context($context, EE_Registration $registration, $id) {
 		//newsletter message type data handler is 'Registrations' and it expects an array of EE_Registration objects.
-		return array( $registration );
+		return array($registration);
 	}
 
 
@@ -64,15 +64,15 @@ 
 
 	protected function _set_contexts() {
 		$this->_context_label = array(
-			'label' => __( 'recipient', 'event_espresso' ),
-			'plural' => __( 'recipients', 'event_espresso' ),
-			'description' => __( 'Recipient\'s are who will receive the message.', 'event_espresso' )
+			'label' => __('recipient', 'event_espresso'),
+			'plural' => __('recipients', 'event_espresso'),
+			'description' => __('Recipient\'s are who will receive the message.', 'event_espresso')
 			);
 
 		$this->_contexts = array(
 			'attendee' => array(
-				'label' => __( 'Registrant', 'event_espresso' ),
-				'description' => __( 'This template goes to selected registrants.', 'event_espresso' )
+				'label' => __('Registrant', 'event_espresso'),
+				'description' => __('This template goes to selected registrants.', 'event_espresso')
 				)
 			);
 	}
@@ -98,13 +98,13 @@ 
 			'newsletter',
 			);
 
-		foreach ( $this->_valid_shortcodes as $context => $shortcodes ) {
-			foreach ( $shortcodes as $key => $shortcode ) {
-				if ( ! in_array( $shortcode, $included_shortcodes ) ) {
-					unset( $this->_valid_shortcodes[ $context ][ $key ] );
+		foreach ($this->_valid_shortcodes as $context => $shortcodes) {
+			foreach ($shortcodes as $key => $shortcode) {
+				if ( ! in_array($shortcode, $included_shortcodes)) {
+					unset($this->_valid_shortcodes[$context][$key]);
 				}
 			}
-			$this->_valid_shortcodes[ $context ][] = 'newsletter';
+			$this->_valid_shortcodes[$context][] = 'newsletter';
 		}
 
 	}
@@ -118,44 +118,44 @@ 
 		$addressee = array();
 
 		//looping through registrations
-		foreach ( $this->_data->registrations as $reg_id => $details ) {
+		foreach ($this->_data->registrations as $reg_id => $details) {
 			//set $attendee array to blank on each loop
 			$aee = array();
 
 			//need to get the attendee from this registration.
-			$attendee = isset( $details['att_obj'] ) && $details['att_obj'] instanceof EE_Attendee
+			$attendee = isset($details['att_obj']) && $details['att_obj'] instanceof EE_Attendee
 				? $details['att_obj']
 				: null;
 
-			if ( ! $attendee instanceof EE_Attendee ) {
+			if ( ! $attendee instanceof EE_Attendee) {
 				continue;
 			}
 
 			//set $aee from attendee object
 			$aee['att_obj'] = $attendee;
-			$aee['reg_objs'] = isset( $this->_data->attendees[ $attendee->ID() ]['reg_objs'] )
-				? $this->_data->attendees[ $attendee->ID() ]['reg_objs']
+			$aee['reg_objs'] = isset($this->_data->attendees[$attendee->ID()]['reg_objs'])
+				? $this->_data->attendees[$attendee->ID()]['reg_objs']
 				: array();
 			$aee['attendee_email'] = $attendee->email();
-			$aee['tkt_objs'] = isset( $this->_data->attendees[ $attendee->ID() ]['tkt_objs'] )
-				? $this->_data->attendees[ $attendee->ID() ]['tkt_objs']
+			$aee['tkt_objs'] = isset($this->_data->attendees[$attendee->ID()]['tkt_objs'])
+				? $this->_data->attendees[$attendee->ID()]['tkt_objs']
 				: array();
 
-			if ( isset( $this->_data->attendees[ $attendee->ID() ]['evt_objs'] ) ) {
-				$aee['evt_objs'] = $this->_data->attendees[ $attendee->ID() ]['evt_objs'];
-				$aee['events'] = $this->_data->attendees[ $attendee->ID() ]['evt_objs'];
+			if (isset($this->_data->attendees[$attendee->ID()]['evt_objs'])) {
+				$aee['evt_objs'] = $this->_data->attendees[$attendee->ID()]['evt_objs'];
+				$aee['events'] = $this->_data->attendees[$attendee->ID()]['evt_objs'];
 			} else {
 				$aee['evt_objs'] = $aee['events'] = array();
 			}
 
-			$aee['reg_obj'] = isset( $details['reg_obj'] )
+			$aee['reg_obj'] = isset($details['reg_obj'])
 				? $details['reg_obj']
 				: null;
 			$aee['attendees'] = $this->_data->attendees;
 
 			//merge in the primary attendee data
-			$aee = array_merge( $this->_default_addressee_data, $aee );
-			$addressee[] = new EE_Messages_Addressee( $aee );
+			$aee = array_merge($this->_default_addressee_data, $aee);
+			$addressee[] = new EE_Messages_Addressee($aee);
 		}
 		return $addressee;
 	}

caffeinated/core/libraries/shortcodes/EE_Newsletter_Shortcodes.lib.php

Indentation +65 added lines, -65 removed lines

@@ -20,81 +20,81 @@
  */
 class EE_Newsletter_Shortcodes extends EE_Shortcodes {
 
-    protected function _init_props() {
-        $this->label = __("Batch Messages Shortcodes", 'event_espresso');
-        $this->description = __('All shortcodes used for the batch message type', 'event_espresso');
-        $this->_shortcodes = array(
-            '[NEWSLETTER_CONTENT]' => __('This will parse to whatever is found in the related [newsletter_content] field.  Note that when triggering a batch message, whatever is added for the custom message will be inserted where this shortcode is placed.', 'event_espresso')
-            );
-    }
+	protected function _init_props() {
+		$this->label = __("Batch Messages Shortcodes", 'event_espresso');
+		$this->description = __('All shortcodes used for the batch message type', 'event_espresso');
+		$this->_shortcodes = array(
+			'[NEWSLETTER_CONTENT]' => __('This will parse to whatever is found in the related [newsletter_content] field.  Note that when triggering a batch message, whatever is added for the custom message will be inserted where this shortcode is placed.', 'event_espresso')
+			);
+	}
 
 
 
-    protected function _parser( $shortcode ) {
-        if ( $shortcode == '[NEWSLETTER_CONTENT]' ) {
-            $this->_validate_list_requirements();
-            $valid_shortcodes = array('recipient_details', 'organization');
-            $template = $this->_data['template']['newsletter_content'];
-            $data = $this->_data;
-            return $this->_shortcode_helper->parse_message_template( $template, $data['data'], $valid_shortcodes, $this->_message_type, $this->_messenger, $this->_message );
-        }
-    }
+	protected function _parser( $shortcode ) {
+		if ( $shortcode == '[NEWSLETTER_CONTENT]' ) {
+			$this->_validate_list_requirements();
+			$valid_shortcodes = array('recipient_details', 'organization');
+			$template = $this->_data['template']['newsletter_content'];
+			$data = $this->_data;
+			return $this->_shortcode_helper->parse_message_template( $template, $data['data'], $valid_shortcodes, $this->_message_type, $this->_messenger, $this->_message );
+		}
+	}
 
 
-    /**
-     * Callback set in args for EE_Register_Messages_Shortcode_Library::register for 'msgr_validator_callback'.
-     *
-     * EE_Register_Messages_Shortcode_Library::register registers this callback with the
-     * 'FHEE__EE_messenger__get_validator_config' filter.
-     *
-     * @since    4.3.0
-     * @param  array        $validator_config  current validator configuration array
-     * @param  EE_messenger $messenger
-     * @return  array                                             new validator config.
-     */
-    public static function messenger_validator_config( $validator_config, EE_messenger $messenger ) {
-        if ( $messenger->name !== 'email' )
-            return $validator_config;
+	/**
+	 * Callback set in args for EE_Register_Messages_Shortcode_Library::register for 'msgr_validator_callback'.
+	 *
+	 * EE_Register_Messages_Shortcode_Library::register registers this callback with the
+	 * 'FHEE__EE_messenger__get_validator_config' filter.
+	 *
+	 * @since    4.3.0
+	 * @param  array        $validator_config  current validator configuration array
+	 * @param  EE_messenger $messenger
+	 * @return  array                                             new validator config.
+	 */
+	public static function messenger_validator_config( $validator_config, EE_messenger $messenger ) {
+		if ( $messenger->name !== 'email' )
+			return $validator_config;
 
-        $validator_config['content']['shortcodes'][] = 'newsletter';
-        $validator_config['newsletter_content'] = array(
-            'shortcodes' => array('recipient_details', 'organization'),
-            'required' => array('[NEWSLETTER_CONTENT]')
-            );
-        return $validator_config;
-    }
+		$validator_config['content']['shortcodes'][] = 'newsletter';
+		$validator_config['newsletter_content'] = array(
+			'shortcodes' => array('recipient_details', 'organization'),
+			'required' => array('[NEWSLETTER_CONTENT]')
+			);
+		return $validator_config;
+	}
 
 
 
 
-    /**
-     * Callback set in args for EE_Register_Messages_Shortcode_Library::register for
-     * 'msgr_template_fields_callback'.
-     *
-     * EE_Register_Messages_Shortcode_Library::register registers this callback with the
-     * FHEE__EE_messenger__get_template_fields filter.
-     *
-     * @since    4.3.0
-     *
-     * @param  array        $template_fields current template fields setup array.
-     * @param  EE_messenger $messenger
-     * @return  array                                           new/modified template fields array.
-     */
-    public static function messenger_template_fields( $template_fields, EE_messenger $messenger ) {
-        if ( $messenger->name !== 'email' )
-            return $template_fields;
+	/**
+	 * Callback set in args for EE_Register_Messages_Shortcode_Library::register for
+	 * 'msgr_template_fields_callback'.
+	 *
+	 * EE_Register_Messages_Shortcode_Library::register registers this callback with the
+	 * FHEE__EE_messenger__get_template_fields filter.
+	 *
+	 * @since    4.3.0
+	 *
+	 * @param  array        $template_fields current template fields setup array.
+	 * @param  EE_messenger $messenger
+	 * @return  array                                           new/modified template fields array.
+	 */
+	public static function messenger_template_fields( $template_fields, EE_messenger $messenger ) {
+		if ( $messenger->name !== 'email' )
+			return $template_fields;
 
-        $template_fields['extra']['content']['newsletter_content'] = array(
-            'input' => 'wp_editor',
-            'label' => '[NEWSLETTER_CONTENT]',
-            'type' => 'string',
-            'required' => TRUE,
-            'validation' => TRUE,
-            'format' => '%s',
-            'rows' => '15',
-            'shortcodes_required' => array('[NEWSLETTER_CONTENT]')
-            );
-        return $template_fields;
-    }
+		$template_fields['extra']['content']['newsletter_content'] = array(
+			'input' => 'wp_editor',
+			'label' => '[NEWSLETTER_CONTENT]',
+			'type' => 'string',
+			'required' => TRUE,
+			'validation' => TRUE,
+			'format' => '%s',
+			'rows' => '15',
+			'shortcodes_required' => array('[NEWSLETTER_CONTENT]')
+			);
+		return $template_fields;
+	}
 
 } //end class EE_Newsletter_Shortcodes