Inspection of "Daily Inspection: Merge branch 'FET-10840-domain-c..." - eventespresso/event-espresso-core - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Branch — FET-3467-waitlists (9ee75b)

unknown

created 2017-06-30 21:19 UTC

Status

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

@@ -3,7 +3,7 @@  discard block
 block discarded – undo
 <ul class="wp-people-group" id="ee-people-group-owners">
 	<li class="wp-person" id="ee-person-sshoultes">
 		<a href="<?php esp_gravatar_profile('[email protected]'); ?>">
-			<?php echo esp_gravatar_image( '[email protected]', 'Seth Shoultes' ); ?>
+			<?php echo esp_gravatar_image('[email protected]', 'Seth Shoultes'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('[email protected]'); ?>">
 			Seth Shoultes
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
 	</li>
 	<li class="wp-person" id="ee-person-gkoyle">
 		<a href="<?php esp_gravatar_profile('[email protected]'); ?>">
-			<?php echo esp_gravatar_image( '[email protected]', 'Garth Koyle' ); ?>
+			<?php echo esp_gravatar_image('[email protected]', 'Garth Koyle'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('[email protected]'); ?>">
 			Garth Koyle
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
 <ul class="wp-people-group" id="ee-people-group-core-developers">
 	<li class="wp-person" id="ee-person-bchristensen">
 		<a href="<?php esp_gravatar_profile('[email protected]'); ?>">
-			<?php echo esp_gravatar_image( '[email protected]', 'Brent Christensen' ); ?>
+			<?php echo esp_gravatar_image('[email protected]', 'Brent Christensen'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('[email protected]'); ?>">
 			Brent Christensen
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
 	</li>
 	<li class="wp-person" id="ee-person-dethier">
 		<a href="<?php esp_gravatar_profile('[email protected]'); ?>">
-			<?php echo esp_gravatar_image( '[email protected]', 'Darren Ethier' ); ?>
+			<?php echo esp_gravatar_image('[email protected]', 'Darren Ethier'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('[email protected]'); ?>">
 			Darren Ethier
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
 	</li>
 	<li class="wp-person" id="ee-person-mnelson">
 		<a href="<?php esp_gravatar_profile('[email protected]'); ?>">
-			<?php echo esp_gravatar_image( '[email protected]', 'Michael Nelson' ); ?>
+			<?php echo esp_gravatar_image('[email protected]', 'Michael Nelson'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('[email protected]'); ?>">
 			Michael Nelson
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
 	</li>
 	<li class="wp-person" id="ee-person-nkolivoshka">
 		<a href="<?php esp_gravatar_profile('[email protected]'); ?>">
-			<?php echo esp_gravatar_image( '[email protected]', 'Nazar Kolivoshka' ); ?>
+			<?php echo esp_gravatar_image('[email protected]', 'Nazar Kolivoshka'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('[email protected]'); ?>">
 			Nazar Kolivoshka
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
 <ul class="wp-people-group" id="ee-people-group-support-staff">
 	<li class="wp-person" id="ee-person-jfeck">
 		<a href="<?php esp_gravatar_profile('[email protected]'); ?>">
-			<?php echo esp_gravatar_image( '[email protected]', 'Josh Feck' ); ?>
+			<?php echo esp_gravatar_image('[email protected]', 'Josh Feck'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('[email protected]'); ?>">
 			Josh Feck
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
 	</li>
 	<li class="wp-person" id="ee-person-twarwick">
 		<a href="<?php esp_gravatar_profile('[email protected]'); ?>">
-			<?php echo esp_gravatar_image( '[email protected]', 'Tony Warwick' ); ?>
+			<?php echo esp_gravatar_image('[email protected]', 'Tony Warwick'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('[email protected]'); ?>">
 			Tony Warwick
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
 	</li>
 	<li class="wp-person" id="ee-person-lcaum">
 		<a href="<?php esp_gravatar_profile('[email protected]'); ?>">
-			<?php echo esp_gravatar_image( '[email protected]', 'Lorenzo Caum' ); ?>
+			<?php echo esp_gravatar_image('[email protected]', 'Lorenzo Caum'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('[email protected]'); ?>">
 			Lorenzo Caum
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
 	</li>
 	<li class="wp-person" id="ee-logan-lenz">
 		<a href="<?php esp_gravatar_profile('[email protected]'); ?>">
-			<?php echo esp_gravatar_image( '[email protected]', 'Logan Lenz' ); ?>
+			<?php echo esp_gravatar_image('[email protected]', 'Logan Lenz'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('[email protected]'); ?>">
 			Logan Lenz
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
 </ul>
 <h3 class="wp-people-group"><?php _e('Contributor Recognition', 'event_espresso'); ?></h3>
 <p class="description">
-	<?php printf( __('For every major release we want to recognize the people who contributed to the release via a GitHub pull request. Want to see your name listed here? %sWhen you submit a pull request that gets included in a major release%s, we\'ll add your name here linked to your GitHub profile.', 'event_espresso'), '<a href="https://github.com/eventespresso/event-espresso-core" title="Contribute to Event Espresso by making a pull request via GitHub">', '</a>' ); ?>
+	<?php printf(__('For every major release we want to recognize the people who contributed to the release via a GitHub pull request. Want to see your name listed here? %sWhen you submit a pull request that gets included in a major release%s, we\'ll add your name here linked to your GitHub profile.', 'event_espresso'), '<a href="https://github.com/eventespresso/event-espresso-core" title="Contribute to Event Espresso by making a pull request via GitHub">', '</a>'); ?>
 </p>
 <p class="wp-credits-list">
 	<ul>
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
 </p>
 <h3 class="wp-people-group"><?php _e('External Libraries', 'event_espresso'); ?></h3>
 <p class="description">
-	<?php printf( __('Along with the libraries %sincluded with WordPress%s, Event Espresso utilizes the following third party libraries:', 'event_espresso'), '<a href="credits.php">', '</a>' ); ?>
+	<?php printf(__('Along with the libraries %sincluded with WordPress%s, Event Espresso utilizes the following third party libraries:', 'event_espresso'), '<a href="credits.php">', '</a>'); ?>
 </p>
 <p class="wp-credits-list">
 	<a href="http://josscrowcroft.github.io/accounting.js/"><?php _e('accounting.js', 'event_espresso'); ?></a>,
@@ -127,10 +127,10 @@  discard block
 block discarded – undo
 
 <?php
 	function esp_gravatar_profile($email) {
-		echo 'http://www.gravatar.com/' . md5($email);
+		echo 'http://www.gravatar.com/'.md5($email);
 	}
 
 	function esp_gravatar_image($email, $name) {
-		echo '<img src="http://0.gravatar.com/avatar/' . md5($email) . '?s=60" class="gravatar" alt="' . $name . '"/>';
+		echo '<img src="http://0.gravatar.com/avatar/'.md5($email).'?s=60" class="gravatar" alt="'.$name.'"/>';
 	}
 ?>

Please login to merge, or discard this patch.

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

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

@@ -118,40 +118,40 @@
 block discarded – undo
 	 * @return EE_Template_Config
 	 */
 	public static function update_template_settings(EE_Template_Config $CFG, $REQ ) {
-	    if(! $CFG->EED_Event_Single instanceof EE_Event_Single_Config){
-            $CFG->EED_Event_Single = new EE_Event_Single_Config();
-        }
-        $display_order_event = $CFG->EED_Event_Single->display_order_event !== null
-            ? $CFG->EED_Event_Single->display_order_event
-            : EED_Event_Single::EVENT_DETAILS_PRIORITY;
+		if(! $CFG->EED_Event_Single instanceof EE_Event_Single_Config){
+			$CFG->EED_Event_Single = new EE_Event_Single_Config();
+		}
+		$display_order_event = $CFG->EED_Event_Single->display_order_event !== null
+			? $CFG->EED_Event_Single->display_order_event
+			: EED_Event_Single::EVENT_DETAILS_PRIORITY;
 		$display_order_datetimes = $CFG->EED_Event_Single->display_order_datetimes !== null
-            ? $CFG->EED_Event_Single->display_order_datetimes
-            : EED_Event_Single::EVENT_DATETIMES_PRIORITY;
-        $display_order_tickets = $CFG->EED_Event_Single->display_order_tickets !== null
-            ? $CFG->EED_Event_Single->display_order_tickets
-            : EED_Event_Single::EVENT_TICKETS_PRIORITY;
+			? $CFG->EED_Event_Single->display_order_datetimes
+			: EED_Event_Single::EVENT_DATETIMES_PRIORITY;
+		$display_order_tickets = $CFG->EED_Event_Single->display_order_tickets !== null
+			? $CFG->EED_Event_Single->display_order_tickets
+			: EED_Event_Single::EVENT_TICKETS_PRIORITY;
 		$display_order_venue = $CFG->EED_Event_Single->display_order_venue !== null
-            ? $CFG->EED_Event_Single->display_order_venue
-            : EED_Event_Single::EVENT_VENUES_PRIORITY;
+			? $CFG->EED_Event_Single->display_order_venue
+			: EED_Event_Single::EVENT_VENUES_PRIORITY;
 		$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'];
+			&& $REQ['display_status_banner_single'];
 		$CFG->EED_Event_Single->display_venue = ! empty( $REQ['display_venue'] ) && $REQ['display_venue'];
 		$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;
+			? absint( $REQ[ 'EED_Events_Single_use_sortable_display_order' ] )
+			: 0;
 		$CFG->EED_Event_Single->display_order_event = $CFG->EED_Event_Single->use_sortable_display_order
-            ? $display_order_event
-            : EED_Event_Single::EVENT_DETAILS_PRIORITY;
+			? $display_order_event
+			: EED_Event_Single::EVENT_DETAILS_PRIORITY;
 		$CFG->EED_Event_Single->display_order_datetimes = $CFG->EED_Event_Single->use_sortable_display_order
-            ? $display_order_datetimes
-            : EED_Event_Single::EVENT_DATETIMES_PRIORITY;
+			? $display_order_datetimes
+			: EED_Event_Single::EVENT_DATETIMES_PRIORITY;
 		$CFG->EED_Event_Single->display_order_tickets = $CFG->EED_Event_Single->use_sortable_display_order
-            ? $display_order_tickets
-            : EED_Event_Single::EVENT_TICKETS_PRIORITY;
+			? $display_order_tickets
+			: EED_Event_Single::EVENT_TICKETS_PRIORITY;
 		$CFG->EED_Event_Single->display_order_venue = $CFG->EED_Event_Single->use_sortable_display_order
-            ? $display_order_venue
-            : EED_Event_Single::EVENT_VENUES_PRIORITY;
+			? $display_order_venue
+			: EED_Event_Single::EVENT_VENUES_PRIORITY;
 		do_action( 'AHEE__EED_Event_Single__update_template_settings__after_update', $CFG, $REQ );
 		return $CFG;
 	}

Please login to merge, or discard this patch.

Spacing +43 added lines, -43 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);
 	}
 
 
@@ -117,8 +117,8 @@  discard block
 block discarded – undo
 	 * @param array $REQ
 	 * @return EE_Template_Config
 	 */
-	public static function update_template_settings(EE_Template_Config $CFG, $REQ ) {
-	    if(! $CFG->EED_Event_Single instanceof EE_Event_Single_Config){
+	public static function update_template_settings(EE_Template_Config $CFG, $REQ) {
+	    if ( ! $CFG->EED_Event_Single instanceof EE_Event_Single_Config) {
             $CFG->EED_Event_Single = new EE_Event_Single_Config();
         }
         $display_order_event = $CFG->EED_Event_Single->display_order_event !== null
@@ -134,11 +134,11 @@  discard block
 block discarded – undo
             ? $CFG->EED_Event_Single->display_order_venue
             : EED_Event_Single::EVENT_VENUES_PRIORITY;
 		$CFG->EED_Event_Single = new EE_Event_Single_Config();
-		$CFG->EED_Event_Single->display_status_banner_single = ! empty( $REQ['display_status_banner_single'] )
+		$CFG->EED_Event_Single->display_status_banner_single = ! empty($REQ['display_status_banner_single'])
             && $REQ['display_status_banner_single'];
-		$CFG->EED_Event_Single->display_venue = ! empty( $REQ['display_venue'] ) && $REQ['display_venue'];
-		$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' ] )
+		$CFG->EED_Event_Single->display_venue = ! empty($REQ['display_venue']) && $REQ['display_venue'];
+		$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_event = $CFG->EED_Event_Single->use_sortable_display_order
             ? $display_order_event
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
 		$CFG->EED_Event_Single->display_order_venue = $CFG->EED_Event_Single->use_sortable_display_order
             ? $display_order_venue
             : EED_Event_Single::EVENT_VENUES_PRIORITY;
-		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;
 	}
 
@@ -166,23 +166,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 ) + EED_Event_Single::EVENT_DETAILS_PRIORITY;
+				$priority = ($key * 10) + EED_Event_Single::EVENT_DETAILS_PRIORITY;
 				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();
 	}
 
@@ -195,7 +195,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.

core/EE_Encryption.core.php 2 patches

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

@@ -16,669 +16,669 @@
 block discarded – undo
 class EE_Encryption
 {
 
-    /**
-     * key used for saving the encryption key to the wp_options table
-     */
-    const ENCRYPTION_OPTION_KEY = 'ee_encryption_key';
-
-    /**
-     * the OPENSSL cipher method used
-     */
-    const OPENSSL_CIPHER_METHOD = 'AES-128-CBC';
-
-    /**
-     * WP "options_name" used to store a verified available cipher method
-     */
-    const OPENSSL_CIPHER_METHOD_OPTION_NAME = 'ee_openssl_cipher_method';
-
-    /**
-     * the OPENSSL digest method used
-     */
-    const OPENSSL_DIGEST_METHOD = 'sha512';
-
-    /**
-     * separates the encrypted text from the initialization vector
-     */
-    const OPENSSL_IV_DELIMITER = ':iv:';
-
-    /**
-     * appended to text encrypted using the acme encryption
-     */
-    const ACME_ENCRYPTION_FLAG = '::ae';
-
-
-
-    /**
-     * instance of the EE_Encryption object
-     */
-    protected static $_instance;
-
-    /**
-     * @var string $_encryption_key
-     */
-    protected $_encryption_key;
-
-    /**
-     * @var string $cipher_method
-     */
-    private $cipher_method = '';
-
-    /**
-     * @var array $cipher_methods
-     */
-    private $cipher_methods = array();
-
-    /**
-     * @var array $digest_methods
-     */
-    private $digest_methods = array();
-
-    /**
-     * @var boolean $_use_openssl_encrypt
-     */
-    protected $_use_openssl_encrypt = false;
-
-    /**
-     * @var boolean $_use_mcrypt
-     */
-    protected $_use_mcrypt = false;
-
-    /**
-     * @var boolean $_use_base64_encode
-     */
-    protected $_use_base64_encode = false;
-
-
-
-    /**
-     * protected constructor to prevent direct creation
-     */
-    protected function __construct()
-    {
-        if (! defined('ESPRESSO_ENCRYPT')) {
-            define('ESPRESSO_ENCRYPT', true);
-        }
-        if (extension_loaded('openssl')) {
-            $this->_use_openssl_encrypt = true;
-        } else if (extension_loaded('mcrypt')) {
-            $this->_use_mcrypt = true;
-        }
-        if (function_exists('base64_encode')) {
-            $this->_use_base64_encode = true;
-        }
-    }
-
-
-
-    /**
-     * singleton method used to instantiate class object
-     *
-     * @return EE_Encryption
-     */
-    public static function instance()
-    {
-        // check if class object is instantiated
-        if (! self::$_instance instanceof EE_Encryption) {
-            self::$_instance = new self();
-        }
-        return self::$_instance;
-    }
-
-
-
-    /**
-     * get encryption key
-     *
-     * @return string
-     */
-    public function get_encryption_key()
-    {
-        // if encryption key has not been set
-        if (empty($this->_encryption_key)) {
-            // retrieve encryption_key from db
-            $this->_encryption_key = get_option(EE_Encryption::ENCRYPTION_OPTION_KEY, '');
-            // WHAT?? No encryption_key in the db ??
-            if ($this->_encryption_key === '') {
-                // let's make one. And md5 it to make it just the right size for a key
-                $new_key = md5($this->generate_random_string());
-                // now save it to the db for later
-                add_option(EE_Encryption::ENCRYPTION_OPTION_KEY, $new_key);
-                // here's the key - FINALLY !
-                $this->_encryption_key = $new_key;
-            }
-        }
-        return $this->_encryption_key;
-    }
-
-
-
-    /**
-     * encrypts data
-     *
-     * @param string $text_string - the text to be encrypted
-     * @return string
-     * @throws RuntimeException
-     */
-    public function encrypt($text_string = '')
-    {
-        // you give me nothing??? GET OUT !
-        if (empty($text_string)) {
-            return $text_string;
-        }
-        if ($this->_use_openssl_encrypt) {
-            $encrypted_text = $this->openssl_encrypt($text_string);
-        } else {
-            $encrypted_text = $this->acme_encrypt($text_string);
-        }
-        return $encrypted_text;
-    }
-
-
-
-    /**
-     * decrypts data
-     *
-     * @param string $encrypted_text - the text to be decrypted
-     * @return string
-     * @throws RuntimeException
-     */
-    public function decrypt($encrypted_text = '')
-    {
-        // you give me nothing??? GET OUT !
-        if (empty($encrypted_text)) {
-            return $encrypted_text;
-        }
-        // if PHP's mcrypt functions are installed then we'll use them
-        if ($this->_use_openssl_encrypt) {
-            $decrypted_text = $this->openssl_decrypt($encrypted_text);
-        } else {
-            $decrypted_text = $this->acme_decrypt($encrypted_text);
-        }
-        return $decrypted_text;
-    }
-
-
-
-    /**
-     * encodes string with PHP's base64 encoding
-     *
-     * @see http://php.net/manual/en/function.base64-encode.php
-     * @param string $text_string the text to be encoded
-     * @return string
-     */
-    public function base64_string_encode($text_string = '')
-    {
-        // you give me nothing??? GET OUT !
-        if (empty($text_string) || ! $this->_use_base64_encode) {
-            return $text_string;
-        }
-        // encode
-        return base64_encode($text_string);
-    }
-
-
-
-    /**
-     * decodes string that has been encoded with PHP's base64 encoding
-     *
-     * @see http://php.net/manual/en/function.base64-encode.php
-     * @param string $encoded_string the text to be decoded
-     * @return string
-     */
-    public function base64_string_decode($encoded_string = '')
-    {
-        // you give me nothing??? GET OUT !
-        if (empty($encoded_string) || ! $this->valid_base_64($encoded_string)) {
-            return $encoded_string;
-        }
-        // decode
-        return base64_decode($encoded_string);
-    }
-
-
-
-    /**
-     * encodes  url string with PHP's base64 encoding
-     *
-     * @see http://php.net/manual/en/function.base64-encode.php
-     * @param string $text_string the text to be encoded
-     * @return string
-     */
-    public function base64_url_encode($text_string = '')
-    {
-        // you give me nothing??? GET OUT !
-        if (empty($text_string) || ! $this->_use_base64_encode) {
-            return $text_string;
-        }
-        // encode
-        $encoded_string = base64_encode($text_string);
-        // remove chars to make encoding more URL friendly
-        return strtr($encoded_string, '+/=', '-_,');
-    }
-
-
-
-    /**
-     * decodes  url string that has been encoded with PHP's base64 encoding
-     *
-     * @see http://php.net/manual/en/function.base64-encode.php
-     * @param string $encoded_string the text to be decoded
-     * @return string
-     */
-    public function base64_url_decode($encoded_string = '')
-    {
-        // you give me nothing??? GET OUT !
-        if (empty($encoded_string) || ! $this->valid_base_64($encoded_string)) {
-            return $encoded_string;
-        }
-        // replace previously removed characters
-        $encoded_string = strtr($encoded_string, '-_,', '+/=');
-        // decode
-        return base64_decode($encoded_string);
-    }
-
-
-
-    /**
-     * encrypts data using PHP's openssl functions
-     *
-     * @param string $text_string the text to be encrypted
-     * @return string
-     * @throws RuntimeException
-     */
-    protected function openssl_encrypt($text_string = '')
-    {
-        // you give me nothing??? GET OUT !
-        if (empty($text_string)) {
-            return $text_string;
-        }
-        $this->cipher_method = $this->getCipherMethod();
-        // get initialization vector size
-        $iv_size = openssl_cipher_iv_length($this->cipher_method);
-        // generate initialization vector.
-        // The second parameter ("crypto_strong") is passed by reference,
-        // and is used to determines if the algorithm used was "cryptographically strong"
-        // openssl_random_pseudo_bytes() will toggle it to either true or false
-        $iv = openssl_random_pseudo_bytes($iv_size, $is_strong);
-        if ($iv === false || $is_strong === false) {
-            throw new RuntimeException(
-                esc_html__('Failed to generate OpenSSL initialization vector.', 'event_espresso')
-            );
-        }
-        // encrypt it
-        $encrypted_text = openssl_encrypt(
-            $text_string,
-            $this->cipher_method,
-            $this->getDigestHashValue(),
-            0,
-            $iv
-        );
-        // append the initialization vector
-        $encrypted_text .= EE_Encryption::OPENSSL_IV_DELIMITER . $iv;
-        // trim and maybe encode
-        return $this->_use_base64_encode
-            ? trim(base64_encode($encrypted_text))
-            : trim($encrypted_text);
-    }
-
-
-
-    /**
-     * Returns a cipher method that has been verified to work.
-     * First checks if the cached cipher has been set already and if so, returns that.
-     * Then tests the incoming default and returns that if it's good.
-     * If not, then it retrieves the previously tested and saved cipher method.
-     * But if that doesn't exist, then calls getAvailableCipherMethod()
-     * to see what is available on the server, and returns the results.
-     *
-     * @param string $cipher_method
-     * @return string
-     * @throws RuntimeException
-     */
-    protected function getCipherMethod($cipher_method = EE_Encryption::OPENSSL_CIPHER_METHOD)
-    {
-        if($this->cipher_method !== ''){
-            return $this->cipher_method;
-        }
-        // verify that the default cipher method can produce an initialization vector
-        if (openssl_cipher_iv_length($cipher_method) === false) {
-            // nope? okay let's get what we found in the past to work
-            $cipher_method = get_option(EE_Encryption::OPENSSL_CIPHER_METHOD_OPTION_NAME, '');
-            // oops... haven't tested available cipher methods yet
-            if($cipher_method === '' || openssl_cipher_iv_length($cipher_method) === false) {
-                $cipher_method = $this->getAvailableCipherMethod($cipher_method);
-            }
-        }
-        return $cipher_method;
-    }
-
-
-
-    /**
-     * @param string $cipher_method
-     * @return string
-     * @throws \RuntimeException
-     */
-    protected function getAvailableCipherMethod($cipher_method)
-    {
-        // verify that the incoming cipher method can produce an initialization vector
-        if (openssl_cipher_iv_length($cipher_method) === false) {
-            // nope? then check the next cipher in the list of available cipher methods
-            $cipher_method = next($this->cipher_methods);
-            // what? there's no list? then generate that list and cache it,
-            if (empty($this->cipher_methods)) {
-                $this->cipher_methods = openssl_get_cipher_methods();
-                // then grab the first item from the list
-                $cipher_method = reset($this->cipher_methods);
-            }
-            if($cipher_method === false){
-                throw new RuntimeException(
-                    esc_html__(
-                        'OpenSSL support appears to be enabled on the server, but no cipher methods are available. Please contact the server administrator.',
-                        'event_espresso'
-                    )
-                );
-            }
-            // verify that the next cipher method works
-            return $this->getAvailableCipherMethod($cipher_method);
-        }
-        // if we've gotten this far, then we found an available cipher method that works
-        // so save that for next time
-        update_option(
-            EE_Encryption::OPENSSL_CIPHER_METHOD_OPTION_NAME,
-            $cipher_method
-        );
-        return $cipher_method;
-    }
-
-
-
-    /**
-     * decrypts data that has been encrypted with PHP's openssl functions
-     *
-     * @param string $encrypted_text the text to be decrypted
-     * @return string
-     * @throws RuntimeException
-     */
-    protected function openssl_decrypt($encrypted_text = '')
-    {
-        // you give me nothing??? GET OUT !
-        if (empty($encrypted_text)) {
-            return $encrypted_text;
-        }
-        // decode
-        $encrypted_text = $this->valid_base_64($encrypted_text)
-            ? base64_decode($encrypted_text)
-            : $encrypted_text;
-        $encrypted_components = explode(
-            EE_Encryption::OPENSSL_IV_DELIMITER,
-            $encrypted_text,
-            2
-        );
-        // check that iv exists, and if not, maybe text was encoded using mcrypt?
-        if ($this->_use_mcrypt && ! isset($encrypted_components[1])) {
-            return $this->m_decrypt($encrypted_text);
-        }
-        // decrypt it
-        $decrypted_text = openssl_decrypt(
-            $encrypted_components[0],
-            $this->getCipherMethod(),
-            $this->getDigestHashValue(),
-            0,
-            $encrypted_components[1]
-        );
-        $decrypted_text = trim($decrypted_text);
-        return $decrypted_text;
-    }
-
-
-
-    /**
-     * Computes the digest hash value using the specified digest method.
-     * If that digest method fails to produce a valid hash value,
-     * then we'll grab the next digest method and recursively try again until something works.
-     *
-     * @param string $digest_method
-     * @return string
-     * @throws RuntimeException
-     */
-    protected function getDigestHashValue($digest_method = EE_Encryption::OPENSSL_DIGEST_METHOD){
-        $digest_hash_value = openssl_digest($this->get_encryption_key(), $digest_method);
-        if ($digest_hash_value === false) {
-            return $this->getDigestHashValue($this->getDigestMethod());
-        }
-        return $digest_hash_value;
-    }
-
-
-
-    /**
-     * Returns the NEXT element in the $digest_methods array.
-     * If the $digest_methods array is empty, then we populate it
-     * with the available values returned from openssl_get_md_methods().
-     *
-     * @return string
-     * @throws \RuntimeException
-     */
-    protected function getDigestMethod(){
-        $digest_method = prev($this->digest_methods);
-        if (empty($this->digest_methods)) {
-            $this->digest_methods = openssl_get_md_methods();
-            $digest_method = end($this->digest_methods);
-        }
-        if ($digest_method === false) {
-            throw new RuntimeException(
-                esc_html__(
-                    'OpenSSL support appears to be enabled on the server, but no digest methods are available. Please contact the server administrator.',
-                    'event_espresso'
-                )
-            );
-        }
-        return $digest_method;
-    }
-
-
-    /**
-     * encrypts data for acme servers that didn't bother to install PHP mcrypt
-     *
-     * @see http://stackoverflow.com/questions/800922/how-to-encrypt-string-without-mcrypt-library-in-php
-     * @param string $text_string the text to be decrypted
-     * @return string
-     */
-    protected function acme_encrypt($text_string = '')
-    {
-        // you give me nothing??? GET OUT !
-        if (empty($text_string)) {
-            return $text_string;
-        }
-        $key_bits = str_split(
-            str_pad(
-                '',
-                strlen($text_string),
-                $this->get_encryption_key(),
-                STR_PAD_RIGHT
-            )
-        );
-        $string_bits = str_split($text_string);
-        foreach ($string_bits as $k => $v) {
-            $temp = ord($v) + ord($key_bits[$k]);
-            $string_bits[$k] = chr($temp > 255 ? ($temp - 256) : $temp);
-        }
-        $encrypted_text = implode('', $string_bits);
-        $encrypted_text .= EE_Encryption::ACME_ENCRYPTION_FLAG;
-        return $this->_use_base64_encode
-            ? base64_encode($encrypted_text)
-            : $encrypted_text;
-    }
-
-
-
-    /**
-     * decrypts data for acme servers that didn't bother to install PHP mcrypt
-     *
-     * @see http://stackoverflow.com/questions/800922/how-to-encrypt-string-without-mcrypt-library-in-php
-     * @param string $encrypted_text the text to be decrypted
-     * @return string
-     * @throws RuntimeException
-     */
-    protected function acme_decrypt($encrypted_text = '')
-    {
-        // you give me nothing??? GET OUT !
-        if (empty($encrypted_text)) {
-            return $encrypted_text;
-        }
-        // decode the data ?
-        $encrypted_text = $this->valid_base_64($encrypted_text)
-            ? base64_decode($encrypted_text)
-            : $encrypted_text;
-        if (
-            $this->_use_mcrypt
-            && strpos($encrypted_text, EE_Encryption::ACME_ENCRYPTION_FLAG) === false
-        ){
-            return $this->m_decrypt($encrypted_text);
-        }
-        $encrypted_text = substr($encrypted_text, 0, -4);
-        $key_bits = str_split(
-            str_pad(
-                '',
-                strlen($encrypted_text),
-                $this->get_encryption_key(),
-                STR_PAD_RIGHT
-            )
-        );
-        $string_bits = str_split($encrypted_text);
-        foreach ($string_bits as $k => $v) {
-            $temp = ord($v) - ord($key_bits[$k]);
-            $string_bits[$k] = chr($temp < 0 ? ($temp + 256) : $temp);
-        }
-        return implode('', $string_bits);
-    }
-
-
-
-    /**
-     * @see http://stackoverflow.com/questions/2556345/detect-base64-encoding-in-php#30231906
-     * @param $string
-     * @return bool
-     */
-    protected function valid_base_64($string)
-    {
-        // ensure data is a string
-        if (! is_string($string) || ! $this->_use_base64_encode) {
-            return false;
-        }
-        $decoded = base64_decode($string, true);
-        // Check if there is no invalid character in string
-        if (! preg_match('/^[a-zA-Z0-9\/\r\n+]*={0,2}$/', $string)) {
-            return false;
-        }
-        // Decode the string in strict mode and send the response
-        if (! base64_decode($string, true)) {
-            return false;
-        }
-        // Encode and compare it to original one
-        return base64_encode($decoded) === $string;
-    }
-
-
-
-    /**
-     * generate random string
-     *
-     * @see http://stackoverflow.com/questions/637278/what-is-the-best-way-to-generate-a-random-key-within-php
-     * @param int $length number of characters for random string
-     * @return string
-     */
-    public function generate_random_string($length = 40)
-    {
-        $iterations = ceil($length / 40);
-        $random_string = '';
-        for ($i = 0; $i < $iterations; $i++) {
-            $random_string .= sha1(microtime(true) . mt_rand(10000, 90000));
-        }
-        $random_string = substr($random_string, 0, $length);
-        return $random_string;
-    }
-
-
-
-    /**
-     * encrypts data using PHP's mcrypt functions
-     *
-     * @deprecated 4.9.39
-     * @param string $text_string
-     * @internal   param $string - the text to be encrypted
-     * @return string
-     * @throws RuntimeException
-     */
-    protected function m_encrypt($text_string = '')
-    {
-        // you give me nothing??? GET OUT !
-        if (empty($text_string)) {
-            return $text_string;
-        }
-        // get the initialization vector size
-        $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
-        // initialization vector
-        $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
-        if ($iv === false) {
-            throw new RuntimeException(
-                esc_html__('Failed to generate mcrypt initialization vector.', 'event_espresso')
-            );
-        }
-        // encrypt it
-        $encrypted_text = mcrypt_encrypt(
-            MCRYPT_RIJNDAEL_256,
-            $this->get_encryption_key(),
-            $text_string,
-            MCRYPT_MODE_ECB,
-            $iv
-        );
-        // trim and maybe encode
-        return $this->_use_base64_encode
-            ? trim(base64_encode($encrypted_text))
-            : trim($encrypted_text);
-    }
-
-
-
-    /**
-     * decrypts data that has been encrypted with PHP's mcrypt functions
-     *
-     * @deprecated 4.9.39
-     * @param string $encrypted_text the text to be decrypted
-     * @return string
-     * @throws RuntimeException
-     */
-    protected function m_decrypt($encrypted_text = '')
-    {
-        // you give me nothing??? GET OUT !
-        if (empty($encrypted_text)) {
-            return $encrypted_text;
-        }
-        // decode
-        $encrypted_text = $this->valid_base_64($encrypted_text)
-            ? base64_decode($encrypted_text)
-            : $encrypted_text;
-        // get the initialization vector size
-        $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
-        $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
-        if ($iv === false) {
-            throw new RuntimeException(
-                esc_html__('Failed to generate mcrypt initialization vector.', 'event_espresso')
-            );
-        }
-        // decrypt it
-        $decrypted_text = mcrypt_decrypt(
-            MCRYPT_RIJNDAEL_256,
-            $this->get_encryption_key(),
-            $encrypted_text,
-            MCRYPT_MODE_ECB,
-            $iv
-        );
-        $decrypted_text = trim($decrypted_text);
-        return $decrypted_text;
-    }
+	/**
+	 * key used for saving the encryption key to the wp_options table
+	 */
+	const ENCRYPTION_OPTION_KEY = 'ee_encryption_key';
+
+	/**
+	 * the OPENSSL cipher method used
+	 */
+	const OPENSSL_CIPHER_METHOD = 'AES-128-CBC';
+
+	/**
+	 * WP "options_name" used to store a verified available cipher method
+	 */
+	const OPENSSL_CIPHER_METHOD_OPTION_NAME = 'ee_openssl_cipher_method';
+
+	/**
+	 * the OPENSSL digest method used
+	 */
+	const OPENSSL_DIGEST_METHOD = 'sha512';
+
+	/**
+	 * separates the encrypted text from the initialization vector
+	 */
+	const OPENSSL_IV_DELIMITER = ':iv:';
+
+	/**
+	 * appended to text encrypted using the acme encryption
+	 */
+	const ACME_ENCRYPTION_FLAG = '::ae';
+
+
+
+	/**
+	 * instance of the EE_Encryption object
+	 */
+	protected static $_instance;
+
+	/**
+	 * @var string $_encryption_key
+	 */
+	protected $_encryption_key;
+
+	/**
+	 * @var string $cipher_method
+	 */
+	private $cipher_method = '';
+
+	/**
+	 * @var array $cipher_methods
+	 */
+	private $cipher_methods = array();
+
+	/**
+	 * @var array $digest_methods
+	 */
+	private $digest_methods = array();
+
+	/**
+	 * @var boolean $_use_openssl_encrypt
+	 */
+	protected $_use_openssl_encrypt = false;
+
+	/**
+	 * @var boolean $_use_mcrypt
+	 */
+	protected $_use_mcrypt = false;
+
+	/**
+	 * @var boolean $_use_base64_encode
+	 */
+	protected $_use_base64_encode = false;
+
+
+
+	/**
+	 * protected constructor to prevent direct creation
+	 */
+	protected function __construct()
+	{
+		if (! defined('ESPRESSO_ENCRYPT')) {
+			define('ESPRESSO_ENCRYPT', true);
+		}
+		if (extension_loaded('openssl')) {
+			$this->_use_openssl_encrypt = true;
+		} else if (extension_loaded('mcrypt')) {
+			$this->_use_mcrypt = true;
+		}
+		if (function_exists('base64_encode')) {
+			$this->_use_base64_encode = true;
+		}
+	}
+
+
+
+	/**
+	 * singleton method used to instantiate class object
+	 *
+	 * @return EE_Encryption
+	 */
+	public static function instance()
+	{
+		// check if class object is instantiated
+		if (! self::$_instance instanceof EE_Encryption) {
+			self::$_instance = new self();
+		}
+		return self::$_instance;
+	}
+
+
+
+	/**
+	 * get encryption key
+	 *
+	 * @return string
+	 */
+	public function get_encryption_key()
+	{
+		// if encryption key has not been set
+		if (empty($this->_encryption_key)) {
+			// retrieve encryption_key from db
+			$this->_encryption_key = get_option(EE_Encryption::ENCRYPTION_OPTION_KEY, '');
+			// WHAT?? No encryption_key in the db ??
+			if ($this->_encryption_key === '') {
+				// let's make one. And md5 it to make it just the right size for a key
+				$new_key = md5($this->generate_random_string());
+				// now save it to the db for later
+				add_option(EE_Encryption::ENCRYPTION_OPTION_KEY, $new_key);
+				// here's the key - FINALLY !
+				$this->_encryption_key = $new_key;
+			}
+		}
+		return $this->_encryption_key;
+	}
+
+
+
+	/**
+	 * encrypts data
+	 *
+	 * @param string $text_string - the text to be encrypted
+	 * @return string
+	 * @throws RuntimeException
+	 */
+	public function encrypt($text_string = '')
+	{
+		// you give me nothing??? GET OUT !
+		if (empty($text_string)) {
+			return $text_string;
+		}
+		if ($this->_use_openssl_encrypt) {
+			$encrypted_text = $this->openssl_encrypt($text_string);
+		} else {
+			$encrypted_text = $this->acme_encrypt($text_string);
+		}
+		return $encrypted_text;
+	}
+
+
+
+	/**
+	 * decrypts data
+	 *
+	 * @param string $encrypted_text - the text to be decrypted
+	 * @return string
+	 * @throws RuntimeException
+	 */
+	public function decrypt($encrypted_text = '')
+	{
+		// you give me nothing??? GET OUT !
+		if (empty($encrypted_text)) {
+			return $encrypted_text;
+		}
+		// if PHP's mcrypt functions are installed then we'll use them
+		if ($this->_use_openssl_encrypt) {
+			$decrypted_text = $this->openssl_decrypt($encrypted_text);
+		} else {
+			$decrypted_text = $this->acme_decrypt($encrypted_text);
+		}
+		return $decrypted_text;
+	}
+
+
+
+	/**
+	 * encodes string with PHP's base64 encoding
+	 *
+	 * @see http://php.net/manual/en/function.base64-encode.php
+	 * @param string $text_string the text to be encoded
+	 * @return string
+	 */
+	public function base64_string_encode($text_string = '')
+	{
+		// you give me nothing??? GET OUT !
+		if (empty($text_string) || ! $this->_use_base64_encode) {
+			return $text_string;
+		}
+		// encode
+		return base64_encode($text_string);
+	}
+
+
+
+	/**
+	 * decodes string that has been encoded with PHP's base64 encoding
+	 *
+	 * @see http://php.net/manual/en/function.base64-encode.php
+	 * @param string $encoded_string the text to be decoded
+	 * @return string
+	 */
+	public function base64_string_decode($encoded_string = '')
+	{
+		// you give me nothing??? GET OUT !
+		if (empty($encoded_string) || ! $this->valid_base_64($encoded_string)) {
+			return $encoded_string;
+		}
+		// decode
+		return base64_decode($encoded_string);
+	}
+
+
+
+	/**
+	 * encodes  url string with PHP's base64 encoding
+	 *
+	 * @see http://php.net/manual/en/function.base64-encode.php
+	 * @param string $text_string the text to be encoded
+	 * @return string
+	 */
+	public function base64_url_encode($text_string = '')
+	{
+		// you give me nothing??? GET OUT !
+		if (empty($text_string) || ! $this->_use_base64_encode) {
+			return $text_string;
+		}
+		// encode
+		$encoded_string = base64_encode($text_string);
+		// remove chars to make encoding more URL friendly
+		return strtr($encoded_string, '+/=', '-_,');
+	}
+
+
+
+	/**
+	 * decodes  url string that has been encoded with PHP's base64 encoding
+	 *
+	 * @see http://php.net/manual/en/function.base64-encode.php
+	 * @param string $encoded_string the text to be decoded
+	 * @return string
+	 */
+	public function base64_url_decode($encoded_string = '')
+	{
+		// you give me nothing??? GET OUT !
+		if (empty($encoded_string) || ! $this->valid_base_64($encoded_string)) {
+			return $encoded_string;
+		}
+		// replace previously removed characters
+		$encoded_string = strtr($encoded_string, '-_,', '+/=');
+		// decode
+		return base64_decode($encoded_string);
+	}
+
+
+
+	/**
+	 * encrypts data using PHP's openssl functions
+	 *
+	 * @param string $text_string the text to be encrypted
+	 * @return string
+	 * @throws RuntimeException
+	 */
+	protected function openssl_encrypt($text_string = '')
+	{
+		// you give me nothing??? GET OUT !
+		if (empty($text_string)) {
+			return $text_string;
+		}
+		$this->cipher_method = $this->getCipherMethod();
+		// get initialization vector size
+		$iv_size = openssl_cipher_iv_length($this->cipher_method);
+		// generate initialization vector.
+		// The second parameter ("crypto_strong") is passed by reference,
+		// and is used to determines if the algorithm used was "cryptographically strong"
+		// openssl_random_pseudo_bytes() will toggle it to either true or false
+		$iv = openssl_random_pseudo_bytes($iv_size, $is_strong);
+		if ($iv === false || $is_strong === false) {
+			throw new RuntimeException(
+				esc_html__('Failed to generate OpenSSL initialization vector.', 'event_espresso')
+			);
+		}
+		// encrypt it
+		$encrypted_text = openssl_encrypt(
+			$text_string,
+			$this->cipher_method,
+			$this->getDigestHashValue(),
+			0,
+			$iv
+		);
+		// append the initialization vector
+		$encrypted_text .= EE_Encryption::OPENSSL_IV_DELIMITER . $iv;
+		// trim and maybe encode
+		return $this->_use_base64_encode
+			? trim(base64_encode($encrypted_text))
+			: trim($encrypted_text);
+	}
+
+
+
+	/**
+	 * Returns a cipher method that has been verified to work.
+	 * First checks if the cached cipher has been set already and if so, returns that.
+	 * Then tests the incoming default and returns that if it's good.
+	 * If not, then it retrieves the previously tested and saved cipher method.
+	 * But if that doesn't exist, then calls getAvailableCipherMethod()
+	 * to see what is available on the server, and returns the results.
+	 *
+	 * @param string $cipher_method
+	 * @return string
+	 * @throws RuntimeException
+	 */
+	protected function getCipherMethod($cipher_method = EE_Encryption::OPENSSL_CIPHER_METHOD)
+	{
+		if($this->cipher_method !== ''){
+			return $this->cipher_method;
+		}
+		// verify that the default cipher method can produce an initialization vector
+		if (openssl_cipher_iv_length($cipher_method) === false) {
+			// nope? okay let's get what we found in the past to work
+			$cipher_method = get_option(EE_Encryption::OPENSSL_CIPHER_METHOD_OPTION_NAME, '');
+			// oops... haven't tested available cipher methods yet
+			if($cipher_method === '' || openssl_cipher_iv_length($cipher_method) === false) {
+				$cipher_method = $this->getAvailableCipherMethod($cipher_method);
+			}
+		}
+		return $cipher_method;
+	}
+
+
+
+	/**
+	 * @param string $cipher_method
+	 * @return string
+	 * @throws \RuntimeException
+	 */
+	protected function getAvailableCipherMethod($cipher_method)
+	{
+		// verify that the incoming cipher method can produce an initialization vector
+		if (openssl_cipher_iv_length($cipher_method) === false) {
+			// nope? then check the next cipher in the list of available cipher methods
+			$cipher_method = next($this->cipher_methods);
+			// what? there's no list? then generate that list and cache it,
+			if (empty($this->cipher_methods)) {
+				$this->cipher_methods = openssl_get_cipher_methods();
+				// then grab the first item from the list
+				$cipher_method = reset($this->cipher_methods);
+			}
+			if($cipher_method === false){
+				throw new RuntimeException(
+					esc_html__(
+						'OpenSSL support appears to be enabled on the server, but no cipher methods are available. Please contact the server administrator.',
+						'event_espresso'
+					)
+				);
+			}
+			// verify that the next cipher method works
+			return $this->getAvailableCipherMethod($cipher_method);
+		}
+		// if we've gotten this far, then we found an available cipher method that works
+		// so save that for next time
+		update_option(
+			EE_Encryption::OPENSSL_CIPHER_METHOD_OPTION_NAME,
+			$cipher_method
+		);
+		return $cipher_method;
+	}
+
+
+
+	/**
+	 * decrypts data that has been encrypted with PHP's openssl functions
+	 *
+	 * @param string $encrypted_text the text to be decrypted
+	 * @return string
+	 * @throws RuntimeException
+	 */
+	protected function openssl_decrypt($encrypted_text = '')
+	{
+		// you give me nothing??? GET OUT !
+		if (empty($encrypted_text)) {
+			return $encrypted_text;
+		}
+		// decode
+		$encrypted_text = $this->valid_base_64($encrypted_text)
+			? base64_decode($encrypted_text)
+			: $encrypted_text;
+		$encrypted_components = explode(
+			EE_Encryption::OPENSSL_IV_DELIMITER,
+			$encrypted_text,
+			2
+		);
+		// check that iv exists, and if not, maybe text was encoded using mcrypt?
+		if ($this->_use_mcrypt && ! isset($encrypted_components[1])) {
+			return $this->m_decrypt($encrypted_text);
+		}
+		// decrypt it
+		$decrypted_text = openssl_decrypt(
+			$encrypted_components[0],
+			$this->getCipherMethod(),
+			$this->getDigestHashValue(),
+			0,
+			$encrypted_components[1]
+		);
+		$decrypted_text = trim($decrypted_text);
+		return $decrypted_text;
+	}
+
+
+
+	/**
+	 * Computes the digest hash value using the specified digest method.
+	 * If that digest method fails to produce a valid hash value,
+	 * then we'll grab the next digest method and recursively try again until something works.
+	 *
+	 * @param string $digest_method
+	 * @return string
+	 * @throws RuntimeException
+	 */
+	protected function getDigestHashValue($digest_method = EE_Encryption::OPENSSL_DIGEST_METHOD){
+		$digest_hash_value = openssl_digest($this->get_encryption_key(), $digest_method);
+		if ($digest_hash_value === false) {
+			return $this->getDigestHashValue($this->getDigestMethod());
+		}
+		return $digest_hash_value;
+	}
+
+
+
+	/**
+	 * Returns the NEXT element in the $digest_methods array.
+	 * If the $digest_methods array is empty, then we populate it
+	 * with the available values returned from openssl_get_md_methods().
+	 *
+	 * @return string
+	 * @throws \RuntimeException
+	 */
+	protected function getDigestMethod(){
+		$digest_method = prev($this->digest_methods);
+		if (empty($this->digest_methods)) {
+			$this->digest_methods = openssl_get_md_methods();
+			$digest_method = end($this->digest_methods);
+		}
+		if ($digest_method === false) {
+			throw new RuntimeException(
+				esc_html__(
+					'OpenSSL support appears to be enabled on the server, but no digest methods are available. Please contact the server administrator.',
+					'event_espresso'
+				)
+			);
+		}
+		return $digest_method;
+	}
+
+
+	/**
+	 * encrypts data for acme servers that didn't bother to install PHP mcrypt
+	 *
+	 * @see http://stackoverflow.com/questions/800922/how-to-encrypt-string-without-mcrypt-library-in-php
+	 * @param string $text_string the text to be decrypted
+	 * @return string
+	 */
+	protected function acme_encrypt($text_string = '')
+	{
+		// you give me nothing??? GET OUT !
+		if (empty($text_string)) {
+			return $text_string;
+		}
+		$key_bits = str_split(
+			str_pad(
+				'',
+				strlen($text_string),
+				$this->get_encryption_key(),
+				STR_PAD_RIGHT
+			)
+		);
+		$string_bits = str_split($text_string);
+		foreach ($string_bits as $k => $v) {
+			$temp = ord($v) + ord($key_bits[$k]);
+			$string_bits[$k] = chr($temp > 255 ? ($temp - 256) : $temp);
+		}
+		$encrypted_text = implode('', $string_bits);
+		$encrypted_text .= EE_Encryption::ACME_ENCRYPTION_FLAG;
+		return $this->_use_base64_encode
+			? base64_encode($encrypted_text)
+			: $encrypted_text;
+	}
+
+
+
+	/**
+	 * decrypts data for acme servers that didn't bother to install PHP mcrypt
+	 *
+	 * @see http://stackoverflow.com/questions/800922/how-to-encrypt-string-without-mcrypt-library-in-php
+	 * @param string $encrypted_text the text to be decrypted
+	 * @return string
+	 * @throws RuntimeException
+	 */
+	protected function acme_decrypt($encrypted_text = '')
+	{
+		// you give me nothing??? GET OUT !
+		if (empty($encrypted_text)) {
+			return $encrypted_text;
+		}
+		// decode the data ?
+		$encrypted_text = $this->valid_base_64($encrypted_text)
+			? base64_decode($encrypted_text)
+			: $encrypted_text;
+		if (
+			$this->_use_mcrypt
+			&& strpos($encrypted_text, EE_Encryption::ACME_ENCRYPTION_FLAG) === false
+		){
+			return $this->m_decrypt($encrypted_text);
+		}
+		$encrypted_text = substr($encrypted_text, 0, -4);
+		$key_bits = str_split(
+			str_pad(
+				'',
+				strlen($encrypted_text),
+				$this->get_encryption_key(),
+				STR_PAD_RIGHT
+			)
+		);
+		$string_bits = str_split($encrypted_text);
+		foreach ($string_bits as $k => $v) {
+			$temp = ord($v) - ord($key_bits[$k]);
+			$string_bits[$k] = chr($temp < 0 ? ($temp + 256) : $temp);
+		}
+		return implode('', $string_bits);
+	}
+
+
+
+	/**
+	 * @see http://stackoverflow.com/questions/2556345/detect-base64-encoding-in-php#30231906
+	 * @param $string
+	 * @return bool
+	 */
+	protected function valid_base_64($string)
+	{
+		// ensure data is a string
+		if (! is_string($string) || ! $this->_use_base64_encode) {
+			return false;
+		}
+		$decoded = base64_decode($string, true);
+		// Check if there is no invalid character in string
+		if (! preg_match('/^[a-zA-Z0-9\/\r\n+]*={0,2}$/', $string)) {
+			return false;
+		}
+		// Decode the string in strict mode and send the response
+		if (! base64_decode($string, true)) {
+			return false;
+		}
+		// Encode and compare it to original one
+		return base64_encode($decoded) === $string;
+	}
+
+
+
+	/**
+	 * generate random string
+	 *
+	 * @see http://stackoverflow.com/questions/637278/what-is-the-best-way-to-generate-a-random-key-within-php
+	 * @param int $length number of characters for random string
+	 * @return string
+	 */
+	public function generate_random_string($length = 40)
+	{
+		$iterations = ceil($length / 40);
+		$random_string = '';
+		for ($i = 0; $i < $iterations; $i++) {
+			$random_string .= sha1(microtime(true) . mt_rand(10000, 90000));
+		}
+		$random_string = substr($random_string, 0, $length);
+		return $random_string;
+	}
+
+
+
+	/**
+	 * encrypts data using PHP's mcrypt functions
+	 *
+	 * @deprecated 4.9.39
+	 * @param string $text_string
+	 * @internal   param $string - the text to be encrypted
+	 * @return string
+	 * @throws RuntimeException
+	 */
+	protected function m_encrypt($text_string = '')
+	{
+		// you give me nothing??? GET OUT !
+		if (empty($text_string)) {
+			return $text_string;
+		}
+		// get the initialization vector size
+		$iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
+		// initialization vector
+		$iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
+		if ($iv === false) {
+			throw new RuntimeException(
+				esc_html__('Failed to generate mcrypt initialization vector.', 'event_espresso')
+			);
+		}
+		// encrypt it
+		$encrypted_text = mcrypt_encrypt(
+			MCRYPT_RIJNDAEL_256,
+			$this->get_encryption_key(),
+			$text_string,
+			MCRYPT_MODE_ECB,
+			$iv
+		);
+		// trim and maybe encode
+		return $this->_use_base64_encode
+			? trim(base64_encode($encrypted_text))
+			: trim($encrypted_text);
+	}
+
+
+
+	/**
+	 * decrypts data that has been encrypted with PHP's mcrypt functions
+	 *
+	 * @deprecated 4.9.39
+	 * @param string $encrypted_text the text to be decrypted
+	 * @return string
+	 * @throws RuntimeException
+	 */
+	protected function m_decrypt($encrypted_text = '')
+	{
+		// you give me nothing??? GET OUT !
+		if (empty($encrypted_text)) {
+			return $encrypted_text;
+		}
+		// decode
+		$encrypted_text = $this->valid_base_64($encrypted_text)
+			? base64_decode($encrypted_text)
+			: $encrypted_text;
+		// get the initialization vector size
+		$iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
+		$iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
+		if ($iv === false) {
+			throw new RuntimeException(
+				esc_html__('Failed to generate mcrypt initialization vector.', 'event_espresso')
+			);
+		}
+		// decrypt it
+		$decrypted_text = mcrypt_decrypt(
+			MCRYPT_RIJNDAEL_256,
+			$this->get_encryption_key(),
+			$encrypted_text,
+			MCRYPT_MODE_ECB,
+			$iv
+		);
+		$decrypted_text = trim($decrypted_text);
+		return $decrypted_text;
+	}
 
 }
 /* End of file EE_Encryption.class.php */

Please login to merge, or discard this patch.

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

@@ -95,7 +95,7 @@  discard block
 block discarded – undo
      */
     protected function __construct()
     {
-        if (! defined('ESPRESSO_ENCRYPT')) {
+        if ( ! defined('ESPRESSO_ENCRYPT')) {
             define('ESPRESSO_ENCRYPT', true);
         }
         if (extension_loaded('openssl')) {
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
     public static function instance()
     {
         // check if class object is instantiated
-        if (! self::$_instance instanceof EE_Encryption) {
+        if ( ! self::$_instance instanceof EE_Encryption) {
             self::$_instance = new self();
         }
         return self::$_instance;
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
             $iv
         );
         // append the initialization vector
-        $encrypted_text .= EE_Encryption::OPENSSL_IV_DELIMITER . $iv;
+        $encrypted_text .= EE_Encryption::OPENSSL_IV_DELIMITER.$iv;
         // trim and maybe encode
         return $this->_use_base64_encode
             ? trim(base64_encode($encrypted_text))
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
      */
     protected function getCipherMethod($cipher_method = EE_Encryption::OPENSSL_CIPHER_METHOD)
     {
-        if($this->cipher_method !== ''){
+        if ($this->cipher_method !== '') {
             return $this->cipher_method;
         }
         // verify that the default cipher method can produce an initialization vector
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
             // nope? okay let's get what we found in the past to work
             $cipher_method = get_option(EE_Encryption::OPENSSL_CIPHER_METHOD_OPTION_NAME, '');
             // oops... haven't tested available cipher methods yet
-            if($cipher_method === '' || openssl_cipher_iv_length($cipher_method) === false) {
+            if ($cipher_method === '' || openssl_cipher_iv_length($cipher_method) === false) {
                 $cipher_method = $this->getAvailableCipherMethod($cipher_method);
             }
         }
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
                 // then grab the first item from the list
                 $cipher_method = reset($this->cipher_methods);
             }
-            if($cipher_method === false){
+            if ($cipher_method === false) {
                 throw new RuntimeException(
                     esc_html__(
                         'OpenSSL support appears to be enabled on the server, but no cipher methods are available. Please contact the server administrator.',
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
      * @return string
      * @throws RuntimeException
      */
-    protected function getDigestHashValue($digest_method = EE_Encryption::OPENSSL_DIGEST_METHOD){
+    protected function getDigestHashValue($digest_method = EE_Encryption::OPENSSL_DIGEST_METHOD) {
         $digest_hash_value = openssl_digest($this->get_encryption_key(), $digest_method);
         if ($digest_hash_value === false) {
             return $this->getDigestHashValue($this->getDigestMethod());
@@ -460,7 +460,7 @@  discard block
 block discarded – undo
      * @return string
      * @throws \RuntimeException
      */
-    protected function getDigestMethod(){
+    protected function getDigestMethod() {
         $digest_method = prev($this->digest_methods);
         if (empty($this->digest_methods)) {
             $this->digest_methods = openssl_get_md_methods();
@@ -534,7 +534,7 @@  discard block
 block discarded – undo
         if (
             $this->_use_mcrypt
             && strpos($encrypted_text, EE_Encryption::ACME_ENCRYPTION_FLAG) === false
-        ){
+        ) {
             return $this->m_decrypt($encrypted_text);
         }
         $encrypted_text = substr($encrypted_text, 0, -4);
@@ -564,16 +564,16 @@  discard block
 block discarded – undo
     protected function valid_base_64($string)
     {
         // ensure data is a string
-        if (! is_string($string) || ! $this->_use_base64_encode) {
+        if ( ! is_string($string) || ! $this->_use_base64_encode) {
             return false;
         }
         $decoded = base64_decode($string, true);
         // Check if there is no invalid character in string
-        if (! preg_match('/^[a-zA-Z0-9\/\r\n+]*={0,2}$/', $string)) {
+        if ( ! preg_match('/^[a-zA-Z0-9\/\r\n+]*={0,2}$/', $string)) {
             return false;
         }
         // Decode the string in strict mode and send the response
-        if (! base64_decode($string, true)) {
+        if ( ! base64_decode($string, true)) {
             return false;
         }
         // Encode and compare it to original one
@@ -594,7 +594,7 @@  discard block
 block discarded – undo
         $iterations = ceil($length / 40);
         $random_string = '';
         for ($i = 0; $i < $iterations; $i++) {
-            $random_string .= sha1(microtime(true) . mt_rand(10000, 90000));
+            $random_string .= sha1(microtime(true).mt_rand(10000, 90000));
         }
         $random_string = substr($random_string, 0, $length);
         return $random_string;

Please login to merge, or discard this patch.

caffeinated/admin/extend/about/Extend_About_Admin_Page.core.php 1 patch

Spacing +18 added lines, -18 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');
 
 /**
@@ -32,15 +32,15 @@  discard block
 block discarded – undo
 
 
 
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
-		define( 'EE_ABOUT_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'about/templates/' );
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
+		define('EE_ABOUT_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'about/templates/');
 	}
 
 
 
 	protected function _extend_page_config() {
-		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'about';
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'about';
 	}
 
 	protected function _set_page_routes() {
@@ -112,11 +112,11 @@  discard block
 block discarded – undo
 	protected function _whats_new() {
 		$steps = EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ? $this->_get_started_steps() : FALSE;
 		$steps = $steps !== FALSE ? $steps : '';
-		$this->_admin_page_title = sprintf( __('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION );
+		$this->_admin_page_title = sprintf(__('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION);
 		$settings_message = $steps;
-		$this->_template_args['admin_page_subtitle'] = __('Thank you for choosing Event Espresso, the most powerful Event Management plugin for WordPress.', 'event_espresso'). $settings_message ;
-		$template = is_readable(EE_ABOUT_CAF_TEMPLATE_PATH . 'whats_new.template.php') ? EE_ABOUT_CAF_TEMPLATE_PATH . 'whats_new.template.php' : EE_ABOUT_TEMPLATE_PATH . 'whats_new.template.php';
-		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE );
+		$this->_template_args['admin_page_subtitle'] = __('Thank you for choosing Event Espresso, the most powerful Event Management plugin for WordPress.', 'event_espresso').$settings_message;
+		$template = is_readable(EE_ABOUT_CAF_TEMPLATE_PATH.'whats_new.template.php') ? EE_ABOUT_CAF_TEMPLATE_PATH.'whats_new.template.php' : EE_ABOUT_TEMPLATE_PATH.'whats_new.template.php';
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template($template, $this->_template_args, TRUE);
 		$this->display_about_admin_page();
 	}
 
@@ -124,32 +124,32 @@  discard block
 block discarded – undo
 	protected function _overview() {
 		$this->_admin_page_title = __('About Event Espresso', 'event_espresso');
 		$this->_template_args['admin_page_subtitle'] = __('Thank you for choosing Event Espresso, the most powerful Event Management plugin for WordPress.', 'event_espresso');
-		$template = is_readable(EE_ABOUT_CAF_TEMPLATE_PATH . 'ee4-overview.template.php') ? EE_ABOUT_CAF_TEMPLATE_PATH . 'ee4-overview.template.php' : EE_ABOUT_TEMPLATE_PATH . 'ee4-overview.template.php';
-		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE );
+		$template = is_readable(EE_ABOUT_CAF_TEMPLATE_PATH.'ee4-overview.template.php') ? EE_ABOUT_CAF_TEMPLATE_PATH.'ee4-overview.template.php' : EE_ABOUT_TEMPLATE_PATH.'ee4-overview.template.php';
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template($template, $this->_template_args, TRUE);
 		$this->display_about_admin_page();
 	}
 
 	protected function _credits() {
 	//	$this->_template_args['admin_page_title'] = sprintf( __('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION );
 		$this->_template_args['admin_page_subtitle'] = __('Thank you for choosing Event Espresso, the most powerful Event Management plugin for WordPress.', 'event_espresso');
-		$template = EE_ABOUT_TEMPLATE_PATH . 'credits.template.php';
-		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE );
+		$template = EE_ABOUT_TEMPLATE_PATH.'credits.template.php';
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template($template, $this->_template_args, TRUE);
 		$this->display_about_admin_page();
 	}
 
 	protected function _decafvpro() {
-		$this->_template_args['admin_page_title'] = sprintf( __('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION );
+		$this->_template_args['admin_page_title'] = sprintf(__('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION);
 		$this->_template_args['admin_page_subtitle'] = sprintf(__('Event Espresso lets you focus on doing %swhat you love%s — %sorganizing your events%s', 'event_espresso'), '<em>', '</em>', '<strong>', '</strong>');
-		$template = EE_ABOUT_TEMPLATE_PATH . 'decafvpro.template.php';
-		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE );
+		$template = EE_ABOUT_TEMPLATE_PATH.'decafvpro.template.php';
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template($template, $this->_template_args, TRUE);
 		$this->display_about_admin_page();
 	}
 
 	protected function _reviews() {
 		$this->_template_args['admin_page_title'] = __('Rave Reviews About Event Espresso 4', 'event_espresso');
 		$this->_template_args['admin_page_subtitle'] = __('At Event Espresso, customer satisfaction is our ultimate goal.', 'event_espresso');
-		$template = EE_ABOUT_TEMPLATE_PATH . 'reviews.template.php';
-		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE );
+		$template = EE_ABOUT_TEMPLATE_PATH.'reviews.template.php';
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template($template, $this->_template_args, TRUE);
 		$this->display_about_admin_page();
 	}
 }

Please login to merge, or discard this patch.

caffeinated/admin/extend/about/templates/ee4-overview.template.php 1 patch

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

@@ -1,8 +1,8 @@  discard block
 block discarded – undo
 <div class="changelog">
 	<h2 class="about-headline-callout"><?php esc_html_e('Welcome to Event Espresso 4!', 'event_espresso'); ?></h2>
-	<p><?php echo sprintf( esc_html__('Manage your events from your WordPress dashboard. Reduce your admin, reduce your costs, make your life easier! This is the Caffeinated/Regular version of Event Espresso, but we also have a hosted version called %sEvent Smart%s for customers that want to cut back on their hosting and security expenses.', 'event_espresso'),'<a href="https://eventsmart.com//?utm_source=ee4_decaf&amp;utm_medium=link&amp;utm_campaign=espresso_about_tab&amp;utm_content=EE4+Caffeinated">','</a>'); ?></p>
+	<p><?php echo sprintf(esc_html__('Manage your events from your WordPress dashboard. Reduce your admin, reduce your costs, make your life easier! This is the Caffeinated/Regular version of Event Espresso, but we also have a hosted version called %sEvent Smart%s for customers that want to cut back on their hosting and security expenses.', 'event_espresso'), '<a href="https://eventsmart.com//?utm_source=ee4_decaf&amp;utm_medium=link&amp;utm_campaign=espresso_about_tab&amp;utm_content=EE4+Caffeinated">', '</a>'); ?></p>
 	<h2><?php esc_html_e('Powering 40,000+ event websites; $100 million in ticket sales per year!', 'event_espresso'); ?></h2>
-	<p><?php echo sprintf( esc_html__('Event Espresso is a %sWordPress event manager%s which makes it easy for you to register attendees for classes, workshops, events, trainings, conferences or concerts, all from your WordPress website. Event Espresso events are created from the WordPress admin area. You can create signup forms to collect information about your attendees, accept payments, and create reports. The lite version of the plugin provides everything that you need to manage your event using WordPress.', 'event_espresso'),'<a href="http://eventespresso.com/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=espresso_about_tab&amp;utm_content=EE4+Decaf" rel="nofollow">','</a>'); ?></p>
+	<p><?php echo sprintf(esc_html__('Event Espresso is a %sWordPress event manager%s which makes it easy for you to register attendees for classes, workshops, events, trainings, conferences or concerts, all from your WordPress website. Event Espresso events are created from the WordPress admin area. You can create signup forms to collect information about your attendees, accept payments, and create reports. The lite version of the plugin provides everything that you need to manage your event using WordPress.', 'event_espresso'), '<a href="http://eventespresso.com/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=espresso_about_tab&amp;utm_content=EE4+Decaf" rel="nofollow">', '</a>'); ?></p>
 	<div class="feature-section col three-col about-updates">
 		<div class="col-1">
 			<img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/publish_meta_box.jpg">
@@ -60,11 +60,11 @@  discard block
 block discarded – undo
 	<h2 class="about-headline-callout"><?php esc_html_e('People Like You Manage Event Registration with WordPress', 'event_espresso'); ?></h2>
 	<div class="feature-section col two-col">
 		<div class="grid_6">
-			<p><?php echo sprintf( esc_html__('Trusted by thousands, Event Espresso is the best WordPress event online registration and ticketing manager plugin–and the best supported with full-time support. Turn your existing blog or website into a %sfully-featured event management website%s and a new way to make money. With Event Espresso you get it all; everything from custom registration forms and emails, seating limits, multiple price options, and discount codes to printable tickets.', 'event_espresso'),'<strong>','</strong>'); ?></p>
+			<p><?php echo sprintf(esc_html__('Trusted by thousands, Event Espresso is the best WordPress event online registration and ticketing manager plugin–and the best supported with full-time support. Turn your existing blog or website into a %sfully-featured event management website%s and a new way to make money. With Event Espresso you get it all; everything from custom registration forms and emails, seating limits, multiple price options, and discount codes to printable tickets.', 'event_espresso'), '<strong>', '</strong>'); ?></p>
 			<p><?php esc_html_e('Event Espresso works perfectly for classes, workshops, fundraisers, sporting, trainings, conferences, networking, religion, social, non-profit, and nearly any other type of event.', 'event_espresso'); ?></p>
 		</div>
 			<div class="grid_6">
-			<p><?php echo sprintf( esc_html__('Our online event registration software can %smake your organization more profitable and efficient%s by helping you save money on registration and ticketing fees, reduce the countless hours of time you spend manually processing registrations, create a “green” and paperless event registration process and you will be open for business to accept registrations and payment 24/7.', 'event_espresso'),'<strong>','</strong>'); ?></p>
+			<p><?php echo sprintf(esc_html__('Our online event registration software can %smake your organization more profitable and efficient%s by helping you save money on registration and ticketing fees, reduce the countless hours of time you spend manually processing registrations, create a “green” and paperless event registration process and you will be open for business to accept registrations and payment 24/7.', 'event_espresso'), '<strong>', '</strong>'); ?></p>
 			<p><?php esc_html_e('If you\'re doing event registration and ticketing any other way, then you’re wasting time and money. We offer packages and prices to fit any budget, so get started with your online event registration and ticketing management system today.', 'event_espresso'); ?></p>
 		</div>
 	</div>
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
 			<h3><?php esc_html_e('Turn your blog into a complete event registration and management system', 'event_espresso'); ?></h3>
 			<p><?php esc_html_e('Create a beautiful event page with ticket selection, venue details, and an integrated single page checkout system. With WordPress, Event Espresso, and Espresso Arabica 2014 (based on the "Twenty Fourteen" theme by WordPress), your events will certainly sell out faster than ever!', 'event_espresso'); ?></p>
 			<p><?php esc_html_e('With a striking design that does not compromise the simplicity of WordPress and Event Espresso 4, Espresso Arabica 2014 will be the best event theme on the market.', 'event_espresso'); ?></p>
-			<p><?php echo sprintf( esc_html__('%sLearn more >>%s', 'event_espresso'), '<a href="http://eventespresso.com/wiki/setup-event-espresso-arabica-theme/">', '</a>' ); ?></p>
+			<p><?php echo sprintf(esc_html__('%sLearn more >>%s', 'event_espresso'), '<a href="http://eventespresso.com/wiki/setup-event-espresso-arabica-theme/">', '</a>'); ?></p>
 		</div>
 		<div><img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/single-event-page.jpg"></div>
 	</div>

Please login to merge, or discard this patch.

admin_pages/about/templates/reviews.template.php 1 patch

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

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
-<h2 style="text-align: left;"><?php esc_html_e( 'Who uses Event Espresso?', 'event_espresso'); ?></h2>
-<p><?php echo sprintf( esc_html__('Event Espresso is used by over 40,000 event organizers across the world. They host %sconferences%s, %sart classes%s, training courses, concerts, fundraisers, workshops, %sfilm festivals%s, %spaint and wine%s, and more.', 'event_espresso'), '<a href="https://eventespresso.com/use-cases/conferences/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=Decaf+vs+Regular">', '</a>', '<a href="https://eventespresso.com/use-cases/art-classes/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=Decaf+vs+Regular">', '</a>','<a href="https://eventespresso.com/use-cases/film-festival-ticketing-software/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=Decaf+vs+Regular">','</a>','<a href="https://eventespresso.com/use-cases/paint-wine-party-ticketing-software/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=Decaf+vs+Regular">','</a>');?></p>
+<h2 style="text-align: left;"><?php esc_html_e('Who uses Event Espresso?', 'event_espresso'); ?></h2>
+<p><?php echo sprintf(esc_html__('Event Espresso is used by over 40,000 event organizers across the world. They host %sconferences%s, %sart classes%s, training courses, concerts, fundraisers, workshops, %sfilm festivals%s, %spaint and wine%s, and more.', 'event_espresso'), '<a href="https://eventespresso.com/use-cases/conferences/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=Decaf+vs+Regular">', '</a>', '<a href="https://eventespresso.com/use-cases/art-classes/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=Decaf+vs+Regular">', '</a>', '<a href="https://eventespresso.com/use-cases/film-festival-ticketing-software/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=Decaf+vs+Regular">', '</a>', '<a href="https://eventespresso.com/use-cases/paint-wine-party-ticketing-software/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=Decaf+vs+Regular">', '</a>'); ?></p>
 
 <div class="changelog">
 	<h2 class="about-headline-callout"><?php _e('Rave Reviews About Event Espresso 4', 'event_espresso'); ?></h2>
@@ -61,9 +61,9 @@  discard block
 block discarded – undo
 		
 	</div>
 	<?php
-		if ( !defined('EE_CAF_URL') ) {
+		if ( ! defined('EE_CAF_URL')) {
 			?>
-			<div align="right"><a href="https://eventespresso.com/pricing/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=reviews+tab" target="_blank" class="button button-primary button-hero"><span class="dashicons dashicons-cart"></span><?php esc_html_e( 'Upgrade Now!', 'event_espresso' ) ?></a></div>
+			<div align="right"><a href="https://eventespresso.com/pricing/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=reviews+tab" target="_blank" class="button button-primary button-hero"><span class="dashicons dashicons-cart"></span><?php esc_html_e('Upgrade Now!', 'event_espresso') ?></a></div>
 			<?php
 		}
 	?>
@@ -124,9 +124,9 @@  discard block
 block discarded – undo
 		
 	</div>
 	<?php
-		if ( !defined('EE_CAF_URL') ) {
+		if ( ! defined('EE_CAF_URL')) {
 			?>
-			<div align="right"><a href="https://eventespresso.com/pricing/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=reviews+tab" target="_blank" class="button button-primary button-hero"><span class="dashicons dashicons-cart"></span><?php esc_html_e( 'Upgrade Now!', 'event_espresso' ) ?></a></div>
+			<div align="right"><a href="https://eventespresso.com/pricing/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=reviews+tab" target="_blank" class="button button-primary button-hero"><span class="dashicons dashicons-cart"></span><?php esc_html_e('Upgrade Now!', 'event_espresso') ?></a></div>
 			<?php
 		}
 	?>
@@ -179,9 +179,9 @@  discard block
 block discarded – undo
 		</div>
 	</div>
 	<?php
-		if ( !defined('EE_CAF_URL') ) {
+		if ( ! defined('EE_CAF_URL')) {
 			?>
-			<div align="right"><a href="https://eventespresso.com/pricing/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=reviews+tab" target="_blank" class="button button-primary button-hero"><span class="dashicons dashicons-cart"></span><?php esc_html_e( 'Upgrade Now!', 'event_espresso' ) ?></a></div>
+			<div align="right"><a href="https://eventespresso.com/pricing/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=reviews+tab" target="_blank" class="button button-primary button-hero"><span class="dashicons dashicons-cart"></span><?php esc_html_e('Upgrade Now!', 'event_espresso') ?></a></div>
 			<?php
 		}
 	?>

Please login to merge, or discard this patch.

admin_pages/about/templates/ee4-overview.template.php 1 patch

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

@@ -1,10 +1,10 @@  discard block
 block discarded – undo
 <div class="changelog">
 	<?php
 	//maintenance mode on?
-	if ( EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance ) {
+	if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
 		?>
 		<div class="ee-attention">
-			<h2 class="ee-maintenance-mode-callout"><?php  esc_html_e('Event Espresso is in full maintenance mode.' , 'event_espresso'); ?></h2>
+			<h2 class="ee-maintenance-mode-callout"><?php  esc_html_e('Event Espresso is in full maintenance mode.', 'event_espresso'); ?></h2>
 			<p>
 				<?php
 				printf(
@@ -20,9 +20,9 @@  discard block
 block discarded – undo
 	?>
 
 	<h2 class="about-headline-callout"><?php esc_html_e('Welcome to the Decaf (free) Version of Event Espresso 4!', 'event_espresso'); ?></h2>
-	<p><?php echo sprintf( esc_html__('Manage your events from your WordPress dashboard. Reduce your admin, reduce your costs, make your life easier! This is the Decaf version of Event Espresso, but we also have a premium version called %sEvent Espreso 4 Regular%s and a hosted version called %sEvent Smart%s (SaaS).', 'event_espresso'),'<a href="?page=espresso_about&action=decafvpro">','</a>','<a href="https://eventsmart.com//?utm_source=ee4_decaf&amp;utm_medium=link&amp;utm_campaign=espresso_about_tab&amp;utm_content=EE4+Decaf">','</a>'); ?></p>
+	<p><?php echo sprintf(esc_html__('Manage your events from your WordPress dashboard. Reduce your admin, reduce your costs, make your life easier! This is the Decaf version of Event Espresso, but we also have a premium version called %sEvent Espreso 4 Regular%s and a hosted version called %sEvent Smart%s (SaaS).', 'event_espresso'), '<a href="?page=espresso_about&action=decafvpro">', '</a>', '<a href="https://eventsmart.com//?utm_source=ee4_decaf&amp;utm_medium=link&amp;utm_campaign=espresso_about_tab&amp;utm_content=EE4+Decaf">', '</a>'); ?></p>
 	<h2><?php esc_html_e('Powering 40,000+ event websites; $100 million in ticket sales per year!', 'event_espresso'); ?></h2>
-	<p><?php echo sprintf( esc_html__('Event Espresso is a %sWordPress event manager%s which makes it easy for you to register attendees for classes, workshops, events, trainings, conferences or concerts, all from your WordPress website. Event Espresso events are created from the WordPress admin area. You can create signup forms to collect information about your attendees, accept payments, and create reports. The Decaf (free) version of the plugin provides everything that you need to manage your event using WordPress.', 'event_espresso'),'<a href="http://eventespresso.com/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=plugin_description_tab&amp;utm_content=EE4+Decaf">','</a>'); ?></p>
+	<p><?php echo sprintf(esc_html__('Event Espresso is a %sWordPress event manager%s which makes it easy for you to register attendees for classes, workshops, events, trainings, conferences or concerts, all from your WordPress website. Event Espresso events are created from the WordPress admin area. You can create signup forms to collect information about your attendees, accept payments, and create reports. The Decaf (free) version of the plugin provides everything that you need to manage your event using WordPress.', 'event_espresso'), '<a href="http://eventespresso.com/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=plugin_description_tab&amp;utm_content=EE4+Decaf">', '</a>'); ?></p>
 	<div class="feature-section col three-col about-updates">
 		<div class="col-1">
 			<img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/publish_meta_box.jpg">
@@ -80,11 +80,11 @@  discard block
 block discarded – undo
 	<h2 class="about-headline-callout"><?php esc_html_e('People Like You Manage Event Registration with WordPress', 'event_espresso'); ?></h2>
 	<div class="feature-section col two-col">
 		<div class="grid_6">
-			<p><?php echo sprintf( esc_html__('Trusted by thousands, Event Espresso is the best WordPress event online registration and ticketing manager plugin–and the best supported with full-time support. Turn your existing blog or website into a %sfully-featured event management website%s and a new way to make money. With Event Espresso you get it all; everything from custom registration forms and emails, seating limits, multiple price options, and discount codes to printable tickets.', 'event_espresso'),'<strong>','</strong>'); ?></p>
+			<p><?php echo sprintf(esc_html__('Trusted by thousands, Event Espresso is the best WordPress event online registration and ticketing manager plugin–and the best supported with full-time support. Turn your existing blog or website into a %sfully-featured event management website%s and a new way to make money. With Event Espresso you get it all; everything from custom registration forms and emails, seating limits, multiple price options, and discount codes to printable tickets.', 'event_espresso'), '<strong>', '</strong>'); ?></p>
 			<p><?php esc_html_e('Event Espresso works perfectly for classes, workshops, fundraisers, sporting, trainings, conferences, networking, religion, social, non-profit, and nearly any other type of event.', 'event_espresso'); ?></p>
 		</div>
 			<div class="grid_6">
-			<p><?php echo sprintf( esc_html__('Our online event registration software can %smake your organization more profitable and efficient%s by helping you save money on registration and ticketing fees, reduce the countless hours of time you spend manually processing registrations, create a “green” and paperless event registration process and you will be open for business to accept registrations and payment 24/7.', 'event_espresso'),'<strong>','</strong>'); ?></p>
+			<p><?php echo sprintf(esc_html__('Our online event registration software can %smake your organization more profitable and efficient%s by helping you save money on registration and ticketing fees, reduce the countless hours of time you spend manually processing registrations, create a “green” and paperless event registration process and you will be open for business to accept registrations and payment 24/7.', 'event_espresso'), '<strong>', '</strong>'); ?></p>
 			<p><?php esc_html_e('If you\'re doing event registration and ticketing any other way, then you’re wasting time and money. We offer packages and prices to fit any budget, so get started with your online event registration and ticketing management system today.', 'event_espresso'); ?></p>
 		</div>
 	</div>
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
 			<h3><?php esc_html_e('Turn your blog into a complete event registration and management system', 'event_espresso'); ?></h3>
 			<p><?php esc_html_e('Create a beautiful event page with ticket selection, venue details, and an integrated single page checkout system. With WordPress, Event Espresso, and Espresso Arabica 2014 (based on the "Twenty Fourteen" theme by WordPress), your events will certainly sell out faster than ever!', 'event_espresso'); ?></p>
 			<p><?php esc_html_e('With a striking design that does not compromise the simplicity of WordPress and Event Espresso 4, Espresso Arabica 2014 will be the best event theme on the market.', 'event_espresso'); ?></p>
-			<p><?php echo sprintf( esc_html__('%sLearn more >>%s', 'event_espresso'), '<a href="http://eventespresso.com/wiki/setup-event-espresso-arabica-theme/">', '</a>' ); ?></p>
+			<p><?php echo sprintf(esc_html__('%sLearn more >>%s', 'event_espresso'), '<a href="http://eventespresso.com/wiki/setup-event-espresso-arabica-theme/">', '</a>'); ?></p>
 		</div>
 		<div><img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/single-event-page.jpg"></div>
 	</div>

Please login to merge, or discard this patch.

admin_pages/about/templates/decafvpro.template.php 1 patch

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

@@ -1,4 +1,4 @@  discard block
 block discarded – undo
-<p><?php echo sprintf( esc_html__('We offer a free version of Event Espresso 4 called Decaf which is a good fit for basic events. Need more features like custom registration forms and advanced email notifications? %sUpgrade to Event Espresso 4 (Regular)%s.', 'event_espresso'),'<a href="https://eventespresso.com/pricing/?ee_ver=ee4&utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=Decaf+vs+Regular">','</a>');?><br>
+<p><?php echo sprintf(esc_html__('We offer a free version of Event Espresso 4 called Decaf which is a good fit for basic events. Need more features like custom registration forms and advanced email notifications? %sUpgrade to Event Espresso 4 (Regular)%s.', 'event_espresso'), '<a href="https://eventespresso.com/pricing/?ee_ver=ee4&utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=Decaf+vs+Regular">', '</a>'); ?><br>
 
 <?php
 
@@ -8,43 +8,43 @@  discard block
 block discarded – undo
 
 $features = array(
 	'pricing-options' => array(
-		'label'   	=> esc_html__( 'Handle multiple dates and pricing options', 'event_espresso' ),
+		'label'   	=> esc_html__('Handle multiple dates and pricing options', 'event_espresso'),
 		'decaf'     	=> '<span class="dashicons dashicons-no-alt"></span>',
 		'regular'	=> '<span class="dashicons dashicons-yes"></span></i>',
 		'class'		=> 'alternate'
 	),
 	'custom-registration' => array(
-		'label'  	=> esc_html__( 'Create custom registration forms', 'event_espresso' ),
+		'label'  	=> esc_html__('Create custom registration forms', 'event_espresso'),
 		'decaf'     	=> '<span class="dashicons dashicons-no-alt"></span>',
 		'regular' 	=> '<span class="dashicons dashicons-yes"></span></i>',
 		'class'		=> 'none'
 	),
 	'advanced-notifications' => array(
-		'label'       => esc_html__( 'Customize advanced email notifications', 'event_espresso' ),
+		'label'       => esc_html__('Customize advanced email notifications', 'event_espresso'),
 		'decaf'     => '<span class="dashicons dashicons-no-alt"></span>',
 		'regular' => '<span class="dashicons dashicons-yes"></span></i>',
 		'class'		=> 'alternate'
 	),
 	'manage-taxes'    => array(
-		'label'       => esc_html__( 'Manage taxes', 'event_espresso' ),
+		'label'       => esc_html__('Manage taxes', 'event_espresso'),
 		'decaf'     => '<span class="dashicons dashicons-no-alt"></span>',
 		'regular' => '<span class="dashicons dashicons-yes"></span></i>',
 		'class'		=> 'none'
 	),
 	'typography'       => array(
-		'label'       => esc_html__( 'Additional payment methods available', 'event_espresso' ),
+		'label'       => esc_html__('Additional payment methods available', 'event_espresso'),
 		'decaf'     => '<span class="dashicons dashicons-no-alt"></span>',
 		'regular' => '<span class="dashicons dashicons-yes"></span></i>',
 		'class'		=> 'alternate'
 	),
 	'add-on-compatibility' => array(
-		'label'       => esc_html__( 'Compatibility with add-ons', 'event_espresso' ),
+		'label'       => esc_html__('Compatibility with add-ons', 'event_espresso'),
 		'decaf'     => '<span class="dashicons dashicons-no-alt"></span>',
 		'regular' => '<span class="dashicons dashicons-yes"></span></i>',
 		'class'		=> 'none'
 	),
 	'best-support' => array(
-		'label'       => esc_html__( 'Best in class support', 'event_espresso' ),
+		'label'       => esc_html__('Best in class support', 'event_espresso'),
 		'decaf'     => '<span class="dashicons dashicons-no-alt"></span>',
 		'regular' => '<span class="dashicons dashicons-yes"></span></i>',
 		'class'		=> 'alternate'
@@ -56,12 +56,12 @@  discard block
 block discarded – undo
         <thead>
         <tr>
             <th></th>
-            <th><?php esc_html_e( 'Decaf', 'event_espresso' ) ?></th>
-            <th><?php esc_html_e( 'Regular', 'event_espresso' ) ?></th>
+            <th><?php esc_html_e('Decaf', 'event_espresso') ?></th>
+            <th><?php esc_html_e('Regular', 'event_espresso') ?></th>
         </tr>
         </thead>
         <tbody>
-		<?php foreach ( $features as $feature ): ?>
+		<?php foreach ($features as $feature): ?>
             <tr class="<?php echo $feature['class']; ?>">
                 <td class="feature">
                     <h3>
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
 		<?php endforeach; ?>
         <tr>
             <td></td>
-            <td colspan="2" class="text-right"><a href="https://eventespresso.com/pricing/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=Decaf+vs+Regular" target="_blank" class="button button-primary button-hero"><span class="dashicons dashicons-cart"></span><?php esc_html_e( 'Upgrade Now!', 'event_espresso' ) ?></a></td>
+            <td colspan="2" class="text-right"><a href="https://eventespresso.com/pricing/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=Decaf+vs+Regular" target="_blank" class="button button-primary button-hero"><span class="dashicons dashicons-cart"></span><?php esc_html_e('Upgrade Now!', 'event_espresso') ?></a></td>
         </tr>
         </tbody>
     </table>

Please login to merge, or discard this patch.

admin_pages/about/About_Admin_Page.core.php 1 patch

Spacing +30 added lines, -30 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');
 
 /**
@@ -139,11 +139,11 @@  discard block
 block discarded – undo
 		//Copied from _whats_new()
 		$steps = EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ? $this->_get_started_steps() : FALSE;
 		$steps = $steps !== FALSE ? $steps : '';
-		$this->_admin_page_title = sprintf( esc_html__('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION );
+		$this->_admin_page_title = sprintf(esc_html__('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION);
 		$settings_message = $steps;
-		$this->_template_args['admin_page_subtitle'] = esc_html__('Thank you for choosing Event Espresso, the most powerful, and free, Event Management plugin for WordPress.', 'event_espresso' ) . $settings_message;
-		$template = EE_ABOUT_TEMPLATE_PATH . 'ee4-overview.template.php';
-		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE );
+		$this->_template_args['admin_page_subtitle'] = esc_html__('Thank you for choosing Event Espresso, the most powerful, and free, Event Management plugin for WordPress.', 'event_espresso').$settings_message;
+		$template = EE_ABOUT_TEMPLATE_PATH.'ee4-overview.template.php';
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template($template, $this->_template_args, TRUE);
 		$this->display_about_admin_page();
 	}
 
@@ -151,36 +151,36 @@  discard block
 block discarded – undo
 
 	protected function _get_started_steps() {
 		$steps = '<h2>'.esc_html__('Getting Started').'</h2>';
-		$step_one = '<p>'.sprintf( esc_html__('%sStep 1%s: Visit your %sOrganization Settings%s and add/update your details.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_general_settings">', '</a>') .'</strong></p>';
-		$step_two = '<p>'.sprintf( esc_html__('%sStep 2%s: Setup your %sPayment Methods%s.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_payment_settings">', '</a>') .'</strong></p>';
-		$step_three = '<p>'.sprintf( esc_html__('%sStep 3%s: Create your %sFirst Event%s.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_events&action=create_new">', '</a>') .'</strong></p>';
+		$step_one = '<p>'.sprintf(esc_html__('%sStep 1%s: Visit your %sOrganization Settings%s and add/update your details.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_general_settings">', '</a>').'</strong></p>';
+		$step_two = '<p>'.sprintf(esc_html__('%sStep 2%s: Setup your %sPayment Methods%s.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_payment_settings">', '</a>').'</strong></p>';
+		$step_three = '<p>'.sprintf(esc_html__('%sStep 3%s: Create your %sFirst Event%s.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_events&action=create_new">', '</a>').'</strong></p>';
 
 		//done?
 		$done_step_one = EE_Registry::instance()->CFG->organization->address_1 == '123 Onna Road' ? FALSE : TRUE;
-		$active_invoice_pm = EEM_Payment_Method::instance()->get_one_active( EEM_Payment_Method::scope_cart, array( array( 'PMD_type' => 'Invoice' ) ) );
-		$active_pms_count = EEM_Payment_Method::instance()->count_active( EEM_Payment_Method::scope_cart );
+		$active_invoice_pm = EEM_Payment_Method::instance()->get_one_active(EEM_Payment_Method::scope_cart, array(array('PMD_type' => 'Invoice')));
+		$active_pms_count = EEM_Payment_Method::instance()->count_active(EEM_Payment_Method::scope_cart);
 		//done step two if a non-invoice paymetn method is active; or there is more than one PM active, or
 		//if only the invoice is active but it's clearly been updated
-		$done_step_two = $active_pms_count > 1  ||
-						 ( $active_pms_count === 1 && ! $active_invoice_pm )	||
-						 ( $active_invoice_pm instanceof EE_Payment_Method && (
-								 $active_invoice_pm->get_extra_meta( 'pdf_payee_name', TRUE, '' ) ||
-								 $active_invoice_pm->get_extra_meta( 'pdf_payee_email', TRUE, '' ) ||
-								 $active_invoice_pm->get_extra_meta( 'pdf_payee_tax_number', TRUE, '' ) ||
-								 $active_invoice_pm->get_extra_meta( 'pdf_payee_address', TRUE, '' ) ||
-								 $active_invoice_pm->get_extra_meta( 'page_extra_info', TRUE, '' )
+		$done_step_two = $active_pms_count > 1 ||
+						 ($active_pms_count === 1 && ! $active_invoice_pm) ||
+						 ($active_invoice_pm instanceof EE_Payment_Method && (
+								 $active_invoice_pm->get_extra_meta('pdf_payee_name', TRUE, '') ||
+								 $active_invoice_pm->get_extra_meta('pdf_payee_email', TRUE, '') ||
+								 $active_invoice_pm->get_extra_meta('pdf_payee_tax_number', TRUE, '') ||
+								 $active_invoice_pm->get_extra_meta('pdf_payee_address', TRUE, '') ||
+								 $active_invoice_pm->get_extra_meta('page_extra_info', TRUE, '')
 								)
 				);
 		$done_step_three = EE_Registry::instance()->load_model('Event')->count() > 0 ? TRUE : FALSE;
 
 		//if ALL steps are done, let's just return FALSE so we don't display anything
-		if ( $done_step_one && $done_step_two && $done_step_three )
+		if ($done_step_one && $done_step_two && $done_step_three)
 			return FALSE;
 
 		//now let's put it together
-		$steps .= sprintf( '%s' . $step_one . '%s', $done_step_one ? '<strike>' : '', $done_step_one ? '</strike>': '' );
-		$steps .= sprintf( '%s' . $step_two . '%s', $done_step_two ? '<strike>' : '', $done_step_two ? '</strike>': '' );
-		$steps .= sprintf( '%s' . $step_three . '%s', $done_step_three ? '<strike>' : '', $done_step_three ? '</strike>': '' );
+		$steps .= sprintf('%s'.$step_one.'%s', $done_step_one ? '<strike>' : '', $done_step_one ? '</strike>' : '');
+		$steps .= sprintf('%s'.$step_two.'%s', $done_step_two ? '<strike>' : '', $done_step_two ? '</strike>' : '');
+		$steps .= sprintf('%s'.$step_three.'%s', $done_step_three ? '<strike>' : '', $done_step_three ? '</strike>' : '');
 
 		return $steps;
 	}
@@ -188,27 +188,27 @@  discard block
 block discarded – undo
 
 
 	protected function _credits() {
-		$this->_template_args['admin_page_title'] = sprintf( __('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION );
+		$this->_template_args['admin_page_title'] = sprintf(__('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION);
 		$this->_template_args['admin_page_subtitle'] = __('Thank you for choosing Event Espresso Decaf, the most powerful, and free, Event Management plugin for WordPress.', 'event_espresso');
-		$template = EE_ABOUT_TEMPLATE_PATH . 'credits.template.php';
-		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE );
+		$template = EE_ABOUT_TEMPLATE_PATH.'credits.template.php';
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template($template, $this->_template_args, TRUE);
 		$this->display_about_admin_page();
 	}
 
 	
 	protected function _decafvpro() {
-		$this->_template_args['admin_page_title'] = sprintf( __('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION );
+		$this->_template_args['admin_page_title'] = sprintf(__('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION);
 		$this->_template_args['admin_page_subtitle'] = sprintf(__('Event Espresso lets you focus on doing %swhat you love%s — %sorganizing your events%s', 'event_espresso'), '<em>', '</em>', '<strong>', '</strong>');
-		$template = EE_ABOUT_TEMPLATE_PATH . 'decafvpro.template.php';
-		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE );
+		$template = EE_ABOUT_TEMPLATE_PATH.'decafvpro.template.php';
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template($template, $this->_template_args, TRUE);
 		$this->display_about_admin_page();
 	}
 
 	protected function _reviews() {
 		$this->_template_args['admin_page_title'] = __('Rave Reviews About Event Espresso 4', 'event_espresso');
 		$this->_template_args['admin_page_subtitle'] = __('At Event Espresso, customer satisfaction is our ultimate goal.', 'event_espresso');
-		$template = EE_ABOUT_TEMPLATE_PATH . 'reviews.template.php';
-		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE );
+		$template = EE_ABOUT_TEMPLATE_PATH.'reviews.template.php';
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template($template, $this->_template_args, TRUE);
 		$this->display_about_admin_page();
 	}
 

Please login to merge, or discard this patch.

		@@ -1,5 +1,5 @@ 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	/**
		@@ -139,11 +139,11 @@ discard block
		block discarded – undo
139	139	//Copied from _whats_new()
140	140	$steps = EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ? $this->_get_started_steps() : FALSE;
141	141	$steps = $steps !== FALSE ? $steps : '';
142		- $this->_admin_page_title = sprintf( esc_html__('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION );
	142	+ $this->_admin_page_title = sprintf(esc_html__('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION);
143	143	$settings_message = $steps;
144		- $this->_template_args['admin_page_subtitle'] = esc_html__('Thank you for choosing Event Espresso, the most powerful, and free, Event Management plugin for WordPress.', 'event_espresso' ) . $settings_message;
145		- $template = EE_ABOUT_TEMPLATE_PATH . 'ee4-overview.template.php';
146		- $this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE );
	144	+ $this->_template_args['admin_page_subtitle'] = esc_html__('Thank you for choosing Event Espresso, the most powerful, and free, Event Management plugin for WordPress.', 'event_espresso').$settings_message;
	145	+ $template = EE_ABOUT_TEMPLATE_PATH.'ee4-overview.template.php';
	146	+ $this->_template_args['about_admin_page_content'] = EEH_Template::display_template($template, $this->_template_args, TRUE);
147	147	$this->display_about_admin_page();
148	148	}
149	149
		@@ -151,36 +151,36 @@ discard block
		block discarded – undo
151	151
152	152	protected function _get_started_steps() {
153	153	$steps = '<h2>'.esc_html__('Getting Started').'</h2>';
154		- $step_one = '<p>'.sprintf( esc_html__('%sStep 1%s: Visit your %sOrganization Settings%s and add/update your details.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_general_settings">', '</a>') .'</strong></p>';
155		- $step_two = '<p>'.sprintf( esc_html__('%sStep 2%s: Setup your %sPayment Methods%s.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_payment_settings">', '</a>') .'</strong></p>';
156		- $step_three = '<p>'.sprintf( esc_html__('%sStep 3%s: Create your %sFirst Event%s.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_events&action=create_new">', '</a>') .'</strong></p>';
	154	+ $step_one = '<p>'.sprintf(esc_html__('%sStep 1%s: Visit your %sOrganization Settings%s and add/update your details.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_general_settings">', '</a>').'</strong></p>';
	155	+ $step_two = '<p>'.sprintf(esc_html__('%sStep 2%s: Setup your %sPayment Methods%s.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_payment_settings">', '</a>').'</strong></p>';
	156	+ $step_three = '<p>'.sprintf(esc_html__('%sStep 3%s: Create your %sFirst Event%s.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_events&action=create_new">', '</a>').'</strong></p>';
157	157
158	158	//done?
159	159	$done_step_one = EE_Registry::instance()->CFG->organization->address_1 == '123 Onna Road' ? FALSE : TRUE;
160		- $active_invoice_pm = EEM_Payment_Method::instance()->get_one_active( EEM_Payment_Method::scope_cart, array( array( 'PMD_type' => 'Invoice' ) ) );
161		- $active_pms_count = EEM_Payment_Method::instance()->count_active( EEM_Payment_Method::scope_cart );
	160	+ $active_invoice_pm = EEM_Payment_Method::instance()->get_one_active(EEM_Payment_Method::scope_cart, array(array('PMD_type' => 'Invoice')));
	161	+ $active_pms_count = EEM_Payment_Method::instance()->count_active(EEM_Payment_Method::scope_cart);
162	162	//done step two if a non-invoice paymetn method is active; or there is more than one PM active, or
163	163	//if only the invoice is active but it's clearly been updated
164		- $done_step_two = $active_pms_count > 1 \|\|
165		- ( $active_pms_count === 1 && ! $active_invoice_pm ) \|\|
166		- ( $active_invoice_pm instanceof EE_Payment_Method && (
167		- $active_invoice_pm->get_extra_meta( 'pdf_payee_name', TRUE, '' ) \|\|
168		- $active_invoice_pm->get_extra_meta( 'pdf_payee_email', TRUE, '' ) \|\|
169		- $active_invoice_pm->get_extra_meta( 'pdf_payee_tax_number', TRUE, '' ) \|\|
170		- $active_invoice_pm->get_extra_meta( 'pdf_payee_address', TRUE, '' ) \|\|
171		- $active_invoice_pm->get_extra_meta( 'page_extra_info', TRUE, '' )
	164	+ $done_step_two = $active_pms_count > 1 \|\|
	165	+ ($active_pms_count === 1 && ! $active_invoice_pm) \|\|
	166	+ ($active_invoice_pm instanceof EE_Payment_Method && (
	167	+ $active_invoice_pm->get_extra_meta('pdf_payee_name', TRUE, '') \|\|
	168	+ $active_invoice_pm->get_extra_meta('pdf_payee_email', TRUE, '') \|\|
	169	+ $active_invoice_pm->get_extra_meta('pdf_payee_tax_number', TRUE, '') \|\|
	170	+ $active_invoice_pm->get_extra_meta('pdf_payee_address', TRUE, '') \|\|
	171	+ $active_invoice_pm->get_extra_meta('page_extra_info', TRUE, '')
172	172	)
173	173	);
174	174	$done_step_three = EE_Registry::instance()->load_model('Event')->count() > 0 ? TRUE : FALSE;
175	175
176	176	//if ALL steps are done, let's just return FALSE so we don't display anything
177		- if ( $done_step_one && $done_step_two && $done_step_three )
	177	+ if ($done_step_one && $done_step_two && $done_step_three)
178	178	return FALSE;
179	179
180	180	//now let's put it together
181		- $steps .= sprintf( '%s' . $step_one . '%s', $done_step_one ? '<strike>' : '', $done_step_one ? '</strike>': '' );
182		- $steps .= sprintf( '%s' . $step_two . '%s', $done_step_two ? '<strike>' : '', $done_step_two ? '</strike>': '' );
183		- $steps .= sprintf( '%s' . $step_three . '%s', $done_step_three ? '<strike>' : '', $done_step_three ? '</strike>': '' );
	181	+ $steps .= sprintf('%s'.$step_one.'%s', $done_step_one ? '<strike>' : '', $done_step_one ? '</strike>' : '');
	182	+ $steps .= sprintf('%s'.$step_two.'%s', $done_step_two ? '<strike>' : '', $done_step_two ? '</strike>' : '');
	183	+ $steps .= sprintf('%s'.$step_three.'%s', $done_step_three ? '<strike>' : '', $done_step_three ? '</strike>' : '');
184	184
185	185	return $steps;
186	186	}
		@@ -188,27 +188,27 @@ discard block
		block discarded – undo
188	188
189	189
190	190	protected function _credits() {
191		- $this->_template_args['admin_page_title'] = sprintf( __('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION );
	191	+ $this->_template_args['admin_page_title'] = sprintf(__('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION);
192	192	$this->_template_args['admin_page_subtitle'] = __('Thank you for choosing Event Espresso Decaf, the most powerful, and free, Event Management plugin for WordPress.', 'event_espresso');
193		- $template = EE_ABOUT_TEMPLATE_PATH . 'credits.template.php';
194		- $this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE );
	193	+ $template = EE_ABOUT_TEMPLATE_PATH.'credits.template.php';
	194	+ $this->_template_args['about_admin_page_content'] = EEH_Template::display_template($template, $this->_template_args, TRUE);
195	195	$this->display_about_admin_page();
196	196	}
197	197
198	198
199	199	protected function _decafvpro() {
200		- $this->_template_args['admin_page_title'] = sprintf( __('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION );
	200	+ $this->_template_args['admin_page_title'] = sprintf(__('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION);
201	201	$this->_template_args['admin_page_subtitle'] = sprintf(__('Event Espresso lets you focus on doing %swhat you love%s — %sorganizing your events%s', 'event_espresso'), '<em>', '</em>', '<strong>', '</strong>');
202		- $template = EE_ABOUT_TEMPLATE_PATH . 'decafvpro.template.php';
203		- $this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE );
	202	+ $template = EE_ABOUT_TEMPLATE_PATH.'decafvpro.template.php';
	203	+ $this->_template_args['about_admin_page_content'] = EEH_Template::display_template($template, $this->_template_args, TRUE);
204	204	$this->display_about_admin_page();
205	205	}
206	206
207	207	protected function _reviews() {
208	208	$this->_template_args['admin_page_title'] = __('Rave Reviews About Event Espresso 4', 'event_espresso');
209	209	$this->_template_args['admin_page_subtitle'] = __('At Event Espresso, customer satisfaction is our ultimate goal.', 'event_espresso');
210		- $template = EE_ABOUT_TEMPLATE_PATH . 'reviews.template.php';
211		- $this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE );
	210	+ $template = EE_ABOUT_TEMPLATE_PATH.'reviews.template.php';
	211	+ $this->_template_args['about_admin_page_content'] = EEH_Template::display_template($template, $this->_template_args, TRUE);
212	212	$this->display_about_admin_page();
213	213	}
214	214

		@@ -3,7 +3,7 @@ discard block
		block discarded – undo
3	3	<ul class="wp-people-group" id="ee-people-group-owners">
4	4	<li class="wp-person" id="ee-person-sshoultes">
5	5	<a href="<?php esp_gravatar_profile('[email protected]'); ?>">
6		- <?php echo esp_gravatar_image( '[email protected]', 'Seth Shoultes' ); ?>
	6	+ <?php echo esp_gravatar_image('[email protected]', 'Seth Shoultes'); ?>
7	7	</a>
8	8	<a class="web" href="<?php esp_gravatar_profile('[email protected]'); ?>">
9	9	Seth Shoultes
		@@ -12,7 +12,7 @@ discard block
		block discarded – undo
12	12	</li>
13	13	<li class="wp-person" id="ee-person-gkoyle">
14	14	<a href="<?php esp_gravatar_profile('[email protected]'); ?>">
15		- <?php echo esp_gravatar_image( '[email protected]', 'Garth Koyle' ); ?>
	15	+ <?php echo esp_gravatar_image('[email protected]', 'Garth Koyle'); ?>
16	16	</a>
17	17	<a class="web" href="<?php esp_gravatar_profile('[email protected]'); ?>">
18	18	Garth Koyle
		@@ -24,7 +24,7 @@ discard block
		block discarded – undo
24	24	<ul class="wp-people-group" id="ee-people-group-core-developers">
25	25	<li class="wp-person" id="ee-person-bchristensen">
26	26	<a href="<?php esp_gravatar_profile('[email protected]'); ?>">
27		- <?php echo esp_gravatar_image( '[email protected]', 'Brent Christensen' ); ?>
	27	+ <?php echo esp_gravatar_image('[email protected]', 'Brent Christensen'); ?>
28	28	</a>
29	29	<a class="web" href="<?php esp_gravatar_profile('[email protected]'); ?>">
30	30	Brent Christensen
		@@ -33,7 +33,7 @@ discard block
		block discarded – undo
33	33	</li>
34	34	<li class="wp-person" id="ee-person-dethier">
35	35	<a href="<?php esp_gravatar_profile('[email protected]'); ?>">
36		- <?php echo esp_gravatar_image( '[email protected]', 'Darren Ethier' ); ?>
	36	+ <?php echo esp_gravatar_image('[email protected]', 'Darren Ethier'); ?>
37	37	</a>
38	38	<a class="web" href="<?php esp_gravatar_profile('[email protected]'); ?>">
39	39	Darren Ethier
		@@ -42,7 +42,7 @@ discard block
		block discarded – undo
42	42	</li>
43	43	<li class="wp-person" id="ee-person-mnelson">
44	44	<a href="<?php esp_gravatar_profile('[email protected]'); ?>">
45		- <?php echo esp_gravatar_image( '[email protected]', 'Michael Nelson' ); ?>
	45	+ <?php echo esp_gravatar_image('[email protected]', 'Michael Nelson'); ?>
46	46	</a>
47	47	<a class="web" href="<?php esp_gravatar_profile('[email protected]'); ?>">
48	48	Michael Nelson
		@@ -51,7 +51,7 @@ discard block
		block discarded – undo
51	51	</li>
52	52	<li class="wp-person" id="ee-person-nkolivoshka">
53	53	<a href="<?php esp_gravatar_profile('[email protected]'); ?>">
54		- <?php echo esp_gravatar_image( '[email protected]', 'Nazar Kolivoshka' ); ?>
	54	+ <?php echo esp_gravatar_image('[email protected]', 'Nazar Kolivoshka'); ?>
55	55	</a>
56	56	<a class="web" href="<?php esp_gravatar_profile('[email protected]'); ?>">
57	57	Nazar Kolivoshka
		@@ -63,7 +63,7 @@ discard block
		block discarded – undo
63	63	<ul class="wp-people-group" id="ee-people-group-support-staff">
64	64	<li class="wp-person" id="ee-person-jfeck">
65	65	<a href="<?php esp_gravatar_profile('[email protected]'); ?>">
66		- <?php echo esp_gravatar_image( '[email protected]', 'Josh Feck' ); ?>
	66	+ <?php echo esp_gravatar_image('[email protected]', 'Josh Feck'); ?>
67	67	</a>
68	68	<a class="web" href="<?php esp_gravatar_profile('[email protected]'); ?>">
69	69	Josh Feck
		@@ -71,7 +71,7 @@ discard block
		block discarded – undo
71	71	</li>
72	72	<li class="wp-person" id="ee-person-twarwick">
73	73	<a href="<?php esp_gravatar_profile('[email protected]'); ?>">
74		- <?php echo esp_gravatar_image( '[email protected]', 'Tony Warwick' ); ?>
	74	+ <?php echo esp_gravatar_image('[email protected]', 'Tony Warwick'); ?>
75	75	</a>
76	76	<a class="web" href="<?php esp_gravatar_profile('[email protected]'); ?>">
77	77	Tony Warwick
		@@ -79,7 +79,7 @@ discard block
		block discarded – undo
79	79	</li>
80	80	<li class="wp-person" id="ee-person-lcaum">
81	81	<a href="<?php esp_gravatar_profile('[email protected]'); ?>">
82		- <?php echo esp_gravatar_image( '[email protected]', 'Lorenzo Caum' ); ?>
	82	+ <?php echo esp_gravatar_image('[email protected]', 'Lorenzo Caum'); ?>
83	83	</a>
84	84	<a class="web" href="<?php esp_gravatar_profile('[email protected]'); ?>">
85	85	Lorenzo Caum
		@@ -87,7 +87,7 @@ discard block
		block discarded – undo
87	87	</li>
88	88	<li class="wp-person" id="ee-logan-lenz">
89	89	<a href="<?php esp_gravatar_profile('[email protected]'); ?>">
90		- <?php echo esp_gravatar_image( '[email protected]', 'Logan Lenz' ); ?>
	90	+ <?php echo esp_gravatar_image('[email protected]', 'Logan Lenz'); ?>
91	91	</a>
92	92	<a class="web" href="<?php esp_gravatar_profile('[email protected]'); ?>">
93	93	Logan Lenz
		@@ -97,7 +97,7 @@ discard block
		block discarded – undo
97	97	</ul>
98	98	<h3 class="wp-people-group"><?php _e('Contributor Recognition', 'event_espresso'); ?></h3>
99	99	<p class="description">
100		- <?php printf( __('For every major release we want to recognize the people who contributed to the release via a GitHub pull request. Want to see your name listed here? %sWhen you submit a pull request that gets included in a major release%s, we\'ll add your name here linked to your GitHub profile.', 'event_espresso'), '<a href="https://github.com/eventespresso/event-espresso-core" title="Contribute to Event Espresso by making a pull request via GitHub">', '</a>' ); ?>
	100	+ <?php printf(__('For every major release we want to recognize the people who contributed to the release via a GitHub pull request. Want to see your name listed here? %sWhen you submit a pull request that gets included in a major release%s, we\'ll add your name here linked to your GitHub profile.', 'event_espresso'), '<a href="https://github.com/eventespresso/event-espresso-core" title="Contribute to Event Espresso by making a pull request via GitHub">', '</a>'); ?>
101	101	</p>
102	102	<p class="wp-credits-list">
103	103	<ul>
		@@ -111,7 +111,7 @@ discard block
		block discarded – undo
111	111	</p>
112	112	<h3 class="wp-people-group"><?php _e('External Libraries', 'event_espresso'); ?></h3>
113	113	<p class="description">
114		- <?php printf( __('Along with the libraries %sincluded with WordPress%s, Event Espresso utilizes the following third party libraries:', 'event_espresso'), '<a href="credits.php">', '</a>' ); ?>
	114	+ <?php printf(__('Along with the libraries %sincluded with WordPress%s, Event Espresso utilizes the following third party libraries:', 'event_espresso'), '<a href="credits.php">', '</a>'); ?>
115	115	</p>
116	116	<p class="wp-credits-list">
117	117	<a href="http://josscrowcroft.github.io/accounting.js/"><?php _e('accounting.js', 'event_espresso'); ?></a>,
		@@ -127,10 +127,10 @@ discard block
		block discarded – undo
127	127
128	128	<?php
129	129	function esp_gravatar_profile($email) {
130		- echo 'http://www.gravatar.com/' . md5($email);
	130	+ echo 'http://www.gravatar.com/'.md5($email);
131	131	}
132	132
133	133	function esp_gravatar_image($email, $name) {
134		- echo '<img src="http://0.gravatar.com/avatar/' . md5($email) . '?s=60" class="gravatar" alt="' . $name . '"/>';
	134	+ echo '<img src="http://0.gravatar.com/avatar/'.md5($email).'?s=60" class="gravatar" alt="'.$name.'"/>';
135	135	}
136	136	?>

		@@ -118,40 +118,40 @@
		block discarded – undo
118	118	* @return EE_Template_Config
119	119	*/
120	120	public static function update_template_settings(EE_Template_Config $CFG, $REQ ) {
121		- if(! $CFG->EED_Event_Single instanceof EE_Event_Single_Config){
122		- $CFG->EED_Event_Single = new EE_Event_Single_Config();
123		- }
124		- $display_order_event = $CFG->EED_Event_Single->display_order_event !== null
125		- ? $CFG->EED_Event_Single->display_order_event
126		- : EED_Event_Single::EVENT_DETAILS_PRIORITY;
	121	+ if(! $CFG->EED_Event_Single instanceof EE_Event_Single_Config){
	122	+ $CFG->EED_Event_Single = new EE_Event_Single_Config();
	123	+ }
	124	+ $display_order_event = $CFG->EED_Event_Single->display_order_event !== null
	125	+ ? $CFG->EED_Event_Single->display_order_event
	126	+ : EED_Event_Single::EVENT_DETAILS_PRIORITY;
127	127	$display_order_datetimes = $CFG->EED_Event_Single->display_order_datetimes !== null
128		- ? $CFG->EED_Event_Single->display_order_datetimes
129		- : EED_Event_Single::EVENT_DATETIMES_PRIORITY;
130		- $display_order_tickets = $CFG->EED_Event_Single->display_order_tickets !== null
131		- ? $CFG->EED_Event_Single->display_order_tickets
132		- : EED_Event_Single::EVENT_TICKETS_PRIORITY;
	128	+ ? $CFG->EED_Event_Single->display_order_datetimes
	129	+ : EED_Event_Single::EVENT_DATETIMES_PRIORITY;
	130	+ $display_order_tickets = $CFG->EED_Event_Single->display_order_tickets !== null
	131	+ ? $CFG->EED_Event_Single->display_order_tickets
	132	+ : EED_Event_Single::EVENT_TICKETS_PRIORITY;
133	133	$display_order_venue = $CFG->EED_Event_Single->display_order_venue !== null
134		- ? $CFG->EED_Event_Single->display_order_venue
135		- : EED_Event_Single::EVENT_VENUES_PRIORITY;
	134	+ ? $CFG->EED_Event_Single->display_order_venue
	135	+ : EED_Event_Single::EVENT_VENUES_PRIORITY;
136	136	$CFG->EED_Event_Single = new EE_Event_Single_Config();
137	137	$CFG->EED_Event_Single->display_status_banner_single = ! empty( $REQ['display_status_banner_single'] )
138		- && $REQ['display_status_banner_single'];
	138	+ && $REQ['display_status_banner_single'];
139	139	$CFG->EED_Event_Single->display_venue = ! empty( $REQ['display_venue'] ) && $REQ['display_venue'];
140	140	$CFG->EED_Event_Single->use_sortable_display_order = ! empty( $REQ[ 'EED_Events_Single_use_sortable_display_order' ] )
141		- ? absint( $REQ[ 'EED_Events_Single_use_sortable_display_order' ] )
142		- : 0;
	141	+ ? absint( $REQ[ 'EED_Events_Single_use_sortable_display_order' ] )
	142	+ : 0;
143	143	$CFG->EED_Event_Single->display_order_event = $CFG->EED_Event_Single->use_sortable_display_order
144		- ? $display_order_event
145		- : EED_Event_Single::EVENT_DETAILS_PRIORITY;
	144	+ ? $display_order_event
	145	+ : EED_Event_Single::EVENT_DETAILS_PRIORITY;
146	146	$CFG->EED_Event_Single->display_order_datetimes = $CFG->EED_Event_Single->use_sortable_display_order
147		- ? $display_order_datetimes
148		- : EED_Event_Single::EVENT_DATETIMES_PRIORITY;
	147	+ ? $display_order_datetimes
	148	+ : EED_Event_Single::EVENT_DATETIMES_PRIORITY;
149	149	$CFG->EED_Event_Single->display_order_tickets = $CFG->EED_Event_Single->use_sortable_display_order
150		- ? $display_order_tickets
151		- : EED_Event_Single::EVENT_TICKETS_PRIORITY;
	150	+ ? $display_order_tickets
	151	+ : EED_Event_Single::EVENT_TICKETS_PRIORITY;
152	152	$CFG->EED_Event_Single->display_order_venue = $CFG->EED_Event_Single->use_sortable_display_order
153		- ? $display_order_venue
154		- : EED_Event_Single::EVENT_VENUES_PRIORITY;
	153	+ ? $display_order_venue
	154	+ : EED_Event_Single::EVENT_VENUES_PRIORITY;
155	155	do_action( 'AHEE__EED_Event_Single__update_template_settings__after_update', $CFG, $REQ );
156	156	return $CFG;
157	157	}

		@@ -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
		@@ -117,8 +117,8 @@ discard block
		block discarded – undo
117	117	* @param array $REQ
118	118	* @return EE_Template_Config
119	119	*/
120		- public static function update_template_settings(EE_Template_Config $CFG, $REQ ) {
121		- if(! $CFG->EED_Event_Single instanceof EE_Event_Single_Config){
	120	+ public static function update_template_settings(EE_Template_Config $CFG, $REQ) {
	121	+ if ( ! $CFG->EED_Event_Single instanceof EE_Event_Single_Config) {
122	122	$CFG->EED_Event_Single = new EE_Event_Single_Config();
123	123	}
124	124	$display_order_event = $CFG->EED_Event_Single->display_order_event !== null
		@@ -134,11 +134,11 @@ discard block
		block discarded – undo
134	134	? $CFG->EED_Event_Single->display_order_venue
135	135	: EED_Event_Single::EVENT_VENUES_PRIORITY;
136	136	$CFG->EED_Event_Single = new EE_Event_Single_Config();
137		- $CFG->EED_Event_Single->display_status_banner_single = ! empty( $REQ['display_status_banner_single'] )
	137	+ $CFG->EED_Event_Single->display_status_banner_single = ! empty($REQ['display_status_banner_single'])
138	138	&& $REQ['display_status_banner_single'];
139		- $CFG->EED_Event_Single->display_venue = ! empty( $REQ['display_venue'] ) && $REQ['display_venue'];
140		- $CFG->EED_Event_Single->use_sortable_display_order = ! empty( $REQ[ 'EED_Events_Single_use_sortable_display_order' ] )
141		- ? absint( $REQ[ 'EED_Events_Single_use_sortable_display_order' ] )
	139	+ $CFG->EED_Event_Single->display_venue = ! empty($REQ['display_venue']) && $REQ['display_venue'];
	140	+ $CFG->EED_Event_Single->use_sortable_display_order = ! empty($REQ['EED_Events_Single_use_sortable_display_order'])
	141	+ ? absint($REQ['EED_Events_Single_use_sortable_display_order'])
142	142	: 0;
143	143	$CFG->EED_Event_Single->display_order_event = $CFG->EED_Event_Single->use_sortable_display_order
144	144	? $display_order_event
		@@ -152,7 +152,7 @@ discard block
		block discarded – undo
152	152	$CFG->EED_Event_Single->display_order_venue = $CFG->EED_Event_Single->use_sortable_display_order
153	153	? $display_order_venue
154	154	: EED_Event_Single::EVENT_VENUES_PRIORITY;
155		- do_action( 'AHEE__EED_Event_Single__update_template_settings__after_update', $CFG, $REQ );
	155	+ do_action('AHEE__EED_Event_Single__update_template_settings__after_update', $CFG, $REQ);
156	156	return $CFG;
157	157	}
158	158
		@@ -166,23 +166,23 @@ discard block
		block discarded – undo
166	166	*/
167	167	public static function update_event_single_order() {
168	168	$config_saved = false;
169		- $template_parts = sanitize_text_field( $_POST[ 'elements' ] );
170		- if ( ! empty( $template_parts ) ) {
171		- $template_parts = explode( ',', trim( $template_parts, ',' ) );
172		- foreach ( $template_parts as $key => $template_part ) {
	169	+ $template_parts = sanitize_text_field($_POST['elements']);
	170	+ if ( ! empty($template_parts)) {
	171	+ $template_parts = explode(',', trim($template_parts, ','));
	172	+ foreach ($template_parts as $key => $template_part) {
173	173	$template_part = "display_order_$template_part";
174		- $priority = ( $key * 10 ) + EED_Event_Single::EVENT_DETAILS_PRIORITY;
	174	+ $priority = ($key * 10) + EED_Event_Single::EVENT_DETAILS_PRIORITY;
175	175	EE_Registry::instance()->CFG->template_settings->EED_Event_Single->{$template_part} = $priority;
176		- do_action( "AHEE__EED_Event_Single__update_event_single_order__$template_part", $priority );
	176	+ do_action("AHEE__EED_Event_Single__update_event_single_order__$template_part", $priority);
177	177	}
178		- $config_saved = EE_Registry::instance()->CFG->update_espresso_config( false, false );
	178	+ $config_saved = EE_Registry::instance()->CFG->update_espresso_config(false, false);
179	179	}
180		- if ( $config_saved ) {
181		- EE_Error::add_success( __( 'Display Order has been successfully updated.', 'event_espresso' ) );
	180	+ if ($config_saved) {
	181	+ EE_Error::add_success(__('Display Order has been successfully updated.', 'event_espresso'));
182	182	} else {
183		- EE_Error::add_error( __( 'Display Order was not updated.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
	183	+ EE_Error::add_error(__('Display Order was not updated.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
184	184	}
185		- echo wp_json_encode( EE_Error::get_notices( false ));
	185	+ echo wp_json_encode(EE_Error::get_notices(false));
186	186	exit();
187	187	}
188	188
		@@ -195,7 +195,7 @@ discard block
		block discarded – undo
195	195	* @param WP $WP
196	196	* @return void
197	197	*/
198		- public function run( $WP ) {
	198	+ public function run($WP) {
199	199	}
200	200
201	201

		@@ -95,7 +95,7 @@ discard block
		block discarded – undo
95	95	*/
96	96	protected function __construct()
97	97	{
98		- if (! defined('ESPRESSO_ENCRYPT')) {
	98	+ if ( ! defined('ESPRESSO_ENCRYPT')) {
99	99	define('ESPRESSO_ENCRYPT', true);
100	100	}
101	101	if (extension_loaded('openssl')) {
		@@ -118,7 +118,7 @@ discard block
		block discarded – undo
118	118	public static function instance()
119	119	{
120	120	// check if class object is instantiated
121		- if (! self::$_instance instanceof EE_Encryption) {
	121	+ if ( ! self::$_instance instanceof EE_Encryption) {
122	122	self::$_instance = new self();
123	123	}
124	124	return self::$_instance;
		@@ -314,7 +314,7 @@ discard block
		block discarded – undo
314	314	$iv
315	315	);
316	316	// append the initialization vector
317		- $encrypted_text .= EE_Encryption::OPENSSL_IV_DELIMITER . $iv;
	317	+ $encrypted_text .= EE_Encryption::OPENSSL_IV_DELIMITER.$iv;
318	318	// trim and maybe encode
319	319	return $this->_use_base64_encode
320	320	? trim(base64_encode($encrypted_text))
		@@ -337,7 +337,7 @@ discard block
		block discarded – undo
337	337	*/
338	338	protected function getCipherMethod($cipher_method = EE_Encryption::OPENSSL_CIPHER_METHOD)
339	339	{
340		- if($this->cipher_method !== ''){
	340	+ if ($this->cipher_method !== '') {
341	341	return $this->cipher_method;
342	342	}
343	343	// verify that the default cipher method can produce an initialization vector
		@@ -345,7 +345,7 @@ discard block
		block discarded – undo
345	345	// nope? okay let's get what we found in the past to work
346	346	$cipher_method = get_option(EE_Encryption::OPENSSL_CIPHER_METHOD_OPTION_NAME, '');
347	347	// oops... haven't tested available cipher methods yet
348		- if($cipher_method === '' \|\| openssl_cipher_iv_length($cipher_method) === false) {
	348	+ if ($cipher_method === '' \|\| openssl_cipher_iv_length($cipher_method) === false) {
349	349	$cipher_method = $this->getAvailableCipherMethod($cipher_method);
350	350	}
351	351	}
		@@ -371,7 +371,7 @@ discard block
		block discarded – undo
371	371	// then grab the first item from the list
372	372	$cipher_method = reset($this->cipher_methods);
373	373	}
374		- if($cipher_method === false){
	374	+ if ($cipher_method === false) {
375	375	throw new RuntimeException(
376	376	esc_html__(
377	377	'OpenSSL support appears to be enabled on the server, but no cipher methods are available. Please contact the server administrator.',
		@@ -442,7 +442,7 @@ discard block
		block discarded – undo
442	442	* @return string
443	443	* @throws RuntimeException
444	444	*/
445		- protected function getDigestHashValue($digest_method = EE_Encryption::OPENSSL_DIGEST_METHOD){
	445	+ protected function getDigestHashValue($digest_method = EE_Encryption::OPENSSL_DIGEST_METHOD) {
446	446	$digest_hash_value = openssl_digest($this->get_encryption_key(), $digest_method);
447	447	if ($digest_hash_value === false) {
448	448	return $this->getDigestHashValue($this->getDigestMethod());
		@@ -460,7 +460,7 @@ discard block
		block discarded – undo
460	460	* @return string
461	461	* @throws \RuntimeException
462	462	*/
463		- protected function getDigestMethod(){
	463	+ protected function getDigestMethod() {
464	464	$digest_method = prev($this->digest_methods);
465	465	if (empty($this->digest_methods)) {
466	466	$this->digest_methods = openssl_get_md_methods();
		@@ -534,7 +534,7 @@ discard block
		block discarded – undo
534	534	if (
535	535	$this->_use_mcrypt
536	536	&& strpos($encrypted_text, EE_Encryption::ACME_ENCRYPTION_FLAG) === false
537		- ){
	537	+ ) {
538	538	return $this->m_decrypt($encrypted_text);
539	539	}
540	540	$encrypted_text = substr($encrypted_text, 0, -4);
		@@ -564,16 +564,16 @@ discard block
		block discarded – undo
564	564	protected function valid_base_64($string)
565	565	{
566	566	// ensure data is a string
567		- if (! is_string($string) \|\| ! $this->_use_base64_encode) {
	567	+ if ( ! is_string($string) \|\| ! $this->_use_base64_encode) {
568	568	return false;
569	569	}
570	570	$decoded = base64_decode($string, true);
571	571	// Check if there is no invalid character in string
572		- if (! preg_match('/^[a-zA-Z0-9\/\r\n+]*={0,2}$/', $string)) {
	572	+ if ( ! preg_match('/^[a-zA-Z0-9\/\r\n+]*={0,2}$/', $string)) {
573	573	return false;
574	574	}
575	575	// Decode the string in strict mode and send the response
576		- if (! base64_decode($string, true)) {
	576	+ if ( ! base64_decode($string, true)) {
577	577	return false;
578	578	}
579	579	// Encode and compare it to original one
		@@ -594,7 +594,7 @@ discard block
		block discarded – undo
594	594	$iterations = ceil($length / 40);
595	595	$random_string = '';
596	596	for ($i = 0; $i < $iterations; $i++) {
597		- $random_string .= sha1(microtime(true) . mt_rand(10000, 90000));
	597	+ $random_string .= sha1(microtime(true).mt_rand(10000, 90000));
598	598	}
599	599	$random_string = substr($random_string, 0, $length);
600	600	return $random_string;

		@@ -1,8 +1,8 @@ discard block
		block discarded – undo
1	1	<div class="changelog">
2	2	<h2 class="about-headline-callout"><?php esc_html_e('Welcome to Event Espresso 4!', 'event_espresso'); ?></h2>
3		- <p><?php echo sprintf( esc_html__('Manage your events from your WordPress dashboard. Reduce your admin, reduce your costs, make your life easier! This is the Caffeinated/Regular version of Event Espresso, but we also have a hosted version called %sEvent Smart%s for customers that want to cut back on their hosting and security expenses.', 'event_espresso'),'<a href="https://eventsmart.com//?utm_source=ee4_decaf&utm_medium=link&utm_campaign=espresso_about_tab&utm_content=EE4+Caffeinated">','</a>'); ?></p>
	3	+ <p><?php echo sprintf(esc_html__('Manage your events from your WordPress dashboard. Reduce your admin, reduce your costs, make your life easier! This is the Caffeinated/Regular version of Event Espresso, but we also have a hosted version called %sEvent Smart%s for customers that want to cut back on their hosting and security expenses.', 'event_espresso'), '<a href="https://eventsmart.com//?utm_source=ee4_decaf&utm_medium=link&utm_campaign=espresso_about_tab&utm_content=EE4+Caffeinated">', '</a>'); ?></p>
4	4	<h2><?php esc_html_e('Powering 40,000+ event websites; $100 million in ticket sales per year!', 'event_espresso'); ?></h2>
5		- <p><?php echo sprintf( esc_html__('Event Espresso is a %sWordPress event manager%s which makes it easy for you to register attendees for classes, workshops, events, trainings, conferences or concerts, all from your WordPress website. Event Espresso events are created from the WordPress admin area. You can create signup forms to collect information about your attendees, accept payments, and create reports. The lite version of the plugin provides everything that you need to manage your event using WordPress.', 'event_espresso'),'<a href="http://eventespresso.com/?utm_source=wordpress_org&utm_medium=link&utm_campaign=espresso_about_tab&utm_content=EE4+Decaf" rel="nofollow">','</a>'); ?></p>
	5	+ <p><?php echo sprintf(esc_html__('Event Espresso is a %sWordPress event manager%s which makes it easy for you to register attendees for classes, workshops, events, trainings, conferences or concerts, all from your WordPress website. Event Espresso events are created from the WordPress admin area. You can create signup forms to collect information about your attendees, accept payments, and create reports. The lite version of the plugin provides everything that you need to manage your event using WordPress.', 'event_espresso'), '<a href="http://eventespresso.com/?utm_source=wordpress_org&utm_medium=link&utm_campaign=espresso_about_tab&utm_content=EE4+Decaf" rel="nofollow">', '</a>'); ?></p>
6	6	<div class="feature-section col three-col about-updates">
7	7	<div class="col-1">
8	8	<img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/publish_meta_box.jpg">
		@@ -60,11 +60,11 @@ discard block
		block discarded – undo
60	60	<h2 class="about-headline-callout"><?php esc_html_e('People Like You Manage Event Registration with WordPress', 'event_espresso'); ?></h2>
61	61	<div class="feature-section col two-col">
62	62	<div class="grid_6">
63		- <p><?php echo sprintf( esc_html__('Trusted by thousands, Event Espresso is the best WordPress event online registration and ticketing manager plugin–and the best supported with full-time support. Turn your existing blog or website into a %sfully-featured event management website%s and a new way to make money. With Event Espresso you get it all; everything from custom registration forms and emails, seating limits, multiple price options, and discount codes to printable tickets.', 'event_espresso'),'<strong>','</strong>'); ?></p>
	63	+ <p><?php echo sprintf(esc_html__('Trusted by thousands, Event Espresso is the best WordPress event online registration and ticketing manager plugin–and the best supported with full-time support. Turn your existing blog or website into a %sfully-featured event management website%s and a new way to make money. With Event Espresso you get it all; everything from custom registration forms and emails, seating limits, multiple price options, and discount codes to printable tickets.', 'event_espresso'), '<strong>', '</strong>'); ?></p>
64	64	<p><?php esc_html_e('Event Espresso works perfectly for classes, workshops, fundraisers, sporting, trainings, conferences, networking, religion, social, non-profit, and nearly any other type of event.', 'event_espresso'); ?></p>
65	65	</div>
66	66	<div class="grid_6">
67		- <p><?php echo sprintf( esc_html__('Our online event registration software can %smake your organization more profitable and efficient%s by helping you save money on registration and ticketing fees, reduce the countless hours of time you spend manually processing registrations, create a “green” and paperless event registration process and you will be open for business to accept registrations and payment 24/7.', 'event_espresso'),'<strong>','</strong>'); ?></p>
	67	+ <p><?php echo sprintf(esc_html__('Our online event registration software can %smake your organization more profitable and efficient%s by helping you save money on registration and ticketing fees, reduce the countless hours of time you spend manually processing registrations, create a “green” and paperless event registration process and you will be open for business to accept registrations and payment 24/7.', 'event_espresso'), '<strong>', '</strong>'); ?></p>
68	68	<p><?php esc_html_e('If you\'re doing event registration and ticketing any other way, then you’re wasting time and money. We offer packages and prices to fit any budget, so get started with your online event registration and ticketing management system today.', 'event_espresso'); ?></p>
69	69	</div>
70	70	</div>
		@@ -74,7 +74,7 @@ discard block
		block discarded – undo
74	74	<h3><?php esc_html_e('Turn your blog into a complete event registration and management system', 'event_espresso'); ?></h3>
75	75	<p><?php esc_html_e('Create a beautiful event page with ticket selection, venue details, and an integrated single page checkout system. With WordPress, Event Espresso, and Espresso Arabica 2014 (based on the "Twenty Fourteen" theme by WordPress), your events will certainly sell out faster than ever!', 'event_espresso'); ?></p>
76	76	<p><?php esc_html_e('With a striking design that does not compromise the simplicity of WordPress and Event Espresso 4, Espresso Arabica 2014 will be the best event theme on the market.', 'event_espresso'); ?></p>
77		- <p><?php echo sprintf( esc_html__('%sLearn more >>%s', 'event_espresso'), '<a href="http://eventespresso.com/wiki/setup-event-espresso-arabica-theme/">', '</a>' ); ?></p>
	77	+ <p><?php echo sprintf(esc_html__('%sLearn more >>%s', 'event_espresso'), '<a href="http://eventespresso.com/wiki/setup-event-espresso-arabica-theme/">', '</a>'); ?></p>
78	78	</div>
79	79	<div><img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/single-event-page.jpg"></div>
80	80	</div>

		@@ -1,5 +1,5 @@ discard block
		block discarded – undo
1		-<h2 style="text-align: left;"><?php esc_html_e( 'Who uses Event Espresso?', 'event_espresso'); ?></h2>
2		-<p><?php echo sprintf( esc_html__('Event Espresso is used by over 40,000 event organizers across the world. They host %sconferences%s, %sart classes%s, training courses, concerts, fundraisers, workshops, %sfilm festivals%s, %spaint and wine%s, and more.', 'event_espresso'), '<a href="https://eventespresso.com/use-cases/conferences/?utm_source=wordpress_org&utm_medium=link&utm_campaign=decaf_about_page&utm_content=Decaf+vs+Regular">', '</a>', '<a href="https://eventespresso.com/use-cases/art-classes/?utm_source=wordpress_org&utm_medium=link&utm_campaign=decaf_about_page&utm_content=Decaf+vs+Regular">', '</a>','<a href="https://eventespresso.com/use-cases/film-festival-ticketing-software/?utm_source=wordpress_org&utm_medium=link&utm_campaign=decaf_about_page&utm_content=Decaf+vs+Regular">','</a>','<a href="https://eventespresso.com/use-cases/paint-wine-party-ticketing-software/?utm_source=wordpress_org&utm_medium=link&utm_campaign=decaf_about_page&utm_content=Decaf+vs+Regular">','</a>');?></p>
	1	+<h2 style="text-align: left;"><?php esc_html_e('Who uses Event Espresso?', 'event_espresso'); ?></h2>
	2	+<p><?php echo sprintf(esc_html__('Event Espresso is used by over 40,000 event organizers across the world. They host %sconferences%s, %sart classes%s, training courses, concerts, fundraisers, workshops, %sfilm festivals%s, %spaint and wine%s, and more.', 'event_espresso'), '<a href="https://eventespresso.com/use-cases/conferences/?utm_source=wordpress_org&utm_medium=link&utm_campaign=decaf_about_page&utm_content=Decaf+vs+Regular">', '</a>', '<a href="https://eventespresso.com/use-cases/art-classes/?utm_source=wordpress_org&utm_medium=link&utm_campaign=decaf_about_page&utm_content=Decaf+vs+Regular">', '</a>', '<a href="https://eventespresso.com/use-cases/film-festival-ticketing-software/?utm_source=wordpress_org&utm_medium=link&utm_campaign=decaf_about_page&utm_content=Decaf+vs+Regular">', '</a>', '<a href="https://eventespresso.com/use-cases/paint-wine-party-ticketing-software/?utm_source=wordpress_org&utm_medium=link&utm_campaign=decaf_about_page&utm_content=Decaf+vs+Regular">', '</a>'); ?></p>
3	3
4	4	<div class="changelog">
5	5	<h2 class="about-headline-callout"><?php _e('Rave Reviews About Event Espresso 4', 'event_espresso'); ?></h2>
		@@ -61,9 +61,9 @@ discard block
		block discarded – undo
61	61
62	62	</div>
63	63	<?php
64		- if ( !defined('EE_CAF_URL') ) {
	64	+ if ( ! defined('EE_CAF_URL')) {
65	65	?>
66		- <div align="right"><a href="https://eventespresso.com/pricing/?utm_source=wordpress_org&utm_medium=link&utm_campaign=decaf_about_page&utm_content=reviews+tab" target="_blank" class="button button-primary button-hero"><span class="dashicons dashicons-cart"></span><?php esc_html_e( 'Upgrade Now!', 'event_espresso' ) ?></a></div>
	66	+ <div align="right"><a href="https://eventespresso.com/pricing/?utm_source=wordpress_org&utm_medium=link&utm_campaign=decaf_about_page&utm_content=reviews+tab" target="_blank" class="button button-primary button-hero"><span class="dashicons dashicons-cart"></span><?php esc_html_e('Upgrade Now!', 'event_espresso') ?></a></div>
67	67	<?php
68	68	}
69	69	?>
		@@ -124,9 +124,9 @@ discard block
		block discarded – undo
124	124
125	125	</div>
126	126	<?php
127		- if ( !defined('EE_CAF_URL') ) {
	127	+ if ( ! defined('EE_CAF_URL')) {
128	128	?>
129		- <div align="right"><a href="https://eventespresso.com/pricing/?utm_source=wordpress_org&utm_medium=link&utm_campaign=decaf_about_page&utm_content=reviews+tab" target="_blank" class="button button-primary button-hero"><span class="dashicons dashicons-cart"></span><?php esc_html_e( 'Upgrade Now!', 'event_espresso' ) ?></a></div>
	129	+ <div align="right"><a href="https://eventespresso.com/pricing/?utm_source=wordpress_org&utm_medium=link&utm_campaign=decaf_about_page&utm_content=reviews+tab" target="_blank" class="button button-primary button-hero"><span class="dashicons dashicons-cart"></span><?php esc_html_e('Upgrade Now!', 'event_espresso') ?></a></div>
130	130	<?php
131	131	}
132	132	?>
		@@ -179,9 +179,9 @@ discard block
		block discarded – undo
179	179	</div>
180	180	</div>
181	181	<?php
182		- if ( !defined('EE_CAF_URL') ) {
	182	+ if ( ! defined('EE_CAF_URL')) {
183	183	?>
184		- <div align="right"><a href="https://eventespresso.com/pricing/?utm_source=wordpress_org&utm_medium=link&utm_campaign=decaf_about_page&utm_content=reviews+tab" target="_blank" class="button button-primary button-hero"><span class="dashicons dashicons-cart"></span><?php esc_html_e( 'Upgrade Now!', 'event_espresso' ) ?></a></div>
	184	+ <div align="right"><a href="https://eventespresso.com/pricing/?utm_source=wordpress_org&utm_medium=link&utm_campaign=decaf_about_page&utm_content=reviews+tab" target="_blank" class="button button-primary button-hero"><span class="dashicons dashicons-cart"></span><?php esc_html_e('Upgrade Now!', 'event_espresso') ?></a></div>
185	185	<?php
186	186	}
187	187	?>

		@@ -1,10 +1,10 @@ discard block
		block discarded – undo
1	1	<div class="changelog">
2	2	<?php
3	3	//maintenance mode on?
4		- if ( EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance ) {
	4	+ if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
5	5	?>
6	6	<div class="ee-attention">
7		- <h2 class="ee-maintenance-mode-callout"><?php esc_html_e('Event Espresso is in full maintenance mode.' , 'event_espresso'); ?></h2>
	7	+ <h2 class="ee-maintenance-mode-callout"><?php esc_html_e('Event Espresso is in full maintenance mode.', 'event_espresso'); ?></h2>
8	8	<p>
9	9	<?php
10	10	printf(
		@@ -20,9 +20,9 @@ discard block
		block discarded – undo
20	20	?>
21	21
22	22	<h2 class="about-headline-callout"><?php esc_html_e('Welcome to the Decaf (free) Version of Event Espresso 4!', 'event_espresso'); ?></h2>
23		- <p><?php echo sprintf( esc_html__('Manage your events from your WordPress dashboard. Reduce your admin, reduce your costs, make your life easier! This is the Decaf version of Event Espresso, but we also have a premium version called %sEvent Espreso 4 Regular%s and a hosted version called %sEvent Smart%s (SaaS).', 'event_espresso'),'<a href="?page=espresso_about&action=decafvpro">','</a>','<a href="https://eventsmart.com//?utm_source=ee4_decaf&utm_medium=link&utm_campaign=espresso_about_tab&utm_content=EE4+Decaf">','</a>'); ?></p>
	23	+ <p><?php echo sprintf(esc_html__('Manage your events from your WordPress dashboard. Reduce your admin, reduce your costs, make your life easier! This is the Decaf version of Event Espresso, but we also have a premium version called %sEvent Espreso 4 Regular%s and a hosted version called %sEvent Smart%s (SaaS).', 'event_espresso'), '<a href="?page=espresso_about&action=decafvpro">', '</a>', '<a href="https://eventsmart.com//?utm_source=ee4_decaf&utm_medium=link&utm_campaign=espresso_about_tab&utm_content=EE4+Decaf">', '</a>'); ?></p>
24	24	<h2><?php esc_html_e('Powering 40,000+ event websites; $100 million in ticket sales per year!', 'event_espresso'); ?></h2>
25		- <p><?php echo sprintf( esc_html__('Event Espresso is a %sWordPress event manager%s which makes it easy for you to register attendees for classes, workshops, events, trainings, conferences or concerts, all from your WordPress website. Event Espresso events are created from the WordPress admin area. You can create signup forms to collect information about your attendees, accept payments, and create reports. The Decaf (free) version of the plugin provides everything that you need to manage your event using WordPress.', 'event_espresso'),'<a href="http://eventespresso.com/?utm_source=wordpress_org&utm_medium=link&utm_campaign=plugin_description_tab&utm_content=EE4+Decaf">','</a>'); ?></p>
	25	+ <p><?php echo sprintf(esc_html__('Event Espresso is a %sWordPress event manager%s which makes it easy for you to register attendees for classes, workshops, events, trainings, conferences or concerts, all from your WordPress website. Event Espresso events are created from the WordPress admin area. You can create signup forms to collect information about your attendees, accept payments, and create reports. The Decaf (free) version of the plugin provides everything that you need to manage your event using WordPress.', 'event_espresso'), '<a href="http://eventespresso.com/?utm_source=wordpress_org&utm_medium=link&utm_campaign=plugin_description_tab&utm_content=EE4+Decaf">', '</a>'); ?></p>
26	26	<div class="feature-section col three-col about-updates">
27	27	<div class="col-1">
28	28	<img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/publish_meta_box.jpg">
		@@ -80,11 +80,11 @@ discard block
		block discarded – undo
80	80	<h2 class="about-headline-callout"><?php esc_html_e('People Like You Manage Event Registration with WordPress', 'event_espresso'); ?></h2>
81	81	<div class="feature-section col two-col">
82	82	<div class="grid_6">
83		- <p><?php echo sprintf( esc_html__('Trusted by thousands, Event Espresso is the best WordPress event online registration and ticketing manager plugin–and the best supported with full-time support. Turn your existing blog or website into a %sfully-featured event management website%s and a new way to make money. With Event Espresso you get it all; everything from custom registration forms and emails, seating limits, multiple price options, and discount codes to printable tickets.', 'event_espresso'),'<strong>','</strong>'); ?></p>
	83	+ <p><?php echo sprintf(esc_html__('Trusted by thousands, Event Espresso is the best WordPress event online registration and ticketing manager plugin–and the best supported with full-time support. Turn your existing blog or website into a %sfully-featured event management website%s and a new way to make money. With Event Espresso you get it all; everything from custom registration forms and emails, seating limits, multiple price options, and discount codes to printable tickets.', 'event_espresso'), '<strong>', '</strong>'); ?></p>
84	84	<p><?php esc_html_e('Event Espresso works perfectly for classes, workshops, fundraisers, sporting, trainings, conferences, networking, religion, social, non-profit, and nearly any other type of event.', 'event_espresso'); ?></p>
85	85	</div>
86	86	<div class="grid_6">
87		- <p><?php echo sprintf( esc_html__('Our online event registration software can %smake your organization more profitable and efficient%s by helping you save money on registration and ticketing fees, reduce the countless hours of time you spend manually processing registrations, create a “green” and paperless event registration process and you will be open for business to accept registrations and payment 24/7.', 'event_espresso'),'<strong>','</strong>'); ?></p>
	87	+ <p><?php echo sprintf(esc_html__('Our online event registration software can %smake your organization more profitable and efficient%s by helping you save money on registration and ticketing fees, reduce the countless hours of time you spend manually processing registrations, create a “green” and paperless event registration process and you will be open for business to accept registrations and payment 24/7.', 'event_espresso'), '<strong>', '</strong>'); ?></p>
88	88	<p><?php esc_html_e('If you\'re doing event registration and ticketing any other way, then you’re wasting time and money. We offer packages and prices to fit any budget, so get started with your online event registration and ticketing management system today.', 'event_espresso'); ?></p>
89	89	</div>
90	90	</div>
		@@ -94,7 +94,7 @@ discard block
		block discarded – undo
94	94	<h3><?php esc_html_e('Turn your blog into a complete event registration and management system', 'event_espresso'); ?></h3>
95	95	<p><?php esc_html_e('Create a beautiful event page with ticket selection, venue details, and an integrated single page checkout system. With WordPress, Event Espresso, and Espresso Arabica 2014 (based on the "Twenty Fourteen" theme by WordPress), your events will certainly sell out faster than ever!', 'event_espresso'); ?></p>
96	96	<p><?php esc_html_e('With a striking design that does not compromise the simplicity of WordPress and Event Espresso 4, Espresso Arabica 2014 will be the best event theme on the market.', 'event_espresso'); ?></p>
97		- <p><?php echo sprintf( esc_html__('%sLearn more >>%s', 'event_espresso'), '<a href="http://eventespresso.com/wiki/setup-event-espresso-arabica-theme/">', '</a>' ); ?></p>
	97	+ <p><?php echo sprintf(esc_html__('%sLearn more >>%s', 'event_espresso'), '<a href="http://eventespresso.com/wiki/setup-event-espresso-arabica-theme/">', '</a>'); ?></p>
98	98	</div>
99	99	<div><img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/single-event-page.jpg"></div>
100	100	</div>

		@@ -1,4 +1,4 @@ discard block
		block discarded – undo
1		-<p><?php echo sprintf( esc_html__('We offer a free version of Event Espresso 4 called Decaf which is a good fit for basic events. Need more features like custom registration forms and advanced email notifications? %sUpgrade to Event Espresso 4 (Regular)%s.', 'event_espresso'),'<a href="https://eventespresso.com/pricing/?ee_ver=ee4&utm_source=wordpress_org&utm_medium=link&utm_campaign=decaf_about_page&utm_content=Decaf+vs+Regular">','</a>');?><br>
	1	+<p><?php echo sprintf(esc_html__('We offer a free version of Event Espresso 4 called Decaf which is a good fit for basic events. Need more features like custom registration forms and advanced email notifications? %sUpgrade to Event Espresso 4 (Regular)%s.', 'event_espresso'), '<a href="https://eventespresso.com/pricing/?ee_ver=ee4&utm_source=wordpress_org&utm_medium=link&utm_campaign=decaf_about_page&utm_content=Decaf+vs+Regular">', '</a>'); ?><br>
2	2
3	3	<?php
4	4
		@@ -8,43 +8,43 @@ discard block
		block discarded – undo
8	8
9	9	$features = array(
10	10	'pricing-options' => array(
11		- 'label' => esc_html__( 'Handle multiple dates and pricing options', 'event_espresso' ),
	11	+ 'label' => esc_html__('Handle multiple dates and pricing options', 'event_espresso'),
12	12	'decaf' => '<span class="dashicons dashicons-no-alt"></span>',
13	13	'regular' => '<span class="dashicons dashicons-yes"></span></i>',
14	14	'class' => 'alternate'
15	15	),
16	16	'custom-registration' => array(
17		- 'label' => esc_html__( 'Create custom registration forms', 'event_espresso' ),
	17	+ 'label' => esc_html__('Create custom registration forms', 'event_espresso'),
18	18	'decaf' => '<span class="dashicons dashicons-no-alt"></span>',
19	19	'regular' => '<span class="dashicons dashicons-yes"></span></i>',
20	20	'class' => 'none'
21	21	),
22	22	'advanced-notifications' => array(
23		- 'label' => esc_html__( 'Customize advanced email notifications', 'event_espresso' ),
	23	+ 'label' => esc_html__('Customize advanced email notifications', 'event_espresso'),
24	24	'decaf' => '<span class="dashicons dashicons-no-alt"></span>',
25	25	'regular' => '<span class="dashicons dashicons-yes"></span></i>',
26	26	'class' => 'alternate'
27	27	),
28	28	'manage-taxes' => array(
29		- 'label' => esc_html__( 'Manage taxes', 'event_espresso' ),
	29	+ 'label' => esc_html__('Manage taxes', 'event_espresso'),
30	30	'decaf' => '<span class="dashicons dashicons-no-alt"></span>',
31	31	'regular' => '<span class="dashicons dashicons-yes"></span></i>',
32	32	'class' => 'none'
33	33	),
34	34	'typography' => array(
35		- 'label' => esc_html__( 'Additional payment methods available', 'event_espresso' ),
	35	+ 'label' => esc_html__('Additional payment methods available', 'event_espresso'),
36	36	'decaf' => '<span class="dashicons dashicons-no-alt"></span>',
37	37	'regular' => '<span class="dashicons dashicons-yes"></span></i>',
38	38	'class' => 'alternate'
39	39	),
40	40	'add-on-compatibility' => array(
41		- 'label' => esc_html__( 'Compatibility with add-ons', 'event_espresso' ),
	41	+ 'label' => esc_html__('Compatibility with add-ons', 'event_espresso'),
42	42	'decaf' => '<span class="dashicons dashicons-no-alt"></span>',
43	43	'regular' => '<span class="dashicons dashicons-yes"></span></i>',
44	44	'class' => 'none'
45	45	),
46	46	'best-support' => array(
47		- 'label' => esc_html__( 'Best in class support', 'event_espresso' ),
	47	+ 'label' => esc_html__('Best in class support', 'event_espresso'),
48	48	'decaf' => '<span class="dashicons dashicons-no-alt"></span>',
49	49	'regular' => '<span class="dashicons dashicons-yes"></span></i>',
50	50	'class' => 'alternate'
		@@ -56,12 +56,12 @@ discard block
		block discarded – undo
56	56	<thead>
57	57	<tr>
58	58	<th></th>
59		- <th><?php esc_html_e( 'Decaf', 'event_espresso' ) ?></th>
60		- <th><?php esc_html_e( 'Regular', 'event_espresso' ) ?></th>
	59	+ <th><?php esc_html_e('Decaf', 'event_espresso') ?></th>
	60	+ <th><?php esc_html_e('Regular', 'event_espresso') ?></th>
61	61	</tr>
62	62	</thead>
63	63	<tbody>
64		- <?php foreach ( $features as $feature ): ?>
	64	+ <?php foreach ($features as $feature): ?>
65	65	<tr class="<?php echo $feature['class']; ?>">
66	66	<td class="feature">
67	67	<h3>
		@@ -78,7 +78,7 @@ discard block
		block discarded – undo
78	78	<?php endforeach; ?>
79	79	<tr>
80	80	<td></td>
81		- <td colspan="2" class="text-right"><a href="https://eventespresso.com/pricing/?utm_source=wordpress_org&utm_medium=link&utm_campaign=decaf_about_page&utm_content=Decaf+vs+Regular" target="_blank" class="button button-primary button-hero"><span class="dashicons dashicons-cart"></span><?php esc_html_e( 'Upgrade Now!', 'event_espresso' ) ?></a></td>
	81	+ <td colspan="2" class="text-right"><a href="https://eventespresso.com/pricing/?utm_source=wordpress_org&utm_medium=link&utm_campaign=decaf_about_page&utm_content=Decaf+vs+Regular" target="_blank" class="button button-primary button-hero"><span class="dashicons dashicons-cart"></span><?php esc_html_e('Upgrade Now!', 'event_espresso') ?></a></td>
82	82	</tr>
83	83	</tbody>
84	84	</table>

eventespresso / event-espresso-core

Branch — FET-3467-waitlists (9ee75b)

Status

Category

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

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

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

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

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

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

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

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

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

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

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