eventespresso / event-espresso-core

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

Indentation +124 added lines, -124 removed lines

@@ -1,24 +1,24 @@ 
 <?php
 // maintenance mode on?
 if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
-    ?>
+	?>
     <div class="ee-attention">
         <h2 class="ee-maintenance-mode-callout">
             <?php esc_html_e(
-                'Event Espresso is in full maintenance mode.',
-                'event_espresso'
-            ); ?></h2>
+				'Event Espresso is in full maintenance mode.',
+				'event_espresso'
+			); ?></h2>
         <p>
             <?php
-            printf(
-                esc_html__(
-                    'A previous version of Event Espresso has detected. But before anything else can happen, we need to know whether or not to migrate (copy over) your existing event data so that it can be utilized by EE4. For more instructions on what to do, please visit the %sEvent Espresso Maintenance%s page.',
-                    'event_espresso'
-                ),
-                '<a href="admin.php?page=espresso_maintenance_settings">',
-                '</a>'
-            );
-            ?>
+			printf(
+				esc_html__(
+					'A previous version of Event Espresso has detected. But before anything else can happen, we need to know whether or not to migrate (copy over) your existing event data so that it can be utilized by EE4. For more instructions on what to do, please visit the %sEvent Espresso Maintenance%s page.',
+					'event_espresso'
+				),
+				'<a href="admin.php?page=espresso_maintenance_settings">',
+				'</a>'
+			);
+			?>
         </p>
     </div>
     <?php
@@ -27,62 +27,62 @@ 
 <div class="headline-feature">
     <h2 class="about-headline-callout">
         <?php esc_html_e(
-            'Welcome to the Decaf (free) Version of Event Espresso 4!',
-            'event_espresso'
-        ); ?></h2>
+			'Welcome to the Decaf (free) Version of Event Espresso 4!',
+			'event_espresso'
+		); ?></h2>
     <p><?php
-        echo sprintf(
-            esc_html__(
-                'Manage your events from your WordPress dashboard. Reduce your admin, reduce your costs, make your life easier! This is the Decaf version of Event Espresso, but we also have a premium version called %sEvent Espreso 4 Regular%s and a hosted version called %sEvent Smart%s (SaaS).',
-                'event_espresso'
-            ),
-            '<a href="?page=espresso_about&action=decafvpro">',
-            '</a>',
-            '<a href="https://eventsmart.com//?utm_source=ee4_decaf&amp;utm_medium=link&amp;utm_campaign=espresso_about_tab&amp;utm_content=EE4+Decaf">',
-            '</a>'
-        ); ?></p>
+		echo sprintf(
+			esc_html__(
+				'Manage your events from your WordPress dashboard. Reduce your admin, reduce your costs, make your life easier! This is the Decaf version of Event Espresso, but we also have a premium version called %sEvent Espreso 4 Regular%s and a hosted version called %sEvent Smart%s (SaaS).',
+				'event_espresso'
+			),
+			'<a href="?page=espresso_about&action=decafvpro">',
+			'</a>',
+			'<a href="https://eventsmart.com//?utm_source=ee4_decaf&amp;utm_medium=link&amp;utm_campaign=espresso_about_tab&amp;utm_content=EE4+Decaf">',
+			'</a>'
+		); ?></p>
     <h2>
         <?php esc_html_e(
-            'Powering 40,000+ event websites; $100 million in ticket sales per year!',
-            'event_espresso'
-        ); ?></h2>
+			'Powering 40,000+ event websites; $100 million in ticket sales per year!',
+			'event_espresso'
+		); ?></h2>
     <p><?php
-        echo sprintf(
-            esc_html__(
-                'Event Espresso is a %sWordPress event manager%s which makes it easy for you to register attendees for classes, workshops, events, trainings, conferences or concerts, all from your WordPress website. Event Espresso events are created from the WordPress admin area. You can create signup forms to collect information about your attendees, accept payments, and create reports. The Decaf (free) version of the plugin provides everything that you need to manage your event using WordPress.',
-                'event_espresso'
-            ),
-            '<a href="http://eventespresso.com/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=plugin_description_tab&amp;utm_content=EE4+Decaf">',
-            '</a>'
-        ); ?></p>
+		echo sprintf(
+			esc_html__(
+				'Event Espresso is a %sWordPress event manager%s which makes it easy for you to register attendees for classes, workshops, events, trainings, conferences or concerts, all from your WordPress website. Event Espresso events are created from the WordPress admin area. You can create signup forms to collect information about your attendees, accept payments, and create reports. The Decaf (free) version of the plugin provides everything that you need to manage your event using WordPress.',
+				'event_espresso'
+			),
+			'<a href="http://eventespresso.com/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=plugin_description_tab&amp;utm_content=EE4+Decaf">',
+			'</a>'
+		); ?></p>
 </div>
     <div class="feature-section has-3-columns is-fullwidth three-col">
         <div class="column col">
             <img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/publish_meta_box.jpg">
             <h3><?php esc_html_e('Optimized aesthetic', 'event_espresso'); ?></h3>
             <p><?php
-                esc_html_e(
-                    'The Event Espresso 4 dashboard has a fresh, uncluttered design that embraces clarity and simplicity.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'The Event Espresso 4 dashboard has a fresh, uncluttered design that embraces clarity and simplicity.',
+					'event_espresso'
+				); ?></p>
         </div>
         <div class="column col">
             <img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/registrations-overview.jpg">
             <h3><?php esc_html_e('Integrated management', 'event_espresso'); ?></h3>
             <p><?php
-                esc_html_e(
-                    'We’ve made it easier to know who your customers are and how they’ve done business with you over time.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'We’ve made it easier to know who your customers are and how they’ve done business with you over time.',
+					'event_espresso'
+				); ?></p>
         </div>
         <div class="column col last-feature">
             <img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/refined-bookkeeping.jpg">
             <h3><?php esc_html_e('Easy bookkeeping', 'event_espresso'); ?></h3>
             <p><?php
-                esc_html_e(
-                    'Registrations, payment, and transactions have been substantially improved in Event Espresso 4.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'Registrations, payment, and transactions have been substantially improved in Event Espresso 4.',
+					'event_espresso'
+				); ?></p>
         </div>
     </div>
 
@@ -92,16 +92,16 @@ 
         <div class="column col">
             <h3><?php esc_html_e('Higher customer retention', 'event_espresso'); ?></h3>
             <p><?php
-                esc_html_e(
-                    'The Event Espresso 4 registration process is faster than ever. With quick ticket selections, single page check-out, and customizable notifications! Registration that can scale to your business needs.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'The Event Espresso 4 registration process is faster than ever. With quick ticket selections, single page check-out, and customizable notifications! Registration that can scale to your business needs.',
+					'event_espresso'
+				); ?></p>
             <h4><?php esc_html_e('Ticket selection boxes on any post page or post', 'event_espresso'); ?></h4>
             <p><?php
-                esc_html_e(
-                    'Customers can easily register for classes, events, or conferences, in just a few simple steps. No matter how you use it, Event Espresso 4 will adapt to a multitude of different ticketing and pricing scenarios.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'Customers can easily register for classes, events, or conferences, in just a few simple steps. No matter how you use it, Event Espresso 4 will adapt to a multitude of different ticketing and pricing scenarios.',
+					'event_espresso'
+				); ?></p>
         </div>
         <div class="column col last-feature about-colors-img">
             <img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/registrtation-page-large.jpg">
@@ -112,22 +112,22 @@ 
         <div class="column col">
             <h3><?php esc_html_e('Refined event management', 'event_espresso'); ?></h3>
             <p><?php
-                esc_html_e(
-                    'The new event management screen lets you survey your events at a glance. Want more information? Click to view more. Quickly add/edit prices, dates, or information in any event.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'The new event management screen lets you survey your events at a glance. Want more information? Click to view more. Quickly add/edit prices, dates, or information in any event.',
+					'event_espresso'
+				); ?></p>
             <h4><?php
-                esc_html_e('Smoother price types, taxes, and price modifiers', 'event_espresso'); ?></h4>
+				esc_html_e('Smoother price types, taxes, and price modifiers', 'event_espresso'); ?></h4>
             <p><?php
-                esc_html_e(
-                    'Price Types allow you to create new prices that adjust the default ticket (base) price for your system-default ticket',
-                    'event_espresso'
-                ); ?>.</p>
+				esc_html_e(
+					'Price Types allow you to create new prices that adjust the default ticket (base) price for your system-default ticket',
+					'event_espresso'
+				); ?>.</p>
             <p><?php
-                esc_html_e(
-                    'Easily categorize a price modifier and indicate how that price gets applied to the running total when a transaction occurs.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'Easily categorize a price modifier and indicate how that price gets applied to the running total when a transaction occurs.',
+					'event_espresso'
+				); ?></p>
         </div>
         <div class="column col last-feature about-themes-img">
             <img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/event-management.jpg">
@@ -137,68 +137,68 @@ 
 <hr>
 
     <h2 class="about-headline-callout"><?php
-        esc_html_e(
-            'People Like You Manage Event Registration with WordPress',
-            'event_espresso'
-        ); ?></h2>
+		esc_html_e(
+			'People Like You Manage Event Registration with WordPress',
+			'event_espresso'
+		); ?></h2>
     <div class="feature-section has-2-columns is-fullwidth two-col">
         <div class="column col">
             <p><?php
-                echo sprintf(
-                    esc_html__(
-                        'Trusted by thousands, Event Espresso is the best WordPress event online registration and ticketing manager plugin–and the best supported with full-time support. Turn your existing blog or website into a %sfully-featured event management website%s and a new way to make money. With Event Espresso you get it all; everything from custom registration forms and emails, seating limits, multiple price options, and discount codes to printable tickets.',
-                        'event_espresso'
-                    ),
-                    '<strong>',
-                    '</strong>'
-                ); ?></p>
-            <p><?php
-                esc_html_e(
-                    'Event Espresso works perfectly for classes, workshops, fundraisers, sporting, trainings, conferences, networking, religion, social, non-profit, and nearly any other type of event.',
-                    'event_espresso'
-                ); ?></p>
+				echo sprintf(
+					esc_html__(
+						'Trusted by thousands, Event Espresso is the best WordPress event online registration and ticketing manager plugin–and the best supported with full-time support. Turn your existing blog or website into a %sfully-featured event management website%s and a new way to make money. With Event Espresso you get it all; everything from custom registration forms and emails, seating limits, multiple price options, and discount codes to printable tickets.',
+						'event_espresso'
+					),
+					'<strong>',
+					'</strong>'
+				); ?></p>
+            <p><?php
+				esc_html_e(
+					'Event Espresso works perfectly for classes, workshops, fundraisers, sporting, trainings, conferences, networking, religion, social, non-profit, and nearly any other type of event.',
+					'event_espresso'
+				); ?></p>
         </div>
         <div class="column col">
             <p><?php
-                echo sprintf(
-                    esc_html__(
-                        'Our online event registration software can %smake your organization more profitable and efficient%s by helping you save money on registration and ticketing fees, reduce the countless hours of time you spend manually processing registrations, create a “green” and paperless event registration process and you will be open for business to accept registrations and payment 24/7.',
-                        'event_espresso'
-                    ),
-                    '<strong>',
-                    '</strong>'
-                ); ?></p>
-            <p><?php
-                esc_html_e(
-                    'If you\'re doing event registration and ticketing any other way, then you’re wasting time and money. We offer packages and prices to fit any budget, so get started with your online event registration and ticketing management system today.',
-                    'event_espresso'
-                ); ?></p>
+				echo sprintf(
+					esc_html__(
+						'Our online event registration software can %smake your organization more profitable and efficient%s by helping you save money on registration and ticketing fees, reduce the countless hours of time you spend manually processing registrations, create a “green” and paperless event registration process and you will be open for business to accept registrations and payment 24/7.',
+						'event_espresso'
+					),
+					'<strong>',
+					'</strong>'
+				); ?></p>
+            <p><?php
+				esc_html_e(
+					'If you\'re doing event registration and ticketing any other way, then you’re wasting time and money. We offer packages and prices to fit any budget, so get started with your online event registration and ticketing management system today.',
+					'event_espresso'
+				); ?></p>
         </div>
     </div>
 
     <div class="feature-section has-2-columns is-fullwidth two-col">
         <div class="column col">
             <h3><?php
-                esc_html_e(
-                    'Turn your blog into a complete event registration and management system',
-                    'event_espresso'
-                ); ?></h3>
-            <p><?php
-                esc_html_e(
-                    'Create a beautiful event page with ticket selection, venue details, and an integrated single page checkout system. With WordPress, Event Espresso, and Espresso Arabica 2014 (based on the "Twenty Fourteen" theme by WordPress), your events will certainly sell out faster than ever!',
-                    'event_espresso'
-                ); ?></p>
-            <p><?php
-                esc_html_e(
-                    'With a striking design that does not compromise the simplicity of WordPress and Event Espresso 4, Espresso Arabica 2014 will be the best event theme on the market.',
-                    'event_espresso'
-                ); ?></p>
-            <p><?php
-                echo sprintf(
-                    esc_html__('%sLearn more >>%s', 'event_espresso'),
-                    '<a href="http://eventespresso.com/wiki/setup-event-espresso-arabica-theme/">',
-                    '</a>'
-                ); ?></p>
+				esc_html_e(
+					'Turn your blog into a complete event registration and management system',
+					'event_espresso'
+				); ?></h3>
+            <p><?php
+				esc_html_e(
+					'Create a beautiful event page with ticket selection, venue details, and an integrated single page checkout system. With WordPress, Event Espresso, and Espresso Arabica 2014 (based on the "Twenty Fourteen" theme by WordPress), your events will certainly sell out faster than ever!',
+					'event_espresso'
+				); ?></p>
+            <p><?php
+				esc_html_e(
+					'With a striking design that does not compromise the simplicity of WordPress and Event Espresso 4, Espresso Arabica 2014 will be the best event theme on the market.',
+					'event_espresso'
+				); ?></p>
+            <p><?php
+				echo sprintf(
+					esc_html__('%sLearn more >>%s', 'event_espresso'),
+					'<a href="http://eventespresso.com/wiki/setup-event-espresso-arabica-theme/">',
+					'</a>'
+				); ?></p>
         </div>
         <div class="column col"><img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/single-event-page.jpg"></div>
     </div>
@@ -209,10 +209,10 @@ 
     <div class="feature-section has-1-column is-fullwidth is-wide one-col">
         <div class="column col">
             <p><?php
-            esc_html_e(
-                'We’ve made it super easy to integrate Event Espresso with almost any properly coded WordPress theme, including many of the thousands of themes available on WordPress.org. The image below shows the same Event Espresso ticketing page across three diffrent WordPress themes.',
-                'event_espresso'
-            ); ?></p>
+			esc_html_e(
+				'We’ve made it super easy to integrate Event Espresso with almost any properly coded WordPress theme, including many of the thousands of themes available on WordPress.org. The image below shows the same Event Espresso ticketing page across three diffrent WordPress themes.',
+				'event_espresso'
+			); ?></p>
             <p><img class="about-overview-img" src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/multiple-themes.jpg"/></p>
         </div>
     </div>

caffeinated/admin/extend/about/templates/whats_new.template.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
         ?>
         <?php printf(
             esc_html__('For more information, see %1$sthe release notes%2$s.', 'event_espresso'),
-            '<a href="http://eventespresso.com/wiki/ee4-changelog/#' . $ver . '" target="_blank" rel="noopener noreferrer">',
+            '<a href="http://eventespresso.com/wiki/ee4-changelog/#'.$ver.'" target="_blank" rel="noopener noreferrer">',
             '</a>'
         ); ?>
     </p>

Indentation +35 added lines, -35 removed lines

@@ -1,58 +1,58 @@
 <div class="changelog point-releases">
     <!-- <h3><?php echo esc_html(
-        _n('Minor Release Information', 'Minor Releases', 1, 'event_espresso')
-    ); ?></h3> -->
+		_n('Minor Release Information', 'Minor Releases', 1, 'event_espresso')
+	); ?></h3> -->
     <h3><?php echo esc_html(
-        _n('Major Release Information', 'Major Releases', 1, 'event_espresso')
-    ); ?></h3>
+		_n('Major Release Information', 'Major Releases', 1, 'event_espresso')
+	); ?></h3>
     <?php // $type = 'minor'; ?>
     <?php $type = 'major'; ?>
     <p><?php
-        printf(
-            esc_html__('%1$sVersion %2$s%3$s is a %4$s release.', 'event_espresso'),
-            '<strong>',
-            EVENT_ESPRESSO_VERSION,
-            '</strong>',
-            $type
-        ); ?>
+		printf(
+			esc_html__('%1$sVersion %2$s%3$s is a %4$s release.', 'event_espresso'),
+			'<strong>',
+			EVENT_ESPRESSO_VERSION,
+			'</strong>',
+			$type
+		); ?>
         <?php
-        $ver = explode('.', EVENT_ESPRESSO_VERSION);
-        array_pop($ver);
-        $ver = implode('.', $ver);
-        ?>
+		$ver = explode('.', EVENT_ESPRESSO_VERSION);
+		array_pop($ver);
+		$ver = implode('.', $ver);
+		?>
         <?php printf(
-            esc_html__('For more information, see %1$sthe release notes%2$s.', 'event_espresso'),
-            '<a href="http://eventespresso.com/wiki/ee4-changelog/#' . $ver . '" target="_blank" rel="noopener noreferrer">',
-            '</a>'
-        ); ?>
+			esc_html__('For more information, see %1$sthe release notes%2$s.', 'event_espresso'),
+			'<a href="http://eventespresso.com/wiki/ee4-changelog/#' . $ver . '" target="_blank" rel="noopener noreferrer">',
+			'</a>'
+		); ?>
     </p>
 </div><!-- end .changelog .point-releases -->
 
 <div class="changelog">
     <?php
-    // maintenance mode on?
-    if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
-        ?>
+	// maintenance mode on?
+	if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
+		?>
         <div class="ee-attention">
             <h2 class="ee-maintenance-mode-callout"><?php
-                esc_html_e('Event Espresso is in full maintenance mode.', 'event_espresso');
-            ?></h2>
+				esc_html_e('Event Espresso is in full maintenance mode.', 'event_espresso');
+			?></h2>
             <p>
                 <?php
-                printf(
-                    esc_html__(
-                        'A previous version of Event Espresso has detected. But before anything else can happen, we need to know whether or not to migrate (copy over) your existing event data so that it can be utilized by EE4. For more instructions on what to do, please visit the %1$sEvent Espresso Maintenance%2$s page.',
-                        'event_espresso'
-                    ),
-                    '<a href="admin.php?page=espresso_maintenance_settings">',
-                    '</a>'
-                );
-                ?>
+				printf(
+					esc_html__(
+						'A previous version of Event Espresso has detected. But before anything else can happen, we need to know whether or not to migrate (copy over) your existing event data so that it can be utilized by EE4. For more instructions on what to do, please visit the %1$sEvent Espresso Maintenance%2$s page.',
+						'event_espresso'
+					),
+					'<a href="admin.php?page=espresso_maintenance_settings">',
+					'</a>'
+				);
+				?>
             </p>
         </div>
         <?php
-    }
-    ?>
+	}
+	?>
 
     <h2 class="about-headline-callout">Updates &amp; Fixes in EE 4.11</h2>
     <p>This release introduces an improved event editor, support for recurring events, and improvements to existing core features. Here are the most interesting updates:</p>

core/domain/services/admin/ajax/ThankYouPageIpnMonitor.php

Indentation +219 added lines, -219 removed lines

