eventespresso / event-espresso-core

core/domain/Domain.php

Indentation +51 added lines, -51 removed lines

@@ -16,66 +16,66 @@
 class Domain extends DomainBase implements CaffeinatedInterface
 {
 
-    /**
-     * URL path component used to denote an API request
-     */
-    const API_NAMESPACE = 'ee/v';
+	/**
+	 * URL path component used to denote an API request
+	 */
+	const API_NAMESPACE = 'ee/v';
 
-    /**
-     * Slug used for the context where a registration status is changed from a manual trigger in the Registration Admin
-     * Page ui.
-     */
-    const CONTEXT_REGISTRATION_STATUS_CHANGE_REGISTRATION_ADMIN
-        = 'manual_registration_status_change_from_registration_admin';
+	/**
+	 * Slug used for the context where a registration status is changed from a manual trigger in the Registration Admin
+	 * Page ui.
+	 */
+	const CONTEXT_REGISTRATION_STATUS_CHANGE_REGISTRATION_ADMIN
+		= 'manual_registration_status_change_from_registration_admin';
 
-    const CONTEXT_REGISTRATION_STATUS_CHANGE_REGISTRATION_ADMIN_NOTIFY
-        = 'manual_registration_status_change_from_registration_admin_and_notify';
+	const CONTEXT_REGISTRATION_STATUS_CHANGE_REGISTRATION_ADMIN_NOTIFY
+		= 'manual_registration_status_change_from_registration_admin_and_notify';
 
 
-    /**
-     * Whether or not EE core is the full premium version.
-     * @since 4.9.59.p
-     * @var bool
-     */
-    private $caffeinated;
+	/**
+	 * Whether or not EE core is the full premium version.
+	 * @since 4.9.59.p
+	 * @var bool
+	 */
+	private $caffeinated;
 
 
-    public function __construct(FilePath $plugin_file, Version $version)
-    {
-        parent::__construct($plugin_file, $version);
-        $this->setCaffeinated();
-    }
+	public function __construct(FilePath $plugin_file, Version $version)
+	{
+		parent::__construct($plugin_file, $version);
+		$this->setCaffeinated();
+	}
 
-    /**
-     * Whether or not EE core is the full premium version.
-     * @since 4.9.59.p
-     * @return bool
-     */
-    public function isCaffeinated()
-    {
-        return $this->caffeinated;
-    }
+	/**
+	 * Whether or not EE core is the full premium version.
+	 * @since 4.9.59.p
+	 * @return bool
+	 */
+	public function isCaffeinated()
+	{
+		return $this->caffeinated;
+	}
 
 
-    /**
-     * Setter for $is_caffeinated property.
-     * @since 4.9.59.p
-     */
-    private function setCaffeinated()
-    {
-        $this->caffeinated = (! defined('EE_DECAF') || EE_DECAF !== true)
-            && is_readable($this->pluginPath() . 'caffeinated/brewing_regular.php');
-    }
+	/**
+	 * Setter for $is_caffeinated property.
+	 * @since 4.9.59.p
+	 */
+	private function setCaffeinated()
+	{
+		$this->caffeinated = (! defined('EE_DECAF') || EE_DECAF !== true)
+			&& is_readable($this->pluginPath() . 'caffeinated/brewing_regular.php');
+	}
 
 
-    /**
-     * This should be used everywhere the Event Espresso brand name is referenced in public facing interfaces
-     * to allow for filtering the brand.
-     *
-     * @return string
-     */
-    public static function brandName()
-    {
-        return (string) apply_filters('FHEE__EventEspresso_core_domain_Domain__brandName', 'Event Espresso');
-    }
+	/**
+	 * This should be used everywhere the Event Espresso brand name is referenced in public facing interfaces
+	 * to allow for filtering the brand.
+	 *
+	 * @return string
+	 */
+	public static function brandName()
+	{
+		return (string) apply_filters('FHEE__EventEspresso_core_domain_Domain__brandName', 'Event Espresso');
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -63,8 +63,8 @@
      */
     private function setCaffeinated()
     {
-        $this->caffeinated = (! defined('EE_DECAF') || EE_DECAF !== true)
-            && is_readable($this->pluginPath() . 'caffeinated/brewing_regular.php');
+        $this->caffeinated = ( ! defined('EE_DECAF') || EE_DECAF !== true)
+            && is_readable($this->pluginPath().'caffeinated/brewing_regular.php');
     }
 
 

core/domain/services/assets/CoreAssetManager.php

Indentation +536 added lines, -536 removed lines

@@ -32,559 +32,559 @@
 class CoreAssetManager extends AssetManager
 {
 
-    // WordPress core / Third party JS asset handles
-    const JS_HANDLE_JQUERY = 'jquery';
+	// WordPress core / Third party JS asset handles
+	const JS_HANDLE_JQUERY = 'jquery';
 
-    const JS_HANDLE_JQUERY_VALIDATE = 'jquery-validate';
+	const JS_HANDLE_JQUERY_VALIDATE = 'jquery-validate';
 
-    const JS_HANDLE_JQUERY_VALIDATE_EXTRA = 'jquery-validate-extra-methods';
+	const JS_HANDLE_JQUERY_VALIDATE_EXTRA = 'jquery-validate-extra-methods';
 
-    const JS_HANDLE_UNDERSCORE = 'underscore';
+	const JS_HANDLE_UNDERSCORE = 'underscore';
 
-    const JS_HANDLE_ACCOUNTING_CORE = 'ee-accounting-core';
+	const JS_HANDLE_ACCOUNTING_CORE = 'ee-accounting-core';
 
-    /**
-     * @since 4.9.71.p
-     */
-    const JS_HANDLE_REACT = 'react';
+	/**
+	 * @since 4.9.71.p
+	 */
+	const JS_HANDLE_REACT = 'react';
 
-    /**
-     * @since 4.9.71.p
-     */
-    const JS_HANDLE_REACT_DOM = 'react-dom';
+	/**
+	 * @since 4.9.71.p
+	 */
+	const JS_HANDLE_REACT_DOM = 'react-dom';
 
-    /**
-     * @since 4.9.71.p
-     */
-    const JS_HANDLE_LODASH = 'lodash';
+	/**
+	 * @since 4.9.71.p
+	 */
+	const JS_HANDLE_LODASH = 'lodash';
 
-    // EE JS assets handles
-    const JS_HANDLE_MANIFEST = 'ee-manifest';
+	// EE JS assets handles
+	const JS_HANDLE_MANIFEST = 'ee-manifest';
 
-    const JS_HANDLE_JS_CORE = 'eejs-core';
+	const JS_HANDLE_JS_CORE = 'eejs-core';
 
-    const JS_HANDLE_VENDOR = 'eventespresso-vendor';
+	const JS_HANDLE_VENDOR = 'eventespresso-vendor';
 
-    const JS_HANDLE_DATA_STORES = 'eventespresso-data-stores';
+	const JS_HANDLE_DATA_STORES = 'eventespresso-data-stores';
 
-    const JS_HANDLE_HELPERS = 'eventespresso-helpers';
+	const JS_HANDLE_HELPERS = 'eventespresso-helpers';
 
-    const JS_HANDLE_MODEL = 'eventespresso-model';
+	const JS_HANDLE_MODEL = 'eventespresso-model';
 
-    const JS_HANDLE_VALUE_OBJECTS = 'eventespresso-value-objects';
+	const JS_HANDLE_VALUE_OBJECTS = 'eventespresso-value-objects';
 
-    const JS_HANDLE_HOCS = 'eventespresso-hocs';
+	const JS_HANDLE_HOCS = 'eventespresso-hocs';
 
-    const JS_HANDLE_COMPONENTS = 'eventespresso-components';
-
-    const JS_HANDLE_EDITOR_HOCS = 'eventespresso-editor-hocs';
+	const JS_HANDLE_COMPONENTS = 'eventespresso-components';
+
+	const JS_HANDLE_EDITOR_HOCS = 'eventespresso-editor-hocs';
 
-    const JS_HANDLE_VALIDATORS = 'eventespresso-validators';
+	const JS_HANDLE_VALIDATORS = 'eventespresso-validators';
 
-    const JS_HANDLE_CORE = 'espresso_core';
+	const JS_HANDLE_CORE = 'espresso_core';
 
-    const JS_HANDLE_I18N = 'eei18n';
-
-    const JS_HANDLE_ACCOUNTING = 'ee-accounting';
-
-    const JS_HANDLE_WP_PLUGINS_PAGE = 'ee-wp-plugins-page';
-
-    // EE CSS assets handles
-    const CSS_HANDLE_DEFAULT = 'espresso_default';
-
-    const CSS_HANDLE_CUSTOM = 'espresso_custom_css';
-
-    const CSS_HANDLE_COMPONENTS = 'eventespresso-components';
-
-    /**
-     * @var EE_Currency_Config $currency_config
-     */
-    protected $currency_config;
-
-    /**
-     * @var EE_Template_Config $template_config
-     */
-    protected $template_config;
-
-
-    /**
-     * CoreAssetRegister constructor.
-     *
-     * @param AssetCollection    $assets
-     * @param EE_Currency_Config $currency_config
-     * @param EE_Template_Config $template_config
-     * @param DomainInterface    $domain
-     * @param Registry           $registry
-     */
-    public function __construct(
-        AssetCollection $assets,
-        EE_Currency_Config $currency_config,
-        EE_Template_Config $template_config,
-        DomainInterface $domain,
-        Registry $registry
-    ) {
-        $this->currency_config = $currency_config;
-        $this->template_config = $template_config;
-        parent::__construct($domain, $assets, $registry);
-    }
-
-
-    /**
-     * @since 4.9.62.p
-     * @throws DomainException
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws InvalidInterfaceException
-     */
-    public function addAssets()
-    {
-        $this->addJavascriptFiles();
-        $this->addStylesheetFiles();
-    }
-
-
-    /**
-     * @since 4.9.62.p
-     * @throws DomainException
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws InvalidInterfaceException
-     */
-    public function addJavascriptFiles()
-    {
-        $this->loadCoreJs();
-        $this->loadJqueryValidate();
-        $this->loadAccountingJs();
-        add_action(
-            'AHEE__EventEspresso_core_services_assets_Registry__registerScripts__before_script',
-            array($this, 'loadQtipJs')
-        );
-        $this->registerAdminAssets();
-    }
-
-
-    /**
-     * @since 4.9.62.p
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     */
-    public function addStylesheetFiles()
-    {
-        $this->loadCoreCss();
-    }
-
-
-    /**
-     * core default javascript
-     *
-     * @since 4.9.62.p
-     * @throws DomainException
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws InvalidInterfaceException
-     */
-    private function loadCoreJs()
-    {
-        // conditionally load third-party libraries that WP core MIGHT have.
-        $this->registerWpAssets();
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_MANIFEST,
-            $this->registry->getJsUrl($this->domain->assetNamespace(), 'manifest')
-        );
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_JS_CORE,
-            $this->registry->getJsUrl($this->domain->assetNamespace(), 'eejs'),
-            array(CoreAssetManager::JS_HANDLE_MANIFEST)
-        )
-        ->setHasInlineData();
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_VENDOR,
-            $this->registry->getJsUrl($this->domain->assetNamespace(), 'vendor'),
-            array(
-                CoreAssetManager::JS_HANDLE_JS_CORE,
-                CoreAssetManager::JS_HANDLE_REACT,
-                CoreAssetManager::JS_HANDLE_REACT_DOM,
-                CoreAssetManager::JS_HANDLE_LODASH,
-            )
-        );
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_VALIDATORS,
-            $this->registry->getJsUrl($this->domain->assetNamespace(), 'validators')
-        )->setRequiresTranslation();
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_HELPERS,
-            $this->registry->getJsUrl($this->domain->assetNamespace(), 'helpers'),
-            array(
-                CoreAssetManager::JS_HANDLE_VALIDATORS
-            )
-        )->setRequiresTranslation();
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_MODEL,
-            $this->registry->getJsUrl($this->domain->assetNamespace(), 'model'),
-            array(
-                CoreAssetManager::JS_HANDLE_HELPERS,
-                CoreAssetManager::JS_HANDLE_VALUE_OBJECTS,
-            )
-        )->setRequiresTranslation();
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_VALUE_OBJECTS,
-            $this->registry->getJsUrl($this->domain->assetNamespace(), 'valueObjects'),
-            array(
-                CoreAssetManager::JS_HANDLE_VALIDATORS,
-                CoreAssetManager::JS_HANDLE_HELPERS,
-            )
-        )->setRequiresTranslation();
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_DATA_STORES,
-            $this->registry->getJsUrl($this->domain->assetNamespace(), 'data-stores'),
-            array(
-                CoreAssetManager::JS_HANDLE_VENDOR,
-                'wp-data',
-                'wp-api-fetch',
-                CoreAssetManager::JS_HANDLE_VALUE_OBJECTS,
-                CoreAssetManager::JS_HANDLE_MODEL,
-            )
-        )
-             ->setRequiresTranslation()
-             ->setInlineDataCallback(
-                 function() {
-                     wp_add_inline_script(
-                         CoreAssetManager::JS_HANDLE_DATA_STORES,
-                         is_admin()
-                             ? 'wp.apiFetch.use( eejs.middleWares.apiFetch.capsMiddleware( eejs.middleWares.apiFetch.CONTEXT_CAPS_EDIT ) )'
-                             : 'wp.apiFetch.use( eejs.middleWares.apiFetch.capsMiddleware )'
-                     );
-                 }
-             );
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_HOCS,
-            $this->registry->getJsUrl($this->domain->assetNamespace(), 'hocs'),
-            array(
-                CoreAssetManager::JS_HANDLE_DATA_STORES,
-                CoreAssetManager::JS_HANDLE_VALUE_OBJECTS,
-                'wp-components',
-            )
-        )->setRequiresTranslation();
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_COMPONENTS,
-            $this->registry->getJsUrl($this->domain->assetNamespace(), 'components'),
-            array(
-                CoreAssetManager::JS_HANDLE_DATA_STORES,
-                CoreAssetManager::JS_HANDLE_VALUE_OBJECTS,
-                'wp-components',
-            )
-        )
-        ->setRequiresTranslation();
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_EDITOR_HOCS,
-            $this->registry->getJsUrl($this->domain->assetNamespace(), 'editor-hocs'),
-            array(
-                CoreAssetManager::JS_HANDLE_COMPONENTS
-            )
-        )->setRequiresTranslation();
-
-        $this->registry->addData('eejs_api_nonce', wp_create_nonce('wp_rest'));
-        $this->registry->addData(
-            'paths',
-            array(
-                'base_rest_route' => rest_url(),
-                'rest_route' => rest_url('ee/v4.8.36/'),
-                'collection_endpoints' => EED_Core_Rest_Api::getCollectionRoutesIndexedByModelName(),
-                'primary_keys' => EED_Core_Rest_Api::getPrimaryKeyNamesIndexedByModelName(),
-                'site_url' => site_url('/'),
-                'admin_url' => admin_url('/'),
-            )
-        );
-        // Event Espresso brand name
-        $this->registry->addData('brandName', Domain::brandName());
-        /** site formatting values **/
-        $this->registry->addData(
-            'site_formats',
-            array(
-                'date_formats' => EEH_DTT_Helper::convert_php_to_js_and_moment_date_formats()
-            )
-        );
-        /** currency data **/
-        $this->registry->addData(
-            'currency_config',
-            $this->getCurrencySettings()
-        );
-        /** site timezone */
-        $this->registry->addData(
-            'default_timezone',
-            array(
-                'pretty' => EEH_DTT_Helper::get_timezone_string_for_display(),
-                'string' => get_option('timezone_string'),
-                'offset' => EEH_DTT_Helper::get_site_timezone_gmt_offset(),
-            )
-        );
-        /** site locale (user locale if user logged in) */
-        $this->registry->addData(
-            'locale',
-            array(
-                'user' => get_user_locale(),
-                'site' => get_locale()
-            )
-        );
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_CORE,
-            EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js',
-            array(CoreAssetManager::JS_HANDLE_JQUERY)
-        )
-        ->setInlineDataCallback(
-            function () {
-                wp_localize_script(
-                    CoreAssetManager::JS_HANDLE_CORE,
-                    CoreAssetManager::JS_HANDLE_I18N,
-                    EE_Registry::$i18n_js_strings
-                );
-            }
-        );
-    }
-
-
-    /**
-     * Registers vendor files that are bundled with a later version WP but might not be for the current version of
-     * WordPress in the running environment.
-     *
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DomainException
-     * @since 4.9.71.p
-     */
-    private function registerWpAssets()
-    {
-        global $wp_version;
-        if (version_compare($wp_version, '5.0.beta', '>=')) {
-            return;
-        }
-        $this->addVendorJavascript(CoreAssetManager::JS_HANDLE_REACT)
-            ->setVersion('16.6.0');
-        $this->addVendorJavascript(
-            CoreAssetManager::JS_HANDLE_REACT_DOM,
-            array(CoreAssetManager::JS_HANDLE_REACT)
-        )->setVersion('16.6.0');
-        $this->addVendorJavascript(CoreAssetManager::JS_HANDLE_LODASH)
-            ->setInlineDataCallback(
-                function() {
-                    wp_add_inline_script(
-                        CoreAssetManager::JS_HANDLE_LODASH,
-                        'window.lodash = _.noConflict();'
-                    );
-                }
-            )
-            ->setVersion('4.17.11');
-    }
-
-
-    /**
-     * Returns configuration data for the accounting-js library.
-     * @since 4.9.71.p
-     * @return array
-     */
-    private function getAccountingSettings() {
-        return array(
-            'currency' => array(
-                'symbol'    => $this->currency_config->sign,
-                'format'    => array(
-                    'pos'  => $this->currency_config->sign_b4 ? '%s%v' : '%v%s',
-                    'neg'  => $this->currency_config->sign_b4 ? '- %s%v' : '- %v%s',
-                    'zero' => $this->currency_config->sign_b4 ? '%s--' : '--%s',
-                ),
-                'decimal'   => $this->currency_config->dec_mrk,
-                'thousand'  => $this->currency_config->thsnds,
-                'precision' => $this->currency_config->dec_plc,
-            ),
-            'number'   => array(
-                'precision' => $this->currency_config->dec_plc,
-                'thousand'  => $this->currency_config->thsnds,
-                'decimal'   => $this->currency_config->dec_mrk,
-            ),
-        );
-    }
-
-
-    /**
-     * Returns configuration data for the js Currency VO.
-     * @since 4.9.71.p
-     * @return array
-     */
-    private function getCurrencySettings()
-    {
-        return array(
-            'code' => $this->currency_config->code,
-            'singularLabel' => $this->currency_config->name,
-            'pluralLabel' => $this->currency_config->plural,
-            'sign' => $this->currency_config->sign,
-            'signB4' => $this->currency_config->sign_b4,
-            'decimalPlaces' => $this->currency_config->dec_plc,
-            'decimalMark' => $this->currency_config->dec_mrk,
-            'thousandsSeparator' => $this->currency_config->thsnds,
-        );
-    }
-
-
-    /**
-     * @since 4.9.62.p
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     */
-    private function loadCoreCss()
-    {
-        if ($this->template_config->enable_default_style && ! is_admin()) {
-            $this->addStylesheet(
-                CoreAssetManager::CSS_HANDLE_DEFAULT,
-                is_readable(EVENT_ESPRESSO_UPLOAD_DIR . 'css/style.css')
-                    ? EVENT_ESPRESSO_UPLOAD_DIR . 'css/espresso_default.css'
-                    : EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
-                array('dashicons')
-            );
-            //Load custom style sheet if available
-            if ($this->template_config->custom_style_sheet !== null) {
-                $this->addStylesheet(
-                    CoreAssetManager::CSS_HANDLE_CUSTOM,
-                    EVENT_ESPRESSO_UPLOAD_URL . 'css/' . $this->template_config->custom_style_sheet,
-                    array(CoreAssetManager::CSS_HANDLE_DEFAULT)
-                );
-            }
-        }
-        $this->addStylesheet(
-            CoreAssetManager::CSS_HANDLE_COMPONENTS,
-            $this->registry->getCssUrl(
-                $this->domain->assetNamespace(),
-                'components'
-            )
-        );
-    }
-
-
-    /**
-     * jQuery Validate for form validation
-     *
-     * @since 4.9.62.p
-     * @throws DomainException
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     */
-    private function loadJqueryValidate()
-    {
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_JQUERY_VALIDATE,
-            EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.min.js',
-            array(CoreAssetManager::JS_HANDLE_JQUERY)
-        )
-        ->setVersion('1.15.0');
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_JQUERY_VALIDATE_EXTRA,
-            EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.additional-methods.min.js',
-            array(CoreAssetManager::JS_HANDLE_JQUERY_VALIDATE)
-        )
-        ->setVersion('1.15.0');
-    }
-
-
-    /**
-     * accounting.js for performing client-side calculations
-     *
-     * @since 4.9.62.p
-     * @throws DomainException
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     */
-    private function loadAccountingJs()
-    {
-        //accounting.js library
-        // @link http://josscrowcroft.github.io/accounting.js/
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_ACCOUNTING_CORE,
-            EE_THIRD_PARTY_URL . 'accounting/accounting.js',
-            array(CoreAssetManager::JS_HANDLE_UNDERSCORE)
-        )
-        ->setVersion('0.3.2');
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_ACCOUNTING,
-            EE_GLOBAL_ASSETS_URL . 'scripts/ee-accounting-config.js',
-            array(CoreAssetManager::JS_HANDLE_ACCOUNTING_CORE)
-        )
-        ->setInlineDataCallback(
-            function () {
-                 wp_localize_script(
-                     CoreAssetManager::JS_HANDLE_ACCOUNTING,
-                     'EE_ACCOUNTING_CFG',
-                     $this->getAccountingSettings()
-                 );
-            }
-        )
-        ->setVersion();
-    }
-
-
-    /**
-     * registers assets for cleaning your ears
-     *
-     * @param JavascriptAsset $script
-     */
-    public function loadQtipJs(JavascriptAsset $script)
-    {
-        // qtip is turned OFF by default, but prior to the wp_enqueue_scripts hook,
-        // can be turned back on again via: add_filter('FHEE_load_qtip', '__return_true' );
-        if (
-            $script->handle() === CoreAssetManager::JS_HANDLE_WP_PLUGINS_PAGE
-            && apply_filters('FHEE_load_qtip', false)
-        ) {
-            EEH_Qtip_Loader::instance()->register_and_enqueue();
-        }
-    }
-
-
-    /**
-     * assets that are used in the WordPress admin
-     *
-     * @since 4.9.62.p
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     */
-    private function registerAdminAssets()
-    {
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_WP_PLUGINS_PAGE,
-            $this->registry->getJsUrl($this->domain->assetNamespace(), 'wp-plugins-page'),
-            array(
-                CoreAssetManager::JS_HANDLE_JQUERY,
-                CoreAssetManager::JS_HANDLE_VENDOR,
-            )
-        )
-        ->setRequiresTranslation();
-
-        $this->addStylesheet(
-            CoreAssetManager::JS_HANDLE_WP_PLUGINS_PAGE,
-            $this->registry->getCssUrl($this->domain->assetNamespace(), 'wp-plugins-page')
-        );
-    }
+	const JS_HANDLE_I18N = 'eei18n';
+
+	const JS_HANDLE_ACCOUNTING = 'ee-accounting';
+
+	const JS_HANDLE_WP_PLUGINS_PAGE = 'ee-wp-plugins-page';
+
+	// EE CSS assets handles
+	const CSS_HANDLE_DEFAULT = 'espresso_default';
+
+	const CSS_HANDLE_CUSTOM = 'espresso_custom_css';
+
+	const CSS_HANDLE_COMPONENTS = 'eventespresso-components';
+
+	/**
+	 * @var EE_Currency_Config $currency_config
+	 */
+	protected $currency_config;
+
+	/**
+	 * @var EE_Template_Config $template_config
+	 */
+	protected $template_config;
+
+
+	/**
+	 * CoreAssetRegister constructor.
+	 *
+	 * @param AssetCollection    $assets
+	 * @param EE_Currency_Config $currency_config
+	 * @param EE_Template_Config $template_config
+	 * @param DomainInterface    $domain
+	 * @param Registry           $registry
+	 */
+	public function __construct(
+		AssetCollection $assets,
+		EE_Currency_Config $currency_config,
+		EE_Template_Config $template_config,
+		DomainInterface $domain,
+		Registry $registry
+	) {
+		$this->currency_config = $currency_config;
+		$this->template_config = $template_config;
+		parent::__construct($domain, $assets, $registry);
+	}
+
+
+	/**
+	 * @since 4.9.62.p
+	 * @throws DomainException
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws InvalidInterfaceException
+	 */
+	public function addAssets()
+	{
+		$this->addJavascriptFiles();
+		$this->addStylesheetFiles();
+	}
+
+
+	/**
+	 * @since 4.9.62.p
+	 * @throws DomainException
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws InvalidInterfaceException
+	 */
+	public function addJavascriptFiles()
+	{
+		$this->loadCoreJs();
+		$this->loadJqueryValidate();
+		$this->loadAccountingJs();
+		add_action(
+			'AHEE__EventEspresso_core_services_assets_Registry__registerScripts__before_script',
+			array($this, 'loadQtipJs')
+		);
+		$this->registerAdminAssets();
+	}
+
+
+	/**
+	 * @since 4.9.62.p
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 */
+	public function addStylesheetFiles()
+	{
+		$this->loadCoreCss();
+	}
+
+
+	/**
+	 * core default javascript
+	 *
+	 * @since 4.9.62.p
+	 * @throws DomainException
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws InvalidInterfaceException
+	 */
+	private function loadCoreJs()
+	{
+		// conditionally load third-party libraries that WP core MIGHT have.
+		$this->registerWpAssets();
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_MANIFEST,
+			$this->registry->getJsUrl($this->domain->assetNamespace(), 'manifest')
+		);
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_JS_CORE,
+			$this->registry->getJsUrl($this->domain->assetNamespace(), 'eejs'),
+			array(CoreAssetManager::JS_HANDLE_MANIFEST)
+		)
+		->setHasInlineData();
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_VENDOR,
+			$this->registry->getJsUrl($this->domain->assetNamespace(), 'vendor'),
+			array(
+				CoreAssetManager::JS_HANDLE_JS_CORE,
+				CoreAssetManager::JS_HANDLE_REACT,
+				CoreAssetManager::JS_HANDLE_REACT_DOM,
+				CoreAssetManager::JS_HANDLE_LODASH,
+			)
+		);
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_VALIDATORS,
+			$this->registry->getJsUrl($this->domain->assetNamespace(), 'validators')
+		)->setRequiresTranslation();
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_HELPERS,
+			$this->registry->getJsUrl($this->domain->assetNamespace(), 'helpers'),
+			array(
+				CoreAssetManager::JS_HANDLE_VALIDATORS
+			)
+		)->setRequiresTranslation();
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_MODEL,
+			$this->registry->getJsUrl($this->domain->assetNamespace(), 'model'),
+			array(
+				CoreAssetManager::JS_HANDLE_HELPERS,
+				CoreAssetManager::JS_HANDLE_VALUE_OBJECTS,
+			)
+		)->setRequiresTranslation();
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_VALUE_OBJECTS,
+			$this->registry->getJsUrl($this->domain->assetNamespace(), 'valueObjects'),
+			array(
+				CoreAssetManager::JS_HANDLE_VALIDATORS,
+				CoreAssetManager::JS_HANDLE_HELPERS,
+			)
+		)->setRequiresTranslation();
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_DATA_STORES,
+			$this->registry->getJsUrl($this->domain->assetNamespace(), 'data-stores'),
+			array(
+				CoreAssetManager::JS_HANDLE_VENDOR,
+				'wp-data',
+				'wp-api-fetch',
+				CoreAssetManager::JS_HANDLE_VALUE_OBJECTS,
+				CoreAssetManager::JS_HANDLE_MODEL,
+			)
+		)
+			 ->setRequiresTranslation()
+			 ->setInlineDataCallback(
+				 function() {
+					 wp_add_inline_script(
+						 CoreAssetManager::JS_HANDLE_DATA_STORES,
+						 is_admin()
+							 ? 'wp.apiFetch.use( eejs.middleWares.apiFetch.capsMiddleware( eejs.middleWares.apiFetch.CONTEXT_CAPS_EDIT ) )'
+							 : 'wp.apiFetch.use( eejs.middleWares.apiFetch.capsMiddleware )'
+					 );
+				 }
+			 );
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_HOCS,
+			$this->registry->getJsUrl($this->domain->assetNamespace(), 'hocs'),
+			array(
+				CoreAssetManager::JS_HANDLE_DATA_STORES,
+				CoreAssetManager::JS_HANDLE_VALUE_OBJECTS,
+				'wp-components',
+			)
+		)->setRequiresTranslation();
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_COMPONENTS,
+			$this->registry->getJsUrl($this->domain->assetNamespace(), 'components'),
+			array(
+				CoreAssetManager::JS_HANDLE_DATA_STORES,
+				CoreAssetManager::JS_HANDLE_VALUE_OBJECTS,
+				'wp-components',
+			)
+		)
+		->setRequiresTranslation();
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_EDITOR_HOCS,
+			$this->registry->getJsUrl($this->domain->assetNamespace(), 'editor-hocs'),
+			array(
+				CoreAssetManager::JS_HANDLE_COMPONENTS
+			)
+		)->setRequiresTranslation();
+
+		$this->registry->addData('eejs_api_nonce', wp_create_nonce('wp_rest'));
+		$this->registry->addData(
+			'paths',
+			array(
+				'base_rest_route' => rest_url(),
+				'rest_route' => rest_url('ee/v4.8.36/'),
+				'collection_endpoints' => EED_Core_Rest_Api::getCollectionRoutesIndexedByModelName(),
+				'primary_keys' => EED_Core_Rest_Api::getPrimaryKeyNamesIndexedByModelName(),
+				'site_url' => site_url('/'),
+				'admin_url' => admin_url('/'),
+			)
+		);
+		// Event Espresso brand name
+		$this->registry->addData('brandName', Domain::brandName());
+		/** site formatting values **/
+		$this->registry->addData(
+			'site_formats',
+			array(
+				'date_formats' => EEH_DTT_Helper::convert_php_to_js_and_moment_date_formats()
+			)
+		);
+		/** currency data **/
+		$this->registry->addData(
+			'currency_config',
+			$this->getCurrencySettings()
+		);
+		/** site timezone */
+		$this->registry->addData(
+			'default_timezone',
+			array(
+				'pretty' => EEH_DTT_Helper::get_timezone_string_for_display(),
+				'string' => get_option('timezone_string'),
+				'offset' => EEH_DTT_Helper::get_site_timezone_gmt_offset(),
+			)
+		);
+		/** site locale (user locale if user logged in) */
+		$this->registry->addData(
+			'locale',
+			array(
+				'user' => get_user_locale(),
+				'site' => get_locale()
+			)
+		);
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_CORE,
+			EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js',
+			array(CoreAssetManager::JS_HANDLE_JQUERY)
+		)
+		->setInlineDataCallback(
+			function () {
+				wp_localize_script(
+					CoreAssetManager::JS_HANDLE_CORE,
+					CoreAssetManager::JS_HANDLE_I18N,
+					EE_Registry::$i18n_js_strings
+				);
+			}
+		);
+	}
+
+
+	/**
+	 * Registers vendor files that are bundled with a later version WP but might not be for the current version of
+	 * WordPress in the running environment.
+	 *
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DomainException
+	 * @since 4.9.71.p
+	 */
+	private function registerWpAssets()
+	{
+		global $wp_version;
+		if (version_compare($wp_version, '5.0.beta', '>=')) {
+			return;
+		}
+		$this->addVendorJavascript(CoreAssetManager::JS_HANDLE_REACT)
+			->setVersion('16.6.0');
+		$this->addVendorJavascript(
+			CoreAssetManager::JS_HANDLE_REACT_DOM,
+			array(CoreAssetManager::JS_HANDLE_REACT)
+		)->setVersion('16.6.0');
+		$this->addVendorJavascript(CoreAssetManager::JS_HANDLE_LODASH)
+			->setInlineDataCallback(
+				function() {
+					wp_add_inline_script(
+						CoreAssetManager::JS_HANDLE_LODASH,
+						'window.lodash = _.noConflict();'
+					);
+				}
+			)
+			->setVersion('4.17.11');
+	}
+
+
+	/**
+	 * Returns configuration data for the accounting-js library.
+	 * @since 4.9.71.p
+	 * @return array
+	 */
+	private function getAccountingSettings() {
+		return array(
+			'currency' => array(
+				'symbol'    => $this->currency_config->sign,
+				'format'    => array(
+					'pos'  => $this->currency_config->sign_b4 ? '%s%v' : '%v%s',
+					'neg'  => $this->currency_config->sign_b4 ? '- %s%v' : '- %v%s',
+					'zero' => $this->currency_config->sign_b4 ? '%s--' : '--%s',
+				),
+				'decimal'   => $this->currency_config->dec_mrk,
+				'thousand'  => $this->currency_config->thsnds,
+				'precision' => $this->currency_config->dec_plc,
+			),
+			'number'   => array(
+				'precision' => $this->currency_config->dec_plc,
+				'thousand'  => $this->currency_config->thsnds,
+				'decimal'   => $this->currency_config->dec_mrk,
+			),
+		);
+	}
+
+
+	/**
+	 * Returns configuration data for the js Currency VO.
+	 * @since 4.9.71.p
+	 * @return array
+	 */
+	private function getCurrencySettings()
+	{
+		return array(
+			'code' => $this->currency_config->code,
+			'singularLabel' => $this->currency_config->name,
+			'pluralLabel' => $this->currency_config->plural,
+			'sign' => $this->currency_config->sign,
+			'signB4' => $this->currency_config->sign_b4,
+			'decimalPlaces' => $this->currency_config->dec_plc,
+			'decimalMark' => $this->currency_config->dec_mrk,
+			'thousandsSeparator' => $this->currency_config->thsnds,
+		);
+	}
+
+
+	/**
+	 * @since 4.9.62.p
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 */
+	private function loadCoreCss()
+	{
+		if ($this->template_config->enable_default_style && ! is_admin()) {
+			$this->addStylesheet(
+				CoreAssetManager::CSS_HANDLE_DEFAULT,
+				is_readable(EVENT_ESPRESSO_UPLOAD_DIR . 'css/style.css')
+					? EVENT_ESPRESSO_UPLOAD_DIR . 'css/espresso_default.css'
+					: EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
+				array('dashicons')
+			);
+			//Load custom style sheet if available
+			if ($this->template_config->custom_style_sheet !== null) {
+				$this->addStylesheet(
+					CoreAssetManager::CSS_HANDLE_CUSTOM,
+					EVENT_ESPRESSO_UPLOAD_URL . 'css/' . $this->template_config->custom_style_sheet,
+					array(CoreAssetManager::CSS_HANDLE_DEFAULT)
+				);
+			}
+		}
+		$this->addStylesheet(
+			CoreAssetManager::CSS_HANDLE_COMPONENTS,
+			$this->registry->getCssUrl(
+				$this->domain->assetNamespace(),
+				'components'
+			)
+		);
+	}
+
+
+	/**
+	 * jQuery Validate for form validation
+	 *
+	 * @since 4.9.62.p
+	 * @throws DomainException
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 */
+	private function loadJqueryValidate()
+	{
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_JQUERY_VALIDATE,
+			EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.min.js',
+			array(CoreAssetManager::JS_HANDLE_JQUERY)
+		)
+		->setVersion('1.15.0');
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_JQUERY_VALIDATE_EXTRA,
+			EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.additional-methods.min.js',
+			array(CoreAssetManager::JS_HANDLE_JQUERY_VALIDATE)
+		)
+		->setVersion('1.15.0');
+	}
+
+
+	/**
+	 * accounting.js for performing client-side calculations
+	 *
+	 * @since 4.9.62.p
+	 * @throws DomainException
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 */
+	private function loadAccountingJs()
+	{
+		//accounting.js library
+		// @link http://josscrowcroft.github.io/accounting.js/
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_ACCOUNTING_CORE,
+			EE_THIRD_PARTY_URL . 'accounting/accounting.js',
+			array(CoreAssetManager::JS_HANDLE_UNDERSCORE)
+		)
+		->setVersion('0.3.2');
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_ACCOUNTING,
+			EE_GLOBAL_ASSETS_URL . 'scripts/ee-accounting-config.js',
+			array(CoreAssetManager::JS_HANDLE_ACCOUNTING_CORE)
+		)
+		->setInlineDataCallback(
+			function () {
+				 wp_localize_script(
+					 CoreAssetManager::JS_HANDLE_ACCOUNTING,
+					 'EE_ACCOUNTING_CFG',
+					 $this->getAccountingSettings()
+				 );
+			}
+		)
+		->setVersion();
+	}
+
+
+	/**
+	 * registers assets for cleaning your ears
+	 *
+	 * @param JavascriptAsset $script
+	 */
+	public function loadQtipJs(JavascriptAsset $script)
+	{
+		// qtip is turned OFF by default, but prior to the wp_enqueue_scripts hook,
+		// can be turned back on again via: add_filter('FHEE_load_qtip', '__return_true' );
+		if (
+			$script->handle() === CoreAssetManager::JS_HANDLE_WP_PLUGINS_PAGE
+			&& apply_filters('FHEE_load_qtip', false)
+		) {
+			EEH_Qtip_Loader::instance()->register_and_enqueue();
+		}
+	}
+
+
+	/**
+	 * assets that are used in the WordPress admin
+	 *
+	 * @since 4.9.62.p
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 */
+	private function registerAdminAssets()
+	{
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_WP_PLUGINS_PAGE,
+			$this->registry->getJsUrl($this->domain->assetNamespace(), 'wp-plugins-page'),
+			array(
+				CoreAssetManager::JS_HANDLE_JQUERY,
+				CoreAssetManager::JS_HANDLE_VENDOR,
+			)
+		)
+		->setRequiresTranslation();
+
+		$this->addStylesheet(
+			CoreAssetManager::JS_HANDLE_WP_PLUGINS_PAGE,
+			$this->registry->getCssUrl($this->domain->assetNamespace(), 'wp-plugins-page')
+		);
+	}
 }

