Inspection of "Daily Inspection: Bumping version to 4.8.41.rc.021" - eventespresso/event-espresso-core - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Branch — FET-9643-checkin-system-docume... (5f5a9c)

unknown

created 2017-05-11 21:34 UTC

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -27,21 +27,21 @@
 block discarded – undo
 		<!-- Primary Style Sheet -->
 		<link rel="stylesheet" type="text/css" href="<?php echo $main_css; ?>" />
 		<!-- Make sure the buttons don't print -->
-		<?php if ( isset( $extra_css )) : ?>
+		<?php if (isset($extra_css)) : ?>
 		<!-- Additional Style Sheet -->
 		<link rel="stylesheet" type="text/css" href="<?php echo $extra_css; ?>" />
 		<?php endif; ?>
 		<style type="text/css">
 		@media print{ .noPrint{ display:none !important;height:0!important; width:0!important; margin:0!important; padding:0!important; }}
 		</style>
-		<?php do_action( 'AHEE__EE_Html_Messenger_main_wrapper_template_head', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?>
+		<?php do_action('AHEE__EE_Html_Messenger_main_wrapper_template_head', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?>
 	</head>
-	<?php do_action( 'AHEE__EE_Html_Messenger_main_wrapper_template_header', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?>
+	<?php do_action('AHEE__EE_Html_Messenger_main_wrapper_template_header', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?>
 	<body>
-		<?php do_action( 'AHEE__EE_Html_Messenger_main_wrapper_template_before_main_body', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?>
+		<?php do_action('AHEE__EE_Html_Messenger_main_wrapper_template_before_main_body', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?>
 		<?php echo $main_body; ?>
-		<?php do_action( 'AHEE__EE_Html_Messenger_main_wrapper_template_after_main_body', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?>
+		<?php do_action('AHEE__EE_Html_Messenger_main_wrapper_template_after_main_body', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?>
 	</body>
-	<?php do_action( 'AHEE__EE_Html_Messenger_main_wrapper_template_footer', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?>
+	<?php do_action('AHEE__EE_Html_Messenger_main_wrapper_template_footer', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?>
 	<?php wp_footer(); ?>
 </html>
\ No newline at end of file

Please login to merge, or discard this patch.

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

Spacing +49 added lines, -49 removed lines patch added patch discarded remove patch

@@ -1,6 +1,6 @@  discard block
 block discarded – undo
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
 /**
  * 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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 				'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 @@  discard block
 block discarded – undo
 				'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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 				'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' => ''
 				)
@@ -348,8 +348,8 @@  discard block
 block discarded – undo
 	 */
 	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()
 		);
@@ -363,7 +363,7 @@  discard block
 block discarded – undo
 	 * @return string html body of the message content and the related css.
 	 */
 	protected function _preview() {
-		return $this->_body( TRUE );
+		return $this->_body(TRUE);
 	}
 
 
@@ -377,18 +377,18 @@  discard block
 block discarded – undo
 	 * @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 );
-		return apply_filters( 'FHEE__EE_Email_messenger___headers', $headers, $this->_incoming_message_type, $this );
+		add_filter('wp_mail_from', array($this, 'set_from_address'), 100);
+		add_filter('wp_mail_from_name', array($this, 'set_from_name'), 100);
+		return apply_filters('FHEE__EE_Email_messenger___headers', $headers, $this->_incoming_message_type, $this);
 	}
 
 
@@ -404,19 +404,19 @@  discard block
 block discarded – undo
 	 * @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);
 	}
 
 
@@ -429,7 +429,7 @@  discard block
 block discarded – undo
 	 *
 	 * @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];
 	}
@@ -444,13 +444,13 @@  discard block
 block discarded – undo
 	 *
 	 * @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"));
 	}
 
 
@@ -461,14 +461,14 @@  discard block
 block discarded – undo
 	 * @param bool $preview will determine 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);
 
 		/**
 		 * This filter allows one to bypass the CSSToInlineStyles tool and leave the body untouched.
@@ -476,17 +476,17 @@  discard block
 block discarded – undo
 		 * @type    bool    $preview    Indicates whether a preview is being generated or not.
 		 * @return  bool    true  indicates to use the inliner, false bypasses it.
 		 */
-		if ( apply_filters( 'FHEE__EE_Email_messenger__apply_CSSInliner ', true, $preview ) ) {
+		if (apply_filters('FHEE__EE_Email_messenger__apply_CSSInliner ', true, $preview)) {
 
 			//require CssToInlineStyles library and its dependencies via composer autoloader
-			require_once EE_THIRD_PARTY . 'cssinliner/vendor/autoload.php';
+			require_once EE_THIRD_PARTY.'cssinliner/vendor/autoload.php';
 
 			//now if this isn't a preview, let's setup the body so it has inline styles
-			if ( ! $preview || ( $preview && defined( 'DOING_AJAX' ) ) ) {
-				$style = file_get_contents( $this->get_variation( $this->_tmp_pack, $this->_incoming_message_type->name, FALSE, 'main', $this->_variation ), TRUE );
-				$CSS = new TijsVerkoyen\CssToInlineStyles\CssToInlineStyles( $body, $style );
-				$body = ltrim( $CSS->convert( true ), ">\n" ); //for some reason the library has a bracket and new line at the beginning.  This takes care of that.
-				$body = ltrim( $body, "<?" ); //see https://events.codebasehq.com/projects/event-espresso/tickets/8609
+			if ( ! $preview || ($preview && defined('DOING_AJAX'))) {
+				$style = file_get_contents($this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, FALSE, 'main', $this->_variation), TRUE);
+				$CSS = new TijsVerkoyen\CssToInlineStyles\CssToInlineStyles($body, $style);
+				$body = ltrim($CSS->convert(true), ">\n"); //for some reason the library has a bracket and new line at the beginning.  This takes care of that.
+				$body = ltrim($body, "<?"); //see https://events.codebasehq.com/projects/event-espresso/tickets/8609
 			}
 
 		}
@@ -505,8 +505,8 @@  discard block
 block discarded – undo
 	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;
 	}

Please login to merge, or discard this patch.

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -426,7 +426,7 @@
 block discarded – undo
 	 *
 	 * @since 4.3.1
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	private function _parse_from() {
 		if ( strpos( $this->_from, '<' ) !== false ) {

Please login to merge, or discard this patch.

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

modules/bot_trap/EED_Bot_Trap.module.php 2 patches

Spacing +48 added lines, -48 removed lines patch added patch discarded remove patch

@@ -18,7 +18,7 @@  discard block
 block discarded – undo
 	 * @return EED_Bot_Trap
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -31,22 +31,22 @@  discard block
 block discarded – undo
 	 */
 	public static function set_hooks() {
 		if (
-			apply_filters( 'FHEE__EED_Bot_Trap__set_hooks__use_bot_trap', true ) &&
+			apply_filters('FHEE__EED_Bot_Trap__set_hooks__use_bot_trap', true) &&
 			EE_Registry::instance()->CFG->registration->use_bot_trap
 		) {
-			define( 'EE_BOT_TRAP_BASE_URL', plugin_dir_url( __FILE__ ) . DS );
+			define('EE_BOT_TRAP_BASE_URL', plugin_dir_url(__FILE__).DS);
 			add_action(
 				'AHEE__ticket_selector_chart__template__after_ticket_selector',
-				array( 'EED_Bot_Trap', 'generate_bot_trap' ),
+				array('EED_Bot_Trap', 'generate_bot_trap'),
 				10, 2
 			);
 			add_action(
 				'EED_Ticket_Selector__process_ticket_selections__before',
-				array( 'EED_Bot_Trap', 'process_bot_trap' ),
+				array('EED_Bot_Trap', 'process_bot_trap'),
 				1, 2
 			);
 			// redirect bots to bogus success page
-			EE_Config::register_route( 'ticket_selection_received', 'EED_Bot_Trap', 'display_bot_trap_success' );
+			EE_Config::register_route('ticket_selection_received', 'EED_Bot_Trap', 'display_bot_trap_success');
 		}
 	}
 
@@ -61,12 +61,12 @@  discard block
 block discarded – undo
 	public static function set_hooks_admin() {
 		add_action(
 			'AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template',
-			array( 'EED_Bot_Trap', 'bot_trap_settings_form' ),
+			array('EED_Bot_Trap', 'bot_trap_settings_form'),
 			10
 		);
 		add_filter(
 			'FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration',
-			array( 'EED_Bot_Trap', 'update_bot_trap_settings_form' ),
+			array('EED_Bot_Trap', 'update_bot_trap_settings_form'),
 			10, 1
 		);
 	}
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
 	 * @param    WP $WP
 	 * @return    void
 	 */
-	public function run( $WP ) {}
+	public function run($WP) {}
 
 
 
@@ -91,14 +91,14 @@  discard block
 block discarded – undo
 	 * @return    void
 	 */
 	public static function generate_bot_trap() {
-		$do_not_enter = __( 'please do not enter anything in this input', 'event_espresso' );
+		$do_not_enter = __('please do not enter anything in this input', 'event_espresso');
 		$html = '<div id="tkt-slctr-request-processor-dv" style="float:left; margin-left:-999em;">';
-		$html .= '<label for="tkt-slctr-request-processor-email">' . $do_not_enter  . '</label>';
+		$html .= '<label for="tkt-slctr-request-processor-email">'.$do_not_enter.'</label>';
 		$html .= '<input type="email" name="tkt-slctr-request-processor-email" value=""/>';
 		$html .= '<input type="hidden" name="tkt-slctr-request-processor-token" value="';
-		if ( EE_Registry::instance()->CFG->registration->use_encryption ) {
-			EE_Registry::instance()->load_core( 'EE_Encryption' );
-			$html .= EE_Encryption::instance()->encrypt( time() );
+		if (EE_Registry::instance()->CFG->registration->use_encryption) {
+			EE_Registry::instance()->load_core('EE_Encryption');
+			$html .= EE_Encryption::instance()->encrypt(time());
 		} else {
 			$html .= time();
 		}
@@ -117,35 +117,35 @@  discard block
 block discarded – undo
 	 */
 	public static function process_bot_trap() {
 		// what's your email address Mr. Bot ?
-		$empty_trap = isset( $_REQUEST[ 'tkt-slctr-request-processor-email' ] ) && $_REQUEST[ 'tkt-slctr-request-processor-email' ] == '' ? true : false;
+		$empty_trap = isset($_REQUEST['tkt-slctr-request-processor-email']) && $_REQUEST['tkt-slctr-request-processor-email'] == '' ? true : false;
 		// get encrypted timestamp for when the form was originally displayed
-		$bot_trap_timestamp = isset( $_REQUEST[ 'tkt-slctr-request-processor-token' ] ) ? sanitize_text_field( $_REQUEST[ 'tkt-slctr-request-processor-token' ] ) : '';
+		$bot_trap_timestamp = isset($_REQUEST['tkt-slctr-request-processor-token']) ? sanitize_text_field($_REQUEST['tkt-slctr-request-processor-token']) : '';
 		// decrypt and convert to absolute  integer
-		if ( EE_Registry::instance()->CFG->registration->use_encryption ) {
-			EE_Registry::instance()->load_core( 'EE_Encryption' );
-			$bot_trap_timestamp = absint( EE_Encryption::instance()->decrypt( $bot_trap_timestamp ) );
+		if (EE_Registry::instance()->CFG->registration->use_encryption) {
+			EE_Registry::instance()->load_core('EE_Encryption');
+			$bot_trap_timestamp = absint(EE_Encryption::instance()->decrypt($bot_trap_timestamp));
 		} else {
-			$bot_trap_timestamp = absint( $bot_trap_timestamp );
+			$bot_trap_timestamp = absint($bot_trap_timestamp);
 		}
 		// ticket form submitted too impossibly fast ( after now ) or more than an hour later ???
-		$suspicious_timing = $bot_trap_timestamp > time() || $bot_trap_timestamp < ( time() - HOUR_IN_SECONDS ) ? true : false;
+		$suspicious_timing = $bot_trap_timestamp > time() || $bot_trap_timestamp < (time() - HOUR_IN_SECONDS) ? true : false;
 		// are we human ?
-		if ( $empty_trap && ! $suspicious_timing ) {
+		if ($empty_trap && ! $suspicious_timing) {
 			return;
 		}
 		// UH OH...
 		$redirect_url = add_query_arg(
-			array( 'ee' => 'ticket_selection_received' ),
+			array('ee' => 'ticket_selection_received'),
 			EE_Registry::instance()->CFG->core->reg_page_url()
 		);
-		if ( $suspicious_timing ) {
+		if ($suspicious_timing) {
 			$redirect_url = add_query_arg(
-				array( 'ee-notice' => urlencode( __( 'We\'re sorry, but your ticket selections could not be processed due to a server timing error. Please hit the back button on your browser and try again.', 'event_espresso' ) ) ),
+				array('ee-notice' => urlencode(__('We\'re sorry, but your ticket selections could not be processed due to a server timing error. Please hit the back button on your browser and try again.', 'event_espresso'))),
 				$redirect_url
 			);
 		}
 		wp_safe_redirect(
-			apply_filters( 'FHEE__EED_Bot_Trap__process_bot_trap__redirect_url', $redirect_url )
+			apply_filters('FHEE__EED_Bot_Trap__process_bot_trap__redirect_url', $redirect_url)
 		);
 		exit();
 	}
@@ -160,11 +160,11 @@  discard block
 block discarded – undo
 	 * @return    void
 	 */
 	public static function display_bot_trap_success() {
-		EE_Registry::instance()->load_helper( 'HTML' );
-		add_filter( 'FHEE__EED_Single_Page_Checkout__run', '__return_false' );
-		$bot_notice = __( 'Thank you so much. Your ticket selections have been received for consideration.', 'event_espresso' );
-		$bot_notice = isset( $_REQUEST[ 'ee-notice' ] ) && $_REQUEST[ 'ee-notice' ] !== '' ? sanitize_text_field( stripslashes( $_REQUEST[ 'ee-notice' ] ) ) : $bot_notice;
-		EE_Registry::instance()->REQ->add_output( EEH_HTML::div( $bot_notice, '', 'ee-attention' ) );
+		EE_Registry::instance()->load_helper('HTML');
+		add_filter('FHEE__EED_Single_Page_Checkout__run', '__return_false');
+		$bot_notice = __('Thank you so much. Your ticket selections have been received for consideration.', 'event_espresso');
+		$bot_notice = isset($_REQUEST['ee-notice']) && $_REQUEST['ee-notice'] !== '' ? sanitize_text_field(stripslashes($_REQUEST['ee-notice'])) : $bot_notice;
+		EE_Registry::instance()->REQ->add_output(EEH_HTML::div($bot_notice, '', 'ee-attention'));
 	}
 
 
@@ -198,20 +198,20 @@  discard block
 block discarded – undo
 				'html_id'         			=> 'bot_trap_settings',
 				'layout_strategy' 	=> new EE_Admin_Two_Column_Layout(),
 				'subsections'     		=> array(
-					'bot_trap_hdr' 		=> new EE_Form_Section_HTML( EEH_HTML::h2( __( 'Bot Trap Settings', 'event_espresso' ) ) ),
+					'bot_trap_hdr' 		=> new EE_Form_Section_HTML(EEH_HTML::h2(__('Bot Trap Settings', 'event_espresso'))),
 					'use_bot_trap' 		=> new EE_Yes_No_Input(
 						array(
-							'html_label_text' 	=> __( 'Enable Bot Trap', 'event_espresso' ),
-							'html_help_text' 		=>  __( 'The Event Espresso Bot Trap will insert a fake input into your Ticket Selector forms that is hidden from regular site visitors, but visible to spam bots. Because the input asks for an email address, it is irresistible to spam bots who will of course enter text into it. Since regular site visitors can not see this input, any value detected during form submission means a bot has been detected, which will then be blocked from submitting the form.', 'event_espresso' ),
-							'default'        			=> isset( EE_Registry::instance()->CFG->registration->use_bot_trap ) ? EE_Registry::instance()->CFG->registration->use_bot_trap : true,
+							'html_label_text' 	=> __('Enable Bot Trap', 'event_espresso'),
+							'html_help_text' 		=>  __('The Event Espresso Bot Trap will insert a fake input into your Ticket Selector forms that is hidden from regular site visitors, but visible to spam bots. Because the input asks for an email address, it is irresistible to spam bots who will of course enter text into it. Since regular site visitors can not see this input, any value detected during form submission means a bot has been detected, which will then be blocked from submitting the form.', 'event_espresso'),
+							'default'        			=> isset(EE_Registry::instance()->CFG->registration->use_bot_trap) ? EE_Registry::instance()->CFG->registration->use_bot_trap : true,
 							'required'        		=> false
 						)
 					),
 					'use_encryption' 		=> new EE_Yes_No_Input(
 						array(
-							'html_label_text' 	=> __( 'Encrypt Bot Trap Data', 'event_espresso' ),
-							'html_help_text' 		=>  __( 'One way to detect spam bots is by looking at how long it takes them to submit a form. They are often inhumanly fast, or will submit forms hours, days, or even weeks after the form was first scraped off the web. The Event Espresso Bot Trap will send a timestamp with the Ticket Selector form when it is submitted. By default, this timestamp is encrypted so that the spam bots can not change it, but encryption may cause issues on some servers due to configuration "conflicts". If you continuously get caught in the bot trap, then try setting this option to "No". This may increase the number of spam submissions you receive, but increases server compatibility.', 'event_espresso' ),
-							'default'        			=> isset( EE_Registry::instance()->CFG->registration->use_encryption ) ? EE_Registry::instance()->CFG->registration->use_encryption : true,
+							'html_label_text' 	=> __('Encrypt Bot Trap Data', 'event_espresso'),
+							'html_help_text' 		=>  __('One way to detect spam bots is by looking at how long it takes them to submit a form. They are often inhumanly fast, or will submit forms hours, days, or even weeks after the form was first scraped off the web. The Event Espresso Bot Trap will send a timestamp with the Ticket Selector form when it is submitted. By default, this timestamp is encrypted so that the spam bots can not change it, but encryption may cause issues on some servers due to configuration "conflicts". If you continuously get caught in the bot trap, then try setting this option to "No". This may increase the number of spam submissions you receive, but increases server compatibility.', 'event_espresso'),
+							'default'        			=> isset(EE_Registry::instance()->CFG->registration->use_encryption) ? EE_Registry::instance()->CFG->registration->use_encryption : true,
 							'required'        		=> false
 						)
 					),
@@ -229,30 +229,30 @@  discard block
 block discarded – undo
 	 * @param \EE_Registration_Config $EE_Registration_Config
 	 * @return \EE_Registration_Config
 	 */
-	public static function update_bot_trap_settings_form( EE_Registration_Config $EE_Registration_Config ) {
+	public static function update_bot_trap_settings_form(EE_Registration_Config $EE_Registration_Config) {
 		try {
 			$bot_trap_settings_form = EED_Bot_Trap::_bot_trap_settings_form();
 			// if not displaying a form, then check for form submission
-			if ( $bot_trap_settings_form->was_submitted() ) {
+			if ($bot_trap_settings_form->was_submitted()) {
 				// capture form data
 				$bot_trap_settings_form->receive_form_submission();
 				// validate form data
-				if ( $bot_trap_settings_form->is_valid() ) {
+				if ($bot_trap_settings_form->is_valid()) {
 					// grab validated data from form
 					$valid_data = $bot_trap_settings_form->valid_data();
-					if ( isset( $valid_data[ 'use_bot_trap' ], $valid_data[ 'use_encryption' ] ) ) {
-						$EE_Registration_Config->use_bot_trap = $valid_data[ 'use_bot_trap' ];
-						$EE_Registration_Config->use_encryption = $valid_data[ 'use_encryption' ];
+					if (isset($valid_data['use_bot_trap'], $valid_data['use_encryption'])) {
+						$EE_Registration_Config->use_bot_trap = $valid_data['use_bot_trap'];
+						$EE_Registration_Config->use_encryption = $valid_data['use_encryption'];
 					} else {
-						EE_Error::add_error( __( 'Invalid or missing Bot Trap settings. Please refresh the form and try again.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+						EE_Error::add_error(__('Invalid or missing Bot Trap settings. Please refresh the form and try again.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					}
 				} else {
-					if ( $bot_trap_settings_form->submission_error_message() != '' ) {
-						EE_Error::add_error( $bot_trap_settings_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__ );
+					if ($bot_trap_settings_form->submission_error_message() != '') {
+						EE_Error::add_error($bot_trap_settings_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__);
 					}
 				}
 			}
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 		return $EE_Registration_Config;

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

		@@ -1,4 +1,6 @@
		block discarded – undo
1		-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
	1	+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
	2	+ exit('No direct script access allowed');
	3	+}
2	4	/**
3	5	* EED_Bot_Trap Class
4	6	*

Please login to merge, or discard this patch.

modules/ical/EED_Ical.module.php 3 patches

Spacing +70 added lines, -70 removed lines patch added patch discarded remove patch

@@ -32,7 +32,7 @@  discard block
 block discarded – undo
 	 * @return EED_Ical
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -45,9 +45,9 @@  discard block
 block discarded – undo
 	 */
 	public static function set_hooks() {
 		// create download buttons
-		add_filter( 'FHEE__espresso_list_of_event_dates__datetime_html', array( 'EED_Ical', 'generate_add_to_iCal_button' ), 10, 2 );
+		add_filter('FHEE__espresso_list_of_event_dates__datetime_html', array('EED_Ical', 'generate_add_to_iCal_button'), 10, 2);
 		 // process ics download request
-		EE_Config::register_route( 'download_ics_file', 'EED_Ical', 'download_ics_file' );
+		EE_Config::register_route('download_ics_file', 'EED_Ical', 'download_ics_file');
 	}
 
 
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
 	 * @param    WP $WP
 	 * @return    void
 	 */
-	public function run( $WP ) {}
+	public function run($WP) {}
 
 
 
@@ -82,30 +82,30 @@  discard block
 block discarded – undo
 	 * @param $datetime
 	 * @return    string
 	 */
-	public static function generate_add_to_iCal_button( $html, $datetime ) {
+	public static function generate_add_to_iCal_button($html, $datetime) {
 		// first verify a proper datetime object has been received
-		if ( $datetime instanceof EE_Datetime ) {
+		if ($datetime instanceof EE_Datetime) {
 			// set whether a link or submit button is shown
-			$iCal_type = apply_filters( 'FHEE__EED_Ical__generate_add_to_iCal_button__iCal_type', 'submit' );
+			$iCal_type = apply_filters('FHEE__EED_Ical__generate_add_to_iCal_button__iCal_type', 'submit');
 			// generate a link to the route we registered in set_hooks()
-			$URL = add_query_arg( array( 'ee' => 'download_ics_file', 'ics_id' => $datetime->ID() ), site_url() );
+			$URL = add_query_arg(array('ee' => 'download_ics_file', 'ics_id' => $datetime->ID()), site_url());
 			// what type ?
-			switch ( $iCal_type ) {
+			switch ($iCal_type) {
 				// submit buttons appear as buttons and are very compatible with a theme's style
 				case 'submit' :
-					$html .= '<form id="download-iCal-frm-' . $datetime->ID() . '" class="download-iCal-frm" action="' . $URL . '" method="post" >';
-					$html .= '<input type="submit" class="ee-ical-sbmt" value="&#xf145;" title="' . __( 'Add to iCal Calendar', 'event_espresso' ) . '"/>';
+					$html .= '<form id="download-iCal-frm-'.$datetime->ID().'" class="download-iCal-frm" action="'.$URL.'" method="post" >';
+					$html .= '<input type="submit" class="ee-ical-sbmt" value="&#xf145;" title="'.__('Add to iCal Calendar', 'event_espresso').'"/>';
 					$html .= '</form>';
 					break;
 				// buttons are just links that have been styled to appear as buttons, but may not be blend with a theme as well as submit buttons
 				case 'button' :
-					$html .= '<a class="ee-ical-btn small ee-button ee-roundish" href="' . $URL . '" title="' . __( 'Add to iCal Calendar', 'event_espresso' ) . '">';
+					$html .= '<a class="ee-ical-btn small ee-button ee-roundish" href="'.$URL.'" title="'.__('Add to iCal Calendar', 'event_espresso').'">';
 					$html .= ' <span class="dashicons dashicons-calendar"></span>';
 					$html .= '</a>';
 					break;
 				// links are just links that use the calendar dashicon
 				case 'icon' :
-					$html .= '<a class="ee-ical-lnk" href="' . $URL . '" title="' . __( 'Add to iCal Calendar', 'event_espresso' ) . '">';
+					$html .= '<a class="ee-ical-lnk" href="'.$URL.'" title="'.__('Add to iCal Calendar', 'event_espresso').'">';
 					$html .= ' <span class="dashicons dashicons-calendar"></span>';
 					$html .= '</a>';
 					break;
@@ -123,73 +123,73 @@  discard block
 block discarded – undo
 	 *  @return 	void
 	 */
 	public static function download_ics_file() {
-		if ( EE_Registry::instance()->REQ->is_set( 'ics_id' )) {
-			$DTT_ID = absint( EE_Registry::instance()->REQ->get( 'ics_id' ));
-			$datetime = EE_Registry::instance()->load_model( 'Datetime' )->get_one_by_ID( $DTT_ID );
-			if ( $datetime instanceof EE_Datetime ) {
+		if (EE_Registry::instance()->REQ->is_set('ics_id')) {
+			$DTT_ID = absint(EE_Registry::instance()->REQ->get('ics_id'));
+			$datetime = EE_Registry::instance()->load_model('Datetime')->get_one_by_ID($DTT_ID);
+			if ($datetime instanceof EE_Datetime) {
 				// get related event, venues, and event categories
 				$event = $datetime->event();
 				// get related category Term object and it's name
 				$category = $event->first_event_category();
-				if ( $category instanceof EE_Term ) {
+				if ($category instanceof EE_Term) {
 					$category = $category->name();
 				}
 				$location = '';
 				// get first related venue and convert to CSV string
-				$venue = $event->venues(array( 'limit'=>1 ));
-				if ( is_array( $venue ) && ! empty( $venue )) {
-					$venue = array_shift( $venue );
-					if ( $venue instanceof EE_Venue ) {
-						 EE_Registry::instance()->load_helper( 'Venue_View' );
-						$location = espresso_venue_raw_address( 'inline', $venue->ID(), FALSE );
+				$venue = $event->venues(array('limit'=>1));
+				if (is_array($venue) && ! empty($venue)) {
+					$venue = array_shift($venue);
+					if ($venue instanceof EE_Venue) {
+						 EE_Registry::instance()->load_helper('Venue_View');
+						$location = espresso_venue_raw_address('inline', $venue->ID(), FALSE);
 					}
 				}
 				// set variables, escape strings, convert timestamps to ics format, etc
-				$filename = $event->slug() . '-' . $datetime->start_date( 'Y-m-d' ) . '.ics';
-				$organizer = EED_Ical::_escape_ICal_data( EE_Registry::instance()->CFG->organization->name );
-				$UID = EED_Ical::_escape_ICal_data( md5( $event->name() . $event->ID() . $datetime->ID() ));
-				$org_email = EED_Ical::_escape_ICal_data( $datetime->ID() );
-				$timestamp = date( EED_Ical::iCal_datetime_format );
-				$location = EED_Ical::_escape_ICal_data( $location );
-				$summary = EED_Ical::_escape_ICal_data( $event->name() );
-				$description = EED_Ical::_escape_ICal_description( wp_strip_all_tags( $event->description() ));
+				$filename = $event->slug().'-'.$datetime->start_date('Y-m-d').'.ics';
+				$organizer = EED_Ical::_escape_ICal_data(EE_Registry::instance()->CFG->organization->name);
+				$UID = EED_Ical::_escape_ICal_data(md5($event->name().$event->ID().$datetime->ID()));
+				$org_email = EED_Ical::_escape_ICal_data($datetime->ID());
+				$timestamp = date(EED_Ical::iCal_datetime_format);
+				$location = EED_Ical::_escape_ICal_data($location);
+				$summary = EED_Ical::_escape_ICal_data($event->name());
+				$description = EED_Ical::_escape_ICal_description(wp_strip_all_tags($event->description()));
 				$status = $datetime->get_active_status();
 				$status = $status == EE_Datetime::cancelled ? 'Cancelled' : 'Confirmed';
-				$status = EED_Ical::_escape_ICal_data( $status );
-				$categories = EED_Ical::_escape_ICal_data( $category );
-				$url = EED_Ical::_escape_ICal_data( get_permalink( $event->ID() ));
-				$dtt_start = EED_Ical::_escape_ICal_data( date( EED_Ical::iCal_datetime_format, $datetime->start() ));
-				$dtt_end = EED_Ical::_escape_ICal_data( date( EED_Ical::iCal_datetime_format, $datetime->end() ));
+				$status = EED_Ical::_escape_ICal_data($status);
+				$categories = EED_Ical::_escape_ICal_data($category);
+				$url = EED_Ical::_escape_ICal_data(get_permalink($event->ID()));
+				$dtt_start = EED_Ical::_escape_ICal_data(date(EED_Ical::iCal_datetime_format, $datetime->start()));
+				$dtt_end = EED_Ical::_escape_ICal_data(date(EED_Ical::iCal_datetime_format, $datetime->end()));
 				// set headers
-				header( 'Content-type: text/calendar; charset=utf-8' );
-				header( 'Content-Disposition: attachment; filename="' . $filename . '"' );
-				header( 'Cache-Control: private, max-age=0, must-revalidate' );
-				header( 'Pragma: public' );
-				header( 'Content-Type: application/octet-stream' );
-				header( 'Content-Type: application/force-download' );
-				header( 'Cache-Control: no-cache, must-revalidate' );
-				header( 'Content-Transfer-Encoding: binary' );
-				header( 'Expires: Sat, 26 Jul 1997 05:00:00 GMT' ); // past date
-				ini_set( 'zlib.output_compression', '0' );
+				header('Content-type: text/calendar; charset=utf-8');
+				header('Content-Disposition: attachment; filename="'.$filename.'"');
+				header('Cache-Control: private, max-age=0, must-revalidate');
+				header('Pragma: public');
+				header('Content-Type: application/octet-stream');
+				header('Content-Type: application/force-download');
+				header('Cache-Control: no-cache, must-revalidate');
+				header('Content-Transfer-Encoding: binary');
+				header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // past date
+				ini_set('zlib.output_compression', '0');
 				// echo the output
-				echo "BEGIN:VCALENDAR" . PHP_EOL;
-				echo "VERSION:2.0" . PHP_EOL;
-				echo "PRODID:-//{$organizer}//NONSGML PDA Calendar Version 1.0//EN" . PHP_EOL;
-				echo "CALSCALE:GREGORIAN" . PHP_EOL;
-				echo "BEGIN:VEVENT" . PHP_EOL;
-				echo "UID:{$UID}" . PHP_EOL;
-				echo "ORGANIZER:MAILTO:{$org_email}" . PHP_EOL;
-				echo "DTSTAMP:{$timestamp}" . PHP_EOL;
-				echo "LOCATION:{$location}" . PHP_EOL;
-				echo "SUMMARY:{$summary}" . PHP_EOL;
-				echo "DESCRIPTION:{$description}" . PHP_EOL;
-				echo "STATUS:{$status}" . PHP_EOL;
-				echo "CATEGORIES:{$categories}" . PHP_EOL;
-				echo "URL;VALUE=URI:{$url}" . PHP_EOL;
-				echo "DTSTART:{$dtt_start}" . PHP_EOL;
-				echo "DTEND:{$dtt_end}" . PHP_EOL;
-				echo "END:VEVENT" . PHP_EOL;
-				echo "END:VCALENDAR" . PHP_EOL;
+				echo "BEGIN:VCALENDAR".PHP_EOL;
+				echo "VERSION:2.0".PHP_EOL;
+				echo "PRODID:-//{$organizer}//NONSGML PDA Calendar Version 1.0//EN".PHP_EOL;
+				echo "CALSCALE:GREGORIAN".PHP_EOL;
+				echo "BEGIN:VEVENT".PHP_EOL;
+				echo "UID:{$UID}".PHP_EOL;
+				echo "ORGANIZER:MAILTO:{$org_email}".PHP_EOL;
+				echo "DTSTAMP:{$timestamp}".PHP_EOL;
+				echo "LOCATION:{$location}".PHP_EOL;
+				echo "SUMMARY:{$summary}".PHP_EOL;
+				echo "DESCRIPTION:{$description}".PHP_EOL;
+				echo "STATUS:{$status}".PHP_EOL;
+				echo "CATEGORIES:{$categories}".PHP_EOL;
+				echo "URL;VALUE=URI:{$url}".PHP_EOL;
+				echo "DTSTART:{$dtt_start}".PHP_EOL;
+				echo "DTEND:{$dtt_end}".PHP_EOL;
+				echo "END:VEVENT".PHP_EOL;
+				echo "END:VCALENDAR".PHP_EOL;
 			}
 		}
 		die();
@@ -204,8 +204,8 @@  discard block
 block discarded – undo
 	 *  	@param	string $string
 	 *  	@return	string
 	 */
-	private static function _escape_ICal_data( $string = '' ) {
-		return preg_replace( '/([\,;])/', '\\\$1', $string );
+	private static function _escape_ICal_data($string = '') {
+		return preg_replace('/([\,;])/', '\\\$1', $string);
 	}
 
 	/**
@@ -215,13 +215,13 @@  discard block
 block discarded – undo
 	 *  	@param	string $description
 	 *  	@return	string
 	 */
-	private static function _escape_ICal_description( $description = '' ) {
+	private static function _escape_ICal_description($description = '') {
 			
 			//Escape spcial chars within the decription
-			$description = EED_Ical::_escape_ICal_data( $description );
+			$description = EED_Ical::_escape_ICal_data($description);
 
 		    //Remove line breaks and output in iCal format
-		    $description = str_replace( array( "\r\n", "\n"), '\n', $description );
+		    $description = str_replace(array("\r\n", "\n"), '\n', $description);
 
 		return $description;
 	}

Please login to merge, or discard this patch.

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -220,8 +220,8 @@
 block discarded – undo
 			//Escape spcial chars within the decription
 			$description = EED_Ical::_escape_ICal_data( $description );
 
-		    //Remove line breaks and output in iCal format
-		    $description = str_replace( array( "\r\n", "\n"), '\n', $description );
+			//Remove line breaks and output in iCal format
+			$description = str_replace( array( "\r\n", "\n"), '\n', $description );
 
 		return $description;
 	}

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

admin_pages/events/Events_Admin_Page.core.php 4 patches

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1345,7 +1345,7 @@
 block discarded – undo
 	 * This just returns whatever is set as the _event object property
 	 *
 	 * //todo this will become obsolete once the models are in place
-	 * @return object
+	 * @return EE_CPT_Base
 	 */
 	public function get_event_object() {
 		return $this->_cpt_model_obj;

Please login to merge, or discard this patch.

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -606,9 +606,9 @@
 block discarded – undo
 		// first check if event is active.
 		if (
 			$orig_status === EEM_Event::cancelled
-		    || $orig_status === EEM_Event::postponed
-		    || $event->is_expired()
-		    || $event->is_inactive()
+			|| $orig_status === EEM_Event::postponed
+			|| $event->is_expired()
+			|| $event->is_inactive()
 		) {
 			return;
 		}

Please login to merge, or discard this patch.

Braces +17 added lines, -11 removed lines patch added patch discarded remove patch

@@ -1,6 +1,7 @@  discard block
 block discarded – undo
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -1484,10 +1485,11 @@  discard block
 block discarded – undo
 			//get the earliest datetime (if present);
 			$earliest_dtt = $this->_cpt_model_obj->ID() > 0 ? $this->_cpt_model_obj->get_first_related('Datetime', array('order_by'=> array('DTT_EVT_start' => 'ASC' ) ) ) : NULL;
 
-			if ( !empty( $earliest_dtt ) )
-				$template_args['TKT_end_date'] = $earliest_dtt->get_datetime('DTT_EVT_start', 'Y-m-d', 'h:i a');
-			else
-				$template_args['TKT_end_date'] = date('Y-m-d h:i a', mktime(0, 0, 0, date("m"), date("d")+7, date("Y") ) );
+			if ( !empty( $earliest_dtt ) ) {
+							$template_args['TKT_end_date'] = $earliest_dtt->get_datetime('DTT_EVT_start', 'Y-m-d', 'h:i a');
+			} else {
+							$template_args['TKT_end_date'] = date('Y-m-d h:i a', mktime(0, 0, 0, date("m"), date("d")+7, date("Y") ) );
+			}
 		}
 
 		$template_args = array_merge( $template_args, $price_args );
@@ -1725,8 +1727,9 @@  discard block
 block discarded – undo
 		}
 		$action = $event_status == 'trash' ? 'moved to the trash' : 'restored from the trash';
 
-		if ( $redirect_after )
-			$this->_redirect_after_action($success, 'Event', $action, array('action' => 'default'));
+		if ( $redirect_after ) {
+					$this->_redirect_after_action($success, 'Event', $action, array('action' => 'default'));
+		}
 	}
 
 	/**
@@ -1853,8 +1856,9 @@  discard block
 block discarded – undo
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 
-		if ( $redirect_after )
-			$this->_redirect_after_action($success, 'Event', 'deleted', array('action' => 'default', 'status' => 'trash'));
+		if ( $redirect_after ) {
+					$this->_redirect_after_action($success, 'Event', 'deleted', array('action' => 'default', 'status' => 'trash'));
+		}
 	}
 
 	/**
@@ -2091,8 +2095,10 @@  discard block
 block discarded – undo
 	 * @return void
 	 */
 	private function _set_category_object() {
-		if ( isset( $this->_category->id ) && !empty( $this->_category->id ) )
-			return; //already have the category object so get out.
+		if ( isset( $this->_category->id ) && !empty( $this->_category->id ) ) {
+					return;
+		}
+		//already have the category object so get out.
 
 		//set default category object
 		$this->_set_empty_category_object();

Please login to merge, or discard this patch.

Spacing +389 added lines, -389 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
 		$this->_cpt_edit_routes = array(
 			'espresso_events' => 'edit'
 		);
-		add_action('AHEE__EE_Admin_Page_CPT__set_model_object__after_set_object', array( $this, 'verify_event_edit' ) );
+		add_action('AHEE__EE_Admin_Page_CPT__set_model_object__after_set_object', array($this, 'verify_event_edit'));
 	}
 
 	protected function _ajax_hooks() {
@@ -92,20 +92,20 @@  discard block
 block discarded – undo
 				'edit' => __('Update Event', 'event_espresso'),
 				'add_category' => __('Save New Category', 'event_espresso'),
 				'edit_category' => __('Update Category', 'event_espresso'),
-				'template_settings' => __( 'Update Settings', 'event_espresso' )
+				'template_settings' => __('Update Settings', 'event_espresso')
 				)
 		);
 	}
 
 	protected function _set_page_routes() {
 		//load formatter helper
-		EE_Registry::instance()->load_helper( 'Formatter' );
+		EE_Registry::instance()->load_helper('Formatter');
 		//load field generator helper
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
+		EE_Registry::instance()->load_helper('Form_Fields');
 
 		//is there a evt_id in the request?
-		$evt_id = ! empty( $this->_req_data['EVT_ID'] ) && ! is_array( $this->_req_data['EVT_ID'] ) ? $this->_req_data['EVT_ID'] : 0;
-		$evt_id = ! empty( $this->_req_data['post'] ) ? $this->_req_data['post'] : $evt_id;
+		$evt_id = ! empty($this->_req_data['EVT_ID']) && ! is_array($this->_req_data['EVT_ID']) ? $this->_req_data['EVT_ID'] : 0;
+		$evt_id = ! empty($this->_req_data['post']) ? $this->_req_data['post'] : $evt_id;
 
 
 		$this->_page_routes = array(
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
 				'help_tour' => array(
 					'Event_Editor_Help_Tour'
 					),
-				'qtips' => array( 'EE_Event_Editor_Decaf_Tips' ),
+				'qtips' => array('EE_Event_Editor_Decaf_Tips'),
 				'require_nonce' => FALSE
 			),
 			'edit' => array(
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
 				/*'help_tour' => array(
 					'Event_Edit_Help_Tour'
 				),*/
-				'qtips' => array( 'EE_Event_Editor_Decaf_Tips' ),
+				'qtips' => array('EE_Event_Editor_Decaf_Tips'),
 				'require_nonce' => FALSE
 			),
 			'default_event_settings' => array(
@@ -397,7 +397,7 @@  discard block
 block discarded – undo
 						'filename' => 'events_default_settings_status'
 					)
 				),
-				'help_tour' => array( 'Event_Default_Settings_Help_Tour'),
+				'help_tour' => array('Event_Default_Settings_Help_Tour'),
 				'require_nonce' => FALSE
 			),
 			//template settings
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
 						'filename' => 'general_settings_templates'
 					)
 				),
-				'help_tour' => array( 'Templates_Help_Tour' ),
+				'help_tour' => array('Templates_Help_Tour'),
 				'require_nonce' => FALSE
 			),
 			//event category stuff
@@ -437,7 +437,7 @@  discard block
 block discarded – undo
 					'label' => __('Edit Category', 'event_espresso'),
 					'order' => 15,
 					'persistent' => FALSE,
-					'url' => isset($this->_req_data['EVT_CAT_ID']) ? add_query_arg(array('EVT_CAT_ID' => $this->_req_data['EVT_CAT_ID'] ), $this->_current_page_view_url )  : $this->_admin_base_url
+					'url' => isset($this->_req_data['EVT_CAT_ID']) ? add_query_arg(array('EVT_CAT_ID' => $this->_req_data['EVT_CAT_ID']), $this->_current_page_view_url) : $this->_admin_base_url
 					),
 				'help_tabs' => array(
 					'edit_category_help_tab' => array(
@@ -507,14 +507,14 @@  discard block
 block discarded – undo
 
 	public function load_scripts_styles() {
 
-		wp_register_style('events-admin-css', EVENTS_ASSETS_URL . 'events-admin-page.css', array(), EVENT_ESPRESSO_VERSION);
-		wp_register_style('ee-cat-admin', EVENTS_ASSETS_URL . 'ee-cat-admin.css', array(), EVENT_ESPRESSO_VERSION );
+		wp_register_style('events-admin-css', EVENTS_ASSETS_URL.'events-admin-page.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_register_style('ee-cat-admin', EVENTS_ASSETS_URL.'ee-cat-admin.css', array(), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('events-admin-css');
 		wp_enqueue_style('ee-cat-admin');
 		//todo note: we also need to load_scripts_styles per view (i.e. default/view_report/event_details
 		//registers for all views
 		//scripts
-		wp_register_script('event_editor_js', EVENTS_ASSETS_URL . 'event_editor.js', array('ee_admin_js', 'jquery-ui-slider', 'jquery-ui-timepicker-addon'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('event_editor_js', EVENTS_ASSETS_URL.'event_editor.js', array('ee_admin_js', 'jquery-ui-slider', 'jquery-ui-timepicker-addon'), EVENT_ESPRESSO_VERSION, TRUE);
 	}
 
 	/**
@@ -532,11 +532,11 @@  discard block
 block discarded – undo
 	public function load_scripts_styles_edit() {
 		//styles
 		wp_enqueue_style('espresso-ui-theme');
-		wp_register_style('event-editor-css', EVENTS_ASSETS_URL . 'event-editor.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION );
+		wp_register_style('event-editor-css', EVENTS_ASSETS_URL.'event-editor.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('event-editor-css');
 
 		//scripts
-		wp_register_script('event-datetime-metabox', EVENTS_ASSETS_URL . 'event-datetime-metabox.js', array('event_editor_js', 'ee-datepicker'), EVENT_ESPRESSO_VERSION );
+		wp_register_script('event-datetime-metabox', EVENTS_ASSETS_URL.'event-datetime-metabox.js', array('event_editor_js', 'ee-datepicker'), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_script('event-datetime-metabox');
 
 	}
@@ -571,7 +571,7 @@  discard block
 block discarded – undo
 
 
 	public function admin_init() {
-		EE_Registry::$i18n_js_strings[ 'image_confirm' ] = __( 'Do you really want to delete this image? Please remember to update your event to complete the removal.', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['image_confirm'] = __('Do you really want to delete this image? Please remember to update your event to complete the removal.', 'event_espresso');
 	}
 
 
@@ -592,12 +592,12 @@  discard block
 block discarded – undo
 	 */
 	public function verify_event_edit($event = NULL) {
 		// no event?
-		if ( empty( $event )) {
+		if (empty($event)) {
 			// set event
 			$event = $this->_cpt_model_obj;
 		}
 		// STILL no event?
-		if ( empty ( $event )) {
+		if (empty ($event)) {
 			return;
 		}
 		$orig_status = $event->status();
@@ -611,27 +611,27 @@  discard block
 block discarded – undo
 			return;
 		}
 		//made it here so it IS active... next check that any of the tickets are sold.
-		if ( $event->is_sold_out( true ) ) {
-			if ( $orig_status !== EEM_Event::sold_out && $event->status() !== $orig_status ) {
+		if ($event->is_sold_out(true)) {
+			if ($orig_status !== EEM_Event::sold_out && $event->status() !== $orig_status) {
 				EE_Error::add_attention(
 					sprintf(
-						__( 'Please note that the Event Status has automatically been changed to %s because there are no more spaces available for this event.  However, this change is not permanent until you update the event.  You can change the status back to something else before updating if you wish.', 'event_espresso' ),
-						EEH_Template::pretty_status( EEM_Event::sold_out, FALSE, 'sentence' )
+						__('Please note that the Event Status has automatically been changed to %s because there are no more spaces available for this event.  However, this change is not permanent until you update the event.  You can change the status back to something else before updating if you wish.', 'event_espresso'),
+						EEH_Template::pretty_status(EEM_Event::sold_out, FALSE, 'sentence')
 					)
 				);
 			}
 			return;
-		} else if ( $orig_status === EEM_Event::sold_out ) {
+		} else if ($orig_status === EEM_Event::sold_out) {
 			EE_Error::add_attention(
 				sprintf(
-					__( 'Please note that the Event Status has automatically been changed to %s because more spaces have become available for this event, most likely due to abandoned transactions freeing up reserved tickets.  However, this change is not permanent until you update the event. If you wish, you can change the status back to something else before updating.',
-						'event_espresso' ),
-					EEH_Template::pretty_status( $event->status(), false, 'sentence' )
+					__('Please note that the Event Status has automatically been changed to %s because more spaces have become available for this event, most likely due to abandoned transactions freeing up reserved tickets.  However, this change is not permanent until you update the event. If you wish, you can change the status back to something else before updating.',
+						'event_espresso'),
+					EEH_Template::pretty_status($event->status(), false, 'sentence')
 				)
 			);
 		}
 		//now we need to determine if the event has any tickets on sale.  If not then we dont' show the error
-		if ( ! $event->tickets_on_sale() ) {
+		if ( ! $event->tickets_on_sale()) {
 			return;
 		}
 		//made it here so show warning
@@ -650,7 +650,7 @@  discard block
 block discarded – undo
 	 */
 	protected function _edit_event_warning() {
 		// we don't want to add warnings during these requests
-		if ( isset( $this->_req_data['action'] ) && $this->_req_data['action'] === 'editpost' ) {
+		if (isset($this->_req_data['action']) && $this->_req_data['action'] === 'editpost') {
 			return;
 		}
 		EE_Error::add_attention(
@@ -681,7 +681,7 @@  discard block
 block discarded – undo
 			),
 		);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_events', 'espresso_events_trash_events' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_events', 'espresso_events_trash_events')) {
 			$this->_views['trash'] = array(
 				'slug' => 'trash',
 				'label' => __('Trash', 'event_espresso'),
@@ -711,39 +711,39 @@  discard block
 block discarded – undo
 				'desc' => __('View Registrations for Event', 'event_espresso')
 			)
 		);
-		$items  = apply_filters( 'FHEE__Events_Admin_Page___event_legend_items__items', $items );
+		$items = apply_filters('FHEE__Events_Admin_Page___event_legend_items__items', $items);
 		$statuses = array(
 			'sold_out_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::sold_out,
-				'desc' => EEH_Template::pretty_status( EE_Datetime::sold_out, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::sold_out,
+				'desc' => EEH_Template::pretty_status(EE_Datetime::sold_out, FALSE, 'sentence')
 			),
 			'active_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::active,
-				'desc' => EEH_Template::pretty_status( EE_Datetime::active, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::active,
+				'desc' => EEH_Template::pretty_status(EE_Datetime::active, FALSE, 'sentence')
 			),
 			'upcoming_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::upcoming,
-				'desc' => EEH_Template::pretty_status( EE_Datetime::upcoming, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::upcoming,
+				'desc' => EEH_Template::pretty_status(EE_Datetime::upcoming, FALSE, 'sentence')
 			),
 			'postponed_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::postponed,
-				'desc' => EEH_Template::pretty_status( EE_Datetime::postponed, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::postponed,
+				'desc' => EEH_Template::pretty_status(EE_Datetime::postponed, FALSE, 'sentence')
 			),
 			'cancelled_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::cancelled,
-				'desc' => EEH_Template::pretty_status( EE_Datetime::cancelled, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::cancelled,
+				'desc' => EEH_Template::pretty_status(EE_Datetime::cancelled, FALSE, 'sentence')
 			),
 			'expired_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::expired,
-				'desc' => EEH_Template::pretty_status( EE_Datetime::expired, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::expired,
+				'desc' => EEH_Template::pretty_status(EE_Datetime::expired, FALSE, 'sentence')
 			),
 			'inactive_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::inactive,
-				'desc' => EEH_Template::pretty_status( EE_Datetime::inactive, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::inactive,
+				'desc' => EEH_Template::pretty_status(EE_Datetime::inactive, FALSE, 'sentence')
 			)
 		);
-		$statuses = apply_filters( 'FHEE__Events_Admin_Page__event_legend_items__statuses', $statuses );
-		return array_merge( $items, $statuses );
+		$statuses = apply_filters('FHEE__Events_Admin_Page__event_legend_items__statuses', $statuses);
+		return array_merge($items, $statuses);
 	}
 
 
@@ -755,8 +755,8 @@  discard block
 block discarded – undo
 	 * @return EEM_Event
 	 */
 	private function _event_model() {
-		if ( ! $this->_event_model instanceof EEM_Event ) {
-			$this->_event_model = EE_Registry::instance()->load_model( 'Event' );
+		if ( ! $this->_event_model instanceof EEM_Event) {
+			$this->_event_model = EE_Registry::instance()->load_model('Event');
 		}
 		return $this->_event_model;
 	}
@@ -775,12 +775,12 @@  discard block
 block discarded – undo
 	 * @param  string $new_slug  what the slug is
 	 * @return string            The new html string for the permalink area
 	 */
-	public function extra_permalink_field_buttons( $return, $id, $new_title, $new_slug ) {
+	public function extra_permalink_field_buttons($return, $id, $new_title, $new_slug) {
 		//make sure this is only when editing
-		if ( !empty( $id ) ) {
-			$post = get_post( $id );
-			$return .= '<a class="button button-small" onclick="prompt(\'Shortcode:\', jQuery(\'#shortcode\').val()); return false;" href="#"  tabindex="-1">' . __('Shortcode', 'event_espresso') . '</a> ';
-			$return .= '<input id="shortcode" type="hidden" value="[ESPRESSO_TICKET_SELECTOR event_id=' . $post->ID . ']">';
+		if ( ! empty($id)) {
+			$post = get_post($id);
+			$return .= '<a class="button button-small" onclick="prompt(\'Shortcode:\', jQuery(\'#shortcode\').val()); return false;" href="#"  tabindex="-1">'.__('Shortcode', 'event_espresso').'</a> ';
+			$return .= '<input id="shortcode" type="hidden" value="[ESPRESSO_TICKET_SELECTOR event_id='.$post->ID.']">';
 		}
 		return $return;
 	}
@@ -796,8 +796,8 @@  discard block
 block discarded – undo
 	 * @return string html for generated table
 	 */
 	protected function _events_overview_list_table() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$this->_template_args['after_list_table'] = EEH_Template::get_button_or_link( get_post_type_archive_link('espresso_events'), __("View Event Archive Page", "event_espresso"), 'button' ) .
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$this->_template_args['after_list_table'] = EEH_Template::get_button_or_link(get_post_type_archive_link('espresso_events'), __("View Event Archive Page", "event_espresso"), 'button').
 		$this->_display_legend($this->_event_legend_items());
 		$this->_admin_page_title .= $this->get_action_link_or_button('create_new', 'add', array(), 'add-new-h2');
 		$this->display_admin_list_table_page_with_no_sidebar();
@@ -815,51 +815,51 @@  discard block
 block discarded – undo
 
 
 
-	protected function _insert_update_cpt_item( $post_id, $post ) {
+	protected function _insert_update_cpt_item($post_id, $post) {
 
-		if ( $post instanceof WP_Post && $post->post_type !== 'espresso_events' ) {
+		if ($post instanceof WP_Post && $post->post_type !== 'espresso_events') {
 			//getout we're not processing an event save.
 			return;
 		}
 
 		$event_values = array(
-			'EVT_display_desc' => !empty( $this->_req_data['display_desc'] ) ? 1 : 0,
-			'EVT_display_ticket_selector' => !empty( $this->_req_data['display_ticket_selector'] ) ? 1 : 0,
+			'EVT_display_desc' => ! empty($this->_req_data['display_desc']) ? 1 : 0,
+			'EVT_display_ticket_selector' => ! empty($this->_req_data['display_ticket_selector']) ? 1 : 0,
 			'EVT_additional_limit' => min(
-					apply_filters( 'FHEE__EE_Events_Admin__insert_update_cpt_item__EVT_additional_limit_max', 255 ),
-					!empty( $this->_req_data['additional_limit'] ) ? $this->_req_data['additional_limit'] : NULL ),
-			'EVT_default_registration_status' => !empty( $this->_req_data['EVT_default_registration_status'] ) ? $this->_req_data['EVT_default_registration_status'] : EE_Registry::instance()->CFG->registration->default_STS_ID,
-			'EVT_member_only' => !empty( $this->_req_data['member_only'] ) ? 1 : 0,
-			'EVT_allow_overflow' => !empty( $this->_req_data['EVT_allow_overflow'] ) ? 1 : 0,
-			'EVT_timezone_string' => !empty( $this->_req_data['timezone_string'] ) ? $this->_req_data['timezone_string'] : NULL,
-			'EVT_external_URL' => !empty( $this->_req_data['externalURL'] ) ? $this->_req_data['externalURL'] : NULL,
-			'EVT_phone' => !empty( $this->_req_data['event_phone'] ) ? $this->_req_data['event_phone'] : NULL
+					apply_filters('FHEE__EE_Events_Admin__insert_update_cpt_item__EVT_additional_limit_max', 255),
+					! empty($this->_req_data['additional_limit']) ? $this->_req_data['additional_limit'] : NULL ),
+			'EVT_default_registration_status' => ! empty($this->_req_data['EVT_default_registration_status']) ? $this->_req_data['EVT_default_registration_status'] : EE_Registry::instance()->CFG->registration->default_STS_ID,
+			'EVT_member_only' => ! empty($this->_req_data['member_only']) ? 1 : 0,
+			'EVT_allow_overflow' => ! empty($this->_req_data['EVT_allow_overflow']) ? 1 : 0,
+			'EVT_timezone_string' => ! empty($this->_req_data['timezone_string']) ? $this->_req_data['timezone_string'] : NULL,
+			'EVT_external_URL' => ! empty($this->_req_data['externalURL']) ? $this->_req_data['externalURL'] : NULL,
+			'EVT_phone' => ! empty($this->_req_data['event_phone']) ? $this->_req_data['event_phone'] : NULL
 			);
 
 		//update event
-		$success = $this->_event_model()->update_by_ID( $event_values, $post_id );
+		$success = $this->_event_model()->update_by_ID($event_values, $post_id);
 
 
 		//get event_object for other metaboxes... though it would seem to make sense to just use $this->_event_model()->get_one_by_ID( $post_id ).. i have to setup where conditions to override the filters in the model that filter out autodraft and inherit statuses so we GET the inherit id!
-		$get_one_where = array( $this->_event_model()->primary_key_name() => $post_id, 'status' => $post->post_status );
-		$event = $this->_event_model()->get_one( array($get_one_where) );
+		$get_one_where = array($this->_event_model()->primary_key_name() => $post_id, 'status' => $post->post_status);
+		$event = $this->_event_model()->get_one(array($get_one_where));
 
 
 		//the following are default callbacks for event attachment updates that can be overridden by caffeinated functionality and/or addons.
-		$event_update_callbacks = apply_filters( 'FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks', array( array($this, '_default_venue_update' ), array( $this, '_default_tickets_update') ) );
+		$event_update_callbacks = apply_filters('FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks', array(array($this, '_default_venue_update'), array($this, '_default_tickets_update')));
 
 		$att_success = TRUE;
 
-		foreach ( $event_update_callbacks as $e_callback ) {
-			$_succ = call_user_func_array( $e_callback, array( $event,  $this->_req_data ) );
-			$att_success = !$att_success ? $att_success : $_succ; //if ANY of these updates fail then we want the appropriate global error message
+		foreach ($event_update_callbacks as $e_callback) {
+			$_succ = call_user_func_array($e_callback, array($event, $this->_req_data));
+			$att_success = ! $att_success ? $att_success : $_succ; //if ANY of these updates fail then we want the appropriate global error message
 		}
 
 		//any errors?
-		if ( $success && FALSE === $att_success ) {
-			EE_Error::add_error( __('Event Details saved successfully but something went wrong with saving attachments.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
-		} else if ( $success === FALSE ) {
-			EE_Error::add_error( __('Event Details did not save successfully.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ($success && FALSE === $att_success) {
+			EE_Error::add_error(__('Event Details saved successfully but something went wrong with saving attachments.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
+		} else if ($success === FALSE) {
+			EE_Error::add_error(__('Event Details did not save successfully.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -869,14 +869,14 @@  discard block
 block discarded – undo
 	/**
 	 * @see parent::restore_item()
 	 */
-	protected function _restore_cpt_item( $post_id, $revision_id ) {
+	protected function _restore_cpt_item($post_id, $revision_id) {
 		//copy existing event meta to new post
 		$post_evt = $this->_event_model()->get_one_by_ID($post_id);
-		if ( $post_evt instanceof EE_Event ) {
+		if ($post_evt instanceof EE_Event) {
 			//meta revision restore
-			$post_evt->restore_revision( $revision_id );
+			$post_evt->restore_revision($revision_id);
 			//related objs restore
-			$post_evt->restore_revision( $revision_id, array( 'Venue', 'Datetime', 'Price' ) );
+			$post_evt->restore_revision($revision_id, array('Venue', 'Datetime', 'Price'));
 		}
 	}
 
@@ -889,52 +889,52 @@  discard block
 block discarded – undo
 	 * @param  array  $data   The request data from the form
 	 * @return bool           Success or fail.
 	 */
-	protected function _default_venue_update( $evtobj, $data ) {
-		require_once( EE_MODELS . 'EEM_Venue.model.php' );
+	protected function _default_venue_update($evtobj, $data) {
+		require_once(EE_MODELS.'EEM_Venue.model.php');
 		$venue_model = EE_Registry::instance()->load_model('Venue');
 		$rows_affected = NULL;
-		$venue_id = !empty( $data['venue_id'] ) ? $data['venue_id'] : NULL;
+		$venue_id = ! empty($data['venue_id']) ? $data['venue_id'] : NULL;
 
 		// very important.  If we don't have a venue name...
 		// then we'll get out because not necessary to create empty venue
-		if ( empty( $data['venue_title'] ) ) {
+		if (empty($data['venue_title'])) {
 			return false;
 		}
 
 		$venue_array = array(
 				'VNU_wp_user' => $evtobj->get('EVT_wp_user'),
-				'VNU_name' => !empty( $data['venue_title'] ) ? $data['venue_title'] : NULL,
-				'VNU_desc' => !empty( $data['venue_description'] ) ? $data['venue_description'] : NULL,
-				'VNU_identifier' => !empty( $data['venue_identifier'] ) ? $data['venue_identifier'] : NULL,
-				'VNU_short_desc' => !empty( $data['venue_short_description'] ) ? $data['venue_short_description'] : NULL,
-				'VNU_address' => !empty( $data['address'] ) ? $data['address'] : NULL,
-				'VNU_address2' => !empty( $data['address2'] ) ? $data['address2'] : NULL,
-				'VNU_city' => !empty( $data['city'] ) ? $data['city'] : NULL,
-				'STA_ID' => !empty( $data['state'] ) ? $data['state'] : NULL,
-				'CNT_ISO' => !empty( $data['countries'] ) ? $data['countries'] : NULL,
-				'VNU_zip' => !empty( $data['zip'] ) ? $data['zip'] : NULL,
-				'VNU_phone' => !empty( $data['venue_phone'] ) ? $data['venue_phone'] : NULL,
-				'VNU_capacity' => !empty( $data['venue_capacity'] ) ? $data['venue_capacity'] : NULL,
-				'VNU_url' => !empty($data['venue_url'] ) ? $data['venue_url'] : NULL,
-				'VNU_virtual_phone' => !empty($data['virtual_phone']) ? $data['virtual_phone'] : NULL,
-				'VNU_virtual_url' => !empty( $data['virtual_url'] ) ? $data['virtual_url'] : NULL,
-				'VNU_enable_for_gmap' => isset( $data['enable_for_gmap'] ) ? 1 : 0,
+				'VNU_name' => ! empty($data['venue_title']) ? $data['venue_title'] : NULL,
+				'VNU_desc' => ! empty($data['venue_description']) ? $data['venue_description'] : NULL,
+				'VNU_identifier' => ! empty($data['venue_identifier']) ? $data['venue_identifier'] : NULL,
+				'VNU_short_desc' => ! empty($data['venue_short_description']) ? $data['venue_short_description'] : NULL,
+				'VNU_address' => ! empty($data['address']) ? $data['address'] : NULL,
+				'VNU_address2' => ! empty($data['address2']) ? $data['address2'] : NULL,
+				'VNU_city' => ! empty($data['city']) ? $data['city'] : NULL,
+				'STA_ID' => ! empty($data['state']) ? $data['state'] : NULL,
+				'CNT_ISO' => ! empty($data['countries']) ? $data['countries'] : NULL,
+				'VNU_zip' => ! empty($data['zip']) ? $data['zip'] : NULL,
+				'VNU_phone' => ! empty($data['venue_phone']) ? $data['venue_phone'] : NULL,
+				'VNU_capacity' => ! empty($data['venue_capacity']) ? $data['venue_capacity'] : NULL,
+				'VNU_url' => ! empty($data['venue_url']) ? $data['venue_url'] : NULL,
+				'VNU_virtual_phone' => ! empty($data['virtual_phone']) ? $data['virtual_phone'] : NULL,
+				'VNU_virtual_url' => ! empty($data['virtual_url']) ? $data['virtual_url'] : NULL,
+				'VNU_enable_for_gmap' => isset($data['enable_for_gmap']) ? 1 : 0,
 				'status' => 'publish'
 			);
 
 
 		//if we've got the venue_id then we're just updating the existing venue so let's do that and then get out.
-		if ( !empty( $venue_id ) ) {
-			$update_where = array( $venue_model->primary_key_name() => $venue_id );
-			$rows_affected = $venue_model->update( $venue_array, array( $update_where ) );
+		if ( ! empty($venue_id)) {
+			$update_where = array($venue_model->primary_key_name() => $venue_id);
+			$rows_affected = $venue_model->update($venue_array, array($update_where));
 			//we've gotta make sure that the venue is always attached to a revision.. add_relation_to should take care of making sure that the relation is already present.
-			$evtobj->_add_relation_to( $venue_id, 'Venue' );
+			$evtobj->_add_relation_to($venue_id, 'Venue');
 			return $rows_affected > 0 ? TRUE : FALSE;
 		} else {
 			//we insert the venue
-			$venue_id = $venue_model->insert( $venue_array );
-			$evtobj->_add_relation_to( $venue_id, 'Venue' );
-			return !empty( $venue_id ) ? TRUE : FALSE;
+			$venue_id = $venue_model->insert($venue_array);
+			$evtobj->_add_relation_to($venue_id, 'Venue');
+			return ! empty($venue_id) ? TRUE : FALSE;
 		}
 		//when we have the ancestor come in it's already been handled by the revision save.
 	}
@@ -948,55 +948,55 @@  discard block
 block discarded – undo
 	 * @param  array    $data   The request data from the form
 	 * @return bool             success or fail
 	 */
-	protected function _default_tickets_update( EE_Event $evtobj, $data ) {
+	protected function _default_tickets_update(EE_Event $evtobj, $data) {
 		$success = true;
 		$saved_dtt = null;
 		$saved_tickets = array();
-		$incoming_date_formats = array( 'Y-m-d', 'h:i a' );
+		$incoming_date_formats = array('Y-m-d', 'h:i a');
 
-		foreach ( $data['edit_event_datetimes'] as $row => $dtt ) {
+		foreach ($data['edit_event_datetimes'] as $row => $dtt) {
 			//trim all values to ensure any excess whitespace is removed.
-			$dtt =  array_map( 'trim', $dtt );
-			$dtt['DTT_EVT_end'] = isset($dtt['DTT_EVT_end']) && ! empty( $dtt['DTT_EVT_end'] ) ? $dtt['DTT_EVT_end'] : $dtt['DTT_EVT_start'];
+			$dtt = array_map('trim', $dtt);
+			$dtt['DTT_EVT_end'] = isset($dtt['DTT_EVT_end']) && ! empty($dtt['DTT_EVT_end']) ? $dtt['DTT_EVT_end'] : $dtt['DTT_EVT_start'];
 			$datetime_values = array(
-				'DTT_ID' 		=> ! empty( $dtt['DTT_ID'] ) ? $dtt['DTT_ID'] : NULL,
+				'DTT_ID' 		=> ! empty($dtt['DTT_ID']) ? $dtt['DTT_ID'] : NULL,
 				'DTT_EVT_start' => $dtt['DTT_EVT_start'],
 				'DTT_EVT_end' 	=> $dtt['DTT_EVT_end'],
-				'DTT_reg_limit' => empty( $dtt['DTT_reg_limit'] ) ? EE_INF : $dtt['DTT_reg_limit'],
+				'DTT_reg_limit' => empty($dtt['DTT_reg_limit']) ? EE_INF : $dtt['DTT_reg_limit'],
 				'DTT_order' 	=> $row,
 			);
 
 			//if we have an id then let's get existing object first and then set the new values.  Otherwise we instantiate a new object for save.
 
-			if ( !empty( $dtt['DTT_ID'] ) ) {
-				$DTM = EE_Registry::instance()->load_model('Datetime', array( $evtobj->get_timezone() ) )->get_one_by_ID($dtt['DTT_ID'] );
-				$DTM->set_date_format( $incoming_date_formats[0] );
-				$DTM->set_time_format( $incoming_date_formats[1] );
-				foreach ( $datetime_values as $field => $value ) {
-					$DTM->set( $field, $value );
+			if ( ! empty($dtt['DTT_ID'])) {
+				$DTM = EE_Registry::instance()->load_model('Datetime', array($evtobj->get_timezone()))->get_one_by_ID($dtt['DTT_ID']);
+				$DTM->set_date_format($incoming_date_formats[0]);
+				$DTM->set_time_format($incoming_date_formats[1]);
+				foreach ($datetime_values as $field => $value) {
+					$DTM->set($field, $value);
 				}
 
 				//make sure the $dtt_id here is saved just in case after the add_relation_to() the autosave replaces it.  We need to do this so we dont' TRASH the parent DTT.
 				$saved_dtts[$DTM->ID()] = $DTM;
 			} else {
-				$DTM = EE_Registry::instance()->load_class('Datetime', array( $datetime_values ), FALSE, FALSE );
-				$DTM->set_date_format( $incoming_date_formats[0] );
-				$DTM->set_time_format( $incoming_date_formats[1] );
-				$DTM->set_timezone( $evtobj->get_timezone() );
-				foreach ( $datetime_values as $field => $value ) {
-					$DTM->set( $field, $value );
+				$DTM = EE_Registry::instance()->load_class('Datetime', array($datetime_values), FALSE, FALSE);
+				$DTM->set_date_format($incoming_date_formats[0]);
+				$DTM->set_time_format($incoming_date_formats[1]);
+				$DTM->set_timezone($evtobj->get_timezone());
+				foreach ($datetime_values as $field => $value) {
+					$DTM->set($field, $value);
 				}
 			}
 			$DTM->save();
 
-			$DTT = $evtobj->_add_relation_to( $DTM, 'Datetime' );
+			$DTT = $evtobj->_add_relation_to($DTM, 'Datetime');
 
 			//load DTT helper
 			EE_Registry::instance()->load_helper('DTT_Helper');
 
 			//before going any further make sure our dates are setup correctly so that the end date is always equal or greater than the start date.
-			if( $DTT->get_raw('DTT_EVT_start') > $DTT->get_raw('DTT_EVT_end') ) {
-				$DTT->set('DTT_EVT_end', $DTT->get('DTT_EVT_start') );
+			if ($DTT->get_raw('DTT_EVT_start') > $DTT->get_raw('DTT_EVT_end')) {
+				$DTT->set('DTT_EVT_end', $DTT->get('DTT_EVT_start'));
 				$DTT = EEH_DTT_Helper::date_time_add($DTT, 'DTT_EVT_end', 'days');
 				$DTT->save();
 			}
@@ -1004,45 +1004,45 @@  discard block
 block discarded – undo
 			//now we got to make sure we add the new DTT_ID to the $saved_dtts array  because it is possible there was a new one created for the autosave.
 			$saved_dtt = $DTT;
 
-			$success = !$success ? $success : $DTT; //if ANY of these updates fail then we want the appropriate global error message. //todod this is actually sucky we need a better error message but this is what it is for now.
+			$success = ! $success ? $success : $DTT; //if ANY of these updates fail then we want the appropriate global error message. //todod this is actually sucky we need a better error message but this is what it is for now.
 		}
 
 		//no dtts get deleted so we don't do any of that logic here.
 		//update tickets next
-		$old_tickets = isset( $data['ticket_IDs'] ) ? explode(',', $data['ticket_IDs'] ) : array();
-		foreach ( $data['edit_tickets'] as $row => $tkt ) {
-			$incoming_date_formats = array( 'Y-m-d', 'h:i a' );
+		$old_tickets = isset($data['ticket_IDs']) ? explode(',', $data['ticket_IDs']) : array();
+		foreach ($data['edit_tickets'] as $row => $tkt) {
+			$incoming_date_formats = array('Y-m-d', 'h:i a');
 			$update_prices = false;
-			$ticket_price = isset( $data['edit_prices'][$row][1]['PRC_amount'] ) ? $data['edit_prices'][$row][1]['PRC_amount'] : 0;
+			$ticket_price = isset($data['edit_prices'][$row][1]['PRC_amount']) ? $data['edit_prices'][$row][1]['PRC_amount'] : 0;
 
 			// trim inputs to ensure any excess whitespace is removed.
-			$tkt = array_map( 'trim', $tkt );
+			$tkt = array_map('trim', $tkt);
 
-			if ( empty( $tkt['TKT_start_date'] ) ) {
+			if (empty($tkt['TKT_start_date'])) {
 				//let's use now in the set timezone.
-				$now = new DateTime( 'now', new DateTimeZone( $evtobj->get_timezone() ) );
-				$tkt['TKT_start_date'] = $now->format( $incoming_date_formats[0] . ' ' . $incoming_date_formats[1] );
+				$now = new DateTime('now', new DateTimeZone($evtobj->get_timezone()));
+				$tkt['TKT_start_date'] = $now->format($incoming_date_formats[0].' '.$incoming_date_formats[1]);
 			}
 
-			if ( empty( $tkt['TKT_end_date'] ) ) {
+			if (empty($tkt['TKT_end_date'])) {
 				//use the start date of the first datetime
 				$dtt = $evtobj->first_datetime();
-				$tkt['TKT_end_date'] = $dtt->start_date_and_time( $incoming_date_formats[0], $incoming_date_formats[1] );
+				$tkt['TKT_end_date'] = $dtt->start_date_and_time($incoming_date_formats[0], $incoming_date_formats[1]);
 			}
 
 			$TKT_values = array(
-				'TKT_ID' 			=> !empty( $tkt['TKT_ID'] ) ? $tkt['TKT_ID'] : NULL,
-				'TTM_ID' 			=> !empty( $tkt['TTM_ID'] ) ? $tkt['TTM_ID'] : 0,
-				'TKT_name' 			=> !empty( $tkt['TKT_name'] ) ? $tkt['TKT_name'] : '',
-				'TKT_description' 	=> !empty( $tkt['TKT_description'] ) ? $tkt['TKT_description'] : '',
+				'TKT_ID' 			=> ! empty($tkt['TKT_ID']) ? $tkt['TKT_ID'] : NULL,
+				'TTM_ID' 			=> ! empty($tkt['TTM_ID']) ? $tkt['TTM_ID'] : 0,
+				'TKT_name' 			=> ! empty($tkt['TKT_name']) ? $tkt['TKT_name'] : '',
+				'TKT_description' 	=> ! empty($tkt['TKT_description']) ? $tkt['TKT_description'] : '',
 				'TKT_start_date' 	=> $tkt['TKT_start_date'],
 				'TKT_end_date' 		=> $tkt['TKT_end_date'],
-				'TKT_qty' 			=> ! isset( $tkt[ 'TKT_qty' ] ) || $tkt[ 'TKT_qty' ] === '' ? EE_INF : $tkt['TKT_qty'],
-				'TKT_uses' 			=> ! isset( $tkt[ 'TKT_uses' ] ) || $tkt[ 'TKT_uses' ] === '' ? EE_INF : $tkt[ 'TKT_uses' ],
-				'TKT_min' 			=> empty( $tkt['TKT_min'] ) ? 0 : $tkt['TKT_min'],
-				'TKT_max' 			=> empty( $tkt['TKT_max'] ) ? EE_INF : $tkt['TKT_max'],
+				'TKT_qty' 			=> ! isset($tkt['TKT_qty']) || $tkt['TKT_qty'] === '' ? EE_INF : $tkt['TKT_qty'],
+				'TKT_uses' 			=> ! isset($tkt['TKT_uses']) || $tkt['TKT_uses'] === '' ? EE_INF : $tkt['TKT_uses'],
+				'TKT_min' 			=> empty($tkt['TKT_min']) ? 0 : $tkt['TKT_min'],
+				'TKT_max' 			=> empty($tkt['TKT_max']) ? EE_INF : $tkt['TKT_max'],
 				'TKT_row' 			=> $row,
-				'TKT_order' 		=> isset( $tkt['TKT_order'] ) ? $tkt['TKT_order'] : $row,
+				'TKT_order' 		=> isset($tkt['TKT_order']) ? $tkt['TKT_order'] : $row,
 				'TKT_price' 		=> $ticket_price
 			);
 
@@ -1050,7 +1050,7 @@  discard block
 block discarded – undo
 
 
 			//if this is a default TKT, then we need to set the TKT_ID to 0 and update accordingly, which means in turn that the prices will become new prices as well.
-			if ( isset( $tkt['TKT_is_default'] ) && $tkt['TKT_is_default'] ) {
+			if (isset($tkt['TKT_is_default']) && $tkt['TKT_is_default']) {
 				$TKT_values['TKT_ID'] = 0;
 				$TKT_values['TKT_is_default'] = 0;
 				$TKT_values['TKT_price'] = $ticket_price;
@@ -1061,58 +1061,58 @@  discard block
 block discarded – undo
 			//we actually do our saves a head of doing any add_relations to because its entirely possible that this ticket didn't removed or added to any datetime in the session but DID have it's items modified.
 			//keep in mind that if the TKT has been sold (and we have changed pricing information), then we won't be updating the tkt but instead a new tkt will be created and the old one archived.
 
-			if ( !empty( $tkt['TKT_ID'] ) ) {
-				$TKT = EE_Registry::instance()->load_model( 'Ticket', array( $evtobj->get_timezone() ) )->get_one_by_ID( $tkt['TKT_ID'] );
-				if ( $TKT instanceof EE_Ticket ) {
-					$ticket_sold = $TKT->count_related( 'Registration', array( array( 'STS_ID' => array( 'NOT IN', array( EEM_Registration::status_id_incomplete ) ) ) ) ) > 0 ? true : false;
+			if ( ! empty($tkt['TKT_ID'])) {
+				$TKT = EE_Registry::instance()->load_model('Ticket', array($evtobj->get_timezone()))->get_one_by_ID($tkt['TKT_ID']);
+				if ($TKT instanceof EE_Ticket) {
+					$ticket_sold = $TKT->count_related('Registration', array(array('STS_ID' => array('NOT IN', array(EEM_Registration::status_id_incomplete))))) > 0 ? true : false;
 					//let's just check the total price for the existing ticket and determine if it matches the new total price.  if they are different then we create a new ticket (if tkts sold) if they aren't different then we go ahead and modify existing ticket.
-					$create_new_TKT = $ticket_sold && $ticket_price != $TKT->get( 'TKT_price' ) && ! $TKT->get( 'TKT_deleted' ) ? true : false;
-					$TKT->set_date_format( $incoming_date_formats[ 0 ] );
-					$TKT->set_time_format( $incoming_date_formats[ 1 ] );
+					$create_new_TKT = $ticket_sold && $ticket_price != $TKT->get('TKT_price') && ! $TKT->get('TKT_deleted') ? true : false;
+					$TKT->set_date_format($incoming_date_formats[0]);
+					$TKT->set_time_format($incoming_date_formats[1]);
 					//set new values
-					foreach ( $TKT_values as $field => $value ) {
-						if ( $field == 'TKT_qty' ) {
-							$TKT->set_qty( $value );
+					foreach ($TKT_values as $field => $value) {
+						if ($field == 'TKT_qty') {
+							$TKT->set_qty($value);
 						} else {
-							$TKT->set( $field, $value );
+							$TKT->set($field, $value);
 						}
 					}
 					//if $create_new_TKT is false then we can safely update the existing ticket.  Otherwise we have to create a new ticket.
-					if ( $create_new_TKT ) {
+					if ($create_new_TKT) {
 						//archive the old ticket first
-						$TKT->set( 'TKT_deleted', 1 );
+						$TKT->set('TKT_deleted', 1);
 						$TKT->save();
 						//make sure this ticket is still recorded in our saved_tkts so we don't run it through the regular trash routine.
-						$saved_tickets[ $TKT->ID() ] = $TKT;
+						$saved_tickets[$TKT->ID()] = $TKT;
 						//create new ticket that's a copy of the existing except a new id of course (and not archived) AND has the new TKT_price associated with it.
 						$TKT = clone $TKT;
-						$TKT->set( 'TKT_ID', 0 );
-						$TKT->set( 'TKT_deleted', 0 );
-						$TKT->set( 'TKT_price', $ticket_price );
-						$TKT->set( 'TKT_sold', 0 );
+						$TKT->set('TKT_ID', 0);
+						$TKT->set('TKT_deleted', 0);
+						$TKT->set('TKT_price', $ticket_price);
+						$TKT->set('TKT_sold', 0);
 						//now we need to make sure that $new prices are created as well and attached to new ticket.
 						$update_prices = true;
 					}
 					//make sure price is set if it hasn't been already
-					$TKT->set( 'TKT_price', $ticket_price );
+					$TKT->set('TKT_price', $ticket_price);
 				}
 
 			} else {
 				//no TKT_id so a new TKT
 				$TKT_values['TKT_price'] = $ticket_price;
-				$TKT = EE_Registry::instance()->load_class('Ticket', array( $TKT_values ), FALSE, FALSE );
-				if ( $TKT instanceof EE_Ticket ) {
+				$TKT = EE_Registry::instance()->load_class('Ticket', array($TKT_values), FALSE, FALSE);
+				if ($TKT instanceof EE_Ticket) {
 					//need to reset values to properly account for the date formats
-					$TKT->set_date_format( $incoming_date_formats[0] );
-					$TKT->set_time_format( $incoming_date_formats[1] );
-					$TKT->set_timezone( $evtobj->get_timezone() );
+					$TKT->set_date_format($incoming_date_formats[0]);
+					$TKT->set_time_format($incoming_date_formats[1]);
+					$TKT->set_timezone($evtobj->get_timezone());
 
 					//set new values
-					foreach ( $TKT_values as $field => $value ) {
-						if ( $field == 'TKT_qty' ) {
-							$TKT->set_qty( $value );
+					foreach ($TKT_values as $field => $value) {
+						if ($field == 'TKT_qty') {
+							$TKT->set_qty($value);
 						} else {
-							$TKT->set( $field, $value );
+							$TKT->set($field, $value);
 						}
 					}
 
@@ -1120,32 +1120,32 @@  discard block
 block discarded – undo
 				}
 			}
 			// cap ticket qty by datetime reg limits
-			$TKT->set_qty( min( $TKT->qty(), $TKT->qty( 'reg_limit' ) ) );
+			$TKT->set_qty(min($TKT->qty(), $TKT->qty('reg_limit')));
 			//update ticket.
 			$TKT->save();
 
 			//before going any further make sure our dates are setup correctly so that the end date is always equal or greater than the start date.
-			if( $TKT->get_raw('TKT_start_date') > $TKT->get_raw('TKT_end_date') ) {
-				$TKT->set('TKT_end_date', $TKT->get('TKT_start_date') );
+			if ($TKT->get_raw('TKT_start_date') > $TKT->get_raw('TKT_end_date')) {
+				$TKT->set('TKT_end_date', $TKT->get('TKT_start_date'));
 				EE_Registry::instance()->load_helper('DTT_Helper');
 				$TKT = EEH_DTT_Helper::date_time_add($TKT, 'TKT_end_date', 'days');
 				$TKT->save();
 			}
 
 			//initially let's add the ticket to the dtt
-			$saved_dtt->_add_relation_to( $TKT, 'Ticket' );
+			$saved_dtt->_add_relation_to($TKT, 'Ticket');
 
 			$saved_tickets[$TKT->ID()] = $TKT;
 
 			//add prices to ticket
-			$this->_add_prices_to_ticket( $data['edit_prices'][$row], $TKT, $update_prices );
+			$this->_add_prices_to_ticket($data['edit_prices'][$row], $TKT, $update_prices);
 		}
 		//however now we need to handle permanently deleting tickets via the ui.  Keep in mind that the ui does not allow deleting/archiving tickets that have ticket sold.  However, it does allow for deleting tickets that have no tickets sold, in which case we want to get rid of permanently because there is no need to save in db.
-		$old_tickets = isset( $old_tickets[0] ) && $old_tickets[0] == '' ? array() : $old_tickets;
-		$tickets_removed = array_diff( $old_tickets, array_keys( $saved_tickets ) );
+		$old_tickets = isset($old_tickets[0]) && $old_tickets[0] == '' ? array() : $old_tickets;
+		$tickets_removed = array_diff($old_tickets, array_keys($saved_tickets));
 
-		foreach ( $tickets_removed as $id ) {
-			$id = absint( $id );
+		foreach ($tickets_removed as $id) {
+			$id = absint($id);
 
 			//get the ticket for this id
 			$tkt_to_remove = EE_Registry::instance()->load_model('Ticket')->get_one_by_ID($id);
@@ -1153,7 +1153,7 @@  discard block
 block discarded – undo
 			//need to get all the related datetimes on this ticket and remove from every single one of them (remember this process can ONLY kick off if there are NO tkts_sold)
 			$dtts = $tkt_to_remove->get_many_related('Datetime');
 
-			foreach( $dtts as $dtt ) {
+			foreach ($dtts as $dtt) {
 				$tkt_to_remove->_remove_relation_to($dtt, 'Datetime');
 			}
 
@@ -1164,7 +1164,7 @@  discard block
 block discarded – undo
 			//finally let's delete this ticket (which should not be blocked at this point b/c we've removed all our relationships)
 			$tkt_to_remove->delete_permanently();
 		}
-		return array( $saved_dtt, $saved_tickets );
+		return array($saved_dtt, $saved_tickets);
 	}
 
 
@@ -1179,31 +1179,31 @@  discard block
 block discarded – undo
 	 * @param bool 		$new_prices Whether attach existing incoming prices or create new ones.
 	 * @return  void
 	 */
-	private function  _add_prices_to_ticket( $prices, EE_Ticket $ticket, $new_prices = FALSE ) {
-		foreach ( $prices as $row => $prc ) {
+	private function  _add_prices_to_ticket($prices, EE_Ticket $ticket, $new_prices = FALSE) {
+		foreach ($prices as $row => $prc) {
 			$PRC_values = array(
-				'PRC_ID' => !empty( $prc['PRC_ID'] ) ? $prc['PRC_ID'] : NULL,
-				'PRT_ID' => !empty( $prc['PRT_ID'] ) ? $prc['PRT_ID'] : NULL,
-				'PRC_amount' => !empty( $prc['PRC_amount'] ) ? $prc['PRC_amount'] : 0,
-				'PRC_name' => !empty( $prc['PRC_name'] ) ? $prc['PRC_name'] : '',
-				'PRC_desc' => !empty( $prc['PRC_desc'] ) ? $prc['PRC_desc'] : '',
+				'PRC_ID' => ! empty($prc['PRC_ID']) ? $prc['PRC_ID'] : NULL,
+				'PRT_ID' => ! empty($prc['PRT_ID']) ? $prc['PRT_ID'] : NULL,
+				'PRC_amount' => ! empty($prc['PRC_amount']) ? $prc['PRC_amount'] : 0,
+				'PRC_name' => ! empty($prc['PRC_name']) ? $prc['PRC_name'] : '',
+				'PRC_desc' => ! empty($prc['PRC_desc']) ? $prc['PRC_desc'] : '',
 				'PRC_is_default' => 0, //make sure prices are NOT set as default from this context
 				'PRC_order' => $row
 			);
 
-			if ( $new_prices || empty( $PRC_values['PRC_ID'] ) ) {
+			if ($new_prices || empty($PRC_values['PRC_ID'])) {
 				$PRC_values['PRC_ID'] = 0;
-				$PRC = EE_Registry::instance()->load_class('Price', array( $PRC_values ), FALSE, FALSE);
+				$PRC = EE_Registry::instance()->load_class('Price', array($PRC_values), FALSE, FALSE);
 			} else {
-				$PRC = EE_Registry::instance()->load_model( 'Price' )->get_one_by_ID( $prc['PRC_ID'] );
+				$PRC = EE_Registry::instance()->load_model('Price')->get_one_by_ID($prc['PRC_ID']);
 				//update this price with new values
-				foreach ( $PRC_values as $field => $newprc ) {
-					$PRC->set( $field, $newprc );
+				foreach ($PRC_values as $field => $newprc) {
+					$PRC->set($field, $newprc);
 				}
 				$PRC->save();
 			}
 
-			$ticket->_add_relation_to( $PRC, 'Price' );
+			$ticket->_add_relation_to($PRC, 'Price');
 		}
 	}
 
@@ -1239,12 +1239,12 @@  discard block
 block discarded – undo
 	private function _generate_publish_box_extra_content() {
 
 		//load formatter helper
-  		EE_Registry::instance()->load_helper( 'Formatter' );
+  		EE_Registry::instance()->load_helper('Formatter');
 
   		//args for getting related registrations
-  		$approved_query_args = array( array( 'REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_approved ) );
-  		$not_approved_query_args = array( array( 'REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_not_approved ) );
-  		$pending_payment_query_args = array( array( 'REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_pending_payment ) );
+  		$approved_query_args = array(array('REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_approved));
+  		$not_approved_query_args = array(array('REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_not_approved));
+  		$pending_payment_query_args = array(array('REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_pending_payment));
 
 
 		// publish box
@@ -1273,9 +1273,9 @@  discard block
 block discarded – undo
 				),
 				REG_ADMIN_URL
 			),
-			'approved_regs' => $this->_cpt_model_obj->count_related( 'Registration', $approved_query_args ),
-			'not_approved_regs' => $this->_cpt_model_obj->count_related( 'Registration', $not_approved_query_args ),
-			'pending_payment_regs' => $this->_cpt_model_obj->count_related( 'Registration', $pending_payment_query_args ),
+			'approved_regs' => $this->_cpt_model_obj->count_related('Registration', $approved_query_args),
+			'not_approved_regs' => $this->_cpt_model_obj->count_related('Registration', $not_approved_query_args),
+			'pending_payment_regs' => $this->_cpt_model_obj->count_related('Registration', $pending_payment_query_args),
 			'misc_pub_section_class' => apply_filters(
 				'FHEE_Events_Admin_Page___generate_publish_box_extra_content__misc_pub_section_class',
 				'misc-pub-section'
@@ -1294,9 +1294,9 @@  discard block
 block discarded – undo
 			'AHEE__Events_Admin_Page___generate_publish_box_extra_content__event_editor_overview_add',
 			$this->_cpt_model_obj
 		);
-		$publish_box_extra_args[ 'event_editor_overview_add' ] = ob_get_clean();
+		$publish_box_extra_args['event_editor_overview_add'] = ob_get_clean();
 		// load template
-		EEH_Template::display_template( EVENTS_TEMPLATE_PATH . 'event_publish_box_extras.template.php', $publish_box_extra_args );
+		EEH_Template::display_template(EVENTS_TEMPLATE_PATH.'event_publish_box_extras.template.php', $publish_box_extra_args);
 	}
 
 
@@ -1328,16 +1328,16 @@  discard block
 block discarded – undo
 		$this->verify_cpt_object();
 		add_meta_box(
 			'espresso_event_editor_tickets',
-			__( 'Event Datetime & Ticket', 'event_espresso' ),
-			array( $this, 'ticket_metabox' ),
+			__('Event Datetime & Ticket', 'event_espresso'),
+			array($this, 'ticket_metabox'),
 			$this->page_slug,
 			'normal',
 			'high'
 		);
 		add_meta_box(
 			'espresso_event_editor_event_options',
-			__( 'Event Registration Options', 'event_espresso' ),
-			array( $this, 'registration_options_meta_box' ),
+			__('Event Registration Options', 'event_espresso'),
+			array($this, 'registration_options_meta_box'),
 			$this->page_slug,
 			'side',
 			'default'
@@ -1367,37 +1367,37 @@  discard block
 block discarded – undo
 			'disabled' => ''
 			);
 
-		$event_id = is_object( $this->_cpt_model_obj ) ? $this->_cpt_model_obj->ID() : NULL;
+		$event_id = is_object($this->_cpt_model_obj) ? $this->_cpt_model_obj->ID() : NULL;
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		/**
 		 * 1. Start with retrieving Datetimes
 		 * 2. Fore each datetime get related tickets
 		 * 3. For each ticket get related prices
 		 */
-		$times = EE_Registry::instance()->load_model('Datetime' )->get_all_event_dates( $event_id );
-		EE_Registry::instance()->load_helper('DTT_Helper' );
+		$times = EE_Registry::instance()->load_model('Datetime')->get_all_event_dates($event_id);
+		EE_Registry::instance()->load_helper('DTT_Helper');
 		/** @type EE_Datetime $first_datetime */
-		$first_datetime = reset( $times );
+		$first_datetime = reset($times);
 		//do we get related tickets?
-		if ( $first_datetime instanceof EE_Datetime
-			&& $first_datetime->ID() !== 0 ) {
+		if ($first_datetime instanceof EE_Datetime
+			&& $first_datetime->ID() !== 0) {
 			$existing_datetime_ids[] = $first_datetime->get('DTT_ID');
 			$template_args['time'] = $first_datetime;
 			$related_tickets = $first_datetime->tickets(
 				array(
-					array( 'OR' => array( 'TKT_deleted' => 1, 'TKT_deleted*' => 0 ) ),
+					array('OR' => array('TKT_deleted' => 1, 'TKT_deleted*' => 0)),
 					'default_where_conditions' => 'none'
 				)
 			);
 
-			if ( !empty($related_tickets) ) {
+			if ( ! empty($related_tickets)) {
 				$template_args['total_ticket_rows'] = count($related_tickets);
 				$row = 0;
-				foreach ( $related_tickets as $ticket ) {
+				foreach ($related_tickets as $ticket) {
 					$existing_ticket_ids[] = $ticket->get('TKT_ID');
-					$template_args['ticket_rows'] .= $this->_get_ticket_row($ticket, FALSE, $row );
+					$template_args['ticket_rows'] .= $this->_get_ticket_row($ticket, FALSE, $row);
 
 					$row++;
 				}
@@ -1405,13 +1405,13 @@  discard block
 block discarded – undo
 				$template_args['total_ticket_rows'] = 1;
 				/** @type EE_Ticket $ticket */
 				$ticket = EE_Registry::instance()->load_model('Ticket')->create_default_object();
-				$template_args['ticket_rows'] .= $this->_get_ticket_row( $ticket );
+				$template_args['ticket_rows'] .= $this->_get_ticket_row($ticket);
 			}
 		} else {
 			$template_args['time'] = $times[0];
 			/** @type EE_Ticket $ticket */
 			$ticket = EE_Registry::instance()->load_model('Ticket')->get_all_default_tickets();
-			$template_args['ticket_rows'] .= $this->_get_ticket_row( $ticket[1] );
+			$template_args['ticket_rows'] .= $this->_get_ticket_row($ticket[1]);
 			// NOTE: we're just sending the first default row
 			// (decaf can't manage default tickets so this should be sufficient);
 		}
@@ -1420,8 +1420,8 @@  discard block
 block discarded – undo
 		$template_args['ticket_options_help_link'] = $this->_get_help_tab_link('ticket_options_info');
 		$template_args['existing_datetime_ids'] = implode(',', $existing_datetime_ids);
 		$template_args['existing_ticket_ids'] = implode(',', $existing_ticket_ids);
-		$template_args['ticket_js_structure'] = $this->_get_ticket_row( EE_Registry::instance()->load_model('Ticket')->create_default_object(), TRUE );
-		$template = apply_filters( 'FHEE__Events_Admin_Page__ticket_metabox__template', EVENTS_TEMPLATE_PATH . 'event_tickets_metabox_main.template.php' );
+		$template_args['ticket_js_structure'] = $this->_get_ticket_row(EE_Registry::instance()->load_model('Ticket')->create_default_object(), TRUE);
+		$template = apply_filters('FHEE__Events_Admin_Page__ticket_metabox__template', EVENTS_TEMPLATE_PATH.'event_tickets_metabox_main.template.php');
 		EEH_Template::display_template($template, $template_args);
 	}
 
@@ -1436,21 +1436,21 @@  discard block
 block discarded – undo
 	 * @param int        $row
 	 * @return string generated html for the ticket row.
 	 */
-	private function _get_ticket_row( $ticket, $skeleton = FALSE, $row = 0 ) {
+	private function _get_ticket_row($ticket, $skeleton = FALSE, $row = 0) {
 		$template_args = array(
-			'tkt_status_class' => ' tkt-status-' . $ticket->ticket_status(),
-			'tkt_archive_class' => $ticket->ticket_status() === EE_Ticket::archived && !$skeleton ? ' tkt-archived' : '',
+			'tkt_status_class' => ' tkt-status-'.$ticket->ticket_status(),
+			'tkt_archive_class' => $ticket->ticket_status() === EE_Ticket::archived && ! $skeleton ? ' tkt-archived' : '',
 			'ticketrow' => $skeleton ? 'TICKETNUM' : $row,
 			'TKT_ID' => $ticket->get('TKT_ID'),
 			'TKT_name' => $ticket->get('TKT_name'),
 			'TKT_start_date' => $skeleton ? '' : $ticket->get_date('TKT_start_date', 'Y-m-d h:i a'),
 			'TKT_end_date' => $skeleton ? '' : $ticket->get_date('TKT_end_date', 'Y-m-d h:i a'),
 			'TKT_is_default' => $ticket->get('TKT_is_default'),
-			'TKT_qty' => $ticket->get_pretty('TKT_qty','input'),
+			'TKT_qty' => $ticket->get_pretty('TKT_qty', 'input'),
 			'edit_ticketrow_name' => $skeleton ? 'TICKETNAMEATTR' : 'edit_tickets',
 			'TKT_sold' => $skeleton ? 0 : $ticket->get('TKT_sold'),
-			'trash_icon' => ( $skeleton || ( !empty( $ticket ) && ! $ticket->get('TKT_deleted') ) ) && ( !empty( $ticket ) && $ticket->get('TKT_sold') === 0 ) ? 'trash-icon dashicons dashicons-post-trash clickable' : 'ee-lock-icon',
-			'disabled' => $skeleton || ( !empty( $ticket ) && ! $ticket->get('TKT_deleted' ) ) ? '' : ' disabled=disabled'
+			'trash_icon' => ($skeleton || ( ! empty($ticket) && ! $ticket->get('TKT_deleted'))) && ( ! empty($ticket) && $ticket->get('TKT_sold') === 0) ? 'trash-icon dashicons dashicons-post-trash clickable' : 'ee-lock-icon',
+			'disabled' => $skeleton || ( ! empty($ticket) && ! $ticket->get('TKT_deleted')) ? '' : ' disabled=disabled'
 			);
 
 		$price = $ticket->ID() !== 0 ? $ticket->get_first_related('Price', array('default_where_conditions' => 'none')) : EE_Registry::instance()->load_model('Price')->create_default_object();
@@ -1466,23 +1466,23 @@  discard block
 block discarded – undo
 
 		//make sure we have default start and end dates if skeleton
 		//handle rows that should NOT be empty
-		if ( empty( $template_args['TKT_start_date'] ) ) {
+		if (empty($template_args['TKT_start_date'])) {
 			//if empty then the start date will be now.
 			$template_args['TKT_start_date'] = date('Y-m-d h:i a', current_time('timestamp'));
 		}
 
-		if ( empty( $template_args['TKT_end_date'] ) ) {
+		if (empty($template_args['TKT_end_date'])) {
 			//get the earliest datetime (if present);
-			$earliest_dtt = $this->_cpt_model_obj->ID() > 0 ? $this->_cpt_model_obj->get_first_related('Datetime', array('order_by'=> array('DTT_EVT_start' => 'ASC' ) ) ) : NULL;
+			$earliest_dtt = $this->_cpt_model_obj->ID() > 0 ? $this->_cpt_model_obj->get_first_related('Datetime', array('order_by'=> array('DTT_EVT_start' => 'ASC'))) : NULL;
 
-			if ( !empty( $earliest_dtt ) )
+			if ( ! empty($earliest_dtt))
 				$template_args['TKT_end_date'] = $earliest_dtt->get_datetime('DTT_EVT_start', 'Y-m-d', 'h:i a');
 			else
-				$template_args['TKT_end_date'] = date('Y-m-d h:i a', mktime(0, 0, 0, date("m"), date("d")+7, date("Y") ) );
+				$template_args['TKT_end_date'] = date('Y-m-d h:i a', mktime(0, 0, 0, date("m"), date("d") + 7, date("Y")));
 		}
 
-		$template_args = array_merge( $template_args, $price_args );
-		$template = apply_filters( 'FHEE__Events_Admin_Page__get_ticket_row__template', EVENTS_TEMPLATE_PATH . 'event_tickets_metabox_ticket_row.template.php', $ticket);
+		$template_args = array_merge($template_args, $price_args);
+		$template = apply_filters('FHEE__Events_Admin_Page__get_ticket_row__template', EVENTS_TEMPLATE_PATH.'event_tickets_metabox_ticket_row.template.php', $ticket);
 		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
@@ -1511,8 +1511,8 @@  discard block
 block discarded – undo
 		$template_args['default_registration_status'] = EEH_Form_Fields::select_input('default_reg_status', $default_reg_status_values, $this->_cpt_model_obj->default_registration_status());
 		$template_args['display_description'] = EEH_Form_Fields::select_input('display_desc', $yes_no_values, $this->_cpt_model_obj->display_description());
 		$template_args['display_ticket_selector'] = EEH_Form_Fields::select_input('display_ticket_selector', $yes_no_values, $this->_cpt_model_obj->display_ticket_selector(), '', '', false);
-		$template_args['additional_registration_options'] = apply_filters( 'FHEE__Events_Admin_Page__registration_options_meta_box__additional_registration_options', '', $template_args, $yes_no_values, $default_reg_status_values );
-		$templatepath = EVENTS_TEMPLATE_PATH . 'event_registration_options.template.php';
+		$template_args['additional_registration_options'] = apply_filters('FHEE__Events_Admin_Page__registration_options_meta_box__additional_registration_options', '', $template_args, $yes_no_values, $default_reg_status_values);
+		$templatepath = EVENTS_TEMPLATE_PATH.'event_registration_options.template.php';
 		EEH_Template::display_template($templatepath, $template_args);
 	}
 
@@ -1540,21 +1540,21 @@  discard block
 block discarded – undo
 		$EEME = $this->_event_model();
 
 		$offset = ($current_page - 1) * $per_page;
-		$limit = $count ? NULL : $offset . ',' . $per_page;
+		$limit = $count ? NULL : $offset.','.$per_page;
 		$orderby = isset($this->_req_data['orderby']) ? $this->_req_data['orderby'] : 'EVT_ID';
 		$order = isset($this->_req_data['order']) ? $this->_req_data['order'] : "DESC";
 
 		if (isset($this->_req_data['month_range'])) {
 			$pieces = explode(' ', $this->_req_data['month_range'], 3);
-			$month_r = !empty($pieces[0]) ? date('m', strtotime($pieces[0])) : '';
-			$year_r = !empty($pieces[1]) ? $pieces[1] : '';
+			$month_r = ! empty($pieces[0]) ? date('m', strtotime($pieces[0])) : '';
+			$year_r = ! empty($pieces[1]) ? $pieces[1] : '';
 		}
 
 		$where = array();
 
-		$status = isset( $this->_req_data['status'] ) ? $this->_req_data['status'] : NULL;
+		$status = isset($this->_req_data['status']) ? $this->_req_data['status'] : NULL;
 		//determine what post_status our condition will have for the query.
-		switch ( $status ) {
+		switch ($status) {
 			case 'month' :
 			case 'today' :
 			case NULL :
@@ -1562,7 +1562,7 @@  discard block
 block discarded – undo
 				break;
 
 			case 'draft' :
-				$where['status'] = array( 'IN', array('draft', 'auto-draft') );
+				$where['status'] = array('IN', array('draft', 'auto-draft'));
 				break;
 
 			default :
@@ -1570,43 +1570,43 @@  discard block
 block discarded – undo
 		}
 
 		//categories?
-		$category = isset( $this->_req_data['EVT_CAT'] ) && $this->_req_data['EVT_CAT'] > 0 ? $this->_req_data['EVT_CAT'] : NULL;
+		$category = isset($this->_req_data['EVT_CAT']) && $this->_req_data['EVT_CAT'] > 0 ? $this->_req_data['EVT_CAT'] : NULL;
 
-		if ( !empty ( $category ) ) {
+		if ( ! empty ($category)) {
 			$where['Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
 			$where['Term_Taxonomy.term_id'] = $category;
 		}
 
 		//date where conditions
-		$start_formats = EEM_Datetime::instance()->get_formats_for( 'DTT_EVT_start' );
+		$start_formats = EEM_Datetime::instance()->get_formats_for('DTT_EVT_start');
 		if (isset($this->_req_data['month_range']) && $this->_req_data['month_range'] != '') {
-			$DateTime = new DateTime( $year_r . '-' . $month_r . '-01 00:00:00', new DateTimeZone( EEM_Datetime::instance()->get_timezone() ) );
-			$start = $DateTime->format( implode( ' ', $start_formats  ) );
-			$end = $DateTime->setDate( $year_r, $month_r, $DateTime->format('t') )->setTime(23,59,59)->format( implode( ' ', $start_formats ) );
-			$where['Datetime.DTT_EVT_start'] = array('BETWEEN', array( $start, $end ) );
+			$DateTime = new DateTime($year_r.'-'.$month_r.'-01 00:00:00', new DateTimeZone(EEM_Datetime::instance()->get_timezone()));
+			$start = $DateTime->format(implode(' ', $start_formats));
+			$end = $DateTime->setDate($year_r, $month_r, $DateTime->format('t'))->setTime(23, 59, 59)->format(implode(' ', $start_formats));
+			$where['Datetime.DTT_EVT_start'] = array('BETWEEN', array($start, $end));
 		} else if (isset($this->_req_data['status']) && $this->_req_data['status'] == 'today') {
-			$DateTime = new DateTime( 'now', new DateTimeZone( EEM_Event::instance()->get_timezone() ) );
-			$start = $DateTime->setTime( 0,0,0 )->format( implode( ' ', $start_formats ) );
-			$end = $DateTime->setTime( 23, 59, 59 )->format( implode( ' ', $start_formats ) );
-			$where['Datetime.DTT_EVT_start'] = array( 'BETWEEN', array( $start, $end ) );
-		} else if ( isset($this->_req_data['status']) && $this->_req_data['status'] == 'month' ) {
-			$now = date( 'Y-m-01' );
-			$DateTime = new DateTime( $now, new DateTimeZone( EEM_Event::instance()->get_timezone() ) );
-			$start = $DateTime->setTime( 0, 0, 0 )->format( implode( ' ', $start_formats ) );
-			$end = $DateTime->setDate( date('Y'), date('m'), $DateTime->format('t' ) )->setTime( 23, 59, 59 )->format( implode( ' ', $start_formats ) );
-			$where['Datetime.DTT_EVT_start'] = array( 'BETWEEN', array( $start, $end ) );
+			$DateTime = new DateTime('now', new DateTimeZone(EEM_Event::instance()->get_timezone()));
+			$start = $DateTime->setTime(0, 0, 0)->format(implode(' ', $start_formats));
+			$end = $DateTime->setTime(23, 59, 59)->format(implode(' ', $start_formats));
+			$where['Datetime.DTT_EVT_start'] = array('BETWEEN', array($start, $end));
+		} else if (isset($this->_req_data['status']) && $this->_req_data['status'] == 'month') {
+			$now = date('Y-m-01');
+			$DateTime = new DateTime($now, new DateTimeZone(EEM_Event::instance()->get_timezone()));
+			$start = $DateTime->setTime(0, 0, 0)->format(implode(' ', $start_formats));
+			$end = $DateTime->setDate(date('Y'), date('m'), $DateTime->format('t'))->setTime(23, 59, 59)->format(implode(' ', $start_formats));
+			$where['Datetime.DTT_EVT_start'] = array('BETWEEN', array($start, $end));
 		}
 
 
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_events', 'get_events' ) ) {
-			$where['EVT_wp_user'] =  get_current_user_id();
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_events', 'get_events')) {
+			$where['EVT_wp_user'] = get_current_user_id();
 		} else {
-			if ( ! isset( $where['status'] ) ) {
-				if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_private_events', 'get_events' ) ) {
+			if ( ! isset($where['status'])) {
+				if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_private_events', 'get_events')) {
 					$where['OR'] = array(
-						'status*restrict_private' => array( '!=', 'private' ),
+						'status*restrict_private' => array('!=', 'private'),
 						'AND' => array(
-							'status*inclusive' => array( '=', 'private' ),
+							'status*inclusive' => array('=', 'private'),
 							'EVT_wp_user' => get_current_user_id()
 						)
 					);
@@ -1614,16 +1614,16 @@  discard block
 block discarded – undo
 			}
 		}
 
-		if ( isset( $this->_req_data['EVT_wp_user'] ) ) {
-			if ( $this->_req_data['EVT_wp_user'] != get_current_user_id() && EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_events', 'get_events' ) ) {
+		if (isset($this->_req_data['EVT_wp_user'])) {
+			if ($this->_req_data['EVT_wp_user'] != get_current_user_id() && EE_Registry::instance()->CAP->current_user_can('ee_read_others_events', 'get_events')) {
 				$where['EVT_wp_user'] = $this->_req_data['EVT_wp_user'];
 			}
 		}
 
 
 		//search query handling
-		if ( isset( $this->_req_data['s'] ) ) {
-			$search_string = '%' . $this->_req_data['s'] . '%';
+		if (isset($this->_req_data['s'])) {
+			$search_string = '%'.$this->_req_data['s'].'%';
 			$where['OR'] = array(
 				'EVT_name' => array('LIKE', $search_string),
 				'EVT_desc' => array('LIKE', $search_string),
@@ -1632,32 +1632,32 @@  discard block
 block discarded – undo
 		}
 
 
-		$where = apply_filters( 'FHEE__Events_Admin_Page__get_events__where', $where, $this->_req_data );
-		$query_params = apply_filters( 'FHEE__Events_Admin_Page__get_events__query_params', array($where, 'limit' => $limit, 'order_by' => $orderby, 'order' => $order, 'group_by' => 'EVT_ID' ), $this->_req_data );
+		$where = apply_filters('FHEE__Events_Admin_Page__get_events__where', $where, $this->_req_data);
+		$query_params = apply_filters('FHEE__Events_Admin_Page__get_events__query_params', array($where, 'limit' => $limit, 'order_by' => $orderby, 'order' => $order, 'group_by' => 'EVT_ID'), $this->_req_data);
 
 
 		//let's first check if we have special requests coming in.
-		if ( isset( $this->_req_data['active_status'] ) ) {
-			switch ( $this->_req_data['active_status'] ) {
+		if (isset($this->_req_data['active_status'])) {
+			switch ($this->_req_data['active_status']) {
 				case 'upcoming' :
-					return $EEME->get_upcoming_events( $query_params, $count );
+					return $EEME->get_upcoming_events($query_params, $count);
 					break;
 
 				case 'expired' :
-					return $EEME->get_expired_events( $query_params, $count );
+					return $EEME->get_expired_events($query_params, $count);
 					break;
 
 				case 'active' :
-					return $EEME->get_active_events( $query_params, $count );
+					return $EEME->get_active_events($query_params, $count);
 					break;
 
 				case 'inactive' :
-					return $EEME->get_inactive_events( $query_params, $count );
+					return $EEME->get_inactive_events($query_params, $count);
 					break;
 			}
 		}
 
-		$events = $count ? $EEME->count( array( $where ), 'EVT_ID', true ) : $EEME->get_all( $query_params );
+		$events = $count ? $EEME->count(array($where), 'EVT_ID', true) : $EEME->get_all($query_params);
 
 		return $events;
 	}
@@ -1666,23 +1666,23 @@  discard block
 block discarded – undo
 
 
 	//handling for WordPress CPT actions (trash, restore, delete)
-	public function trash_cpt_item( $post_id ) {
+	public function trash_cpt_item($post_id) {
 		$this->_req_data['EVT_ID'] = $post_id;
-		$this->_trash_or_restore_event( 'trash', FALSE );
+		$this->_trash_or_restore_event('trash', FALSE);
 	}
 
 
 
 
-	public function restore_cpt_item( $post_id ) {
+	public function restore_cpt_item($post_id) {
 		$this->_req_data['EVT_ID'] = $post_id;
-		$this->_trash_or_restore_event( 'draft', FALSE );
+		$this->_trash_or_restore_event('draft', FALSE);
 	}
 
 
-	public function delete_cpt_item( $post_id ) {
+	public function delete_cpt_item($post_id) {
 		$this->_req_data['EVT_ID'] = $post_id;
-		$this->_delete_event( FALSE );
+		$this->_delete_event(FALSE);
 	}
 
 
@@ -1694,7 +1694,7 @@  discard block
 block discarded – undo
 	 * @param  string $event_status
 	 * @return void
 	 */
-	protected function _trash_or_restore_event($event_status = 'trash', $redirect_after = TRUE ) {
+	protected function _trash_or_restore_event($event_status = 'trash', $redirect_after = TRUE) {
 		//determine the event id and set to array.
 		$EVT_ID = isset($this->_req_data['EVT_ID']) ? absint($this->_req_data['EVT_ID']) : FALSE;
 		// loop thru events
@@ -1702,7 +1702,7 @@  discard block
 block discarded – undo
 			// clean status
 			$event_status = sanitize_key($event_status);
 			// grab status
-			if (!empty($event_status)) {
+			if ( ! empty($event_status)) {
 				$success = $this->_change_event_status($EVT_ID, $event_status);
 			} else {
 				$success = FALSE;
@@ -1716,7 +1716,7 @@  discard block
 block discarded – undo
 		}
 		$action = $event_status == 'trash' ? 'moved to the trash' : 'restored from the trash';
 
-		if ( $redirect_after )
+		if ($redirect_after)
 			$this->_redirect_after_action($success, 'Event', $action, array('action' => 'default'));
 	}
 
@@ -1731,7 +1731,7 @@  discard block
 block discarded – undo
 		// clean status
 		$event_status = sanitize_key($event_status);
 		// grab status
-		if (!empty($event_status)) {
+		if ( ! empty($event_status)) {
 			$success = TRUE;
 			//determine the event id and set to array.
 			$EVT_IDs = isset($this->_req_data['EVT_IDs']) ? (array) $this->_req_data['EVT_IDs'] : array();
@@ -1766,15 +1766,15 @@  discard block
 block discarded – undo
 	 * @param  string $event_status
 	 * @return bool
 	 */
-	private function _change_event_status( $EVT_ID = 0, $event_status = '') {
+	private function _change_event_status($EVT_ID = 0, $event_status = '') {
 		// grab event id
-		if (!$EVT_ID) {
+		if ( ! $EVT_ID) {
 			$msg = __('An error occurred. No Event ID or an invalid Event ID was received.', 'event_espresso');
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
-		$this->_cpt_model_obj = EEM_Event::instance()->get_one_by_ID( $EVT_ID );
+		$this->_cpt_model_obj = EEM_Event::instance()->get_one_by_ID($EVT_ID);
 
 		// clean status
 		$event_status = sanitize_key($event_status);
@@ -1800,7 +1800,7 @@  discard block
 block discarded – undo
 				$hook = FALSE;
 		}
 		//use class to change status
-		$this->_cpt_model_obj->set_status( $event_status );
+		$this->_cpt_model_obj->set_status($event_status);
 		$success = $this->_cpt_model_obj->save();
 
 		if ($success === FALSE) {
@@ -1822,15 +1822,15 @@  discard block
 block discarded – undo
 	 * @access protected
 	 * @param bool $redirect_after
 	 */
-	protected function _delete_event( $redirect_after = TRUE ) {
+	protected function _delete_event($redirect_after = TRUE) {
 		//determine the event id and set to array.
 		$EVT_ID = isset($this->_req_data['EVT_ID']) ? absint($this->_req_data['EVT_ID']) : NULL;
-		$EVT_ID = isset( $this->_req_data['post'] ) ? absint( $this->_req_data['post'] ) : $EVT_ID;
+		$EVT_ID = isset($this->_req_data['post']) ? absint($this->_req_data['post']) : $EVT_ID;
 
 
 		// loop thru events
 		if ($EVT_ID) {
-			$success = $this->_permanently_delete_event( $EVT_ID );
+			$success = $this->_permanently_delete_event($EVT_ID);
 			// get list of events with no prices
 			$espresso_no_ticket_prices = get_option('ee_no_ticket_prices', array());
 			// remove this event from the list of events with no prices
@@ -1844,7 +1844,7 @@  discard block
 block discarded – undo
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 
-		if ( $redirect_after )
+		if ($redirect_after)
 			$this->_redirect_after_action($success, 'Event', 'deleted', array('action' => 'default', 'status' => 'trash'));
 	}
 
@@ -1862,12 +1862,12 @@  discard block
 block discarded – undo
 		$EVT_IDs = isset($this->_req_data['EVT_IDs']) ? (array) $this->_req_data['EVT_IDs'] : array();
 		// loop thru events
 		foreach ($EVT_IDs as $EVT_ID) {
-			$EVT_ID = absint( $EVT_ID );
-			if ( $EVT_ID ) {
-				$results = $this->_permanently_delete_event( $EVT_ID );
+			$EVT_ID = absint($EVT_ID);
+			if ($EVT_ID) {
+				$results = $this->_permanently_delete_event($EVT_ID);
 				$success = $results !== FALSE ? $success : FALSE;
 				// remove this event from the list of events with no prices
-				unset( $espresso_no_ticket_prices[ $EVT_ID ] );
+				unset($espresso_no_ticket_prices[$EVT_ID]);
 			} else {
 				$success = FALSE;
 				$msg = __('An error occurred. An event could not be deleted because a valid event ID was not not supplied.', 'event_espresso');
@@ -1887,9 +1887,9 @@  discard block
 block discarded – undo
 	 * @param  int $EVT_ID
 	 * @return bool
 	 */
-	private function _permanently_delete_event( $EVT_ID = 0 ) {
+	private function _permanently_delete_event($EVT_ID = 0) {
 		// grab event id
-		if ( ! $EVT_ID ) {
+		if ( ! $EVT_ID) {
 			$msg = __('An error occurred. No Event ID or an invalid Event ID was received.', 'event_espresso');
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
@@ -1898,19 +1898,19 @@  discard block
 block discarded – undo
 			! $this->_cpt_model_obj instanceof EE_Event
 			|| $this->_cpt_model_obj->ID() !== $EVT_ID
 		) {
-			$this->_cpt_model_obj = EEM_Event::instance()->get_one_by_ID( $EVT_ID );
+			$this->_cpt_model_obj = EEM_Event::instance()->get_one_by_ID($EVT_ID);
 		}
 
-		if ( ! $this->_cpt_model instanceof EE_Event ) {
+		if ( ! $this->_cpt_model instanceof EE_Event) {
 			return false;
 		}
 
 		//need to delete related tickets and prices first.
 		$datetimes = $this->_cpt_model_obj->get_many_related('Datetime');
-		foreach ( $datetimes as $datetime ) {
+		foreach ($datetimes as $datetime) {
 			$this->_cpt_model_obj->_remove_relation_to($datetime, 'Datetime');
 			$tickets = $datetime->get_many_related('Ticket');
-			foreach ( $tickets as $ticket ) {
+			foreach ($tickets as $ticket) {
 				$ticket->_remove_relation_to($datetime, 'Datetime');
 				$ticket->delete_related_permanently('Price');
 				$ticket->delete_permanently();
@@ -1920,14 +1920,14 @@  discard block
 block discarded – undo
 
 		//what about related venues or terms?
 		$venues = $this->_cpt_model_obj->get_many_related('Venue');
-		foreach ( $venues as $venue ) {
+		foreach ($venues as $venue) {
 			$this->_cpt_model_obj->_remove_relation_to($venue, 'Venue');
 		}
 
 		//any attached question groups?
 		$question_groups = $this->_cpt_model_obj->get_many_related('Question_Group');
-		if ( !empty( $question_groups ) ) {
-			foreach ( $question_groups as $question_group ) {
+		if ( ! empty($question_groups)) {
+			foreach ($question_groups as $question_group) {
 				$this->_cpt_model_obj->_remove_relation_to($question_group, 'Question_Group');
 			}
 		}
@@ -1936,12 +1936,12 @@  discard block
 block discarded – undo
 
 
 		//Message Template Groups
-		$this->_cpt_model_obj->_remove_relations( 'Message_Template_Group' );
+		$this->_cpt_model_obj->_remove_relations('Message_Template_Group');
 
 		/** @type EE_Term_Taxonomy[] $term_taxonomies */
 		$term_taxonomies = $this->_cpt_model_obj->term_taxonomies();
 
-		foreach ( $term_taxonomies as $term_taxonomy ) {
+		foreach ($term_taxonomies as $term_taxonomy) {
 			$this->_cpt_model_obj->remove_relation_to_term_taxonomy($term_taxonomy);
 		}
 
@@ -1955,7 +1955,7 @@  discard block
 block discarded – undo
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		do_action( 'AHEE__Events_Admin_Page___permanently_delete_event__after_event_deleted', $EVT_ID );
+		do_action('AHEE__Events_Admin_Page___permanently_delete_event__after_event_deleted', $EVT_ID);
 		return TRUE;
 	}
 
@@ -1972,7 +1972,7 @@  discard block
 block discarded – undo
 	 */
 	public function total_events() {
 
-		$count = EEM_Event::instance()->count( array( 'caps' => 'read_admin' ), 'EVT_ID', true );
+		$count = EEM_Event::instance()->count(array('caps' => 'read_admin'), 'EVT_ID', true);
 		return $count;
 	}
 
@@ -1987,10 +1987,10 @@  discard block
 block discarded – undo
 	 */
 	public function total_events_draft() {
 		$where = array(
-			'status' => array( 'IN', array('draft', 'auto-draft' ) )
+			'status' => array('IN', array('draft', 'auto-draft'))
 			);
 
-		$count = EEM_Event::instance()->count( array( $where, 'caps' => 'read_admin' ), 'EVT_ID', true );
+		$count = EEM_Event::instance()->count(array($where, 'caps' => 'read_admin'), 'EVT_ID', true);
 		return $count;
 	}
 
@@ -2009,7 +2009,7 @@  discard block
 block discarded – undo
 			'status' => 'trash'
 			);
 
-		$count = EEM_Event::instance()->count( array( $where, 'caps' => 'read_admin' ), 'EVT_ID', true );
+		$count = EEM_Event::instance()->count(array($where, 'caps' => 'read_admin'), 'EVT_ID', true);
 		return $count;
 	}
 
@@ -2037,11 +2037,11 @@  discard block
 block discarded – undo
 			// translated
 			TRUE
 		);
-		$this->_template_args['default_reg_status'] = isset( EE_Registry::instance()->CFG->registration->default_STS_ID ) ? sanitize_text_field( EE_Registry::instance()->CFG->registration->default_STS_ID ) : EEM_Registration::status_id_pending_payment;
+		$this->_template_args['default_reg_status'] = isset(EE_Registry::instance()->CFG->registration->default_STS_ID) ? sanitize_text_field(EE_Registry::instance()->CFG->registration->default_STS_ID) : EEM_Registration::status_id_pending_payment;
 
 		$this->_set_add_edit_form_tags('update_default_event_settings');
 		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template(EVENTS_TEMPLATE_PATH . 'event_settings.template.php', $this->_template_args, TRUE);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(EVENTS_TEMPLATE_PATH.'event_settings.template.php', $this->_template_args, TRUE);
 		$this->display_admin_page_with_sidebar();
 	}
 
@@ -2067,9 +2067,9 @@  discard block
 block discarded – undo
 
 	protected function _template_settings() {
 		$this->_admin_page_title = __('Template Settings (Preview)', 'event_espresso');
-		$this->_template_args['preview_img'] = '<img src="' . EVENTS_ASSETS_URL . DS . 'images' . DS . 'caffeinated_template_features.jpg" alt="' . esc_attr__( 'Template Settings Preview screenshot', 'event_espresso' ) . '" />';
-		$this->_template_args['preview_text'] = '<strong>'.__( 'Template Settings is a feature that is only available in the Caffeinated version of Event Espresso. Template Settings allow you to configure some of the appearance options for both the Event List and Event Details pages.', 'event_espresso' ).'</strong>';
-		$this->display_admin_caf_preview_page( 'template_settings_tab' );
+		$this->_template_args['preview_img'] = '<img src="'.EVENTS_ASSETS_URL.DS.'images'.DS.'caffeinated_template_features.jpg" alt="'.esc_attr__('Template Settings Preview screenshot', 'event_espresso').'" />';
+		$this->_template_args['preview_text'] = '<strong>'.__('Template Settings is a feature that is only available in the Caffeinated version of Event Espresso. Template Settings allow you to configure some of the appearance options for both the Event List and Event Details pages.', 'event_espresso').'</strong>';
+		$this->display_admin_caf_preview_page('template_settings_tab');
 	}
 
 
@@ -2082,22 +2082,22 @@  discard block
 block discarded – undo
 	 * @return void
 	 */
 	private function _set_category_object() {
-		if ( isset( $this->_category->id ) && !empty( $this->_category->id ) )
+		if (isset($this->_category->id) && ! empty($this->_category->id))
 			return; //already have the category object so get out.
 
 		//set default category object
 		$this->_set_empty_category_object();
 
 		//only set if we've got an id
-		if ( !isset($this->_req_data['EVT_CAT_ID'] ) ) {
+		if ( ! isset($this->_req_data['EVT_CAT_ID'])) {
 			return;
 		}
 
 		$category_id = absint($this->_req_data['EVT_CAT_ID']);
 
-		$term = get_term( $category_id, 'espresso_event_categories' );
+		$term = get_term($category_id, 'espresso_event_categories');
 
-		if ( !empty( $term ) ) {
+		if ( ! empty($term)) {
 			$this->_category->category_name = $term->name;
 			$this->_category->category_identifier = $term->slug;
 			$this->_category->category_desc = $term->description;
@@ -2111,13 +2111,13 @@  discard block
 block discarded – undo
 
 	private function _set_empty_category_object() {
 		$this->_category = new stdClass();
-		$this->_category->category_name = $this->_category->category_identifier = $this->_category->category_desc  = '';
+		$this->_category->category_name = $this->_category->category_identifier = $this->_category->category_desc = '';
 		$this->_category->id = $this->_category->parent = 0;
 	}
 
 
 	protected function _category_list_table() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$this->_search_btn_label = __('Categories', 'event_espresso');
 		$this->_admin_page_title .= $this->get_action_link_or_button('add_category', 'add_category', array(), 'add-new-h2');
 		$this->display_admin_list_table_page_with_sidebar();
@@ -2127,22 +2127,22 @@  discard block
 block discarded – undo
 	protected function _category_details($view) {
 
 		//load formatter helper
-		EE_Registry::instance()->load_helper( 'Formatter' );
+		EE_Registry::instance()->load_helper('Formatter');
 		//load field generator helper
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
+		EE_Registry::instance()->load_helper('Form_Fields');
 
 		$route = $view == 'edit' ? 'update_category' : 'insert_category';
 		$this->_set_add_edit_form_tags($route);
 
 		$this->_set_category_object();
-		$id = !empty($this->_category->id) ? $this->_category->id : '';
+		$id = ! empty($this->_category->id) ? $this->_category->id : '';
 
 		$delete_action = 'delete_category';
 
 		//custom redirect
-		$redirect = EE_Admin_Page::add_query_args_and_nonce( array('action' => 'category_list'), $this->_admin_base_url );
+		$redirect = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'category_list'), $this->_admin_base_url);
 
-		$this->_set_publish_post_box_vars( 'EVT_CAT_ID', $id, $delete_action, $redirect );
+		$this->_set_publish_post_box_vars('EVT_CAT_ID', $id, $delete_action, $redirect);
 
 		//take care of contents
 		$this->_template_args['admin_page_content'] = $this->_category_details_content();
@@ -2156,25 +2156,25 @@  discard block
 block discarded – undo
 			'type' => 'wp_editor',
 			'value' => EEH_Formatter::admin_format_content($this->_category->category_desc),
 			'class' => 'my_editor_custom',
-			'wpeditor_args' => array('media_buttons' => FALSE )
+			'wpeditor_args' => array('media_buttons' => FALSE)
 		);
-		$_wp_editor = $this->_generate_admin_form_fields( $editor_args, 'array' );
+		$_wp_editor = $this->_generate_admin_form_fields($editor_args, 'array');
 
-		$all_terms = get_terms( array('espresso_event_categories' ), array( 'hide_empty' => 0, 'exclude' => array( $this->_category->id ) ) );
+		$all_terms = get_terms(array('espresso_event_categories'), array('hide_empty' => 0, 'exclude' => array($this->_category->id)));
 
 		//setup category select for term parents.
 		$category_select_values[] = array(
 			'text' => __('No Parent', 'event_espresso'),
 			'id' => 0
 			);
-		foreach ( $all_terms as $term ) {
+		foreach ($all_terms as $term) {
 			$category_select_values[] = array(
 				'text' => $term->name,
 				'id' => $term->term_id
 				);
 		}
 
-		$category_select = EEH_Form_Fields::select_input( 'category_parent', $category_select_values, $this->_category->parent );
+		$category_select = EEH_Form_Fields::select_input('category_parent', $category_select_values, $this->_category->parent);
 
 		$template_args = array(
 			'category' => $this->_category,
@@ -2184,15 +2184,15 @@  discard block
 block discarded – undo
 			'disable' => '',
 			'disabled_message' => FALSE
 			);
-		$template = EVENTS_TEMPLATE_PATH . 'event_category_details.template.php';
-		return EEH_Template::display_template($template, $template_args, TRUE );
+		$template = EVENTS_TEMPLATE_PATH.'event_category_details.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
 	protected function _delete_categories() {
-		$cat_ids = isset( $this->_req_data['EVT_CAT_ID'] ) ? (array) $this->_req_data['EVT_CAT_ID'] : (array) $this->_req_data['category_id'];
+		$cat_ids = isset($this->_req_data['EVT_CAT_ID']) ? (array) $this->_req_data['EVT_CAT_ID'] : (array) $this->_req_data['category_id'];
 
-		foreach ( $cat_ids as $cat_id ) {
+		foreach ($cat_ids as $cat_id) {
 			$this->_delete_category($cat_id);
 		}
 
@@ -2200,7 +2200,7 @@  discard block
 block discarded – undo
 		$query_args = array(
 			'action' => 'category_list'
 			);
-		$this->_redirect_after_action(0,'','',$query_args);
+		$this->_redirect_after_action(0, '', '', $query_args);
 
 	}
 
@@ -2210,61 +2210,61 @@  discard block
 block discarded – undo
 
 	protected function _delete_category($cat_id) {
 		global $wpdb;
-		$cat_id = absint( $cat_id );
-		wp_delete_term( $cat_id, 'espresso_event_categories' );
+		$cat_id = absint($cat_id);
+		wp_delete_term($cat_id, 'espresso_event_categories');
 	}
 
 
 
 	protected function _insert_or_update_category($new_category) {
 
-		$cat_id = $new_category ? $this->_insert_category() : $this->_insert_category( TRUE );
+		$cat_id = $new_category ? $this->_insert_category() : $this->_insert_category(TRUE);
 		$success = 0; //we already have a success message so lets not send another.
 
-		if ( $cat_id ) {
+		if ($cat_id) {
 			$query_args = array(
 				'action'     => 'edit_category',
 				'EVT_CAT_ID' => $cat_id
 			);
 		} else {
-			$query_args = array( 'action' => 'add_category' );
+			$query_args = array('action' => 'add_category');
 		}
-		$this->_redirect_after_action( $success, '','', $query_args, TRUE );
+		$this->_redirect_after_action($success, '', '', $query_args, TRUE);
 
 	}
 
 
 
-	private function _insert_category( $update = FALSE ) {
+	private function _insert_category($update = FALSE) {
 		$cat_id = $update ? $this->_req_data['EVT_CAT_ID'] : '';
-		$category_name= isset( $this->_req_data['category_name'] ) ? $this->_req_data['category_name'] : '';
-		$category_desc= isset( $this->_req_data['category_desc'] ) ? $this->_req_data['category_desc'] : '';
-		$category_parent = isset( $this->_req_data['category_parent'] ) ? $this->_req_data['category_parent'] : 0;
+		$category_name = isset($this->_req_data['category_name']) ? $this->_req_data['category_name'] : '';
+		$category_desc = isset($this->_req_data['category_desc']) ? $this->_req_data['category_desc'] : '';
+		$category_parent = isset($this->_req_data['category_parent']) ? $this->_req_data['category_parent'] : 0;
 
-		if ( empty( $category_name ) ) {
-			$msg = __( 'You must add a name for the category.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($category_name)) {
+			$msg = __('You must add a name for the category.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
-		$term_args=array(
+		$term_args = array(
 			'name'=>$category_name,
 			'description'=>$category_desc,
 			'parent'=>$category_parent
 		);
 		//was the category_identifier input disabled?
-		if(isset($this->_req_data['category_identifier'])){
+		if (isset($this->_req_data['category_identifier'])) {
 			$term_args['slug'] = $this->_req_data['category_identifier'];
 		}
-		$insert_ids = $update ? wp_update_term( $cat_id, 'espresso_event_categories', $term_args ) :wp_insert_term( $category_name, 'espresso_event_categories', $term_args );
+		$insert_ids = $update ? wp_update_term($cat_id, 'espresso_event_categories', $term_args) : wp_insert_term($category_name, 'espresso_event_categories', $term_args);
 
-		if ( !is_array( $insert_ids ) ) {
-			$msg = __( 'An error occurred and the category has not been saved to the database.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! is_array($insert_ids)) {
+			$msg = __('An error occurred and the category has not been saved to the database.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		} else {
 			$cat_id = $insert_ids['term_id'];
-			$msg = sprintf ( __('The category %s was successfuly saved', 'event_espresso'), $category_name );
-			EE_Error::add_success( $msg );
+			$msg = sprintf(__('The category %s was successfuly saved', 'event_espresso'), $category_name);
+			EE_Error::add_success($msg);
 		}
 
 		return $cat_id;
@@ -2273,32 +2273,32 @@  discard block
 block discarded – undo
 
 
 
-	public function get_categories( $per_page = 10, $current_page = 1, $count = FALSE ) {
+	public function get_categories($per_page = 10, $current_page = 1, $count = FALSE) {
 		global $wpdb;
 
 		//testing term stuff
-		$orderby = isset( $this->_req_data['orderby'] ) ? $this->_req_data['orderby'] : 'Term.term_id';
-		$order = isset( $this->_req_data['order'] ) ? $this->_req_data['order'] : 'DESC';
-		$limit = ($current_page-1)*$per_page;
+		$orderby = isset($this->_req_data['orderby']) ? $this->_req_data['orderby'] : 'Term.term_id';
+		$order = isset($this->_req_data['order']) ? $this->_req_data['order'] : 'DESC';
+		$limit = ($current_page - 1) * $per_page;
 
-		$where = array( 'taxonomy' => 'espresso_event_categories' );
+		$where = array('taxonomy' => 'espresso_event_categories');
 
-		if ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$where['OR'] = array(
-				'Term.name' => array( 'LIKE', $sstr),
-				'description' => array( 'LIKE', $sstr )
+				'Term.name' => array('LIKE', $sstr),
+				'description' => array('LIKE', $sstr)
 				);
 		}
 
 		$query_params = array(
-			$where ,
-			'order_by' => array( $orderby => $order ),
-			'limit' => $limit . ',' . $per_page,
+			$where,
+			'order_by' => array($orderby => $order),
+			'limit' => $limit.','.$per_page,
 			'force_join' => array('Term')
 			);
 
-		$categories = $count ? EEM_Term_Taxonomy::instance()->count( $query_params, 'term_id' ) :EEM_Term_Taxonomy::instance()->get_all( $query_params );
+		$categories = $count ? EEM_Term_Taxonomy::instance()->count($query_params, 'term_id') : EEM_Term_Taxonomy::instance()->get_all($query_params);
 
 		return $categories;
 	}

Please login to merge, or discard this patch.

caffeinated/modules/event_single_caff/EED_Event_Single_Caff.module.php 3 patches

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -116,7 +116,7 @@
 block discarded – undo
 	 * @access    	public
 	 * @param 		EE_Template_Config $CFG
 	 * @param 		array $REQ
-	 * @return    	EE_Event_Single_Config
+	 * @return    	EE_Template_Config
 	 */
 	public static function update_template_settings( $CFG, $REQ ) {
 		$display_order_tickets = isset( $CFG->EED_Event_Single->display_order_tickets ) ? $CFG->EED_Event_Single->display_order_tickets : 100;

Please login to merge, or discard this patch.

Spacing +45 added lines, -45 removed lines patch added patch discarded remove patch

@@ -29,7 +29,7 @@  discard block
 block discarded – undo
 	 * @return EED_Event_Single_Caff
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -50,34 +50,34 @@  discard block
 block discarded – undo
 	 *  @return 	void
 	 */
 	public static function set_hooks_admin() {
-		define( 'EVENT_SINGLE_CAFF_TEMPLATES_PATH', plugin_dir_path( __FILE__ ) . 'templates' . DS );
-		define( 'EVENT_SINGLE_CAFF_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
+		define('EVENT_SINGLE_CAFF_TEMPLATES_PATH', plugin_dir_path(__FILE__).'templates'.DS);
+		define('EVENT_SINGLE_CAFF_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
 		add_action(
 			'FHEE__EE_Admin_Page___load_page_dependencies__after_load__espresso_events__template_settings',
-			array( 'EED_Event_Single_Caff', 'load_scripts_styles' ),
+			array('EED_Event_Single_Caff', 'load_scripts_styles'),
 			10
 		);
-		add_action( 'AHEE__template_settings__template__before_settings_form', array( 'EED_Event_Single_Caff', 'template_settings_form' ), 10 );
-		add_filter( 'FHEE__General_Settings_Admin_Page__update_template_settings__data', array( 'EED_Event_Single_Caff', 'update_template_settings' ), 10, 2 );
+		add_action('AHEE__template_settings__template__before_settings_form', array('EED_Event_Single_Caff', 'template_settings_form'), 10);
+		add_filter('FHEE__General_Settings_Admin_Page__update_template_settings__data', array('EED_Event_Single_Caff', 'update_template_settings'), 10, 2);
 		// AJAX
-		add_action( 'wp_ajax_espresso_update_event_single_order', array( 'EED_Event_Single_Caff', 'update_event_single_order' ) );
-		add_action( 'wp_ajax_nopriv_espresso_update_event_single_order', array( 'EED_Event_Single_Caff', 'update_event_single_order' ) );
+		add_action('wp_ajax_espresso_update_event_single_order', array('EED_Event_Single_Caff', 'update_event_single_order'));
+		add_action('wp_ajax_nopriv_espresso_update_event_single_order', array('EED_Event_Single_Caff', 'update_event_single_order'));
 
 	}
 
 
 
 	public static function load_scripts_styles() {
-		add_action( 'admin_enqueue_scripts', array( 'EED_Event_Single_Caff', 'enqueue_scripts_styles' ), 10 );
+		add_action('admin_enqueue_scripts', array('EED_Event_Single_Caff', 'enqueue_scripts_styles'), 10);
 	}
 
 
 
 	public static function enqueue_scripts_styles() {
-		wp_register_style( 'eed-event-single-sortable', EVENT_SINGLE_CAFF_ASSETS_URL . 'eed_event_single_sortable.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_style( 'eed-event-single-sortable' );
-		wp_register_script( 'eed-event-single-sortable', EVENT_SINGLE_CAFF_ASSETS_URL . 'eed_event_single_sortable.js', array( 'jquery-ui-sortable' ), EVENT_ESPRESSO_VERSION, true );
-		wp_enqueue_script( 'eed-event-single-sortable' );
+		wp_register_style('eed-event-single-sortable', EVENT_SINGLE_CAFF_ASSETS_URL.'eed_event_single_sortable.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_style('eed-event-single-sortable');
+		wp_register_script('eed-event-single-sortable', EVENT_SINGLE_CAFF_ASSETS_URL.'eed_event_single_sortable.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, true);
+		wp_enqueue_script('eed-event-single-sortable');
 	}
 
 
@@ -91,21 +91,21 @@  discard block
 block discarded – undo
 	 */
 	public static function template_settings_form() {
 		$config = EE_Registry::instance()->CFG->template_settings;
-		$config = isset( $config->EED_Event_Single ) && $config->EED_Event_Single instanceof EE_Event_Single_Config ? $config->EED_Event_Single : new EE_Event_Single_Config();
-		$config->use_sortable_display_order = isset( $config->use_sortable_display_order ) ? $config->use_sortable_display_order : false;
-		$config = apply_filters( 'FHEE__EED_Event_Single__template_settings_form__event_list_config', $config );
+		$config = isset($config->EED_Event_Single) && $config->EED_Event_Single instanceof EE_Event_Single_Config ? $config->EED_Event_Single : new EE_Event_Single_Config();
+		$config->use_sortable_display_order = isset($config->use_sortable_display_order) ? $config->use_sortable_display_order : false;
+		$config = apply_filters('FHEE__EED_Event_Single__template_settings_form__event_list_config', $config);
 
 		$event_single_order_array = array();
-		$event_single_order_array[ $config->display_order_tickets ] = 'tickets';
-		$event_single_order_array[ $config->display_order_datetimes ] = 'datetimes';
-		$event_single_order_array[ $config->display_order_event ] = 'event';
-		$event_single_order_array[ $config->display_order_venue ] = 'venue';
+		$event_single_order_array[$config->display_order_tickets] = 'tickets';
+		$event_single_order_array[$config->display_order_datetimes] = 'datetimes';
+		$event_single_order_array[$config->display_order_event] = 'event';
+		$event_single_order_array[$config->display_order_venue] = 'venue';
 		// get template parts
-		$template_parts = EED_Event_Single::instance()->initialize_template_parts( $config );
+		$template_parts = EED_Event_Single::instance()->initialize_template_parts($config);
 		// convert to array so that we can add more properties
-		$config = get_object_vars( $config );
-		$config[ 'event_single_display_order' ] = $template_parts->generate_sortable_list_of_template_parts( 'event-single-sortable-js', '', 'single-sortable-li single-sortable-js' );
-		EEH_Template::display_template( EVENT_SINGLE_CAFF_TEMPLATES_PATH . 'admin-event-single-settings.template.php', $config );
+		$config = get_object_vars($config);
+		$config['event_single_display_order'] = $template_parts->generate_sortable_list_of_template_parts('event-single-sortable-js', '', 'single-sortable-li single-sortable-js');
+		EEH_Template::display_template(EVENT_SINGLE_CAFF_TEMPLATES_PATH.'admin-event-single-settings.template.php', $config);
 	}
 
 
@@ -118,20 +118,20 @@  discard block
 block discarded – undo
 	 * @param 		array $REQ
 	 * @return    	EE_Event_Single_Config
 	 */
-	public static function update_template_settings( $CFG, $REQ ) {
-		$display_order_tickets = isset( $CFG->EED_Event_Single->display_order_tickets ) ? $CFG->EED_Event_Single->display_order_tickets : 100;
-		$display_order_datetimes = isset( $CFG->EED_Event_Single->display_order_datetimes ) ? $CFG->EED_Event_Single->display_order_datetimes : 110;
-		$display_order_event = isset( $CFG->EED_Event_Single->display_order_event ) ? $CFG->EED_Event_Single->display_order_event : 120;
-		$display_order_venue = isset( $CFG->EED_Event_Single->display_order_venue ) ? $CFG->EED_Event_Single->display_order_venue : 130;
+	public static function update_template_settings($CFG, $REQ) {
+		$display_order_tickets = isset($CFG->EED_Event_Single->display_order_tickets) ? $CFG->EED_Event_Single->display_order_tickets : 100;
+		$display_order_datetimes = isset($CFG->EED_Event_Single->display_order_datetimes) ? $CFG->EED_Event_Single->display_order_datetimes : 110;
+		$display_order_event = isset($CFG->EED_Event_Single->display_order_event) ? $CFG->EED_Event_Single->display_order_event : 120;
+		$display_order_venue = isset($CFG->EED_Event_Single->display_order_venue) ? $CFG->EED_Event_Single->display_order_venue : 130;
 		$CFG->EED_Event_Single = new EE_Event_Single_Config();
-		$CFG->EED_Event_Single->display_status_banner_single = !empty( $REQ['display_status_banner_single'] ) && $REQ['display_status_banner_single'] ? TRUE : FALSE;
-		$CFG->EED_Event_Single->display_venue = ! empty( $REQ['display_venue'] ) && $REQ['display_venue'] ? TRUE : FALSE;
-		$CFG->EED_Event_Single->use_sortable_display_order = ! empty( $REQ[ 'EED_Events_Single_use_sortable_display_order' ] ) ? absint( $REQ[ 'EED_Events_Single_use_sortable_display_order' ] ) : 0;
+		$CFG->EED_Event_Single->display_status_banner_single = ! empty($REQ['display_status_banner_single']) && $REQ['display_status_banner_single'] ? TRUE : FALSE;
+		$CFG->EED_Event_Single->display_venue = ! empty($REQ['display_venue']) && $REQ['display_venue'] ? TRUE : FALSE;
+		$CFG->EED_Event_Single->use_sortable_display_order = ! empty($REQ['EED_Events_Single_use_sortable_display_order']) ? absint($REQ['EED_Events_Single_use_sortable_display_order']) : 0;
 		$CFG->EED_Event_Single->display_order_tickets = $CFG->EED_Event_Single->use_sortable_display_order ? $display_order_tickets : 100;
 		$CFG->EED_Event_Single->display_order_datetimes = $CFG->EED_Event_Single->use_sortable_display_order ? $display_order_datetimes : 110;
 		$CFG->EED_Event_Single->display_order_event = $CFG->EED_Event_Single->use_sortable_display_order ? $display_order_event : 120;
 		$CFG->EED_Event_Single->display_order_venue = $CFG->EED_Event_Single->use_sortable_display_order ? $display_order_venue : 130;
-		do_action( 'AHEE__EED_Event_Single__update_template_settings__after_update', $CFG, $REQ );
+		do_action('AHEE__EED_Event_Single__update_template_settings__after_update', $CFG, $REQ);
 		return $CFG;
 	}
 
@@ -145,23 +145,23 @@  discard block
 block discarded – undo
 	 */
 	public static function update_event_single_order() {
 		$config_saved = false;
-		$template_parts = sanitize_text_field( $_POST[ 'elements' ] );
-		if ( ! empty( $template_parts ) ) {
-			$template_parts = explode( ',', trim( $template_parts, ',' ) );
-			foreach ( $template_parts as $key => $template_part ) {
+		$template_parts = sanitize_text_field($_POST['elements']);
+		if ( ! empty($template_parts)) {
+			$template_parts = explode(',', trim($template_parts, ','));
+			foreach ($template_parts as $key => $template_part) {
 				$template_part = "display_order_$template_part";
-				$priority = ( $key * 10 ) + 100;
+				$priority = ($key * 10) + 100;
 				EE_Registry::instance()->CFG->template_settings->EED_Event_Single->{$template_part} = $priority;
-				do_action( "AHEE__EED_Event_Single__update_event_single_order__$template_part", $priority );
+				do_action("AHEE__EED_Event_Single__update_event_single_order__$template_part", $priority);
 			}
-			$config_saved = EE_Registry::instance()->CFG->update_espresso_config( false, false );
+			$config_saved = EE_Registry::instance()->CFG->update_espresso_config(false, false);
 		}
-		if ( $config_saved ) {
-			EE_Error::add_success( __( 'Display Order has been successfully updated.', 'event_espresso' ) );
+		if ($config_saved) {
+			EE_Error::add_success(__('Display Order has been successfully updated.', 'event_espresso'));
 		} else {
-			EE_Error::add_error( __( 'Display Order was not updated.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('Display Order was not updated.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
-		echo wp_json_encode( EE_Error::get_notices( false ));
+		echo wp_json_encode(EE_Error::get_notices(false));
 		exit();
 	}
 
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
 	 * @param WP $WP
 	 * @return    void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 	}
 
 

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

caffeinated/modules/events_archive_caff/EED_Events_Archive_Caff.module.php 3 patches

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -123,7 +123,7 @@
 block discarded – undo
 	 *  @access 	public
 	 *  @param    EE_Template_Config $CFG
 	 *  @param 	array $REQ
-	 *  @return    EE_Events_Archive_Config
+	 *  @return    EE_Template_Config
 	 */
 	public static function update_template_settings( $CFG, $REQ ) {
 		$config = new EE_Events_Archive_Config();

Please login to merge, or discard this patch.

Spacing +53 added lines, -53 removed lines patch added patch discarded remove patch

@@ -28,7 +28,7 @@  discard block
 block discarded – undo
 	 * @return EED_Events_Archive_Caff
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -49,13 +49,13 @@  discard block
 block discarded – undo
 	 *  @return 	void
 	 */
 	public static function set_hooks_admin() {
-		define( 'EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS );
-		define( 'EVENT_ARCHIVE_CAFF_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
-		add_action( 'AHEE__template_settings__template__before_settings_form', array( 'EED_Events_Archive_Caff', 'template_settings_form' ), 10 );
-		add_filter( 'FHEE__General_Settings_Admin_Page__update_template_settings__data', array( 'EED_Events_Archive_Caff', 'update_template_settings' ), 10, 2 );
+		define('EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
+		define('EVENT_ARCHIVE_CAFF_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
+		add_action('AHEE__template_settings__template__before_settings_form', array('EED_Events_Archive_Caff', 'template_settings_form'), 10);
+		add_filter('FHEE__General_Settings_Admin_Page__update_template_settings__data', array('EED_Events_Archive_Caff', 'update_template_settings'), 10, 2);
 		// AJAX
-		add_action( 'wp_ajax_espresso_update_event_archive_order', array( 'EED_Events_Archive_Caff', 'update_event_archive_order' ) );
-		add_action( 'wp_ajax_nopriv_espresso_update_event_archive_order', array( 'EED_Events_Archive_Caff', 'update_event_archive_order' ) );
+		add_action('wp_ajax_espresso_update_event_archive_order', array('EED_Events_Archive_Caff', 'update_event_archive_order'));
+		add_action('wp_ajax_nopriv_espresso_update_event_archive_order', array('EED_Events_Archive_Caff', 'update_event_archive_order'));
 	}
 
 
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
 	 * @param    WP $WP
 	 * @return    void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 	}
 
 
@@ -83,33 +83,33 @@  discard block
 block discarded – undo
 	 */
 	public static function template_settings_form() {
 		// grab general settings admin page and remove the existing hook callback
-		$gen_set_admin = EE_Registry::instance()->LIB->EE_Admin_Page_Loader->get_admin_page_object( 'general_settings' );
-		if ( $gen_set_admin instanceof General_Settings_Admin_Page ) {
-			remove_action( 'AHEE__template_settings__template__before_settings_form', array( $gen_set_admin, 'template_settings_caff_features' ), 100 );
+		$gen_set_admin = EE_Registry::instance()->LIB->EE_Admin_Page_Loader->get_admin_page_object('general_settings');
+		if ($gen_set_admin instanceof General_Settings_Admin_Page) {
+			remove_action('AHEE__template_settings__template__before_settings_form', array($gen_set_admin, 'template_settings_caff_features'), 100);
 		}
 		// first just grab the template settings
 		$config = EE_Registry::instance()->CFG->template_settings;
 		// then if the Event Archive config is valid, use that, else create a new one
-		$config = isset( $config->EED_Events_Archive ) && $config->EED_Events_Archive instanceof EE_Events_Archive_Config ? $config->EED_Events_Archive : new EE_Events_Archive_Config();
-		$config = apply_filters( 'FHEE__EED_Events_Archive__template_settings_form__event_list_config', $config );
-		$config->display_status_banner = isset( $config->display_status_banner ) ? $config->display_status_banner : 0;
-		$config->display_description = isset( $config->display_description ) ? $config->display_description : 1;
-		$config->display_ticket_selector = isset( $config->display_ticket_selector ) ? $config->display_ticket_selector : 0;
-		$config->display_datetimes = isset( $config->display_datetimes ) ? $config->display_datetimes : 1;
-		$config->display_venue = isset( $config->display_venue ) ? $config->display_venue : 0;
-		$config->display_expired_events = isset( $config->display_expired_events ) ? $config->display_expired_events : 0;
+		$config = isset($config->EED_Events_Archive) && $config->EED_Events_Archive instanceof EE_Events_Archive_Config ? $config->EED_Events_Archive : new EE_Events_Archive_Config();
+		$config = apply_filters('FHEE__EED_Events_Archive__template_settings_form__event_list_config', $config);
+		$config->display_status_banner = isset($config->display_status_banner) ? $config->display_status_banner : 0;
+		$config->display_description = isset($config->display_description) ? $config->display_description : 1;
+		$config->display_ticket_selector = isset($config->display_ticket_selector) ? $config->display_ticket_selector : 0;
+		$config->display_datetimes = isset($config->display_datetimes) ? $config->display_datetimes : 1;
+		$config->display_venue = isset($config->display_venue) ? $config->display_venue : 0;
+		$config->display_expired_events = isset($config->display_expired_events) ? $config->display_expired_events : 0;
 		// display order options
-		$config->use_sortable_display_order = isset( $config->use_sortable_display_order  )? $config->use_sortable_display_order : false;
-		$config->display_order_tickets = isset( $config->display_order_tickets  )? $config->display_order_tickets : 100;
-		$config->display_order_datetimes = isset( $config->display_order_datetimes  )? $config->display_order_datetimes : 110;
-		$config->display_order_event = isset( $config->display_order_event  )? $config->display_order_event : 120;
-		$config->display_order_venue = isset( $config->display_order_venue  )? $config->display_order_venue : 130;
+		$config->use_sortable_display_order = isset($config->use_sortable_display_order) ? $config->use_sortable_display_order : false;
+		$config->display_order_tickets = isset($config->display_order_tickets) ? $config->display_order_tickets : 100;
+		$config->display_order_datetimes = isset($config->display_order_datetimes) ? $config->display_order_datetimes : 110;
+		$config->display_order_event = isset($config->display_order_event) ? $config->display_order_event : 120;
+		$config->display_order_venue = isset($config->display_order_venue) ? $config->display_order_venue : 130;
 		// get template parts
-		$template_parts = EED_Events_Archive::instance()->initialize_template_parts( $config );
+		$template_parts = EED_Events_Archive::instance()->initialize_template_parts($config);
 		// convert to array so that we can add more properties
-		$config = get_object_vars( $config );
-		$config[ 'event_archive_display_order' ] = $template_parts->generate_sortable_list_of_template_parts( 'event-archive-sortable-js', '', 'archive-sortable-li archive-sortable-js' );
-		EEH_Template::display_template( EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH . 'admin-event-list-settings.template.php', $config );
+		$config = get_object_vars($config);
+		$config['event_archive_display_order'] = $template_parts->generate_sortable_list_of_template_parts('event-archive-sortable-js', '', 'archive-sortable-li archive-sortable-js');
+		EEH_Template::display_template(EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH.'admin-event-list-settings.template.php', $config);
 	}
 
 
@@ -125,24 +125,24 @@  discard block
 block discarded – undo
 	 *  @param 	array $REQ
 	 *  @return    EE_Events_Archive_Config
 	 */
-	public static function update_template_settings( $CFG, $REQ ) {
+	public static function update_template_settings($CFG, $REQ) {
 		$config = new EE_Events_Archive_Config();
 		// unless we are resetting the config...
-		if ( ! isset( $REQ['EED_Events_Archive_reset_event_list_settings'] ) || absint( $REQ['EED_Events_Archive_reset_event_list_settings'] ) !== 1 ) {
-			$config->display_status_banner = isset( $REQ['EED_Events_Archive_display_status_banner'] ) ? absint( $REQ['EED_Events_Archive_display_status_banner'] ) : 0;
-			$config->display_description = isset( $REQ['EED_Events_Archive_display_description'] ) ? absint( $REQ['EED_Events_Archive_display_description'] ) : 1;
-			$config->display_ticket_selector = isset( $REQ['EED_Events_Archive_display_ticket_selector'] ) ? absint( $REQ['EED_Events_Archive_display_ticket_selector'] ) : 0;
-			$config->display_datetimes = isset( $REQ['EED_Events_Archive_display_datetimes'] ) ? absint( $REQ['EED_Events_Archive_display_datetimes'] ) : 1;
-			$config->display_venue = isset( $REQ['EED_Events_Archive_display_venue'] ) ? absint( $REQ['EED_Events_Archive_display_venue'] ) : 0;
-			$config->display_expired_events = isset( $REQ['EED_Events_Archive_display_expired_events'] ) ? absint( $REQ['EED_Events_Archive_display_expired_events'] ) : 0;
-			$config->use_sortable_display_order = isset( $REQ['EED_Events_Archive_use_sortable_display_order'] ) ? absint( $REQ['EED_Events_Archive_use_sortable_display_order'] ) : 0;
-			$config->display_order_tickets = isset( $CFG->EED_Events_Archive->display_order_tickets ) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_tickets : 100;
-			$config->display_order_datetimes = isset( $CFG->EED_Events_Archive->display_order_datetimes ) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_datetimes : 110;
-			$config->display_order_event = isset( $CFG->EED_Events_Archive->display_order_event ) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_event : 120;
-			$config->display_order_venue = isset( $CFG->EED_Events_Archive->display_order_venue ) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_venue : 130;
+		if ( ! isset($REQ['EED_Events_Archive_reset_event_list_settings']) || absint($REQ['EED_Events_Archive_reset_event_list_settings']) !== 1) {
+			$config->display_status_banner = isset($REQ['EED_Events_Archive_display_status_banner']) ? absint($REQ['EED_Events_Archive_display_status_banner']) : 0;
+			$config->display_description = isset($REQ['EED_Events_Archive_display_description']) ? absint($REQ['EED_Events_Archive_display_description']) : 1;
+			$config->display_ticket_selector = isset($REQ['EED_Events_Archive_display_ticket_selector']) ? absint($REQ['EED_Events_Archive_display_ticket_selector']) : 0;
+			$config->display_datetimes = isset($REQ['EED_Events_Archive_display_datetimes']) ? absint($REQ['EED_Events_Archive_display_datetimes']) : 1;
+			$config->display_venue = isset($REQ['EED_Events_Archive_display_venue']) ? absint($REQ['EED_Events_Archive_display_venue']) : 0;
+			$config->display_expired_events = isset($REQ['EED_Events_Archive_display_expired_events']) ? absint($REQ['EED_Events_Archive_display_expired_events']) : 0;
+			$config->use_sortable_display_order = isset($REQ['EED_Events_Archive_use_sortable_display_order']) ? absint($REQ['EED_Events_Archive_use_sortable_display_order']) : 0;
+			$config->display_order_tickets = isset($CFG->EED_Events_Archive->display_order_tickets) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_tickets : 100;
+			$config->display_order_datetimes = isset($CFG->EED_Events_Archive->display_order_datetimes) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_datetimes : 110;
+			$config->display_order_event = isset($CFG->EED_Events_Archive->display_order_event) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_event : 120;
+			$config->display_order_venue = isset($CFG->EED_Events_Archive->display_order_venue) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_venue : 130;
 		}
 		$CFG->EED_Events_Archive = $config;
-		do_action( 'AHEE__EED_Events_Archive__update_template_settings__after_update', $CFG, $REQ );
+		do_action('AHEE__EED_Events_Archive__update_template_settings__after_update', $CFG, $REQ);
 		return $CFG;
 	}
 
@@ -156,12 +156,12 @@  discard block
 block discarded – undo
 	 */
 	public static function update_event_archive_order() {
 		$config_saved = false;
-		$template_parts = sanitize_text_field( $_POST[ 'elements' ] );
-		if ( ! empty( $template_parts ) ) {
-			$template_parts = explode( ',', trim( $template_parts, ',' ) );
-			foreach ( $template_parts as $key => $template_part ) {
+		$template_parts = sanitize_text_field($_POST['elements']);
+		if ( ! empty($template_parts)) {
+			$template_parts = explode(',', trim($template_parts, ','));
+			foreach ($template_parts as $key => $template_part) {
 				$template_part = "display_order_$template_part";
-				$priority = ( $key * 10 ) + 100;
+				$priority = ($key * 10) + 100;
 				if (
 					property_exists(
 						EE_Registry::instance()->CFG->template_settings->EED_Events_Archive,
@@ -170,16 +170,16 @@  discard block
 block discarded – undo
 				) {
 					EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->{$template_part} = $priority;
 				}
-				do_action( "AHEE__EED_Events_Archive__update_event_archive_order__$template_part", $priority );
+				do_action("AHEE__EED_Events_Archive__update_event_archive_order__$template_part", $priority);
 			}
-			$config_saved = EE_Registry::instance()->CFG->update_espresso_config( false, false );
+			$config_saved = EE_Registry::instance()->CFG->update_espresso_config(false, false);
 		}
-		if ( $config_saved ) {
-			EE_Error::add_success( __( 'Display Order has been successfully updated.', 'event_espresso' ) );
+		if ($config_saved) {
+			EE_Error::add_success(__('Display Order has been successfully updated.', 'event_espresso'));
 		} else {
-			EE_Error::add_error( __( 'Display Order was not updated.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('Display Order was not updated.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
-		echo wp_json_encode( EE_Error::get_notices( false ) );
+		echo wp_json_encode(EE_Error::get_notices(false));
 		exit();
 	}
 

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

templates/txn_admin_details_side_meta_box_billing_info.template.php 2 patches

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

@@ -1,37 +1,37 @@
 block discarded – undo
 	<div id="admin-side-mbox-billing-info-dv" class="admin-side-mbox-dv">
-<?php if ( empty($billing_form) ) : ?>
+<?php if (empty($billing_form)) : ?>
 		<div class="clearfix">
-			<?php _e( 'There is no billing info for this transaction.', 'event_espresso' );?><br/>
+			<?php _e('There is no billing info for this transaction.', 'event_espresso'); ?><br/>
 		</div>
 <?php else :
-	function ee_show_billing_info_cleaned( EE_Form_Section_Proper $form_section, $found_cc_data = false ) {
-		foreach( $form_section->subsections() as $subsection ) {
-			if( $subsection instanceof EE_Form_Input_Base ) {
-				if( $subsection->get_sensitive_data_removal_strategy() instanceof EE_All_Sensitive_Data_Removal ||
-					$subsection->get_sensitive_data_removal_strategy() instanceof EE_CCV_Sensitive_Data_Removal ){
+	function ee_show_billing_info_cleaned(EE_Form_Section_Proper $form_section, $found_cc_data = false) {
+		foreach ($form_section->subsections() as $subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				if ($subsection->get_sensitive_data_removal_strategy() instanceof EE_All_Sensitive_Data_Removal ||
+					$subsection->get_sensitive_data_removal_strategy() instanceof EE_CCV_Sensitive_Data_Removal) {
 					continue;
 				}
-				if( $subsection->get_sensitive_data_removal_strategy() instanceof EE_Credit_Card_Sensitive_Data_Removal ) {
+				if ($subsection->get_sensitive_data_removal_strategy() instanceof EE_Credit_Card_Sensitive_Data_Removal) {
 					$found_cc_data = true;
 				}
 				?>
 					<div class="clearfix">
-						<span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php echo $subsection->get_html_for_label();?></span><?php echo $subsection->pretty_value();?>
+						<span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php echo $subsection->get_html_for_label(); ?></span><?php echo $subsection->pretty_value(); ?>
 					</div><?php
-			} elseif( $subsection instanceof EE_Form_Section_Proper ) {
-				$found_cc_data = ee_show_billing_info_cleaned( $subsection, $found_cc_data);
+			} elseif ($subsection instanceof EE_Form_Section_Proper) {
+				$found_cc_data = ee_show_billing_info_cleaned($subsection, $found_cc_data);
 			}
 		}
 		return $found_cc_data;
 	}
-	$found_cc_data = ee_show_billing_info_cleaned( $billing_form );
-	if( apply_filters( 
+	$found_cc_data = ee_show_billing_info_cleaned($billing_form);
+	if (apply_filters( 
 			'FHEE__txn_admin_details_side_meta_box_billing_info__show_default_note', 
 			$found_cc_data,
-			$billing_form ) ) {?>
-		<p class="help"><?php _e( 'Note: Card expiry dates and CCV are not stored. Only the last 4 digits of card numbers are stored.', 'event_espresso' );?></p>
+			$billing_form )) {?>
+		<p class="help"><?php _e('Note: Card expiry dates and CCV are not stored. Only the last 4 digits of card numbers are stored.', 'event_espresso'); ?></p>
 	<?php }
-	do_action( 'AHEE__txn_admin_details_side_meta_box_billing_info__billing_form_footer', $billing_form );
+	do_action('AHEE__txn_admin_details_side_meta_box_billing_info__billing_form_footer', $billing_form);
 	endif; ?>
 
 	</div>

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -3,13 +3,15 @@
 block discarded – undo
 		<div class="clearfix">
 			<?php _e( 'There is no billing info for this transaction.', 'event_espresso' );?><br/>
 		</div>
-<?php else :
+<?php else {
+	:
 	function ee_show_billing_info_cleaned( EE_Form_Section_Proper $form_section, $found_cc_data = false ) {
 		foreach( $form_section->subsections() as $subsection ) {
 			if( $subsection instanceof EE_Form_Input_Base ) {
 				if( $subsection->get_sensitive_data_removal_strategy() instanceof EE_All_Sensitive_Data_Removal ||
 					$subsection->get_sensitive_data_removal_strategy() instanceof EE_CCV_Sensitive_Data_Removal ){
 					continue;
+}
 				}
 				if( $subsection->get_sensitive_data_removal_strategy() instanceof EE_Credit_Card_Sensitive_Data_Removal ) {
 					$found_cc_data = true;

Please login to merge, or discard this patch.

event_single_caff/templates/admin-event-single-settings.template.php 1 patch

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -1,11 +1,11 @@  discard block
 block discarded – undo
 <?php
-add_filter( 'FHEE__EEH_Form_Fields__label_html', '__return_empty_string' );
-EE_Registry::instance()->load_helper( 'Event_View' );
-EE_Registry::instance()->load_helper( 'Form_Fields' );
+add_filter('FHEE__EEH_Form_Fields__label_html', '__return_empty_string');
+EE_Registry::instance()->load_helper('Event_View');
+EE_Registry::instance()->load_helper('Form_Fields');
 $values = EEH_Form_Fields::prep_answer_options(
 	array(
-		array( 'id' => 1, 'text' => __( 'Yes', 'event_espresso' ) ),
-		array( 'id' => 0, 'text' => __( 'No', 'event_espresso' ) )
+		array('id' => 1, 'text' => __('Yes', 'event_espresso')),
+		array('id' => 0, 'text' => __('No', 'event_espresso'))
 	)
 );
 ?>
@@ -24,27 +24,27 @@  discard block
 block discarded – undo
 					</label>
 				</th>
 				<td>
-					<?php echo EEH_Form_Fields::select( 'display_status_banner_single', $display_status_banner_single, $values, 'display_status_banner_single', 'display_status_banner_single' ); ?>
-					<p class="description"><?php _e( 'Selecting "Yes" will inject an Event Status banner with the title whenever Events are displaying on the single event page.', 'event_espresso' ); ?></p>
+					<?php echo EEH_Form_Fields::select('display_status_banner_single', $display_status_banner_single, $values, 'display_status_banner_single', 'display_status_banner_single'); ?>
+					<p class="description"><?php _e('Selecting "Yes" will inject an Event Status banner with the title whenever Events are displaying on the single event page.', 'event_espresso'); ?></p>
 				</td>
 			</tr>
 
 			<tr>
 				<th>
 					<label for="display_venue">
-						<?php _e( 'Display Venue Details', 'event_espresso' ); ?><?php echo EEH_Template::get_help_tab_link('display_addresses_in_reg_form_info');?>
+						<?php _e('Display Venue Details', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link('display_addresses_in_reg_form_info'); ?>
 					</label>
 				</th>
 				<td>
-					<?php echo EEH_Form_Fields::select( 'display_venue', $display_venue, $values, 'display_venue', 'display_venue' ); ?>
-					<p class="description"><?php _e( 'Do not use this if you are using the venue shortcodes in your event description.', 'event_espresso' ); ?></p>
+					<?php echo EEH_Form_Fields::select('display_venue', $display_venue, $values, 'display_venue', 'display_venue'); ?>
+					<p class="description"><?php _e('Do not use this if you are using the venue shortcodes in your event description.', 'event_espresso'); ?></p>
 				</td>
 			</tr>
 
 			<tr>
 				<th>
 					<label for="EED_Events_Single_use_sortable_display_order">
-						<?php _e( 'Use Custom Display Order?', 'event_espresso' ); ?>
+						<?php _e('Use Custom Display Order?', 'event_espresso'); ?>
 					</label>
 				</th>
 				<td>
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
 					<p class="description ">
 						<?php
 						echo sprintf(
-							__( '%1$sPlease Note:%2$s%3$sIf you are currently using filters to customize the display order for elements within the Event Single page display, then you do NOT activate this feature until those filters have been removed or disabled. If this feature is activated while still using such filters, duplicate event content such as the ticket selector, datetimes, or venue information could be displayed on the frontend of the site. Please verify that this is not the case after activating this feature.', 'event_espresso' ),
+							__('%1$sPlease Note:%2$s%3$sIf you are currently using filters to customize the display order for elements within the Event Single page display, then you do NOT activate this feature until those filters have been removed or disabled. If this feature is activated while still using such filters, duplicate event content such as the ticket selector, datetimes, or venue information could be displayed on the frontend of the site. Please verify that this is not the case after activating this feature.', 'event_espresso'),
 							'<span class="important-notice">',
 							'</span>',
 							'<br />'
@@ -72,11 +72,11 @@  discard block
 block discarded – undo
 
 			<tr>
 				<th>
-					<?php _e('Display Order', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link('display_addresses_in_reg_form_info');?>
+					<?php _e('Display Order', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link('display_addresses_in_reg_form_info'); ?>
 				</th>
 				<td>
 
-					<?php wp_nonce_field( 'espresso_update_event_single_order', 'espresso_update_event_single_order_nonce', false ); ?>
+					<?php wp_nonce_field('espresso_update_event_single_order', 'espresso_update_event_single_order_nonce', false); ?>
 					<?php echo $event_single_display_order; ?>
 
 					<p class="description"><?php _e('Drag and Drop the above to determine the display order of the Event Description, Date and Times, Ticket Selector, and Venue Information on the single event page.', 'event_espresso'); ?></p>

Please login to merge, or discard this patch.

		@@ -1345,7 +1345,7 @@
		block discarded – undo
1345	1345	* This just returns whatever is set as the _event object property
1346	1346	*
1347	1347	* //todo this will become obsolete once the models are in place
1348		- * @return object
	1348	+ * @return EE_CPT_Base
1349	1349	*/
1350	1350	public function get_event_object() {
1351	1351	return $this->_cpt_model_obj;

		@@ -27,21 +27,21 @@
		block discarded – undo
27	27	<!-- Primary Style Sheet -->
28	28	<link rel="stylesheet" type="text/css" href="<?php echo $main_css; ?>" />
29	29	<!-- Make sure the buttons don't print -->
30		- <?php if ( isset( $extra_css )) : ?>
	30	+ <?php if (isset($extra_css)) : ?>
31	31	<!-- Additional Style Sheet -->
32	32	<link rel="stylesheet" type="text/css" href="<?php echo $extra_css; ?>" />
33	33	<?php endif; ?>
34	34	<style type="text/css">
35	35	@media print{ .noPrint{ display:none !important;height:0!important; width:0!important; margin:0!important; padding:0!important; }}
36	36	</style>
37		- <?php do_action( 'AHEE__EE_Html_Messenger_main_wrapper_template_head', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?>
	37	+ <?php do_action('AHEE__EE_Html_Messenger_main_wrapper_template_head', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?>
38	38	</head>
39		- <?php do_action( 'AHEE__EE_Html_Messenger_main_wrapper_template_header', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?>
	39	+ <?php do_action('AHEE__EE_Html_Messenger_main_wrapper_template_header', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?>
40	40	<body>
41		- <?php do_action( 'AHEE__EE_Html_Messenger_main_wrapper_template_before_main_body', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?>
	41	+ <?php do_action('AHEE__EE_Html_Messenger_main_wrapper_template_before_main_body', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?>
42	42	<?php echo $main_body; ?>
43		- <?php do_action( 'AHEE__EE_Html_Messenger_main_wrapper_template_after_main_body', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?>
	43	+ <?php do_action('AHEE__EE_Html_Messenger_main_wrapper_template_after_main_body', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?>
44	44	</body>
45		- <?php do_action( 'AHEE__EE_Html_Messenger_main_wrapper_template_footer', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?>
	45	+ <?php do_action('AHEE__EE_Html_Messenger_main_wrapper_template_footer', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?>
46	46	<?php wp_footer(); ?>
47	47	</html>
48	48	\ No newline at end of file

		@@ -1,6 +1,6 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		-if (!defined('EVENT_ESPRESSO_VERSION') )
	3	+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4	4	exit('NO direct script access allowed');
5	5
6	6	/**
		@@ -29,7 +29,7 @@ discard block
		block discarded – undo
29	29	/**
30	30	* This sets up the email messenger for the EE_messages (notifications) subsystem in EE.
31	31	*/
32		-class EE_Email_messenger extends EE_messenger {
	32	+class EE_Email_messenger extends EE_messenger {
33	33
34	34	/**
35	35	* The following are the properties that email requires for the message going out.
		@@ -75,7 +75,7 @@ discard block
		block discarded – undo
75	75	protected function _set_valid_shortcodes() {
76	76	//remember by leaving the other fields not set, those fields will inherit the valid shortcodes from the message type.
77	77	$this->_valid_shortcodes = array(
78		- 'to' => array('email','event_author', 'primary_registration_details', 'recipient_details'),
	78	+ 'to' => array('email', 'event_author', 'primary_registration_details', 'recipient_details'),
79	79	'from' => array('email', 'event_author', 'primary_registration_details', 'recipient_details')
80	80	);
81	81	}
		@@ -109,7 +109,7 @@ discard block
		block discarded – undo
109	109	'shortcodes' => array('organization', 'primary_registration_details', 'event_author', 'primary_registration_details', 'recipient_details')
110	110	),
111	111	'content' => array(
112		- 'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'primary_registration_details', 'primary_registration_list', 'event_author', 'recipient_details', 'recipient_list', 'transaction', 'messenger')
	112	+ 'shortcodes' => array('event_list', 'attendee_list', 'ticket_list', 'organization', 'primary_registration_details', 'primary_registration_list', 'event_author', 'recipient_details', 'recipient_list', 'transaction', 'messenger')
113	113	),
114	114	'attendee_list' => array(
115	115	'shortcodes' => array('attendee', 'event_list', 'ticket_list'),
		@@ -120,7 +120,7 @@ discard block
		block discarded – undo
120	120	'required' => array('[EVENT_LIST]')
121	121	),
122	122	'ticket_list' => array(
123		- 'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list','primary_registration_details', 'recipient_details'),
	123	+ 'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'primary_registration_details', 'recipient_details'),
124	124	'required' => array('[TICKET_LIST]')
125	125	),
126	126	'datetime_list' => array(
		@@ -139,21 +139,21 @@ discard block
		block discarded – undo
139	139	*
140	140	* @since 4.5.0
141	141	*/
142		- public function do_secondary_messenger_hooks( $sending_messenger_name ) {
143		- if ( $sending_messenger_name = 'html' ) {
144		- add_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', array( $this, 'add_email_css' ), 10, 8 );
	142	+ public function do_secondary_messenger_hooks($sending_messenger_name) {
	143	+ if ($sending_messenger_name = 'html') {
	144	+ add_filter('FHEE__EE_Messages_Template_Pack__get_variation', array($this, 'add_email_css'), 10, 8);
145	145	}
146	146	}
147	147
148	148
149	149
150	150
151		- public function add_email_css( $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack ) {
	151	+ public function add_email_css($variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack) {
152	152	//prevent recursion on this callback.
153		- remove_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', array( $this, 'add_email_css' ), 10 );
154		- $variation = $this->get_variation( $template_pack, $message_type, $url, 'main', $variation, FALSE );
	153	+ remove_filter('FHEE__EE_Messages_Template_Pack__get_variation', array($this, 'add_email_css'), 10);
	154	+ $variation = $this->get_variation($template_pack, $message_type, $url, 'main', $variation, FALSE);
155	155
156		- add_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', array( $this, 'add_email_css' ), 10, 8 );
	156	+ add_filter('FHEE__EE_Messages_Template_Pack__get_variation', array($this, 'add_email_css'), 10, 8);
157	157	return $variation;
158	158	}
159	159
		@@ -185,7 +185,7 @@ discard block
		block discarded – undo
185	185	'required' => FALSE,
186	186	'validation' => FALSE,
187	187	'format' => '%s',
188		- 'value' => sprintf( __('Test email sent from %s', 'event_espresso'), get_bloginfo('name') ),
	188	+ 'value' => sprintf(__('Test email sent from %s', 'event_espresso'), get_bloginfo('name')),
189	189	'default'=> '',
190	190	'css_class' => ''
191	191	)
		@@ -348,8 +348,8 @@ discard block
		block discarded – undo
348	348	*/
349	349	protected function _send_message() {
350	350	return wp_mail(
351		- html_entity_decode( $this->_to, ENT_QUOTES, "UTF-8" ),
352		- stripslashes( html_entity_decode( $this->_subject, ENT_QUOTES, "UTF-8" )),
	351	+ html_entity_decode($this->_to, ENT_QUOTES, "UTF-8"),
	352	+ stripslashes(html_entity_decode($this->_subject, ENT_QUOTES, "UTF-8")),
353	353	$this->_body(),
354	354	$this->_headers()
355	355	);
		@@ -363,7 +363,7 @@ discard block
		block discarded – undo
363	363	* @return string html body of the message content and the related css.
364	364	*/
365	365	protected function _preview() {
366		- return $this->_body( TRUE );
	366	+ return $this->_body(TRUE);
367	367	}
368	368
369	369
		@@ -377,18 +377,18 @@ discard block
		block discarded – undo
377	377	* @return string formatted header for email
378	378	*/
379	379	protected function _headers() {
380		- $from = stripslashes_deep( html_entity_decode($this->_from, ENT_QUOTES,"UTF-8" ) );
	380	+ $from = stripslashes_deep(html_entity_decode($this->_from, ENT_QUOTES, "UTF-8"));
381	381	$headers = array(
382	382	'MIME-Version: 1.0',
383		- 'From:' . $from,
384		- 'Reply-To:' . $from,
	383	+ 'From:'.$from,
	384	+ 'Reply-To:'.$from,
385	385	'Content-Type:text/html; charset=utf-8'
386	386	);
387	387
388	388	//but wait! Header's for the from is NOT reliable because some plugins don't respect From: as set in the header.
389		- add_filter( 'wp_mail_from', array( $this, 'set_from_address' ), 100 );
390		- add_filter( 'wp_mail_from_name', array( $this, 'set_from_name' ), 100 );
391		- return apply_filters( 'FHEE__EE_Email_messenger___headers', $headers, $this->_incoming_message_type, $this );
	389	+ add_filter('wp_mail_from', array($this, 'set_from_address'), 100);
	390	+ add_filter('wp_mail_from_name', array($this, 'set_from_name'), 100);
	391	+ return apply_filters('FHEE__EE_Email_messenger___headers', $headers, $this->_incoming_message_type, $this);
392	392	}
393	393
394	394
		@@ -404,19 +404,19 @@ discard block
		block discarded – undo
404	404	* @return array
405	405	*/
406	406	private function _parse_from() {
407		- if ( strpos( $this->_from, '<' ) !== false ) {
408		- $from_name = substr( $this->_from, 0, strpos( $this->_from, '<' ) - 1 );
409		- $from_name = str_replace( '"', '', $from_name );
410		- $from_name = trim( $from_name );
411		-
412		- $from_email = substr( $this->_from, strpos( $this->_from, '<' ) + 1 );
413		- $from_email = str_replace( '>', '', $from_email );
414		- $from_email = trim( $from_email );
	407	+ if (strpos($this->_from, '<') !== false) {
	408	+ $from_name = substr($this->_from, 0, strpos($this->_from, '<') - 1);
	409	+ $from_name = str_replace('"', '', $from_name);
	410	+ $from_name = trim($from_name);
	411	+
	412	+ $from_email = substr($this->_from, strpos($this->_from, '<') + 1);
	413	+ $from_email = str_replace('>', '', $from_email);
	414	+ $from_email = trim($from_email);
415	415	} else {
416	416	$from_name = '';
417		- $from_email = trim( $this->_from );
	417	+ $from_email = trim($this->_from);
418	418	}
419		- return array( $from_name, $from_email );
	419	+ return array($from_name, $from_email);
420	420	}
421	421
422	422
		@@ -429,7 +429,7 @@ discard block
		block discarded – undo
429	429	*
430	430	* @param string $from_email What the original from_email is.
431	431	*/
432		- public function set_from_address( $from_email ) {
	432	+ public function set_from_address($from_email) {
433	433	$parsed_from = $this->_parse_from();
434	434	return $parsed_from[1];
435	435	}
		@@ -444,13 +444,13 @@ discard block
		block discarded – undo
444	444	*
445	445	* @param string $from_name The original from_name.
446	446	*/
447		- public function set_from_name( $from_name ) {
	447	+ public function set_from_name($from_name) {
448	448	$parsed_from = $this->_parse_from();
449		- if ( is_array( $parsed_from) && ! empty( $parsed_from[0] ) ) {
450		- $from_name = $parsed_from[0];
	449	+ if (is_array($parsed_from) && ! empty($parsed_from[0])) {
	450	+ $from_name = $parsed_from[0];
451	451	}
452	452
453		- return stripslashes_deep( html_entity_decode($from_name, ENT_QUOTES,"UTF-8" ) );
	453	+ return stripslashes_deep(html_entity_decode($from_name, ENT_QUOTES, "UTF-8"));
454	454	}
455	455
456	456
		@@ -461,14 +461,14 @@ discard block
		block discarded – undo
461	461	* @param bool $preview will determine whether this is preview template or not.
462	462	* @return string formatted body for email.
463	463	*/
464		- protected function _body( $preview = FALSE ) {
	464	+ protected function _body($preview = FALSE) {
465	465	//setup template args!
466	466	$this->_template_args = array(
467	467	'subject' => $this->_subject,
468	468	'from' => $this->_from,
469		- 'main_body' => wpautop(stripslashes_deep( html_entity_decode($this->_content, ENT_QUOTES,"UTF-8" ) ))
	469	+ 'main_body' => wpautop(stripslashes_deep(html_entity_decode($this->_content, ENT_QUOTES, "UTF-8")))
470	470	);
471		- $body = $this->_get_main_template( $preview );
	471	+ $body = $this->_get_main_template($preview);
472	472
473	473	/**
474	474	* This filter allows one to bypass the CSSToInlineStyles tool and leave the body untouched.
		@@ -476,17 +476,17 @@ discard block
		block discarded – undo
476	476	* @type bool $preview Indicates whether a preview is being generated or not.
477	477	* @return bool true indicates to use the inliner, false bypasses it.
478	478	*/
479		- if ( apply_filters( 'FHEE__EE_Email_messenger__apply_CSSInliner ', true, $preview ) ) {
	479	+ if (apply_filters('FHEE__EE_Email_messenger__apply_CSSInliner ', true, $preview)) {
480	480
481	481	//require CssToInlineStyles library and its dependencies via composer autoloader
482		- require_once EE_THIRD_PARTY . 'cssinliner/vendor/autoload.php';
	482	+ require_once EE_THIRD_PARTY.'cssinliner/vendor/autoload.php';
483	483
484	484	//now if this isn't a preview, let's setup the body so it has inline styles
485		- if ( ! $preview \|\| ( $preview && defined( 'DOING_AJAX' ) ) ) {
486		- $style = file_get_contents( $this->get_variation( $this->_tmp_pack, $this->_incoming_message_type->name, FALSE, 'main', $this->_variation ), TRUE );
487		- $CSS = new TijsVerkoyen\CssToInlineStyles\CssToInlineStyles( $body, $style );
488		- $body = ltrim( $CSS->convert( true ), ">\n" ); //for some reason the library has a bracket and new line at the beginning. This takes care of that.
489		- $body = ltrim( $body, "<?" ); //see https://events.codebasehq.com/projects/event-espresso/tickets/8609
	485	+ if ( ! $preview \|\| ($preview && defined('DOING_AJAX'))) {
	486	+ $style = file_get_contents($this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, FALSE, 'main', $this->_variation), TRUE);
	487	+ $CSS = new TijsVerkoyen\CssToInlineStyles\CssToInlineStyles($body, $style);
	488	+ $body = ltrim($CSS->convert(true), ">\n"); //for some reason the library has a bracket and new line at the beginning. This takes care of that.
	489	+ $body = ltrim($body, "<?"); //see https://events.codebasehq.com/projects/event-espresso/tickets/8609
490	490	}
491	491
492	492	}
		@@ -505,8 +505,8 @@ discard block
		block discarded – undo
505	505	public function get_existing_test_settings() {
506	506	$settings = parent::get_existing_test_settings();
507	507	//override subject if present because we always want it to be fresh.
508		- if ( is_array( $settings ) && ! empty( $settings['subject'] ) ) {
509		- $settings['subject'] = sprintf( __('Test email sent from %s', 'event_espresso'), get_bloginfo('name') );
	508	+ if (is_array($settings) && ! empty($settings['subject'])) {
	509	+ $settings['subject'] = sprintf(__('Test email sent from %s', 'event_espresso'), get_bloginfo('name'));
510	510	}
511	511	return $settings;
512	512	}

		@@ -426,7 +426,7 @@
		block discarded – undo
426	426	*
427	427	* @since 4.3.1
428	428	*
429		- * @return array
	429	+ * @return string[]
430	430	*/
431	431	private function _parse_from() {
432	432	if ( strpos( $this->_from, '<' ) !== false ) {

		@@ -1,6 +1,7 @@
		block discarded – undo
1	1	<?php
2		-if (!defined('EVENT_ESPRESSO_VERSION') )
	2	+if (!defined('EVENT_ESPRESSO_VERSION') ) {
3	3	exit('NO direct script access allowed');
	4	+}
4	5
5	6	/**
6	7	* Event Espresso

		@@ -18,7 +18,7 @@ discard block
		block discarded – undo
18	18	* @return EED_Bot_Trap
19	19	*/
20	20	public static function instance() {
21		- return parent::get_instance( __CLASS__ );
	21	+ return parent::get_instance(__CLASS__);
22	22	}
23	23
24	24
		@@ -31,22 +31,22 @@ discard block
		block discarded – undo
31	31	*/
32	32	public static function set_hooks() {
33	33	if (
34		- apply_filters( 'FHEE__EED_Bot_Trap__set_hooks__use_bot_trap', true ) &&
	34	+ apply_filters('FHEE__EED_Bot_Trap__set_hooks__use_bot_trap', true) &&
35	35	EE_Registry::instance()->CFG->registration->use_bot_trap
36	36	) {
37		- define( 'EE_BOT_TRAP_BASE_URL', plugin_dir_url( __FILE__ ) . DS );
	37	+ define('EE_BOT_TRAP_BASE_URL', plugin_dir_url(__FILE__).DS);
38	38	add_action(
39	39	'AHEE__ticket_selector_chart__template__after_ticket_selector',
40		- array( 'EED_Bot_Trap', 'generate_bot_trap' ),
	40	+ array('EED_Bot_Trap', 'generate_bot_trap'),
41	41	10, 2
42	42	);
43	43	add_action(
44	44	'EED_Ticket_Selector__process_ticket_selections__before',
45		- array( 'EED_Bot_Trap', 'process_bot_trap' ),
	45	+ array('EED_Bot_Trap', 'process_bot_trap'),
46	46	1, 2
47	47	);
48	48	// redirect bots to bogus success page
49		- EE_Config::register_route( 'ticket_selection_received', 'EED_Bot_Trap', 'display_bot_trap_success' );
	49	+ EE_Config::register_route('ticket_selection_received', 'EED_Bot_Trap', 'display_bot_trap_success');
50	50	}
51	51	}
52	52
		@@ -61,12 +61,12 @@ discard block
		block discarded – undo
61	61	public static function set_hooks_admin() {
62	62	add_action(
63	63	'AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template',
64		- array( 'EED_Bot_Trap', 'bot_trap_settings_form' ),
	64	+ array('EED_Bot_Trap', 'bot_trap_settings_form'),
65	65	10
66	66	);
67	67	add_filter(
68	68	'FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration',
69		- array( 'EED_Bot_Trap', 'update_bot_trap_settings_form' ),
	69	+ array('EED_Bot_Trap', 'update_bot_trap_settings_form'),
70	70	10, 1
71	71	);
72	72	}
		@@ -80,7 +80,7 @@ discard block
		block discarded – undo
80	80	* @param WP $WP
81	81	* @return void
82	82	*/
83		- public function run( $WP ) {}
	83	+ public function run($WP) {}
84	84
85	85
86	86
		@@ -91,14 +91,14 @@ discard block
		block discarded – undo
91	91	* @return void
92	92	*/
93	93	public static function generate_bot_trap() {
94		- $do_not_enter = __( 'please do not enter anything in this input', 'event_espresso' );
	94	+ $do_not_enter = __('please do not enter anything in this input', 'event_espresso');
95	95	$html = '<div id="tkt-slctr-request-processor-dv" style="float:left; margin-left:-999em;">';
96		- $html .= '<label for="tkt-slctr-request-processor-email">' . $do_not_enter . '</label>';
	96	+ $html .= '<label for="tkt-slctr-request-processor-email">'.$do_not_enter.'</label>';
97	97	$html .= '<input type="email" name="tkt-slctr-request-processor-email" value=""/>';
98	98	$html .= '<input type="hidden" name="tkt-slctr-request-processor-token" value="';
99		- if ( EE_Registry::instance()->CFG->registration->use_encryption ) {
100		- EE_Registry::instance()->load_core( 'EE_Encryption' );
101		- $html .= EE_Encryption::instance()->encrypt( time() );
	99	+ if (EE_Registry::instance()->CFG->registration->use_encryption) {
	100	+ EE_Registry::instance()->load_core('EE_Encryption');
	101	+ $html .= EE_Encryption::instance()->encrypt(time());
102	102	} else {
103	103	$html .= time();
104	104	}
		@@ -117,35 +117,35 @@ discard block
		block discarded – undo
117	117	*/
118	118	public static function process_bot_trap() {
119	119	// what's your email address Mr. Bot ?
120		- $empty_trap = isset( $_REQUEST[ 'tkt-slctr-request-processor-email' ] ) && $_REQUEST[ 'tkt-slctr-request-processor-email' ] == '' ? true : false;
	120	+ $empty_trap = isset($_REQUEST['tkt-slctr-request-processor-email']) && $_REQUEST['tkt-slctr-request-processor-email'] == '' ? true : false;
121	121	// get encrypted timestamp for when the form was originally displayed
122		- $bot_trap_timestamp = isset( $_REQUEST[ 'tkt-slctr-request-processor-token' ] ) ? sanitize_text_field( $_REQUEST[ 'tkt-slctr-request-processor-token' ] ) : '';
	122	+ $bot_trap_timestamp = isset($_REQUEST['tkt-slctr-request-processor-token']) ? sanitize_text_field($_REQUEST['tkt-slctr-request-processor-token']) : '';
123	123	// decrypt and convert to absolute integer
124		- if ( EE_Registry::instance()->CFG->registration->use_encryption ) {
125		- EE_Registry::instance()->load_core( 'EE_Encryption' );
126		- $bot_trap_timestamp = absint( EE_Encryption::instance()->decrypt( $bot_trap_timestamp ) );
	124	+ if (EE_Registry::instance()->CFG->registration->use_encryption) {
	125	+ EE_Registry::instance()->load_core('EE_Encryption');
	126	+ $bot_trap_timestamp = absint(EE_Encryption::instance()->decrypt($bot_trap_timestamp));
127	127	} else {
128		- $bot_trap_timestamp = absint( $bot_trap_timestamp );
	128	+ $bot_trap_timestamp = absint($bot_trap_timestamp);
129	129	}
130	130	// ticket form submitted too impossibly fast ( after now ) or more than an hour later ???
131		- $suspicious_timing = $bot_trap_timestamp > time() \|\| $bot_trap_timestamp < ( time() - HOUR_IN_SECONDS ) ? true : false;
	131	+ $suspicious_timing = $bot_trap_timestamp > time() \|\| $bot_trap_timestamp < (time() - HOUR_IN_SECONDS) ? true : false;
132	132	// are we human ?
133		- if ( $empty_trap && ! $suspicious_timing ) {
	133	+ if ($empty_trap && ! $suspicious_timing) {
134	134	return;
135	135	}
136	136	// UH OH...
137	137	$redirect_url = add_query_arg(
138		- array( 'ee' => 'ticket_selection_received' ),
	138	+ array('ee' => 'ticket_selection_received'),
139	139	EE_Registry::instance()->CFG->core->reg_page_url()
140	140	);
141		- if ( $suspicious_timing ) {
	141	+ if ($suspicious_timing) {
142	142	$redirect_url = add_query_arg(
143		- array( 'ee-notice' => urlencode( __( 'We\'re sorry, but your ticket selections could not be processed due to a server timing error. Please hit the back button on your browser and try again.', 'event_espresso' ) ) ),
	143	+ array('ee-notice' => urlencode(__('We\'re sorry, but your ticket selections could not be processed due to a server timing error. Please hit the back button on your browser and try again.', 'event_espresso'))),
144	144	$redirect_url
145	145	);
146	146	}
147	147	wp_safe_redirect(
148		- apply_filters( 'FHEE__EED_Bot_Trap__process_bot_trap__redirect_url', $redirect_url )
	148	+ apply_filters('FHEE__EED_Bot_Trap__process_bot_trap__redirect_url', $redirect_url)
149	149	);
150	150	exit();
151	151	}
		@@ -160,11 +160,11 @@ discard block
		block discarded – undo
160	160	* @return void
161	161	*/
162	162	public static function display_bot_trap_success() {
163		- EE_Registry::instance()->load_helper( 'HTML' );
164		- add_filter( 'FHEE__EED_Single_Page_Checkout__run', '__return_false' );
165		- $bot_notice = __( 'Thank you so much. Your ticket selections have been received for consideration.', 'event_espresso' );
166		- $bot_notice = isset( $_REQUEST[ 'ee-notice' ] ) && $_REQUEST[ 'ee-notice' ] !== '' ? sanitize_text_field( stripslashes( $_REQUEST[ 'ee-notice' ] ) ) : $bot_notice;
167		- EE_Registry::instance()->REQ->add_output( EEH_HTML::div( $bot_notice, '', 'ee-attention' ) );
	163	+ EE_Registry::instance()->load_helper('HTML');
	164	+ add_filter('FHEE__EED_Single_Page_Checkout__run', '__return_false');
	165	+ $bot_notice = __('Thank you so much. Your ticket selections have been received for consideration.', 'event_espresso');
	166	+ $bot_notice = isset($_REQUEST['ee-notice']) && $_REQUEST['ee-notice'] !== '' ? sanitize_text_field(stripslashes($_REQUEST['ee-notice'])) : $bot_notice;
	167	+ EE_Registry::instance()->REQ->add_output(EEH_HTML::div($bot_notice, '', 'ee-attention'));
168	168	}
169	169
170	170
		@@ -198,20 +198,20 @@ discard block
		block discarded – undo
198	198	'html_id' => 'bot_trap_settings',
199	199	'layout_strategy' => new EE_Admin_Two_Column_Layout(),
200	200	'subsections' => array(
201		- 'bot_trap_hdr' => new EE_Form_Section_HTML( EEH_HTML::h2( __( 'Bot Trap Settings', 'event_espresso' ) ) ),
	201	+ 'bot_trap_hdr' => new EE_Form_Section_HTML(EEH_HTML::h2(__('Bot Trap Settings', 'event_espresso'))),
202	202	'use_bot_trap' => new EE_Yes_No_Input(
203	203	array(
204		- 'html_label_text' => __( 'Enable Bot Trap', 'event_espresso' ),
205		- 'html_help_text' => __( 'The Event Espresso Bot Trap will insert a fake input into your Ticket Selector forms that is hidden from regular site visitors, but visible to spam bots. Because the input asks for an email address, it is irresistible to spam bots who will of course enter text into it. Since regular site visitors can not see this input, any value detected during form submission means a bot has been detected, which will then be blocked from submitting the form.', 'event_espresso' ),
206		- 'default' => isset( EE_Registry::instance()->CFG->registration->use_bot_trap ) ? EE_Registry::instance()->CFG->registration->use_bot_trap : true,
	204	+ 'html_label_text' => __('Enable Bot Trap', 'event_espresso'),
	205	+ 'html_help_text' => __('The Event Espresso Bot Trap will insert a fake input into your Ticket Selector forms that is hidden from regular site visitors, but visible to spam bots. Because the input asks for an email address, it is irresistible to spam bots who will of course enter text into it. Since regular site visitors can not see this input, any value detected during form submission means a bot has been detected, which will then be blocked from submitting the form.', 'event_espresso'),
	206	+ 'default' => isset(EE_Registry::instance()->CFG->registration->use_bot_trap) ? EE_Registry::instance()->CFG->registration->use_bot_trap : true,
207	207	'required' => false
208	208	)
209	209	),
210	210	'use_encryption' => new EE_Yes_No_Input(
211	211	array(
212		- 'html_label_text' => __( 'Encrypt Bot Trap Data', 'event_espresso' ),
213		- 'html_help_text' => __( 'One way to detect spam bots is by looking at how long it takes them to submit a form. They are often inhumanly fast, or will submit forms hours, days, or even weeks after the form was first scraped off the web. The Event Espresso Bot Trap will send a timestamp with the Ticket Selector form when it is submitted. By default, this timestamp is encrypted so that the spam bots can not change it, but encryption may cause issues on some servers due to configuration "conflicts". If you continuously get caught in the bot trap, then try setting this option to "No". This may increase the number of spam submissions you receive, but increases server compatibility.', 'event_espresso' ),
214		- 'default' => isset( EE_Registry::instance()->CFG->registration->use_encryption ) ? EE_Registry::instance()->CFG->registration->use_encryption : true,
	212	+ 'html_label_text' => __('Encrypt Bot Trap Data', 'event_espresso'),
	213	+ 'html_help_text' => __('One way to detect spam bots is by looking at how long it takes them to submit a form. They are often inhumanly fast, or will submit forms hours, days, or even weeks after the form was first scraped off the web. The Event Espresso Bot Trap will send a timestamp with the Ticket Selector form when it is submitted. By default, this timestamp is encrypted so that the spam bots can not change it, but encryption may cause issues on some servers due to configuration "conflicts". If you continuously get caught in the bot trap, then try setting this option to "No". This may increase the number of spam submissions you receive, but increases server compatibility.', 'event_espresso'),
	214	+ 'default' => isset(EE_Registry::instance()->CFG->registration->use_encryption) ? EE_Registry::instance()->CFG->registration->use_encryption : true,
215	215	'required' => false
216	216	)
217	217	),
		@@ -229,30 +229,30 @@ discard block
		block discarded – undo
229	229	* @param \EE_Registration_Config $EE_Registration_Config
230	230	* @return \EE_Registration_Config
231	231	*/
232		- public static function update_bot_trap_settings_form( EE_Registration_Config $EE_Registration_Config ) {
	232	+ public static function update_bot_trap_settings_form(EE_Registration_Config $EE_Registration_Config) {
233	233	try {
234	234	$bot_trap_settings_form = EED_Bot_Trap::_bot_trap_settings_form();
235	235	// if not displaying a form, then check for form submission
236		- if ( $bot_trap_settings_form->was_submitted() ) {
	236	+ if ($bot_trap_settings_form->was_submitted()) {
237	237	// capture form data
238	238	$bot_trap_settings_form->receive_form_submission();
239	239	// validate form data
240		- if ( $bot_trap_settings_form->is_valid() ) {
	240	+ if ($bot_trap_settings_form->is_valid()) {
241	241	// grab validated data from form
242	242	$valid_data = $bot_trap_settings_form->valid_data();
243		- if ( isset( $valid_data[ 'use_bot_trap' ], $valid_data[ 'use_encryption' ] ) ) {
244		- $EE_Registration_Config->use_bot_trap = $valid_data[ 'use_bot_trap' ];
245		- $EE_Registration_Config->use_encryption = $valid_data[ 'use_encryption' ];
	243	+ if (isset($valid_data['use_bot_trap'], $valid_data['use_encryption'])) {
	244	+ $EE_Registration_Config->use_bot_trap = $valid_data['use_bot_trap'];
	245	+ $EE_Registration_Config->use_encryption = $valid_data['use_encryption'];
246	246	} else {
247		- EE_Error::add_error( __( 'Invalid or missing Bot Trap settings. Please refresh the form and try again.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
	247	+ EE_Error::add_error(__('Invalid or missing Bot Trap settings. Please refresh the form and try again.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
248	248	}
249	249	} else {
250		- if ( $bot_trap_settings_form->submission_error_message() != '' ) {
251		- EE_Error::add_error( $bot_trap_settings_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__ );
	250	+ if ($bot_trap_settings_form->submission_error_message() != '') {
	251	+ EE_Error::add_error($bot_trap_settings_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__);
252	252	}
253	253	}
254	254	}
255		- } catch ( EE_Error $e ) {
	255	+ } catch (EE_Error $e) {
256	256	$e->get_error();
257	257	}
258	258	return $EE_Registration_Config;

		@@ -32,7 +32,7 @@ discard block
		block discarded – undo
32	32	* @return EED_Ical
33	33	*/
34	34	public static function instance() {
35		- return parent::get_instance( __CLASS__ );
	35	+ return parent::get_instance(__CLASS__);
36	36	}
37	37
38	38
		@@ -45,9 +45,9 @@ discard block
		block discarded – undo
45	45	*/
46	46	public static function set_hooks() {
47	47	// create download buttons
48		- add_filter( 'FHEE__espresso_list_of_event_dates__datetime_html', array( 'EED_Ical', 'generate_add_to_iCal_button' ), 10, 2 );
	48	+ add_filter('FHEE__espresso_list_of_event_dates__datetime_html', array('EED_Ical', 'generate_add_to_iCal_button'), 10, 2);
49	49	// process ics download request
50		- EE_Config::register_route( 'download_ics_file', 'EED_Ical', 'download_ics_file' );
	50	+ EE_Config::register_route('download_ics_file', 'EED_Ical', 'download_ics_file');
51	51	}
52	52
53	53
		@@ -70,7 +70,7 @@ discard block
		block discarded – undo
70	70	* @param WP $WP
71	71	* @return void
72	72	*/
73		- public function run( $WP ) {}
	73	+ public function run($WP) {}
74	74
75	75
76	76
		@@ -82,30 +82,30 @@ discard block
		block discarded – undo
82	82	* @param $datetime
83	83	* @return string
84	84	*/
85		- public static function generate_add_to_iCal_button( $html, $datetime ) {
	85	+ public static function generate_add_to_iCal_button($html, $datetime) {
86	86	// first verify a proper datetime object has been received
87		- if ( $datetime instanceof EE_Datetime ) {
	87	+ if ($datetime instanceof EE_Datetime) {
88	88	// set whether a link or submit button is shown
89		- $iCal_type = apply_filters( 'FHEE__EED_Ical__generate_add_to_iCal_button__iCal_type', 'submit' );
	89	+ $iCal_type = apply_filters('FHEE__EED_Ical__generate_add_to_iCal_button__iCal_type', 'submit');
90	90	// generate a link to the route we registered in set_hooks()
91		- $URL = add_query_arg( array( 'ee' => 'download_ics_file', 'ics_id' => $datetime->ID() ), site_url() );
	91	+ $URL = add_query_arg(array('ee' => 'download_ics_file', 'ics_id' => $datetime->ID()), site_url());
92	92	// what type ?
93		- switch ( $iCal_type ) {
	93	+ switch ($iCal_type) {
94	94	// submit buttons appear as buttons and are very compatible with a theme's style
95	95	case 'submit' :
96		- $html .= '<form id="download-iCal-frm-' . $datetime->ID() . '" class="download-iCal-frm" action="' . $URL . '" method="post" >';
97		- $html .= '<input type="submit" class="ee-ical-sbmt" value="" title="' . __( 'Add to iCal Calendar', 'event_espresso' ) . '"/>';
	96	+ $html .= '<form id="download-iCal-frm-'.$datetime->ID().'" class="download-iCal-frm" action="'.$URL.'" method="post" >';
	97	+ $html .= '<input type="submit" class="ee-ical-sbmt" value="" title="'.__('Add to iCal Calendar', 'event_espresso').'"/>';
98	98	$html .= '</form>';
99	99	break;
100	100	// buttons are just links that have been styled to appear as buttons, but may not be blend with a theme as well as submit buttons
101	101	case 'button' :
102		- $html .= '<a class="ee-ical-btn small ee-button ee-roundish" href="' . $URL . '" title="' . __( 'Add to iCal Calendar', 'event_espresso' ) . '">';
	102	+ $html .= '<a class="ee-ical-btn small ee-button ee-roundish" href="'.$URL.'" title="'.__('Add to iCal Calendar', 'event_espresso').'">';
103	103	$html .= ' <span class="dashicons dashicons-calendar"></span>';
104	104	$html .= '</a>';
105	105	break;
106	106	// links are just links that use the calendar dashicon
107	107	case 'icon' :
108		- $html .= '<a class="ee-ical-lnk" href="' . $URL . '" title="' . __( 'Add to iCal Calendar', 'event_espresso' ) . '">';
	108	+ $html .= '<a class="ee-ical-lnk" href="'.$URL.'" title="'.__('Add to iCal Calendar', 'event_espresso').'">';
109	109	$html .= ' <span class="dashicons dashicons-calendar"></span>';
110	110	$html .= '</a>';
111	111	break;
		@@ -123,73 +123,73 @@ discard block
		block discarded – undo
123	123	* @return void
124	124	*/
125	125	public static function download_ics_file() {
126		- if ( EE_Registry::instance()->REQ->is_set( 'ics_id' )) {
127		- $DTT_ID = absint( EE_Registry::instance()->REQ->get( 'ics_id' ));
128		- $datetime = EE_Registry::instance()->load_model( 'Datetime' )->get_one_by_ID( $DTT_ID );
129		- if ( $datetime instanceof EE_Datetime ) {
	126	+ if (EE_Registry::instance()->REQ->is_set('ics_id')) {
	127	+ $DTT_ID = absint(EE_Registry::instance()->REQ->get('ics_id'));
	128	+ $datetime = EE_Registry::instance()->load_model('Datetime')->get_one_by_ID($DTT_ID);
	129	+ if ($datetime instanceof EE_Datetime) {
130	130	// get related event, venues, and event categories
131	131	$event = $datetime->event();
132	132	// get related category Term object and it's name
133	133	$category = $event->first_event_category();
134		- if ( $category instanceof EE_Term ) {
	134	+ if ($category instanceof EE_Term) {
135	135	$category = $category->name();
136	136	}
137	137	$location = '';
138	138	// get first related venue and convert to CSV string
139		- $venue = $event->venues(array( 'limit'=>1 ));
140		- if ( is_array( $venue ) && ! empty( $venue )) {
141		- $venue = array_shift( $venue );
142		- if ( $venue instanceof EE_Venue ) {
143		- EE_Registry::instance()->load_helper( 'Venue_View' );
144		- $location = espresso_venue_raw_address( 'inline', $venue->ID(), FALSE );
	139	+ $venue = $event->venues(array('limit'=>1));
	140	+ if (is_array($venue) && ! empty($venue)) {
	141	+ $venue = array_shift($venue);
	142	+ if ($venue instanceof EE_Venue) {
	143	+ EE_Registry::instance()->load_helper('Venue_View');
	144	+ $location = espresso_venue_raw_address('inline', $venue->ID(), FALSE);
145	145	}
146	146	}
147	147	// set variables, escape strings, convert timestamps to ics format, etc
148		- $filename = $event->slug() . '-' . $datetime->start_date( 'Y-m-d' ) . '.ics';
149		- $organizer = EED_Ical::_escape_ICal_data( EE_Registry::instance()->CFG->organization->name );
150		- $UID = EED_Ical::_escape_ICal_data( md5( $event->name() . $event->ID() . $datetime->ID() ));
151		- $org_email = EED_Ical::_escape_ICal_data( $datetime->ID() );
152		- $timestamp = date( EED_Ical::iCal_datetime_format );
153		- $location = EED_Ical::_escape_ICal_data( $location );
154		- $summary = EED_Ical::_escape_ICal_data( $event->name() );
155		- $description = EED_Ical::_escape_ICal_description( wp_strip_all_tags( $event->description() ));
	148	+ $filename = $event->slug().'-'.$datetime->start_date('Y-m-d').'.ics';
	149	+ $organizer = EED_Ical::_escape_ICal_data(EE_Registry::instance()->CFG->organization->name);
	150	+ $UID = EED_Ical::_escape_ICal_data(md5($event->name().$event->ID().$datetime->ID()));
	151	+ $org_email = EED_Ical::_escape_ICal_data($datetime->ID());
	152	+ $timestamp = date(EED_Ical::iCal_datetime_format);
	153	+ $location = EED_Ical::_escape_ICal_data($location);
	154	+ $summary = EED_Ical::_escape_ICal_data($event->name());
	155	+ $description = EED_Ical::_escape_ICal_description(wp_strip_all_tags($event->description()));
156	156	$status = $datetime->get_active_status();
157	157	$status = $status == EE_Datetime::cancelled ? 'Cancelled' : 'Confirmed';
158		- $status = EED_Ical::_escape_ICal_data( $status );
159		- $categories = EED_Ical::_escape_ICal_data( $category );
160		- $url = EED_Ical::_escape_ICal_data( get_permalink( $event->ID() ));
161		- $dtt_start = EED_Ical::_escape_ICal_data( date( EED_Ical::iCal_datetime_format, $datetime->start() ));
162		- $dtt_end = EED_Ical::_escape_ICal_data( date( EED_Ical::iCal_datetime_format, $datetime->end() ));
	158	+ $status = EED_Ical::_escape_ICal_data($status);
	159	+ $categories = EED_Ical::_escape_ICal_data($category);
	160	+ $url = EED_Ical::_escape_ICal_data(get_permalink($event->ID()));
	161	+ $dtt_start = EED_Ical::_escape_ICal_data(date(EED_Ical::iCal_datetime_format, $datetime->start()));
	162	+ $dtt_end = EED_Ical::_escape_ICal_data(date(EED_Ical::iCal_datetime_format, $datetime->end()));
163	163	// set headers
164		- header( 'Content-type: text/calendar; charset=utf-8' );
165		- header( 'Content-Disposition: attachment; filename="' . $filename . '"' );
166		- header( 'Cache-Control: private, max-age=0, must-revalidate' );
167		- header( 'Pragma: public' );
168		- header( 'Content-Type: application/octet-stream' );
169		- header( 'Content-Type: application/force-download' );
170		- header( 'Cache-Control: no-cache, must-revalidate' );
171		- header( 'Content-Transfer-Encoding: binary' );
172		- header( 'Expires: Sat, 26 Jul 1997 05:00:00 GMT' ); // past date
173		- ini_set( 'zlib.output_compression', '0' );
	164	+ header('Content-type: text/calendar; charset=utf-8');
	165	+ header('Content-Disposition: attachment; filename="'.$filename.'"');
	166	+ header('Cache-Control: private, max-age=0, must-revalidate');
	167	+ header('Pragma: public');
	168	+ header('Content-Type: application/octet-stream');
	169	+ header('Content-Type: application/force-download');
	170	+ header('Cache-Control: no-cache, must-revalidate');
	171	+ header('Content-Transfer-Encoding: binary');
	172	+ header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // past date
	173	+ ini_set('zlib.output_compression', '0');
174	174	// echo the output
175		- echo "BEGIN:VCALENDAR" . PHP_EOL;
176		- echo "VERSION:2.0" . PHP_EOL;
177		- echo "PRODID:-//{$organizer}//NONSGML PDA Calendar Version 1.0//EN" . PHP_EOL;
178		- echo "CALSCALE:GREGORIAN" . PHP_EOL;
179		- echo "BEGIN:VEVENT" . PHP_EOL;
180		- echo "UID:{$UID}" . PHP_EOL;
181		- echo "ORGANIZER:MAILTO:{$org_email}" . PHP_EOL;
182		- echo "DTSTAMP:{$timestamp}" . PHP_EOL;
183		- echo "LOCATION:{$location}" . PHP_EOL;
184		- echo "SUMMARY:{$summary}" . PHP_EOL;
185		- echo "DESCRIPTION:{$description}" . PHP_EOL;
186		- echo "STATUS:{$status}" . PHP_EOL;
187		- echo "CATEGORIES:{$categories}" . PHP_EOL;
188		- echo "URL;VALUE=URI:{$url}" . PHP_EOL;
189		- echo "DTSTART:{$dtt_start}" . PHP_EOL;
190		- echo "DTEND:{$dtt_end}" . PHP_EOL;
191		- echo "END:VEVENT" . PHP_EOL;
192		- echo "END:VCALENDAR" . PHP_EOL;
	175	+ echo "BEGIN:VCALENDAR".PHP_EOL;
	176	+ echo "VERSION:2.0".PHP_EOL;
	177	+ echo "PRODID:-//{$organizer}//NONSGML PDA Calendar Version 1.0//EN".PHP_EOL;
	178	+ echo "CALSCALE:GREGORIAN".PHP_EOL;
	179	+ echo "BEGIN:VEVENT".PHP_EOL;
	180	+ echo "UID:{$UID}".PHP_EOL;
	181	+ echo "ORGANIZER:MAILTO:{$org_email}".PHP_EOL;
	182	+ echo "DTSTAMP:{$timestamp}".PHP_EOL;
	183	+ echo "LOCATION:{$location}".PHP_EOL;
	184	+ echo "SUMMARY:{$summary}".PHP_EOL;
	185	+ echo "DESCRIPTION:{$description}".PHP_EOL;
	186	+ echo "STATUS:{$status}".PHP_EOL;
	187	+ echo "CATEGORIES:{$categories}".PHP_EOL;
	188	+ echo "URL;VALUE=URI:{$url}".PHP_EOL;
	189	+ echo "DTSTART:{$dtt_start}".PHP_EOL;
	190	+ echo "DTEND:{$dtt_end}".PHP_EOL;
	191	+ echo "END:VEVENT".PHP_EOL;
	192	+ echo "END:VCALENDAR".PHP_EOL;
193	193	}
194	194	}
195	195	die();
		@@ -204,8 +204,8 @@ discard block
		block discarded – undo
204	204	* @param string $string
205	205	* @return string
206	206	*/
207		- private static function _escape_ICal_data( $string = '' ) {
208		- return preg_replace( '/([\,;])/', '\\\$1', $string );
	207	+ private static function _escape_ICal_data($string = '') {
	208	+ return preg_replace('/([\,;])/', '\\\$1', $string);
209	209	}
210	210
211	211	/**
		@@ -215,13 +215,13 @@ discard block
		block discarded – undo
215	215	* @param string $description
216	216	* @return string
217	217	*/
218		- private static function _escape_ICal_description( $description = '' ) {
	218	+ private static function _escape_ICal_description($description = '') {
219	219
220	220	//Escape spcial chars within the decription
221		- $description = EED_Ical::_escape_ICal_data( $description );
	221	+ $description = EED_Ical::_escape_ICal_data($description);
222	222
223	223	//Remove line breaks and output in iCal format
224		- $description = str_replace( array( "\r\n", "\n"), '\n', $description );
	224	+ $description = str_replace(array("\r\n", "\n"), '\n', $description);
225	225
226	226	return $description;
227	227	}

		@@ -220,8 +220,8 @@
		block discarded – undo
220	220	//Escape spcial chars within the decription
221	221	$description = EED_Ical::_escape_ICal_data( $description );
222	222
223		- //Remove line breaks and output in iCal format
224		- $description = str_replace( array( "\r\n", "\n"), '\n', $description );
	223	+ //Remove line breaks and output in iCal format
	224	+ $description = str_replace( array( "\r\n", "\n"), '\n', $description );
225	225
226	226	return $description;
227	227	}

		@@ -606,9 +606,9 @@
		block discarded – undo
606	606	// first check if event is active.
607	607	if (
608	608	$orig_status === EEM_Event::cancelled
609		- \|\| $orig_status === EEM_Event::postponed
610		- \|\| $event->is_expired()
611		- \|\| $event->is_inactive()
	609	+ \|\| $orig_status === EEM_Event::postponed
	610	+ \|\| $event->is_expired()
	611	+ \|\| $event->is_inactive()
612	612	) {
613	613	return;
614	614	}

		@@ -1,6 +1,7 @@ discard block
		block discarded – undo
1	1	<?php
2		-if (!defined('EVENT_ESPRESSO_VERSION'))
	2	+if (!defined('EVENT_ESPRESSO_VERSION')) {
3	3	exit('NO direct script access allowed');
	4	+}
4	5
5	6	/**
6	7	* Event Espresso
		@@ -1484,10 +1485,11 @@ discard block
		block discarded – undo
1484	1485	//get the earliest datetime (if present);
1485	1486	$earliest_dtt = $this->_cpt_model_obj->ID() > 0 ? $this->_cpt_model_obj->get_first_related('Datetime', array('order_by'=> array('DTT_EVT_start' => 'ASC' ) ) ) : NULL;
1486	1487
1487		- if ( !empty( $earliest_dtt ) )
1488		- $template_args['TKT_end_date'] = $earliest_dtt->get_datetime('DTT_EVT_start', 'Y-m-d', 'h:i a');
1489		- else
1490		- $template_args['TKT_end_date'] = date('Y-m-d h:i a', mktime(0, 0, 0, date("m"), date("d")+7, date("Y") ) );
	1488	+ if ( !empty( $earliest_dtt ) ) {
	1489	+ $template_args['TKT_end_date'] = $earliest_dtt->get_datetime('DTT_EVT_start', 'Y-m-d', 'h:i a');
	1490	+ } else {
	1491	+ $template_args['TKT_end_date'] = date('Y-m-d h:i a', mktime(0, 0, 0, date("m"), date("d")+7, date("Y") ) );
	1492	+ }
1491	1493	}
1492	1494
1493	1495	$template_args = array_merge( $template_args, $price_args );
		@@ -1725,8 +1727,9 @@ discard block
		block discarded – undo
1725	1727	}
1726	1728	$action = $event_status == 'trash' ? 'moved to the trash' : 'restored from the trash';
1727	1729
1728		- if ( $redirect_after )
1729		- $this->_redirect_after_action($success, 'Event', $action, array('action' => 'default'));
	1730	+ if ( $redirect_after ) {
	1731	+ $this->_redirect_after_action($success, 'Event', $action, array('action' => 'default'));
	1732	+ }
1730	1733	}
1731	1734
1732	1735	/**
		@@ -1853,8 +1856,9 @@ discard block
		block discarded – undo
1853	1856	EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
1854	1857	}
1855	1858
1856		- if ( $redirect_after )
1857		- $this->_redirect_after_action($success, 'Event', 'deleted', array('action' => 'default', 'status' => 'trash'));
	1859	+ if ( $redirect_after ) {
	1860	+ $this->_redirect_after_action($success, 'Event', 'deleted', array('action' => 'default', 'status' => 'trash'));
	1861	+ }
1858	1862	}
1859	1863
1860	1864	/**
		@@ -2091,8 +2095,10 @@ discard block
		block discarded – undo
2091	2095	* @return void
2092	2096	*/
2093	2097	private function _set_category_object() {
2094		- if ( isset( $this->_category->id ) && !empty( $this->_category->id ) )
2095		- return; //already have the category object so get out.
	2098	+ if ( isset( $this->_category->id ) && !empty( $this->_category->id ) ) {
	2099	+ return;
	2100	+ }
	2101	+ //already have the category object so get out.
2096	2102
2097	2103	//set default category object
2098	2104	$this->_set_empty_category_object();

		@@ -116,7 +116,7 @@
		block discarded – undo
116	116	* @access public
117	117	* @param EE_Template_Config $CFG
118	118	* @param array $REQ
119		- * @return EE_Event_Single_Config
	119	+ * @return EE_Template_Config
120	120	*/
121	121	public static function update_template_settings( $CFG, $REQ ) {
122	122	$display_order_tickets = isset( $CFG->EED_Event_Single->display_order_tickets ) ? $CFG->EED_Event_Single->display_order_tickets : 100;

		@@ -29,7 +29,7 @@ discard block
		block discarded – undo
29	29	* @return EED_Event_Single_Caff
30	30	*/
31	31	public static function instance() {
32		- return parent::get_instance( __CLASS__ );
	32	+ return parent::get_instance(__CLASS__);
33	33	}
34	34
35	35
		@@ -50,34 +50,34 @@ discard block
		block discarded – undo
50	50	* @return void
51	51	*/
52	52	public static function set_hooks_admin() {
53		- define( 'EVENT_SINGLE_CAFF_TEMPLATES_PATH', plugin_dir_path( __FILE__ ) . 'templates' . DS );
54		- define( 'EVENT_SINGLE_CAFF_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
	53	+ define('EVENT_SINGLE_CAFF_TEMPLATES_PATH', plugin_dir_path(__FILE__).'templates'.DS);
	54	+ define('EVENT_SINGLE_CAFF_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
55	55	add_action(
56	56	'FHEE__EE_Admin_Page___load_page_dependencies__after_load__espresso_events__template_settings',
57		- array( 'EED_Event_Single_Caff', 'load_scripts_styles' ),
	57	+ array('EED_Event_Single_Caff', 'load_scripts_styles'),
58	58	10
59	59	);
60		- add_action( 'AHEE__template_settings__template__before_settings_form', array( 'EED_Event_Single_Caff', 'template_settings_form' ), 10 );
61		- add_filter( 'FHEE__General_Settings_Admin_Page__update_template_settings__data', array( 'EED_Event_Single_Caff', 'update_template_settings' ), 10, 2 );
	60	+ add_action('AHEE__template_settings__template__before_settings_form', array('EED_Event_Single_Caff', 'template_settings_form'), 10);
	61	+ add_filter('FHEE__General_Settings_Admin_Page__update_template_settings__data', array('EED_Event_Single_Caff', 'update_template_settings'), 10, 2);
62	62	// AJAX
63		- add_action( 'wp_ajax_espresso_update_event_single_order', array( 'EED_Event_Single_Caff', 'update_event_single_order' ) );
64		- add_action( 'wp_ajax_nopriv_espresso_update_event_single_order', array( 'EED_Event_Single_Caff', 'update_event_single_order' ) );
	63	+ add_action('wp_ajax_espresso_update_event_single_order', array('EED_Event_Single_Caff', 'update_event_single_order'));
	64	+ add_action('wp_ajax_nopriv_espresso_update_event_single_order', array('EED_Event_Single_Caff', 'update_event_single_order'));
65	65
66	66	}
67	67
68	68
69	69
70	70	public static function load_scripts_styles() {
71		- add_action( 'admin_enqueue_scripts', array( 'EED_Event_Single_Caff', 'enqueue_scripts_styles' ), 10 );
	71	+ add_action('admin_enqueue_scripts', array('EED_Event_Single_Caff', 'enqueue_scripts_styles'), 10);
72	72	}
73	73
74	74
75	75
76	76	public static function enqueue_scripts_styles() {
77		- wp_register_style( 'eed-event-single-sortable', EVENT_SINGLE_CAFF_ASSETS_URL . 'eed_event_single_sortable.css', array(), EVENT_ESPRESSO_VERSION );
78		- wp_enqueue_style( 'eed-event-single-sortable' );
79		- wp_register_script( 'eed-event-single-sortable', EVENT_SINGLE_CAFF_ASSETS_URL . 'eed_event_single_sortable.js', array( 'jquery-ui-sortable' ), EVENT_ESPRESSO_VERSION, true );
80		- wp_enqueue_script( 'eed-event-single-sortable' );
	77	+ wp_register_style('eed-event-single-sortable', EVENT_SINGLE_CAFF_ASSETS_URL.'eed_event_single_sortable.css', array(), EVENT_ESPRESSO_VERSION);
	78	+ wp_enqueue_style('eed-event-single-sortable');
	79	+ wp_register_script('eed-event-single-sortable', EVENT_SINGLE_CAFF_ASSETS_URL.'eed_event_single_sortable.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, true);
	80	+ wp_enqueue_script('eed-event-single-sortable');
81	81	}
82	82
83	83
		@@ -91,21 +91,21 @@ discard block
		block discarded – undo
91	91	*/
92	92	public static function template_settings_form() {
93	93	$config = EE_Registry::instance()->CFG->template_settings;
94		- $config = isset( $config->EED_Event_Single ) && $config->EED_Event_Single instanceof EE_Event_Single_Config ? $config->EED_Event_Single : new EE_Event_Single_Config();
95		- $config->use_sortable_display_order = isset( $config->use_sortable_display_order ) ? $config->use_sortable_display_order : false;
96		- $config = apply_filters( 'FHEE__EED_Event_Single__template_settings_form__event_list_config', $config );
	94	+ $config = isset($config->EED_Event_Single) && $config->EED_Event_Single instanceof EE_Event_Single_Config ? $config->EED_Event_Single : new EE_Event_Single_Config();
	95	+ $config->use_sortable_display_order = isset($config->use_sortable_display_order) ? $config->use_sortable_display_order : false;
	96	+ $config = apply_filters('FHEE__EED_Event_Single__template_settings_form__event_list_config', $config);
97	97
98	98	$event_single_order_array = array();
99		- $event_single_order_array[ $config->display_order_tickets ] = 'tickets';
100		- $event_single_order_array[ $config->display_order_datetimes ] = 'datetimes';
101		- $event_single_order_array[ $config->display_order_event ] = 'event';
102		- $event_single_order_array[ $config->display_order_venue ] = 'venue';
	99	+ $event_single_order_array[$config->display_order_tickets] = 'tickets';
	100	+ $event_single_order_array[$config->display_order_datetimes] = 'datetimes';
	101	+ $event_single_order_array[$config->display_order_event] = 'event';
	102	+ $event_single_order_array[$config->display_order_venue] = 'venue';
103	103	// get template parts
104		- $template_parts = EED_Event_Single::instance()->initialize_template_parts( $config );
	104	+ $template_parts = EED_Event_Single::instance()->initialize_template_parts($config);
105	105	// convert to array so that we can add more properties
106		- $config = get_object_vars( $config );
107		- $config[ 'event_single_display_order' ] = $template_parts->generate_sortable_list_of_template_parts( 'event-single-sortable-js', '', 'single-sortable-li single-sortable-js' );
108		- EEH_Template::display_template( EVENT_SINGLE_CAFF_TEMPLATES_PATH . 'admin-event-single-settings.template.php', $config );
	106	+ $config = get_object_vars($config);
	107	+ $config['event_single_display_order'] = $template_parts->generate_sortable_list_of_template_parts('event-single-sortable-js', '', 'single-sortable-li single-sortable-js');
	108	+ EEH_Template::display_template(EVENT_SINGLE_CAFF_TEMPLATES_PATH.'admin-event-single-settings.template.php', $config);
109	109	}
110	110
111	111
		@@ -118,20 +118,20 @@ discard block
		block discarded – undo
118	118	* @param array $REQ
119	119	* @return EE_Event_Single_Config
120	120	*/
121		- public static function update_template_settings( $CFG, $REQ ) {
122		- $display_order_tickets = isset( $CFG->EED_Event_Single->display_order_tickets ) ? $CFG->EED_Event_Single->display_order_tickets : 100;
123		- $display_order_datetimes = isset( $CFG->EED_Event_Single->display_order_datetimes ) ? $CFG->EED_Event_Single->display_order_datetimes : 110;
124		- $display_order_event = isset( $CFG->EED_Event_Single->display_order_event ) ? $CFG->EED_Event_Single->display_order_event : 120;
125		- $display_order_venue = isset( $CFG->EED_Event_Single->display_order_venue ) ? $CFG->EED_Event_Single->display_order_venue : 130;
	121	+ public static function update_template_settings($CFG, $REQ) {
	122	+ $display_order_tickets = isset($CFG->EED_Event_Single->display_order_tickets) ? $CFG->EED_Event_Single->display_order_tickets : 100;
	123	+ $display_order_datetimes = isset($CFG->EED_Event_Single->display_order_datetimes) ? $CFG->EED_Event_Single->display_order_datetimes : 110;
	124	+ $display_order_event = isset($CFG->EED_Event_Single->display_order_event) ? $CFG->EED_Event_Single->display_order_event : 120;
	125	+ $display_order_venue = isset($CFG->EED_Event_Single->display_order_venue) ? $CFG->EED_Event_Single->display_order_venue : 130;
126	126	$CFG->EED_Event_Single = new EE_Event_Single_Config();
127		- $CFG->EED_Event_Single->display_status_banner_single = !empty( $REQ['display_status_banner_single'] ) && $REQ['display_status_banner_single'] ? TRUE : FALSE;
128		- $CFG->EED_Event_Single->display_venue = ! empty( $REQ['display_venue'] ) && $REQ['display_venue'] ? TRUE : FALSE;
129		- $CFG->EED_Event_Single->use_sortable_display_order = ! empty( $REQ[ 'EED_Events_Single_use_sortable_display_order' ] ) ? absint( $REQ[ 'EED_Events_Single_use_sortable_display_order' ] ) : 0;
	127	+ $CFG->EED_Event_Single->display_status_banner_single = ! empty($REQ['display_status_banner_single']) && $REQ['display_status_banner_single'] ? TRUE : FALSE;
	128	+ $CFG->EED_Event_Single->display_venue = ! empty($REQ['display_venue']) && $REQ['display_venue'] ? TRUE : FALSE;
	129	+ $CFG->EED_Event_Single->use_sortable_display_order = ! empty($REQ['EED_Events_Single_use_sortable_display_order']) ? absint($REQ['EED_Events_Single_use_sortable_display_order']) : 0;
130	130	$CFG->EED_Event_Single->display_order_tickets = $CFG->EED_Event_Single->use_sortable_display_order ? $display_order_tickets : 100;
131	131	$CFG->EED_Event_Single->display_order_datetimes = $CFG->EED_Event_Single->use_sortable_display_order ? $display_order_datetimes : 110;
132	132	$CFG->EED_Event_Single->display_order_event = $CFG->EED_Event_Single->use_sortable_display_order ? $display_order_event : 120;
133	133	$CFG->EED_Event_Single->display_order_venue = $CFG->EED_Event_Single->use_sortable_display_order ? $display_order_venue : 130;
134		- do_action( 'AHEE__EED_Event_Single__update_template_settings__after_update', $CFG, $REQ );
	134	+ do_action('AHEE__EED_Event_Single__update_template_settings__after_update', $CFG, $REQ);
135	135	return $CFG;
136	136	}
137	137
		@@ -145,23 +145,23 @@ discard block
		block discarded – undo
145	145	*/
146	146	public static function update_event_single_order() {
147	147	$config_saved = false;
148		- $template_parts = sanitize_text_field( $_POST[ 'elements' ] );
149		- if ( ! empty( $template_parts ) ) {
150		- $template_parts = explode( ',', trim( $template_parts, ',' ) );
151		- foreach ( $template_parts as $key => $template_part ) {
	148	+ $template_parts = sanitize_text_field($_POST['elements']);
	149	+ if ( ! empty($template_parts)) {
	150	+ $template_parts = explode(',', trim($template_parts, ','));
	151	+ foreach ($template_parts as $key => $template_part) {
152	152	$template_part = "display_order_$template_part";
153		- $priority = ( $key * 10 ) + 100;
	153	+ $priority = ($key * 10) + 100;
154	154	EE_Registry::instance()->CFG->template_settings->EED_Event_Single->{$template_part} = $priority;
155		- do_action( "AHEE__EED_Event_Single__update_event_single_order__$template_part", $priority );
	155	+ do_action("AHEE__EED_Event_Single__update_event_single_order__$template_part", $priority);
156	156	}
157		- $config_saved = EE_Registry::instance()->CFG->update_espresso_config( false, false );
	157	+ $config_saved = EE_Registry::instance()->CFG->update_espresso_config(false, false);
158	158	}
159		- if ( $config_saved ) {
160		- EE_Error::add_success( __( 'Display Order has been successfully updated.', 'event_espresso' ) );
	159	+ if ($config_saved) {
	160	+ EE_Error::add_success(__('Display Order has been successfully updated.', 'event_espresso'));
161	161	} else {
162		- EE_Error::add_error( __( 'Display Order was not updated.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
	162	+ EE_Error::add_error(__('Display Order was not updated.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
163	163	}
164		- echo wp_json_encode( EE_Error::get_notices( false ));
	164	+ echo wp_json_encode(EE_Error::get_notices(false));
165	165	exit();
166	166	}
167	167
		@@ -174,7 +174,7 @@ discard block
		block discarded – undo
174	174	* @param WP $WP
175	175	* @return void
176	176	*/
177		- public function run( $WP ) {
	177	+ public function run($WP) {
178	178	}
179	179
180	180

		@@ -123,7 +123,7 @@
		block discarded – undo
123	123	* @access public
124	124	* @param EE_Template_Config $CFG
125	125	* @param array $REQ
126		- * @return EE_Events_Archive_Config
	126	+ * @return EE_Template_Config
127	127	*/
128	128	public static function update_template_settings( $CFG, $REQ ) {
129	129	$config = new EE_Events_Archive_Config();

		@@ -28,7 +28,7 @@ discard block
		block discarded – undo
28	28	* @return EED_Events_Archive_Caff
29	29	*/
30	30	public static function instance() {
31		- return parent::get_instance( __CLASS__ );
	31	+ return parent::get_instance(__CLASS__);
32	32	}
33	33
34	34
		@@ -49,13 +49,13 @@ discard block
		block discarded – undo
49	49	* @return void
50	50	*/
51	51	public static function set_hooks_admin() {
52		- define( 'EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS );
53		- define( 'EVENT_ARCHIVE_CAFF_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
54		- add_action( 'AHEE__template_settings__template__before_settings_form', array( 'EED_Events_Archive_Caff', 'template_settings_form' ), 10 );
55		- add_filter( 'FHEE__General_Settings_Admin_Page__update_template_settings__data', array( 'EED_Events_Archive_Caff', 'update_template_settings' ), 10, 2 );
	52	+ define('EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
	53	+ define('EVENT_ARCHIVE_CAFF_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
	54	+ add_action('AHEE__template_settings__template__before_settings_form', array('EED_Events_Archive_Caff', 'template_settings_form'), 10);
	55	+ add_filter('FHEE__General_Settings_Admin_Page__update_template_settings__data', array('EED_Events_Archive_Caff', 'update_template_settings'), 10, 2);
56	56	// AJAX
57		- add_action( 'wp_ajax_espresso_update_event_archive_order', array( 'EED_Events_Archive_Caff', 'update_event_archive_order' ) );
58		- add_action( 'wp_ajax_nopriv_espresso_update_event_archive_order', array( 'EED_Events_Archive_Caff', 'update_event_archive_order' ) );
	57	+ add_action('wp_ajax_espresso_update_event_archive_order', array('EED_Events_Archive_Caff', 'update_event_archive_order'));
	58	+ add_action('wp_ajax_nopriv_espresso_update_event_archive_order', array('EED_Events_Archive_Caff', 'update_event_archive_order'));
59	59	}
60	60
61	61
		@@ -68,7 +68,7 @@ discard block
		block discarded – undo
68	68	* @param WP $WP
69	69	* @return void
70	70	*/
71		- public function run( $WP ) {
	71	+ public function run($WP) {
72	72	}
73	73
74	74
		@@ -83,33 +83,33 @@ discard block
		block discarded – undo
83	83	*/
84	84	public static function template_settings_form() {
85	85	// grab general settings admin page and remove the existing hook callback
86		- $gen_set_admin = EE_Registry::instance()->LIB->EE_Admin_Page_Loader->get_admin_page_object( 'general_settings' );
87		- if ( $gen_set_admin instanceof General_Settings_Admin_Page ) {
88		- remove_action( 'AHEE__template_settings__template__before_settings_form', array( $gen_set_admin, 'template_settings_caff_features' ), 100 );
	86	+ $gen_set_admin = EE_Registry::instance()->LIB->EE_Admin_Page_Loader->get_admin_page_object('general_settings');
	87	+ if ($gen_set_admin instanceof General_Settings_Admin_Page) {
	88	+ remove_action('AHEE__template_settings__template__before_settings_form', array($gen_set_admin, 'template_settings_caff_features'), 100);
89	89	}
90	90	// first just grab the template settings
91	91	$config = EE_Registry::instance()->CFG->template_settings;
92	92	// then if the Event Archive config is valid, use that, else create a new one
93		- $config = isset( $config->EED_Events_Archive ) && $config->EED_Events_Archive instanceof EE_Events_Archive_Config ? $config->EED_Events_Archive : new EE_Events_Archive_Config();
94		- $config = apply_filters( 'FHEE__EED_Events_Archive__template_settings_form__event_list_config', $config );
95		- $config->display_status_banner = isset( $config->display_status_banner ) ? $config->display_status_banner : 0;
96		- $config->display_description = isset( $config->display_description ) ? $config->display_description : 1;
97		- $config->display_ticket_selector = isset( $config->display_ticket_selector ) ? $config->display_ticket_selector : 0;
98		- $config->display_datetimes = isset( $config->display_datetimes ) ? $config->display_datetimes : 1;
99		- $config->display_venue = isset( $config->display_venue ) ? $config->display_venue : 0;
100		- $config->display_expired_events = isset( $config->display_expired_events ) ? $config->display_expired_events : 0;
	93	+ $config = isset($config->EED_Events_Archive) && $config->EED_Events_Archive instanceof EE_Events_Archive_Config ? $config->EED_Events_Archive : new EE_Events_Archive_Config();
	94	+ $config = apply_filters('FHEE__EED_Events_Archive__template_settings_form__event_list_config', $config);
	95	+ $config->display_status_banner = isset($config->display_status_banner) ? $config->display_status_banner : 0;
	96	+ $config->display_description = isset($config->display_description) ? $config->display_description : 1;
	97	+ $config->display_ticket_selector = isset($config->display_ticket_selector) ? $config->display_ticket_selector : 0;
	98	+ $config->display_datetimes = isset($config->display_datetimes) ? $config->display_datetimes : 1;
	99	+ $config->display_venue = isset($config->display_venue) ? $config->display_venue : 0;
	100	+ $config->display_expired_events = isset($config->display_expired_events) ? $config->display_expired_events : 0;
101	101	// display order options
102		- $config->use_sortable_display_order = isset( $config->use_sortable_display_order )? $config->use_sortable_display_order : false;
103		- $config->display_order_tickets = isset( $config->display_order_tickets )? $config->display_order_tickets : 100;
104		- $config->display_order_datetimes = isset( $config->display_order_datetimes )? $config->display_order_datetimes : 110;
105		- $config->display_order_event = isset( $config->display_order_event )? $config->display_order_event : 120;
106		- $config->display_order_venue = isset( $config->display_order_venue )? $config->display_order_venue : 130;
	102	+ $config->use_sortable_display_order = isset($config->use_sortable_display_order) ? $config->use_sortable_display_order : false;
	103	+ $config->display_order_tickets = isset($config->display_order_tickets) ? $config->display_order_tickets : 100;
	104	+ $config->display_order_datetimes = isset($config->display_order_datetimes) ? $config->display_order_datetimes : 110;
	105	+ $config->display_order_event = isset($config->display_order_event) ? $config->display_order_event : 120;
	106	+ $config->display_order_venue = isset($config->display_order_venue) ? $config->display_order_venue : 130;
107	107	// get template parts
108		- $template_parts = EED_Events_Archive::instance()->initialize_template_parts( $config );
	108	+ $template_parts = EED_Events_Archive::instance()->initialize_template_parts($config);
109	109	// convert to array so that we can add more properties
110		- $config = get_object_vars( $config );
111		- $config[ 'event_archive_display_order' ] = $template_parts->generate_sortable_list_of_template_parts( 'event-archive-sortable-js', '', 'archive-sortable-li archive-sortable-js' );
112		- EEH_Template::display_template( EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH . 'admin-event-list-settings.template.php', $config );
	110	+ $config = get_object_vars($config);
	111	+ $config['event_archive_display_order'] = $template_parts->generate_sortable_list_of_template_parts('event-archive-sortable-js', '', 'archive-sortable-li archive-sortable-js');
	112	+ EEH_Template::display_template(EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH.'admin-event-list-settings.template.php', $config);
113	113	}
114	114
115	115
		@@ -125,24 +125,24 @@ discard block
		block discarded – undo
125	125	* @param array $REQ
126	126	* @return EE_Events_Archive_Config
127	127	*/
128		- public static function update_template_settings( $CFG, $REQ ) {
	128	+ public static function update_template_settings($CFG, $REQ) {
129	129	$config = new EE_Events_Archive_Config();
130	130	// unless we are resetting the config...
131		- if ( ! isset( $REQ['EED_Events_Archive_reset_event_list_settings'] ) \|\| absint( $REQ['EED_Events_Archive_reset_event_list_settings'] ) !== 1 ) {
132		- $config->display_status_banner = isset( $REQ['EED_Events_Archive_display_status_banner'] ) ? absint( $REQ['EED_Events_Archive_display_status_banner'] ) : 0;
133		- $config->display_description = isset( $REQ['EED_Events_Archive_display_description'] ) ? absint( $REQ['EED_Events_Archive_display_description'] ) : 1;
134		- $config->display_ticket_selector = isset( $REQ['EED_Events_Archive_display_ticket_selector'] ) ? absint( $REQ['EED_Events_Archive_display_ticket_selector'] ) : 0;
135		- $config->display_datetimes = isset( $REQ['EED_Events_Archive_display_datetimes'] ) ? absint( $REQ['EED_Events_Archive_display_datetimes'] ) : 1;
136		- $config->display_venue = isset( $REQ['EED_Events_Archive_display_venue'] ) ? absint( $REQ['EED_Events_Archive_display_venue'] ) : 0;
137		- $config->display_expired_events = isset( $REQ['EED_Events_Archive_display_expired_events'] ) ? absint( $REQ['EED_Events_Archive_display_expired_events'] ) : 0;
138		- $config->use_sortable_display_order = isset( $REQ['EED_Events_Archive_use_sortable_display_order'] ) ? absint( $REQ['EED_Events_Archive_use_sortable_display_order'] ) : 0;
139		- $config->display_order_tickets = isset( $CFG->EED_Events_Archive->display_order_tickets ) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_tickets : 100;
140		- $config->display_order_datetimes = isset( $CFG->EED_Events_Archive->display_order_datetimes ) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_datetimes : 110;
141		- $config->display_order_event = isset( $CFG->EED_Events_Archive->display_order_event ) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_event : 120;
142		- $config->display_order_venue = isset( $CFG->EED_Events_Archive->display_order_venue ) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_venue : 130;
	131	+ if ( ! isset($REQ['EED_Events_Archive_reset_event_list_settings']) \|\| absint($REQ['EED_Events_Archive_reset_event_list_settings']) !== 1) {
	132	+ $config->display_status_banner = isset($REQ['EED_Events_Archive_display_status_banner']) ? absint($REQ['EED_Events_Archive_display_status_banner']) : 0;
	133	+ $config->display_description = isset($REQ['EED_Events_Archive_display_description']) ? absint($REQ['EED_Events_Archive_display_description']) : 1;
	134	+ $config->display_ticket_selector = isset($REQ['EED_Events_Archive_display_ticket_selector']) ? absint($REQ['EED_Events_Archive_display_ticket_selector']) : 0;
	135	+ $config->display_datetimes = isset($REQ['EED_Events_Archive_display_datetimes']) ? absint($REQ['EED_Events_Archive_display_datetimes']) : 1;
	136	+ $config->display_venue = isset($REQ['EED_Events_Archive_display_venue']) ? absint($REQ['EED_Events_Archive_display_venue']) : 0;
	137	+ $config->display_expired_events = isset($REQ['EED_Events_Archive_display_expired_events']) ? absint($REQ['EED_Events_Archive_display_expired_events']) : 0;
	138	+ $config->use_sortable_display_order = isset($REQ['EED_Events_Archive_use_sortable_display_order']) ? absint($REQ['EED_Events_Archive_use_sortable_display_order']) : 0;
	139	+ $config->display_order_tickets = isset($CFG->EED_Events_Archive->display_order_tickets) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_tickets : 100;
	140	+ $config->display_order_datetimes = isset($CFG->EED_Events_Archive->display_order_datetimes) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_datetimes : 110;
	141	+ $config->display_order_event = isset($CFG->EED_Events_Archive->display_order_event) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_event : 120;
	142	+ $config->display_order_venue = isset($CFG->EED_Events_Archive->display_order_venue) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_venue : 130;
143	143	}
144	144	$CFG->EED_Events_Archive = $config;
145		- do_action( 'AHEE__EED_Events_Archive__update_template_settings__after_update', $CFG, $REQ );
	145	+ do_action('AHEE__EED_Events_Archive__update_template_settings__after_update', $CFG, $REQ);
146	146	return $CFG;
147	147	}
148	148
		@@ -156,12 +156,12 @@ discard block
		block discarded – undo
156	156	*/
157	157	public static function update_event_archive_order() {
158	158	$config_saved = false;
159		- $template_parts = sanitize_text_field( $_POST[ 'elements' ] );
160		- if ( ! empty( $template_parts ) ) {
161		- $template_parts = explode( ',', trim( $template_parts, ',' ) );
162		- foreach ( $template_parts as $key => $template_part ) {
	159	+ $template_parts = sanitize_text_field($_POST['elements']);
	160	+ if ( ! empty($template_parts)) {
	161	+ $template_parts = explode(',', trim($template_parts, ','));
	162	+ foreach ($template_parts as $key => $template_part) {
163	163	$template_part = "display_order_$template_part";
164		- $priority = ( $key * 10 ) + 100;
	164	+ $priority = ($key * 10) + 100;
165	165	if (
166	166	property_exists(
167	167	EE_Registry::instance()->CFG->template_settings->EED_Events_Archive,
		@@ -170,16 +170,16 @@ discard block
		block discarded – undo
170	170	) {
171	171	EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->{$template_part} = $priority;
172	172	}
173		- do_action( "AHEE__EED_Events_Archive__update_event_archive_order__$template_part", $priority );
	173	+ do_action("AHEE__EED_Events_Archive__update_event_archive_order__$template_part", $priority);
174	174	}
175		- $config_saved = EE_Registry::instance()->CFG->update_espresso_config( false, false );
	175	+ $config_saved = EE_Registry::instance()->CFG->update_espresso_config(false, false);
176	176	}
177		- if ( $config_saved ) {
178		- EE_Error::add_success( __( 'Display Order has been successfully updated.', 'event_espresso' ) );
	177	+ if ($config_saved) {
	178	+ EE_Error::add_success(__('Display Order has been successfully updated.', 'event_espresso'));
179	179	} else {
180		- EE_Error::add_error( __( 'Display Order was not updated.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
	180	+ EE_Error::add_error(__('Display Order was not updated.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
181	181	}
182		- echo wp_json_encode( EE_Error::get_notices( false ) );
	182	+ echo wp_json_encode(EE_Error::get_notices(false));
183	183	exit();
184	184	}
185	185

		@@ -1,37 +1,37 @@
		block discarded – undo
1	1	<div id="admin-side-mbox-billing-info-dv" class="admin-side-mbox-dv">
2		-<?php if ( empty($billing_form) ) : ?>
	2	+<?php if (empty($billing_form)) : ?>
3	3	<div class="clearfix">
4		- <?php _e( 'There is no billing info for this transaction.', 'event_espresso' );?><br/>
	4	+ <?php _e('There is no billing info for this transaction.', 'event_espresso'); ?><br/>
5	5	</div>
6	6	<?php else :
7		- function ee_show_billing_info_cleaned( EE_Form_Section_Proper $form_section, $found_cc_data = false ) {
8		- foreach( $form_section->subsections() as $subsection ) {
9		- if( $subsection instanceof EE_Form_Input_Base ) {
10		- if( $subsection->get_sensitive_data_removal_strategy() instanceof EE_All_Sensitive_Data_Removal \|\|
11		- $subsection->get_sensitive_data_removal_strategy() instanceof EE_CCV_Sensitive_Data_Removal ){
	7	+ function ee_show_billing_info_cleaned(EE_Form_Section_Proper $form_section, $found_cc_data = false) {
	8	+ foreach ($form_section->subsections() as $subsection) {
	9	+ if ($subsection instanceof EE_Form_Input_Base) {
	10	+ if ($subsection->get_sensitive_data_removal_strategy() instanceof EE_All_Sensitive_Data_Removal \|\|
	11	+ $subsection->get_sensitive_data_removal_strategy() instanceof EE_CCV_Sensitive_Data_Removal) {
12	12	continue;
13	13	}
14		- if( $subsection->get_sensitive_data_removal_strategy() instanceof EE_Credit_Card_Sensitive_Data_Removal ) {
	14	+ if ($subsection->get_sensitive_data_removal_strategy() instanceof EE_Credit_Card_Sensitive_Data_Removal) {
15	15	$found_cc_data = true;
16	16	}
17	17	?>
18	18	<div class="clearfix">
19		- <span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php echo $subsection->get_html_for_label();?></span><?php echo $subsection->pretty_value();?>
	19	+ <span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php echo $subsection->get_html_for_label(); ?></span><?php echo $subsection->pretty_value(); ?>
20	20	</div><?php
21		- } elseif( $subsection instanceof EE_Form_Section_Proper ) {
22		- $found_cc_data = ee_show_billing_info_cleaned( $subsection, $found_cc_data);
	21	+ } elseif ($subsection instanceof EE_Form_Section_Proper) {
	22	+ $found_cc_data = ee_show_billing_info_cleaned($subsection, $found_cc_data);
23	23	}
24	24	}
25	25	return $found_cc_data;
26	26	}
27		- $found_cc_data = ee_show_billing_info_cleaned( $billing_form );
28		- if( apply_filters(
	27	+ $found_cc_data = ee_show_billing_info_cleaned($billing_form);
	28	+ if (apply_filters(
29	29	'FHEE__txn_admin_details_side_meta_box_billing_info__show_default_note',
30	30	$found_cc_data,
31		- $billing_form ) ) {?>
32		- <p class="help"><?php _e( 'Note: Card expiry dates and CCV are not stored. Only the last 4 digits of card numbers are stored.', 'event_espresso' );?></p>
	31	+ $billing_form )) {?>
	32	+ <p class="help"><?php _e('Note: Card expiry dates and CCV are not stored. Only the last 4 digits of card numbers are stored.', 'event_espresso'); ?></p>
33	33	<?php }
34		- do_action( 'AHEE__txn_admin_details_side_meta_box_billing_info__billing_form_footer', $billing_form );
	34	+ do_action('AHEE__txn_admin_details_side_meta_box_billing_info__billing_form_footer', $billing_form);
35	35	endif; ?>
36	36
37	37	</div>

		@@ -3,13 +3,15 @@
		block discarded – undo
3	3	<div class="clearfix">
4	4	<?php _e( 'There is no billing info for this transaction.', 'event_espresso' );?><br/>
5	5	</div>
6		-<?php else :
	6	+<?php else {
	7	+ :
7	8	function ee_show_billing_info_cleaned( EE_Form_Section_Proper $form_section, $found_cc_data = false ) {
8	9	foreach( $form_section->subsections() as $subsection ) {
9	10	if( $subsection instanceof EE_Form_Input_Base ) {
10	11	if( $subsection->get_sensitive_data_removal_strategy() instanceof EE_All_Sensitive_Data_Removal \|\|
11	12	$subsection->get_sensitive_data_removal_strategy() instanceof EE_CCV_Sensitive_Data_Removal ){
12	13	continue;
	14	+}
13	15	}
14	16	if( $subsection->get_sensitive_data_removal_strategy() instanceof EE_Credit_Card_Sensitive_Data_Removal ) {
15	17	$found_cc_data = true;

		@@ -1,11 +1,11 @@ discard block
		block discarded – undo
1	1	<?php
2		-add_filter( 'FHEE__EEH_Form_Fields__label_html', '__return_empty_string' );
3		-EE_Registry::instance()->load_helper( 'Event_View' );
4		-EE_Registry::instance()->load_helper( 'Form_Fields' );
	2	+add_filter('FHEE__EEH_Form_Fields__label_html', '__return_empty_string');
	3	+EE_Registry::instance()->load_helper('Event_View');
	4	+EE_Registry::instance()->load_helper('Form_Fields');
5	5	$values = EEH_Form_Fields::prep_answer_options(
6	6	array(
7		- array( 'id' => 1, 'text' => __( 'Yes', 'event_espresso' ) ),
8		- array( 'id' => 0, 'text' => __( 'No', 'event_espresso' ) )
	7	+ array('id' => 1, 'text' => __('Yes', 'event_espresso')),
	8	+ array('id' => 0, 'text' => __('No', 'event_espresso'))
9	9	)
10	10	);
11	11	?>
		@@ -24,27 +24,27 @@ discard block
		block discarded – undo
24	24	</label>
25	25	</th>
26	26	<td>
27		- <?php echo EEH_Form_Fields::select( 'display_status_banner_single', $display_status_banner_single, $values, 'display_status_banner_single', 'display_status_banner_single' ); ?>
28		- <p class="description"><?php _e( 'Selecting "Yes" will inject an Event Status banner with the title whenever Events are displaying on the single event page.', 'event_espresso' ); ?></p>
	27	+ <?php echo EEH_Form_Fields::select('display_status_banner_single', $display_status_banner_single, $values, 'display_status_banner_single', 'display_status_banner_single'); ?>
	28	+ <p class="description"><?php _e('Selecting "Yes" will inject an Event Status banner with the title whenever Events are displaying on the single event page.', 'event_espresso'); ?></p>
29	29	</td>
30	30	</tr>
31	31
32	32	<tr>
33	33	<th>
34	34	<label for="display_venue">
35		- <?php _e( 'Display Venue Details', 'event_espresso' ); ?><?php echo EEH_Template::get_help_tab_link('display_addresses_in_reg_form_info');?>
	35	+ <?php _e('Display Venue Details', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link('display_addresses_in_reg_form_info'); ?>
36	36	</label>
37	37	</th>
38	38	<td>
39		- <?php echo EEH_Form_Fields::select( 'display_venue', $display_venue, $values, 'display_venue', 'display_venue' ); ?>
40		- <p class="description"><?php _e( 'Do not use this if you are using the venue shortcodes in your event description.', 'event_espresso' ); ?></p>
	39	+ <?php echo EEH_Form_Fields::select('display_venue', $display_venue, $values, 'display_venue', 'display_venue'); ?>
	40	+ <p class="description"><?php _e('Do not use this if you are using the venue shortcodes in your event description.', 'event_espresso'); ?></p>
41	41	</td>
42	42	</tr>
43	43
44	44	<tr>
45	45	<th>
46	46	<label for="EED_Events_Single_use_sortable_display_order">
47		- <?php _e( 'Use Custom Display Order?', 'event_espresso' ); ?>
	47	+ <?php _e('Use Custom Display Order?', 'event_espresso'); ?>
48	48	</label>
49	49	</th>
50	50	<td>
		@@ -60,7 +60,7 @@ discard block
		block discarded – undo
60	60	<p class="description ">
61	61	<?php
62	62	echo sprintf(
63		- __( '%1$sPlease Note:%2$s%3$sIf you are currently using filters to customize the display order for elements within the Event Single page display, then you do NOT activate this feature until those filters have been removed or disabled. If this feature is activated while still using such filters, duplicate event content such as the ticket selector, datetimes, or venue information could be displayed on the frontend of the site. Please verify that this is not the case after activating this feature.', 'event_espresso' ),
	63	+ __('%1$sPlease Note:%2$s%3$sIf you are currently using filters to customize the display order for elements within the Event Single page display, then you do NOT activate this feature until those filters have been removed or disabled. If this feature is activated while still using such filters, duplicate event content such as the ticket selector, datetimes, or venue information could be displayed on the frontend of the site. Please verify that this is not the case after activating this feature.', 'event_espresso'),
64	64	'<span class="important-notice">',
65	65	'</span>',
66	66	'<br />'
		@@ -72,11 +72,11 @@ discard block
		block discarded – undo
72	72
73	73	<tr>
74	74	<th>
75		- <?php _e('Display Order', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link('display_addresses_in_reg_form_info');?>
	75	+ <?php _e('Display Order', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link('display_addresses_in_reg_form_info'); ?>
76	76	</th>
77	77	<td>
78	78
79		- <?php wp_nonce_field( 'espresso_update_event_single_order', 'espresso_update_event_single_order_nonce', false ); ?>
	79	+ <?php wp_nonce_field('espresso_update_event_single_order', 'espresso_update_event_single_order_nonce', false); ?>
80	80	<?php echo $event_single_display_order; ?>
81	81
82	82	<p class="description"><?php _e('Drag and Drop the above to determine the display order of the Event Description, Date and Times, Ticket Selector, and Venue Information on the single event page.', 'event_espresso'); ?></p>

eventespresso / event-espresso-core

Branch — FET-9643-checkin-system-docume... (5f5a9c)

Category

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +49 added lines, -49 removed lines patch added patch discarded remove patch

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +48 added lines, -48 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +70 added lines, -70 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +17 added lines, -11 removed lines patch added patch discarded remove patch

Spacing +389 added lines, -389 removed lines patch added patch discarded remove patch

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +45 added lines, -45 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +53 added lines, -53 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch