eventespresso / event-espresso-core

espresso.php

Spacing +48 added lines, -48 removed lines

@@ -129,54 +129,54 @@ 
         define('EE_PLUGIN_DIR_PATH', plugin_dir_path(EVENT_ESPRESSO_MAIN_FILE));
         define('EE_PLUGIN_DIR_URL', plugin_dir_url(EVENT_ESPRESSO_MAIN_FILE));
         // main root folder paths
-        define('EE_ADMIN_PAGES', EE_PLUGIN_DIR_PATH . 'admin_pages' . DS);
-        define('EE_CORE', EE_PLUGIN_DIR_PATH . 'core' . DS);
-        define('EE_MODULES', EE_PLUGIN_DIR_PATH . 'modules' . DS);
-        define('EE_PUBLIC', EE_PLUGIN_DIR_PATH . 'public' . DS);
-        define('EE_SHORTCODES', EE_PLUGIN_DIR_PATH . 'shortcodes' . DS);
-        define('EE_WIDGETS', EE_PLUGIN_DIR_PATH . 'widgets' . DS);
-        define('EE_PAYMENT_METHODS', EE_PLUGIN_DIR_PATH . 'payment_methods' . DS);
-        define('EE_CAFF_PATH', EE_PLUGIN_DIR_PATH . 'caffeinated' . DS);
+        define('EE_ADMIN_PAGES', EE_PLUGIN_DIR_PATH.'admin_pages'.DS);
+        define('EE_CORE', EE_PLUGIN_DIR_PATH.'core'.DS);
+        define('EE_MODULES', EE_PLUGIN_DIR_PATH.'modules'.DS);
+        define('EE_PUBLIC', EE_PLUGIN_DIR_PATH.'public'.DS);
+        define('EE_SHORTCODES', EE_PLUGIN_DIR_PATH.'shortcodes'.DS);
+        define('EE_WIDGETS', EE_PLUGIN_DIR_PATH.'widgets'.DS);
+        define('EE_PAYMENT_METHODS', EE_PLUGIN_DIR_PATH.'payment_methods'.DS);
+        define('EE_CAFF_PATH', EE_PLUGIN_DIR_PATH.'caffeinated'.DS);
         // core system paths
-        define('EE_ADMIN', EE_CORE . 'admin' . DS);
-        define('EE_CPTS', EE_CORE . 'CPTs' . DS);
-        define('EE_CLASSES', EE_CORE . 'db_classes' . DS);
-        define('EE_INTERFACES', EE_CORE . 'interfaces' . DS);
-        define('EE_BUSINESS', EE_CORE . 'business' . DS);
-        define('EE_MODELS', EE_CORE . 'db_models' . DS);
-        define('EE_HELPERS', EE_CORE . 'helpers' . DS);
-        define('EE_LIBRARIES', EE_CORE . 'libraries' . DS);
-        define('EE_TEMPLATES', EE_CORE . 'templates' . DS);
-        define('EE_THIRD_PARTY', EE_CORE . 'third_party_libs' . DS);
-        define('EE_GLOBAL_ASSETS', EE_TEMPLATES . 'global_assets' . DS);
-        define('EE_FORM_SECTIONS', EE_LIBRARIES . 'form_sections' . DS);
+        define('EE_ADMIN', EE_CORE.'admin'.DS);
+        define('EE_CPTS', EE_CORE.'CPTs'.DS);
+        define('EE_CLASSES', EE_CORE.'db_classes'.DS);
+        define('EE_INTERFACES', EE_CORE.'interfaces'.DS);
+        define('EE_BUSINESS', EE_CORE.'business'.DS);
+        define('EE_MODELS', EE_CORE.'db_models'.DS);
+        define('EE_HELPERS', EE_CORE.'helpers'.DS);
+        define('EE_LIBRARIES', EE_CORE.'libraries'.DS);
+        define('EE_TEMPLATES', EE_CORE.'templates'.DS);
+        define('EE_THIRD_PARTY', EE_CORE.'third_party_libs'.DS);
+        define('EE_GLOBAL_ASSETS', EE_TEMPLATES.'global_assets'.DS);
+        define('EE_FORM_SECTIONS', EE_LIBRARIES.'form_sections'.DS);
         // gateways
-        define('EE_GATEWAYS', EE_MODULES . 'gateways' . DS);
-        define('EE_GATEWAYS_URL', EE_PLUGIN_DIR_URL . 'modules' . DS . 'gateways' . DS);
+        define('EE_GATEWAYS', EE_MODULES.'gateways'.DS);
+        define('EE_GATEWAYS_URL', EE_PLUGIN_DIR_URL.'modules'.DS.'gateways'.DS);
         // asset URL paths
-        define('EE_TEMPLATES_URL', EE_PLUGIN_DIR_URL . 'core' . DS . 'templates' . DS);
-        define('EE_GLOBAL_ASSETS_URL', EE_TEMPLATES_URL . 'global_assets' . DS);
-        define('EE_IMAGES_URL', EE_GLOBAL_ASSETS_URL . 'images' . DS);
-        define('EE_THIRD_PARTY_URL', EE_PLUGIN_DIR_URL . 'core' . DS . 'third_party_libs' . DS);
-        define('EE_HELPERS_ASSETS', EE_PLUGIN_DIR_URL . 'core/helpers/assets/');
-        define('EE_LIBRARIES_URL', EE_PLUGIN_DIR_URL . 'core/libraries/');
+        define('EE_TEMPLATES_URL', EE_PLUGIN_DIR_URL.'core'.DS.'templates'.DS);
+        define('EE_GLOBAL_ASSETS_URL', EE_TEMPLATES_URL.'global_assets'.DS);
+        define('EE_IMAGES_URL', EE_GLOBAL_ASSETS_URL.'images'.DS);
+        define('EE_THIRD_PARTY_URL', EE_PLUGIN_DIR_URL.'core'.DS.'third_party_libs'.DS);
+        define('EE_HELPERS_ASSETS', EE_PLUGIN_DIR_URL.'core/helpers/assets/');
+        define('EE_LIBRARIES_URL', EE_PLUGIN_DIR_URL.'core/libraries/');
         // define upload paths
         $uploads = wp_upload_dir();
         // define the uploads directory and URL
-        define('EVENT_ESPRESSO_UPLOAD_DIR', $uploads['basedir'] . DS . 'espresso' . DS);
-        define('EVENT_ESPRESSO_UPLOAD_URL', $uploads['baseurl'] . DS . 'espresso' . DS);
+        define('EVENT_ESPRESSO_UPLOAD_DIR', $uploads['basedir'].DS.'espresso'.DS);
+        define('EVENT_ESPRESSO_UPLOAD_URL', $uploads['baseurl'].DS.'espresso'.DS);
         // define the templates directory and URL
-        define('EVENT_ESPRESSO_TEMPLATE_DIR', $uploads['basedir'] . DS . 'espresso' . DS . 'templates' . DS);
-        define('EVENT_ESPRESSO_TEMPLATE_URL', $uploads['baseurl'] . DS . 'espresso' . DS . 'templates' . DS);
+        define('EVENT_ESPRESSO_TEMPLATE_DIR', $uploads['basedir'].DS.'espresso'.DS.'templates'.DS);
+        define('EVENT_ESPRESSO_TEMPLATE_URL', $uploads['baseurl'].DS.'espresso'.DS.'templates'.DS);
         // define the gateway directory and URL
-        define('EVENT_ESPRESSO_GATEWAY_DIR', $uploads['basedir'] . DS . 'espresso' . DS . 'gateways' . DS);
-        define('EVENT_ESPRESSO_GATEWAY_URL', $uploads['baseurl'] . DS . 'espresso' . DS . 'gateways' . DS);
+        define('EVENT_ESPRESSO_GATEWAY_DIR', $uploads['basedir'].DS.'espresso'.DS.'gateways'.DS);
+        define('EVENT_ESPRESSO_GATEWAY_URL', $uploads['baseurl'].DS.'espresso'.DS.'gateways'.DS);
         // languages folder/path
-        define('EE_LANGUAGES_SAFE_LOC', '..' . DS . 'uploads' . DS . 'espresso' . DS . 'languages' . DS);
-        define('EE_LANGUAGES_SAFE_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'languages' . DS);
+        define('EE_LANGUAGES_SAFE_LOC', '..'.DS.'uploads'.DS.'espresso'.DS.'languages'.DS);
+        define('EE_LANGUAGES_SAFE_DIR', EVENT_ESPRESSO_UPLOAD_DIR.'languages'.DS);
         //check for dompdf fonts in uploads
-        if (file_exists(EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS)) {
-            define('DOMPDF_FONT_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS);
+        if (file_exists(EVENT_ESPRESSO_UPLOAD_DIR.'fonts'.DS)) {
+            define('DOMPDF_FONT_DIR', EVENT_ESPRESSO_UPLOAD_DIR.'fonts'.DS);
         }
         //ajax constants
         define(
@@ -191,7 +191,7 @@ 
         //you're better to use this than its straight value (currently -1) in case you ever
         //want to change its default value! or find when -1 means infinity
         define('EE_INF_IN_DB', -1);
-        define('EE_INF', INF > (float)PHP_INT_MAX ? INF : PHP_INT_MAX);
+        define('EE_INF', INF > (float) PHP_INT_MAX ? INF : PHP_INT_MAX);
         define('EE_DEBUG', false);
         // for older WP versions
         if ( ! defined('MONTH_IN_SECONDS')) {
@@ -214,13 +214,13 @@ 
         function espresso_load_error_handling()
         {
             // load debugging tools
-            if (WP_DEBUG === true && is_readable(EE_HELPERS . 'EEH_Debug_Tools.helper.php')) {
-                require_once(EE_HELPERS . 'EEH_Debug_Tools.helper.php');
+            if (WP_DEBUG === true && is_readable(EE_HELPERS.'EEH_Debug_Tools.helper.php')) {
+                require_once(EE_HELPERS.'EEH_Debug_Tools.helper.php');
                 EEH_Debug_Tools::instance();
             }
             // load error handling
-            if (is_readable(EE_CORE . 'EE_Error.core.php')) {
-                require_once(EE_CORE . 'EE_Error.core.php');
+            if (is_readable(EE_CORE.'EE_Error.core.php')) {
+                require_once(EE_CORE.'EE_Error.core.php');
             } else {
                 wp_die(esc_html__('The EE_Error core class could not be loaded.', 'event_espresso'));
             }
@@ -244,7 +244,7 @@ 
             if (is_readable($full_path_to_file)) {
                 require_once($full_path_to_file);
             } else {
-                throw new EE_Error (
+                throw new EE_Error(
                         sprintf(
                                 esc_html__(
                                         'The %s class file could not be located or is not readable due to file permissions.',
@@ -256,9 +256,9 @@ 
             }
         }
 
-        espresso_load_required('EEH_Base', EE_CORE . 'helpers' . DS . 'EEH_Base.helper.php');
-        espresso_load_required('EEH_File', EE_CORE . 'helpers' . DS . 'EEH_File.helper.php');
-        espresso_load_required('EE_Bootstrap', EE_CORE . 'EE_Bootstrap.core.php');
+        espresso_load_required('EEH_Base', EE_CORE.'helpers'.DS.'EEH_Base.helper.php');
+        espresso_load_required('EEH_File', EE_CORE.'helpers'.DS.'EEH_File.helper.php');
+        espresso_load_required('EE_Bootstrap', EE_CORE.'EE_Bootstrap.core.php');
         new EE_Bootstrap();
     }
 }
@@ -274,7 +274,7 @@ 
     function espresso_deactivate_plugin($plugin_basename = '')
     {
         if ( ! function_exists('deactivate_plugins')) {
-            require_once(ABSPATH . 'wp-admin/includes/plugin.php');
+            require_once(ABSPATH.'wp-admin/includes/plugin.php');
         }
         unset($_GET['activate'], $_REQUEST['activate']);
         deactivate_plugins($plugin_basename);

Indentation +219 added lines, -219 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('ABSPATH')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 /*
   Plugin Name:		Event Espresso
@@ -40,243 +40,243 @@ 
  * @since            4.0
  */
 if (function_exists('espresso_version')) {
-    /**
-     *    espresso_duplicate_plugin_error
-     *    displays if more than one version of EE is activated at the same time
-     */
-    function 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'
-                ); ?>
+						'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__));
-    }
+		espresso_deactivate_plugin(plugin_basename(__FILE__));
+	}
 
-    add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
+	add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
 } else {
-    define('EE_MIN_PHP_VER_REQUIRED', '5.3.9');
-    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.3.9');
+	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 {
-        /**
-         * espresso_version
-         * Returns the plugin version
-         *
-         * @return string
-         */
-        function espresso_version()
-        {
-            return apply_filters('FHEE__espresso__espresso_version', '4.9.29.rc.003');
-        }
+		add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
+	} else {
+		/**
+		 * espresso_version
+		 * Returns the plugin version
+		 *
+		 * @return string
+		 */
+		function espresso_version()
+		{
+			return apply_filters('FHEE__espresso__espresso_version', '4.9.29.rc.003');
+		}
 
-        // define versions
-        define('EVENT_ESPRESSO_VERSION', espresso_version());
-        define('EE_MIN_WP_VER_REQUIRED', '4.1');
-        define('EE_MIN_WP_VER_RECOMMENDED', '4.4.2');
-        define('EE_MIN_PHP_VER_RECOMMENDED', '5.4.44');
-        define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
-        //used to be DIRECTORY_SEPARATOR, but that caused issues on windows
-        if ( ! defined('DS')) {
-            define('DS', '/');
-        }
-        if ( ! defined('PS')) {
-            define('PS', PATH_SEPARATOR);
-        }
-        if ( ! defined('SP')) {
-            define('SP', ' ');
-        }
-        if ( ! defined('EENL')) {
-            define('EENL', "\n");
-        }
-        define('EE_SUPPORT_EMAIL', 'support@eventespresso.com');
-        // define the plugin directory and URL
-        define('EE_PLUGIN_BASENAME', plugin_basename(EVENT_ESPRESSO_MAIN_FILE));
-        define('EE_PLUGIN_DIR_PATH', plugin_dir_path(EVENT_ESPRESSO_MAIN_FILE));
-        define('EE_PLUGIN_DIR_URL', plugin_dir_url(EVENT_ESPRESSO_MAIN_FILE));
-        // main root folder paths
-        define('EE_ADMIN_PAGES', EE_PLUGIN_DIR_PATH . 'admin_pages' . DS);
-        define('EE_CORE', EE_PLUGIN_DIR_PATH . 'core' . DS);
-        define('EE_MODULES', EE_PLUGIN_DIR_PATH . 'modules' . DS);
-        define('EE_PUBLIC', EE_PLUGIN_DIR_PATH . 'public' . DS);
-        define('EE_SHORTCODES', EE_PLUGIN_DIR_PATH . 'shortcodes' . DS);
-        define('EE_WIDGETS', EE_PLUGIN_DIR_PATH . 'widgets' . DS);
-        define('EE_PAYMENT_METHODS', EE_PLUGIN_DIR_PATH . 'payment_methods' . DS);
-        define('EE_CAFF_PATH', EE_PLUGIN_DIR_PATH . 'caffeinated' . DS);
-        // core system paths
-        define('EE_ADMIN', EE_CORE . 'admin' . DS);
-        define('EE_CPTS', EE_CORE . 'CPTs' . DS);
-        define('EE_CLASSES', EE_CORE . 'db_classes' . DS);
-        define('EE_INTERFACES', EE_CORE . 'interfaces' . DS);
-        define('EE_BUSINESS', EE_CORE . 'business' . DS);
-        define('EE_MODELS', EE_CORE . 'db_models' . DS);
-        define('EE_HELPERS', EE_CORE . 'helpers' . DS);
-        define('EE_LIBRARIES', EE_CORE . 'libraries' . DS);
-        define('EE_TEMPLATES', EE_CORE . 'templates' . DS);
-        define('EE_THIRD_PARTY', EE_CORE . 'third_party_libs' . DS);
-        define('EE_GLOBAL_ASSETS', EE_TEMPLATES . 'global_assets' . DS);
-        define('EE_FORM_SECTIONS', EE_LIBRARIES . 'form_sections' . DS);
-        // gateways
-        define('EE_GATEWAYS', EE_MODULES . 'gateways' . DS);
-        define('EE_GATEWAYS_URL', EE_PLUGIN_DIR_URL . 'modules' . DS . 'gateways' . DS);
-        // asset URL paths
-        define('EE_TEMPLATES_URL', EE_PLUGIN_DIR_URL . 'core' . DS . 'templates' . DS);
-        define('EE_GLOBAL_ASSETS_URL', EE_TEMPLATES_URL . 'global_assets' . DS);
-        define('EE_IMAGES_URL', EE_GLOBAL_ASSETS_URL . 'images' . DS);
-        define('EE_THIRD_PARTY_URL', EE_PLUGIN_DIR_URL . 'core' . DS . 'third_party_libs' . DS);
-        define('EE_HELPERS_ASSETS', EE_PLUGIN_DIR_URL . 'core/helpers/assets/');
-        define('EE_LIBRARIES_URL', EE_PLUGIN_DIR_URL . 'core/libraries/');
-        // define upload paths
-        $uploads = wp_upload_dir();
-        // define the uploads directory and URL
-        define('EVENT_ESPRESSO_UPLOAD_DIR', $uploads['basedir'] . DS . 'espresso' . DS);
-        define('EVENT_ESPRESSO_UPLOAD_URL', $uploads['baseurl'] . DS . 'espresso' . DS);
-        // define the templates directory and URL
-        define('EVENT_ESPRESSO_TEMPLATE_DIR', $uploads['basedir'] . DS . 'espresso' . DS . 'templates' . DS);
-        define('EVENT_ESPRESSO_TEMPLATE_URL', $uploads['baseurl'] . DS . 'espresso' . DS . 'templates' . DS);
-        // define the gateway directory and URL
-        define('EVENT_ESPRESSO_GATEWAY_DIR', $uploads['basedir'] . DS . 'espresso' . DS . 'gateways' . DS);
-        define('EVENT_ESPRESSO_GATEWAY_URL', $uploads['baseurl'] . DS . 'espresso' . DS . 'gateways' . DS);
-        // languages folder/path
-        define('EE_LANGUAGES_SAFE_LOC', '..' . DS . 'uploads' . DS . 'espresso' . DS . 'languages' . DS);
-        define('EE_LANGUAGES_SAFE_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'languages' . DS);
-        //check for dompdf fonts in uploads
-        if (file_exists(EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS)) {
-            define('DOMPDF_FONT_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS);
-        }
-        //ajax constants
-        define(
-                'EE_FRONT_AJAX',
-                isset($_REQUEST['ee_front_ajax']) || isset($_REQUEST['data']['ee_front_ajax']) ? true : false
-        );
-        define(
-                'EE_ADMIN_AJAX',
-                isset($_REQUEST['ee_admin_ajax']) || isset($_REQUEST['data']['ee_admin_ajax']) ? true : false
-        );
-        //just a handy constant occasionally needed for finding values representing infinity in the DB
-        //you're better to use this than its straight value (currently -1) in case you ever
-        //want to change its default value! or find when -1 means infinity
-        define('EE_INF_IN_DB', -1);
-        define('EE_INF', INF > (float)PHP_INT_MAX ? INF : PHP_INT_MAX);
-        define('EE_DEBUG', false);
-        // for older WP versions
-        if ( ! defined('MONTH_IN_SECONDS')) {
-            define('MONTH_IN_SECONDS', DAY_IN_SECONDS * 30);
-        }
-        /**
-         *    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);
-        }
+		// define versions
+		define('EVENT_ESPRESSO_VERSION', espresso_version());
+		define('EE_MIN_WP_VER_REQUIRED', '4.1');
+		define('EE_MIN_WP_VER_RECOMMENDED', '4.4.2');
+		define('EE_MIN_PHP_VER_RECOMMENDED', '5.4.44');
+		define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
+		//used to be DIRECTORY_SEPARATOR, but that caused issues on windows
+		if ( ! defined('DS')) {
+			define('DS', '/');
+		}
+		if ( ! defined('PS')) {
+			define('PS', PATH_SEPARATOR);
+		}
+		if ( ! defined('SP')) {
+			define('SP', ' ');
+		}
+		if ( ! defined('EENL')) {
+			define('EENL', "\n");
+		}
+		define('EE_SUPPORT_EMAIL', 'support@eventespresso.com');
+		// define the plugin directory and URL
+		define('EE_PLUGIN_BASENAME', plugin_basename(EVENT_ESPRESSO_MAIN_FILE));
+		define('EE_PLUGIN_DIR_PATH', plugin_dir_path(EVENT_ESPRESSO_MAIN_FILE));
+		define('EE_PLUGIN_DIR_URL', plugin_dir_url(EVENT_ESPRESSO_MAIN_FILE));
+		// main root folder paths
+		define('EE_ADMIN_PAGES', EE_PLUGIN_DIR_PATH . 'admin_pages' . DS);
+		define('EE_CORE', EE_PLUGIN_DIR_PATH . 'core' . DS);
+		define('EE_MODULES', EE_PLUGIN_DIR_PATH . 'modules' . DS);
+		define('EE_PUBLIC', EE_PLUGIN_DIR_PATH . 'public' . DS);
+		define('EE_SHORTCODES', EE_PLUGIN_DIR_PATH . 'shortcodes' . DS);
+		define('EE_WIDGETS', EE_PLUGIN_DIR_PATH . 'widgets' . DS);
+		define('EE_PAYMENT_METHODS', EE_PLUGIN_DIR_PATH . 'payment_methods' . DS);
+		define('EE_CAFF_PATH', EE_PLUGIN_DIR_PATH . 'caffeinated' . DS);
+		// core system paths
+		define('EE_ADMIN', EE_CORE . 'admin' . DS);
+		define('EE_CPTS', EE_CORE . 'CPTs' . DS);
+		define('EE_CLASSES', EE_CORE . 'db_classes' . DS);
+		define('EE_INTERFACES', EE_CORE . 'interfaces' . DS);
+		define('EE_BUSINESS', EE_CORE . 'business' . DS);
+		define('EE_MODELS', EE_CORE . 'db_models' . DS);
+		define('EE_HELPERS', EE_CORE . 'helpers' . DS);
+		define('EE_LIBRARIES', EE_CORE . 'libraries' . DS);
+		define('EE_TEMPLATES', EE_CORE . 'templates' . DS);
+		define('EE_THIRD_PARTY', EE_CORE . 'third_party_libs' . DS);
+		define('EE_GLOBAL_ASSETS', EE_TEMPLATES . 'global_assets' . DS);
+		define('EE_FORM_SECTIONS', EE_LIBRARIES . 'form_sections' . DS);
+		// gateways
+		define('EE_GATEWAYS', EE_MODULES . 'gateways' . DS);
+		define('EE_GATEWAYS_URL', EE_PLUGIN_DIR_URL . 'modules' . DS . 'gateways' . DS);
+		// asset URL paths
+		define('EE_TEMPLATES_URL', EE_PLUGIN_DIR_URL . 'core' . DS . 'templates' . DS);
+		define('EE_GLOBAL_ASSETS_URL', EE_TEMPLATES_URL . 'global_assets' . DS);
+		define('EE_IMAGES_URL', EE_GLOBAL_ASSETS_URL . 'images' . DS);
+		define('EE_THIRD_PARTY_URL', EE_PLUGIN_DIR_URL . 'core' . DS . 'third_party_libs' . DS);
+		define('EE_HELPERS_ASSETS', EE_PLUGIN_DIR_URL . 'core/helpers/assets/');
+		define('EE_LIBRARIES_URL', EE_PLUGIN_DIR_URL . 'core/libraries/');
+		// define upload paths
+		$uploads = wp_upload_dir();
+		// define the uploads directory and URL
+		define('EVENT_ESPRESSO_UPLOAD_DIR', $uploads['basedir'] . DS . 'espresso' . DS);
+		define('EVENT_ESPRESSO_UPLOAD_URL', $uploads['baseurl'] . DS . 'espresso' . DS);
+		// define the templates directory and URL
+		define('EVENT_ESPRESSO_TEMPLATE_DIR', $uploads['basedir'] . DS . 'espresso' . DS . 'templates' . DS);
+		define('EVENT_ESPRESSO_TEMPLATE_URL', $uploads['baseurl'] . DS . 'espresso' . DS . 'templates' . DS);
+		// define the gateway directory and URL
+		define('EVENT_ESPRESSO_GATEWAY_DIR', $uploads['basedir'] . DS . 'espresso' . DS . 'gateways' . DS);
+		define('EVENT_ESPRESSO_GATEWAY_URL', $uploads['baseurl'] . DS . 'espresso' . DS . 'gateways' . DS);
+		// languages folder/path
+		define('EE_LANGUAGES_SAFE_LOC', '..' . DS . 'uploads' . DS . 'espresso' . DS . 'languages' . DS);
+		define('EE_LANGUAGES_SAFE_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'languages' . DS);
+		//check for dompdf fonts in uploads
+		if (file_exists(EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS)) {
+			define('DOMPDF_FONT_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS);
+		}
+		//ajax constants
+		define(
+				'EE_FRONT_AJAX',
+				isset($_REQUEST['ee_front_ajax']) || isset($_REQUEST['data']['ee_front_ajax']) ? true : false
+		);
+		define(
+				'EE_ADMIN_AJAX',
+				isset($_REQUEST['ee_admin_ajax']) || isset($_REQUEST['data']['ee_admin_ajax']) ? true : false
+		);
+		//just a handy constant occasionally needed for finding values representing infinity in the DB
+		//you're better to use this than its straight value (currently -1) in case you ever
+		//want to change its default value! or find when -1 means infinity
+		define('EE_INF_IN_DB', -1);
+		define('EE_INF', INF > (float)PHP_INT_MAX ? INF : PHP_INT_MAX);
+		define('EE_DEBUG', false);
+		// for older WP versions
+		if ( ! defined('MONTH_IN_SECONDS')) {
+			define('MONTH_IN_SECONDS', DAY_IN_SECONDS * 30);
+		}
+		/**
+		 *    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');
-        /**
-         *    espresso_load_error_handling
-         *    this function loads EE's class for handling exceptions and errors
-         */
-        function espresso_load_error_handling()
-        {
-            // load debugging tools
-            if (WP_DEBUG === true && is_readable(EE_HELPERS . 'EEH_Debug_Tools.helper.php')) {
-                require_once(EE_HELPERS . 'EEH_Debug_Tools.helper.php');
-                EEH_Debug_Tools::instance();
-            }
-            // load error handling
-            if (is_readable(EE_CORE . 'EE_Error.core.php')) {
-                require_once(EE_CORE . 'EE_Error.core.php');
-            } else {
-                wp_die(esc_html__('The EE_Error core class could not be loaded.', 'event_espresso'));
-            }
-        }
+		register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
+		/**
+		 *    espresso_load_error_handling
+		 *    this function loads EE's class for handling exceptions and errors
+		 */
+		function espresso_load_error_handling()
+		{
+			// load debugging tools
+			if (WP_DEBUG === true && is_readable(EE_HELPERS . 'EEH_Debug_Tools.helper.php')) {
+				require_once(EE_HELPERS . 'EEH_Debug_Tools.helper.php');
+				EEH_Debug_Tools::instance();
+			}
+			// load error handling
+			if (is_readable(EE_CORE . 'EE_Error.core.php')) {
+				require_once(EE_CORE . 'EE_Error.core.php');
+			} else {
+				wp_die(esc_html__('The EE_Error core class could not be loaded.', 'event_espresso'));
+			}
+		}
 
-        /**
-         *    espresso_load_required
-         *    given a class name and path, this function will load that file or throw an exception
-         *
-         * @param    string $classname
-         * @param    string $full_path_to_file
-         * @throws    EE_Error
-         */
-        function espresso_load_required($classname, $full_path_to_file)
-        {
-            static $error_handling_loaded = false;
-            if ( ! $error_handling_loaded) {
-                espresso_load_error_handling();
-                $error_handling_loaded = true;
-            }
-            if (is_readable($full_path_to_file)) {
-                require_once($full_path_to_file);
-            } else {
-                throw new EE_Error (
-                        sprintf(
-                                esc_html__(
-                                        'The %s class file could not be located or is not readable due to file permissions.',
-                                        'event_espresso'
-                                ),
-                                $classname
-                        )
-                );
-            }
-        }
+		/**
+		 *    espresso_load_required
+		 *    given a class name and path, this function will load that file or throw an exception
+		 *
+		 * @param    string $classname
+		 * @param    string $full_path_to_file
+		 * @throws    EE_Error
+		 */
+		function espresso_load_required($classname, $full_path_to_file)
+		{
+			static $error_handling_loaded = false;
+			if ( ! $error_handling_loaded) {
+				espresso_load_error_handling();
+				$error_handling_loaded = true;
+			}
+			if (is_readable($full_path_to_file)) {
+				require_once($full_path_to_file);
+			} else {
+				throw new EE_Error (
+						sprintf(
+								esc_html__(
+										'The %s class file could not be located or is not readable due to file permissions.',
+										'event_espresso'
+								),
+								$classname
+						)
+				);
+			}
+		}
 
-        espresso_load_required('EEH_Base', EE_CORE . 'helpers' . DS . 'EEH_Base.helper.php');
-        espresso_load_required('EEH_File', EE_CORE . 'helpers' . DS . 'EEH_File.helper.php');
-        espresso_load_required('EE_Bootstrap', EE_CORE . 'EE_Bootstrap.core.php');
-        new EE_Bootstrap();
-    }
+		espresso_load_required('EEH_Base', EE_CORE . 'helpers' . DS . 'EEH_Base.helper.php');
+		espresso_load_required('EEH_File', EE_CORE . 'helpers' . DS . 'EEH_File.helper.php');
+		espresso_load_required('EE_Bootstrap', EE_CORE . 'EE_Bootstrap.core.php');
+		new EE_Bootstrap();
+	}
 }
 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/services/assets/Registry.php

Indentation +214 added lines, -214 removed lines

@@ -16,222 +16,222 @@
 class Registry
 {
 
-    /**
-     * This holds the jsdata data object that will be exposed on pages that enqueue the `eejs-core` script.
-     * @var array
-     */
-    protected $jsdata = array();
-
-
-    /**
-     * Registry constructor.
-     * Hooking into WP actions for script registry.
-     */
-    public function __construct()
-    {
-        add_action('wp_enqueue_scripts', array($this, 'scripts'), 100);
-        add_action('admin_enqueue_scripts', array($this, 'scripts'), 100);
-    }
-
-
-    /**
-     * Callback for the WP script actions.
-     * Used to register globally accessible core scripts.
-     * Also used to add the eejs.data object to the source for any js having eejs-core as a dependency.
-     */
-    public function scripts()
-    {
-        global $wp_version;
-        wp_register_script(
-            'eejs-core',
-            EE_PLUGIN_DIR_URL . 'core/services/assets/core_assets/eejs-core.js',
-            array(),
-            espresso_version(),
-            true
-        );
-        //only run this if WordPress 4.4.0 > is in use.
-        if (version_compare($wp_version, '4.4.0', '>')) {
-            //js.api
-            wp_register_script(
-                'eejs-api',
-                EE_LIBRARIES_URL . 'rest_api/assets/js/eejs-api.min.js',
-                array('underscore', 'eejs-core'),
-                espresso_version(),
-                true
-            );
-            $this->jsdata['paths'] = array('rest_route' => rest_url('ee/v4.8.36/'));
-
-            wp_localize_script('eejs-core', 'eejs', array('data' => $this->jsdata));
-        }
-    }
-
-
-    /**
-     * Used to add data to eejs.data object.
-     *
-     * Note:  Overriding existing data is not allowed.
-     *
-     * Data will be accessible as a javascript object when you list `eejs-core` as a dependency for your javascript.
-     * If the data you add is something like this:
-     *
-     *  $this->addData( 'my_plugin_data', array( 'foo' => 'gar' ) );
-     *
-     * It will be exposed in the page source as:
-     *
-     *  eejs.data.my_plugin_data.foo == gar
-     *
-     * @param string       $key   Key used to access your data
-     * @param string|array $value Value to attach to key
-     * @throws InvalidArgumentException
-     */
-    public function addData($key, $value)
-    {
-        if ($this->verifyDataNotExisting($key)) {
-            $this->jsdata[$key] = $value;
-        }
-    }
-
-
-    /**
-     * Similar to addData except this allows for users to push values to an existing key where the values on key are
-     * elements in an array.
-     *
-     * When you use this method, the value you include will be appended to the end of an array on $key.
-     *
-     * So if the $key was 'test' and you added a value of 'my_data' then it would be represented in the javascript object
-     * like this,
-     *
-     * eejs.data.test = [
-     *     my_data,
-     * ]
-     *
-     * If there has already been a scalar value attached to the data object given key, then
-     * this will throw an exception.
-     *
-     * @param string $key          Key to attach data to.
-     * @param string|array $value  Value being registered.
-     * @throws InvalidArgumentException
-     */
-    public function pushData($key, $value)
-    {
-        if (isset($this->jsdata[$key])
-            && ! is_array($this->jsdata[$key])
-        ) {
-            throw new invalidArgumentException(
-                sprintf(
-                    __(
-                        'The value for %1$s is already set and it is not an array. The %2$s method can only be used to
+	/**
+	 * This holds the jsdata data object that will be exposed on pages that enqueue the `eejs-core` script.
+	 * @var array
+	 */
+	protected $jsdata = array();
+
+
+	/**
+	 * Registry constructor.
+	 * Hooking into WP actions for script registry.
+	 */
+	public function __construct()
+	{
+		add_action('wp_enqueue_scripts', array($this, 'scripts'), 100);
+		add_action('admin_enqueue_scripts', array($this, 'scripts'), 100);
+	}
+
+
+	/**
+	 * Callback for the WP script actions.
+	 * Used to register globally accessible core scripts.
+	 * Also used to add the eejs.data object to the source for any js having eejs-core as a dependency.
+	 */
+	public function scripts()
+	{
+		global $wp_version;
+		wp_register_script(
+			'eejs-core',
+			EE_PLUGIN_DIR_URL . 'core/services/assets/core_assets/eejs-core.js',
+			array(),
+			espresso_version(),
+			true
+		);
+		//only run this if WordPress 4.4.0 > is in use.
+		if (version_compare($wp_version, '4.4.0', '>')) {
+			//js.api
+			wp_register_script(
+				'eejs-api',
+				EE_LIBRARIES_URL . 'rest_api/assets/js/eejs-api.min.js',
+				array('underscore', 'eejs-core'),
+				espresso_version(),
+				true
+			);
+			$this->jsdata['paths'] = array('rest_route' => rest_url('ee/v4.8.36/'));
+
+			wp_localize_script('eejs-core', 'eejs', array('data' => $this->jsdata));
+		}
+	}
+
+
+	/**
+	 * Used to add data to eejs.data object.
+	 *
+	 * Note:  Overriding existing data is not allowed.
+	 *
+	 * Data will be accessible as a javascript object when you list `eejs-core` as a dependency for your javascript.
+	 * If the data you add is something like this:
+	 *
+	 *  $this->addData( 'my_plugin_data', array( 'foo' => 'gar' ) );
+	 *
+	 * It will be exposed in the page source as:
+	 *
+	 *  eejs.data.my_plugin_data.foo == gar
+	 *
+	 * @param string       $key   Key used to access your data
+	 * @param string|array $value Value to attach to key
+	 * @throws InvalidArgumentException
+	 */
+	public function addData($key, $value)
+	{
+		if ($this->verifyDataNotExisting($key)) {
+			$this->jsdata[$key] = $value;
+		}
+	}
+
+
+	/**
+	 * Similar to addData except this allows for users to push values to an existing key where the values on key are
+	 * elements in an array.
+	 *
+	 * When you use this method, the value you include will be appended to the end of an array on $key.
+	 *
+	 * So if the $key was 'test' and you added a value of 'my_data' then it would be represented in the javascript object
+	 * like this,
+	 *
+	 * eejs.data.test = [
+	 *     my_data,
+	 * ]
+	 *
+	 * If there has already been a scalar value attached to the data object given key, then
+	 * this will throw an exception.
+	 *
+	 * @param string $key          Key to attach data to.
+	 * @param string|array $value  Value being registered.
+	 * @throws InvalidArgumentException
+	 */
+	public function pushData($key, $value)
+	{
+		if (isset($this->jsdata[$key])
+			&& ! is_array($this->jsdata[$key])
+		) {
+			throw new invalidArgumentException(
+				sprintf(
+					__(
+						'The value for %1$s is already set and it is not an array. The %2$s method can only be used to
                          push values to this data element when it is an array.',
-                        'event_espresso'
-                    ),
-                    $key,
-                    __METHOD__
-                )
-            );
-        }
-
-        $this->jsdata[$key][] = $value;
-    }
-
-
-    /**
-     * Used to set content used by javascript for a template.
-     * Note: Overrides of existing registered templates are not allowed.
-     *
-     * @param string $template_reference
-     * @param string $template_content
-     * @throws InvalidArgumentException
-     */
-    public function addTemplate($template_reference, $template_content)
-    {
-        if (! isset($this->jsdata['templates'])) {
-            $this->jsdata['templates'] = array();
-        }
-
-        //no overrides allowed.
-        if (isset($this->jsdata['templates'][$template_reference])) {
-            throw new invalidArgumentException(
-                sprintf(
-                    __(
-                        'The %1$s key already exists for the templates array in the js data array.  No overrides are allowed.',
-                        'event_espresso'
-                    ),
-                    $template_reference
-                )
-            );
-        } else {
-            $this->jsdata['templates'][$template_reference] = $template_content;
-        }
-    }
-
-
-    /**
-     * Retrieve the template content already registered for the given reference.
-     * @param string $template_reference
-     * @return string
-     */
-    public function getTemplate($template_reference)
-    {
-        return isset($this->jsdata['templates'], $this->jsdata['templates'][$template_reference])
-            ? $this->jsdata['templates'][$template_reference]
-            : '';
-    }
-
-
-    /**
-     * Retrieve registered data.
-     *
-     * @param string $key           Name of key to attach data to.
-     * @return mixed                If there is no for the given key, then false is returned.
-     */
-    public function getData($key)
-    {
-        return isset($this->jsdata[$key])
-            ? $this->jsdata[$key]
-            : false;
-    }
-
-
-
-
-    /**
-     * Verifies whether the given data exists already on the jsdata array.
-     *
-     * Overriding data is not allowed.
-     *
-     * @param string       $key          Index for data.
-     * @return bool        If valid then return true.
-     * @throws InvalidArgumentException if data already exists.
-     */
-    protected function verifyDataNotExisting($key)
-    {
-        if (isset($this->jsdata[$key])) {
-            if (is_array($this->jsdata[$key])) {
-                throw new InvalidArgumentException(
-                    sprintf(
-                        __(
-                            'The value for %1$s already exists in the Registry::eejs object.
+						'event_espresso'
+					),
+					$key,
+					__METHOD__
+				)
+			);
+		}
+
+		$this->jsdata[$key][] = $value;
+	}
+
+
+	/**
+	 * Used to set content used by javascript for a template.
+	 * Note: Overrides of existing registered templates are not allowed.
+	 *
+	 * @param string $template_reference
+	 * @param string $template_content
+	 * @throws InvalidArgumentException
+	 */
+	public function addTemplate($template_reference, $template_content)
+	{
+		if (! isset($this->jsdata['templates'])) {
+			$this->jsdata['templates'] = array();
+		}
+
+		//no overrides allowed.
+		if (isset($this->jsdata['templates'][$template_reference])) {
+			throw new invalidArgumentException(
+				sprintf(
+					__(
+						'The %1$s key already exists for the templates array in the js data array.  No overrides are allowed.',
+						'event_espresso'
+					),
+					$template_reference
+				)
+			);
+		} else {
+			$this->jsdata['templates'][$template_reference] = $template_content;
+		}
+	}
+
+
+	/**
+	 * Retrieve the template content already registered for the given reference.
+	 * @param string $template_reference
+	 * @return string
+	 */
+	public function getTemplate($template_reference)
+	{
+		return isset($this->jsdata['templates'], $this->jsdata['templates'][$template_reference])
+			? $this->jsdata['templates'][$template_reference]
+			: '';
+	}
+
+
+	/**
+	 * Retrieve registered data.
+	 *
+	 * @param string $key           Name of key to attach data to.
+	 * @return mixed                If there is no for the given key, then false is returned.
+	 */
+	public function getData($key)
+	{
+		return isset($this->jsdata[$key])
+			? $this->jsdata[$key]
+			: false;
+	}
+
+
+
+
+	/**
+	 * Verifies whether the given data exists already on the jsdata array.
+	 *
+	 * Overriding data is not allowed.
+	 *
+	 * @param string       $key          Index for data.
+	 * @return bool        If valid then return true.
+	 * @throws InvalidArgumentException if data already exists.
+	 */
+	protected function verifyDataNotExisting($key)
+	{
+		if (isset($this->jsdata[$key])) {
+			if (is_array($this->jsdata[$key])) {
+				throw new InvalidArgumentException(
+					sprintf(
+						__(
+							'The value for %1$s already exists in the Registry::eejs object.
                             Overrides are not allowed. Since the value of this data is an array, you may want to use the
                             %2$s method to push your value to the array.',
-                            'event_espresso'
-                        ),
-                        $key,
-                        'pushData()'
-                    )
-                );
-            } else {
-                throw new InvalidArgumentException(
-                    sprintf(
-                        __(
-                            'The value for %1$s already exists in the Registry::eejs object. Overrides are not
+							'event_espresso'
+						),
+						$key,
+						'pushData()'
+					)
+				);
+			} else {
+				throw new InvalidArgumentException(
+					sprintf(
+						__(
+							'The value for %1$s already exists in the Registry::eejs object. Overrides are not
                             allowed.  Consider attaching your value to a different key',
-                            'event_espresso'
-                        ),
-                        $key
-                    )
-                );
-            }
-        }
-        return true;
-    }
+							'event_espresso'
+						),
+						$key
+					)
+				);
+			}
+		}
+		return true;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
         global $wp_version;
         wp_register_script(
             'eejs-core',
-            EE_PLUGIN_DIR_URL . 'core/services/assets/core_assets/eejs-core.js',
+            EE_PLUGIN_DIR_URL.'core/services/assets/core_assets/eejs-core.js',
             array(),
             espresso_version(),
             true
@@ -54,7 +54,7 @@ 
             //js.api
             wp_register_script(
                 'eejs-api',
-                EE_LIBRARIES_URL . 'rest_api/assets/js/eejs-api.min.js',
+                EE_LIBRARIES_URL.'rest_api/assets/js/eejs-api.min.js',
                 array('underscore', 'eejs-core'),
                 espresso_version(),
                 true
@@ -144,7 +144,7 @@ 
      */
     public function addTemplate($template_reference, $template_content)
     {
-        if (! isset($this->jsdata['templates'])) {
+        if ( ! isset($this->jsdata['templates'])) {
             $this->jsdata['templates'] = array();
         }
 

core/services/automated_actions/TriggerStrategyHook.php

Indentation +19 added lines, -19 removed lines

@@ -16,25 +16,25 @@
 class TriggerStrategyHook extends TriggerStrategy
 {
 
-    /**
-     * This allows strategies to set up whatever hooks are necessary to trigger their logic.
-     * All overriding methods should call: $this->setAutomatedAction($automated_action)
-     *
-     * @param AutomatedActionInterface $automated_action
-     */
-    public function set(AutomatedActionInterface $automated_action)
-    {
-        \EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
-        $this->setAutomatedAction($automated_action);
-        $extra_data = $automated_action->getData();
-        // todo: might want to change where these parameters are saved
-        // todo: maybe make them part of the AMA_trigger_value field ?
-        $priority = isset($extra_data->hook, $extra_data->hook->priority) ? $extra_data->hook->priority : 10;
-        $arguments = isset($extra_data->hook, $extra_data->hook->arguments) ? $extra_data->hook->arguments : 1;
-        // \EEH_Debug_Tools::printr($priority, '$priority', __FILE__, __LINE__);
-        // \EEH_Debug_Tools::printr($arguments, '$arguments', __FILE__, __LINE__);
-        add_action($automated_action->getTriggerValue(), array($this, 'triggerCallback'), $priority, $arguments);
-    }
+	/**
+	 * This allows strategies to set up whatever hooks are necessary to trigger their logic.
+	 * All overriding methods should call: $this->setAutomatedAction($automated_action)
+	 *
+	 * @param AutomatedActionInterface $automated_action
+	 */
+	public function set(AutomatedActionInterface $automated_action)
+	{
+		\EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
+		$this->setAutomatedAction($automated_action);
+		$extra_data = $automated_action->getData();
+		// todo: might want to change where these parameters are saved
+		// todo: maybe make them part of the AMA_trigger_value field ?
+		$priority = isset($extra_data->hook, $extra_data->hook->priority) ? $extra_data->hook->priority : 10;
+		$arguments = isset($extra_data->hook, $extra_data->hook->arguments) ? $extra_data->hook->arguments : 1;
+		// \EEH_Debug_Tools::printr($priority, '$priority', __FILE__, __LINE__);
+		// \EEH_Debug_Tools::printr($arguments, '$arguments', __FILE__, __LINE__);
+		add_action($automated_action->getTriggerValue(), array($this, 'triggerCallback'), $priority, $arguments);
+	}
 
 
 

core/services/automated_actions/TriggerStrategy.php

Indentation +198 added lines, -198 removed lines

@@ -23,217 +23,217 @@
 abstract class TriggerStrategy
 {
 
-    /**
-     * @var RuleManager $rule_manager
-     */
-    private $rule_manager;
+	/**
+	 * @var RuleManager $rule_manager
+	 */
+	private $rule_manager;
 
-    /**
-     * @var AutomatedActionInterface $automated_action
-     */
-    private $automated_action;
+	/**
+	 * @var AutomatedActionInterface $automated_action
+	 */
+	private $automated_action;
 
-    /**
-     * @var array $callback_args
-     */
-    private $callback_args = array();
+	/**
+	 * @var array $callback_args
+	 */
+	private $callback_args = array();
 
-    /**
-     * @var boolean $pulled
-     */
-    private $pulled = false;
+	/**
+	 * @var boolean $pulled
+	 */
+	private $pulled = false;
 
-    /**
-     * @var Collection $rules
-     */
-    private $rules;
+	/**
+	 * @var Collection $rules
+	 */
+	private $rules;
 
 
 
-    /**
-     * TriggerStrategy constructor.
-     *
-     * @param RuleManager $rule_manager
-     */
-    public function __construct(RuleManager $rule_manager)
-    {
-        $this->rule_manager = $rule_manager;
-    }
+	/**
+	 * TriggerStrategy constructor.
+	 *
+	 * @param RuleManager $rule_manager
+	 */
+	public function __construct(RuleManager $rule_manager)
+	{
+		$this->rule_manager = $rule_manager;
+	}
 
 
 
-    /**
-     * @return AutomatedActionInterface
-     */
-    public function getAutomatedAction()
-    {
-        return $this->automated_action;
-    }
+	/**
+	 * @return AutomatedActionInterface
+	 */
+	public function getAutomatedAction()
+	{
+		return $this->automated_action;
+	}
 
 
 
-    /**
-     * @param \EventEspresso\core\services\automated_actions\AutomatedActionInterface $automated_action
-     */
-    public function setAutomatedAction(AutomatedActionInterface $automated_action) {
-        $this->automated_action = $automated_action;
-    }
-
-
-
-
-    /**
-     * @return array
-     */
-    public function getCallbackArgs()
-    {
-        return $this->callback_args;
-    }
-
-
-
-    /**
-     * @param array $callback_args
-     */
-    public function setCallbackArgs(array $callback_args = array())
-    {
-        $this->callback_args = $callback_args;
-    }
-
-
-
-    /**
-     * @return bool
-     */
-    public function pulled()
-    {
-        return $this->pulled;
-    }
-
-
-
-    /**
-     * @param bool $pulled
-     */
-    public function setPulled($pulled = true)
-    {
-        $this->pulled = filter_var($pulled, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-
-    /**
-     * @return Collection
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidEntityException
-     * @throws DomainException
-     */
-    public function getRules()
-    {
-        if ($this->rules === null) {
-            $this->setRules();
-        }
-        return $this->rules;
-    }
-
-
-
-    /**
-     * @return void
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidEntityException
-     * @throws DomainException
-     */
-    private function setRules()
-    {
-        $this->rules = $this->rule_manager->retrieveRulesForObject(
-            'Automated Action',
-            $this->automated_action->getID()
-        );
-    }
-
-
-
-    /**
-     * This is required and should be overridden by all trigger types,
-     * as it allows strategies to set up whatever hooks are necessary to trigger their logic.
-     * All overriding methods should call: $this->setAutomatedAction($automated_action)
-     *
-     * @param AutomatedActionInterface $automated_action
-     */
-    abstract public function set(AutomatedActionInterface $automated_action);
-
-
-
-    /**
-     * callback method for all strategies (regardless of type),
-     * that runs when the trigger is "pulled".
-     * At this point strategies should ONLY proceed to collect data
-     * required for the action, store it for later processing,
-     * and call setPulled() to indicate that the trigger was successful
-     * (meaning data results for the action were retrieved).
-     * This allows control over when that happens
-     * because the moment the trigger is pulled
-     * may not be the most optimum time for data processing.
-     * By default, logic processing will occur during "shutdown",
-     * but can be overridden by an AutomatedActionStrategy class
-     *
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidEntityException
-     * @throws DomainException
-     */
-    public function triggerCallback() {
-        \EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
-        $this->setCallbackArgs(func_get_args());
-        $this->execute(
-            $this->getQueryParamsForRules()
-        );
-    }
-
-
-
-    /**
-     * @return array
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidEntityException
-     * @throws DomainException
-     */
-    public function getQueryParamsForRules()
-    {
-        return $this->rule_manager->getQueryParamsForRules(
-            $this->getRules()
-        );
-    }
-
-
-
-    /**
-     * when a trigger has been "pulled",
-     * either by a do_action or scheduled cron,
-     * this is the TriggerStrategy method that will run
-     * to continue processing the trigger.
-     * This will typically mean retrieving objects from the db.
-     * By default, this method does nothing but set callback args
-     * to be used for querying during the 'shutdown' hook when
-     * AutomatedActionManager::processActions() runs,
-     * but can be overridden to perform querying now.
-     *
-     * @param array $query_params
-     * @return void
-     */
-    public function execute(array $query_params)
-    {
-        \EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
-        $this->setCallbackArgs(
-            array_merge($this->callback_args, array('query_params' => $query_params))
-        );
-        // \EEH_Debug_Tools::printr($this->callback_args, '$this->callback_args', __FILE__, __LINE__);
-        $this->setPulled();
-    }
+	/**
+	 * @param \EventEspresso\core\services\automated_actions\AutomatedActionInterface $automated_action
+	 */
+	public function setAutomatedAction(AutomatedActionInterface $automated_action) {
+		$this->automated_action = $automated_action;
+	}
+
+
+
+
+	/**
+	 * @return array
+	 */
+	public function getCallbackArgs()
+	{
+		return $this->callback_args;
+	}
+
+
+
+	/**
+	 * @param array $callback_args
+	 */
+	public function setCallbackArgs(array $callback_args = array())
+	{
+		$this->callback_args = $callback_args;
+	}
+
+
+
+	/**
+	 * @return bool
+	 */
+	public function pulled()
+	{
+		return $this->pulled;
+	}
+
+
+
+	/**
+	 * @param bool $pulled
+	 */
+	public function setPulled($pulled = true)
+	{
+		$this->pulled = filter_var($pulled, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+
+	/**
+	 * @return Collection
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidEntityException
+	 * @throws DomainException
+	 */
+	public function getRules()
+	{
+		if ($this->rules === null) {
+			$this->setRules();
+		}
+		return $this->rules;
+	}
+
+
+
+	/**
+	 * @return void
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidEntityException
+	 * @throws DomainException
+	 */
+	private function setRules()
+	{
+		$this->rules = $this->rule_manager->retrieveRulesForObject(
+			'Automated Action',
+			$this->automated_action->getID()
+		);
+	}
+
+
+
+	/**
+	 * This is required and should be overridden by all trigger types,
+	 * as it allows strategies to set up whatever hooks are necessary to trigger their logic.
+	 * All overriding methods should call: $this->setAutomatedAction($automated_action)
+	 *
+	 * @param AutomatedActionInterface $automated_action
+	 */
+	abstract public function set(AutomatedActionInterface $automated_action);
+
+
+
+	/**
+	 * callback method for all strategies (regardless of type),
+	 * that runs when the trigger is "pulled".
+	 * At this point strategies should ONLY proceed to collect data
+	 * required for the action, store it for later processing,
+	 * and call setPulled() to indicate that the trigger was successful
+	 * (meaning data results for the action were retrieved).
+	 * This allows control over when that happens
+	 * because the moment the trigger is pulled
+	 * may not be the most optimum time for data processing.
+	 * By default, logic processing will occur during "shutdown",
+	 * but can be overridden by an AutomatedActionStrategy class
+	 *
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidEntityException
+	 * @throws DomainException
+	 */
+	public function triggerCallback() {
+		\EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
+		$this->setCallbackArgs(func_get_args());
+		$this->execute(
+			$this->getQueryParamsForRules()
+		);
+	}
+
+
+
+	/**
+	 * @return array
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidEntityException
+	 * @throws DomainException
+	 */
+	public function getQueryParamsForRules()
+	{
+		return $this->rule_manager->getQueryParamsForRules(
+			$this->getRules()
+		);
+	}
+
+
+
+	/**
+	 * when a trigger has been "pulled",
+	 * either by a do_action or scheduled cron,
+	 * this is the TriggerStrategy method that will run
+	 * to continue processing the trigger.
+	 * This will typically mean retrieving objects from the db.
+	 * By default, this method does nothing but set callback args
+	 * to be used for querying during the 'shutdown' hook when
+	 * AutomatedActionManager::processActions() runs,
+	 * but can be overridden to perform querying now.
+	 *
+	 * @param array $query_params
+	 * @return void
+	 */
+	public function execute(array $query_params)
+	{
+		\EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
+		$this->setCallbackArgs(
+			array_merge($this->callback_args, array('query_params' => $query_params))
+		);
+		// \EEH_Debug_Tools::printr($this->callback_args, '$this->callback_args', __FILE__, __LINE__);
+		$this->setPulled();
+	}
 
 
 }

core/services/automated_actions/CronManager.php

Indentation +131 added lines, -131 removed lines

@@ -20,137 +20,137 @@
 class CronManager implements JobSchedulerInterface
 {
 
-    /**
-     * @var $crons Collection
-     */
-    private $crons;
-
-
-
-    /**
-     * CronManager constructor.
-     *
-     * @param Collection $crons
-     * @throws InvalidInterfaceException
-     */
-    public function __construct(Collection $crons = null)
-    {
-        $this->crons = $crons instanceof Collection
-            ? $crons
-            : new Collection('EventEspresso\core\services\automated_actions\Cron');
-    }
-
-
-
-    /**
-     * @param string $identifier
-     * @return bool
-     * @throws InvalidEntityException
-     */
-    public function hasJob($identifier) {
-        return $this->crons->has($identifier);
-    }
-
-
-
-    /**
-     * @param JobInterface $cron
-     * @param string $identifier
-     * @return bool
-     * @throws InvalidEntityException
-     */
-    public function addJob(JobInterface $cron, $identifier) {
-        if ($this->crons->has($identifier)) {
-            return false;
-        }
-        return $this->crons->add($cron, $identifier);
-    }
-
-
-
-    /**
-     * @param array $crons
-     * @throws InvalidEntityException
-     */
-    public function addJobs($crons = array()) {
-        $crons = is_array($crons) ? $crons : array($crons);
-        foreach ($crons as $identifier => $cron) {
-            $this->addJob($cron, $identifier);
-        }
-    }
-
-
-
-    /**
-     * @param string $identifier
-     * @return Cron|null
-     */
-    public function getJob($identifier)
-    {
-        if ($this->crons->has($identifier)) {
-            return $this->crons->get($identifier);
-        }
-        return null;
-    }
-
-
-
-    /**
-     * @param JobInterface|Cron $cron
-     * @return void
-     */
-    public function scheduleJob(JobInterface $cron)
-    {
-        if ( ! $this->nextScheduledJob($cron)) {
-            if ($cron->getRecurrence() === '') {
-                wp_schedule_single_event(
-                    $cron->getTimestamp(),
-                    $cron->getActionHook(),
-                    $cron->getData()
-                );
-            } else {
-                wp_schedule_event(
-                    $cron->getTimestamp(),
-                    $cron->getRecurrence(),
-                    $cron->getActionHook(),
-                    $cron->getData()
-                );
-            }
-        }
-    }
-
-
-
-    /**
-     * @param JobInterface|Cron $cron
-     * @return int
-     */
-    public function nextScheduledJob(JobInterface $cron)
-    {
-        return wp_next_scheduled($cron->getActionHook(), $cron->getData());
-    }
-
-
-
-    /**
-     * @param JobInterface|Cron $cron
-     * @return void
-     */
-    public function clearScheduledJob(JobInterface $cron)
-    {
-        wp_clear_scheduled_hook($cron->getActionHook(), $cron->getData());
-    }
-
-
-
-    /**
-     * @param JobInterface|Cron $cron
-     * @return void
-     */
-    public function unscheduleJob(JobInterface $cron)
-    {
-        wp_unschedule_event($cron->getTimestamp(), $cron->getActionHook(), $cron->getData());
-    }
+	/**
+	 * @var $crons Collection
+	 */
+	private $crons;
+
+
+
+	/**
+	 * CronManager constructor.
+	 *
+	 * @param Collection $crons
+	 * @throws InvalidInterfaceException
+	 */
+	public function __construct(Collection $crons = null)
+	{
+		$this->crons = $crons instanceof Collection
+			? $crons
+			: new Collection('EventEspresso\core\services\automated_actions\Cron');
+	}
+
+
+
+	/**
+	 * @param string $identifier
+	 * @return bool
+	 * @throws InvalidEntityException
+	 */
+	public function hasJob($identifier) {
+		return $this->crons->has($identifier);
+	}
+
+
+
+	/**
+	 * @param JobInterface $cron
+	 * @param string $identifier
+	 * @return bool
+	 * @throws InvalidEntityException
+	 */
+	public function addJob(JobInterface $cron, $identifier) {
+		if ($this->crons->has($identifier)) {
+			return false;
+		}
+		return $this->crons->add($cron, $identifier);
+	}
+
+
+
+	/**
+	 * @param array $crons
+	 * @throws InvalidEntityException
+	 */
+	public function addJobs($crons = array()) {
+		$crons = is_array($crons) ? $crons : array($crons);
+		foreach ($crons as $identifier => $cron) {
+			$this->addJob($cron, $identifier);
+		}
+	}
+
+
+
+	/**
+	 * @param string $identifier
+	 * @return Cron|null
+	 */
+	public function getJob($identifier)
+	{
+		if ($this->crons->has($identifier)) {
+			return $this->crons->get($identifier);
+		}
+		return null;
+	}
+
+
+
+	/**
+	 * @param JobInterface|Cron $cron
+	 * @return void
+	 */
+	public function scheduleJob(JobInterface $cron)
+	{
+		if ( ! $this->nextScheduledJob($cron)) {
+			if ($cron->getRecurrence() === '') {
+				wp_schedule_single_event(
+					$cron->getTimestamp(),
+					$cron->getActionHook(),
+					$cron->getData()
+				);
+			} else {
+				wp_schedule_event(
+					$cron->getTimestamp(),
+					$cron->getRecurrence(),
+					$cron->getActionHook(),
+					$cron->getData()
+				);
+			}
+		}
+	}
+
+
+
+	/**
+	 * @param JobInterface|Cron $cron
+	 * @return int
+	 */
+	public function nextScheduledJob(JobInterface $cron)
+	{
+		return wp_next_scheduled($cron->getActionHook(), $cron->getData());
+	}
+
+
+
+	/**
+	 * @param JobInterface|Cron $cron
+	 * @return void
+	 */
+	public function clearScheduledJob(JobInterface $cron)
+	{
+		wp_clear_scheduled_hook($cron->getActionHook(), $cron->getData());
+	}
+
+
+
+	/**
+	 * @param JobInterface|Cron $cron
+	 * @return void
+	 */
+	public function unscheduleJob(JobInterface $cron)
+	{
+		wp_unschedule_event($cron->getTimestamp(), $cron->getActionHook(), $cron->getData());
+	}
 
 
 

core/services/automated_actions/TriggerStrategyHourly.php

Indentation +8 added lines, -8 removed lines

@@ -16,17 +16,17 @@
 class TriggerStrategyHourly extends TriggerStrategyCron
 {
 
-    const RECURRENCE = 'hourly';
+	const RECURRENCE = 'hourly';
 
 
 
-    /**
-     * @return string
-     */
-    public function getRecurrence()
-    {
-        return TriggerStrategyHourly::RECURRENCE;
-    }
+	/**
+	 * @return string
+	 */
+	public function getRecurrence()
+	{
+		return TriggerStrategyHourly::RECURRENCE;
+	}
 
 
 

core/services/automated_actions/TriggerStrategyCron.php

Indentation +33 added lines, -33 removed lines

@@ -20,39 +20,39 @@
 abstract class TriggerStrategyCron extends TriggerStrategy
 {
 
-    /**
-     * @var JobSchedulerInterface $job_scheduler
-     */
-    protected $job_scheduler;
-
-
-
-    /**
-     * TriggerStrategyCron constructor
-     *
-     * @param RuleManager $rule_manager
-     * @param JobSchedulerInterface $job_scheduler
-     * @throws InvalidInterfaceException
-     */
-    public function __construct(RuleManager $rule_manager, JobSchedulerInterface $job_scheduler)
-    {
-        $this->job_scheduler = $job_scheduler;
-        parent::__construct($rule_manager);
-    }
-
-
-
-    /**
-     * This allows strategies to set up whatever hooks are necessary to trigger their logic.
-     * All overriding methods should call: $this->setAutomatedAction($automated_action)
-     *
-     * @param AutomatedActionInterface $automated_action
-     */
-    public function set(AutomatedActionInterface $automated_action)
-    {
-        \EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
-        $this->setAutomatedAction($automated_action);
-    }
+	/**
+	 * @var JobSchedulerInterface $job_scheduler
+	 */
+	protected $job_scheduler;
+
+
+
+	/**
+	 * TriggerStrategyCron constructor
+	 *
+	 * @param RuleManager $rule_manager
+	 * @param JobSchedulerInterface $job_scheduler
+	 * @throws InvalidInterfaceException
+	 */
+	public function __construct(RuleManager $rule_manager, JobSchedulerInterface $job_scheduler)
+	{
+		$this->job_scheduler = $job_scheduler;
+		parent::__construct($rule_manager);
+	}
+
+
+
+	/**
+	 * This allows strategies to set up whatever hooks are necessary to trigger their logic.
+	 * All overriding methods should call: $this->setAutomatedAction($automated_action)
+	 *
+	 * @param AutomatedActionInterface $automated_action
+	 */
+	public function set(AutomatedActionInterface $automated_action)
+	{
+		\EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
+		$this->setAutomatedAction($automated_action);
+	}
 
 
 

core/services/automated_actions/AutomatedActionManager.php

Indentation +139 added lines, -139 removed lines

@@ -26,145 +26,145 @@
 {
 
 
-    /**
-     * @var Collection $automated_actions
-     */
-    private $automated_actions;
-
-
-    /**
-     * @var AutomatedActionFactory $automated_action_factory
-     */
-    private $automated_action_factory;
-
-    /**
-     * @type CapabilitiesChecker $capabilities_checker
-     */
-    private $capabilities_checker;
-
-
-
-    /**
-     * AutomatedActionManager constructor
-     *
-     * @param AutomatedActionFactory $automated_action_factory
-     * @param CapabilitiesChecker    $capabilities_checker
-     * @throws InvalidInterfaceException
-     */
-    public function __construct(
-        AutomatedActionFactory $automated_action_factory,
-        CapabilitiesChecker $capabilities_checker
-    ) {
-        Benchmark::startTimer(__METHOD__);
-        $this->automated_actions = new Collection(
-            'EventEspresso\core\services\automated_actions\AutomatedActionInterface'
-        );
-        $this->automated_action_factory = $automated_action_factory;
-        $this->capabilities_checker = $capabilities_checker;
-        add_action('AHEE__EE_System__initialize', array($this, 'initialize'));
-        Benchmark::stopTimer(__METHOD__);
-    }
-
-
-
-    /**
-     * @throws \DomainException
-     * @throws InvalidEntityException
-     * @throws InsufficientPermissionsException
-     * @throws InvalidClassException
-     */
-    public function initialize()
-    {
-        $results = $this->getActiveActions();
-        $this->generateActionObjects($results);
-        $this->setTriggers();
-        add_action('shutdown', array($this, 'processActions'));
-    }
-
-
-
-    /**
-     * @return array
-     * @throws \DomainException
-     */
-    protected function getActiveActions()
-    {
-        Benchmark::startTimer(__METHOD__);
-        global $wpdb;
-        $results = $wpdb->get_results(
-            "SELECT * FROM {$wpdb->prefix}esp_automated_action WHERE AMA_is_active = 1;"
-        );
-        if ($results instanceof \WP_Error) {
-            throw new \DomainException(
-                $results->get_error_message()
-            );
-        }
-        $results = is_array($results) ? $results : array($results);
-        Benchmark::stopTimer(__METHOD__);
-        return $results;
-    }
-
-
-
-    /**
-     * @param array $results
-     * @throws InvalidEntityException
-     * @throws \DomainException
-     */
-    protected function generateActionObjects(array $results)
-    {
-        Benchmark::startTimer(__METHOD__);
-        foreach ($results as $result) {
-            $this->automated_actions->add(
-                $this->automated_action_factory->create($result),
-                $result->AMA_name
-            );
-        }
-        Benchmark::stopTimer(__METHOD__);
-    }
-
-
-
-    /**
-     * @throws InsufficientPermissionsException
-     * @throws InvalidClassException
-     */
-    public function setTriggers()
-    {
-        \EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
-        Benchmark::startTimer(__METHOD__);
-        foreach ($this->automated_actions as $automated_action) {
-            /** @var AutomatedActionInterface $automated_action */
-            if ($automated_action instanceof RequiresCapCheckInterface) {
-                $this->capabilities_checker->processCapCheck(
-                    $automated_action->getCapCheck()
-                );
-            }
-            $automated_action->setTrigger();
-        }
-        Benchmark::stopTimer(__METHOD__);
-    }
-
-
-
-    /**
-     *
-     */
-    public function processActions()
-    {
-        \EEH_Debug_Tools::printr('', 'SHUTDOWN HOOK', __FILE__, __LINE__, 2);
-        \EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
-        Benchmark::startTimer(__METHOD__);
-        foreach ($this->automated_actions as $automated_action) {
-            /** @var AutomatedActionInterface $automated_action */
-            if ( ! $automated_action->triggerPulled() || $automated_action->hasRun()) {
-                continue;
-            }
-            $automated_action->process();
-        }
-        Benchmark::stopTimer(__METHOD__);
-        Benchmark::displayResults();
-    }
+	/**
+	 * @var Collection $automated_actions
+	 */
+	private $automated_actions;
+
+
+	/**
+	 * @var AutomatedActionFactory $automated_action_factory
+	 */
+	private $automated_action_factory;
+
+	/**
+	 * @type CapabilitiesChecker $capabilities_checker
+	 */
+	private $capabilities_checker;
+
+
+
+	/**
+	 * AutomatedActionManager constructor
+	 *
+	 * @param AutomatedActionFactory $automated_action_factory
+	 * @param CapabilitiesChecker    $capabilities_checker
+	 * @throws InvalidInterfaceException
+	 */
+	public function __construct(
+		AutomatedActionFactory $automated_action_factory,
+		CapabilitiesChecker $capabilities_checker
+	) {
+		Benchmark::startTimer(__METHOD__);
+		$this->automated_actions = new Collection(
+			'EventEspresso\core\services\automated_actions\AutomatedActionInterface'
+		);
+		$this->automated_action_factory = $automated_action_factory;
+		$this->capabilities_checker = $capabilities_checker;
+		add_action('AHEE__EE_System__initialize', array($this, 'initialize'));
+		Benchmark::stopTimer(__METHOD__);
+	}
+
+
+
+	/**
+	 * @throws \DomainException
+	 * @throws InvalidEntityException
+	 * @throws InsufficientPermissionsException
+	 * @throws InvalidClassException
+	 */
+	public function initialize()
+	{
+		$results = $this->getActiveActions();
+		$this->generateActionObjects($results);
+		$this->setTriggers();
+		add_action('shutdown', array($this, 'processActions'));
+	}
+
+
+
+	/**
+	 * @return array
+	 * @throws \DomainException
+	 */
+	protected function getActiveActions()
+	{
+		Benchmark::startTimer(__METHOD__);
+		global $wpdb;
+		$results = $wpdb->get_results(
+			"SELECT * FROM {$wpdb->prefix}esp_automated_action WHERE AMA_is_active = 1;"
+		);
+		if ($results instanceof \WP_Error) {
+			throw new \DomainException(
+				$results->get_error_message()
+			);
+		}
+		$results = is_array($results) ? $results : array($results);
+		Benchmark::stopTimer(__METHOD__);
+		return $results;
+	}
+
+
+
+	/**
+	 * @param array $results
+	 * @throws InvalidEntityException
+	 * @throws \DomainException
+	 */
+	protected function generateActionObjects(array $results)
+	{
+		Benchmark::startTimer(__METHOD__);
+		foreach ($results as $result) {
+			$this->automated_actions->add(
+				$this->automated_action_factory->create($result),
+				$result->AMA_name
+			);
+		}
+		Benchmark::stopTimer(__METHOD__);
+	}
+
+
+
+	/**
+	 * @throws InsufficientPermissionsException
+	 * @throws InvalidClassException
+	 */
+	public function setTriggers()
+	{
+		\EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
+		Benchmark::startTimer(__METHOD__);
+		foreach ($this->automated_actions as $automated_action) {
+			/** @var AutomatedActionInterface $automated_action */
+			if ($automated_action instanceof RequiresCapCheckInterface) {
+				$this->capabilities_checker->processCapCheck(
+					$automated_action->getCapCheck()
+				);
+			}
+			$automated_action->setTrigger();
+		}
+		Benchmark::stopTimer(__METHOD__);
+	}
+
+
+
+	/**
+	 *
+	 */
+	public function processActions()
+	{
+		\EEH_Debug_Tools::printr('', 'SHUTDOWN HOOK', __FILE__, __LINE__, 2);
+		\EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
+		Benchmark::startTimer(__METHOD__);
+		foreach ($this->automated_actions as $automated_action) {
+			/** @var AutomatedActionInterface $automated_action */
+			if ( ! $automated_action->triggerPulled() || $automated_action->hasRun()) {
+				continue;
+			}
+			$automated_action->process();
+		}
+		Benchmark::stopTimer(__METHOD__);
+		Benchmark::displayResults();
+	}
 
 
 }

core/services/automated_actions/JobSchedulerInterface.php

Indentation +43 added lines, -43 removed lines

@@ -10,56 +10,56 @@
 interface JobSchedulerInterface
 {
 
-    /**
-     * @param string $identifier
-     * @return bool
-     * @throws InvalidEntityException
-     */
-    public function hasJob($identifier);
+	/**
+	 * @param string $identifier
+	 * @return bool
+	 * @throws InvalidEntityException
+	 */
+	public function hasJob($identifier);
 
-    /**
-     * @param JobInterface $job
-     * @param string $identifier
-     * @return bool
-     * @throws InvalidEntityException
-     */
-    public function addJob(JobInterface $job, $identifier);
+	/**
+	 * @param JobInterface $job
+	 * @param string $identifier
+	 * @return bool
+	 * @throws InvalidEntityException
+	 */
+	public function addJob(JobInterface $job, $identifier);
 
-    /**
-     * @param array $crons
-     * @throws InvalidEntityException
-     */
-    public function addJobs($crons = array());
+	/**
+	 * @param array $crons
+	 * @throws InvalidEntityException
+	 */
+	public function addJobs($crons = array());
 
-    /**
-     * @param string $identifier
-     * @return JobInterface|null
-     */
-    public function getJob($identifier);
+	/**
+	 * @param string $identifier
+	 * @return JobInterface|null
+	 */
+	public function getJob($identifier);
 
-    /**
-     * @param JobInterface $job
-     * @return void
-     */
-    public function scheduleJob(JobInterface $job);
+	/**
+	 * @param JobInterface $job
+	 * @return void
+	 */
+	public function scheduleJob(JobInterface $job);
 
-    /**
-     * @param JobInterface $job
-     * @return int
-     */
-    public function nextScheduledJob(JobInterface $job);
+	/**
+	 * @param JobInterface $job
+	 * @return int
+	 */
+	public function nextScheduledJob(JobInterface $job);
 
-    /**
-     * @param JobInterface $job
-     * @return void
-     */
-    public function clearScheduledJob(JobInterface $job);
+	/**
+	 * @param JobInterface $job
+	 * @return void
+	 */
+	public function clearScheduledJob(JobInterface $job);
 
-    /**
-     * @param JobInterface $job
-     * @return void
-     */
-    public function unscheduleJob(JobInterface $job);
+	/**
+	 * @param JobInterface $job
+	 * @return void
+	 */
+	public function unscheduleJob(JobInterface $job);
 
 }
 // End of file JobSchedulerInterface.php