eventespresso / event-espresso-core

modules/ical/EED_Ical.module.php

Spacing +13 added lines, -13 removed lines

@@ -86,24 +86,24 @@ 
             switch ($iCal_type) {
                 // submit buttons appear as buttons and are very compatible with a theme's style
                 case 'submit':
-                    $html .= '<form id="download-iCal-frm-' . $datetime->ID();
-                    $html .= '" class="download-iCal-frm" action="' . $URL . '" method="post" >';
+                    $html .= '<form id="download-iCal-frm-'.$datetime->ID();
+                    $html .= '" class="download-iCal-frm" action="'.$URL.'" method="post" >';
                     $html .= '<input type="submit" class="ee-ical-sbmt" value="&#xf145;" title="';
-                    $html .= esc_html__('Add to iCal Calendar', 'event_espresso') . '"/>';
+                    $html .= esc_html__('Add to iCal Calendar', 'event_espresso').'"/>';
                     $html .= '</form>';
                     break;
                 // buttons are just links that have been styled to appear as buttons,
                 // but may not be blend with a theme as well as submit buttons
                 case 'button':
-                    $html .= '<a class="ee-ical-btn small ee-button ee-roundish" href="' . $URL;
-                    $html .= '" title="' . esc_html__('Add to iCal Calendar', 'event_espresso') . '">';
+                    $html .= '<a class="ee-ical-btn small ee-button ee-roundish" href="'.$URL;
+                    $html .= '" title="'.esc_html__('Add to iCal Calendar', 'event_espresso').'">';
                     $html .= ' <span class="dashicons dashicons-calendar"></span>';
                     $html .= '</a>';
                     break;
                 // links are just links that use the calendar dashicon
                 case 'icon':
-                    $html .= '<a class="ee-ical-lnk" href="' . $URL . '" title="';
-                    $html .= esc_html__('Add to iCal Calendar', 'event_espresso') . '">';
+                    $html .= '<a class="ee-ical-lnk" href="'.$URL.'" title="';
+                    $html .= esc_html__('Add to iCal Calendar', 'event_espresso').'">';
                     $html .= ' <span class="dashicons dashicons-calendar"></span>';
                     $html .= '</a>';
                     break;
@@ -144,7 +144,7 @@ 
                     }
 
                     // Generate filename
-                    $filename = $event->slug() . '-' . $datetime->start_date('Y-m-d') . '.ics';
+                    $filename = $event->slug().'-'.$datetime->start_date('Y-m-d').'.ics';
 
                     // Check the datetime status has not been cancelled and set the ics value accordingly
                     $status = $datetime->get_active_status();