@@ -22,239 +22,239 @@
 class ThankYouPageIpnMonitor
 {
 
-    /**
-     * @var string $heartbeat
-     */
-    private $heartbeat;
+	/**
+	 * @var string $heartbeat
+	 */
+	private $heartbeat;
 
-    /**
-     * @var EED_Thank_You_Page $thank_you_page
-     */
-    private $thank_you_page;
+	/**
+	 * @var EED_Thank_You_Page $thank_you_page
+	 */
+	private $thank_you_page;
 
-    /**
-     * @var EE_Transaction $transaction
-     */
-    private $transaction;
+	/**
+	 * @var EE_Transaction $transaction
+	 */
+	private $transaction;
 
 
-    /**
-     * EventEditorHeartbeat constructor.
-     */
-    public function __construct()
-    {
-        $this->heartbeat = WordpressHeartbeat::RESPONSE_KEY_THANK_YOU_PAGE;
-        add_filter('heartbeat_received', array($this, 'heartbeatResponse'), 10, 3);
-        add_filter('heartbeat_nopriv_received', array($this, 'heartbeatResponse'), 10, 3);
-    }
+	/**
+	 * EventEditorHeartbeat constructor.
+	 */
+	public function __construct()
+	{
+		$this->heartbeat = WordpressHeartbeat::RESPONSE_KEY_THANK_YOU_PAGE;
+		add_filter('heartbeat_received', array($this, 'heartbeatResponse'), 10, 3);
+		add_filter('heartbeat_nopriv_received', array($this, 'heartbeatResponse'), 10, 3);
+	}
 
 
-    /**
-     * thank_you_page_IPN_monitor
-     * this basically just pulls the TXN based on the reg_url_link sent from the server,
-     * then checks that the TXN status is not failed, and that no other errors have been generated.
-     * it also calculates the IPN wait time since the Thank You page was first loaded
-     *
-     * @param array $response
-     * @param array $data
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function heartbeatResponse($response = array(), $data = array())
-    {
-        // does this heartbeat contain our data ?
-        if (! isset($data[ $this->heartbeat ])) {
-            return $response;
-        }
-        // check for reg_url_link in the incoming heartbeat data
-        if (! isset($data[ $this->heartbeat ]['e_reg_url_link'])) {
-            $response[ $this->heartbeat ] = array(
-                'errors' => ! empty($notices['errors'])
-                    ? $notices['errors']
-                    : __(
-                        'No transaction information could be retrieved because the registration URL link is missing or invalid.',
-                        'event_espresso'
-                    ),
-            );
-            return $response;
-        }
-        // kk heartbeat has our data
-        $response = $this->initializeThankYouPageAndTransaction($response, $data);
-        // if something went wrong...
-        if (isset($response[ $this->heartbeat ]['errors'])) {
-            return $response;
-        }
-        // grab transient of Transaction's status
-        $txn_status = isset($data[ $this->heartbeat ]['txn_status'])
-            ? $data[ $this->heartbeat ]['txn_status']
-            : null;
-        $response = $this->getTransactionDetails($txn_status, $response, $data);
-        // no payment data yet?
-        if (isset($response[ $this->heartbeat ]['still_waiting'])) {
-            return $response;
-        }
-        // TXN is happening so let's get the payments now
-        // if we've already gotten payments then the heartbeat data will contain the timestamp of the last time we checked
-        $since = isset($data[ $this->heartbeat ]['get_payments_since'])
-            ? $data[ $this->heartbeat ]['get_payments_since']
-            : 0;
-        return $this->paymentDetails($response, $since);
-    }
+	/**
+	 * thank_you_page_IPN_monitor
+	 * this basically just pulls the TXN based on the reg_url_link sent from the server,
+	 * then checks that the TXN status is not failed, and that no other errors have been generated.
+	 * it also calculates the IPN wait time since the Thank You page was first loaded
+	 *
+	 * @param array $response
+	 * @param array $data
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function heartbeatResponse($response = array(), $data = array())
+	{
+		// does this heartbeat contain our data ?
+		if (! isset($data[ $this->heartbeat ])) {
+			return $response;
+		}
+		// check for reg_url_link in the incoming heartbeat data
+		if (! isset($data[ $this->heartbeat ]['e_reg_url_link'])) {
+			$response[ $this->heartbeat ] = array(
+				'errors' => ! empty($notices['errors'])
+					? $notices['errors']
+					: __(
+						'No transaction information could be retrieved because the registration URL link is missing or invalid.',
+						'event_espresso'
+					),
+			);
+			return $response;
+		}
+		// kk heartbeat has our data
+		$response = $this->initializeThankYouPageAndTransaction($response, $data);
+		// if something went wrong...
+		if (isset($response[ $this->heartbeat ]['errors'])) {
+			return $response;
+		}
+		// grab transient of Transaction's status
+		$txn_status = isset($data[ $this->heartbeat ]['txn_status'])
+			? $data[ $this->heartbeat ]['txn_status']
+			: null;
+		$response = $this->getTransactionDetails($txn_status, $response, $data);
+		// no payment data yet?
+		if (isset($response[ $this->heartbeat ]['still_waiting'])) {
+			return $response;
+		}
+		// TXN is happening so let's get the payments now
+		// if we've already gotten payments then the heartbeat data will contain the timestamp of the last time we checked
+		$since = isset($data[ $this->heartbeat ]['get_payments_since'])
+			? $data[ $this->heartbeat ]['get_payments_since']
+			: 0;
+		return $this->paymentDetails($response, $since);
+	}
 
 
-    /**
-     * @param array $response
-     * @param array $data
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    private function initializeThankYouPageAndTransaction($response, $data)
-    {
-        require_once EE_MODULES . 'thank_you_page/EED_Thank_You_Page.module.php';
-        // set_definitions, instantiate the thank you page class, and get the ball rolling
-        EED_Thank_You_Page::set_definitions();
-        $this->thank_you_page = EED_Thank_You_Page::instance();
-        $this->thank_you_page->set_reg_url_link($data[ $this->heartbeat ]['e_reg_url_link']);
-        $this->thank_you_page->init();
-        // get TXN
-        $transaction = $this->thank_you_page->get_txn();
-        // no TXN? then get out
-        if (! $transaction instanceof EE_Transaction) {
-            $notices = EE_Error::get_notices();
-            $response[ $this->heartbeat ] = array(
-                'errors' => ! empty($notices['errors'])
-                    ? $notices['errors']
-                    : sprintf(
-                        __(
-                            'The information for your transaction could not be retrieved from the server or the transaction data received was invalid because of a technical reason. (%s)',
-                            'event_espresso'
-                        ),
-                        __LINE__
-                    ),
-            );
-            return $response;
-        }
-        $this->transaction = $transaction;
-        return $response;
-    }
+	/**
+	 * @param array $response
+	 * @param array $data
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	private function initializeThankYouPageAndTransaction($response, $data)
+	{
+		require_once EE_MODULES . 'thank_you_page/EED_Thank_You_Page.module.php';
+		// set_definitions, instantiate the thank you page class, and get the ball rolling
+		EED_Thank_You_Page::set_definitions();
+		$this->thank_you_page = EED_Thank_You_Page::instance();
+		$this->thank_you_page->set_reg_url_link($data[ $this->heartbeat ]['e_reg_url_link']);
+		$this->thank_you_page->init();
+		// get TXN
+		$transaction = $this->thank_you_page->get_txn();
+		// no TXN? then get out
+		if (! $transaction instanceof EE_Transaction) {
+			$notices = EE_Error::get_notices();
+			$response[ $this->heartbeat ] = array(
+				'errors' => ! empty($notices['errors'])
+					? $notices['errors']
+					: sprintf(
+						__(
+							'The information for your transaction could not be retrieved from the server or the transaction data received was invalid because of a technical reason. (%s)',
+							'event_espresso'
+						),
+						__LINE__
+					),
+			);
+			return $response;
+		}
+		$this->transaction = $transaction;
+		return $response;
+	}
 
 
-    /**
-     * @param string $txn_status
-     * @param array  $response
-     * @param array  $data
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    private function getTransactionDetails($txn_status, $response, $data)
-    {
-        // has the TXN status changed since we last checked (or empty because this is the first time running through this code)?
-        if ($txn_status !== $this->transaction->status_ID()) {
-            // switch between two possible basic outcomes
-            switch ($this->transaction->status_ID()) {
-                // TXN has been updated in some way
-                case EEM_Transaction::overpaid_status_code:
-                case EEM_Transaction::complete_status_code:
-                case EEM_Transaction::incomplete_status_code:
-                    // send updated TXN results back to client,
-                    return $this->setTransactionDetails($response);
-                // or we have a bad TXN, or really slow IPN, so calculate the wait time and send that back...
-                case EEM_Transaction::failed_status_code:
-                default:
-                    // keep on waiting...
-                    return $this->updateServerWaitTime($data[ $this->heartbeat ]);
-            }
-            // or is the TXN still failed (never been updated) ???
-        } elseif ($this->transaction->failed()) {
-            // keep on waiting...
-            return $this->updateServerWaitTime($data[ $this->heartbeat ]);
-        }
-        return $response;
-    }
+	/**
+	 * @param string $txn_status
+	 * @param array  $response
+	 * @param array  $data
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	private function getTransactionDetails($txn_status, $response, $data)
+	{
+		// has the TXN status changed since we last checked (or empty because this is the first time running through this code)?
+		if ($txn_status !== $this->transaction->status_ID()) {
+			// switch between two possible basic outcomes
+			switch ($this->transaction->status_ID()) {
+				// TXN has been updated in some way
+				case EEM_Transaction::overpaid_status_code:
+				case EEM_Transaction::complete_status_code:
+				case EEM_Transaction::incomplete_status_code:
+					// send updated TXN results back to client,
+					return $this->setTransactionDetails($response);
+				// or we have a bad TXN, or really slow IPN, so calculate the wait time and send that back...
+				case EEM_Transaction::failed_status_code:
+				default:
+					// keep on waiting...
+					return $this->updateServerWaitTime($data[ $this->heartbeat ]);
+			}
+			// or is the TXN still failed (never been updated) ???
+		} elseif ($this->transaction->failed()) {
+			// keep on waiting...
+			return $this->updateServerWaitTime($data[ $this->heartbeat ]);
+		}
+		return $response;
+	}
 
 
-    /**
-     * @param array $response
-     * @param boolean $status_only
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    private function setTransactionDetails($response, $status_only = false)
-    {
-        if (! $status_only && ! isset($response[ $this->heartbeat ]['transaction_details'])) {
-            $response[ $this->heartbeat ]['transaction_details'] = $this->thank_you_page->get_transaction_details();
-        }
-        if (! isset($response[ $this->heartbeat ]['txn_status'])) {
-            $response[ $this->heartbeat ]['txn_status'] = $this->transaction->status_ID();
-        }
-        return $response;
-    }
+	/**
+	 * @param array $response
+	 * @param boolean $status_only
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	private function setTransactionDetails($response, $status_only = false)
+	{
+		if (! $status_only && ! isset($response[ $this->heartbeat ]['transaction_details'])) {
+			$response[ $this->heartbeat ]['transaction_details'] = $this->thank_you_page->get_transaction_details();
+		}
+		if (! isset($response[ $this->heartbeat ]['txn_status'])) {
+			$response[ $this->heartbeat ]['txn_status'] = $this->transaction->status_ID();
+		}
+		return $response;
+	}
 
 
-    /**
-     * @param array $response
-     * @param int $since
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    private function paymentDetails($response, $since)
-    {
-        // then check for payments
-        $payments = $this->thank_you_page->get_txn_payments($since);
-        // has a payment been processed ?
-        if (! empty($payments) || $this->thank_you_page->isOfflinePaymentMethod()) {
-            if ($since) {
-                $response[ $this->heartbeat ]['new_payments'] = $this->thank_you_page->get_new_payments($payments);
-                $response = $this->setTransactionDetails($response);
-            } else {
-                $response[ $this->heartbeat ]['payment_details'] = $this->thank_you_page->get_payment_details(
-                    $payments
-                );
-            }
-            // reset time to check for payments
-            $response[ $this->heartbeat ]['get_payments_since'] = time();
-        } else {
-            $response[ $this->heartbeat ]['get_payments_since'] = $since;
-        }
-        return $response;
-    }
+	/**
+	 * @param array $response
+	 * @param int $since
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	private function paymentDetails($response, $since)
+	{
+		// then check for payments
+		$payments = $this->thank_you_page->get_txn_payments($since);
+		// has a payment been processed ?
+		if (! empty($payments) || $this->thank_you_page->isOfflinePaymentMethod()) {
+			if ($since) {
+				$response[ $this->heartbeat ]['new_payments'] = $this->thank_you_page->get_new_payments($payments);
+				$response = $this->setTransactionDetails($response);
+			} else {
+				$response[ $this->heartbeat ]['payment_details'] = $this->thank_you_page->get_payment_details(
+					$payments
+				);
+			}
+			// reset time to check for payments
+			$response[ $this->heartbeat ]['get_payments_since'] = time();
+		} else {
+			$response[ $this->heartbeat ]['get_payments_since'] = $since;
+		}
+		return $response;
+	}
 
 
-    /**
-     * @param array $thank_you_page_data    thank you page portion of the incoming JSON array
-     *                                      from the WP heartbeat data
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    private function updateServerWaitTime($thank_you_page_data)
-    {
-        $response[ $this->heartbeat ]['still_waiting'] = isset($thank_you_page_data['initial_access'])
-            ? time() - $thank_you_page_data['initial_access']
-            : 0;
-        $response = $this->setTransactionDetails($response, true);
-        return $response;
-    }
+	/**
+	 * @param array $thank_you_page_data    thank you page portion of the incoming JSON array
+	 *                                      from the WP heartbeat data
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	private function updateServerWaitTime($thank_you_page_data)
+	{
+		$response[ $this->heartbeat ]['still_waiting'] = isset($thank_you_page_data['initial_access'])
+			? time() - $thank_you_page_data['initial_access']
+			: 0;
+		$response = $this->setTransactionDetails($response, true);
+		return $response;
+	}
 }

Spacing +25 added lines, -25 removed lines

@@ -67,12 +67,12 @@ 
     public function heartbeatResponse($response = array(), $data = array())
     {
         // does this heartbeat contain our data ?
-        if (! isset($data[ $this->heartbeat ])) {
+        if ( ! isset($data[$this->heartbeat])) {
             return $response;
         }
         // check for reg_url_link in the incoming heartbeat data
-        if (! isset($data[ $this->heartbeat ]['e_reg_url_link'])) {
-            $response[ $this->heartbeat ] = array(
+        if ( ! isset($data[$this->heartbeat]['e_reg_url_link'])) {
+            $response[$this->heartbeat] = array(
                 'errors' => ! empty($notices['errors'])
                     ? $notices['errors']
                     : __(
@@ -85,22 +85,22 @@ 
         // kk heartbeat has our data
         $response = $this->initializeThankYouPageAndTransaction($response, $data);
         // if something went wrong...
-        if (isset($response[ $this->heartbeat ]['errors'])) {
+        if (isset($response[$this->heartbeat]['errors'])) {
             return $response;
         }
         // grab transient of Transaction's status
-        $txn_status = isset($data[ $this->heartbeat ]['txn_status'])
-            ? $data[ $this->heartbeat ]['txn_status']
+        $txn_status = isset($data[$this->heartbeat]['txn_status'])
+            ? $data[$this->heartbeat]['txn_status']
             : null;
         $response = $this->getTransactionDetails($txn_status, $response, $data);
         // no payment data yet?
-        if (isset($response[ $this->heartbeat ]['still_waiting'])) {
+        if (isset($response[$this->heartbeat]['still_waiting'])) {
             return $response;
         }
         // TXN is happening so let's get the payments now
         // if we've already gotten payments then the heartbeat data will contain the timestamp of the last time we checked
-        $since = isset($data[ $this->heartbeat ]['get_payments_since'])
-            ? $data[ $this->heartbeat ]['get_payments_since']
+        $since = isset($data[$this->heartbeat]['get_payments_since'])
+            ? $data[$this->heartbeat]['get_payments_since']
             : 0;
         return $this->paymentDetails($response, $since);
     }
@@ -117,18 +117,18 @@ 
      */
     private function initializeThankYouPageAndTransaction($response, $data)
     {
-        require_once EE_MODULES . 'thank_you_page/EED_Thank_You_Page.module.php';
+        require_once EE_MODULES.'thank_you_page/EED_Thank_You_Page.module.php';
         // set_definitions, instantiate the thank you page class, and get the ball rolling
         EED_Thank_You_Page::set_definitions();
         $this->thank_you_page = EED_Thank_You_Page::instance();
-        $this->thank_you_page->set_reg_url_link($data[ $this->heartbeat ]['e_reg_url_link']);
+        $this->thank_you_page->set_reg_url_link($data[$this->heartbeat]['e_reg_url_link']);
         $this->thank_you_page->init();
         // get TXN
         $transaction = $this->thank_you_page->get_txn();
         // no TXN? then get out
-        if (! $transaction instanceof EE_Transaction) {
+        if ( ! $transaction instanceof EE_Transaction) {
             $notices = EE_Error::get_notices();
-            $response[ $this->heartbeat ] = array(
+            $response[$this->heartbeat] = array(
                 'errors' => ! empty($notices['errors'])
                     ? $notices['errors']
                     : sprintf(
@@ -173,12 +173,12 @@ 
                 case EEM_Transaction::failed_status_code:
                 default:
                     // keep on waiting...
-                    return $this->updateServerWaitTime($data[ $this->heartbeat ]);
+                    return $this->updateServerWaitTime($data[$this->heartbeat]);
             }
             // or is the TXN still failed (never been updated) ???
         } elseif ($this->transaction->failed()) {
             // keep on waiting...
-            return $this->updateServerWaitTime($data[ $this->heartbeat ]);
+            return $this->updateServerWaitTime($data[$this->heartbeat]);
         }
         return $response;
     }
@@ -196,11 +196,11 @@ 
      */
     private function setTransactionDetails($response, $status_only = false)
     {
-        if (! $status_only && ! isset($response[ $this->heartbeat ]['transaction_details'])) {
-            $response[ $this->heartbeat ]['transaction_details'] = $this->thank_you_page->get_transaction_details();
+        if ( ! $status_only && ! isset($response[$this->heartbeat]['transaction_details'])) {
+            $response[$this->heartbeat]['transaction_details'] = $this->thank_you_page->get_transaction_details();
         }
-        if (! isset($response[ $this->heartbeat ]['txn_status'])) {
-            $response[ $this->heartbeat ]['txn_status'] = $this->transaction->status_ID();
+        if ( ! isset($response[$this->heartbeat]['txn_status'])) {
+            $response[$this->heartbeat]['txn_status'] = $this->transaction->status_ID();
         }
         return $response;
     }
@@ -221,19 +221,19 @@ 
         // then check for payments
         $payments = $this->thank_you_page->get_txn_payments($since);
         // has a payment been processed ?
-        if (! empty($payments) || $this->thank_you_page->isOfflinePaymentMethod()) {
+        if ( ! empty($payments) || $this->thank_you_page->isOfflinePaymentMethod()) {
             if ($since) {
-                $response[ $this->heartbeat ]['new_payments'] = $this->thank_you_page->get_new_payments($payments);
+                $response[$this->heartbeat]['new_payments'] = $this->thank_you_page->get_new_payments($payments);
                 $response = $this->setTransactionDetails($response);
             } else {
-                $response[ $this->heartbeat ]['payment_details'] = $this->thank_you_page->get_payment_details(
+                $response[$this->heartbeat]['payment_details'] = $this->thank_you_page->get_payment_details(
                     $payments
                 );
             }
             // reset time to check for payments
-            $response[ $this->heartbeat ]['get_payments_since'] = time();
+            $response[$this->heartbeat]['get_payments_since'] = time();
         } else {
-            $response[ $this->heartbeat ]['get_payments_since'] = $since;
+            $response[$this->heartbeat]['get_payments_since'] = $since;
         }
         return $response;
     }
@@ -251,7 +251,7 @@ 
      */
     private function updateServerWaitTime($thank_you_page_data)
     {
-        $response[ $this->heartbeat ]['still_waiting'] = isset($thank_you_page_data['initial_access'])
+        $response[$this->heartbeat]['still_waiting'] = isset($thank_you_page_data['initial_access'])
             ? time() - $thank_you_page_data['initial_access']
             : 0;
         $response = $this->setTransactionDetails($response, true);

core/domain/services/admin/ajax/WordpressHeartbeat.php

Indentation +42 added lines, -42 removed lines

@@ -17,52 +17,52 @@
 class WordpressHeartbeat
 {
 
-    const RESPONSE_KEY_THANK_YOU_PAGE = 'espresso_thank_you_page';
+	const RESPONSE_KEY_THANK_YOU_PAGE = 'espresso_thank_you_page';
 
-    /**
-     * @var LoaderInterface $loader
-     */
-    protected $loader;
+	/**
+	 * @var LoaderInterface $loader
+	 */
+	protected $loader;
 
-    /**
-     * @var RequestInterface $request
-     */
-    protected $request;
+	/**
+	 * @var RequestInterface $request
+	 */
+	protected $request;
 
 
-    /**
-     * WordpressHeartbeat constructor.
-     *
-     * @param LoaderInterface  $loader
-     * @param RequestInterface $request
-     */
-    public function __construct(
-        LoaderInterface $loader,
-        RequestInterface $request
-    ) {
-        $this->loader = $loader;
-        $this->request = $request;
-        do_action('AHEE__EventEspresso_core_domain_services_admin_ajax_WordpressHeartbeat__constructor', $this);
-        add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'resolveRoutes'));
-    }
+	/**
+	 * WordpressHeartbeat constructor.
+	 *
+	 * @param LoaderInterface  $loader
+	 * @param RequestInterface $request
+	 */
+	public function __construct(
+		LoaderInterface $loader,
+		RequestInterface $request
+	) {
+		$this->loader = $loader;
+		$this->request = $request;
+		do_action('AHEE__EventEspresso_core_domain_services_admin_ajax_WordpressHeartbeat__constructor', $this);
+		add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'resolveRoutes'));
+	}
 
 
-    /**
-     * @since 4.9.76.p
-     * @throws InvalidClassException
-     */
-    public function resolveRoutes()
-    {
-        $screenID = $this->request->getRequestParam('screen_id');
-        $heartbeat_data = $this->request->getRequestParam('data', []);
-        if ($screenID === 'espresso_events') {
-            $this->loader->getShared(
-                'EventEspresso\core\domain\services\admin\ajax\EventEditorHeartbeat'
-            );
-        } elseif ($screenID === 'front' && ! empty($heartbeat_data[ self::RESPONSE_KEY_THANK_YOU_PAGE ])) {
-            $this->loader->getShared(
-                'EventEspresso\core\domain\services\admin\ajax\ThankYouPageIpnMonitor'
-            );
-        }
-    }
+	/**
+	 * @since 4.9.76.p
+	 * @throws InvalidClassException
+	 */
+	public function resolveRoutes()
+	{
+		$screenID = $this->request->getRequestParam('screen_id');
+		$heartbeat_data = $this->request->getRequestParam('data', []);
+		if ($screenID === 'espresso_events') {
+			$this->loader->getShared(
+				'EventEspresso\core\domain\services\admin\ajax\EventEditorHeartbeat'
+			);
+		} elseif ($screenID === 'front' && ! empty($heartbeat_data[ self::RESPONSE_KEY_THANK_YOU_PAGE ])) {
+			$this->loader->getShared(
+				'EventEspresso\core\domain\services\admin\ajax\ThankYouPageIpnMonitor'
+			);
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
             $this->loader->getShared(
                 'EventEspresso\core\domain\services\admin\ajax\EventEditorHeartbeat'
             );
-        } elseif ($screenID === 'front' && ! empty($heartbeat_data[ self::RESPONSE_KEY_THANK_YOU_PAGE ])) {
+        } elseif ($screenID === 'front' && ! empty($heartbeat_data[self::RESPONSE_KEY_THANK_YOU_PAGE])) {
             $this->loader->getShared(
                 'EventEspresso\core\domain\services\admin\ajax\ThankYouPageIpnMonitor'
             );

core/third-party-compatibility.php

Indentation +20 added lines, -20 removed lines

@@ -7,24 +7,24 @@
  * ACF compatibility
  */
 add_action(
-    'plugins_loaded',
-    function () {
-        if (function_exists('acf_include')) {
-            add_filter(
-                'acf/get_post_types',
-                function ($post_types, $args) {
-                    if (! empty($args['show_ui'])) {
-                        $ee_post_types = get_post_types(array('show_ee_ui' => 1));
-                        $ee_post_types = array_keys($ee_post_types);
-                        $post_types = array_merge($post_types, $ee_post_types);
-                        $post_types = array_unique($post_types);
-                    }
-                    return $post_types;
-                },
-                10,
-                2
-            );
-        }
-    },
-    100
+	'plugins_loaded',
+	function () {
+		if (function_exists('acf_include')) {
+			add_filter(
+				'acf/get_post_types',
+				function ($post_types, $args) {
+					if (! empty($args['show_ui'])) {
+						$ee_post_types = get_post_types(array('show_ee_ui' => 1));
+						$ee_post_types = array_keys($ee_post_types);
+						$post_types = array_merge($post_types, $ee_post_types);
+						$post_types = array_unique($post_types);
+					}
+					return $post_types;
+				},
+				10,
+				2
+			);
+		}
+	},
+	100
 );

Spacing +3 added lines, -3 removed lines

@@ -8,12 +8,12 @@
  */
 add_action(
     'plugins_loaded',
-    function () {
+    function() {
         if (function_exists('acf_include')) {
             add_filter(
                 'acf/get_post_types',
-                function ($post_types, $args) {
-                    if (! empty($args['show_ui'])) {
+                function($post_types, $args) {
+                    if ( ! empty($args['show_ui'])) {
                         $ee_post_types = get_post_types(array('show_ee_ui' => 1));
                         $ee_post_types = array_keys($ee_post_types);
                         $post_types = array_merge($post_types, $ee_post_types);

caffeinated/modules/ticket_selector_caff/templates/ticket_selector_price_details.template.php

Indentation +46 added lines, -46 removed lines

@@ -7,39 +7,39 @@ 
 if ($display_ticket_price) { ?>
     <section class="tckt-slctr-tkt-price-sctn">
         <h5><?php
-            echo apply_filters(
-                'FHEE__ticket_selector_chart_template__ticket_details_price_breakdown_heading',
-                esc_html__('Price', 'event_espresso')
-            ); ?></h5>
+			echo apply_filters(
+				'FHEE__ticket_selector_chart_template__ticket_details_price_breakdown_heading',
+				esc_html__('Price', 'event_espresso')
+			); ?></h5>
         <div class="tckt-slctr-tkt-details-tbl-wrap-dv">
             <table class="tckt-slctr-tkt-details-tbl">
                 <thead>
                 <tr>
                     <th class="ee-third-width"><span class="small-text">
                             <?php
-                            esc_html_e(
-                                'Name',
-                                'event_espresso'
-                            ); ?></span>
+							esc_html_e(
+								'Name',
+								'event_espresso'
+							); ?></span>
                     </th>
                     <th class="jst-cntr"><span class="small-text">
                             <?php
-                            esc_html_e(
-                                'Description',
-                                'event_espresso'
-                            ); ?></span>
+							esc_html_e(
+								'Description',
+								'event_espresso'
+							); ?></span>
                     </th>
                     <th class="ee-fourth-width jst-rght"><span class="small-text">
                             <?php
-                            esc_html_e(
-                                'Amount',
-                                'event_espresso'
-                            ); ?></span></th>
+							esc_html_e(
+								'Amount',
+								'event_espresso'
+							); ?></span></th>
                 </tr>
                 </thead>
                 <tbody>
                 <?php
-                if ($ticket->base_price() instanceof EE_Price) { ?>
+				if ($ticket->base_price() instanceof EE_Price) { ?>
                     <tr>
                         <td data-th="<?php esc_html_e('Name', 'event_espresso'); ?>" class="small-text" colspan="2">
                             <b><?php echo $ticket->base_price()->name(); ?></b></td>
@@ -47,12 +47,12 @@ 
                             class="jst-rght small-text"><?php echo $ticket->base_price()->pretty_price(); ?></td>
                     </tr>
                     <?php
-                    $running_total = $ticket->base_price()->amount();
-                } else {
-                    $running_total = 0;
-                }
-                // now add price modifiers
-                foreach ($ticket->price_modifiers() as $price_mod) { ?>
+					$running_total = $ticket->base_price()->amount();
+				} else {
+					$running_total = 0;
+				}
+				// now add price modifiers
+				foreach ($ticket->price_modifiers() as $price_mod) { ?>
                     <tr>
                         <td data-th="<?php esc_html_e('Name', 'event_espresso'); ?>"
                             class="jst-rght small-text"><?php echo $price_mod->name(); ?></td>
@@ -62,23 +62,23 @@ 
                                 %
                             </td>
                             <?php
-                            $new_sub_total = $running_total * ($price_mod->amount() / 100);
-                            $new_sub_total = $price_mod->is_discount() ? $new_sub_total * -1 : $new_sub_total;
-                            ?>
+							$new_sub_total = $running_total * ($price_mod->amount() / 100);
+							$new_sub_total = $price_mod->is_discount() ? $new_sub_total * -1 : $new_sub_total;
+							?>
                         <?php } else { ?>
                             <?php $new_sub_total = $price_mod->is_discount() ? $price_mod->amount() * -1
-                                : $price_mod->amount(); ?>
+								: $price_mod->amount(); ?>
                             <td data-th="<?php esc_html_e('Description', 'event_espresso'); ?>"
                                 class="small-text"><?php echo $price_mod->desc(); ?></td>
                             <?php $new_sub_total = $price_mod->is_discount() ? $price_mod->amount() * -1
-                                : $price_mod->amount(); ?>
+								: $price_mod->amount(); ?>
                         <?php } ?>
                         <td data-th="<?php esc_html_e('Amount', 'event_espresso'); ?>"
                             class="jst-rght small-text">
                             <?php
-                            echo EEH_Template::format_currency(
-                                $new_sub_total
-                            ); ?></td>
+							echo EEH_Template::format_currency(
+								$new_sub_total
+							); ?></td>
                         <?php $running_total += $new_sub_total; ?>
                     </tr>
                 <?php } ?>
@@ -87,10 +87,10 @@ 
                     <tr>
                         <td colspan="2" class="jst-rght small-text sbttl"><b>
                                 <?php
-                                esc_html_e(
-                                    'subtotal',
-                                    'event_espresso'
-                                ); ?></b></td>
+								esc_html_e(
+									'subtotal',
+									'event_espresso'
+								); ?></b></td>
                         <td data-th="<?php esc_html_e('subtotal', 'event_espresso'); ?>" class="jst-rght small-text">
                             <b><?php echo EEH_Template::format_currency($running_total); ?></b></td>
                     </tr>
@@ -106,9 +106,9 @@ 
                             <td data-th="<?php esc_html_e('Amount', 'event_espresso'); ?>"
                                 class="jst-rght small-text">
                                 <?php
-                                echo EEH_Template::format_currency(
-                                    $tax_amount
-                                ); ?></td>
+								echo EEH_Template::format_currency(
+									$tax_amount
+								); ?></td>
                             <?php $running_total += $tax_amount; ?>
                         </tr>
                     <?php } ?>
@@ -116,15 +116,15 @@ 
                 <tr>
                     <td colspan="2" class="jst-rght small-text ttl-lbl-td">
                         <b><?php
-                            echo apply_filters(
-                                'FHEE__ticket_selector_chart_template__ticket_details_total_price',
-                                esc_html__('Total', 'event_espresso')
-                            ); ?></b></td>
+							echo apply_filters(
+								'FHEE__ticket_selector_chart_template__ticket_details_total_price',
+								esc_html__('Total', 'event_espresso')
+							); ?></b></td>
                     <td data-th="<?php
-                                    echo apply_filters(
-                                        'FHEE__ticket_selector_chart_template__ticket_details_total_price',
-                                        esc_html__('Total', 'event_espresso')
-                                    ); ?>" class="jst-rght small-text">
+									echo apply_filters(
+										'FHEE__ticket_selector_chart_template__ticket_details_total_price',
+										esc_html__('Total', 'event_espresso')
+									); ?>" class="jst-rght small-text">
                         <b><?php echo EEH_Template::format_currency($running_total); ?></b></td>
                 </tr>
                 </tbody>

core/libraries/form_sections/inputs/EE_State_Select_Input.php

Spacing +5 added lines, -5 removed lines

@@ -36,7 +36,7 @@ 
     {
         if (isset($input_settings['value_field_name'])) {
             $this->valueFieldName = $input_settings['value_field_name'];
-            if (! EEM_State::instance()->has_field((string) $this->valueFieldName())) {
+            if ( ! EEM_State::instance()->has_field((string) $this->valueFieldName())) {
                 throw new InvalidArgumentException(
                     sprintf(
                         esc_html__('An invalid state field "%1$s" was specified for the state input\'s option values.', 'event_espresso'),
@@ -53,7 +53,7 @@ 
             $this
         );
         $input_settings['html_class'] = isset($input_settings['html_class'])
-            ? $input_settings['html_class'] . ' ee-state-select-js'
+            ? $input_settings['html_class'].' ee-state-select-js'
             : 'ee-state-select-js';
         parent::__construct($state_options, $input_settings);
     }
@@ -83,7 +83,7 @@ 
     public function get_state_answer_options($state_options = null)
     {
         // if passed something that is NOT an array
-        if (! is_array($state_options) || empty($state_options)) {
+        if ( ! is_array($state_options) || empty($state_options)) {
             // get possibly cached list of states
             $states = EEM_State::instance()->get_all_active_states();
         }
@@ -91,12 +91,12 @@ 
             $states = $state_options;
             $state_options = array();
         }
-        if (! empty($states)) {
+        if ( ! empty($states)) {
             // set the default
             $state_options[''][''] = '';
             foreach ($states as $state) {
                 if ($state instanceof EE_State) {
-                    $state_options[ $state->country()->name() ][ $state->get($this->valueFieldName()) ] = $state->name();
+                    $state_options[$state->country()->name()][$state->get($this->valueFieldName())] = $state->name();
                 }
             }
         }

Indentation +86 added lines, -86 removed lines

@@ -12,94 +12,94 @@
  */
 class EE_State_Select_Input extends EE_Select_Input
 {
-    /**
-     * @var string the name of the EE_State field to use for option values in the HTML form input.
-     */
-    protected $valueFieldName;
+	/**
+	 * @var string the name of the EE_State field to use for option values in the HTML form input.
+	 */
+	protected $valueFieldName;
 
-    /**
-     * @param EE_State[]|array|null $state_options. If a flat array of string is provided,
-     * $input_settings['value_field_name'] is ignored. If an array of states is passed, that field will be used for
-     * the keys (which will become the option values). If null or empty is passed, all active states will be used,
-     * and $input_settings['value_field_name'] will again be used.     *
-     * @param array $input_settings same as parent, but also {
-     *   @type string $value_field_name the name of the field to use
-     *   for the HTML option values, ie, `STA_ID`, `STA_abbrev`, or `STA_name`.
-     * }
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function __construct($state_options, $input_settings = array())
-    {
-        if (isset($input_settings['value_field_name'])) {
-            $this->valueFieldName = $input_settings['value_field_name'];
-            if (! EEM_State::instance()->has_field((string) $this->valueFieldName())) {
-                throw new InvalidArgumentException(
-                    sprintf(
-                        esc_html__('An invalid state field "%1$s" was specified for the state input\'s option values.', 'event_espresso'),
-                        $this->valueFieldName()
-                    )
-                );
-            }
-        } else {
-            $this->valueFieldName = 'STA_ID';
-        }
-        $state_options = apply_filters(
-            'FHEE__EE_State_Select_Input____construct__state_options',
-            $this->get_state_answer_options($state_options),
-            $this
-        );
-        $input_settings['html_class'] = isset($input_settings['html_class'])
-            ? $input_settings['html_class'] . ' ee-state-select-js'
-            : 'ee-state-select-js';
-        parent::__construct($state_options, $input_settings);
-    }
+	/**
+	 * @param EE_State[]|array|null $state_options. If a flat array of string is provided,
+	 * $input_settings['value_field_name'] is ignored. If an array of states is passed, that field will be used for
+	 * the keys (which will become the option values). If null or empty is passed, all active states will be used,
+	 * and $input_settings['value_field_name'] will again be used.     *
+	 * @param array $input_settings same as parent, but also {
+	 *   @type string $value_field_name the name of the field to use
+	 *   for the HTML option values, ie, `STA_ID`, `STA_abbrev`, or `STA_name`.
+	 * }
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function __construct($state_options, $input_settings = array())
+	{
+		if (isset($input_settings['value_field_name'])) {
+			$this->valueFieldName = $input_settings['value_field_name'];
+			if (! EEM_State::instance()->has_field((string) $this->valueFieldName())) {
+				throw new InvalidArgumentException(
+					sprintf(
+						esc_html__('An invalid state field "%1$s" was specified for the state input\'s option values.', 'event_espresso'),
+						$this->valueFieldName()
+					)
+				);
+			}
+		} else {
+			$this->valueFieldName = 'STA_ID';
+		}
+		$state_options = apply_filters(
+			'FHEE__EE_State_Select_Input____construct__state_options',
+			$this->get_state_answer_options($state_options),
+			$this
+		);
+		$input_settings['html_class'] = isset($input_settings['html_class'])
+			? $input_settings['html_class'] . ' ee-state-select-js'
+			: 'ee-state-select-js';
+		parent::__construct($state_options, $input_settings);
+	}
 
-    /**
-     * Returns the name of the state field used for the HTML option values.
-     * @since 4.10.0.p
-     * @return string
-     */
-    public function valueFieldName()
-    {
-        return $this->valueFieldName;
-    }
+	/**
+	 * Returns the name of the state field used for the HTML option values.
+	 * @since 4.10.0.p
+	 * @return string
+	 */
+	public function valueFieldName()
+	{
+		return $this->valueFieldName;
+	}
 
 
-    /**
-     * get_state_answer_options
-     *
-     * @param array $state_options
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function get_state_answer_options($state_options = null)
-    {
-        // if passed something that is NOT an array
-        if (! is_array($state_options) || empty($state_options)) {
-            // get possibly cached list of states
-            $states = EEM_State::instance()->get_all_active_states();
-        }
-        if (is_array($state_options) && reset($state_options) instanceof EE_State) {
-            $states = $state_options;
-            $state_options = array();
-        }
-        if (! empty($states)) {
-            // set the default
-            $state_options[''][''] = '';
-            foreach ($states as $state) {
-                if ($state instanceof EE_State) {
-                    $state_options[ $state->country()->name() ][ $state->get($this->valueFieldName()) ] = $state->name();
-                }
-            }
-        }
-        return $state_options;
-    }
+	/**
+	 * get_state_answer_options
+	 *
+	 * @param array $state_options
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function get_state_answer_options($state_options = null)
+	{
+		// if passed something that is NOT an array
+		if (! is_array($state_options) || empty($state_options)) {
+			// get possibly cached list of states
+			$states = EEM_State::instance()->get_all_active_states();
+		}
+		if (is_array($state_options) && reset($state_options) instanceof EE_State) {
+			$states = $state_options;
+			$state_options = array();
+		}
+		if (! empty($states)) {
+			// set the default
+			$state_options[''][''] = '';
+			foreach ($states as $state) {
+				if ($state instanceof EE_State) {
+					$state_options[ $state->country()->name() ][ $state->get($this->valueFieldName()) ] = $state->name();
+				}
+			}
+		}
+		return $state_options;
+	}
 }

admin_pages/transactions/Transactions_Admin_Page_Init.core.php

Indentation +49 added lines, -49 removed lines

@@ -13,58 +13,58 @@
 {
 
 
-    /**
-     * @Constructor
-     * @access public
-     * @return Transactions_Admin_Page_Init
-     */
-    public function __construct()
-    {
+	/**
+	 * @Constructor
+	 * @access public
+	 * @return Transactions_Admin_Page_Init
+	 */
+	public function __construct()
+	{
 
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        if (! defined('TXN_PG_SLUG')) {
-            define('TXN_PG_SLUG', 'espresso_transactions');
-            define('TXN_PG_NAME', ucwords(str_replace('_', '', TXN_PG_SLUG)));
-            define('TXN_ADMIN', EE_ADMIN_PAGES . 'transactions/');
-            define('TXN_ADMIN_URL', admin_url('admin.php?page=' . TXN_PG_SLUG));
-            define('TXN_ASSETS_PATH', TXN_ADMIN . 'assets/');
-            define('TXN_ASSETS_URL', str_replace('\\', '/', EE_ADMIN_PAGES_URL . 'transactions/assets/'));
-            define('TXN_TEMPLATE_PATH', TXN_ADMIN . 'templates/');
-            define('TXN_TEMPLATE_URL', str_replace('\\', '/', EE_ADMIN_PAGES_URL . 'transactions/templates/'));
-        }
-        parent::__construct();
-    }
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		if (! defined('TXN_PG_SLUG')) {
+			define('TXN_PG_SLUG', 'espresso_transactions');
+			define('TXN_PG_NAME', ucwords(str_replace('_', '', TXN_PG_SLUG)));
+			define('TXN_ADMIN', EE_ADMIN_PAGES . 'transactions/');
+			define('TXN_ADMIN_URL', admin_url('admin.php?page=' . TXN_PG_SLUG));
+			define('TXN_ASSETS_PATH', TXN_ADMIN . 'assets/');
+			define('TXN_ASSETS_URL', str_replace('\\', '/', EE_ADMIN_PAGES_URL . 'transactions/assets/'));
+			define('TXN_TEMPLATE_PATH', TXN_ADMIN . 'templates/');
+			define('TXN_TEMPLATE_URL', str_replace('\\', '/', EE_ADMIN_PAGES_URL . 'transactions/templates/'));
+		}
+		parent::__construct();
+	}
 
 
-    /**
-     *    _set_init_properties
-     *
-     * @return void
-     */
-    protected function _set_init_properties()
-    {
-        $this->label = __('Transactions Overview', 'event_espresso');
-    }
+	/**
+	 *    _set_init_properties
+	 *
+	 * @return void
+	 */
+	protected function _set_init_properties()
+	{
+		$this->label = __('Transactions Overview', 'event_espresso');
+	}
 
 
-    /**
-     *    _set_menu_map
-     *
-     * @return void
-     */
-    protected function _set_menu_map()
-    {
-        $this->_menu_map = new EE_Admin_Page_Sub_Menu(
-            array(
-                'menu_group'      => 'main',
-                'menu_order'      => 50,
-                'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
-                'parent_slug'     => 'espresso_events',
-                'menu_slug'       => TXN_PG_SLUG,
-                'menu_label'      => __('Transactions', 'event_espresso'),
-                'capability'      => 'ee_read_transactions',
-                'admin_init_page' => $this,
-            )
-        );
-    }
+	/**
+	 *    _set_menu_map
+	 *
+	 * @return void
+	 */
+	protected function _set_menu_map()
+	{
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(
+			array(
+				'menu_group'      => 'main',
+				'menu_order'      => 50,
+				'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
+				'parent_slug'     => 'espresso_events',
+				'menu_slug'       => TXN_PG_SLUG,
+				'menu_label'      => __('Transactions', 'event_espresso'),
+				'capability'      => 'ee_read_transactions',
+				'admin_init_page' => $this,
+			)
+		);
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -22,15 +22,15 @@
     {
 
         do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        if (! defined('TXN_PG_SLUG')) {
+        if ( ! defined('TXN_PG_SLUG')) {
             define('TXN_PG_SLUG', 'espresso_transactions');
             define('TXN_PG_NAME', ucwords(str_replace('_', '', TXN_PG_SLUG)));
-            define('TXN_ADMIN', EE_ADMIN_PAGES . 'transactions/');
-            define('TXN_ADMIN_URL', admin_url('admin.php?page=' . TXN_PG_SLUG));
-            define('TXN_ASSETS_PATH', TXN_ADMIN . 'assets/');
-            define('TXN_ASSETS_URL', str_replace('\\', '/', EE_ADMIN_PAGES_URL . 'transactions/assets/'));
-            define('TXN_TEMPLATE_PATH', TXN_ADMIN . 'templates/');
-            define('TXN_TEMPLATE_URL', str_replace('\\', '/', EE_ADMIN_PAGES_URL . 'transactions/templates/'));
+            define('TXN_ADMIN', EE_ADMIN_PAGES.'transactions/');
+            define('TXN_ADMIN_URL', admin_url('admin.php?page='.TXN_PG_SLUG));
+            define('TXN_ASSETS_PATH', TXN_ADMIN.'assets/');
+            define('TXN_ASSETS_URL', str_replace('\\', '/', EE_ADMIN_PAGES_URL.'transactions/assets/'));
+            define('TXN_TEMPLATE_PATH', TXN_ADMIN.'templates/');
+            define('TXN_TEMPLATE_URL', str_replace('\\', '/', EE_ADMIN_PAGES_URL.'transactions/templates/'));
         }
         parent::__construct();
     }

admin_pages/general_settings/General_Settings_Admin_Page_Init.core.php

Indentation +30 added lines, -30 removed lines

@@ -18,37 +18,37 @@
 class General_Settings_Admin_Page_Init extends EE_Admin_Page_Init
 {
 
-    public function __construct()
-    {
-        // define some constants
-        define('GEN_SET_PG_SLUG', 'espresso_general_settings');
-        define('GEN_SET_LABEL', __('General Settings', 'event_espresso'));
-        define('GEN_SET_ADMIN', EE_ADMIN_PAGES . 'general_settings/');
-        define('GEN_SET_ADMIN_URL', admin_url('admin.php?page=' . GEN_SET_PG_SLUG));
-        define('GEN_SET_TEMPLATE_PATH', GEN_SET_ADMIN . 'templates/');
-        define('GEN_SET_ASSETS_URL', EE_ADMIN_PAGES_URL . 'general_settings/assets/');
+	public function __construct()
+	{
+		// define some constants
+		define('GEN_SET_PG_SLUG', 'espresso_general_settings');
+		define('GEN_SET_LABEL', __('General Settings', 'event_espresso'));
+		define('GEN_SET_ADMIN', EE_ADMIN_PAGES . 'general_settings/');
+		define('GEN_SET_ADMIN_URL', admin_url('admin.php?page=' . GEN_SET_PG_SLUG));
+		define('GEN_SET_TEMPLATE_PATH', GEN_SET_ADMIN . 'templates/');
+		define('GEN_SET_ASSETS_URL', EE_ADMIN_PAGES_URL . 'general_settings/assets/');
 
-        parent::__construct();
-    }
+		parent::__construct();
+	}
 
-    protected function _set_init_properties()
-    {
-        $this->label = GEN_SET_LABEL;
-    }
+	protected function _set_init_properties()
+	{
+		$this->label = GEN_SET_LABEL;
+	}
 
-    protected function _set_menu_map()
-    {
-        $this->_menu_map = new EE_Admin_Page_Sub_Menu(
-            array(
-                'menu_group'      => 'settings',
-                'menu_order'      => 20,
-                'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
-                'parent_slug'     => 'espresso_events',
-                'menu_slug'       => GEN_SET_PG_SLUG,
-                'menu_label'      => GEN_SET_LABEL,
-                'capability'      => 'manage_options',
-                'admin_init_page' => $this,
-            )
-        );
-    }
+	protected function _set_menu_map()
+	{
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(
+			array(
+				'menu_group'      => 'settings',
+				'menu_order'      => 20,
+				'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
+				'parent_slug'     => 'espresso_events',
+				'menu_slug'       => GEN_SET_PG_SLUG,
+				'menu_label'      => GEN_SET_LABEL,
+				'capability'      => 'manage_options',
+				'admin_init_page' => $this,
+			)
+		);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -23,10 +23,10 @@
         // define some constants
         define('GEN_SET_PG_SLUG', 'espresso_general_settings');
         define('GEN_SET_LABEL', __('General Settings', 'event_espresso'));
-        define('GEN_SET_ADMIN', EE_ADMIN_PAGES . 'general_settings/');
-        define('GEN_SET_ADMIN_URL', admin_url('admin.php?page=' . GEN_SET_PG_SLUG));
-        define('GEN_SET_TEMPLATE_PATH', GEN_SET_ADMIN . 'templates/');
-        define('GEN_SET_ASSETS_URL', EE_ADMIN_PAGES_URL . 'general_settings/assets/');
+        define('GEN_SET_ADMIN', EE_ADMIN_PAGES.'general_settings/');
+        define('GEN_SET_ADMIN_URL', admin_url('admin.php?page='.GEN_SET_PG_SLUG));
+        define('GEN_SET_TEMPLATE_PATH', GEN_SET_ADMIN.'templates/');
+        define('GEN_SET_ASSETS_URL', EE_ADMIN_PAGES_URL.'general_settings/assets/');
 
         parent::__construct();
     }