core/services/assets/I18nRegistry.php

Indentation +235 added lines, -235 removed lines

@@ -15,239 +15,239 @@
  */
 class I18nRegistry
 {
-    /**
-     * @var DomainInterface
-     */
-    private $domain;
-
-    /**
-     * Will hold all registered i18n scripts.  Prevents script handles from being registered more than once.
-     *
-     * @var array
-     */
-    private $registered_i18n = array();
-
-
-    /**
-     * Used to hold queued translations for the chunks loading in a view.
-     *
-     * @var array
-     */
-    private $queued_handle_translations = array();
-
-    /**
-     * Used to track script handles queued for adding translation strings as inline data in the dom.
-     *
-     * @var array
-     */
-    private $queued_scripts = array();
-
-
-    /**
-     * Obtained from the generated json file from the all javascript using wp.i18n with a map of script handle names to
-     * translation strings.
-     *
-     * @var array
-     */
-    private $i18n_map;
-
-
-    /**
-     * I18nRegistry constructor.
-     *
-     * @param array() $i18n_map  An array of script handle names and the strings translated for those handles.  If not
-     *                            provided, the class will look for map in root of plugin with filename of
-     *                            'translation-map.json'.
-     * @param DomainInterface $domain
-     */
-    public function __construct(array $i18n_map = array(), DomainInterface $domain)
-    {
-        $this->domain = $domain;
-        $this->setI18nMap($i18n_map);
-        add_filter('print_scripts_array', array($this, 'queueI18n'));
-    }
-
-
-    /**
-     * Used to register a script that has i18n strings for its $handle
-     *
-     * @param string $handle The script handle reference.
-     * @param string $domain The i18n domain for the strings.
-     */
-    public function registerScriptI18n($handle, $domain = 'event_espresso')
-    {
-        if(! isset($this->registered_i18n[$handle])) {
-            $this->registered_i18n[ $handle ] = 1;
-            $this->queued_scripts[ $handle ] = $domain;
-        }
-    }
-
-
-
-    /**
-     * Callback on print_scripts_array to listen for scripts enqueued and handle setting up the localized data.
-     *
-     * @param array $handles Array of registered script handles.
-     * @return array
-     */
-    public function queueI18n(array $handles)
-    {
-        if (empty($this->queued_scripts)) {
-            return $handles;
-        }
-        foreach ($handles as $handle) {
-            $this->queueI18nTranslationsForHandle($handle);
-        }
-        if ($this->queued_handle_translations) {
-            foreach ($this->queued_handle_translations as $handle => $translations_for_domain) {
-                $this->registerInlineScript(
-                    $handle,
-                    $translations_for_domain['translations'],
-                    $translations_for_domain['domain']
-                );
-                unset($this->queued_handle_translations[$handle]);
-            }
-        }
-        return $handles;
-    }
-
-
-    /**
-     * Registers inline script with translations for given handle and domain.
-     *
-     * @param string $handle       Handle used to register javascript file containing translations.
-     * @param array  $translations Array of string translations.
-     * @param string $domain       Domain for translations.  If left empty then strings are registered with the default
-     *                             domain for the javascript.
-     */
-    protected function registerInlineScript($handle, array $translations, $domain)
-    {
-        $script = $domain ?
-            'eejs.i18n.setLocaleData( ' . wp_json_encode($translations) . ', "' . $domain . '" );' :
-            'eejs.i18n.setLocaleData( ' . wp_json_encode($translations) . ' );';
-        wp_add_inline_script($handle, $script, 'before');
-    }
-
-
-    /**
-     * Queues up the translation strings for the given handle.
-     *
-     * @param string $handle The script handle being queued up.
-     */
-    private function queueI18nTranslationsForHandle($handle)
-    {
-        if (isset($this->queued_scripts[$handle])) {
-            $domain = $this->queued_scripts[$handle];
-            $translations = $this->getJedLocaleDataForDomainAndChunk($handle, $domain);
-            if (count($translations) > 0) {
-                $this->queued_handle_translations[$handle] = array(
-                    'domain'       => $domain,
-                    'translations' => $translations,
-                );
-            }
-            unset($this->queued_scripts[$handle]);
-        }
-    }
-
-
-    /**
-     * Sets the internal i18n_map property.
-     * If $chunk_map is empty or not an array, will attempt to load a chunk map from a default named map.
-     *
-     * @param array $i18n_map  If provided, an array of translation strings indexed by script handle names they
-     *                         correspond to.
-     */
-    private function setI18nMap(array $i18n_map)
-    {
-        if (empty($i18n_map)) {
-            $i18n_map = file_exists($this->domain->pluginPath() . 'translation-map.json')
-                ? json_decode(
-                        file_get_contents($this->domain->pluginPath() . 'translation-map.json'),
-                        true
-                    )
-                : array();
-        }
-        $this->i18n_map = $i18n_map;
-    }
-
-
-    /**
-     * Get the jed locale data for a given $handle and domain
-     *
-     * @param string $handle The name for the script handle we want strings returned for.
-     * @param string $domain The i18n domain.
-     * @return array
-     */
-    protected function getJedLocaleDataForDomainAndChunk($handle, $domain)
-    {
-        $translations = $this->getJedLocaleData($domain);
-        // get index for adding back after extracting strings for this $chunk.
-        $index = $translations[''];
-        $translations = $this->getLocaleDataMatchingMap(
-            $this->getOriginalStringsForHandleFromMap($handle),
-            $translations
-        );
-        $translations[''] = $index;
-        return $translations;
-    }
-
-
-    /**
-     * Get locale data for given strings from given translations
-     *
-     * @param array $string_set   This is the subset of strings (msgIds) we want to extract from the translations array.
-     * @param array $translations Translation data to extra strings from.
-     * @return array
-     */
-    protected function getLocaleDataMatchingMap(array $string_set, array $translations)
-    {
-        if (empty($string_set)) {
-            return array();
-        }
-        // some strings with quotes in them will break on the array_flip, so making sure quotes in the string are
-        // slashed also filter falsey values.
-        $string_set = array_unique(array_filter(wp_slash($string_set)));
-        return array_intersect_key($translations, array_flip($string_set));
-    }
-
-
-    /**
-     * Get original strings to translate for the given chunk from the map
-     *
-     * @param string $handle The script handle name to get strings from the map for.
-     * @return array
-     */
-    protected function getOriginalStringsForHandleFromMap($handle)
-    {
-        return isset($this->i18n_map[$handle]) ? $this->i18n_map[$handle] : array();
-    }
-
-
-    /**
-     * Returns Jed-formatted localization data.
-     *
-     * @param  string $domain Translation domain.
-     * @return array
-     */
-    private function getJedLocaleData($domain)
-    {
-        $translations = get_translations_for_domain($domain);
-
-        $locale = array(
-            '' => array(
-                'domain' => $domain,
-                'lang'   => is_admin() ? EEH_DTT_Helper::get_user_locale() : get_locale()
-            ),
-        );
-
-        if (! empty($translations->headers['Plural-Forms'])) {
-            $locale['']['plural_forms'] = $translations->headers['Plural-Forms'];
-        }
-
-        foreach ($translations->entries as $msgid => $entry) {
-            $locale[$msgid] = $entry->translations;
-        }
-
-        return $locale;
-    }
+	/**
+	 * @var DomainInterface
+	 */
+	private $domain;
+
+	/**
+	 * Will hold all registered i18n scripts.  Prevents script handles from being registered more than once.
+	 *
+	 * @var array
+	 */
+	private $registered_i18n = array();
+
+
+	/**
+	 * Used to hold queued translations for the chunks loading in a view.
+	 *
+	 * @var array
+	 */
+	private $queued_handle_translations = array();
+
+	/**
+	 * Used to track script handles queued for adding translation strings as inline data in the dom.
+	 *
+	 * @var array
+	 */
+	private $queued_scripts = array();
+
+
+	/**
+	 * Obtained from the generated json file from the all javascript using wp.i18n with a map of script handle names to
+	 * translation strings.
+	 *
+	 * @var array
+	 */
+	private $i18n_map;
+
+
+	/**
+	 * I18nRegistry constructor.
+	 *
+	 * @param array() $i18n_map  An array of script handle names and the strings translated for those handles.  If not
+	 *                            provided, the class will look for map in root of plugin with filename of
+	 *                            'translation-map.json'.
+	 * @param DomainInterface $domain
+	 */
+	public function __construct(array $i18n_map = array(), DomainInterface $domain)
+	{
+		$this->domain = $domain;
+		$this->setI18nMap($i18n_map);
+		add_filter('print_scripts_array', array($this, 'queueI18n'));
+	}
+
+
+	/**
+	 * Used to register a script that has i18n strings for its $handle
+	 *
+	 * @param string $handle The script handle reference.
+	 * @param string $domain The i18n domain for the strings.
+	 */
+	public function registerScriptI18n($handle, $domain = 'event_espresso')
+	{
+		if(! isset($this->registered_i18n[$handle])) {
+			$this->registered_i18n[ $handle ] = 1;
+			$this->queued_scripts[ $handle ] = $domain;
+		}
+	}
+
+
+
+	/**
+	 * Callback on print_scripts_array to listen for scripts enqueued and handle setting up the localized data.
+	 *
+	 * @param array $handles Array of registered script handles.
+	 * @return array
+	 */
+	public function queueI18n(array $handles)
+	{
+		if (empty($this->queued_scripts)) {
+			return $handles;
+		}
+		foreach ($handles as $handle) {
+			$this->queueI18nTranslationsForHandle($handle);
+		}
+		if ($this->queued_handle_translations) {
+			foreach ($this->queued_handle_translations as $handle => $translations_for_domain) {
+				$this->registerInlineScript(
+					$handle,
+					$translations_for_domain['translations'],
+					$translations_for_domain['domain']
+				);
+				unset($this->queued_handle_translations[$handle]);
+			}
+		}
+		return $handles;
+	}
+
+
+	/**
+	 * Registers inline script with translations for given handle and domain.
+	 *
+	 * @param string $handle       Handle used to register javascript file containing translations.
+	 * @param array  $translations Array of string translations.
+	 * @param string $domain       Domain for translations.  If left empty then strings are registered with the default
+	 *                             domain for the javascript.
+	 */
+	protected function registerInlineScript($handle, array $translations, $domain)
+	{
+		$script = $domain ?
+			'eejs.i18n.setLocaleData( ' . wp_json_encode($translations) . ', "' . $domain . '" );' :
+			'eejs.i18n.setLocaleData( ' . wp_json_encode($translations) . ' );';
+		wp_add_inline_script($handle, $script, 'before');
+	}
+
+
+	/**
+	 * Queues up the translation strings for the given handle.
+	 *
+	 * @param string $handle The script handle being queued up.
+	 */
+	private function queueI18nTranslationsForHandle($handle)
+	{
+		if (isset($this->queued_scripts[$handle])) {
+			$domain = $this->queued_scripts[$handle];
+			$translations = $this->getJedLocaleDataForDomainAndChunk($handle, $domain);
+			if (count($translations) > 0) {
+				$this->queued_handle_translations[$handle] = array(
+					'domain'       => $domain,
+					'translations' => $translations,
+				);
+			}
+			unset($this->queued_scripts[$handle]);
+		}
+	}
+
+
+	/**
+	 * Sets the internal i18n_map property.
+	 * If $chunk_map is empty or not an array, will attempt to load a chunk map from a default named map.
+	 *
+	 * @param array $i18n_map  If provided, an array of translation strings indexed by script handle names they
+	 *                         correspond to.
+	 */
+	private function setI18nMap(array $i18n_map)
+	{
+		if (empty($i18n_map)) {
+			$i18n_map = file_exists($this->domain->pluginPath() . 'translation-map.json')
+				? json_decode(
+						file_get_contents($this->domain->pluginPath() . 'translation-map.json'),
+						true
+					)
+				: array();
+		}
+		$this->i18n_map = $i18n_map;
+	}
+
+
+	/**
+	 * Get the jed locale data for a given $handle and domain
+	 *
+	 * @param string $handle The name for the script handle we want strings returned for.
+	 * @param string $domain The i18n domain.
+	 * @return array
+	 */
+	protected function getJedLocaleDataForDomainAndChunk($handle, $domain)
+	{
+		$translations = $this->getJedLocaleData($domain);
+		// get index for adding back after extracting strings for this $chunk.
+		$index = $translations[''];
+		$translations = $this->getLocaleDataMatchingMap(
+			$this->getOriginalStringsForHandleFromMap($handle),
+			$translations
+		);
+		$translations[''] = $index;
+		return $translations;
+	}
+
+
+	/**
+	 * Get locale data for given strings from given translations
+	 *
+	 * @param array $string_set   This is the subset of strings (msgIds) we want to extract from the translations array.
+	 * @param array $translations Translation data to extra strings from.
+	 * @return array
+	 */
+	protected function getLocaleDataMatchingMap(array $string_set, array $translations)
+	{
+		if (empty($string_set)) {
+			return array();
+		}
+		// some strings with quotes in them will break on the array_flip, so making sure quotes in the string are
+		// slashed also filter falsey values.
+		$string_set = array_unique(array_filter(wp_slash($string_set)));
+		return array_intersect_key($translations, array_flip($string_set));
+	}
+
+
+	/**
+	 * Get original strings to translate for the given chunk from the map
+	 *
+	 * @param string $handle The script handle name to get strings from the map for.
+	 * @return array
+	 */
+	protected function getOriginalStringsForHandleFromMap($handle)
+	{
+		return isset($this->i18n_map[$handle]) ? $this->i18n_map[$handle] : array();
+	}
+
+
+	/**
+	 * Returns Jed-formatted localization data.
+	 *
+	 * @param  string $domain Translation domain.
+	 * @return array
+	 */
+	private function getJedLocaleData($domain)
+	{
+		$translations = get_translations_for_domain($domain);
+
+		$locale = array(
+			'' => array(
+				'domain' => $domain,
+				'lang'   => is_admin() ? EEH_DTT_Helper::get_user_locale() : get_locale()
+			),
+		);
+
+		if (! empty($translations->headers['Plural-Forms'])) {
+			$locale['']['plural_forms'] = $translations->headers['Plural-Forms'];
+		}
+
+		foreach ($translations->entries as $msgid => $entry) {
+			$locale[$msgid] = $entry->translations;
+		}
+
+		return $locale;
+	}
 }
\ No newline at end of file

espresso.php

Indentation +80 added lines, -80 removed lines

@@ -38,103 +38,103 @@
  * @since           4.0
  */
 if (function_exists('espresso_version')) {
-    if (! function_exists('espresso_duplicate_plugin_error')) {
-        /**
-         *    espresso_duplicate_plugin_error
-         *    displays if more than one version of EE is activated at the same time
-         */
-        function espresso_duplicate_plugin_error()
-        {
-            ?>
+	if (! function_exists('espresso_duplicate_plugin_error')) {
+		/**
+		 *    espresso_duplicate_plugin_error
+		 *    displays if more than one version of EE is activated at the same time
+		 */
+		function espresso_duplicate_plugin_error()
+		{
+			?>
             <div class="error">
                 <p>
                     <?php
-                    echo esc_html__(
-                        'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
-                        'event_espresso'
-                    ); ?>
+					echo esc_html__(
+						'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
+						'event_espresso'
+					); ?>
                 </p>
             </div>
             <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
-    }
-    add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
+	}
+	add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
 } else {
-    define('EE_MIN_PHP_VER_REQUIRED', '5.4.0');
-    if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
-        /**
-         * espresso_minimum_php_version_error
-         *
-         * @return void
-         */
-        function espresso_minimum_php_version_error()
-        {
-            ?>
+	define('EE_MIN_PHP_VER_REQUIRED', '5.4.0');
+	if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
+		/**
+		 * espresso_minimum_php_version_error
+		 *
+		 * @return void
+		 */
+		function espresso_minimum_php_version_error()
+		{
+			?>
             <div class="error">
                 <p>
                     <?php
-                    printf(
-                        esc_html__(
-                            'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
-                            'event_espresso'
-                        ),
-                        EE_MIN_PHP_VER_REQUIRED,
-                        PHP_VERSION,
-                        '<br/>',
-                        '<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
-                    );
-                    ?>
+					printf(
+						esc_html__(
+							'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
+							'event_espresso'
+						),
+						EE_MIN_PHP_VER_REQUIRED,
+						PHP_VERSION,
+						'<br/>',
+						'<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
+					);
+					?>
                 </p>
             </div>
             <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
 
-        add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
-    } else {
-        define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
-        /**
-         * espresso_version
-         * Returns the plugin version
-         *
-         * @return string
-         */
-        function espresso_version()
-        {
-            return apply_filters('FHEE__espresso__espresso_version', '4.9.81.rc.011');
-        }
+		add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
+	} else {
+		define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
+		/**
+		 * espresso_version
+		 * Returns the plugin version
+		 *
+		 * @return string
+		 */
+		function espresso_version()
+		{
+			return apply_filters('FHEE__espresso__espresso_version', '4.9.81.rc.011');
+		}
 
-        /**
-         * espresso_plugin_activation
-         * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
-         */
-        function espresso_plugin_activation()
-        {
-            update_option('ee_espresso_activation', true);
-        }
+		/**
+		 * espresso_plugin_activation
+		 * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
+		 */
+		function espresso_plugin_activation()
+		{
+			update_option('ee_espresso_activation', true);
+		}
 
-        register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
+		register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
 
-        require_once __DIR__ . '/core/bootstrap_espresso.php';
-        bootstrap_espresso();
-    }
+		require_once __DIR__ . '/core/bootstrap_espresso.php';
+		bootstrap_espresso();
+	}
 }
 if (! function_exists('espresso_deactivate_plugin')) {
-    /**
-     *    deactivate_plugin
-     * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
-     *
-     * @access public
-     * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
-     * @return    void
-     */
-    function espresso_deactivate_plugin($plugin_basename = '')
-    {
-        if (! function_exists('deactivate_plugins')) {
-            require_once ABSPATH . 'wp-admin/includes/plugin.php';
-        }
-        unset($_GET['activate'], $_REQUEST['activate']);
-        deactivate_plugins($plugin_basename);
-    }
+	/**
+	 *    deactivate_plugin
+	 * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
+	 *
+	 * @access public
+	 * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
+	 * @return    void
+	 */
+	function espresso_deactivate_plugin($plugin_basename = '')
+	{
+		if (! function_exists('deactivate_plugins')) {
+			require_once ABSPATH . 'wp-admin/includes/plugin.php';
+		}
+		unset($_GET['activate'], $_REQUEST['activate']);
+		deactivate_plugins($plugin_basename);
+	}
 }

core/data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_org_options.dmsstage.php

Indentation +273 added lines, -273 removed lines

@@ -103,289 +103,289 @@
 class EE_DMS_4_1_0_org_options extends EE_Data_Migration_Script_Stage
 {
 
-    public function _migration_step($num_items = 50)
-    {
+	public function _migration_step($num_items = 50)
+	{
 
-        $items_actually_migrated = 0;
-        $old_org_options = get_option('events_organization_settings');
-        foreach ($this->_org_options_we_know_how_to_migrate as $option_name) {
-            // only bother migrating if there's a setting to migrate. Otherwise we'll just use the default
-            if (isset($old_org_options[ $option_name ])) {
-                $this->_handle_org_option($option_name, $old_org_options[ $option_name ]);
-            }
-            if ($option_name=='surcharge') {
-                $this->_insert_new_global_surcharge_price($old_org_options);
-            }
-            $items_actually_migrated++;
-        }
+		$items_actually_migrated = 0;
+		$old_org_options = get_option('events_organization_settings');
+		foreach ($this->_org_options_we_know_how_to_migrate as $option_name) {
+			// only bother migrating if there's a setting to migrate. Otherwise we'll just use the default
+			if (isset($old_org_options[ $option_name ])) {
+				$this->_handle_org_option($option_name, $old_org_options[ $option_name ]);
+			}
+			if ($option_name=='surcharge') {
+				$this->_insert_new_global_surcharge_price($old_org_options);
+			}
+			$items_actually_migrated++;
+		}
 
-        $success = EE_Config::instance()->update_espresso_config(false, true);
-        if (! $success) {
-            $this->add_error(sprintf(__('Could not save EE Config during org options stage. Reason: %s', 'event_espresso'), EE_Error::get_notices(false)));
-            EE_Error::overwrite_errors();
-        }
-        EE_Network_Config::instance()->update_config(false, false);
-        if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
-            // we may have added new pages and this might be necessary
-            flush_rewrite_rules();
-            $this->set_completed();
-        }
-        return $items_actually_migrated;
-    }
-    public function _count_records_to_migrate()
-    {
-        $count_of_options_to_migrate = count($this->_org_options_we_know_how_to_migrate);
-        return $count_of_options_to_migrate;
-    }
-    public function __construct()
-    {
-        $this->_pretty_name = __("Organization Options/Config", "event_espresso");
-        $this->_org_options_we_know_how_to_migrate = apply_filters('FHEE__EE_DMS_4_1_0_org_options__org_options_we_know_how_to_migrate', $this->_org_options_we_know_how_to_migrate);
-        parent::__construct();
-    }
+		$success = EE_Config::instance()->update_espresso_config(false, true);
+		if (! $success) {
+			$this->add_error(sprintf(__('Could not save EE Config during org options stage. Reason: %s', 'event_espresso'), EE_Error::get_notices(false)));
+			EE_Error::overwrite_errors();
+		}
+		EE_Network_Config::instance()->update_config(false, false);
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
+			// we may have added new pages and this might be necessary
+			flush_rewrite_rules();
+			$this->set_completed();
+		}
+		return $items_actually_migrated;
+	}
+	public function _count_records_to_migrate()
+	{
+		$count_of_options_to_migrate = count($this->_org_options_we_know_how_to_migrate);
+		return $count_of_options_to_migrate;
+	}
+	public function __construct()
+	{
+		$this->_pretty_name = __("Organization Options/Config", "event_espresso");
+		$this->_org_options_we_know_how_to_migrate = apply_filters('FHEE__EE_DMS_4_1_0_org_options__org_options_we_know_how_to_migrate', $this->_org_options_we_know_how_to_migrate);
+		parent::__construct();
+	}
 
-    private function _handle_org_option($option_name, $value)
-    {
-        $c = EE_Config::instance();
-        $cn = EE_Network_Config::instance();
-        switch ($option_name) {
-            case 'organization':
-                $c->organization->name = $value;
-                break;
-            case 'organization_street1':
-                $c->organization->address_1 = $value;
-                break;
-            case 'organization_street2':
-                $c->organization->address_2 = $value;
-                break;
-            case 'organization_city':
-                $c->organization->city = $value;
-                break;
-            case 'organization_state':
-                try {
-                    $state = $this->get_migration_script()->get_or_create_state($value);
-                    $state_id = $state['STA_ID'];
-                    $c->organization->STA_ID = $state_id;
-                } catch (EE_Error $e) {
-                }
-                break;
-            case 'organization_zip':
-                $c->organization->zip = $value;
-                break;
-            case 'contact_email':
-                $c->organization->email = $value;
-                break;
-            case 'default_payment_status':
-                $c->registration->default_STS_ID =  $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID($value);
-                break;
-            case 'organization_country':
-                $iso =$this->get_migration_script()->get_iso_from_3_1_country_id($value);
-                $c->organization->CNT_ISO = $iso;
-                $country_row = $this->get_migration_script()->get_or_create_country($iso);
-                if (! $country_row) {
-                    $this->add_error(sprintf(__("Could not set country's currency config because no country exists for ISO %s", "event_espresso"), $iso));
-                }
-                // can't use EE_Currency_Config's handy constructor because the models are off-limits right now (and it uses them)
-                $c->currency->code = $country_row['CNT_cur_code'];          // currency code: USD, CAD, EUR
-                $c->currency->name = $country_row['CNT_cur_single'];    // Dollar
-                $c->currency->plural = $country_row['CNT_cur_plural'];  // Dollars
-                $c->currency->sign =  $country_row['CNT_cur_sign'];             // currency sign: $
-                $c->currency->sign_b4 = filter_var($country_row['CNT_cur_sign_b4'], FILTER_VALIDATE_BOOLEAN);        // currency sign before or after: $TRUE  or  FALSE$
-                $c->currency->dec_plc = (int) $country_row['CNT_cur_dec_plc'];    // decimal places: 2 = 0.00  3 = 0.000
-                $c->currency->dec_mrk = $country_row['CNT_cur_dec_mrk'];    // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
-                $c->currency->thsnds = $country_row['CNT_cur_thsnds'];  // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
+	private function _handle_org_option($option_name, $value)
+	{
+		$c = EE_Config::instance();
+		$cn = EE_Network_Config::instance();
+		switch ($option_name) {
+			case 'organization':
+				$c->organization->name = $value;
+				break;
+			case 'organization_street1':
+				$c->organization->address_1 = $value;
+				break;
+			case 'organization_street2':
+				$c->organization->address_2 = $value;
+				break;
+			case 'organization_city':
+				$c->organization->city = $value;
+				break;
+			case 'organization_state':
+				try {
+					$state = $this->get_migration_script()->get_or_create_state($value);
+					$state_id = $state['STA_ID'];
+					$c->organization->STA_ID = $state_id;
+				} catch (EE_Error $e) {
+				}
+				break;
+			case 'organization_zip':
+				$c->organization->zip = $value;
+				break;
+			case 'contact_email':
+				$c->organization->email = $value;
+				break;
+			case 'default_payment_status':
+				$c->registration->default_STS_ID =  $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID($value);
+				break;
+			case 'organization_country':
+				$iso =$this->get_migration_script()->get_iso_from_3_1_country_id($value);
+				$c->organization->CNT_ISO = $iso;
+				$country_row = $this->get_migration_script()->get_or_create_country($iso);
+				if (! $country_row) {
+					$this->add_error(sprintf(__("Could not set country's currency config because no country exists for ISO %s", "event_espresso"), $iso));
+				}
+				// can't use EE_Currency_Config's handy constructor because the models are off-limits right now (and it uses them)
+				$c->currency->code = $country_row['CNT_cur_code'];          // currency code: USD, CAD, EUR
+				$c->currency->name = $country_row['CNT_cur_single'];    // Dollar
+				$c->currency->plural = $country_row['CNT_cur_plural'];  // Dollars
+				$c->currency->sign =  $country_row['CNT_cur_sign'];             // currency sign: $
+				$c->currency->sign_b4 = filter_var($country_row['CNT_cur_sign_b4'], FILTER_VALIDATE_BOOLEAN);        // currency sign before or after: $TRUE  or  FALSE$
+				$c->currency->dec_plc = (int) $country_row['CNT_cur_dec_plc'];    // decimal places: 2 = 0.00  3 = 0.000
+				$c->currency->dec_mrk = $country_row['CNT_cur_dec_mrk'];    // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
+				$c->currency->thsnds = $country_row['CNT_cur_thsnds'];  // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
   //            $c->currency = new EE_Currency_Config($c->organization->CNT_ISO);break;
   //        case 'currency_symbol': ignore the currency symbol. we'll just go by their country.
   //            $c->currency->sign = $value;break;
-            case 'show_pending_payment_options':
-                $c->registration->show_pending_payment_options = ($value == 'Y');
-                break;
-            case 'display_address_in_regform':
-                $c->template_settings->display_address_in_regform = ($value == 'Y');
-                break;
-            case 'default_logo_url':
-                $c->organization->logo_url = $value;
-                break;
-            case 'event_page_id':
-                // also, find that post, and changes the shortcode in it from ESPRESSO_PAYMENTS
-                // to ESPRESSO_THANK_YOU
-                $reg_page_post = get_post($value);
-                $reg_page_post->post_content = str_replace("[ESPRESSO_EVENTS]", "[ESPRESSO_CHECKOUT]", $reg_page_post->post_content);
-                wp_update_post($reg_page_post);
-                $c->core->reg_page_id = $value;
-                break;
-            case 'return_url':
-                // also, find that post, and changes the shortcode in it from ESPRESSO_PAYMENTS
-                // to ESPRESSO_THANK_YOU
-                $thank_you_page_post = get_post($value);
-                $thank_you_page_post->post_content = str_replace("[ESPRESSO_PAYMENTS]", "[ESPRESSO_THANK_YOU]", $thank_you_page_post->post_content);
-                wp_update_post($thank_you_page_post);
-                $c->core->thank_you_page_id = $value;
-                break;
-            case 'cancel_return':
-                $c->core->cancel_page_id = $value;
+			case 'show_pending_payment_options':
+				$c->registration->show_pending_payment_options = ($value == 'Y');
+				break;
+			case 'display_address_in_regform':
+				$c->template_settings->display_address_in_regform = ($value == 'Y');
+				break;
+			case 'default_logo_url':
+				$c->organization->logo_url = $value;
+				break;
+			case 'event_page_id':
+				// also, find that post, and changes the shortcode in it from ESPRESSO_PAYMENTS
+				// to ESPRESSO_THANK_YOU
+				$reg_page_post = get_post($value);
+				$reg_page_post->post_content = str_replace("[ESPRESSO_EVENTS]", "[ESPRESSO_CHECKOUT]", $reg_page_post->post_content);
+				wp_update_post($reg_page_post);
+				$c->core->reg_page_id = $value;
+				break;
+			case 'return_url':
+				// also, find that post, and changes the shortcode in it from ESPRESSO_PAYMENTS
+				// to ESPRESSO_THANK_YOU
+				$thank_you_page_post = get_post($value);
+				$thank_you_page_post->post_content = str_replace("[ESPRESSO_PAYMENTS]", "[ESPRESSO_THANK_YOU]", $thank_you_page_post->post_content);
+				wp_update_post($thank_you_page_post);
+				$c->core->thank_you_page_id = $value;
+				break;
+			case 'cancel_return':
+				$c->core->cancel_page_id = $value;
 
-                break;
-            case 'notify_url':
-                $c->core->txn_page_id = $value;
-                break;
-            case 'use_captcha':
-                $c->registration->use_captcha = ($value == 'Y');
-                break;
-            case 'recaptcha_publickey':
-                $c->registration->recaptcha_publickey = $value;
-                break;
-            case 'recaptcha_privatekey':
-                $c->registration->recaptcha_privatekey = $value;
-                break;
-            case 'recaptcha_theme':
-                $c->registration->recaptcha_theme = $value;
-                break;
-            case 'recaptcha_width':
-                $c->registration->recaptcha_width = $value;
-                break;
-            case 'recaptcha_language':
-                $c->registration->recaptcha_language = $value;
-                break;
-            case 'espresso_dashboard_widget':
-                $c->admin->use_dashboard_widget = ($value == 'Y');
-                break;
-            case 'use_personnel_manager':
-                $c->admin->use_personnel_manager = ($value == 'Y');
-                break;
-            case 'use_event_timezones':
-                $c->admin->use_event_timezones = ($value == 'Y');
-                break;
-            case 'full_logging':
-                $c->admin->use_full_logging = ($value == 'Y');
-                break;
-            case 'affiliate_id':
-                $c->admin->affiliate_id = $value;
-                break;
-            case 'site_license_key':
-                $cn->core->site_license_key = $value;
-                break;
-            default:
-                do_action('AHEE__EE_DMS_4_1_0__handle_org_option', $option_name, $value);
-        }
-    }
+				break;
+			case 'notify_url':
+				$c->core->txn_page_id = $value;
+				break;
+			case 'use_captcha':
+				$c->registration->use_captcha = ($value == 'Y');
+				break;
+			case 'recaptcha_publickey':
+				$c->registration->recaptcha_publickey = $value;
+				break;
+			case 'recaptcha_privatekey':
+				$c->registration->recaptcha_privatekey = $value;
+				break;
+			case 'recaptcha_theme':
+				$c->registration->recaptcha_theme = $value;
+				break;
+			case 'recaptcha_width':
+				$c->registration->recaptcha_width = $value;
+				break;
+			case 'recaptcha_language':
+				$c->registration->recaptcha_language = $value;
+				break;
+			case 'espresso_dashboard_widget':
+				$c->admin->use_dashboard_widget = ($value == 'Y');
+				break;
+			case 'use_personnel_manager':
+				$c->admin->use_personnel_manager = ($value == 'Y');
+				break;
+			case 'use_event_timezones':
+				$c->admin->use_event_timezones = ($value == 'Y');
+				break;
+			case 'full_logging':
+				$c->admin->use_full_logging = ($value == 'Y');
+				break;
+			case 'affiliate_id':
+				$c->admin->affiliate_id = $value;
+				break;
+			case 'site_license_key':
+				$cn->core->site_license_key = $value;
+				break;
+			default:
+				do_action('AHEE__EE_DMS_4_1_0__handle_org_option', $option_name, $value);
+		}
+	}
 
-    /**
-     * Creates a 4.1 member price discount
-     * @global type $wpdb
-     * @param type $old_price
-     * @return int
-     */
-    private function _insert_new_global_surcharge_price($org_options)
-    {
-        $amount = floatval($org_options['surcharge']);
-        // dont createa a price if the surcharge is 0
-        if ($amount <=.01) {
-            return 0;
-        }
-        if ($org_options['surcharge_type'] == 'flat_rate') {
-            $price_type = EE_DMS_4_1_0_prices::price_type_flat_surcharge;
-        } else {
-            $price_type = EE_DMS_4_1_0_prices::price_type_percent_surcharge;
-        }
-        global $wpdb;
-        $cols_n_values = array(
-            'PRT_ID'=>$price_type,
-            'PRC_amount'=>$amount,
-            'PRC_name'=>  $org_options['surcharge_text'],
-            'PRC_is_default'=>true,
-            'PRC_overrides'=>false,
-            'PRC_order'=>100,
-            'PRC_deleted'=>false,
-            'PRC_parent'=>null
+	/**
+	 * Creates a 4.1 member price discount
+	 * @global type $wpdb
+	 * @param type $old_price
+	 * @return int
+	 */
+	private function _insert_new_global_surcharge_price($org_options)
+	{
+		$amount = floatval($org_options['surcharge']);
+		// dont createa a price if the surcharge is 0
+		if ($amount <=.01) {
+			return 0;
+		}
+		if ($org_options['surcharge_type'] == 'flat_rate') {
+			$price_type = EE_DMS_4_1_0_prices::price_type_flat_surcharge;
+		} else {
+			$price_type = EE_DMS_4_1_0_prices::price_type_percent_surcharge;
+		}
+		global $wpdb;
+		$cols_n_values = array(
+			'PRT_ID'=>$price_type,
+			'PRC_amount'=>$amount,
+			'PRC_name'=>  $org_options['surcharge_text'],
+			'PRC_is_default'=>true,
+			'PRC_overrides'=>false,
+			'PRC_order'=>100,
+			'PRC_deleted'=>false,
+			'PRC_parent'=>null
 
-        );
-        $datatypes = array(
-            '%d',// PRT_ID
-            '%f',// PRT_amount
-            '%s',// PRC_name
-            '%d',// PRC_is_default
-            '%d',// PRC_overrides
-            '%d',// PRC_order
-            '%d',// PRC_deleted
-            '%d',// PRC_parent
-        );
-        $price_table = $wpdb->prefix."esp_price";
-        $success = $wpdb->insert($price_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion(
-                'org_options',
-                array(
-                        'surcharge'=>$org_options['surcharge'],
-                        'surcharge_type'=>$org_options['surcharge_type'],
-                        'surcharge_text'=>$org_options['surcharge_text']),
-                $price_table,
-                $cols_n_values,
-                $datatypes
-            ));
-            return 0;
-        }
-        $new_id = $wpdb->insert_id;
-        return $new_id;
-    }
+		);
+		$datatypes = array(
+			'%d',// PRT_ID
+			'%f',// PRT_amount
+			'%s',// PRC_name
+			'%d',// PRC_is_default
+			'%d',// PRC_overrides
+			'%d',// PRC_order
+			'%d',// PRC_deleted
+			'%d',// PRC_parent
+		);
+		$price_table = $wpdb->prefix."esp_price";
+		$success = $wpdb->insert($price_table, $cols_n_values, $datatypes);
+		if (! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion(
+				'org_options',
+				array(
+						'surcharge'=>$org_options['surcharge'],
+						'surcharge_type'=>$org_options['surcharge_type'],
+						'surcharge_text'=>$org_options['surcharge_text']),
+				$price_table,
+				$cols_n_values,
+				$datatypes
+			));
+			return 0;
+		}
+		$new_id = $wpdb->insert_id;
+		return $new_id;
+	}
 
-    protected $_org_options_we_know_how_to_migrate = array(
-      'organization',
-      'organization_street1',
-      'organization_street2',
-      'organization_city',
-      'organization_state',
-      'organization_zip',
-      'contact_email',
-      'default_mail',
-      'payment_subject',
-      'payment_message',
-      'message',
-      'default_payment_status',
-      'surcharge',// unused?
-      'country_id',// unused?
-      'organization_country',
+	protected $_org_options_we_know_how_to_migrate = array(
+	  'organization',
+	  'organization_street1',
+	  'organization_street2',
+	  'organization_city',
+	  'organization_state',
+	  'organization_zip',
+	  'contact_email',
+	  'default_mail',
+	  'payment_subject',
+	  'payment_message',
+	  'message',
+	  'default_payment_status',
+	  'surcharge',// unused?
+	  'country_id',// unused?
+	  'organization_country',
 //    'currency_symbol',
-      'expire_on_registration_end',
-      'email_before_payment',
-      'email_fancy_headers',
-      'enable_default_style',
-      'event_ssl_active',
-      'selected_style',
-      'show_pending_payment_options',
-      'show_reg_footer',
-      'skip_confirmation_page',
-      'allow_mer_discounts',// no equiv
-      'allow_mer_vouchers',// no equiv
-      'display_short_description_in_event_list',
-      'display_description_on_multi_reg_page',
-      'display_address_in_event_list',
-      'display_address_in_regform',
-      'use_custom_post_types',// no equiv
-      'display_ical_download',
-      'display_featured_image',
-      'themeroller',
-      'default_logo_url',
-      'event_page_id',
-      'return_url',
-      'cancel_return',
-      'notify_url',
-      'events_in_dashboard',
-      'use_captcha',
-      'recaptcha_publickey',
-      'recaptcha_privatekey',
-      'recaptcha_theme',
-      'recaptcha_width',
-      'recaptcha_language',
-      'espresso_dashboard_widget',
-      'time_reg_limit',
+	  'expire_on_registration_end',
+	  'email_before_payment',
+	  'email_fancy_headers',
+	  'enable_default_style',
+	  'event_ssl_active',
+	  'selected_style',
+	  'show_pending_payment_options',
+	  'show_reg_footer',
+	  'skip_confirmation_page',
+	  'allow_mer_discounts',// no equiv
+	  'allow_mer_vouchers',// no equiv
+	  'display_short_description_in_event_list',
+	  'display_description_on_multi_reg_page',
+	  'display_address_in_event_list',
+	  'display_address_in_regform',
+	  'use_custom_post_types',// no equiv
+	  'display_ical_download',
+	  'display_featured_image',
+	  'themeroller',
+	  'default_logo_url',
+	  'event_page_id',
+	  'return_url',
+	  'cancel_return',
+	  'notify_url',
+	  'events_in_dashboard',
+	  'use_captcha',
+	  'recaptcha_publickey',
+	  'recaptcha_privatekey',
+	  'recaptcha_theme',
+	  'recaptcha_width',
+	  'recaptcha_language',
+	  'espresso_dashboard_widget',
+	  'time_reg_limit',
 //    'use_attendee_pre_approval', removed in 4.1- instead this is factored into the default reg status
-      'use_personnel_manager',// no equiv
-      'use_event_timezones',
-      'full_logging',
-      'surcharge_type',// unused
-      'surcharge_text',// unused
-      'affiliate_id',
-      'site_license_key',
-    );
+	  'use_personnel_manager',// no equiv
+	  'use_event_timezones',
+	  'full_logging',
+	  'surcharge_type',// unused
+	  'surcharge_text',// unused
+	  'affiliate_id',
+	  'site_license_key',
+	);
 }

Spacing +33 added lines, -33 removed lines

@@ -110,17 +110,17 @@ 
         $old_org_options = get_option('events_organization_settings');
         foreach ($this->_org_options_we_know_how_to_migrate as $option_name) {
             // only bother migrating if there's a setting to migrate. Otherwise we'll just use the default
-            if (isset($old_org_options[ $option_name ])) {
-                $this->_handle_org_option($option_name, $old_org_options[ $option_name ]);
+            if (isset($old_org_options[$option_name])) {
+                $this->_handle_org_option($option_name, $old_org_options[$option_name]);
             }
-            if ($option_name=='surcharge') {
+            if ($option_name == 'surcharge') {
                 $this->_insert_new_global_surcharge_price($old_org_options);
             }
             $items_actually_migrated++;
         }
 
         $success = EE_Config::instance()->update_espresso_config(false, true);
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error(sprintf(__('Could not save EE Config during org options stage. Reason: %s', 'event_espresso'), EE_Error::get_notices(false)));
             EE_Error::overwrite_errors();
         }
@@ -176,24 +176,24 @@ 
                 $c->organization->email = $value;
                 break;
             case 'default_payment_status':
-                $c->registration->default_STS_ID =  $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID($value);
+                $c->registration->default_STS_ID = $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID($value);
                 break;
             case 'organization_country':
-                $iso =$this->get_migration_script()->get_iso_from_3_1_country_id($value);
+                $iso = $this->get_migration_script()->get_iso_from_3_1_country_id($value);
                 $c->organization->CNT_ISO = $iso;
                 $country_row = $this->get_migration_script()->get_or_create_country($iso);
-                if (! $country_row) {
+                if ( ! $country_row) {
                     $this->add_error(sprintf(__("Could not set country's currency config because no country exists for ISO %s", "event_espresso"), $iso));
                 }
                 // can't use EE_Currency_Config's handy constructor because the models are off-limits right now (and it uses them)
-                $c->currency->code = $country_row['CNT_cur_code'];          // currency code: USD, CAD, EUR
-                $c->currency->name = $country_row['CNT_cur_single'];    // Dollar
-                $c->currency->plural = $country_row['CNT_cur_plural'];  // Dollars
-                $c->currency->sign =  $country_row['CNT_cur_sign'];             // currency sign: $
-                $c->currency->sign_b4 = filter_var($country_row['CNT_cur_sign_b4'], FILTER_VALIDATE_BOOLEAN);        // currency sign before or after: $TRUE  or  FALSE$
-                $c->currency->dec_plc = (int) $country_row['CNT_cur_dec_plc'];    // decimal places: 2 = 0.00  3 = 0.000
-                $c->currency->dec_mrk = $country_row['CNT_cur_dec_mrk'];    // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
-                $c->currency->thsnds = $country_row['CNT_cur_thsnds'];  // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
+                $c->currency->code = $country_row['CNT_cur_code']; // currency code: USD, CAD, EUR
+                $c->currency->name = $country_row['CNT_cur_single']; // Dollar
+                $c->currency->plural = $country_row['CNT_cur_plural']; // Dollars
+                $c->currency->sign = $country_row['CNT_cur_sign']; // currency sign: $
+                $c->currency->sign_b4 = filter_var($country_row['CNT_cur_sign_b4'], FILTER_VALIDATE_BOOLEAN); // currency sign before or after: $TRUE  or  FALSE$
+                $c->currency->dec_plc = (int) $country_row['CNT_cur_dec_plc']; // decimal places: 2 = 0.00  3 = 0.000
+                $c->currency->dec_mrk = $country_row['CNT_cur_dec_mrk']; // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
+                $c->currency->thsnds = $country_row['CNT_cur_thsnds']; // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
   //            $c->currency = new EE_Currency_Config($c->organization->CNT_ISO);break;
   //        case 'currency_symbol': ignore the currency symbol. we'll just go by their country.
   //            $c->currency->sign = $value;break;
@@ -280,7 +280,7 @@ 
     {
         $amount = floatval($org_options['surcharge']);
         // dont createa a price if the surcharge is 0
-        if ($amount <=.01) {
+        if ($amount <= .01) {
             return 0;
         }
         if ($org_options['surcharge_type'] == 'flat_rate') {
@@ -301,18 +301,18 @@ 
 
         );
         $datatypes = array(
-            '%d',// PRT_ID
-            '%f',// PRT_amount
-            '%s',// PRC_name
-            '%d',// PRC_is_default
-            '%d',// PRC_overrides
-            '%d',// PRC_order
-            '%d',// PRC_deleted
-            '%d',// PRC_parent
+            '%d', // PRT_ID
+            '%f', // PRT_amount
+            '%s', // PRC_name
+            '%d', // PRC_is_default
+            '%d', // PRC_overrides
+            '%d', // PRC_order
+            '%d', // PRC_deleted
+            '%d', // PRC_parent
         );
         $price_table = $wpdb->prefix."esp_price";
         $success = $wpdb->insert($price_table, $cols_n_values, $datatypes);
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion(
                 'org_options',
                 array(
@@ -342,8 +342,8 @@ 
       'payment_message',
       'message',
       'default_payment_status',
-      'surcharge',// unused?
-      'country_id',// unused?
+      'surcharge', // unused?
+      'country_id', // unused?
       'organization_country',
 //    'currency_symbol',
       'expire_on_registration_end',
@@ -355,13 +355,13 @@ 
       'show_pending_payment_options',
       'show_reg_footer',
       'skip_confirmation_page',
-      'allow_mer_discounts',// no equiv
-      'allow_mer_vouchers',// no equiv
+      'allow_mer_discounts', // no equiv
+      'allow_mer_vouchers', // no equiv
       'display_short_description_in_event_list',
       'display_description_on_multi_reg_page',
       'display_address_in_event_list',
       'display_address_in_regform',
-      'use_custom_post_types',// no equiv
+      'use_custom_post_types', // no equiv
       'display_ical_download',
       'display_featured_image',
       'themeroller',
@@ -380,11 +380,11 @@ 
       'espresso_dashboard_widget',
       'time_reg_limit',
 //    'use_attendee_pre_approval', removed in 4.1- instead this is factored into the default reg status
-      'use_personnel_manager',// no equiv
+      'use_personnel_manager', // no equiv
       'use_event_timezones',
       'full_logging',
-      'surcharge_type',// unused
-      'surcharge_text',// unused
+      'surcharge_type', // unused
+      'surcharge_text', // unused
       'affiliate_id',
       'site_license_key',
     );