@@ -153,7 +153,7 @@ 
                     // Create array of ics details, escape strings, convert timestamps to ics format, etc
                     $ics_data = [
                         'ORGANIZER_NAME' => EE_Registry::instance()->CFG->organization->name,
-                        'UID'            => md5($event->name() . $event->ID() . $datetime->ID()),
+                        'UID'            => md5($event->name().$event->ID().$datetime->ID()),
                         'ORGANIZER'      => EE_Registry::instance()->CFG->organization->email,
                         'DTSTAMP'        => date(EED_Ical::iCal_datetime_format),
                         'LOCATION'       => $location,
@@ -174,9 +174,9 @@ 
                     foreach ($ics_data as $key => $value) {
                         // Description is escaped differently from all all values
                         if ($key === 'DESCRIPTION') {
-                            $ics_data[ $key ] = EED_Ical::_escape_ICal_description(wp_strip_all_tags($value));
+                            $ics_data[$key] = EED_Ical::_escape_ICal_description(wp_strip_all_tags($value));
                         } else {
-                            $ics_data[ $key ] = EED_Ical::_escape_ICal_data($value);
+                            $ics_data[$key] = EED_Ical::_escape_ICal_data($value);
                         }
                     }
 
@@ -186,7 +186,7 @@ 
 
                     // set headers
                     header('Content-type: text/calendar; charset=utf-8');
-                    header('Content-Disposition: attachment; filename="' . $filename . '"');
+                    header('Content-Disposition: attachment; filename="'.$filename.'"');
                     header('Cache-Control: private, max-age=0, must-revalidate');
                     header('Pragma: public');
                     header('Content-Type: application/octet-stream');
@@ -204,7 +204,7 @@ 
 
                     // Output all remaining values from ics_data.
                     foreach ($ics_data as $key => $value) {
-                        echo $key . ':' . $value . "\r\n";
+                        echo $key.':'.$value."\r\n";
                     }
 
                     echo "END:VEVENT\r\n";

Indentation +231 added lines, -231 removed lines

@@ -12,235 +12,235 @@
  */
 class EED_Ical extends EED_Module
 {
-    const iCal_datetime_format = 'Ymd\THis\Z';
-
-
-    /**
-     * @return EED_Ical|EED_Module
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function instance()
-    {
-        return parent::get_instance(__CLASS__);
-    }
-
-
-    /**
-     *    set_hooks - for hooking into EE Core, other modules, etc
-     *
-     * @return    void
-     */
-    public static function set_hooks()
-    {
-        // create download buttons
-        add_filter(
-            'FHEE__espresso_list_of_event_dates__datetime_html',
-            ['EED_Ical', 'generate_add_to_iCal_button'],
-            10,
-            2
-        );
-        // process ics download request
-        EE_Config::register_route('download_ics_file', 'EED_Ical', 'download_ics_file');
-    }
-
-
-    /**
-     *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
-     *
-     * @return    void
-     */
-    public static function set_hooks_admin()
-    {
-    }
-
-
-    /**
-     *    run - initial module setup
-     *
-     * @param WP $WP
-     * @return    void
-     */
-    public function run($WP)
-    {
-    }
-
-
-    /**
-     * @param $html
-     * @param $datetime
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function generate_add_to_iCal_button($html, $datetime)
-    {
-        // first verify a proper datetime object has been received
-        if ($datetime instanceof EE_Datetime) {
-            // set whether a link or submit button is shown
-            $iCal_type = apply_filters('FHEE__EED_Ical__generate_add_to_iCal_button__iCal_type', 'submit');
-            // generate a link to the route we registered in set_hooks()
-            $URL = add_query_arg(['ee' => 'download_ics_file', 'ics_id' => $datetime->ID()], site_url());
-            $URL = esc_url_Raw($URL);
-            // what type ?
-            switch ($iCal_type) {
-                // submit buttons appear as buttons and are very compatible with a theme's style
-                case 'submit':
-                    $html .= '<form id="download-iCal-frm-' . $datetime->ID();
-                    $html .= '" class="download-iCal-frm" action="' . $URL . '" method="post" >';
-                    $html .= '<input type="submit" class="ee-ical-sbmt" value="&#xf145;" title="';
-                    $html .= esc_html__('Add to iCal Calendar', 'event_espresso') . '"/>';
-                    $html .= '</form>';
-                    break;
-                // buttons are just links that have been styled to appear as buttons,
-                // but may not be blend with a theme as well as submit buttons
-                case 'button':
-                    $html .= '<a class="ee-ical-btn small ee-button ee-roundish" href="' . $URL;
-                    $html .= '" title="' . esc_html__('Add to iCal Calendar', 'event_espresso') . '">';
-                    $html .= ' <span class="dashicons dashicons-calendar"></span>';
-                    $html .= '</a>';
-                    break;
-                // links are just links that use the calendar dashicon
-                case 'icon':
-                    $html .= '<a class="ee-ical-lnk" href="' . $URL . '" title="';
-                    $html .= esc_html__('Add to iCal Calendar', 'event_espresso') . '">';
-                    $html .= ' <span class="dashicons dashicons-calendar"></span>';
-                    $html .= '</a>';
-                    break;
-            }
-        }
-        return $html;
-    }
-
-
-    /**
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function download_ics_file()
-    {
-        $request = self::getRequest();
-        if ($request->requestParamIsSet('ics_id')) {
-            $DTT_ID   = $request->getRequestParam('ics_id', 0, 'int');
-            $datetime = EEM_Datetime::instance()->get_one_by_ID($DTT_ID);
-            if ($datetime instanceof EE_Datetime) {
-                // get related event, venues, and event categories
-                $event = $datetime->event();
-                if ($event instanceof EE_Event) {
-                    // get related category Term object and it's name
-                    $category = $event->first_event_category();
-                    if ($category instanceof EE_Term) {
-                        $category = $category->name();
-                    }
-                    $location = '';
-                    // get first related venue and convert to CSV string
-                    $venue = $event->venues(['limit' => 1]);
-                    if (is_array($venue) && ! empty($venue)) {
-                        $venue = array_shift($venue);
-                        if ($venue instanceof EE_Venue) {
-                            $location = espresso_venue_raw_address('inline', $venue->ID(), false);
-                        }
-                    }
-
-                    // Generate filename
-                    $filename = $event->slug() . '-' . $datetime->start_date('Y-m-d') . '.ics';
-
-                    // Check the datetime status has not been cancelled and set the ics value accordingly
-                    $status = $datetime->get_active_status();
-                    $status = $status === EE_Datetime::cancelled ? 'CANCELLED' : 'CONFIRMED';
-
-                    // Create array of ics details, escape strings, convert timestamps to ics format, etc
-                    $ics_data = [
-                        'ORGANIZER_NAME' => EE_Registry::instance()->CFG->organization->name,
-                        'UID'            => md5($event->name() . $event->ID() . $datetime->ID()),
-                        'ORGANIZER'      => EE_Registry::instance()->CFG->organization->email,
-                        'DTSTAMP'        => date(EED_Ical::iCal_datetime_format),
-                        'LOCATION'       => $location,
-                        'SUMMARY'        => $event->name(),
-                        'DESCRIPTION'    => wp_strip_all_tags($event->description()),
-                        'STATUS'         => $status,
-                        'CATEGORIES'     => $category,
-                        'URL;VALUE=URI'  => get_permalink($event->ID()),
-                        'DTSTART'        => date(EED_Ical::iCal_datetime_format, $datetime->start()),
-                        'DTEND'          => date(EED_Ical::iCal_datetime_format, $datetime->end()),
-                    ];
-
-                    // Filter the values used within the ics output.
-                    // NOTE - all values within ics_data will be escaped automatically.
-                    $ics_data = apply_filters('FHEE__EED_Ical__download_ics_file_ics_data', $ics_data, $datetime);
-
-                    // Escape all ics data
-                    foreach ($ics_data as $key => $value) {
-                        // Description is escaped differently from all all values
-                        if ($key === 'DESCRIPTION') {
-                            $ics_data[ $key ] = EED_Ical::_escape_ICal_description(wp_strip_all_tags($value));
-                        } else {
-                            $ics_data[ $key ] = EED_Ical::_escape_ICal_data($value);
-                        }
-                    }
-
-                    // Pull the organizer name from ics_data and remove it from the array.
-                    $organizer_name = isset($ics_data['ORGANIZER_NAME'])
-                        ? $ics_data['ORGANIZER_NAME']
-                        : '';
-                    unset($ics_data['ORGANIZER_NAME']);
-
-                    // set headers
-                    header('Content-type: text/calendar; charset=utf-8');
-                    header('Content-Disposition: attachment; filename="' . $filename . '"');
-                    header('Cache-Control: private, max-age=0, must-revalidate');
-                    header('Pragma: public');
-                    header('Content-Type: application/octet-stream');
-                    header('Content-Type: application/force-download');
-                    header('Cache-Control: no-cache, must-revalidate');
-                    header('Content-Transfer-Encoding: binary');
-                    header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // past date
-                    ini_set('zlib.output_compression', '0');
-                    // echo the output
-                    echo "BEGIN:VCALENDAR\r\n";
-                    echo "VERSION:2.0\r\n";
-                    echo "PRODID:-//{$organizer_name}//NONSGML PDA Calendar Version 1.0//EN\r\n";
-                    echo "CALSCALE:GREGORIAN\r\n";
-                    echo "BEGIN:VEVENT\r\n";
-
-                    // Output all remaining values from ics_data.
-                    foreach ($ics_data as $key => $value) {
-                        echo $key . ':' . $value . "\r\n";
-                    }
-
-                    echo "END:VEVENT\r\n";
-                    echo "END:VCALENDAR\r\n";
-                }
-            }
-        }
-        die();
-    }
-
-
-    /**
-     *    _escape_ICal_data
-     *
-     * @param string $string
-     * @return    string
-     */
-    private static function _escape_ICal_data($string = '')
-    {
-        return preg_replace('/([\,;])/', '\\\$1', $string);
-    }
-
-
-    /**
-     *    _escape_ICal_description
-     *
-     * @param string $description
-     * @return    string
-     */
-    private static function _escape_ICal_description($description = '')
-    {
-        // Escape special chars within the description
-        $description = EED_Ical::_escape_ICal_data($description);
-        // Remove line breaks and output in iCal format
-        return str_replace(["\r\n", "\n"], '\n', $description);
-    }
+	const iCal_datetime_format = 'Ymd\THis\Z';
+
+
+	/**
+	 * @return EED_Ical|EED_Module
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function instance()
+	{
+		return parent::get_instance(__CLASS__);
+	}
+
+
+	/**
+	 *    set_hooks - for hooking into EE Core, other modules, etc
+	 *
+	 * @return    void
+	 */
+	public static function set_hooks()
+	{
+		// create download buttons
+		add_filter(
+			'FHEE__espresso_list_of_event_dates__datetime_html',
+			['EED_Ical', 'generate_add_to_iCal_button'],
+			10,
+			2
+		);
+		// process ics download request
+		EE_Config::register_route('download_ics_file', 'EED_Ical', 'download_ics_file');
+	}
+
+
+	/**
+	 *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
+	 *
+	 * @return    void
+	 */
+	public static function set_hooks_admin()
+	{
+	}
+
+
+	/**
+	 *    run - initial module setup
+	 *
+	 * @param WP $WP
+	 * @return    void
+	 */
+	public function run($WP)
+	{
+	}
+
+
+	/**
+	 * @param $html
+	 * @param $datetime
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function generate_add_to_iCal_button($html, $datetime)
+	{
+		// first verify a proper datetime object has been received
+		if ($datetime instanceof EE_Datetime) {
+			// set whether a link or submit button is shown
+			$iCal_type = apply_filters('FHEE__EED_Ical__generate_add_to_iCal_button__iCal_type', 'submit');
+			// generate a link to the route we registered in set_hooks()
+			$URL = add_query_arg(['ee' => 'download_ics_file', 'ics_id' => $datetime->ID()], site_url());
+			$URL = esc_url_Raw($URL);
+			// what type ?
+			switch ($iCal_type) {
+				// submit buttons appear as buttons and are very compatible with a theme's style
+				case 'submit':
+					$html .= '<form id="download-iCal-frm-' . $datetime->ID();
+					$html .= '" class="download-iCal-frm" action="' . $URL . '" method="post" >';
+					$html .= '<input type="submit" class="ee-ical-sbmt" value="&#xf145;" title="';
+					$html .= esc_html__('Add to iCal Calendar', 'event_espresso') . '"/>';
+					$html .= '</form>';
+					break;
+				// buttons are just links that have been styled to appear as buttons,
+				// but may not be blend with a theme as well as submit buttons
+				case 'button':
+					$html .= '<a class="ee-ical-btn small ee-button ee-roundish" href="' . $URL;
+					$html .= '" title="' . esc_html__('Add to iCal Calendar', 'event_espresso') . '">';
+					$html .= ' <span class="dashicons dashicons-calendar"></span>';
+					$html .= '</a>';
+					break;
+				// links are just links that use the calendar dashicon
+				case 'icon':
+					$html .= '<a class="ee-ical-lnk" href="' . $URL . '" title="';
+					$html .= esc_html__('Add to iCal Calendar', 'event_espresso') . '">';
+					$html .= ' <span class="dashicons dashicons-calendar"></span>';
+					$html .= '</a>';
+					break;
+			}
+		}
+		return $html;
+	}
+
+
+	/**
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function download_ics_file()
+	{
+		$request = self::getRequest();
+		if ($request->requestParamIsSet('ics_id')) {
+			$DTT_ID   = $request->getRequestParam('ics_id', 0, 'int');
+			$datetime = EEM_Datetime::instance()->get_one_by_ID($DTT_ID);
+			if ($datetime instanceof EE_Datetime) {
+				// get related event, venues, and event categories
+				$event = $datetime->event();
+				if ($event instanceof EE_Event) {
+					// get related category Term object and it's name
+					$category = $event->first_event_category();
+					if ($category instanceof EE_Term) {
+						$category = $category->name();
+					}
+					$location = '';
+					// get first related venue and convert to CSV string
+					$venue = $event->venues(['limit' => 1]);
+					if (is_array($venue) && ! empty($venue)) {
+						$venue = array_shift($venue);
+						if ($venue instanceof EE_Venue) {
+							$location = espresso_venue_raw_address('inline', $venue->ID(), false);
+						}
+					}
+
+					// Generate filename
+					$filename = $event->slug() . '-' . $datetime->start_date('Y-m-d') . '.ics';
+
+					// Check the datetime status has not been cancelled and set the ics value accordingly
+					$status = $datetime->get_active_status();
+					$status = $status === EE_Datetime::cancelled ? 'CANCELLED' : 'CONFIRMED';
+
+					// Create array of ics details, escape strings, convert timestamps to ics format, etc
+					$ics_data = [
+						'ORGANIZER_NAME' => EE_Registry::instance()->CFG->organization->name,
+						'UID'            => md5($event->name() . $event->ID() . $datetime->ID()),
+						'ORGANIZER'      => EE_Registry::instance()->CFG->organization->email,
+						'DTSTAMP'        => date(EED_Ical::iCal_datetime_format),
+						'LOCATION'       => $location,
+						'SUMMARY'        => $event->name(),
+						'DESCRIPTION'    => wp_strip_all_tags($event->description()),
+						'STATUS'         => $status,
+						'CATEGORIES'     => $category,
+						'URL;VALUE=URI'  => get_permalink($event->ID()),
+						'DTSTART'        => date(EED_Ical::iCal_datetime_format, $datetime->start()),
+						'DTEND'          => date(EED_Ical::iCal_datetime_format, $datetime->end()),
+					];
+
+					// Filter the values used within the ics output.
+					// NOTE - all values within ics_data will be escaped automatically.
+					$ics_data = apply_filters('FHEE__EED_Ical__download_ics_file_ics_data', $ics_data, $datetime);
+
+					// Escape all ics data
+					foreach ($ics_data as $key => $value) {
+						// Description is escaped differently from all all values
+						if ($key === 'DESCRIPTION') {
+							$ics_data[ $key ] = EED_Ical::_escape_ICal_description(wp_strip_all_tags($value));
+						} else {
+							$ics_data[ $key ] = EED_Ical::_escape_ICal_data($value);
+						}
+					}
+
+					// Pull the organizer name from ics_data and remove it from the array.
+					$organizer_name = isset($ics_data['ORGANIZER_NAME'])
+						? $ics_data['ORGANIZER_NAME']
+						: '';
+					unset($ics_data['ORGANIZER_NAME']);
+
+					// set headers
+					header('Content-type: text/calendar; charset=utf-8');
+					header('Content-Disposition: attachment; filename="' . $filename . '"');
+					header('Cache-Control: private, max-age=0, must-revalidate');
+					header('Pragma: public');
+					header('Content-Type: application/octet-stream');
+					header('Content-Type: application/force-download');
+					header('Cache-Control: no-cache, must-revalidate');
+					header('Content-Transfer-Encoding: binary');
+					header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // past date
+					ini_set('zlib.output_compression', '0');
+					// echo the output
+					echo "BEGIN:VCALENDAR\r\n";
+					echo "VERSION:2.0\r\n";
+					echo "PRODID:-//{$organizer_name}//NONSGML PDA Calendar Version 1.0//EN\r\n";
+					echo "CALSCALE:GREGORIAN\r\n";
+					echo "BEGIN:VEVENT\r\n";
+
+					// Output all remaining values from ics_data.
+					foreach ($ics_data as $key => $value) {
+						echo $key . ':' . $value . "\r\n";
+					}
+
+					echo "END:VEVENT\r\n";
+					echo "END:VCALENDAR\r\n";
+				}
+			}
+		}
+		die();
+	}
+
+
+	/**
+	 *    _escape_ICal_data
+	 *
+	 * @param string $string
+	 * @return    string
+	 */
+	private static function _escape_ICal_data($string = '')
+	{
+		return preg_replace('/([\,;])/', '\\\$1', $string);
+	}
+
+
+	/**
+	 *    _escape_ICal_description
+	 *
+	 * @param string $description
+	 * @return    string
+	 */
+	private static function _escape_ICal_description($description = '')
+	{
+		// Escape special chars within the description
+		$description = EED_Ical::_escape_ICal_data($description);
+		// Remove line breaks and output in iCal format
+		return str_replace(["\r\n", "\n"], '\n', $description);
+	}
 }

caffeinated/admin/extend/registration_form/templates/questions_in_group_meta_box.template.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 use EventEspresso\core\services\request\sanitizers\AllowedTags;
 
 assert($question_group instanceof EE_Question_Group);
-assert(isset($all_questions) && (empty($all_questions) || is_array($all_questions)));// list of unused questions
+assert(isset($all_questions) && (empty($all_questions) || is_array($all_questions))); // list of unused questions
 foreach ($all_questions as $question_option) {
     assert($question_option);
     assert($question_option instanceof EE_Question);

admin_pages/transactions/templates/txn_admin_details_side_meta_box_billing_info.template.php

Indentation +32 added lines, -32 removed lines

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

core/helpers/EEH_DTT_Helper.helper.php

Spacing +41 added lines, -41 removed lines

@@ -131,7 +131,7 @@ 
      */
     public static function get_timezone_string_from_abbreviations_list($gmt_offset = 0, $coerce = true)
     {
-        $gmt_offset =  (int) $gmt_offset;
+        $gmt_offset = (int) $gmt_offset;
         /** @var array[] $abbreviations */
         $abbreviations = DateTimeZone::listAbbreviations();
         foreach ($abbreviations as $abbreviation) {
@@ -326,7 +326,7 @@ 
      */
     protected static function _modify_datetime_object(DateTime $DateTime, $period = 'years', $value = 1, $operand = '+')
     {
-        if (! $DateTime instanceof DateTime) {
+        if ( ! $DateTime instanceof DateTime) {
             throw new EE_Error(
                 sprintf(
                     esc_html__('Expected a PHP DateTime object, but instead received %1$s', 'event_espresso'),
@@ -336,25 +336,25 @@ 
         }
         switch ($period) {
             case 'years':
-                $value = 'P' . $value . 'Y';
+                $value = 'P'.$value.'Y';
                 break;
             case 'months':
-                $value = 'P' . $value . 'M';
+                $value = 'P'.$value.'M';
                 break;
             case 'weeks':
-                $value = 'P' . $value . 'W';
+                $value = 'P'.$value.'W';
                 break;
             case 'days':
-                $value = 'P' . $value . 'D';
+                $value = 'P'.$value.'D';
                 break;
             case 'hours':
-                $value = 'PT' . $value . 'H';
+                $value = 'PT'.$value.'H';
                 break;
             case 'minutes':
-                $value = 'PT' . $value . 'M';
+                $value = 'PT'.$value.'M';
                 break;
             case 'seconds':
-                $value = 'PT' . $value . 'S';
+                $value = 'PT'.$value.'S';
                 break;
         }
         switch ($operand) {
@@ -382,7 +382,7 @@ 
      */
     protected static function _modify_timestamp($timestamp, $period = 'years', $value = 1, $operand = '+')
     {
-        if (! preg_match(EE_Datetime_Field::unix_timestamp_regex, $timestamp)) {
+        if ( ! preg_match(EE_Datetime_Field::unix_timestamp_regex, $timestamp)) {
             throw new EE_Error(
                 sprintf(
                     esc_html__('Expected a Unix timestamp, but instead received %1$s', 'event_espresso'),
@@ -495,7 +495,7 @@ 
                 'date' => $date_format['js'],
                 'time' => $time_format['js'],
             ),
-            'moment' => $date_format['moment'] . ' ' . $time_format['moment'],
+            'moment' => $date_format['moment'].' '.$time_format['moment'],
             'moment_split' => array(
                 'date' => $date_format['moment'],
                 'time' => $time_format['moment']
@@ -518,7 +518,7 @@ 
          *
          * @var array
          */
-        $symbols_map          = array(
+        $symbols_map = array(
             // Day
             // 01
             'd' => array(
@@ -670,26 +670,26 @@ 
         $escaping             = false;
         $format_string_length = strlen($format_string);
         for ($i = 0; $i < $format_string_length; $i++) {
-            $char = $format_string[ $i ];
+            $char = $format_string[$i];
             if ($char === '\\') { // PHP date format escaping character
                 $i++;
                 if ($escaping) {
-                    $jquery_ui_format .= $format_string[ $i ];
-                    $moment_format    .= $format_string[ $i ];
+                    $jquery_ui_format .= $format_string[$i];
+                    $moment_format    .= $format_string[$i];
                 } else {
-                    $jquery_ui_format .= '\'' . $format_string[ $i ];
-                    $moment_format    .= $format_string[ $i ];
+                    $jquery_ui_format .= '\''.$format_string[$i];
+                    $moment_format    .= $format_string[$i];
                 }
                 $escaping = true;
             } else {
                 if ($escaping) {
                     $jquery_ui_format .= "'";
                     $moment_format    .= "'";
-                    $escaping         = false;
+                    $escaping = false;
                 }
-                if (isset($symbols_map[ $char ])) {
-                    $jquery_ui_format .= $symbols_map[ $char ]['js'];
-                    $moment_format    .= $symbols_map[ $char ]['moment'];
+                if (isset($symbols_map[$char])) {
+                    $jquery_ui_format .= $symbols_map[$char]['js'];
+                    $moment_format    .= $symbols_map[$char]['moment'];
                 } else {
                     $jquery_ui_format .= $char;
                     $moment_format    .= $char;
@@ -747,7 +747,7 @@ 
     {
 
         if (
-            (! $date_1 instanceof DateTime || ! $date_2 instanceof DateTime)
+            ( ! $date_1 instanceof DateTime || ! $date_2 instanceof DateTime)
             || ($date_1->format(EE_Datetime_Field::mysql_time_format) !== '00:00:00'
                 || $date_2->format(
                     EE_Datetime_Field::mysql_time_format
@@ -783,8 +783,8 @@ 
             ? $DateTimeZone->getOffset(new DateTime('now')) / HOUR_IN_SECONDS
             : (float) get_option('gmt_offset');
         $query_interval = $offset < 0
-            ? 'DATE_SUB(' . $field_for_interval . ', INTERVAL ' . $offset * -1 . ' HOUR)'
-            : 'DATE_ADD(' . $field_for_interval . ', INTERVAL ' . $offset . ' HOUR)';
+            ? 'DATE_SUB('.$field_for_interval.', INTERVAL '.$offset * -1.' HOUR)'
+            : 'DATE_ADD('.$field_for_interval.', INTERVAL '.$offset.' HOUR)';
         return $query_interval;
     }
 
@@ -801,16 +801,16 @@ 
     public static function get_timezone_string_for_display()
     {
         $pretty_timezone = apply_filters('FHEE__EEH_DTT_Helper__get_timezone_string_for_display', '');
-        if (! empty($pretty_timezone)) {
+        if ( ! empty($pretty_timezone)) {
             return esc_html($pretty_timezone);
         }
         $timezone_string = get_option('timezone_string');
         if ($timezone_string) {
             static $mo_loaded = false;
             // Load translations for continents and cities just like wp_timezone_choice does
-            if (! $mo_loaded) {
+            if ( ! $mo_loaded) {
                 $locale = get_locale();
-                $mofile = WP_LANG_DIR . '/continents-cities-' . $locale . '.mo';
+                $mofile = WP_LANG_DIR.'/continents-cities-'.$locale.'.mo';
                 load_textdomain('continents-cities', $mofile);
                 $mo_loaded = true;
             }
@@ -837,10 +837,10 @@ 
         } else {
             // convert the part after the decimal, eg "5" (from x.5) or "25" (from x.25)
             // to minutes, eg 30 or 15, respectively
-            $hour_fraction = (float) ('0.' . $parts[1]);
+            $hour_fraction = (float) ('0.'.$parts[1]);
             $parts[1]      = (string) $hour_fraction * 60;
         }
-        return sprintf(esc_html__('UTC%1$s', 'event_espresso'), $prefix . implode(':', $parts));
+        return sprintf(esc_html__('UTC%1$s', 'event_espresso'), $prefix.implode(':', $parts));
     }
 
 
@@ -923,9 +923,9 @@ 
             'Pacific',
         );
         // Load translations for continents and cities.
-        if (! $mo_loaded || $locale !== $locale_loaded) {
+        if ( ! $mo_loaded || $locale !== $locale_loaded) {
             $locale_loaded = $locale ? $locale : get_locale();
-            $mofile        = WP_LANG_DIR . '/continents-cities-' . $locale_loaded . '.mo';
+            $mofile        = WP_LANG_DIR.'/continents-cities-'.$locale_loaded.'.mo';
             unload_textdomain('continents-cities');
             load_textdomain('continents-cities', $mofile);
             $mo_loaded = true;
@@ -933,11 +933,11 @@ 
         $zone_data = array();
         foreach (timezone_identifiers_list() as $zone) {
             $zone = explode('/', $zone);
-            if (! in_array($zone[0], $continents, true)) {
+            if ( ! in_array($zone[0], $continents, true)) {
                 continue;
             }
             // This determines what gets set and translated - we don't translate Etc/* strings here, they are done later
-            $exists      = array(
+            $exists = array(
                 0 => isset($zone[0]) && $zone[0],
                 1 => isset($zone[1]) && $zone[1],
                 2 => isset($zone[2]) && $zone[2],
@@ -967,7 +967,7 @@ 
         usort($zone_data, '_wp_timezone_choice_usort_callback');
         $structure = array();
         if (empty($selected_zone)) {
-            $structure[] = '<option selected value="">' . esc_html__('Select a city', 'event_espresso') . '</option>';
+            $structure[] = '<option selected value="">'.esc_html__('Select a city', 'event_espresso').'</option>';
         }
         foreach ($zone_data as $key => $zone) {
             // Build value in an array to join later
@@ -978,31 +978,31 @@ 
             } else {
                 // It's inside a continent group
                 // Continent optgroup
-                if (! isset($zone_data[ $key - 1 ]) || $zone_data[ $key - 1 ]['continent'] !== $zone['continent']) {
+                if ( ! isset($zone_data[$key - 1]) || $zone_data[$key - 1]['continent'] !== $zone['continent']) {
                     $label       = $zone['t_continent'];
-                    $structure[] = '<optgroup label="' . esc_attr($label) . '">';
+                    $structure[] = '<optgroup label="'.esc_attr($label).'">';
                 }
                 // Add the city to the value
                 $value[] = $zone['city'];
                 $display = $zone['t_city'];
-                if (! empty($zone['subcity'])) {
+                if ( ! empty($zone['subcity'])) {
                     // Add the subcity to the value
                     $value[] = $zone['subcity'];
-                    $display .= ' - ' . $zone['t_subcity'];
+                    $display .= ' - '.$zone['t_subcity'];
                 }
             }
             // Build the value
             $value       = implode('/', $value);
             $selected    = $value === $selected_zone ? ' selected' : '';
-            $structure[] = '<option value="' . esc_attr($value) . '"' . $selected . '>'
+            $structure[] = '<option value="'.esc_attr($value).'"'.$selected.'>'
                            . esc_html($display)
                            . '</option>';
             // Close continent optgroup
             if (
                 ! empty($zone['city'])
                 && (
-                    ! isset($zone_data[ $key + 1 ])
-                    || (isset($zone_data[ $key + 1 ]) && $zone_data[ $key + 1 ]['continent'] !== $zone['continent'])
+                    ! isset($zone_data[$key + 1])
+                    || (isset($zone_data[$key + 1]) && $zone_data[$key + 1]['continent'] !== $zone['continent'])
                 )
             ) {
                 $structure[] = '</optgroup>';

Indentation +983 added lines, -983 removed lines

@@ -15,1045 +15,1045 @@
  */
 class EEH_DTT_Helper
 {
-    /**
-     * return the timezone set for the WP install
-     *
-     * @return string valid timezone string for PHP DateTimeZone() class
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function get_timezone()
-    {
-        return EEH_DTT_Helper::get_valid_timezone_string();
-    }
+	/**
+	 * return the timezone set for the WP install
+	 *
+	 * @return string valid timezone string for PHP DateTimeZone() class
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function get_timezone()
+	{
+		return EEH_DTT_Helper::get_valid_timezone_string();
+	}
 
 
-    /**
-     * get_valid_timezone_string
-     *    ensures that a valid timezone string is returned
-     *
-     * @param string $timezone_string
-     * @return string
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function get_valid_timezone_string($timezone_string = '')
-    {
-        return self::getHelperAdapter()->getValidTimezoneString($timezone_string);
-    }
+	/**
+	 * get_valid_timezone_string
+	 *    ensures that a valid timezone string is returned
+	 *
+	 * @param string $timezone_string
+	 * @return string
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function get_valid_timezone_string($timezone_string = '')
+	{
+		return self::getHelperAdapter()->getValidTimezoneString($timezone_string);
+	}
 
 
-    /**
-     * This only purpose for this static method is to validate that the incoming timezone is a valid php timezone.
-     *
-     * @static
-     * @param  string $timezone_string Timezone string to check
-     * @param bool    $throw_error
-     * @return bool
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function validate_timezone($timezone_string, $throw_error = true)
-    {
-        return self::getHelperAdapter()->validateTimezone($timezone_string, $throw_error);
-    }
+	/**
+	 * This only purpose for this static method is to validate that the incoming timezone is a valid php timezone.
+	 *
+	 * @static
+	 * @param  string $timezone_string Timezone string to check
+	 * @param bool    $throw_error
+	 * @return bool
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function validate_timezone($timezone_string, $throw_error = true)
+	{
+		return self::getHelperAdapter()->validateTimezone($timezone_string, $throw_error);
+	}
 
 
-    /**
-     * This returns a string that can represent the provided gmt offset in format that can be passed into
-     * DateTimeZone.  This is NOT a string that can be passed as a value on the WordPress timezone_string option.
-     *
-     * @param float|string $gmt_offset
-     * @return string
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function get_timezone_string_from_gmt_offset($gmt_offset = '')
-    {
-        return self::getHelperAdapter()->getTimezoneStringFromGmtOffset($gmt_offset);
-    }
+	/**
+	 * This returns a string that can represent the provided gmt offset in format that can be passed into
+	 * DateTimeZone.  This is NOT a string that can be passed as a value on the WordPress timezone_string option.
+	 *
+	 * @param float|string $gmt_offset
+	 * @return string
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function get_timezone_string_from_gmt_offset($gmt_offset = '')
+	{
+		return self::getHelperAdapter()->getTimezoneStringFromGmtOffset($gmt_offset);
+	}
 
 
-    /**
-     * Gets the site's GMT offset based on either the timezone string
-     * (in which case teh gmt offset will vary depending on the location's
-     * observance of daylight savings time) or the gmt_offset wp option
-     *
-     * @return int seconds offset
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function get_site_timezone_gmt_offset()
-    {
-        return self::getHelperAdapter()->getSiteTimezoneGmtOffset();
-    }
+	/**
+	 * Gets the site's GMT offset based on either the timezone string
+	 * (in which case teh gmt offset will vary depending on the location's
+	 * observance of daylight savings time) or the gmt_offset wp option
+	 *
+	 * @return int seconds offset
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function get_site_timezone_gmt_offset()
+	{
+		return self::getHelperAdapter()->getSiteTimezoneGmtOffset();
+	}
 
 
-    /**
-     * Depending on PHP version,
-     * there might not be valid current timezone strings to match these gmt_offsets in its timezone tables.
-     * To get around that, for these fringe timezones we bump them to a known valid offset.
-     * This method should ONLY be called after first verifying an timezone_string cannot be retrieved for the offset.
-     *
-     * @deprecated 4.9.54.rc    Developers this was always meant to only be an internally used method.  This will be
-     *                          removed in a future version of EE.
-     * @param int $gmt_offset
-     * @return int
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function adjust_invalid_gmt_offsets($gmt_offset = 0)
-    {
-        return self::getHelperAdapter()->adjustInvalidGmtOffsets($gmt_offset);
-    }
+	/**
+	 * Depending on PHP version,
+	 * there might not be valid current timezone strings to match these gmt_offsets in its timezone tables.
+	 * To get around that, for these fringe timezones we bump them to a known valid offset.
+	 * This method should ONLY be called after first verifying an timezone_string cannot be retrieved for the offset.
+	 *
+	 * @deprecated 4.9.54.rc    Developers this was always meant to only be an internally used method.  This will be
+	 *                          removed in a future version of EE.
+	 * @param int $gmt_offset
+	 * @return int
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function adjust_invalid_gmt_offsets($gmt_offset = 0)
+	{
+		return self::getHelperAdapter()->adjustInvalidGmtOffsets($gmt_offset);
+	}
 
 
-    /**
-     * get_timezone_string_from_abbreviations_list
-     *
-     * @deprecated 4.9.54.rc  Developers, this was never intended to be public.  This is a soft deprecation for now.
-     *                        If you are using this, you'll want to work out an alternate way of getting the value.
-     * @param int  $gmt_offset
-     * @param bool $coerce If true, we attempt to coerce with our adjustment table @see self::adjust_invalid_gmt_offset.
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function get_timezone_string_from_abbreviations_list($gmt_offset = 0, $coerce = true)
-    {
-        $gmt_offset =  (int) $gmt_offset;
-        /** @var array[] $abbreviations */
-        $abbreviations = DateTimeZone::listAbbreviations();
-        foreach ($abbreviations as $abbreviation) {
-            foreach ($abbreviation as $timezone) {
-                if ((int) $timezone['offset'] === $gmt_offset && (bool) $timezone['dst'] === false) {
-                    try {
-                        $offset = self::get_timezone_offset(new DateTimeZone($timezone['timezone_id']));
-                        if ($offset !== $gmt_offset) {
-                            continue;
-                        }
-                        return $timezone['timezone_id'];
-                    } catch (Exception $e) {
-                        continue;
-                    }
-                }
-            }
-        }
-        // if $coerce is true, let's see if we can get a timezone string after the offset is adjusted
-        if ($coerce === true) {
-            $timezone_string = self::get_timezone_string_from_abbreviations_list(
-                self::adjust_invalid_gmt_offsets($gmt_offset),
-                false
-            );
-            if ($timezone_string) {
-                return $timezone_string;
-            }
-        }
-        throw new EE_Error(
-            sprintf(
-                esc_html__(
-                    'The provided GMT offset (%1$s), is invalid, please check with %2$sthis list%3$s for what valid timezones can be used',
-                    'event_espresso'
-                ),
-                $gmt_offset / HOUR_IN_SECONDS,
-                '<a href="http://www.php.net/manual/en/timezones.php">',
-                '</a>'
-            )
-        );
-    }
+	/**
+	 * get_timezone_string_from_abbreviations_list
+	 *
+	 * @deprecated 4.9.54.rc  Developers, this was never intended to be public.  This is a soft deprecation for now.
+	 *                        If you are using this, you'll want to work out an alternate way of getting the value.
+	 * @param int  $gmt_offset
+	 * @param bool $coerce If true, we attempt to coerce with our adjustment table @see self::adjust_invalid_gmt_offset.
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function get_timezone_string_from_abbreviations_list($gmt_offset = 0, $coerce = true)
+	{
+		$gmt_offset =  (int) $gmt_offset;
+		/** @var array[] $abbreviations */
+		$abbreviations = DateTimeZone::listAbbreviations();
+		foreach ($abbreviations as $abbreviation) {
+			foreach ($abbreviation as $timezone) {
+				if ((int) $timezone['offset'] === $gmt_offset && (bool) $timezone['dst'] === false) {
+					try {
+						$offset = self::get_timezone_offset(new DateTimeZone($timezone['timezone_id']));
+						if ($offset !== $gmt_offset) {
+							continue;
+						}
+						return $timezone['timezone_id'];
+					} catch (Exception $e) {
+						continue;
+					}
+				}
+			}
+		}
+		// if $coerce is true, let's see if we can get a timezone string after the offset is adjusted
+		if ($coerce === true) {
+			$timezone_string = self::get_timezone_string_from_abbreviations_list(
+				self::adjust_invalid_gmt_offsets($gmt_offset),
+				false
+			);
+			if ($timezone_string) {
+				return $timezone_string;
+			}
+		}
+		throw new EE_Error(
+			sprintf(
+				esc_html__(
+					'The provided GMT offset (%1$s), is invalid, please check with %2$sthis list%3$s for what valid timezones can be used',
+					'event_espresso'
+				),
+				$gmt_offset / HOUR_IN_SECONDS,
+				'<a href="http://www.php.net/manual/en/timezones.php">',
+				'</a>'
+			)
+		);
+	}
 
 
-    /**
-     * Get Timezone Transitions
-     *
-     * @param DateTimeZone $date_time_zone
-     * @param int|null     $time
-     * @param bool         $first_only
-     * @return array
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function get_timezone_transitions(DateTimeZone $date_time_zone, $time = null, $first_only = true)
-    {
-        return self::getHelperAdapter()->getTimezoneTransitions($date_time_zone, $time, $first_only);
-    }
+	/**
+	 * Get Timezone Transitions
+	 *
+	 * @param DateTimeZone $date_time_zone
+	 * @param int|null     $time
+	 * @param bool         $first_only
+	 * @return array
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function get_timezone_transitions(DateTimeZone $date_time_zone, $time = null, $first_only = true)
+	{
+		return self::getHelperAdapter()->getTimezoneTransitions($date_time_zone, $time, $first_only);
+	}
 
 
-    /**
-     * Get Timezone Offset for given timezone object.
-     *
-     * @param DateTimeZone $date_time_zone
-     * @param null         $time
-     * @return mixed
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function get_timezone_offset(DateTimeZone $date_time_zone, $time = null)
-    {
-        return self::getHelperAdapter()->getTimezoneOffset($date_time_zone, $time);
-    }
+	/**
+	 * Get Timezone Offset for given timezone object.
+	 *
+	 * @param DateTimeZone $date_time_zone
+	 * @param null         $time
+	 * @return mixed
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function get_timezone_offset(DateTimeZone $date_time_zone, $time = null)
+	{
+		return self::getHelperAdapter()->getTimezoneOffset($date_time_zone, $time);
+	}
 
 
-    /**
-     * Prints a select input for the given timezone string.
-     * @param string $timezone_string
-     * @deprecatd 4.9.54.rc   Soft deprecation.  Consider using \EEH_DTT_Helper::wp_timezone_choice instead.
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function timezone_select_input($timezone_string = '')
-    {
-        self::getHelperAdapter()->timezoneSelectInput($timezone_string);
-    }
+	/**
+	 * Prints a select input for the given timezone string.
+	 * @param string $timezone_string
+	 * @deprecatd 4.9.54.rc   Soft deprecation.  Consider using \EEH_DTT_Helper::wp_timezone_choice instead.
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function timezone_select_input($timezone_string = '')
+	{
+		self::getHelperAdapter()->timezoneSelectInput($timezone_string);
+	}
 
 
-    /**
-     * This method will take an incoming unix timestamp and add the offset to it for the given timezone_string.
-     * If no unix timestamp is given then time() is used.  If no timezone is given then the set timezone string for
-     * the site is used.
-     * This is used typically when using a Unix timestamp any core WP functions that expect their specially
-     * computed timestamp (i.e. date_i18n() )
-     *
-     * @param int    $unix_timestamp                  if 0, then time() will be used.
-     * @param string $timezone_string                 timezone_string. If empty, then the current set timezone for the
-     *                                                site will be used.
-     * @return int $unix_timestamp with the offset applied for the given timezone.
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function get_timestamp_with_offset($unix_timestamp = 0, $timezone_string = '')
-    {
-        return self::getHelperAdapter()->getTimestampWithOffset($unix_timestamp, $timezone_string);
-    }
+	/**
+	 * This method will take an incoming unix timestamp and add the offset to it for the given timezone_string.
+	 * If no unix timestamp is given then time() is used.  If no timezone is given then the set timezone string for
+	 * the site is used.
+	 * This is used typically when using a Unix timestamp any core WP functions that expect their specially
+	 * computed timestamp (i.e. date_i18n() )
+	 *
+	 * @param int    $unix_timestamp                  if 0, then time() will be used.
+	 * @param string $timezone_string                 timezone_string. If empty, then the current set timezone for the
+	 *                                                site will be used.
+	 * @return int $unix_timestamp with the offset applied for the given timezone.
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function get_timestamp_with_offset($unix_timestamp = 0, $timezone_string = '')
+	{
+		return self::getHelperAdapter()->getTimestampWithOffset($unix_timestamp, $timezone_string);
+	}
 
 
-    /**
-     *    _set_date_time_field
-     *    modifies EE_Base_Class EE_Datetime_Field objects
-     *
-     * @param  EE_Base_Class $obj                 EE_Base_Class object
-     * @param    DateTime    $DateTime            PHP DateTime object
-     * @param  string        $datetime_field_name the datetime fieldname to be manipulated
-     * @return EE_Base_Class
-     * @throws EE_Error
-     */
-    protected static function _set_date_time_field(EE_Base_Class $obj, DateTime $DateTime, $datetime_field_name)
-    {
-        // grab current datetime format
-        $current_format = $obj->get_format();
-        // set new full timestamp format
-        $obj->set_date_format(EE_Datetime_Field::mysql_date_format);
-        $obj->set_time_format(EE_Datetime_Field::mysql_time_format);
-        // set the new date value using a full timestamp format so that no data is lost
-        $obj->set($datetime_field_name, $DateTime->format(EE_Datetime_Field::mysql_timestamp_format));
-        // reset datetime formats
-        $obj->set_date_format($current_format[0]);
-        $obj->set_time_format($current_format[1]);
-        return $obj;
-    }
+	/**
+	 *    _set_date_time_field
+	 *    modifies EE_Base_Class EE_Datetime_Field objects
+	 *
+	 * @param  EE_Base_Class $obj                 EE_Base_Class object
+	 * @param    DateTime    $DateTime            PHP DateTime object
+	 * @param  string        $datetime_field_name the datetime fieldname to be manipulated
+	 * @return EE_Base_Class
+	 * @throws EE_Error
+	 */
+	protected static function _set_date_time_field(EE_Base_Class $obj, DateTime $DateTime, $datetime_field_name)
+	{
+		// grab current datetime format
+		$current_format = $obj->get_format();
+		// set new full timestamp format
+		$obj->set_date_format(EE_Datetime_Field::mysql_date_format);
+		$obj->set_time_format(EE_Datetime_Field::mysql_time_format);
+		// set the new date value using a full timestamp format so that no data is lost
+		$obj->set($datetime_field_name, $DateTime->format(EE_Datetime_Field::mysql_timestamp_format));
+		// reset datetime formats
+		$obj->set_date_format($current_format[0]);
+		$obj->set_time_format($current_format[1]);
+		return $obj;
+	}
 
 
-    /**
-     *    date_time_add
-     *    helper for doing simple datetime calculations on a given datetime from EE_Base_Class
-     *    and modifying it IN the EE_Base_Class so you don't have to do anything else.
-     *
-     * @param  EE_Base_Class $obj                 EE_Base_Class object
-     * @param  string        $datetime_field_name name of the EE_Datetime_Filed datatype db column to be manipulated
-     * @param  string        $period              what you are adding. The options are (years, months, days, hours,
-     *                                            minutes, seconds) defaults to years
-     * @param  integer       $value               what you want to increment the time by
-     * @return EE_Base_Class return the EE_Base_Class object so right away you can do something with it
-     *                                            (chaining)
-     * @throws EE_Error
-     * @throws Exception
-     */
-    public static function date_time_add(EE_Base_Class $obj, $datetime_field_name, $period = 'years', $value = 1)
-    {
-        // get the raw UTC date.
-        $DateTime = $obj->get_DateTime_object($datetime_field_name);
-        $DateTime = EEH_DTT_Helper::calc_date($DateTime, $period, $value);
-        return EEH_DTT_Helper::_set_date_time_field($obj, $DateTime, $datetime_field_name);
-    }
+	/**
+	 *    date_time_add
+	 *    helper for doing simple datetime calculations on a given datetime from EE_Base_Class
+	 *    and modifying it IN the EE_Base_Class so you don't have to do anything else.
+	 *
+	 * @param  EE_Base_Class $obj                 EE_Base_Class object
+	 * @param  string        $datetime_field_name name of the EE_Datetime_Filed datatype db column to be manipulated
+	 * @param  string        $period              what you are adding. The options are (years, months, days, hours,
+	 *                                            minutes, seconds) defaults to years
+	 * @param  integer       $value               what you want to increment the time by
+	 * @return EE_Base_Class return the EE_Base_Class object so right away you can do something with it
+	 *                                            (chaining)
+	 * @throws EE_Error
+	 * @throws Exception
+	 */
+	public static function date_time_add(EE_Base_Class $obj, $datetime_field_name, $period = 'years', $value = 1)
+	{
+		// get the raw UTC date.
+		$DateTime = $obj->get_DateTime_object($datetime_field_name);
+		$DateTime = EEH_DTT_Helper::calc_date($DateTime, $period, $value);
+		return EEH_DTT_Helper::_set_date_time_field($obj, $DateTime, $datetime_field_name);
+	}
 
 
-    /**
-     *    date_time_subtract
-     *    same as date_time_add except subtracting value instead of adding.
-     *
-     * @param EE_Base_Class $obj
-     * @param  string       $datetime_field_name name of the EE_Datetime_Filed datatype db column to be manipulated
-     * @param string        $period
-     * @param int           $value
-     * @return EE_Base_Class
-     * @throws EE_Error
-     * @throws Exception
-     */
-    public static function date_time_subtract(EE_Base_Class $obj, $datetime_field_name, $period = 'years', $value = 1)
-    {
-        // get the raw UTC date
-        $DateTime = $obj->get_DateTime_object($datetime_field_name);
-        $DateTime = EEH_DTT_Helper::calc_date($DateTime, $period, $value, '-');
-        return EEH_DTT_Helper::_set_date_time_field($obj, $DateTime, $datetime_field_name);
-    }
+	/**
+	 *    date_time_subtract
+	 *    same as date_time_add except subtracting value instead of adding.
+	 *
+	 * @param EE_Base_Class $obj
+	 * @param  string       $datetime_field_name name of the EE_Datetime_Filed datatype db column to be manipulated
+	 * @param string        $period
+	 * @param int           $value
+	 * @return EE_Base_Class
+	 * @throws EE_Error
+	 * @throws Exception
+	 */
+	public static function date_time_subtract(EE_Base_Class $obj, $datetime_field_name, $period = 'years', $value = 1)
+	{
+		// get the raw UTC date
+		$DateTime = $obj->get_DateTime_object($datetime_field_name);
+		$DateTime = EEH_DTT_Helper::calc_date($DateTime, $period, $value, '-');
+		return EEH_DTT_Helper::_set_date_time_field($obj, $DateTime, $datetime_field_name);
+	}
 
 
-    /**
-     * Simply takes an incoming DateTime object and does calculations on it based on the incoming parameters
-     *
-     * @param  DateTime   $DateTime DateTime object
-     * @param  string     $period   a value to indicate what interval is being used in the calculation. The options are
-     *                              'years', 'months', 'days', 'hours', 'minutes', 'seconds'. Defaults to years.
-     * @param  int|string $value    What you want to increment the date by
-     * @param  string     $operand  What operand you wish to use for the calculation
-     * @return DateTime return whatever type came in.
-     * @throws Exception
-     * @throws EE_Error
-     */
-    protected static function _modify_datetime_object(DateTime $DateTime, $period = 'years', $value = 1, $operand = '+')
-    {
-        if (! $DateTime instanceof DateTime) {
-            throw new EE_Error(
-                sprintf(
-                    esc_html__('Expected a PHP DateTime object, but instead received %1$s', 'event_espresso'),
-                    print_r($DateTime, true)
-                )
-            );
-        }
-        switch ($period) {
-            case 'years':
-                $value = 'P' . $value . 'Y';
-                break;
-            case 'months':
-                $value = 'P' . $value . 'M';
-                break;
-            case 'weeks':
-                $value = 'P' . $value . 'W';
-                break;
-            case 'days':
-                $value = 'P' . $value . 'D';
-                break;
-            case 'hours':
-                $value = 'PT' . $value . 'H';
-                break;
-            case 'minutes':
-                $value = 'PT' . $value . 'M';
-                break;
-            case 'seconds':
-                $value = 'PT' . $value . 'S';
-                break;
-        }
-        switch ($operand) {
-            case '+':
-                $DateTime->add(new DateInterval($value));
-                break;
-            case '-':
-                $DateTime->sub(new DateInterval($value));
-                break;
-        }
-        return $DateTime;
-    }
+	/**
+	 * Simply takes an incoming DateTime object and does calculations on it based on the incoming parameters
+	 *
+	 * @param  DateTime   $DateTime DateTime object
+	 * @param  string     $period   a value to indicate what interval is being used in the calculation. The options are
+	 *                              'years', 'months', 'days', 'hours', 'minutes', 'seconds'. Defaults to years.
+	 * @param  int|string $value    What you want to increment the date by
+	 * @param  string     $operand  What operand you wish to use for the calculation
+	 * @return DateTime return whatever type came in.
+	 * @throws Exception
+	 * @throws EE_Error
+	 */
+	protected static function _modify_datetime_object(DateTime $DateTime, $period = 'years', $value = 1, $operand = '+')
+	{
+		if (! $DateTime instanceof DateTime) {
+			throw new EE_Error(
+				sprintf(
+					esc_html__('Expected a PHP DateTime object, but instead received %1$s', 'event_espresso'),
+					print_r($DateTime, true)
+				)
+			);
+		}
+		switch ($period) {
+			case 'years':
+				$value = 'P' . $value . 'Y';
+				break;
+			case 'months':
+				$value = 'P' . $value . 'M';
+				break;
+			case 'weeks':
+				$value = 'P' . $value . 'W';
+				break;
+			case 'days':
+				$value = 'P' . $value . 'D';
+				break;
+			case 'hours':
+				$value = 'PT' . $value . 'H';
+				break;
+			case 'minutes':
+				$value = 'PT' . $value . 'M';
+				break;
+			case 'seconds':
+				$value = 'PT' . $value . 'S';
+				break;
+		}
+		switch ($operand) {
+			case '+':
+				$DateTime->add(new DateInterval($value));
+				break;
+			case '-':
+				$DateTime->sub(new DateInterval($value));
+				break;
+		}
+		return $DateTime;
+	}
 
 
-    /**
-     * Simply takes an incoming Unix timestamp and does calculations on it based on the incoming parameters
-     *
-     * @param  int     $timestamp Unix timestamp
-     * @param  string  $period    a value to indicate what interval is being used in the calculation. The options are
-     *                            'years', 'months', 'days', 'hours', 'minutes', 'seconds'. Defaults to years.
-     * @param  integer $value     What you want to increment the date by
-     * @param  string  $operand   What operand you wish to use for the calculation
-     * @return int
-     * @throws EE_Error
-     */
-    protected static function _modify_timestamp($timestamp, $period = 'years', $value = 1, $operand = '+')
-    {
-        if (! preg_match(EE_Datetime_Field::unix_timestamp_regex, $timestamp)) {
-            throw new EE_Error(
-                sprintf(
-                    esc_html__('Expected a Unix timestamp, but instead received %1$s', 'event_espresso'),
-                    print_r($timestamp, true)
-                )
-            );
-        }
-        switch ($period) {
-            case 'years':
-                $value = YEAR_IN_SECONDS * $value;
-                break;
-            case 'months':
-                $value = YEAR_IN_SECONDS / 12 * $value;
-                break;
-            case 'weeks':
-                $value = WEEK_IN_SECONDS * $value;
-                break;
-            case 'days':
-                $value = DAY_IN_SECONDS * $value;
-                break;
-            case 'hours':
-                $value = HOUR_IN_SECONDS * $value;
-                break;
-            case 'minutes':
-                $value = MINUTE_IN_SECONDS * $value;
-                break;
-        }
-        switch ($operand) {
-            case '+':
-                $timestamp += $value;
-                break;
-            case '-':
-                $timestamp -= $value;
-                break;
-        }
-        return $timestamp;
-    }
+	/**
+	 * Simply takes an incoming Unix timestamp and does calculations on it based on the incoming parameters
+	 *
+	 * @param  int     $timestamp Unix timestamp
+	 * @param  string  $period    a value to indicate what interval is being used in the calculation. The options are
+	 *                            'years', 'months', 'days', 'hours', 'minutes', 'seconds'. Defaults to years.
+	 * @param  integer $value     What you want to increment the date by
+	 * @param  string  $operand   What operand you wish to use for the calculation
+	 * @return int
+	 * @throws EE_Error
+	 */
+	protected static function _modify_timestamp($timestamp, $period = 'years', $value = 1, $operand = '+')
+	{
+		if (! preg_match(EE_Datetime_Field::unix_timestamp_regex, $timestamp)) {
+			throw new EE_Error(
+				sprintf(
+					esc_html__('Expected a Unix timestamp, but instead received %1$s', 'event_espresso'),
+					print_r($timestamp, true)
+				)
+			);
+		}
+		switch ($period) {
+			case 'years':
+				$value = YEAR_IN_SECONDS * $value;
+				break;
+			case 'months':
+				$value = YEAR_IN_SECONDS / 12 * $value;
+				break;
+			case 'weeks':
+				$value = WEEK_IN_SECONDS * $value;
+				break;
+			case 'days':
+				$value = DAY_IN_SECONDS * $value;
+				break;
+			case 'hours':
+				$value = HOUR_IN_SECONDS * $value;
+				break;
+			case 'minutes':
+				$value = MINUTE_IN_SECONDS * $value;
+				break;
+		}
+		switch ($operand) {
+			case '+':
+				$timestamp += $value;
+				break;
+			case '-':
+				$timestamp -= $value;
+				break;
+		}
+		return $timestamp;
+	}
 
 
-    /**
-     * Simply takes an incoming UTC timestamp or DateTime object and does calculations on it based on the incoming
-     * parameters and returns the new timestamp or DateTime.
-     *
-     * @param  int | DateTime $DateTime_or_timestamp DateTime object or Unix timestamp
-     * @param  string         $period                a value to indicate what interval is being used in the
-     *                                               calculation. The options are 'years', 'months', 'days', 'hours',
-     *                                               'minutes', 'seconds'. Defaults to years.
-     * @param  integer        $value                 What you want to increment the date by
-     * @param  string         $operand               What operand you wish to use for the calculation
-     * @return mixed string|DateTime          return whatever type came in.
-     * @throws Exception
-     * @throws EE_Error
-     */
-    public static function calc_date($DateTime_or_timestamp, $period = 'years', $value = 1, $operand = '+')
-    {
-        if ($DateTime_or_timestamp instanceof DateTime) {
-            return EEH_DTT_Helper::_modify_datetime_object(
-                $DateTime_or_timestamp,
-                $period,
-                $value,
-                $operand
-            );
-        }
-        if (preg_match(EE_Datetime_Field::unix_timestamp_regex, $DateTime_or_timestamp)) {
-            return EEH_DTT_Helper::_modify_timestamp(
-                $DateTime_or_timestamp,
-                $period,
-                $value,
-                $operand
-            );
-        }
-        // error
-        return $DateTime_or_timestamp;
-    }
+	/**
+	 * Simply takes an incoming UTC timestamp or DateTime object and does calculations on it based on the incoming
+	 * parameters and returns the new timestamp or DateTime.
+	 *
+	 * @param  int | DateTime $DateTime_or_timestamp DateTime object or Unix timestamp
+	 * @param  string         $period                a value to indicate what interval is being used in the
+	 *                                               calculation. The options are 'years', 'months', 'days', 'hours',
+	 *                                               'minutes', 'seconds'. Defaults to years.
+	 * @param  integer        $value                 What you want to increment the date by
+	 * @param  string         $operand               What operand you wish to use for the calculation
+	 * @return mixed string|DateTime          return whatever type came in.
+	 * @throws Exception
+	 * @throws EE_Error
+	 */
+	public static function calc_date($DateTime_or_timestamp, $period = 'years', $value = 1, $operand = '+')
+	{
+		if ($DateTime_or_timestamp instanceof DateTime) {
+			return EEH_DTT_Helper::_modify_datetime_object(
+				$DateTime_or_timestamp,
+				$period,
+				$value,
+				$operand
+			);
+		}
+		if (preg_match(EE_Datetime_Field::unix_timestamp_regex, $DateTime_or_timestamp)) {
+			return EEH_DTT_Helper::_modify_timestamp(
+				$DateTime_or_timestamp,
+				$period,
+				$value,
+				$operand
+			);
+		}
+		// error
+		return $DateTime_or_timestamp;
+	}
 
 
-    /**
-     * The purpose of this helper method is to receive an incoming format string in php date/time format
-     * and spit out the js and moment.js equivalent formats.
-     * Note, if no format string is given, then it is assumed the user wants what is set for WP.
-     * Note, js date and time formats are those used by the jquery-ui datepicker and the jquery-ui date-
-     * time picker.
-     *
-     * @see http://stackoverflow.com/posts/16725290/ for the code inspiration.
-     * @param string $date_format_string
-     * @param string $time_format_string
-     * @return array
-     *              array(
-     *              'js' => array (
-     *              'date' => //date format
-     *              'time' => //time format
-     *              ),
-     *              'moment' => //date and time format.
-     *              )
-     */
-    public static function convert_php_to_js_and_moment_date_formats(
-        $date_format_string = null,
-        $time_format_string = null
-    ) {
-        if ($date_format_string === null) {
-            $date_format_string = (string) get_option('date_format');
-        }
-        if ($time_format_string === null) {
-            $time_format_string = (string) get_option('time_format');
-        }
-        $date_format = self::_php_to_js_moment_converter($date_format_string);
-        $time_format = self::_php_to_js_moment_converter($time_format_string);
-        return array(
-            'js'     => array(
-                'date' => $date_format['js'],
-                'time' => $time_format['js'],
-            ),
-            'moment' => $date_format['moment'] . ' ' . $time_format['moment'],
-            'moment_split' => array(
-                'date' => $date_format['moment'],
-                'time' => $time_format['moment']
-            )
-        );
-    }
+	/**
+	 * The purpose of this helper method is to receive an incoming format string in php date/time format
+	 * and spit out the js and moment.js equivalent formats.
+	 * Note, if no format string is given, then it is assumed the user wants what is set for WP.
+	 * Note, js date and time formats are those used by the jquery-ui datepicker and the jquery-ui date-
+	 * time picker.
+	 *
+	 * @see http://stackoverflow.com/posts/16725290/ for the code inspiration.
+	 * @param string $date_format_string
+	 * @param string $time_format_string
+	 * @return array
+	 *              array(
+	 *              'js' => array (
+	 *              'date' => //date format
+	 *              'time' => //time format
+	 *              ),
+	 *              'moment' => //date and time format.
+	 *              )
+	 */
+	public static function convert_php_to_js_and_moment_date_formats(
+		$date_format_string = null,
+		$time_format_string = null
+	) {
+		if ($date_format_string === null) {
+			$date_format_string = (string) get_option('date_format');
+		}
+		if ($time_format_string === null) {
+			$time_format_string = (string) get_option('time_format');
+		}
+		$date_format = self::_php_to_js_moment_converter($date_format_string);
+		$time_format = self::_php_to_js_moment_converter($time_format_string);
+		return array(
+			'js'     => array(
+				'date' => $date_format['js'],
+				'time' => $time_format['js'],
+			),
+			'moment' => $date_format['moment'] . ' ' . $time_format['moment'],
+			'moment_split' => array(
+				'date' => $date_format['moment'],
+				'time' => $time_format['moment']
+			)
+		);
+	}
 
 
-    /**
-     * This converts incoming format string into js and moment variations.
-     *
-     * @param string $format_string incoming php format string
-     * @return array js and moment formats.
-     */
-    protected static function _php_to_js_moment_converter($format_string)
-    {
-        /**
-         * This is a map of symbols for formats.
-         * The index is the php symbol, the equivalent values are in the array.
-         *
-         * @var array
-         */
-        $symbols_map          = array(
-            // Day
-            // 01
-            'd' => array(
-                'js'     => 'dd',
-                'moment' => 'DD',
-            ),
-            // Mon
-            'D' => array(
-                'js'     => 'D',
-                'moment' => 'ddd',
-            ),
-            // 1,2,...31
-            'j' => array(
-                'js'     => 'd',
-                'moment' => 'D',
-            ),
-            // Monday
-            'l' => array(
-                'js'     => 'DD',
-                'moment' => 'dddd',
-            ),
-            // ISO numeric representation of the day of the week (1-6)
-            'N' => array(
-                'js'     => '',
-                'moment' => 'E',
-            ),
-            // st,nd.rd
-            'S' => array(
-                'js'     => '',
-                'moment' => 'o',
-            ),
-            // numeric representation of day of week (0-6)
-            'w' => array(
-                'js'     => '',
-                'moment' => 'd',
-            ),
-            // day of year starting from 0 (0-365)
-            'z' => array(
-                'js'     => 'o',
-                'moment' => 'DDD' // note moment does not start with 0 so will need to modify by subtracting 1
-            ),
-            // Week
-            // ISO-8601 week number of year (weeks starting on monday)
-            'W' => array(
-                'js'     => '',
-                'moment' => 'w',
-            ),
-            // Month
-            // January...December
-            'F' => array(
-                'js'     => 'MM',
-                'moment' => 'MMMM',
-            ),
-            // 01...12
-            'm' => array(
-                'js'     => 'mm',
-                'moment' => 'MM',
-            ),
-            // Jan...Dec
-            'M' => array(
-                'js'     => 'M',
-                'moment' => 'MMM',
-            ),
-            // 1-12
-            'n' => array(
-                'js'     => 'm',
-                'moment' => 'M',
-            ),
-            // number of days in given month
-            't' => array(
-                'js'     => '',
-                'moment' => '',
-            ),
-            // Year
-            // whether leap year or not 1/0
-            'L' => array(
-                'js'     => '',
-                'moment' => '',
-            ),
-            // ISO-8601 year number
-            'o' => array(
-                'js'     => '',
-                'moment' => 'GGGG',
-            ),
-            // 1999...2003
-            'Y' => array(
-                'js'     => 'yy',
-                'moment' => 'YYYY',
-            ),
-            // 99...03
-            'y' => array(
-                'js'     => 'y',
-                'moment' => 'YY',
-            ),
-            // Time
-            // am/pm
-            'a' => array(
-                'js'     => 'tt',
-                'moment' => 'a',
-            ),
-            // AM/PM
-            'A' => array(
-                'js'     => 'TT',
-                'moment' => 'A',
-            ),
-            // Swatch Internet Time?!?
-            'B' => array(
-                'js'     => '',
-                'moment' => '',
-            ),
-            // 1...12
-            'g' => array(
-                'js'     => 'h',
-                'moment' => 'h',
-            ),
-            // 0...23
-            'G' => array(
-                'js'     => 'H',
-                'moment' => 'H',
-            ),
-            // 01...12
-            'h' => array(
-                'js'     => 'hh',
-                'moment' => 'hh',
-            ),
-            // 00...23
-            'H' => array(
-                'js'     => 'HH',
-                'moment' => 'HH',
-            ),
-            // 00..59
-            'i' => array(
-                'js'     => 'mm',
-                'moment' => 'mm',
-            ),
-            // seconds... 00...59
-            's' => array(
-                'js'     => 'ss',
-                'moment' => 'ss',
-            ),
-            // microseconds
-            'u' => array(
-                'js'     => '',
-                'moment' => '',
-            ),
-        );
-        $jquery_ui_format     = '';
-        $moment_format        = '';
-        $escaping             = false;
-        $format_string_length = strlen($format_string);
-        for ($i = 0; $i < $format_string_length; $i++) {
-            $char = $format_string[ $i ];
-            if ($char === '\\') { // PHP date format escaping character
-                $i++;
-                if ($escaping) {
-                    $jquery_ui_format .= $format_string[ $i ];
-                    $moment_format    .= $format_string[ $i ];
-                } else {
-                    $jquery_ui_format .= '\'' . $format_string[ $i ];
-                    $moment_format    .= $format_string[ $i ];
-                }
-                $escaping = true;
-            } else {
-                if ($escaping) {
-                    $jquery_ui_format .= "'";
-                    $moment_format    .= "'";
-                    $escaping         = false;
-                }
-                if (isset($symbols_map[ $char ])) {
-                    $jquery_ui_format .= $symbols_map[ $char ]['js'];
-                    $moment_format    .= $symbols_map[ $char ]['moment'];
-                } else {
-                    $jquery_ui_format .= $char;
-                    $moment_format    .= $char;
-                }
-            }
-        }
-        return array('js' => $jquery_ui_format, 'moment' => $moment_format);
-    }
+	/**
+	 * This converts incoming format string into js and moment variations.
+	 *
+	 * @param string $format_string incoming php format string
+	 * @return array js and moment formats.
+	 */
+	protected static function _php_to_js_moment_converter($format_string)
+	{
+		/**
+		 * This is a map of symbols for formats.
+		 * The index is the php symbol, the equivalent values are in the array.
+		 *
+		 * @var array
+		 */
+		$symbols_map          = array(
+			// Day
+			// 01
+			'd' => array(
+				'js'     => 'dd',
+				'moment' => 'DD',
+			),
+			// Mon
+			'D' => array(
+				'js'     => 'D',
+				'moment' => 'ddd',
+			),
+			// 1,2,...31
+			'j' => array(
+				'js'     => 'd',
+				'moment' => 'D',
+			),
+			// Monday
+			'l' => array(
+				'js'     => 'DD',
+				'moment' => 'dddd',
+			),
+			// ISO numeric representation of the day of the week (1-6)
+			'N' => array(
+				'js'     => '',
+				'moment' => 'E',
+			),
+			// st,nd.rd
+			'S' => array(
+				'js'     => '',
+				'moment' => 'o',
+			),
+			// numeric representation of day of week (0-6)
+			'w' => array(
+				'js'     => '',
+				'moment' => 'd',
+			),
+			// day of year starting from 0 (0-365)
+			'z' => array(
+				'js'     => 'o',
+				'moment' => 'DDD' // note moment does not start with 0 so will need to modify by subtracting 1
+			),
+			// Week
+			// ISO-8601 week number of year (weeks starting on monday)
+			'W' => array(
+				'js'     => '',
+				'moment' => 'w',
+			),
+			// Month
+			// January...December
+			'F' => array(
+				'js'     => 'MM',
+				'moment' => 'MMMM',
+			),
+			// 01...12
+			'm' => array(
+				'js'     => 'mm',
+				'moment' => 'MM',
+			),
+			// Jan...Dec
+			'M' => array(
+				'js'     => 'M',
+				'moment' => 'MMM',
+			),
+			// 1-12
+			'n' => array(
+				'js'     => 'm',
+				'moment' => 'M',
+			),
+			// number of days in given month
+			't' => array(
+				'js'     => '',
+				'moment' => '',
+			),
+			// Year
+			// whether leap year or not 1/0
+			'L' => array(
+				'js'     => '',
+				'moment' => '',
+			),
+			// ISO-8601 year number
+			'o' => array(
+				'js'     => '',
+				'moment' => 'GGGG',
+			),
+			// 1999...2003
+			'Y' => array(
+				'js'     => 'yy',
+				'moment' => 'YYYY',
+			),
+			// 99...03
+			'y' => array(
+				'js'     => 'y',
+				'moment' => 'YY',
+			),
+			// Time
+			// am/pm
+			'a' => array(
+				'js'     => 'tt',
+				'moment' => 'a',
+			),
+			// AM/PM
+			'A' => array(
+				'js'     => 'TT',
+				'moment' => 'A',
+			),
+			// Swatch Internet Time?!?
+			'B' => array(
+				'js'     => '',
+				'moment' => '',
+			),
+			// 1...12
+			'g' => array(
+				'js'     => 'h',
+				'moment' => 'h',
+			),
+			// 0...23
+			'G' => array(
+				'js'     => 'H',
+				'moment' => 'H',
+			),
+			// 01...12
+			'h' => array(
+				'js'     => 'hh',
+				'moment' => 'hh',
+			),
+			// 00...23
+			'H' => array(
+				'js'     => 'HH',
+				'moment' => 'HH',
+			),
+			// 00..59
+			'i' => array(
+				'js'     => 'mm',
+				'moment' => 'mm',
+			),
+			// seconds... 00...59
+			's' => array(
+				'js'     => 'ss',
+				'moment' => 'ss',
+			),
+			// microseconds
+			'u' => array(
+				'js'     => '',
+				'moment' => '',
+			),
+		);
+		$jquery_ui_format     = '';
+		$moment_format        = '';
+		$escaping             = false;
+		$format_string_length = strlen($format_string);
+		for ($i = 0; $i < $format_string_length; $i++) {
+			$char = $format_string[ $i ];
+			if ($char === '\\') { // PHP date format escaping character
+				$i++;
+				if ($escaping) {
+					$jquery_ui_format .= $format_string[ $i ];
+					$moment_format    .= $format_string[ $i ];
+				} else {
+					$jquery_ui_format .= '\'' . $format_string[ $i ];
+					$moment_format    .= $format_string[ $i ];
+				}
+				$escaping = true;
+			} else {
+				if ($escaping) {
+					$jquery_ui_format .= "'";
+					$moment_format    .= "'";
+					$escaping         = false;
+				}
+				if (isset($symbols_map[ $char ])) {
+					$jquery_ui_format .= $symbols_map[ $char ]['js'];
+					$moment_format    .= $symbols_map[ $char ]['moment'];
+				} else {
+					$jquery_ui_format .= $char;
+					$moment_format    .= $char;
+				}
+			}
+		}
+		return array('js' => $jquery_ui_format, 'moment' => $moment_format);
+	}
 
 
-    /**
-     * This takes an incoming format string and validates it to ensure it will work fine with PHP.
-     *
-     * @param string $format_string   Incoming format string for php date().
-     * @return mixed bool|array  If all is okay then TRUE is returned.  Otherwise an array of validation
-     *                                errors is returned.  So for client code calling, check for is_array() to
-     *                                indicate failed validations.
-     */
-    public static function validate_format_string($format_string)
-    {
-        $error_msg = array();
-        // time format checks
-        switch (true) {
-            case strpos($format_string, 'h') !== false:
-            case strpos($format_string, 'g') !== false:
-                /**
-                 * if the time string has a lowercase 'h' which == 12 hour time format and there
-                 * is not any ante meridiem format ('a' or 'A').  Then throw an error because its
-                 * too ambiguous and PHP won't be able to figure out whether 1 = 1pm or 1am.
-                 */
-                if (stripos($format_string, 'A') === false) {
-                    $error_msg[] = esc_html__(
-                        'There is a  time format for 12 hour time but no  "a" or "A" to indicate am/pm.  Without this distinction, PHP is unable to determine if a "1" for the hour value equals "1pm" or "1am".',
-                        'event_espresso'
-                    );
-                }
-                break;
-        }
-        return empty($error_msg) ? true : $error_msg;
-    }
+	/**
+	 * This takes an incoming format string and validates it to ensure it will work fine with PHP.
+	 *
+	 * @param string $format_string   Incoming format string for php date().
+	 * @return mixed bool|array  If all is okay then TRUE is returned.  Otherwise an array of validation
+	 *                                errors is returned.  So for client code calling, check for is_array() to
+	 *                                indicate failed validations.
+	 */
+	public static function validate_format_string($format_string)
+	{
+		$error_msg = array();
+		// time format checks
+		switch (true) {
+			case strpos($format_string, 'h') !== false:
+			case strpos($format_string, 'g') !== false:
+				/**
+				 * if the time string has a lowercase 'h' which == 12 hour time format and there
+				 * is not any ante meridiem format ('a' or 'A').  Then throw an error because its
+				 * too ambiguous and PHP won't be able to figure out whether 1 = 1pm or 1am.
+				 */
+				if (stripos($format_string, 'A') === false) {
+					$error_msg[] = esc_html__(
+						'There is a  time format for 12 hour time but no  "a" or "A" to indicate am/pm.  Without this distinction, PHP is unable to determine if a "1" for the hour value equals "1pm" or "1am".',
+						'event_espresso'
+					);
+				}
+				break;
+		}
+		return empty($error_msg) ? true : $error_msg;
+	}
 
 
-    /**
-     *     If the the first date starts at midnight on one day, and the next date ends at midnight on the
-     *     very next day then this method will return true.
-     *    If $date_1 = 2015-12-15 00:00:00 and $date_2 = 2015-12-16 00:00:00 then this function will return true.
-     *    If $date_1 = 2015-12-15 03:00:00 and $date_2 = 2015-12_16 03:00:00 then this function will return false.
-     *    If $date_1 = 2015-12-15 00:00:00 and $date_2 = 2015-12-15 00:00:00 then this function will return true.
-     *
-     * @param mixed $date_1
-     * @param mixed $date_2
-     * @return bool
-     */
-    public static function dates_represent_one_24_hour_date($date_1, $date_2)
-    {
+	/**
+	 *     If the the first date starts at midnight on one day, and the next date ends at midnight on the
+	 *     very next day then this method will return true.
+	 *    If $date_1 = 2015-12-15 00:00:00 and $date_2 = 2015-12-16 00:00:00 then this function will return true.
+	 *    If $date_1 = 2015-12-15 03:00:00 and $date_2 = 2015-12_16 03:00:00 then this function will return false.
+	 *    If $date_1 = 2015-12-15 00:00:00 and $date_2 = 2015-12-15 00:00:00 then this function will return true.
+	 *
+	 * @param mixed $date_1
+	 * @param mixed $date_2
+	 * @return bool
+	 */
+	public static function dates_represent_one_24_hour_date($date_1, $date_2)
+	{
 
-        if (
-            (! $date_1 instanceof DateTime || ! $date_2 instanceof DateTime)
-            || ($date_1->format(EE_Datetime_Field::mysql_time_format) !== '00:00:00'
-                || $date_2->format(
-                    EE_Datetime_Field::mysql_time_format
-                ) !== '00:00:00')
-        ) {
-            return false;
-        }
-        return $date_2->format('U') - $date_1->format('U') === 86400;
-    }
+		if (
+			(! $date_1 instanceof DateTime || ! $date_2 instanceof DateTime)
+			|| ($date_1->format(EE_Datetime_Field::mysql_time_format) !== '00:00:00'
+				|| $date_2->format(
+					EE_Datetime_Field::mysql_time_format
+				) !== '00:00:00')
+		) {
+			return false;
+		}
+		return $date_2->format('U') - $date_1->format('U') === 86400;
+	}
 
 
-    /**
-     * This returns the appropriate query interval string that can be used in sql queries involving mysql Date
-     * Functions.
-     *
-     * @param string $timezone_string    A timezone string in a valid format to instantiate a DateTimeZone object.
-     * @param string $field_for_interval The Database field that is the interval is applied to in the query.
-     * @return string
-     */
-    public static function get_sql_query_interval_for_offset($timezone_string, $field_for_interval)
-    {
-        try {
-            /** need to account for timezone offset on the selects */
-            $DateTimeZone = new DateTimeZone($timezone_string);
-        } catch (Exception $e) {
-            $DateTimeZone = null;
-        }
-        /**
-         * Note get_option( 'gmt_offset') returns a value in hours, whereas DateTimeZone::getOffset returns values in seconds.
-         * Hence we do the calc for DateTimeZone::getOffset.
-         */
-        $offset         = $DateTimeZone instanceof DateTimeZone
-            ? $DateTimeZone->getOffset(new DateTime('now')) / HOUR_IN_SECONDS
-            : (float) get_option('gmt_offset');
-        $query_interval = $offset < 0
-            ? 'DATE_SUB(' . $field_for_interval . ', INTERVAL ' . $offset * -1 . ' HOUR)'
-            : 'DATE_ADD(' . $field_for_interval . ', INTERVAL ' . $offset . ' HOUR)';
-        return $query_interval;
-    }
+	/**
+	 * This returns the appropriate query interval string that can be used in sql queries involving mysql Date
+	 * Functions.
+	 *
+	 * @param string $timezone_string    A timezone string in a valid format to instantiate a DateTimeZone object.
+	 * @param string $field_for_interval The Database field that is the interval is applied to in the query.
+	 * @return string
+	 */
+	public static function get_sql_query_interval_for_offset($timezone_string, $field_for_interval)
+	{
+		try {
+			/** need to account for timezone offset on the selects */
+			$DateTimeZone = new DateTimeZone($timezone_string);
+		} catch (Exception $e) {
+			$DateTimeZone = null;
+		}
+		/**
+		 * Note get_option( 'gmt_offset') returns a value in hours, whereas DateTimeZone::getOffset returns values in seconds.
+		 * Hence we do the calc for DateTimeZone::getOffset.
+		 */
+		$offset         = $DateTimeZone instanceof DateTimeZone
+			? $DateTimeZone->getOffset(new DateTime('now')) / HOUR_IN_SECONDS
+			: (float) get_option('gmt_offset');
+		$query_interval = $offset < 0
+			? 'DATE_SUB(' . $field_for_interval . ', INTERVAL ' . $offset * -1 . ' HOUR)'
+			: 'DATE_ADD(' . $field_for_interval . ', INTERVAL ' . $offset . ' HOUR)';
+		return $query_interval;
+	}
 
 
-    /**
-     * Retrieves the site's default timezone and returns it formatted so it's ready for display
-     * to users. If you want to customize how its displayed feel free to fetch the 'timezone_string'
-     * and 'gmt_offset' WordPress options directly; or use the filter
-     * FHEE__EEH_DTT_Helper__get_timezone_string_for_display
-     * (although note that we remove any HTML that may be added)
-     *
-     * @return string
-     */
-    public static function get_timezone_string_for_display()
-    {
-        $pretty_timezone = apply_filters('FHEE__EEH_DTT_Helper__get_timezone_string_for_display', '');
-        if (! empty($pretty_timezone)) {
-            return esc_html($pretty_timezone);
-        }
-        $timezone_string = get_option('timezone_string');
-        if ($timezone_string) {
-            static $mo_loaded = false;
-            // Load translations for continents and cities just like wp_timezone_choice does
-            if (! $mo_loaded) {
-                $locale = get_locale();
-                $mofile = WP_LANG_DIR . '/continents-cities-' . $locale . '.mo';
-                load_textdomain('continents-cities', $mofile);
-                $mo_loaded = true;
-            }
-            // well that was easy.
-            $parts = explode('/', $timezone_string);
-            // remove the continent
-            unset($parts[0]);
-            $t_parts = array();
-            // phpcs:disable WordPress.WP.I18n.NonSingularStringLiteralText
-            // phpcs:disable WordPress.WP.I18n.TextDomainMismatch
-            // disabled because this code is copied from WordPress and is a WordPress domain
-            foreach ($parts as $part) {
-                $t_parts[] = translate(str_replace('_', ' ', $part), 'continents-cities');
-            }
-            return implode(' - ', $t_parts);
-            // phpcs:enable
-        }
-        // they haven't set the timezone string, so let's return a string like "UTC+1"
-        $gmt_offset = get_option('gmt_offset');
-        $prefix     = (int) $gmt_offset >= 0 ? '+' : '';
-        $parts      = explode('.', (string) $gmt_offset);
-        if (count($parts) === 1) {
-            $parts[1] = '00';
-        } else {
-            // convert the part after the decimal, eg "5" (from x.5) or "25" (from x.25)
-            // to minutes, eg 30 or 15, respectively
-            $hour_fraction = (float) ('0.' . $parts[1]);
-            $parts[1]      = (string) $hour_fraction * 60;
-        }
-        return sprintf(esc_html__('UTC%1$s', 'event_espresso'), $prefix . implode(':', $parts));
-    }
+	/**
+	 * Retrieves the site's default timezone and returns it formatted so it's ready for display
+	 * to users. If you want to customize how its displayed feel free to fetch the 'timezone_string'
+	 * and 'gmt_offset' WordPress options directly; or use the filter
+	 * FHEE__EEH_DTT_Helper__get_timezone_string_for_display
+	 * (although note that we remove any HTML that may be added)
+	 *
+	 * @return string
+	 */
+	public static function get_timezone_string_for_display()
+	{
+		$pretty_timezone = apply_filters('FHEE__EEH_DTT_Helper__get_timezone_string_for_display', '');
+		if (! empty($pretty_timezone)) {
+			return esc_html($pretty_timezone);
+		}
+		$timezone_string = get_option('timezone_string');
+		if ($timezone_string) {
+			static $mo_loaded = false;
+			// Load translations for continents and cities just like wp_timezone_choice does
+			if (! $mo_loaded) {
+				$locale = get_locale();
+				$mofile = WP_LANG_DIR . '/continents-cities-' . $locale . '.mo';
+				load_textdomain('continents-cities', $mofile);
+				$mo_loaded = true;
+			}
+			// well that was easy.
+			$parts = explode('/', $timezone_string);
+			// remove the continent
+			unset($parts[0]);
+			$t_parts = array();
+			// phpcs:disable WordPress.WP.I18n.NonSingularStringLiteralText
+			// phpcs:disable WordPress.WP.I18n.TextDomainMismatch
+			// disabled because this code is copied from WordPress and is a WordPress domain
+			foreach ($parts as $part) {
+				$t_parts[] = translate(str_replace('_', ' ', $part), 'continents-cities');
+			}
+			return implode(' - ', $t_parts);
+			// phpcs:enable
+		}
+		// they haven't set the timezone string, so let's return a string like "UTC+1"
+		$gmt_offset = get_option('gmt_offset');
+		$prefix     = (int) $gmt_offset >= 0 ? '+' : '';
+		$parts      = explode('.', (string) $gmt_offset);
+		if (count($parts) === 1) {
+			$parts[1] = '00';
+		} else {
+			// convert the part after the decimal, eg "5" (from x.5) or "25" (from x.25)
+			// to minutes, eg 30 or 15, respectively
+			$hour_fraction = (float) ('0.' . $parts[1]);
+			$parts[1]      = (string) $hour_fraction * 60;
+		}
+		return sprintf(esc_html__('UTC%1$s', 'event_espresso'), $prefix . implode(':', $parts));
+	}
 
 
 
-    /**
-     * So PHP does this awesome thing where if you are trying to get a timestamp
-     * for a month using a string like "February" or "February 2017",
-     * and you don't specify a day as part of your string,
-     * then PHP will use whatever the current day of the month is.
-     * IF the current day of the month happens to be the 30th or 31st,
-     * then PHP gets really confused by a date like February 30,
-     * so instead of saying
-     *      "Hey February only has 28 days (this year)...
-     *      ...you must have meant the last day of the month!"
-     * PHP does the next most logical thing, and bumps the date up to March 2nd,
-     * because someone requesting February 30th obviously meant March 1st!
-     * The way around this is to always set the day to the first,
-     * so that the month will stay on the month you wanted.
-     * this method will add that "1" into your date regardless of the format.
-     *
-     * @param string $month
-     * @return string
-     */
-    public static function first_of_month_timestamp($month = '')
-    {
-        $month = (string) $month;
-        $year  = '';
-        // check if the incoming string has a year in it or not
-        if (preg_match('/\b\d{4}\b/', $month, $matches)) {
-            $year = $matches[0];
-            // ten remove that from the month string as well as any spaces
-            $month = trim(str_replace($year, '', $month));
-            // add a space before the year
-            $year = " {$year}";
-        }
-        // return timestamp for something like "February 1 2017"
-        return strtotime("{$month} 1{$year}");
-    }
+	/**
+	 * So PHP does this awesome thing where if you are trying to get a timestamp
+	 * for a month using a string like "February" or "February 2017",
+	 * and you don't specify a day as part of your string,
+	 * then PHP will use whatever the current day of the month is.
+	 * IF the current day of the month happens to be the 30th or 31st,
+	 * then PHP gets really confused by a date like February 30,
+	 * so instead of saying
+	 *      "Hey February only has 28 days (this year)...
+	 *      ...you must have meant the last day of the month!"
+	 * PHP does the next most logical thing, and bumps the date up to March 2nd,
+	 * because someone requesting February 30th obviously meant March 1st!
+	 * The way around this is to always set the day to the first,
+	 * so that the month will stay on the month you wanted.
+	 * this method will add that "1" into your date regardless of the format.
+	 *
+	 * @param string $month
+	 * @return string
+	 */
+	public static function first_of_month_timestamp($month = '')
+	{
+		$month = (string) $month;
+		$year  = '';
+		// check if the incoming string has a year in it or not
+		if (preg_match('/\b\d{4}\b/', $month, $matches)) {
+			$year = $matches[0];
+			// ten remove that from the month string as well as any spaces
+			$month = trim(str_replace($year, '', $month));
+			// add a space before the year
+			$year = " {$year}";
+		}
+		// return timestamp for something like "February 1 2017"
+		return strtotime("{$month} 1{$year}");
+	}
 
 
-    /**
-     * This simply returns the timestamp for tomorrow (midnight next day) in this sites timezone.  So it may be midnight
-     * for this sites timezone, but the timestamp could be some other time GMT.
-     */
-    public static function tomorrow()
-    {
-        // The multiplication of -1 ensures that we switch positive offsets to negative and negative offsets to positive
-        // before adding to the timestamp.  Why? Because we want tomorrow to be for midnight the next day in THIS timezone
-        // not an offset from midnight in UTC.  So if we're starting with UTC 00:00:00, then we want to make sure the
-        // final timestamp is equivalent to midnight in this timezone as represented in GMT.
-        return strtotime('tomorrow') + (self::get_site_timezone_gmt_offset() * -1);
-    }
+	/**
+	 * This simply returns the timestamp for tomorrow (midnight next day) in this sites timezone.  So it may be midnight
+	 * for this sites timezone, but the timestamp could be some other time GMT.
+	 */
+	public static function tomorrow()
+	{
+		// The multiplication of -1 ensures that we switch positive offsets to negative and negative offsets to positive
+		// before adding to the timestamp.  Why? Because we want tomorrow to be for midnight the next day in THIS timezone
+		// not an offset from midnight in UTC.  So if we're starting with UTC 00:00:00, then we want to make sure the
+		// final timestamp is equivalent to midnight in this timezone as represented in GMT.
+		return strtotime('tomorrow') + (self::get_site_timezone_gmt_offset() * -1);
+	}
 
 
-    /**
-     * **
-     * Gives a nicely-formatted list of timezone strings.
-     * Copied from the core wp function by the same name so we could customize to remove UTC offsets.
-     *
-     * @since     4.9.40.rc.008
-     * @staticvar bool $mo_loaded
-     * @staticvar string $locale_loaded
-     * @param string $selected_zone Selected timezone.
-     * @param string $locale        Optional. Locale to load the timezones in. Default current site locale.
-     * @return string
-     */
-    public static function wp_timezone_choice($selected_zone, $locale = null)
-    {
-        static $mo_loaded = false, $locale_loaded = null;
-        $continents = array(
-            'Africa',
-            'America',
-            'Antarctica',
-            'Arctic',
-            'Asia',
-            'Atlantic',
-            'Australia',
-            'Europe',
-            'Indian',
-            'Pacific',
-        );
-        // Load translations for continents and cities.
-        if (! $mo_loaded || $locale !== $locale_loaded) {
-            $locale_loaded = $locale ? $locale : get_locale();
-            $mofile        = WP_LANG_DIR . '/continents-cities-' . $locale_loaded . '.mo';
-            unload_textdomain('continents-cities');
-            load_textdomain('continents-cities', $mofile);
-            $mo_loaded = true;
-        }
-        $zone_data = array();
-        foreach (timezone_identifiers_list() as $zone) {
-            $zone = explode('/', $zone);
-            if (! in_array($zone[0], $continents, true)) {
-                continue;
-            }
-            // This determines what gets set and translated - we don't translate Etc/* strings here, they are done later
-            $exists      = array(
-                0 => isset($zone[0]) && $zone[0],
-                1 => isset($zone[1]) && $zone[1],
-                2 => isset($zone[2]) && $zone[2],
-            );
-            $exists[3]   = $exists[0] && $zone[0] !== 'Etc';
-            $exists[4]   = $exists[1] && $exists[3];
-            $exists[5]   = $exists[2] && $exists[3];
-            // phpcs:disable WordPress.WP.I18n.NonSingularStringLiteralText
-            // phpcs:disable WordPress.WP.I18n.TextDomainMismatch
-            // disabled because this code is copied from WordPress and is a WordPress domain
-            $zone_data[] = array(
-                'continent'   => $exists[0] ? $zone[0] : '',
-                'city'        => $exists[1] ? $zone[1] : '',
-                'subcity'     => $exists[2] ? $zone[2] : '',
-                't_continent' => $exists[3]
-                    ? translate(str_replace('_', ' ', $zone[0]), 'continents-cities')
-                    : '',
-                't_city'      => $exists[4]
-                    ? translate(str_replace('_', ' ', $zone[1]), 'continents-cities')
-                    : '',
-                't_subcity'   => $exists[5]
-                    ? translate(str_replace('_', ' ', $zone[2]), 'continents-cities')
-                    : '',
-            );
-            // phpcs:enable
-        }
-        usort($zone_data, '_wp_timezone_choice_usort_callback');
-        $structure = array();
-        if (empty($selected_zone)) {
-            $structure[] = '<option selected value="">' . esc_html__('Select a city', 'event_espresso') . '</option>';
-        }
-        foreach ($zone_data as $key => $zone) {
-            // Build value in an array to join later
-            $value = array($zone['continent']);
-            if (empty($zone['city'])) {
-                // It's at the continent level (generally won't happen)
-                $display = $zone['t_continent'];
-            } else {
-                // It's inside a continent group
-                // Continent optgroup
-                if (! isset($zone_data[ $key - 1 ]) || $zone_data[ $key - 1 ]['continent'] !== $zone['continent']) {
-                    $label       = $zone['t_continent'];
-                    $structure[] = '<optgroup label="' . esc_attr($label) . '">';
-                }
-                // Add the city to the value
-                $value[] = $zone['city'];
-                $display = $zone['t_city'];
-                if (! empty($zone['subcity'])) {
-                    // Add the subcity to the value
-                    $value[] = $zone['subcity'];
-                    $display .= ' - ' . $zone['t_subcity'];
-                }
-            }
-            // Build the value
-            $value       = implode('/', $value);
-            $selected    = $value === $selected_zone ? ' selected' : '';
-            $structure[] = '<option value="' . esc_attr($value) . '"' . $selected . '>'
-                           . esc_html($display)
-                           . '</option>';
-            // Close continent optgroup
-            if (
-                ! empty($zone['city'])
-                && (
-                    ! isset($zone_data[ $key + 1 ])
-                    || (isset($zone_data[ $key + 1 ]) && $zone_data[ $key + 1 ]['continent'] !== $zone['continent'])
-                )
-            ) {
-                $structure[] = '</optgroup>';
-            }
-        }
-        return implode("\n", $structure);
-    }
+	/**
+	 * **
+	 * Gives a nicely-formatted list of timezone strings.
+	 * Copied from the core wp function by the same name so we could customize to remove UTC offsets.
+	 *
+	 * @since     4.9.40.rc.008
+	 * @staticvar bool $mo_loaded
+	 * @staticvar string $locale_loaded
+	 * @param string $selected_zone Selected timezone.
+	 * @param string $locale        Optional. Locale to load the timezones in. Default current site locale.
+	 * @return string
+	 */
+	public static function wp_timezone_choice($selected_zone, $locale = null)
+	{
+		static $mo_loaded = false, $locale_loaded = null;
+		$continents = array(
+			'Africa',
+			'America',
+			'Antarctica',
+			'Arctic',
+			'Asia',
+			'Atlantic',
+			'Australia',
+			'Europe',
+			'Indian',
+			'Pacific',
+		);
+		// Load translations for continents and cities.
+		if (! $mo_loaded || $locale !== $locale_loaded) {
+			$locale_loaded = $locale ? $locale : get_locale();
+			$mofile        = WP_LANG_DIR . '/continents-cities-' . $locale_loaded . '.mo';
+			unload_textdomain('continents-cities');
+			load_textdomain('continents-cities', $mofile);
+			$mo_loaded = true;
+		}
+		$zone_data = array();
+		foreach (timezone_identifiers_list() as $zone) {
+			$zone = explode('/', $zone);
+			if (! in_array($zone[0], $continents, true)) {
+				continue;
+			}
+			// This determines what gets set and translated - we don't translate Etc/* strings here, they are done later
+			$exists      = array(
+				0 => isset($zone[0]) && $zone[0],
+				1 => isset($zone[1]) && $zone[1],
+				2 => isset($zone[2]) && $zone[2],
+			);
+			$exists[3]   = $exists[0] && $zone[0] !== 'Etc';
+			$exists[4]   = $exists[1] && $exists[3];
+			$exists[5]   = $exists[2] && $exists[3];
+			// phpcs:disable WordPress.WP.I18n.NonSingularStringLiteralText
+			// phpcs:disable WordPress.WP.I18n.TextDomainMismatch
+			// disabled because this code is copied from WordPress and is a WordPress domain
+			$zone_data[] = array(
+				'continent'   => $exists[0] ? $zone[0] : '',
+				'city'        => $exists[1] ? $zone[1] : '',
+				'subcity'     => $exists[2] ? $zone[2] : '',
+				't_continent' => $exists[3]
+					? translate(str_replace('_', ' ', $zone[0]), 'continents-cities')
+					: '',
+				't_city'      => $exists[4]
+					? translate(str_replace('_', ' ', $zone[1]), 'continents-cities')
+					: '',
+				't_subcity'   => $exists[5]
+					? translate(str_replace('_', ' ', $zone[2]), 'continents-cities')
+					: '',
+			);
+			// phpcs:enable
+		}
+		usort($zone_data, '_wp_timezone_choice_usort_callback');
+		$structure = array();
+		if (empty($selected_zone)) {
+			$structure[] = '<option selected value="">' . esc_html__('Select a city', 'event_espresso') . '</option>';
+		}
+		foreach ($zone_data as $key => $zone) {
+			// Build value in an array to join later
+			$value = array($zone['continent']);
+			if (empty($zone['city'])) {
+				// It's at the continent level (generally won't happen)
+				$display = $zone['t_continent'];
+			} else {
+				// It's inside a continent group
+				// Continent optgroup
+				if (! isset($zone_data[ $key - 1 ]) || $zone_data[ $key - 1 ]['continent'] !== $zone['continent']) {
+					$label       = $zone['t_continent'];
+					$structure[] = '<optgroup label="' . esc_attr($label) . '">';
+				}
+				// Add the city to the value
+				$value[] = $zone['city'];
+				$display = $zone['t_city'];
+				if (! empty($zone['subcity'])) {
+					// Add the subcity to the value
+					$value[] = $zone['subcity'];
+					$display .= ' - ' . $zone['t_subcity'];
+				}
+			}
+			// Build the value
+			$value       = implode('/', $value);
+			$selected    = $value === $selected_zone ? ' selected' : '';
+			$structure[] = '<option value="' . esc_attr($value) . '"' . $selected . '>'
+						   . esc_html($display)
+						   . '</option>';
+			// Close continent optgroup
+			if (
+				! empty($zone['city'])
+				&& (
+					! isset($zone_data[ $key + 1 ])
+					|| (isset($zone_data[ $key + 1 ]) && $zone_data[ $key + 1 ]['continent'] !== $zone['continent'])
+				)
+			) {
+				$structure[] = '</optgroup>';
+			}
+		}
+		return implode("\n", $structure);
+	}
 
 
-    /**
-     * Shim for the WP function `get_user_locale` that was added in WordPress 4.7.0
-     *
-     * @param int|WP_User $user_id
-     * @return string
-     */
-    public static function get_user_locale($user_id = 0)
-    {
-        if (function_exists('get_user_locale')) {
-            return get_user_locale($user_id);
-        }
-        return get_locale();
-    }
+	/**
+	 * Shim for the WP function `get_user_locale` that was added in WordPress 4.7.0
+	 *
+	 * @param int|WP_User $user_id
+	 * @return string
+	 */
+	public static function get_user_locale($user_id = 0)
+	{
+		if (function_exists('get_user_locale')) {
+			return get_user_locale($user_id);
+		}
+		return get_locale();
+	}
 
 
-    /**
-     * Return the appropriate helper adapter for DTT related things.
-     *
-     * @return HelperInterface
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    private static function getHelperAdapter()
-    {
-        $dtt_helper_fqcn = PHP_VERSION_ID < 50600
-            ? 'EventEspresso\core\services\helpers\datetime\PhpCompatLessFiveSixHelper'
-            : 'EventEspresso\core\services\helpers\datetime\PhpCompatGreaterFiveSixHelper';
-        return LoaderFactory::getLoader()->getShared($dtt_helper_fqcn);
-    }
+	/**
+	 * Return the appropriate helper adapter for DTT related things.
+	 *
+	 * @return HelperInterface
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	private static function getHelperAdapter()
+	{
+		$dtt_helper_fqcn = PHP_VERSION_ID < 50600
+			? 'EventEspresso\core\services\helpers\datetime\PhpCompatLessFiveSixHelper'
+			: 'EventEspresso\core\services\helpers\datetime\PhpCompatGreaterFiveSixHelper';
+		return LoaderFactory::getLoader()->getShared($dtt_helper_fqcn);
+	}
 
 
-    /**
-     * Helper function for setting the timezone on a DateTime object.
-     * This is implemented to standardize a workaround for a PHP bug outlined in
-     * https://events.codebasehq.com/projects/event-espresso/tickets/11407 and
-     * https://events.codebasehq.com/projects/event-espresso/tickets/11233
-     *
-     * @param DateTime     $datetime
-     * @param DateTimeZone $timezone
-     */
-    public static function setTimezone(DateTime $datetime, DateTimeZone $timezone)
-    {
-        $datetime->setTimezone($timezone);
-        $datetime->getTimestamp();
-    }
+	/**
+	 * Helper function for setting the timezone on a DateTime object.
+	 * This is implemented to standardize a workaround for a PHP bug outlined in
+	 * https://events.codebasehq.com/projects/event-espresso/tickets/11407 and
+	 * https://events.codebasehq.com/projects/event-espresso/tickets/11233
+	 *
+	 * @param DateTime     $datetime
+	 * @param DateTimeZone $timezone
+	 */
+	public static function setTimezone(DateTime $datetime, DateTimeZone $timezone)
+	{
+		$datetime->setTimezone($timezone);
+		$datetime->getTimestamp();
+	}
 }

core/templates/json_linked_data_for_event.template.php

Indentation +15 added lines, -15 removed lines

@@ -29,8 +29,8 @@ 
   "eventStatus": [ "<?php echo esc_url_raw($event_status); ?>" ],
   "offers": [
     <?php
-    $i = 0;
-    foreach ($event_tickets as $ticket) {?>
+	$i = 0;
+	foreach ($event_tickets as $ticket) {?>
     {
       "@type": "Offer",
       "url": "<?php echo esc_url_raw($event_permalink); ?>",
@@ -39,18 +39,18 @@ 
       "price": "<?php echo esc_html($ticket['price']); ?>",
       "priceCurrency": "<?php echo esc_html($currency); ?>"
         <?php if (isset($ticket['availability'])) {
-            ?>,"availability": "<?php echo esc_url_raw('https://schema.org/' . $ticket['availability']); ?>"
+			?>,"availability": "<?php echo esc_url_raw('https://schema.org/' . $ticket['availability']); ?>"
         <?php } ?>
     }<?php
-    $i++;
-    if ($i < count($event_tickets)) {
-        echo ',';
-    }
-    }
-    ?>
+	$i++;
+	if ($i < count($event_tickets)) {
+		echo ',';
+	}
+	}
+	?>
     ]<?php
-    if ($venue_name) {
-        ?>,
+	if ($venue_name) {
+		?>,
   "location": {
     "@type": "Place",
     "name": <?php echo wp_json_encode($venue_name); ?>,
@@ -63,13 +63,13 @@ 
     }
   }
         <?php
-    } ?>
+	} ?>
     <?php
-    if ($event_image) {
-        ?>,
+	if ($event_image) {
+		?>,
   "image": "<?php echo esc_url_raw($event_image); ?>"
         <?php
-    } ?>
+	} ?>
     <?php do_action('AHEE__json_linked_data_for_event__template'); ?>
 }
 

core/libraries/form_sections/strategies/display/EE_Checkbox_Display_Strategy.strategy.php

Spacing +10 added lines, -10 removed lines

@@ -22,7 +22,7 @@ 
         $input->set_label_sizes();
         $label_size_class = $input->get_label_size_class();
         $html = '';
-        if (! is_array($input->raw_value()) && $input->raw_value() !== null) {
+        if ( ! is_array($input->raw_value()) && $input->raw_value() !== null) {
             EE_Error::doing_it_wrong(
                 'EE_Checkbox_Display_Strategy::display()',
                 sprintf(
@@ -33,7 +33,7 @@ 
                     ),
                     $input->html_id(),
                     var_export($input->raw_value(), true),
-                    $input->html_name() . '[]'
+                    $input->html_name().'[]'
                 ),
                 '4.8.1'
             );
@@ -52,19 +52,19 @@ 
                      . '">';
             $html .= EEH_HTML::nl(1, 'checkbox');
             $html .= '<input type="checkbox"';
-            $html .= ' name="' . $input->html_name() . '[]"';
-            $html .= ' id="' . $html_id . '"';
-            $html .= ' class="' . $input->html_class() . '"';
-            $html .= ' style="' . $input->html_style() . '"';
-            $html .= ' value="' . esc_attr($value) . '"';
+            $html .= ' name="'.$input->html_name().'[]"';
+            $html .= ' id="'.$html_id.'"';
+            $html .= ' class="'.$input->html_class().'"';
+            $html .= ' style="'.$input->html_style().'"';
+            $html .= ' value="'.esc_attr($value).'"';
             $html .= ! empty($input_raw_value) && in_array($value, $input_raw_value, true)
                 ? ' checked'
                 : '';
-            $html .= ' ' . $this->_input->other_html_attributes();
-            $html .= ' data-question_label="' . $input->html_label_id() . '"';
+            $html .= ' '.$this->_input->other_html_attributes();
+            $html .= ' data-question_label="'.$input->html_label_id().'"';
             $html .= '>&nbsp;';
             $html .= $display_text;
-            $html .= EEH_HTML::nl(-1, 'checkbox') . '</label>';
+            $html .= EEH_HTML::nl(-1, 'checkbox').'</label>';
         }
         return $html;
     }

Indentation +56 added lines, -56 removed lines

@@ -11,60 +11,60 @@
  */
 class EE_Checkbox_Display_Strategy extends EE_Compound_Input_Display_Strategy
 {
-    /**
-     * @throws EE_Error
-     * @return string of html to display the field
-     */
-    public function display()
-    {
-        $input = $this->get_input();
-        $input->set_label_sizes();
-        $label_size_class = $input->get_label_size_class();
-        $html = '';
-        if (! is_array($input->raw_value()) && $input->raw_value() !== null) {
-            EE_Error::doing_it_wrong(
-                'EE_Checkbox_Display_Strategy::display()',
-                sprintf(
-                    esc_html_x(
-                        'Input values for checkboxes should be an array of values, but the value for input "%1$s" is "%2$s". Please verify that the input name is exactly "%3$s"',
-                        'Input values for checkboxes should be an array of values, but the value for input "form-input-id" is "form-input-value". Please verify that the input name is exactly "form_input_name[]"',
-                        'event_espresso'
-                    ),
-                    $input->html_id(),
-                    var_export($input->raw_value(), true),
-                    $input->html_name() . '[]'
-                ),
-                '4.8.1'
-            );
-        }
-        $input_raw_value = (array) $input->raw_value();
-        foreach ($input->options() as $value => $display_text) {
-            $value = $input->get_normalization_strategy()->unnormalize_one($value);
-            $html_id = $this->get_sub_input_id($value);
-            $html .= EEH_HTML::nl(0, 'checkbox');
-            $html .= '<label for="'
-                     . $html_id
-                     . '" id="'
-                     . $html_id
-                     . '-lbl" class="ee-checkbox-label-after'
-                     . $label_size_class
-                     . '">';
-            $html .= EEH_HTML::nl(1, 'checkbox');
-            $html .= '<input type="checkbox"';
-            $html .= ' name="' . $input->html_name() . '[]"';
-            $html .= ' id="' . $html_id . '"';
-            $html .= ' class="' . $input->html_class() . '"';
-            $html .= ' style="' . $input->html_style() . '"';
-            $html .= ' value="' . esc_attr($value) . '"';
-            $html .= ! empty($input_raw_value) && in_array($value, $input_raw_value, true)
-                ? ' checked'
-                : '';
-            $html .= ' ' . $this->_input->other_html_attributes();
-            $html .= ' data-question_label="' . $input->html_label_id() . '"';
-            $html .= '>&nbsp;';
-            $html .= $display_text;
-            $html .= EEH_HTML::nl(-1, 'checkbox') . '</label>';
-        }
-        return $html;
-    }
+	/**
+	 * @throws EE_Error
+	 * @return string of html to display the field
+	 */
+	public function display()
+	{
+		$input = $this->get_input();
+		$input->set_label_sizes();
+		$label_size_class = $input->get_label_size_class();
+		$html = '';
+		if (! is_array($input->raw_value()) && $input->raw_value() !== null) {
+			EE_Error::doing_it_wrong(
+				'EE_Checkbox_Display_Strategy::display()',
+				sprintf(
+					esc_html_x(
+						'Input values for checkboxes should be an array of values, but the value for input "%1$s" is "%2$s". Please verify that the input name is exactly "%3$s"',
+						'Input values for checkboxes should be an array of values, but the value for input "form-input-id" is "form-input-value". Please verify that the input name is exactly "form_input_name[]"',
+						'event_espresso'
+					),
+					$input->html_id(),
+					var_export($input->raw_value(), true),
+					$input->html_name() . '[]'
+				),
+				'4.8.1'
+			);
+		}
+		$input_raw_value = (array) $input->raw_value();
+		foreach ($input->options() as $value => $display_text) {
+			$value = $input->get_normalization_strategy()->unnormalize_one($value);
+			$html_id = $this->get_sub_input_id($value);
+			$html .= EEH_HTML::nl(0, 'checkbox');
+			$html .= '<label for="'
+					 . $html_id
+					 . '" id="'
+					 . $html_id
+					 . '-lbl" class="ee-checkbox-label-after'
+					 . $label_size_class
+					 . '">';
+			$html .= EEH_HTML::nl(1, 'checkbox');
+			$html .= '<input type="checkbox"';
+			$html .= ' name="' . $input->html_name() . '[]"';
+			$html .= ' id="' . $html_id . '"';
+			$html .= ' class="' . $input->html_class() . '"';
+			$html .= ' style="' . $input->html_style() . '"';
+			$html .= ' value="' . esc_attr($value) . '"';
+			$html .= ! empty($input_raw_value) && in_array($value, $input_raw_value, true)
+				? ' checked'
+				: '';
+			$html .= ' ' . $this->_input->other_html_attributes();
+			$html .= ' data-question_label="' . $input->html_label_id() . '"';
+			$html .= '>&nbsp;';
+			$html .= $display_text;
+			$html .= EEH_HTML::nl(-1, 'checkbox') . '</label>';
+		}
+		return $html;
+	}
 }

core/libraries/form_sections/strategies/display/EE_Select_Display_Strategy.strategy.php

Spacing +7 added lines, -7 removed lines

@@ -22,7 +22,7 @@ 
      */
     public function display()
     {
-        if (! $this->_input instanceof EE_Form_Input_With_Options_Base) {
+        if ( ! $this->_input instanceof EE_Form_Input_With_Options_Base) {
             throw new EE_Error(sprintf(esc_html__('Cannot use Select Display Strategy with an input that doesn\'t have options', 'event_espresso')));
         }
 
@@ -36,14 +36,14 @@ 
         if (EEH_Array::is_multi_dimensional_array($this->_input->options())) {
             EEH_HTML::indent(1, 'optgroup');
             foreach ($this->_input->options() as $opt_group_label => $opt_group) {
-                if (! empty($opt_group_label)) {
-                    $html .= EEH_HTML::nl(0, 'optgroup') . '<optgroup label="' . esc_attr($opt_group_label) . '">';
+                if ( ! empty($opt_group_label)) {
+                    $html .= EEH_HTML::nl(0, 'optgroup').'<optgroup label="'.esc_attr($opt_group_label).'">';
                 }
                 EEH_HTML::indent(1, 'option');
                 $html .= $this->_display_options($opt_group);
                 EEH_HTML::indent(-1, 'option');
-                if (! empty($opt_group_label)) {
-                    $html .= EEH_HTML::nl(0, 'optgroup') . '</optgroup>';
+                if ( ! empty($opt_group_label)) {
+                    $html .= EEH_HTML::nl(0, 'optgroup').'</optgroup>';
                 }
             }
             EEH_HTML::indent(-1, 'optgroup');
@@ -51,7 +51,7 @@ 
             $html .= $this->_display_options($this->_input->options());
         }
 
-        $html .= EEH_HTML::nl(0, 'select') . '</select>';
+        $html .= EEH_HTML::nl(0, 'select').'</select>';
         return $html;
     }
 
@@ -71,7 +71,7 @@ 
             // PHP will have converted it to a PHP integer (eg 123). So we need to make sure it's a string
             $unnormalized_value = $this->_input->get_normalization_strategy()->unnormalize_one($value);
             $selected = $this->_check_if_option_selected($unnormalized_value) ? ' selected' : '';
-            $html .= EEH_HTML::nl(0, 'option') . '<option value="' . esc_attr($unnormalized_value) . '"' . $selected . '>' . $display_text . '</option>';
+            $html .= EEH_HTML::nl(0, 'option').'<option value="'.esc_attr($unnormalized_value).'"'.$selected.'>'.$display_text.'</option>';
         }
         EEH_HTML::indent(-1, 'option');
         return $html;

Indentation +65 added lines, -65 removed lines

@@ -14,78 +14,78 @@
  */
 class EE_Select_Display_Strategy extends EE_Display_Strategy_Base
 {
-    /**
-     *
-     * @throws EE_Error
-     * @return string of html to display the field
-     */
-    public function display()
-    {
-        if (! $this->_input instanceof EE_Form_Input_With_Options_Base) {
-            throw new EE_Error(sprintf(esc_html__('Cannot use Select Display Strategy with an input that doesn\'t have options', 'event_espresso')));
-        }
+	/**
+	 *
+	 * @throws EE_Error
+	 * @return string of html to display the field
+	 */
+	public function display()
+	{
+		if (! $this->_input instanceof EE_Form_Input_With_Options_Base) {
+			throw new EE_Error(sprintf(esc_html__('Cannot use Select Display Strategy with an input that doesn\'t have options', 'event_espresso')));
+		}
 
-        $html = EEH_HTML::nl(0, 'select');
-        $html .= '<select';
-        $html .= $this->_attributes_string(
-            $this->_standard_attributes_array()
-        );
-        $html .= '>';
+		$html = EEH_HTML::nl(0, 'select');
+		$html .= '<select';
+		$html .= $this->_attributes_string(
+			$this->_standard_attributes_array()
+		);
+		$html .= '>';
 
-        if (EEH_Array::is_multi_dimensional_array($this->_input->options())) {
-            EEH_HTML::indent(1, 'optgroup');
-            foreach ($this->_input->options() as $opt_group_label => $opt_group) {
-                if (! empty($opt_group_label)) {
-                    $html .= EEH_HTML::nl(0, 'optgroup') . '<optgroup label="' . esc_attr($opt_group_label) . '">';
-                }
-                EEH_HTML::indent(1, 'option');
-                $html .= $this->_display_options($opt_group);
-                EEH_HTML::indent(-1, 'option');
-                if (! empty($opt_group_label)) {
-                    $html .= EEH_HTML::nl(0, 'optgroup') . '</optgroup>';
-                }
-            }
-            EEH_HTML::indent(-1, 'optgroup');
-        } else {
-            $html .= $this->_display_options($this->_input->options());
-        }
+		if (EEH_Array::is_multi_dimensional_array($this->_input->options())) {
+			EEH_HTML::indent(1, 'optgroup');
+			foreach ($this->_input->options() as $opt_group_label => $opt_group) {
+				if (! empty($opt_group_label)) {
+					$html .= EEH_HTML::nl(0, 'optgroup') . '<optgroup label="' . esc_attr($opt_group_label) . '">';
+				}
+				EEH_HTML::indent(1, 'option');
+				$html .= $this->_display_options($opt_group);
+				EEH_HTML::indent(-1, 'option');
+				if (! empty($opt_group_label)) {
+					$html .= EEH_HTML::nl(0, 'optgroup') . '</optgroup>';
+				}
+			}
+			EEH_HTML::indent(-1, 'optgroup');
+		} else {
+			$html .= $this->_display_options($this->_input->options());
+		}
 
-        $html .= EEH_HTML::nl(0, 'select') . '</select>';
-        return $html;
-    }
+		$html .= EEH_HTML::nl(0, 'select') . '</select>';
+		return $html;
+	}
 
 
 
-    /**
-     * Displays a flat list of options as option tags
-     * @param array $options
-     * @return string
-     */
-    protected function _display_options($options)
-    {
-        $html = '';
-        EEH_HTML::indent(1, 'option');
-        foreach ($options as $value => $display_text) {
-            // even if this input uses EE_Text_Normalization if one of the array keys is a numeric string, like "123",
-            // PHP will have converted it to a PHP integer (eg 123). So we need to make sure it's a string
-            $unnormalized_value = $this->_input->get_normalization_strategy()->unnormalize_one($value);
-            $selected = $this->_check_if_option_selected($unnormalized_value) ? ' selected' : '';
-            $html .= EEH_HTML::nl(0, 'option') . '<option value="' . esc_attr($unnormalized_value) . '"' . $selected . '>' . $display_text . '</option>';
-        }
-        EEH_HTML::indent(-1, 'option');
-        return $html;
-    }
+	/**
+	 * Displays a flat list of options as option tags
+	 * @param array $options
+	 * @return string
+	 */
+	protected function _display_options($options)
+	{
+		$html = '';
+		EEH_HTML::indent(1, 'option');
+		foreach ($options as $value => $display_text) {
+			// even if this input uses EE_Text_Normalization if one of the array keys is a numeric string, like "123",
+			// PHP will have converted it to a PHP integer (eg 123). So we need to make sure it's a string
+			$unnormalized_value = $this->_input->get_normalization_strategy()->unnormalize_one($value);
+			$selected = $this->_check_if_option_selected($unnormalized_value) ? ' selected' : '';
+			$html .= EEH_HTML::nl(0, 'option') . '<option value="' . esc_attr($unnormalized_value) . '"' . $selected . '>' . $display_text . '</option>';
+		}
+		EEH_HTML::indent(-1, 'option');
+		return $html;
+	}
 
 
 
-    /**
-     * Checks if that value is the one selected
-     *
-     * @param string|int $option_value unnormalized value option (string). How it will appear in the HTML.
-     * @return string
-     */
-    protected function _check_if_option_selected($option_value)
-    {
-        return $option_value === $this->_input->raw_value();
-    }
+	/**
+	 * Checks if that value is the one selected
+	 *
+	 * @param string|int $option_value unnormalized value option (string). How it will appear in the HTML.
+	 * @return string
+	 */
+	protected function _check_if_option_selected($option_value)
+	{
+		return $option_value === $this->_input->raw_value();
+	}
 }

caffeinated/admin/new/pricing/templates/event_tickets_datetime_ticket_row.template.php

Indentation +22 added lines, -22 removed lines

@@ -81,7 +81,7 @@ 
                maxlength='245'
                name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo esc_attr($tkt_row); ?>][TKT_name]"
                placeholder="<?php
-               esc_html_e('Ticket Title', 'event_espresso') ?>"
+			   esc_html_e('Ticket Title', 'event_espresso') ?>"
                value="<?php echo esc_attr($TKT_name); ?>"
         />
     </td>
@@ -327,7 +327,7 @@ 
                                        for='edit-ticket-TKT_uses-<?php echo esc_attr($tkt_row); ?>'
                                 >
                                     <?php
-                                    esc_html_e('Ticket Uses', 'event_espresso') ?>
+									esc_html_e('Ticket Uses', 'event_espresso') ?>
                                 </label>
                                 <input type="text"
                                        class="edit-ticket-TKT_uses ee-small-text-inp ee-numeric"
@@ -346,7 +346,7 @@ 
                                 />
                                 <label class='screen-reader-text' for='disabled-ticket-TKT_min-<?php echo esc_attr($tkt_row);?>'>
                                     <?php
-                                    esc_html_e('Minimum Quantity', 'event_espresso') ?>
+									esc_html_e('Minimum Quantity', 'event_espresso') ?>
                                 </label>
                                 <input type="text" disabled
                                        class="edit-ticket-TKT_min ee-small-text-inp ee-numeric"
@@ -408,14 +408,14 @@ 
                                id="edit-ticket-TKT_required-<?php echo esc_attr($tkt_row); ?>"
                                value="1"
                             <?php
-                                echo ($TKT_required ? ' checked' : '');
-                                echo ($disabled ? ' disabled' : '');
-                            ?>
+								echo ($TKT_required ? ' checked' : '');
+								echo ($disabled ? ' disabled' : '');
+							?>
                         />
                         <?php esc_html_e(
-                            'This ticket is required (will appear first in frontend ticket lists).',
-                            'event_espresso'
-                        ); ?>
+							'This ticket is required (will appear first in frontend ticket lists).',
+							'event_espresso'
+						); ?>
                     </label>
                 </div>
                 <div class="ticket-is-taxable-container">
@@ -517,32 +517,32 @@ 
             <h4 class="tickets-heading"><?php esc_html_e('Event Datetimes', 'event_espresso'); ?></h4>
             <p>
             <?php  esc_html_e(
-                'This ticket will be usable (allow entrance) for the following selected event datetimes (click to select).  The "# Datetimes" amount (above) indicates how many of the assigned datetimes the ticket holder can gain access to:',
-                'event_espresso'
-            ); ?>
+				'This ticket will be usable (allow entrance) for the following selected event datetimes (click to select).  The "# Datetimes" amount (above) indicates how many of the assigned datetimes the ticket holder can gain access to:',
+				'event_espresso'
+			); ?>
             </p>
             <ul class="datetime-tickets-list">
                 <?php echo wp_kses($ticket_datetimes_list, AllowedTags::getWithFormTags()); ?>
             </ul>
 
             <?php do_action(
-                'AHEE__event_tickets_datetime_ticket_row_template__advanced_details_end',
-                $tkt_row,
-                $TKT_ID
-            ); ?>
+				'AHEE__event_tickets_datetime_ticket_row_template__advanced_details_end',
+				$tkt_row,
+				$TKT_ID
+			); ?>
             <div class="ee-editor-footer-container">
                 <div class="ee-editor-id-container">
                     <span class="ee-item-id"><?php
-                        echo ($TKT_ID
-                            ? sprintf(esc_html__('Ticket ID: %d', 'event_espresso'), $TKT_ID)
-                            : ''); ?></span>
+						echo ($TKT_ID
+							? sprintf(esc_html__('Ticket ID: %d', 'event_espresso'), $TKT_ID)
+							: ''); ?></span>
                 </div>
                 <div class="save-cancel-button-container">
                     <label for="edit-ticket-TKT_is_default_selector-<?php echo esc_attr($tkt_row); ?>">
                         <?php esc_html_e(
-                            'use this new ticket as a default ticket for any new events',
-                            'event_espresso'
-                        ); ?>
+							'use this new ticket as a default ticket for any new events',
+							'event_espresso'
+						); ?>
                         <input type="checkbox"
                                name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo esc_attr($tkt_row); ?>][TKT_is_default_selector]"
                                class="edit-ticket-TKT_is_default_selector"

Spacing +10 added lines, -10 removed lines

@@ -59,7 +59,7 @@ 
 
 $ticket_archive_class .= WP_DEBUG ? ' ee-wp-debug' : '';
 ?>
-<tr class="ee-ticket-sortable ticket-row <?php echo sanitize_html_class($ticket_archive_class);?>"
+<tr class="ee-ticket-sortable ticket-row <?php echo sanitize_html_class($ticket_archive_class); ?>"
     id="display-ticketrow-<?php echo esc_attr($tkt_row); ?>">
     <!-- TKT_order -->
     <td class="ee-tkt-order-field">
@@ -344,23 +344,23 @@ 
                                        name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo esc_attr($tkt_row); ?>][TKT_min]"
                                        value="<?php echo esc_attr($TKT_min); ?>"
                                 />
-                                <label class='screen-reader-text' for='disabled-ticket-TKT_min-<?php echo esc_attr($tkt_row);?>'>
+                                <label class='screen-reader-text' for='disabled-ticket-TKT_min-<?php echo esc_attr($tkt_row); ?>'>
                                     <?php
                                     esc_html_e('Minimum Quantity', 'event_espresso') ?>
                                 </label>
                                 <input type="text" disabled
                                        class="edit-ticket-TKT_min ee-small-text-inp ee-numeric"
-                                       id='disabled-ticket-TKT_min-<?php echo esc_attr($tkt_row);?>'
+                                       id='disabled-ticket-TKT_min-<?php echo esc_attr($tkt_row); ?>'
                                        name="archived_ticket[<?php echo esc_attr($tkt_row); ?>][TKT_min]"
                                        value="<?php echo esc_attr($TKT_min); ?>"
                                 />
                             <?php else : ?>
-                                <label class='screen-reader-text' for='edit-ticket-TKT_min-<?php echo esc_attr($tkt_row);?>'>
+                                <label class='screen-reader-text' for='edit-ticket-TKT_min-<?php echo esc_attr($tkt_row); ?>'>
                                     <?php esc_html_e('Minimum Quantity', 'event_espresso') ?>
                                 </label>
                                 <input type="text"
                                        class="edit-ticket-TKT_min ee-small-text-inp ee-numeric"
-                                       id='edit-ticket-TKT_min-<?php echo esc_attr($tkt_row);?>'
+                                       id='edit-ticket-TKT_min-<?php echo esc_attr($tkt_row); ?>'
                                        name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo esc_attr($tkt_row); ?>][TKT_min]"
                                        value="<?php echo esc_attr($TKT_min); ?>"
                                 />
@@ -372,22 +372,22 @@ 
                                        name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo esc_attr($tkt_row); ?>][TKT_max]"
                                        value="<?php echo esc_attr($TKT_max); ?>"
                                 />
-                                <label class='screen-reader-text' for='disabled-ticket-TKT_max-<?php echo esc_attr($tkt_row);?>'>
+                                <label class='screen-reader-text' for='disabled-ticket-TKT_max-<?php echo esc_attr($tkt_row); ?>'>
                                     <?php esc_html_e('Maximum Quantity', 'event_espresso') ?>
                                 </label>
                                 <input type="text" disabled
                                        class="edit-ticket-TKT_max ee-small-text-inp ee-numeric"
-                                       id='disabled-ticket-TKT_max-<?php echo esc_attr($tkt_row);?>'
+                                       id='disabled-ticket-TKT_max-<?php echo esc_attr($tkt_row); ?>'
                                        name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo esc_attr($tkt_row); ?>][TKT_max]"
                                        value="<?php echo esc_attr($TKT_max); ?>"
                                 />
                             <?php else : ?>
-                                <label class='screen-reader-text' for='edit-ticket-TKT_max-<?php echo esc_attr($tkt_row);?>'>
+                                <label class='screen-reader-text' for='edit-ticket-TKT_max-<?php echo esc_attr($tkt_row); ?>'>
                                     <?php esc_html_e('Maximum Quantity', 'event_espresso') ?>
                                 </label>
                                 <input type="text"
                                        class="edit-ticket-TKT_max ee-small-text-inp ee-numeric"
-                                       id='edit-ticket-TKT_max-<?php echo esc_attr($tkt_row);?>'
+                                       id='edit-ticket-TKT_max-<?php echo esc_attr($tkt_row); ?>'
                                        name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo esc_attr($tkt_row); ?>][TKT_max]"
                                        value="<?php echo esc_attr($TKT_max); ?>"
                                 />
@@ -419,7 +419,7 @@ 
                     </label>
                 </div>
                 <div class="ticket-is-taxable-container">
-                    <?php if (! empty($tax_rows)) { ?>
+                    <?php if ( ! empty($tax_rows)) { ?>
                         <label for="edit-ticket-TKT_taxable-<?php echo esc_attr($tkt_row); ?>">
                         <?php if ($disabled) : ?>
                             <?php $tax_value = ! empty($TKT_taxable) ? 1 : 0; ?>

caffeinated/admin/extend/registration_form/espresso_events_Registration_Form_Hooks_Extend.class.php

Spacing +7 added lines, -7 removed lines

@@ -135,7 +135,7 @@ 
                 : [];
             $EQGids = array_keys($EQGs);
 
-            if (! empty($QSGs)) {
+            if ( ! empty($QSGs)) {
                 $html = count($QSGs) > 10 ? '<div style="height:250px;overflow:auto;">' : '';
                 foreach ($QSGs as $QSG) {
                     $checked = in_array($QSG->ID(), $EQGids, true) ? ' checked ' : '';
@@ -148,15 +148,15 @@ 
                     );
 
                     $html .= '
-					<p id="event-question-group-' . $QSG->ID() . '">
-						<input value="' . $QSG->ID() . '"'
-                             . ' type="checkbox" name="add_attendee_question_groups[' . $QSG->ID() . ']"' . $checked . ' />
-						<a href="' . $edit_link . '" title="'
+					<p id="event-question-group-' . $QSG->ID().'">
+						<input value="' . $QSG->ID().'"'
+                             . ' type="checkbox" name="add_attendee_question_groups['.$QSG->ID().']"'.$checked.' />
+						<a href="' . $edit_link.'" title="'
                              . sprintf(
                                  esc_attr__('Edit %s Group', 'event_espresso'),
                                  $QSG->get('QSG_name')
                              )
-                             . '" target="_blank">' . $QSG->get('QSG_name') . '</a>
+                             . '" target="_blank">'.$QSG->get('QSG_name').'</a>
 					</p>';
                     if ($QSG->ID() === 2) {
                         $html .= '
@@ -200,7 +200,7 @@ 
         $current_qgs = array_keys($current_qgs); // we just want the ids
 
         // now let's get the groups selected in the editor and update (IF we have data)
-        if (! empty($question_groups)) {
+        if ( ! empty($question_groups)) {
             foreach ($question_groups as $qgid) {
                 // add to event
                 if ($qgid) {

Indentation +195 added lines, -195 removed lines

@@ -16,214 +16,214 @@
  */
 class espresso_events_Registration_Form_Hooks_Extend extends espresso_events_Registration_Form_Hooks
 {
-    /**
-     * extending the properties set in espresso_events_Registration_From_Hooks
-     *
-     * @access protected
-     * @return void
-     */
-    protected function _extend_properties()
-    {
-        if (
-            $this->_adminpage_obj->adminConfig()->useAdvancedEditor()
-            && $this->_adminpage_obj->feature()->allowed('use_reg_form_builder')
-        ) {
-            return;
-        }
-        $this->_metaboxes = array_merge(
-            $this->_metaboxes,
-            array(
-                1 => array(
-                    'page_route' => array('create_new', 'edit'),
-                    'func'       => 'additional_questions',
-                    'label'      => esc_html__('Questions for Additional Registrants', 'event_espresso'),
-                    'priority'   => 'default',
-                    'context'    => 'side',
-                ),
-            )
-        );
-        $this->_scripts_styles = array(
-            'registers' => array(
-                'extended-event-editor' => array(
-                    'url'     => EE_CORE_CAF_ADMIN_EXTEND_URL
-                                 . 'registration_form/assets/event-editor-question-groups.js',
-                    'depends' => array('jquery'),
-                ),
-            ),
-            'enqueues'  => array(
-                'extended-event-editor' => array('edit', 'create_new'),
-            ),
-        );
-    }
-
-
-    /**
-     * @param Callable[] $callbacks
-     * @return array
-     */
-    public function modify_callbacks($callbacks)
-    {
-        $callbacks = parent::modify_callbacks($callbacks);
-        $callbacks[] = array($this, 'additional_question_group_update');
-        return $callbacks;
-    }
-
-
-    /**
-     * Call back hooked into revision restores.
-     *
-     * @param $post_id
-     * @param $revision_id
-     * @return EE_Base_Class|void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function restore_revision($post_id, $revision_id)
-    {
-        $post_evt = parent::restore_revision($post_id, $revision_id);
-
-        // restore revision for additional questions
-        $post_evt->restore_revision(
-            $revision_id,
-            ['Question_Group'],
-            [
-                'Question_Group' => ['Event_Question_Group.EQG_additional' => true],
-            ]
-        );
-    }
-
-
-    /**
-     * @param $post_id
-     * @param $post
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function additional_questions($post_id, $post)
-    {
-        $this->_event = $this->_adminpage_obj->get_event_object();
-        $event_id = $this->_event->ID();
-        ?>
+	/**
+	 * extending the properties set in espresso_events_Registration_From_Hooks
+	 *
+	 * @access protected
+	 * @return void
+	 */
+	protected function _extend_properties()
+	{
+		if (
+			$this->_adminpage_obj->adminConfig()->useAdvancedEditor()
+			&& $this->_adminpage_obj->feature()->allowed('use_reg_form_builder')
+		) {
+			return;
+		}
+		$this->_metaboxes = array_merge(
+			$this->_metaboxes,
+			array(
+				1 => array(
+					'page_route' => array('create_new', 'edit'),
+					'func'       => 'additional_questions',
+					'label'      => esc_html__('Questions for Additional Registrants', 'event_espresso'),
+					'priority'   => 'default',
+					'context'    => 'side',
+				),
+			)
+		);
+		$this->_scripts_styles = array(
+			'registers' => array(
+				'extended-event-editor' => array(
+					'url'     => EE_CORE_CAF_ADMIN_EXTEND_URL
+								 . 'registration_form/assets/event-editor-question-groups.js',
+					'depends' => array('jquery'),
+				),
+			),
+			'enqueues'  => array(
+				'extended-event-editor' => array('edit', 'create_new'),
+			),
+		);
+	}
+
+
+	/**
+	 * @param Callable[] $callbacks
+	 * @return array
+	 */
+	public function modify_callbacks($callbacks)
+	{
+		$callbacks = parent::modify_callbacks($callbacks);
+		$callbacks[] = array($this, 'additional_question_group_update');
+		return $callbacks;
+	}
+
+
+	/**
+	 * Call back hooked into revision restores.
+	 *
+	 * @param $post_id
+	 * @param $revision_id
+	 * @return EE_Base_Class|void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function restore_revision($post_id, $revision_id)
+	{
+		$post_evt = parent::restore_revision($post_id, $revision_id);
+
+		// restore revision for additional questions
+		$post_evt->restore_revision(
+			$revision_id,
+			['Question_Group'],
+			[
+				'Question_Group' => ['Event_Question_Group.EQG_additional' => true],
+			]
+		);
+	}
+
+
+	/**
+	 * @param $post_id
+	 * @param $post
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function additional_questions($post_id, $post)
+	{
+		$this->_event = $this->_adminpage_obj->get_event_object();
+		$event_id = $this->_event->ID();
+		?>
         <div class="inside">
             <p><strong>
                     <?php esc_html_e('Question Groups', 'event_espresso'); ?>
                 </strong><br/>
                 <?php
-                printf(
-                    esc_html__(
-                        'Add a pre-populated %1$sgroup of questions%2$s to your event.',
-                        'event_espresso'
-                    ),
-                    '<a href="admin.php?page=espresso_registration_form" target="_blank">',
-                    '</a>'
-                );
-                ?>
+				printf(
+					esc_html__(
+						'Add a pre-populated %1$sgroup of questions%2$s to your event.',
+						'event_espresso'
+					),
+					'<a href="admin.php?page=espresso_registration_form" target="_blank">',
+					'</a>'
+				);
+				?>
             </p>
             <?php
 
-            $qsg_where['QSG_deleted'] = false;
-            $query_params = apply_filters(
-                'FHEE__espresso_events_Registration_Form_Hooks_Extend__additional_questions__question_group_query_parameters',
-                array($qsg_where, 'order_by' => array('QSG_order' => 'ASC'))
-            );
-            $QSGs = EEM_Question_Group::instance()->get_all($query_params);
-            $EQGs = ! empty($event_id)
-                ? $this->_event->get_many_related(
-                    'Question_Group',
-                    [['Event_Question_Group.EQG_additional' => true]]
-                )
-                : [];
-            $EQGids = array_keys($EQGs);
-
-            if (! empty($QSGs)) {
-                $html = count($QSGs) > 10 ? '<div style="height:250px;overflow:auto;">' : '';
-                foreach ($QSGs as $QSG) {
-                    $checked = in_array($QSG->ID(), $EQGids, true) ? ' checked ' : '';
-                    $edit_link = EE_Admin_Page::add_query_args_and_nonce(
-                        array(
-                            'action' => 'edit_question_group',
-                            'QSG_ID' => $QSG->ID(),
-                        ),
-                        EE_FORMS_ADMIN_URL
-                    );
-
-                    $html .= '
+			$qsg_where['QSG_deleted'] = false;
+			$query_params = apply_filters(
+				'FHEE__espresso_events_Registration_Form_Hooks_Extend__additional_questions__question_group_query_parameters',
+				array($qsg_where, 'order_by' => array('QSG_order' => 'ASC'))
+			);
+			$QSGs = EEM_Question_Group::instance()->get_all($query_params);
+			$EQGs = ! empty($event_id)
+				? $this->_event->get_many_related(
+					'Question_Group',
+					[['Event_Question_Group.EQG_additional' => true]]
+				)
+				: [];
+			$EQGids = array_keys($EQGs);
+
+			if (! empty($QSGs)) {
+				$html = count($QSGs) > 10 ? '<div style="height:250px;overflow:auto;">' : '';
+				foreach ($QSGs as $QSG) {
+					$checked = in_array($QSG->ID(), $EQGids, true) ? ' checked ' : '';
+					$edit_link = EE_Admin_Page::add_query_args_and_nonce(
+						array(
+							'action' => 'edit_question_group',
+							'QSG_ID' => $QSG->ID(),
+						),
+						EE_FORMS_ADMIN_URL
+					);
+
+					$html .= '
 					<p id="event-question-group-' . $QSG->ID() . '">
 						<input value="' . $QSG->ID() . '"'
-                             . ' type="checkbox" name="add_attendee_question_groups[' . $QSG->ID() . ']"' . $checked . ' />
+							 . ' type="checkbox" name="add_attendee_question_groups[' . $QSG->ID() . ']"' . $checked . ' />
 						<a href="' . $edit_link . '" title="'
-                             . sprintf(
-                                 esc_attr__('Edit %s Group', 'event_espresso'),
-                                 $QSG->get('QSG_name')
-                             )
-                             . '" target="_blank">' . $QSG->get('QSG_name') . '</a>
+							 . sprintf(
+								 esc_attr__('Edit %s Group', 'event_espresso'),
+								 $QSG->get('QSG_name')
+							 )
+							 . '" target="_blank">' . $QSG->get('QSG_name') . '</a>
 					</p>';
-                    if ($QSG->ID() === 2) {
-                        $html .= '
+					if ($QSG->ID() === 2) {
+						$html .= '
 					<p id="question-group-requirements-notice-pg" class="important-notice small-text" style="display: none;">'
-                                 . esc_html__(
-                                     'The Personal Information question group is required whenever the Address Information question group is activated.',
-                                     'event_espresso'
-                                 )
-                                 . '</p>';
-                    }
-                }
-                $html .= count($QSGs) > 10 ? '</div>' : '';
-
-                echo wp_kses($html, AllowedTags::getWithFormTags());
-            } else {
-                esc_html_e(
-                    'There seems to be a problem with your questions. Please contact support@eventespresso.com',
-                    'event_espresso'
-                );
-            }
-            do_action('AHEE__espresso_events_Registration_Form_Hooks__additional_questions__after_content');
-            ?>
+								 . esc_html__(
+									 'The Personal Information question group is required whenever the Address Information question group is activated.',
+									 'event_espresso'
+								 )
+								 . '</p>';
+					}
+				}
+				$html .= count($QSGs) > 10 ? '</div>' : '';
+
+				echo wp_kses($html, AllowedTags::getWithFormTags());
+			} else {
+				esc_html_e(
+					'There seems to be a problem with your questions. Please contact support@eventespresso.com',
+					'event_espresso'
+				);
+			}
+			do_action('AHEE__espresso_events_Registration_Form_Hooks__additional_questions__after_content');
+			?>
         </div>
         <?php
-    }
-
-
-    public function additional_question_group_update($evtobj, $data)
-    {
-        $question_groups = ! empty($data['add_attendee_question_groups'])
-            ? (array) $data['add_attendee_question_groups']
-            : [];
-        $added_qgs = array_keys($question_groups);
-        $success = [];
-
-        // let's get all current question groups associated with this event.
-        $current_qgs = $evtobj->get_many_related(
-            'Question_Group',
-            [['Event_Question_Group.EQG_additional' => true]]
-        );
-        $current_qgs = array_keys($current_qgs); // we just want the ids
-
-        // now let's get the groups selected in the editor and update (IF we have data)
-        if (! empty($question_groups)) {
-            foreach ($question_groups as $qgid) {
-                // add to event
-                if ($qgid) {
-                    $qg = $evtobj->add_question_group($qgid, false);
-                }
-                $success[] = ! empty($qg) ? 1 : 0;
-            }
-        }
-
-        // wait a minute... are there question groups missing in the saved groups that ARE with the current event?
-        $removed_qgs = array_diff($current_qgs, $added_qgs);
-
-        foreach ($removed_qgs as $qgid) {
-            $qg = $evtobj->remove_question_group($qgid, false);
-            $success[] = ! empty($qg) ? 1 : 0;
-        }
-
-
-        return in_array(0, $success, true) ? false : true;
-    }
+	}
+
+
+	public function additional_question_group_update($evtobj, $data)
+	{
+		$question_groups = ! empty($data['add_attendee_question_groups'])
+			? (array) $data['add_attendee_question_groups']
+			: [];
+		$added_qgs = array_keys($question_groups);
+		$success = [];
+
+		// let's get all current question groups associated with this event.
+		$current_qgs = $evtobj->get_many_related(
+			'Question_Group',
+			[['Event_Question_Group.EQG_additional' => true]]
+		);
+		$current_qgs = array_keys($current_qgs); // we just want the ids
+
+		// now let's get the groups selected in the editor and update (IF we have data)
+		if (! empty($question_groups)) {
+			foreach ($question_groups as $qgid) {
+				// add to event
+				if ($qgid) {
+					$qg = $evtobj->add_question_group($qgid, false);
+				}
+				$success[] = ! empty($qg) ? 1 : 0;
+			}
+		}
+
+		// wait a minute... are there question groups missing in the saved groups that ARE with the current event?
+		$removed_qgs = array_diff($current_qgs, $added_qgs);
+
+		foreach ($removed_qgs as $qgid) {
+			$qg = $evtobj->remove_question_group($qgid, false);
+			$success[] = ! empty($qg) ? 1 : 0;
+		}
+
+
+		return in_array(0, $success, true) ? false : true;
+	}
 }