eventespresso / event-espresso-core

core/espresso_definitions.php

Indentation +10 added lines, -10 removed lines

@@ -7,16 +7,16 @@ 
 define('EE_SUPPORT_EMAIL', 'support@eventespresso.com');
 // used to be DIRECTORY_SEPARATOR, but that caused issues on windows
 if (! defined('DS')) {
-    define('DS', '/');
+	define('DS', '/');
 }
 if (! defined('PS')) {
-    define('PS', PATH_SEPARATOR);
+	define('PS', PATH_SEPARATOR);
 }
 if (! defined('SP')) {
-    define('SP', ' ');
+	define('SP', ' ');
 }
 if (! defined('EENL')) {
-    define('EENL', "\n");
+	define('EENL', "\n");
 }
 // define the plugin directory and URL
 define('EE_PLUGIN_BASENAME', plugin_basename(EVENT_ESPRESSO_MAIN_FILE));
@@ -70,16 +70,16 @@ 
 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);
+	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'])
+	'EE_FRONT_AJAX',
+	isset($_REQUEST['ee_front_ajax']) || isset($_REQUEST['data']['ee_front_ajax'])
 );
 define(
-    'EE_ADMIN_AJAX',
-    isset($_REQUEST['ee_admin_ajax']) || isset($_REQUEST['data']['ee_admin_ajax'])
+	'EE_ADMIN_AJAX',
+	isset($_REQUEST['ee_admin_ajax']) || isset($_REQUEST['data']['ee_admin_ajax'])
 );
 // 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
@@ -89,5 +89,5 @@ 
 define('EE_DEBUG', false);
 // for older WP versions
 if (! defined('MONTH_IN_SECONDS')) {
-    define('MONTH_IN_SECONDS', DAY_IN_SECONDS * 30);
+	define('MONTH_IN_SECONDS', DAY_IN_SECONDS * 30);
 }

Spacing +44 added lines, -44 removed lines

@@ -6,71 +6,71 @@ 
 define('EE_MIN_PHP_VER_RECOMMENDED', '5.6.32');
 define('EE_SUPPORT_EMAIL', 'support@eventespresso.com');
 // used to be DIRECTORY_SEPARATOR, but that caused issues on windows
-if (! defined('DS')) {
+if ( ! defined('DS')) {
     define('DS', '/');
 }
-if (! defined('PS')) {
+if ( ! defined('PS')) {
     define('PS', PATH_SEPARATOR);
 }
-if (! defined('SP')) {
+if ( ! defined('SP')) {
     define('SP', ' ');
 }
-if (! defined('EENL')) {
+if ( ! defined('EENL')) {
     define('EENL', "\n");
 }
 // define the plugin directory and URL
 define('EE_PLUGIN_BASENAME', plugin_basename(EVENT_ESPRESSO_MAIN_FILE));
-define('EE_PLUGIN_DIR_PATH', dirname(EVENT_ESPRESSO_MAIN_FILE) . DS);
+define('EE_PLUGIN_DIR_PATH', dirname(EVENT_ESPRESSO_MAIN_FILE).DS);
 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(
@@ -88,6 +88,6 @@ 
 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')) {
+if ( ! defined('MONTH_IN_SECONDS')) {
     define('MONTH_IN_SECONDS', DAY_IN_SECONDS * 30);
 }

modules/single_page_checkout/inc/EE_SPCO_JSON_Response.php

Indentation +399 added lines, -399 removed lines

@@ -15,403 +15,403 @@
 class EE_SPCO_JSON_Response
 {
 
-    /**
-     * @var string
-     */
-    protected $_errors = '';
-
-    /**
-     * @var string
-     */
-    protected $_unexpected_errors = '';
-
-    /**
-     * @var string
-     */
-    protected $_attention = '';
-
-    /**
-     * @var string
-     */
-    protected $_success = '';
-
-    /**
-     * @var string
-     */
-    protected $_plz_select_method_of_payment = '';
-
-    /**
-     * @var string
-     */
-    protected $_redirect_url = '';
-
-    /**
-     * @var string
-     */
-    protected $_registration_time_limit = '';
-
-    /**
-     * @var string
-     */
-    protected $_redirect_form = '';
-
-    /**
-     * @var string
-     */
-    protected $_reg_step_html = '';
-
-    /**
-     * @var string
-     */
-    protected $_method_of_payment = '';
-
-    /**
-     * @var float
-     */
-    protected $_payment_amount;
-
-    /**
-     * @var array
-     */
-    protected $_return_data = array();
-
-
-    /**
-     * @var array
-     */
-    protected $_validation_rules = array();
-
-
-    /**
-     *    class constructor
-     */
-    public function __construct()
-    {
-    }
-
-
-    /**
-     *    __toString
-     *
-     *        allows you to simply echo or print an EE_SPCO_JSON_Response object to produce a  JSON encoded string
-     *        ie: $json_response = new EE_SPCO_JSON_Response();
-     *        echo $json_response;
-     *
-     * @access    public
-     * @return    string
-     */
-    public function __toString()
-    {
-        $JSON_response = array();
-        // grab notices
-        $notices = EE_Error::get_notices(false);
-        $this->set_attention(isset($notices['attention']) ? $notices['attention'] : '');
-        $this->set_errors(isset($notices['errors']) ? $notices['errors'] : '');
-        $this->set_success(isset($notices['success']) ? $notices['success'] : '');
-        // add notices to JSON response, but only if they exist
-        if ($this->attention()) {
-            $JSON_response['attention'] = $this->attention();
-        }
-        if ($this->errors()) {
-            $JSON_response['errors'] = $this->errors();
-        }
-        if ($this->unexpected_errors()) {
-            $JSON_response['unexpected_errors'] = $this->unexpected_errors();
-        }
-        if ($this->success()) {
-            $JSON_response['success'] = $this->success();
-        }
-        // but if NO notices are set... at least set the "success" as a key so that the JS knows everything worked
-        if (! isset($JSON_response['attention']) && ! isset($JSON_response['errors']) && ! isset($JSON_response['success'])) {
-            $JSON_response['success'] = null;
-        }
-        // set redirect_url, IF it exists
-        if ($this->redirect_url()) {
-            $JSON_response['redirect_url'] = $this->redirect_url();
-        }
-        // set registration_time_limit, IF it exists
-        if ($this->registration_time_limit()) {
-            $JSON_response['registration_time_limit'] = $this->registration_time_limit();
-        }
-        // set payment_amount, IF it exists
-        if ($this->payment_amount() !== null) {
-            $JSON_response['payment_amount'] = $this->payment_amount();
-        }
-        // grab generic return data
-        $return_data = $this->return_data();
-        // add billing form validation rules
-        if ($this->validation_rules()) {
-            $return_data['validation_rules'] = $this->validation_rules();
-        }
-        // set reg_step_html, IF it exists
-        if ($this->reg_step_html()) {
-            $return_data['reg_step_html'] = $this->reg_step_html();
-        }
-        // set method of payment, IF it exists
-        if ($this->method_of_payment()) {
-            $return_data['method_of_payment'] = $this->method_of_payment();
-        }
-        // set "plz_select_method_of_payment" message, IF it exists
-        if ($this->plz_select_method_of_payment()) {
-            $return_data['plz_select_method_of_payment'] = $this->plz_select_method_of_payment();
-        }
-        // set redirect_form, IF it exists
-        if ($this->redirect_form()) {
-            $return_data['redirect_form'] = $this->redirect_form();
-        }
-        // and finally, add return_data array to main JSON response array, IF it contains anything
-        // why did we add some of the above properties to the return data array?
-        // because it is easier and cleaner in the Javascript to deal with this way
-        if (! empty($return_data)) {
-            $JSON_response['return_data'] = $return_data;
-        }
-        // filter final array
-        $JSON_response = apply_filters('FHEE__EE_SPCO_JSON_Response___toString__JSON_response', $JSON_response);
-        // return encoded array
-        return (string) wp_json_encode($JSON_response);
-    }
-
-
-    /**
-     * @param string $attention
-     */
-    public function set_attention($attention)
-    {
-        $this->_attention = $attention;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function attention()
-    {
-        return $this->_attention;
-    }
-
-
-    /**
-     * @param string $errors
-     */
-    public function set_errors($errors)
-    {
-        $this->_errors = $errors;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function errors()
-    {
-        return $this->_errors;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function unexpected_errors()
-    {
-        return $this->_unexpected_errors;
-    }
-
-
-    /**
-     * @param string $unexpected_errors
-     */
-    public function set_unexpected_errors($unexpected_errors)
-    {
-        $this->_unexpected_errors = $unexpected_errors;
-    }
-
-
-    /**
-     * @param string $success
-     */
-    public function set_success($success)
-    {
-        $this->_success = $success;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function success()
-    {
-        return $this->_success;
-    }
-
-
-    /**
-     * @param string $method_of_payment
-     */
-    public function set_method_of_payment($method_of_payment)
-    {
-        $this->_method_of_payment = $method_of_payment;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function method_of_payment()
-    {
-        return $this->_method_of_payment;
-    }
-
-
-    /**
-     * @return float
-     */
-    public function payment_amount()
-    {
-        return $this->_payment_amount;
-    }
-
-
-    /**
-     * @param float $payment_amount
-     * @throws EE_Error
-     */
-    public function set_payment_amount($payment_amount)
-    {
-        $this->_payment_amount = (float) $payment_amount;
-    }
-
-
-    /**
-     * @param string $next_step_html
-     */
-    public function set_reg_step_html($next_step_html)
-    {
-        $this->_reg_step_html = $next_step_html;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function reg_step_html()
-    {
-        return $this->_reg_step_html;
-    }
-
-
-    /**
-     * @param string $redirect_form
-     */
-    public function set_redirect_form($redirect_form)
-    {
-        $this->_redirect_form = $redirect_form;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function redirect_form()
-    {
-        return ! empty($this->_redirect_form) ? $this->_redirect_form : false;
-    }
-
-
-    /**
-     * @param string $plz_select_method_of_payment
-     */
-    public function set_plz_select_method_of_payment($plz_select_method_of_payment)
-    {
-        $this->_plz_select_method_of_payment = $plz_select_method_of_payment;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function plz_select_method_of_payment()
-    {
-        return $this->_plz_select_method_of_payment;
-    }
-
-
-    /**
-     * @param string $redirect_url
-     */
-    public function set_redirect_url($redirect_url)
-    {
-        $this->_redirect_url = $redirect_url;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function redirect_url()
-    {
-        return $this->_redirect_url;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function registration_time_limit()
-    {
-        return $this->_registration_time_limit;
-    }
-
-
-    /**
-     * @param string $registration_time_limit
-     */
-    public function set_registration_time_limit($registration_time_limit)
-    {
-        $this->_registration_time_limit = $registration_time_limit;
-    }
-
-
-    /**
-     * @param array $return_data
-     */
-    public function set_return_data($return_data)
-    {
-        $this->_return_data = array_merge($this->_return_data, $return_data);
-    }
-
-
-    /**
-     * @return array
-     */
-    public function return_data()
-    {
-        return $this->_return_data;
-    }
-
-
-    /**
-     * @param array $validation_rules
-     */
-    public function add_validation_rules(array $validation_rules = array())
-    {
-        if (is_array($validation_rules) && ! empty($validation_rules)) {
-            $this->_validation_rules = array_merge($this->_validation_rules, $validation_rules);
-        }
-    }
-
-
-    /**
-     * @return array | bool
-     */
-    public function validation_rules()
-    {
-        return ! empty($this->_validation_rules) ? $this->_validation_rules : false;
-    }
-
-
-    public function echoAndExit()
-    {
-        echo $this;
-        exit();
-    }
+	/**
+	 * @var string
+	 */
+	protected $_errors = '';
+
+	/**
+	 * @var string
+	 */
+	protected $_unexpected_errors = '';
+
+	/**
+	 * @var string
+	 */
+	protected $_attention = '';
+
+	/**
+	 * @var string
+	 */
+	protected $_success = '';
+
+	/**
+	 * @var string
+	 */
+	protected $_plz_select_method_of_payment = '';
+
+	/**
+	 * @var string
+	 */
+	protected $_redirect_url = '';
+
+	/**
+	 * @var string
+	 */
+	protected $_registration_time_limit = '';
+
+	/**
+	 * @var string
+	 */
+	protected $_redirect_form = '';
+
+	/**
+	 * @var string
+	 */
+	protected $_reg_step_html = '';
+
+	/**
+	 * @var string
+	 */
+	protected $_method_of_payment = '';
+
+	/**
+	 * @var float
+	 */
+	protected $_payment_amount;
+
+	/**
+	 * @var array
+	 */
+	protected $_return_data = array();
+
+
+	/**
+	 * @var array
+	 */
+	protected $_validation_rules = array();
+
+
+	/**
+	 *    class constructor
+	 */
+	public function __construct()
+	{
+	}
+
+
+	/**
+	 *    __toString
+	 *
+	 *        allows you to simply echo or print an EE_SPCO_JSON_Response object to produce a  JSON encoded string
+	 *        ie: $json_response = new EE_SPCO_JSON_Response();
+	 *        echo $json_response;
+	 *
+	 * @access    public
+	 * @return    string
+	 */
+	public function __toString()
+	{
+		$JSON_response = array();
+		// grab notices
+		$notices = EE_Error::get_notices(false);
+		$this->set_attention(isset($notices['attention']) ? $notices['attention'] : '');
+		$this->set_errors(isset($notices['errors']) ? $notices['errors'] : '');
+		$this->set_success(isset($notices['success']) ? $notices['success'] : '');
+		// add notices to JSON response, but only if they exist
+		if ($this->attention()) {
+			$JSON_response['attention'] = $this->attention();
+		}
+		if ($this->errors()) {
+			$JSON_response['errors'] = $this->errors();
+		}
+		if ($this->unexpected_errors()) {
+			$JSON_response['unexpected_errors'] = $this->unexpected_errors();
+		}
+		if ($this->success()) {
+			$JSON_response['success'] = $this->success();
+		}
+		// but if NO notices are set... at least set the "success" as a key so that the JS knows everything worked
+		if (! isset($JSON_response['attention']) && ! isset($JSON_response['errors']) && ! isset($JSON_response['success'])) {
+			$JSON_response['success'] = null;
+		}
+		// set redirect_url, IF it exists
+		if ($this->redirect_url()) {
+			$JSON_response['redirect_url'] = $this->redirect_url();
+		}
+		// set registration_time_limit, IF it exists
+		if ($this->registration_time_limit()) {
+			$JSON_response['registration_time_limit'] = $this->registration_time_limit();
+		}
+		// set payment_amount, IF it exists
+		if ($this->payment_amount() !== null) {
+			$JSON_response['payment_amount'] = $this->payment_amount();
+		}
+		// grab generic return data
+		$return_data = $this->return_data();
+		// add billing form validation rules
+		if ($this->validation_rules()) {
+			$return_data['validation_rules'] = $this->validation_rules();
+		}
+		// set reg_step_html, IF it exists
+		if ($this->reg_step_html()) {
+			$return_data['reg_step_html'] = $this->reg_step_html();
+		}
+		// set method of payment, IF it exists
+		if ($this->method_of_payment()) {
+			$return_data['method_of_payment'] = $this->method_of_payment();
+		}
+		// set "plz_select_method_of_payment" message, IF it exists
+		if ($this->plz_select_method_of_payment()) {
+			$return_data['plz_select_method_of_payment'] = $this->plz_select_method_of_payment();
+		}
+		// set redirect_form, IF it exists
+		if ($this->redirect_form()) {
+			$return_data['redirect_form'] = $this->redirect_form();
+		}
+		// and finally, add return_data array to main JSON response array, IF it contains anything
+		// why did we add some of the above properties to the return data array?
+		// because it is easier and cleaner in the Javascript to deal with this way
+		if (! empty($return_data)) {
+			$JSON_response['return_data'] = $return_data;
+		}
+		// filter final array
+		$JSON_response = apply_filters('FHEE__EE_SPCO_JSON_Response___toString__JSON_response', $JSON_response);
+		// return encoded array
+		return (string) wp_json_encode($JSON_response);
+	}
+
+
+	/**
+	 * @param string $attention
+	 */
+	public function set_attention($attention)
+	{
+		$this->_attention = $attention;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function attention()
+	{
+		return $this->_attention;
+	}
+
+
+	/**
+	 * @param string $errors
+	 */
+	public function set_errors($errors)
+	{
+		$this->_errors = $errors;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function errors()
+	{
+		return $this->_errors;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function unexpected_errors()
+	{
+		return $this->_unexpected_errors;
+	}
+
+
+	/**
+	 * @param string $unexpected_errors
+	 */
+	public function set_unexpected_errors($unexpected_errors)
+	{
+		$this->_unexpected_errors = $unexpected_errors;
+	}
+
+
+	/**
+	 * @param string $success
+	 */
+	public function set_success($success)
+	{
+		$this->_success = $success;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function success()
+	{
+		return $this->_success;
+	}
+
+
+	/**
+	 * @param string $method_of_payment
+	 */
+	public function set_method_of_payment($method_of_payment)
+	{
+		$this->_method_of_payment = $method_of_payment;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function method_of_payment()
+	{
+		return $this->_method_of_payment;
+	}
+
+
+	/**
+	 * @return float
+	 */
+	public function payment_amount()
+	{
+		return $this->_payment_amount;
+	}
+
+
+	/**
+	 * @param float $payment_amount
+	 * @throws EE_Error
+	 */
+	public function set_payment_amount($payment_amount)
+	{
+		$this->_payment_amount = (float) $payment_amount;
+	}
+
+
+	/**
+	 * @param string $next_step_html
+	 */
+	public function set_reg_step_html($next_step_html)
+	{
+		$this->_reg_step_html = $next_step_html;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function reg_step_html()
+	{
+		return $this->_reg_step_html;
+	}
+
+
+	/**
+	 * @param string $redirect_form
+	 */
+	public function set_redirect_form($redirect_form)
+	{
+		$this->_redirect_form = $redirect_form;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function redirect_form()
+	{
+		return ! empty($this->_redirect_form) ? $this->_redirect_form : false;
+	}
+
+
+	/**
+	 * @param string $plz_select_method_of_payment
+	 */
+	public function set_plz_select_method_of_payment($plz_select_method_of_payment)
+	{
+		$this->_plz_select_method_of_payment = $plz_select_method_of_payment;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function plz_select_method_of_payment()
+	{
+		return $this->_plz_select_method_of_payment;
+	}
+
+
+	/**
+	 * @param string $redirect_url
+	 */
+	public function set_redirect_url($redirect_url)
+	{
+		$this->_redirect_url = $redirect_url;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function redirect_url()
+	{
+		return $this->_redirect_url;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function registration_time_limit()
+	{
+		return $this->_registration_time_limit;
+	}
+
+
+	/**
+	 * @param string $registration_time_limit
+	 */
+	public function set_registration_time_limit($registration_time_limit)
+	{
+		$this->_registration_time_limit = $registration_time_limit;
+	}
+
+
+	/**
+	 * @param array $return_data
+	 */
+	public function set_return_data($return_data)
+	{
+		$this->_return_data = array_merge($this->_return_data, $return_data);
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function return_data()
+	{
+		return $this->_return_data;
+	}
+
+
+	/**
+	 * @param array $validation_rules
+	 */
+	public function add_validation_rules(array $validation_rules = array())
+	{
+		if (is_array($validation_rules) && ! empty($validation_rules)) {
+			$this->_validation_rules = array_merge($this->_validation_rules, $validation_rules);
+		}
+	}
+
+
+	/**
+	 * @return array | bool
+	 */
+	public function validation_rules()
+	{
+		return ! empty($this->_validation_rules) ? $this->_validation_rules : false;
+	}
+
+
+	public function echoAndExit()
+	{
+		echo $this;
+		exit();
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -122,7 +122,7 @@ 
             $JSON_response['success'] = $this->success();
         }
         // but if NO notices are set... at least set the "success" as a key so that the JS knows everything worked
-        if (! isset($JSON_response['attention']) && ! isset($JSON_response['errors']) && ! isset($JSON_response['success'])) {
+        if ( ! isset($JSON_response['attention']) && ! isset($JSON_response['errors']) && ! isset($JSON_response['success'])) {
             $JSON_response['success'] = null;
         }
         // set redirect_url, IF it exists
@@ -162,7 +162,7 @@ 
         // and finally, add return_data array to main JSON response array, IF it contains anything
         // why did we add some of the above properties to the return data array?
         // because it is easier and cleaner in the Javascript to deal with this way
-        if (! empty($return_data)) {
+        if ( ! empty($return_data)) {
             $JSON_response['return_data'] = $return_data;
         }
         // filter final array

admin_pages/registration_form/help_tours/Registration_Form_Questions_Overview_Help_Tour.class.php

Indentation +124 added lines, -124 removed lines

@@ -15,64 +15,64 @@ 
 class Registration_Form_Questions_Overview_Help_Tour extends EE_Help_Tour
 {
 
-    protected function _set_tour_properties()
-    {
-        $this->_label = __('Questions Overview Tour', 'event_espresso');
-        $this->_slug = $this->_is_caf ? 'questions-overview-caf-joyride' : 'questions-overview-joyride';
-    }
+	protected function _set_tour_properties()
+	{
+		$this->_label = __('Questions Overview Tour', 'event_espresso');
+		$this->_slug = $this->_is_caf ? 'questions-overview-caf-joyride' : 'questions-overview-joyride';
+	}
 
-    protected function _set_tour_stops()
-    {
-        $this->_stops = array(
-            10  => array(
-                'content' => $this->_start(),
-            ),
-            30  => array(
-                'id'      => 'display_text',
-                'content' => $this->_display_text_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentX' => -5,
-                    'tipAdjustmentY' => -25,
-                ),
-            ),
-            40  => array(
-                'id'      => 'admin_label',
-                'content' => $this->_admin_label_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentX' => 20,
-                    'tipAdjustmentY' => -25,
-                ),
-            ),
-            50  => array(
-                'id'      => 'type',
-                'content' => $this->_type_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentX' => -5,
-                    'tipAdjustmentY' => -25,
-                ),
-            ),
-            60  => array(
-                'id'      => 'values',
-                'content' => $this->_values_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentX' => -5,
-                    'tipAdjustmentY' => -25,
-                ),
-            ),
-            70  => array(
-                'id'      => 'required',
-                'content' => $this->_required_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentY' => -20,
-                    'tipAdjustmentX' => -15,
-                ),
-            ),
-            /*80 => array(
+	protected function _set_tour_stops()
+	{
+		$this->_stops = array(
+			10  => array(
+				'content' => $this->_start(),
+			),
+			30  => array(
+				'id'      => 'display_text',
+				'content' => $this->_display_text_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentX' => -5,
+					'tipAdjustmentY' => -25,
+				),
+			),
+			40  => array(
+				'id'      => 'admin_label',
+				'content' => $this->_admin_label_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentX' => 20,
+					'tipAdjustmentY' => -25,
+				),
+			),
+			50  => array(
+				'id'      => 'type',
+				'content' => $this->_type_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentX' => -5,
+					'tipAdjustmentY' => -25,
+				),
+			),
+			60  => array(
+				'id'      => 'values',
+				'content' => $this->_values_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentX' => -5,
+					'tipAdjustmentY' => -25,
+				),
+			),
+			70  => array(
+				'id'      => 'required',
+				'content' => $this->_required_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentY' => -20,
+					'tipAdjustmentX' => -15,
+				),
+			),
+			/*80 => array(
                 'class' => 'bulkactions',
                 'content' => $this->_bulk_actions_stop(),
                 'options' => array(
@@ -81,84 +81,84 @@ 
                     'tipAdjustmentX' => -15
                     )
                 ),*/
-            90  => array(
-                'id'      => 'event-espresso_page_espresso_registration_form-search-input',
-                'content' => $this->_search_stop(),
-                'options' => array(
-                    'tipLocation'    => 'left',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => -15,
-                ),
-            ),
-            100 => array(
-                'id'      => 'add-new-question',
-                'content' => $this->_add_new_question_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            ),
-        );
-    }
+			90  => array(
+				'id'      => 'event-espresso_page_espresso_registration_form-search-input',
+				'content' => $this->_search_stop(),
+				'options' => array(
+					'tipLocation'    => 'left',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => -15,
+				),
+			),
+			100 => array(
+				'id'      => 'add-new-question',
+				'content' => $this->_add_new_question_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			),
+		);
+	}
 
 
-    protected function _start()
-    {
-        $content = '<h3>' . __('Questions Overview', 'event_espresso') . '</h3>';
-        $content .= '<p>' . __(
-            'This tour of the Questions Overview page will go over different areas of the screen to help you understand what they are used for.',
-            'event_espresso'
-        ) . '</p>';
+	protected function _start()
+	{
+		$content = '<h3>' . __('Questions Overview', 'event_espresso') . '</h3>';
+		$content .= '<p>' . __(
+			'This tour of the Questions Overview page will go over different areas of the screen to help you understand what they are used for.',
+			'event_espresso'
+		) . '</p>';
 
-        return $content;
-    }
+		return $content;
+	}
 
-    protected function _display_text_stop()
-    {
-        return '<p>' . __('View available questions.', 'event_espresso') . '</p>';
-    }
+	protected function _display_text_stop()
+	{
+		return '<p>' . __('View available questions.', 'event_espresso') . '</p>';
+	}
 
-    protected function _admin_label_stop()
-    {
-        return '<p>' . __('View the admin label for your questions.', 'event_espresso') . '</p>';
-    }
+	protected function _admin_label_stop()
+	{
+		return '<p>' . __('View the admin label for your questions.', 'event_espresso') . '</p>';
+	}
 
-    protected function _type_stop()
-    {
-        return '<p>' . __(
-            'View the type of question. Available options are Text, Textarea, Checkboxes, Radio Buttons, Dropdown, State/Province Dropdown, Country Dropdown, and Date Picker.',
-            'event_espresso'
-        ) . '</p>';
-    }
+	protected function _type_stop()
+	{
+		return '<p>' . __(
+			'View the type of question. Available options are Text, Textarea, Checkboxes, Radio Buttons, Dropdown, State/Province Dropdown, Country Dropdown, and Date Picker.',
+			'event_espresso'
+		) . '</p>';
+	}
 
-    protected function _values_stop()
-    {
-        return '<p>' . __(
-            'View stored values for checkboxes, radio buttons, and select boxes.',
-            'event_espresso'
-        ) . '</p>';
-    }
+	protected function _values_stop()
+	{
+		return '<p>' . __(
+			'View stored values for checkboxes, radio buttons, and select boxes.',
+			'event_espresso'
+		) . '</p>';
+	}
 
-    protected function _required_stop()
-    {
-        return '<p>' . __('View if a question is required.', 'event_espresso') . '</p>';
-    }
+	protected function _required_stop()
+	{
+		return '<p>' . __('View if a question is required.', 'event_espresso') . '</p>';
+	}
 
-    /* protected function _bulk_actions_stop() {
+	/* protected function _bulk_actions_stop() {
         return '<p>' . __('Perform bulk actions to multiple questions.', 'event_espresso') . '</p>';
     } */
 
-    protected function _search_stop()
-    {
-        return '<p>' . __(
-            'Search through questions. The following sources will be searched: Name of Question (display text).',
-            'event_espresso'
-        ) . '</p>';
-    }
+	protected function _search_stop()
+	{
+		return '<p>' . __(
+			'Search through questions. The following sources will be searched: Name of Question (display text).',
+			'event_espresso'
+		) . '</p>';
+	}
 
-    protected function _add_new_question_stop()
-    {
-        return '<p>' . __('Click here to add a new question.', 'event_espresso') . '</p>';
-    }
+	protected function _add_new_question_stop()
+	{
+		return '<p>' . __('Click here to add a new question.', 'event_espresso') . '</p>';
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -105,44 +105,44 @@ 
 
     protected function _start()
     {
-        $content = '<h3>' . __('Questions Overview', 'event_espresso') . '</h3>';
-        $content .= '<p>' . __(
+        $content = '<h3>'.__('Questions Overview', 'event_espresso').'</h3>';
+        $content .= '<p>'.__(
             'This tour of the Questions Overview page will go over different areas of the screen to help you understand what they are used for.',
             'event_espresso'
-        ) . '</p>';
+        ).'</p>';
 
         return $content;
     }
 
     protected function _display_text_stop()
     {
-        return '<p>' . __('View available questions.', 'event_espresso') . '</p>';
+        return '<p>'.__('View available questions.', 'event_espresso').'</p>';
     }
 
     protected function _admin_label_stop()
     {
-        return '<p>' . __('View the admin label for your questions.', 'event_espresso') . '</p>';
+        return '<p>'.__('View the admin label for your questions.', 'event_espresso').'</p>';
     }
 
     protected function _type_stop()
     {
-        return '<p>' . __(
+        return '<p>'.__(
             'View the type of question. Available options are Text, Textarea, Checkboxes, Radio Buttons, Dropdown, State/Province Dropdown, Country Dropdown, and Date Picker.',
             'event_espresso'
-        ) . '</p>';
+        ).'</p>';
     }
 
     protected function _values_stop()
     {
-        return '<p>' . __(
+        return '<p>'.__(
             'View stored values for checkboxes, radio buttons, and select boxes.',
             'event_espresso'
-        ) . '</p>';
+        ).'</p>';
     }
 
     protected function _required_stop()
     {
-        return '<p>' . __('View if a question is required.', 'event_espresso') . '</p>';
+        return '<p>'.__('View if a question is required.', 'event_espresso').'</p>';
     }
 
     /* protected function _bulk_actions_stop() {
@@ -151,14 +151,14 @@ 
 
     protected function _search_stop()
     {
-        return '<p>' . __(
+        return '<p>'.__(
             'Search through questions. The following sources will be searched: Name of Question (display text).',
             'event_espresso'
-        ) . '</p>';
+        ).'</p>';
     }
 
     protected function _add_new_question_stop()
     {
-        return '<p>' . __('Click here to add a new question.', 'event_espresso') . '</p>';
+        return '<p>'.__('Click here to add a new question.', 'event_espresso').'</p>';
     }
 }

admin_pages/messages/espresso_events_Messages_Hooks.class.php

Indentation +8 added lines, -8 removed lines

@@ -16,14 +16,14 @@
 {
 
 
-    public function __construct(EE_Admin_Page $admin_page)
-    {
-        parent::__construct($admin_page);
-    }
+	public function __construct(EE_Admin_Page $admin_page)
+	{
+		parent::__construct($admin_page);
+	}
 
 
-    protected function _set_hooks_properties()
-    {
-        $this->_name = 'messages';
-    }
+	protected function _set_hooks_properties()
+	{
+		$this->_name = 'messages';
+	}
 }

caffeinated/brewing_regular.php

Indentation +254 added lines, -254 removed lines

@@ -27,282 +27,282 @@
 class EE_Brewing_Regular extends EE_BASE implements InterminableInterface
 {
 
-    /**
-     * @var \EventEspresso\core\services\database\TableAnalysis $table_analysis
-     */
-    protected $_table_analysis;
+	/**
+	 * @var \EventEspresso\core\services\database\TableAnalysis $table_analysis
+	 */
+	protected $_table_analysis;
 
 
-    /**
-     * EE_Brewing_Regular constructor.
-     *
-     * @throws \DomainException
-     * @throws \EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws \InvalidArgumentException
-     */
-    public function __construct(TableAnalysis $table_analysis)
-    {
-        $this->_table_analysis = $table_analysis;
-        if (defined('EE_CAFF_PATH')) {
-            // activation
-            add_action('AHEE__EEH_Activation__initialize_db_content', array($this, 'initialize_caf_db_content'));
-            // load caff init
-            add_action('AHEE__EE_System__set_hooks_for_core', array($this, 'caffeinated_init'));
-            // remove the "powered by" credit link from receipts and invoices
-            add_filter('FHEE_EE_Html_messenger__add_powered_by_credit_link_to_receipt_and_invoice', '__return_false');
-            // add caffeinated modules
-            add_filter(
-                'FHEE__EE_Config__register_modules__modules_to_register',
-                array($this, 'caffeinated_modules_to_register')
-            );
-            // load caff scripts
-            add_action('wp_enqueue_scripts', array($this, 'enqueue_caffeinated_scripts'), 10);
-            add_filter('FHEE__EE_Registry__load_helper__helper_paths', array($this, 'caf_helper_paths'), 10);
-            // add_filter('FHEE__EE_Registry__load_helper__helper_paths', array($this, 'caf_helper_paths'), 10);
-            EE_Register_Payment_Method::register(
-                'caffeinated_payment_methods',
-                array(
-                    'payment_method_paths' => glob(EE_CAF_PAYMENT_METHODS . '*', GLOB_ONLYDIR),
-                )
-            );
-            // caffeinated constructed
-            do_action('AHEE__EE_Brewing_Regular__construct__complete');
-            // seeing how this is caf, which isn't put on WordPress.org, we can have affiliate links without a disclaimer
-            add_filter('FHEE__ee_show_affiliate_links', '__return_false');
-        }
-    }
+	/**
+	 * EE_Brewing_Regular constructor.
+	 *
+	 * @throws \DomainException
+	 * @throws \EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws \InvalidArgumentException
+	 */
+	public function __construct(TableAnalysis $table_analysis)
+	{
+		$this->_table_analysis = $table_analysis;
+		if (defined('EE_CAFF_PATH')) {
+			// activation
+			add_action('AHEE__EEH_Activation__initialize_db_content', array($this, 'initialize_caf_db_content'));
+			// load caff init
+			add_action('AHEE__EE_System__set_hooks_for_core', array($this, 'caffeinated_init'));
+			// remove the "powered by" credit link from receipts and invoices
+			add_filter('FHEE_EE_Html_messenger__add_powered_by_credit_link_to_receipt_and_invoice', '__return_false');
+			// add caffeinated modules
+			add_filter(
+				'FHEE__EE_Config__register_modules__modules_to_register',
+				array($this, 'caffeinated_modules_to_register')
+			);
+			// load caff scripts
+			add_action('wp_enqueue_scripts', array($this, 'enqueue_caffeinated_scripts'), 10);
+			add_filter('FHEE__EE_Registry__load_helper__helper_paths', array($this, 'caf_helper_paths'), 10);
+			// add_filter('FHEE__EE_Registry__load_helper__helper_paths', array($this, 'caf_helper_paths'), 10);
+			EE_Register_Payment_Method::register(
+				'caffeinated_payment_methods',
+				array(
+					'payment_method_paths' => glob(EE_CAF_PAYMENT_METHODS . '*', GLOB_ONLYDIR),
+				)
+			);
+			// caffeinated constructed
+			do_action('AHEE__EE_Brewing_Regular__construct__complete');
+			// seeing how this is caf, which isn't put on WordPress.org, we can have affiliate links without a disclaimer
+			add_filter('FHEE__ee_show_affiliate_links', '__return_false');
+		}
+	}
 
 
-    /**
-     * callback for the FHEE__EE_Registry__load_helper__helper_paths filter to add the caffeinated paths
-     *
-     * @param array $paths original helper paths array
-     * @return array             new array of paths
-     */
-    public function caf_helper_paths($paths)
-    {
-        $paths[] = EE_CAF_CORE . 'helpers' . DS;
-        return $paths;
-    }
+	/**
+	 * callback for the FHEE__EE_Registry__load_helper__helper_paths filter to add the caffeinated paths
+	 *
+	 * @param array $paths original helper paths array
+	 * @return array             new array of paths
+	 */
+	public function caf_helper_paths($paths)
+	{
+		$paths[] = EE_CAF_CORE . 'helpers' . DS;
+		return $paths;
+	}
 
 
-    /**
-     * Upon brand-new activation, if this is a new activation of CAF, we want to add
-     * some global prices that will show off EE4's capabilities. However, if they're upgrading
-     * from 3.1, or simply EE4.x decaf, we assume they don't want us to suddenly introduce these extra prices.
-     * This action should only be called when EE 4.x.0.P is initially activated.
-     * Right now the only CAF content are these global prices. If there's more in the future, then
-     * we should probably create a caf file to contain it all instead just a function like this.
-     * Right now, we ASSUME the only price types in the system are default ones
-     *
-     * @global wpdb $wpdb
-     */
-    public function initialize_caf_db_content()
-    {
-        global $wpdb;
-        // use same method of getting creator id as the version introducing the change
-        $default_creator_id = apply_filters('FHEE__EE_DMS_Core_4_5_0__get_default_creator_id', get_current_user_id());
-        $price_type_table = $wpdb->prefix . "esp_price_type";
-        $price_table = $wpdb->prefix . "esp_price";
-        if ($this->_get_table_analysis()->tableExists($price_type_table)) {
-            $SQL = 'SELECT COUNT(PRT_ID) FROM ' . $price_type_table . ' WHERE PBT_ID=4';// include trashed price types
-            $tax_price_type_count = $wpdb->get_var($SQL);
-            if ($tax_price_type_count <= 1) {
-                $wpdb->insert(
-                    $price_type_table,
-                    array(
-                        'PRT_name'       => __("Regional Tax", "event_espresso"),
-                        'PBT_ID'         => 4,
-                        'PRT_is_percent' => true,
-                        'PRT_order'      => 60,
-                        'PRT_deleted'    => false,
-                        'PRT_wp_user'    => $default_creator_id,
-                    ),
-                    array(
-                        '%s',// PRT_name
-                        '%d',// PBT_id
-                        '%d',// PRT_is_percent
-                        '%d',// PRT_order
-                        '%d',// PRT_deleted
-                        '%d', // PRT_wp_user
-                    )
-                );
-                // federal tax
-                $result = $wpdb->insert(
-                    $price_type_table,
-                    array(
-                        'PRT_name'       => __("Federal Tax", "event_espresso"),
-                        'PBT_ID'         => 4,
-                        'PRT_is_percent' => true,
-                        'PRT_order'      => 70,
-                        'PRT_deleted'    => false,
-                        'PRT_wp_user'    => $default_creator_id,
-                    ),
-                    array(
-                        '%s',// PRT_name
-                        '%d',// PBT_id
-                        '%d',// PRT_is_percent
-                        '%d',// PRT_order
-                        '%d',// PRT_deleted
-                        '%d' // PRT_wp_user
-                    )
-                );
-                if ($result) {
-                    $wpdb->insert(
-                        $price_table,
-                        array(
-                            'PRT_ID'         => $wpdb->insert_id,
-                            'PRC_amount'     => 15.00,
-                            'PRC_name'       => __("Sales Tax", "event_espresso"),
-                            'PRC_desc'       => '',
-                            'PRC_is_default' => true,
-                            'PRC_overrides'  => null,
-                            'PRC_deleted'    => false,
-                            'PRC_order'      => 50,
-                            'PRC_parent'     => null,
-                            'PRC_wp_user'    => $default_creator_id,
-                        ),
-                        array(
-                            '%d',// PRT_id
-                            '%f',// PRC_amount
-                            '%s',// PRC_name
-                            '%s',// PRC_desc
-                            '%d',// PRC_is_default
-                            '%d',// PRC_overrides
-                            '%d',// PRC_deleted
-                            '%d',// PRC_order
-                            '%d',// PRC_parent
-                            '%d' // PRC_wp_user
-                        )
-                    );
-                }
-            }
-        }
-    }
+	/**
+	 * Upon brand-new activation, if this is a new activation of CAF, we want to add
+	 * some global prices that will show off EE4's capabilities. However, if they're upgrading
+	 * from 3.1, or simply EE4.x decaf, we assume they don't want us to suddenly introduce these extra prices.
+	 * This action should only be called when EE 4.x.0.P is initially activated.
+	 * Right now the only CAF content are these global prices. If there's more in the future, then
+	 * we should probably create a caf file to contain it all instead just a function like this.
+	 * Right now, we ASSUME the only price types in the system are default ones
+	 *
+	 * @global wpdb $wpdb
+	 */
+	public function initialize_caf_db_content()
+	{
+		global $wpdb;
+		// use same method of getting creator id as the version introducing the change
+		$default_creator_id = apply_filters('FHEE__EE_DMS_Core_4_5_0__get_default_creator_id', get_current_user_id());
+		$price_type_table = $wpdb->prefix . "esp_price_type";
+		$price_table = $wpdb->prefix . "esp_price";
+		if ($this->_get_table_analysis()->tableExists($price_type_table)) {
+			$SQL = 'SELECT COUNT(PRT_ID) FROM ' . $price_type_table . ' WHERE PBT_ID=4';// include trashed price types
+			$tax_price_type_count = $wpdb->get_var($SQL);
+			if ($tax_price_type_count <= 1) {
+				$wpdb->insert(
+					$price_type_table,
+					array(
+						'PRT_name'       => __("Regional Tax", "event_espresso"),
+						'PBT_ID'         => 4,
+						'PRT_is_percent' => true,
+						'PRT_order'      => 60,
+						'PRT_deleted'    => false,
+						'PRT_wp_user'    => $default_creator_id,
+					),
+					array(
+						'%s',// PRT_name
+						'%d',// PBT_id
+						'%d',// PRT_is_percent
+						'%d',// PRT_order
+						'%d',// PRT_deleted
+						'%d', // PRT_wp_user
+					)
+				);
+				// federal tax
+				$result = $wpdb->insert(
+					$price_type_table,
+					array(
+						'PRT_name'       => __("Federal Tax", "event_espresso"),
+						'PBT_ID'         => 4,
+						'PRT_is_percent' => true,
+						'PRT_order'      => 70,
+						'PRT_deleted'    => false,
+						'PRT_wp_user'    => $default_creator_id,
+					),
+					array(
+						'%s',// PRT_name
+						'%d',// PBT_id
+						'%d',// PRT_is_percent
+						'%d',// PRT_order
+						'%d',// PRT_deleted
+						'%d' // PRT_wp_user
+					)
+				);
+				if ($result) {
+					$wpdb->insert(
+						$price_table,
+						array(
+							'PRT_ID'         => $wpdb->insert_id,
+							'PRC_amount'     => 15.00,
+							'PRC_name'       => __("Sales Tax", "event_espresso"),
+							'PRC_desc'       => '',
+							'PRC_is_default' => true,
+							'PRC_overrides'  => null,
+							'PRC_deleted'    => false,
+							'PRC_order'      => 50,
+							'PRC_parent'     => null,
+							'PRC_wp_user'    => $default_creator_id,
+						),
+						array(
+							'%d',// PRT_id
+							'%f',// PRC_amount
+							'%s',// PRC_name
+							'%s',// PRC_desc
+							'%d',// PRC_is_default
+							'%d',// PRC_overrides
+							'%d',// PRC_deleted
+							'%d',// PRC_order
+							'%d',// PRC_parent
+							'%d' // PRC_wp_user
+						)
+					);
+				}
+			}
+		}
+	}
 
 
-    /**
-     *    caffeinated_modules_to_register
-     *
-     * @access public
-     * @param array $modules_to_register
-     * @return array
-     */
-    public function caffeinated_modules_to_register($modules_to_register = array())
-    {
-        if (is_readable(EE_CAFF_PATH . 'modules')) {
-            $caffeinated_modules_to_register = glob(EE_CAFF_PATH . 'modules' . DS . '*', GLOB_ONLYDIR);
-            if (is_array($caffeinated_modules_to_register) && ! empty($caffeinated_modules_to_register)) {
-                $modules_to_register = array_merge($modules_to_register, $caffeinated_modules_to_register);
-            }
-        }
-        return $modules_to_register;
-    }
+	/**
+	 *    caffeinated_modules_to_register
+	 *
+	 * @access public
+	 * @param array $modules_to_register
+	 * @return array
+	 */
+	public function caffeinated_modules_to_register($modules_to_register = array())
+	{
+		if (is_readable(EE_CAFF_PATH . 'modules')) {
+			$caffeinated_modules_to_register = glob(EE_CAFF_PATH . 'modules' . DS . '*', GLOB_ONLYDIR);
+			if (is_array($caffeinated_modules_to_register) && ! empty($caffeinated_modules_to_register)) {
+				$modules_to_register = array_merge($modules_to_register, $caffeinated_modules_to_register);
+			}
+		}
+		return $modules_to_register;
+	}
 
 
-    /**
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function caffeinated_init()
-    {
-        // Custom Post Type hooks
-        add_filter(
-            'FHEE__EventEspresso_core_domain_entities_custom_post_types_TaxonomyDefinitions__getTaxonomies',
-            array($this, 'filter_taxonomies')
-        );
-        add_filter(
-            'FHEE__EventEspresso_core_domain_entities_custom_post_types_CustomPostTypeDefinitions__getCustomPostTypes',
-            array($this, 'filter_cpts')
-        );
-        add_filter(
-            'FHEE__EE_Admin__get_extra_nav_menu_pages_items',
-            array($this, 'nav_metabox_items')
-        );
-        EE_Registry::instance()->load_file(
-            EE_CAFF_PATH,
-            'EE_Caf_Messages',
-            'class',
-            array(),
-            false
-        );
-        // caffeinated_init__complete hook
-        do_action('AHEE__EE_Brewing_Regular__caffeinated_init__complete');
-    }
+	/**
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function caffeinated_init()
+	{
+		// Custom Post Type hooks
+		add_filter(
+			'FHEE__EventEspresso_core_domain_entities_custom_post_types_TaxonomyDefinitions__getTaxonomies',
+			array($this, 'filter_taxonomies')
+		);
+		add_filter(
+			'FHEE__EventEspresso_core_domain_entities_custom_post_types_CustomPostTypeDefinitions__getCustomPostTypes',
+			array($this, 'filter_cpts')
+		);
+		add_filter(
+			'FHEE__EE_Admin__get_extra_nav_menu_pages_items',
+			array($this, 'nav_metabox_items')
+		);
+		EE_Registry::instance()->load_file(
+			EE_CAFF_PATH,
+			'EE_Caf_Messages',
+			'class',
+			array(),
+			false
+		);
+		// caffeinated_init__complete hook
+		do_action('AHEE__EE_Brewing_Regular__caffeinated_init__complete');
+	}
 
 
-    public function enqueue_caffeinated_scripts()
-    {
-        // sound of crickets...
-    }
+	public function enqueue_caffeinated_scripts()
+	{
+		// sound of crickets...
+	}
 
 
-    /**
-     * callbacks below here
-     *
-     * @param array $taxonomy_array
-     * @return array
-     */
-    public function filter_taxonomies(array $taxonomy_array)
-    {
-        $taxonomy_array['espresso_venue_categories']['args']['show_in_nav_menus'] = true;
-        return $taxonomy_array;
-    }
+	/**
+	 * callbacks below here
+	 *
+	 * @param array $taxonomy_array
+	 * @return array
+	 */
+	public function filter_taxonomies(array $taxonomy_array)
+	{
+		$taxonomy_array['espresso_venue_categories']['args']['show_in_nav_menus'] = true;
+		return $taxonomy_array;
+	}
 
 
-    /**
-     * @param array $cpt_array
-     * @return mixed
-     */
-    public function filter_cpts(array $cpt_array)
-    {
-        $cpt_array['espresso_venues']['args']['show_in_nav_menus'] = true;
-        return $cpt_array;
-    }
+	/**
+	 * @param array $cpt_array
+	 * @return mixed
+	 */
+	public function filter_cpts(array $cpt_array)
+	{
+		$cpt_array['espresso_venues']['args']['show_in_nav_menus'] = true;
+		return $cpt_array;
+	}
 
 
-    /**
-     * @param array $menuitems
-     * @return array
-     */
-    public function nav_metabox_items(array $menuitems)
-    {
-        $menuitems[] = array(
-            'title'       => __('Venue List', 'event_espresso'),
-            'url'         => get_post_type_archive_link('espresso_venues'),
-            'description' => __('Archive page for all venues.', 'event_espresso'),
-        );
-        return $menuitems;
-    }
+	/**
+	 * @param array $menuitems
+	 * @return array
+	 */
+	public function nav_metabox_items(array $menuitems)
+	{
+		$menuitems[] = array(
+			'title'       => __('Venue List', 'event_espresso'),
+			'url'         => get_post_type_archive_link('espresso_venues'),
+			'description' => __('Archive page for all venues.', 'event_espresso'),
+		);
+		return $menuitems;
+	}
 
 
-    /**
-     * Gets the injected table analyzer, or throws an exception
-     *
-     * @return TableAnalysis
-     * @throws \EE_Error
-     */
-    protected function _get_table_analysis()
-    {
-        if ($this->_table_analysis instanceof TableAnalysis) {
-            return $this->_table_analysis;
-        } else {
-            throw new \EE_Error(
-                sprintf(
-                    __('Table analysis class on class %1$s is not set properly.', 'event_espresso'),
-                    get_class($this)
-                )
-            );
-        }
-    }
+	/**
+	 * Gets the injected table analyzer, or throws an exception
+	 *
+	 * @return TableAnalysis
+	 * @throws \EE_Error
+	 */
+	protected function _get_table_analysis()
+	{
+		if ($this->_table_analysis instanceof TableAnalysis) {
+			return $this->_table_analysis;
+		} else {
+			throw new \EE_Error(
+				sprintf(
+					__('Table analysis class on class %1$s is not set properly.', 'event_espresso'),
+					get_class($this)
+				)
+			);
+		}
+	}
 }
 
 
 $brewing = new EE_Brewing_Regular(
-    EE_Registry::instance()->create('TableAnalysis', array(), true)
+	EE_Registry::instance()->create('TableAnalysis', array(), true)
 );

Spacing +30 added lines, -30 removed lines

@@ -11,10 +11,10 @@ 
  * define and use the hook in a specific caffeinated/whatever class or file.
  */
 // defined some new constants related to caffeinated folder
-define('EE_CAF_URL', EE_PLUGIN_DIR_URL . 'caffeinated/');
-define('EE_CAF_CORE', EE_CAFF_PATH . 'core' . DS);
-define('EE_CAF_LIBRARIES', EE_CAF_CORE . 'libraries' . DS);
-define('EE_CAF_PAYMENT_METHODS', EE_CAFF_PATH . 'payment_methods' . DS);
+define('EE_CAF_URL', EE_PLUGIN_DIR_URL.'caffeinated/');
+define('EE_CAF_CORE', EE_CAFF_PATH.'core'.DS);
+define('EE_CAF_LIBRARIES', EE_CAF_CORE.'libraries'.DS);
+define('EE_CAF_PAYMENT_METHODS', EE_CAFF_PATH.'payment_methods'.DS);
 
 
 /**
@@ -64,7 +64,7 @@ 
             EE_Register_Payment_Method::register(
                 'caffeinated_payment_methods',
                 array(
-                    'payment_method_paths' => glob(EE_CAF_PAYMENT_METHODS . '*', GLOB_ONLYDIR),
+                    'payment_method_paths' => glob(EE_CAF_PAYMENT_METHODS.'*', GLOB_ONLYDIR),
                 )
             );
             // caffeinated constructed
@@ -83,7 +83,7 @@ 
      */
     public function caf_helper_paths($paths)
     {
-        $paths[] = EE_CAF_CORE . 'helpers' . DS;
+        $paths[] = EE_CAF_CORE.'helpers'.DS;
         return $paths;
     }
 
@@ -104,10 +104,10 @@ 
         global $wpdb;
         // use same method of getting creator id as the version introducing the change
         $default_creator_id = apply_filters('FHEE__EE_DMS_Core_4_5_0__get_default_creator_id', get_current_user_id());
-        $price_type_table = $wpdb->prefix . "esp_price_type";
-        $price_table = $wpdb->prefix . "esp_price";
+        $price_type_table = $wpdb->prefix."esp_price_type";
+        $price_table = $wpdb->prefix."esp_price";
         if ($this->_get_table_analysis()->tableExists($price_type_table)) {
-            $SQL = 'SELECT COUNT(PRT_ID) FROM ' . $price_type_table . ' WHERE PBT_ID=4';// include trashed price types
+            $SQL = 'SELECT COUNT(PRT_ID) FROM '.$price_type_table.' WHERE PBT_ID=4'; // include trashed price types
             $tax_price_type_count = $wpdb->get_var($SQL);
             if ($tax_price_type_count <= 1) {
                 $wpdb->insert(
@@ -121,11 +121,11 @@ 
                         'PRT_wp_user'    => $default_creator_id,
                     ),
                     array(
-                        '%s',// PRT_name
-                        '%d',// PBT_id
-                        '%d',// PRT_is_percent
-                        '%d',// PRT_order
-                        '%d',// PRT_deleted
+                        '%s', // PRT_name
+                        '%d', // PBT_id
+                        '%d', // PRT_is_percent
+                        '%d', // PRT_order
+                        '%d', // PRT_deleted
                         '%d', // PRT_wp_user
                     )
                 );
@@ -141,11 +141,11 @@ 
                         'PRT_wp_user'    => $default_creator_id,
                     ),
                     array(
-                        '%s',// PRT_name
-                        '%d',// PBT_id
-                        '%d',// PRT_is_percent
-                        '%d',// PRT_order
-                        '%d',// PRT_deleted
+                        '%s', // PRT_name
+                        '%d', // PBT_id
+                        '%d', // PRT_is_percent
+                        '%d', // PRT_order
+                        '%d', // PRT_deleted
                         '%d' // PRT_wp_user
                     )
                 );
@@ -165,15 +165,15 @@ 
                             'PRC_wp_user'    => $default_creator_id,
                         ),
                         array(
-                            '%d',// PRT_id
-                            '%f',// PRC_amount
-                            '%s',// PRC_name
-                            '%s',// PRC_desc
-                            '%d',// PRC_is_default
-                            '%d',// PRC_overrides
-                            '%d',// PRC_deleted
-                            '%d',// PRC_order
-                            '%d',// PRC_parent
+                            '%d', // PRT_id
+                            '%f', // PRC_amount
+                            '%s', // PRC_name
+                            '%s', // PRC_desc
+                            '%d', // PRC_is_default
+                            '%d', // PRC_overrides
+                            '%d', // PRC_deleted
+                            '%d', // PRC_order
+                            '%d', // PRC_parent
                             '%d' // PRC_wp_user
                         )
                     );
@@ -192,8 +192,8 @@ 
      */
     public function caffeinated_modules_to_register($modules_to_register = array())
     {
-        if (is_readable(EE_CAFF_PATH . 'modules')) {
-            $caffeinated_modules_to_register = glob(EE_CAFF_PATH . 'modules' . DS . '*', GLOB_ONLYDIR);
+        if (is_readable(EE_CAFF_PATH.'modules')) {
+            $caffeinated_modules_to_register = glob(EE_CAFF_PATH.'modules'.DS.'*', GLOB_ONLYDIR);
             if (is_array($caffeinated_modules_to_register) && ! empty($caffeinated_modules_to_register)) {
                 $modules_to_register = array_merge($modules_to_register, $caffeinated_modules_to_register);
             }

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

Indentation +189 added lines, -189 removed lines

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

Spacing +7 added lines, -7 removed lines

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

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

Indentation +97 added lines, -97 removed lines

@@ -16,113 +16,113 @@
 class Extend_Registration_Form_Questions_Admin_List_Table extends Registration_Form_Questions_Admin_List_Table
 {
 
-    public function __construct($admin_page)
-    {
-        parent::__construct($admin_page);
-    }
+	public function __construct($admin_page)
+	{
+		parent::__construct($admin_page);
+	}
 
-    public function column_display_text(EE_Question $item)
-    {
-        $system_question = $item->is_system_question();
-        $actions = array();
+	public function column_display_text(EE_Question $item)
+	{
+		$system_question = $item->is_system_question();
+		$actions = array();
 
-        if (! defined('REG_ADMIN_URL')) {
-            define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
-        }
+		if (! defined('REG_ADMIN_URL')) {
+			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
+		}
 
-        $edit_query_args = array(
-            'action' => 'edit_question',
-            'QST_ID' => $item->ID(),
-        );
+		$edit_query_args = array(
+			'action' => 'edit_question',
+			'QST_ID' => $item->ID(),
+		);
 
-        $trash_query_args = array(
-            'action' => 'trash_question',
-            'QST_ID' => $item->ID(),
-        );
+		$trash_query_args = array(
+			'action' => 'trash_question',
+			'QST_ID' => $item->ID(),
+		);
 
-        $restore_query_args = array(
-            'action' => 'restore_question',
-            'QST_ID' => $item->ID(),
-        );
+		$restore_query_args = array(
+			'action' => 'restore_question',
+			'QST_ID' => $item->ID(),
+		);
 
-        $delete_query_args = array(
-            'action' => 'delete_questions',
-            'QST_ID' => $item->ID(),
-        );
+		$delete_query_args = array(
+			'action' => 'delete_questions',
+			'QST_ID' => $item->ID(),
+		);
 
-        $duplicate_query_args = array(
-            'action' => 'duplicate_question',
-            'QST_ID' => $item->ID(),
-        );
+		$duplicate_query_args = array(
+			'action' => 'duplicate_question',
+			'QST_ID' => $item->ID(),
+		);
 
-        $edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_FORMS_ADMIN_URL);
-        $trash_link = EE_Admin_Page::add_query_args_and_nonce($trash_query_args, EE_FORMS_ADMIN_URL);
-        $restore_link = EE_Admin_Page::add_query_args_and_nonce($restore_query_args, EE_FORMS_ADMIN_URL);
-        $delete_link = EE_Admin_Page::add_query_args_and_nonce($delete_query_args, EE_FORMS_ADMIN_URL);
-        $duplicate_link = EE_Admin_Page::add_query_args_and_nonce($duplicate_query_args, EE_FORMS_ADMIN_URL);
+		$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_FORMS_ADMIN_URL);
+		$trash_link = EE_Admin_Page::add_query_args_and_nonce($trash_query_args, EE_FORMS_ADMIN_URL);
+		$restore_link = EE_Admin_Page::add_query_args_and_nonce($restore_query_args, EE_FORMS_ADMIN_URL);
+		$delete_link = EE_Admin_Page::add_query_args_and_nonce($delete_query_args, EE_FORMS_ADMIN_URL);
+		$duplicate_link = EE_Admin_Page::add_query_args_and_nonce($duplicate_query_args, EE_FORMS_ADMIN_URL);
 
-        if (EE_Registry::instance()->CAP->current_user_can(
-            'ee_edit_question',
-            'espresso_registration_form_edit_question',
-            $item->ID()
-        )) {
-            $actions = array(
-                'edit' => '<a href="' . $edit_link . '" title="'
-                          . __('Edit Question', 'event_espresso') . '">'
-                          . __('Edit', 'event_espresso') . '</a>',
-            );
-        }
+		if (EE_Registry::instance()->CAP->current_user_can(
+			'ee_edit_question',
+			'espresso_registration_form_edit_question',
+			$item->ID()
+		)) {
+			$actions = array(
+				'edit' => '<a href="' . $edit_link . '" title="'
+						  . __('Edit Question', 'event_espresso') . '">'
+						  . __('Edit', 'event_espresso') . '</a>',
+			);
+		}
 
-        if (! $system_question
-            && $this->_view != 'trash'
-            && EE_Registry::instance()->CAP->current_user_can(
-                'ee_delete_question',
-                'espresso_registration_form_trash_question',
-                $item->ID()
-            )) {
-                $actions['delete'] = '<a href="' . $trash_link . '" title="'
-                                     . __('Trash Question', 'event_espresso') . '">'
-                                     . __('Trash', 'event_espresso') . '</a>';
-        }
+		if (! $system_question
+			&& $this->_view != 'trash'
+			&& EE_Registry::instance()->CAP->current_user_can(
+				'ee_delete_question',
+				'espresso_registration_form_trash_question',
+				$item->ID()
+			)) {
+				$actions['delete'] = '<a href="' . $trash_link . '" title="'
+									 . __('Trash Question', 'event_espresso') . '">'
+									 . __('Trash', 'event_espresso') . '</a>';
+		}
 
-        if ($this->_view == 'trash') {
-            if (EE_Registry::instance()->CAP->current_user_can(
-                'ee_delete_question',
-                'espresso_registration_form_restore_question',
-                $item->ID()
-            )) {
-                $actions['restore'] = '<a href="' . $restore_link . '" title="'
-                                      . __('Restore Question', 'event_espresso') . '">'
-                                      . __('Restore', 'event_espresso') . '</a>';
-            }
-            if ($item->count_related('Answer') === 0
-                && EE_Registry::instance()->CAP->current_user_can(
-                    'ee_delete_question',
-                    'espresso_registration_form_delete_questions',
-                    $item->ID()
-                )) {
-                    $actions['delete'] = '<a href="' . $delete_link . '" title="'
-                                         . __('Delete Question Permanently', 'event_espresso') . '">'
-                                         . __('Delete Permanently', 'event_espresso') . '</a>';
-            }
-        }
-        if (EE_Registry::instance()->CAP->current_user_can(
-            'ee_edit_questions',
-            'espresso_registration_form_edit_question'
-        )) {
-            $actions['duplicate'] = '<a href="' . $duplicate_link . '" title="'
-                                    . __('Duplicate Question', 'event_espresso') . '">'
-                                    . __('Duplicate', 'event_espresso') . '</a>';
-        }
+		if ($this->_view == 'trash') {
+			if (EE_Registry::instance()->CAP->current_user_can(
+				'ee_delete_question',
+				'espresso_registration_form_restore_question',
+				$item->ID()
+			)) {
+				$actions['restore'] = '<a href="' . $restore_link . '" title="'
+									  . __('Restore Question', 'event_espresso') . '">'
+									  . __('Restore', 'event_espresso') . '</a>';
+			}
+			if ($item->count_related('Answer') === 0
+				&& EE_Registry::instance()->CAP->current_user_can(
+					'ee_delete_question',
+					'espresso_registration_form_delete_questions',
+					$item->ID()
+				)) {
+					$actions['delete'] = '<a href="' . $delete_link . '" title="'
+										 . __('Delete Question Permanently', 'event_espresso') . '">'
+										 . __('Delete Permanently', 'event_espresso') . '</a>';
+			}
+		}
+		if (EE_Registry::instance()->CAP->current_user_can(
+			'ee_edit_questions',
+			'espresso_registration_form_edit_question'
+		)) {
+			$actions['duplicate'] = '<a href="' . $duplicate_link . '" title="'
+									. __('Duplicate Question', 'event_espresso') . '">'
+									. __('Duplicate', 'event_espresso') . '</a>';
+		}
 
-        $content = EE_Registry::instance()->CAP->current_user_can(
-            'ee_edit_question',
-            'espresso_registration_form_edit_question',
-            $item->ID()
-        )
-            ? '<strong><a class="row-title" href="' . $edit_link . '">' . $item->display_text() . '</a></strong>'
-            : $item->display_text();
-        $content .= $this->row_actions($actions);
-        return $content;
-    }
+		$content = EE_Registry::instance()->CAP->current_user_can(
+			'ee_edit_question',
+			'espresso_registration_form_edit_question',
+			$item->ID()
+		)
+			? '<strong><a class="row-title" href="' . $edit_link . '">' . $item->display_text() . '</a></strong>'
+			: $item->display_text();
+		$content .= $this->row_actions($actions);
+		return $content;
+	}
 }

Spacing +18 added lines, -18 removed lines

@@ -26,7 +26,7 @@ 
         $system_question = $item->is_system_question();
         $actions = array();
 
-        if (! defined('REG_ADMIN_URL')) {
+        if ( ! defined('REG_ADMIN_URL')) {
             define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
         }
 
@@ -67,22 +67,22 @@ 
             $item->ID()
         )) {
             $actions = array(
-                'edit' => '<a href="' . $edit_link . '" title="'
-                          . __('Edit Question', 'event_espresso') . '">'
-                          . __('Edit', 'event_espresso') . '</a>',
+                'edit' => '<a href="'.$edit_link.'" title="'
+                          . __('Edit Question', 'event_espresso').'">'
+                          . __('Edit', 'event_espresso').'</a>',
             );
         }
 
-        if (! $system_question
+        if ( ! $system_question
             && $this->_view != 'trash'
             && EE_Registry::instance()->CAP->current_user_can(
                 'ee_delete_question',
                 'espresso_registration_form_trash_question',
                 $item->ID()
             )) {
-                $actions['delete'] = '<a href="' . $trash_link . '" title="'
-                                     . __('Trash Question', 'event_espresso') . '">'
-                                     . __('Trash', 'event_espresso') . '</a>';
+                $actions['delete'] = '<a href="'.$trash_link.'" title="'
+                                     . __('Trash Question', 'event_espresso').'">'
+                                     . __('Trash', 'event_espresso').'</a>';
         }
 
         if ($this->_view == 'trash') {
@@ -91,9 +91,9 @@ 
                 'espresso_registration_form_restore_question',
                 $item->ID()
             )) {
-                $actions['restore'] = '<a href="' . $restore_link . '" title="'
-                                      . __('Restore Question', 'event_espresso') . '">'
-                                      . __('Restore', 'event_espresso') . '</a>';
+                $actions['restore'] = '<a href="'.$restore_link.'" title="'
+                                      . __('Restore Question', 'event_espresso').'">'
+                                      . __('Restore', 'event_espresso').'</a>';
             }
             if ($item->count_related('Answer') === 0
                 && EE_Registry::instance()->CAP->current_user_can(
@@ -101,18 +101,18 @@ 
                     'espresso_registration_form_delete_questions',
                     $item->ID()
                 )) {
-                    $actions['delete'] = '<a href="' . $delete_link . '" title="'
-                                         . __('Delete Question Permanently', 'event_espresso') . '">'
-                                         . __('Delete Permanently', 'event_espresso') . '</a>';
+                    $actions['delete'] = '<a href="'.$delete_link.'" title="'
+                                         . __('Delete Question Permanently', 'event_espresso').'">'
+                                         . __('Delete Permanently', 'event_espresso').'</a>';
             }
         }
         if (EE_Registry::instance()->CAP->current_user_can(
             'ee_edit_questions',
             'espresso_registration_form_edit_question'
         )) {
-            $actions['duplicate'] = '<a href="' . $duplicate_link . '" title="'
-                                    . __('Duplicate Question', 'event_espresso') . '">'
-                                    . __('Duplicate', 'event_espresso') . '</a>';
+            $actions['duplicate'] = '<a href="'.$duplicate_link.'" title="'
+                                    . __('Duplicate Question', 'event_espresso').'">'
+                                    . __('Duplicate', 'event_espresso').'</a>';
         }
 
         $content = EE_Registry::instance()->CAP->current_user_can(
@@ -120,7 +120,7 @@ 
             'espresso_registration_form_edit_question',
             $item->ID()
         )
-            ? '<strong><a class="row-title" href="' . $edit_link . '">' . $item->display_text() . '</a></strong>'
+            ? '<strong><a class="row-title" href="'.$edit_link.'">'.$item->display_text().'</a></strong>'
             : $item->display_text();
         $content .= $this->row_actions($actions);
         return $content;

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

Indentation +227 added lines, -227 removed lines

@@ -30,231 +30,231 @@
 {
 
 
-    public function __construct($admin_page)
-    {
-        parent::__construct($admin_page);
-    }
-
-
-    protected function _setup_data()
-    {
-        $this->_data = $this->_view != 'trash'
-            ? $this->_admin_page->get_question_groups($this->_per_page, $this->_current_page, false)
-            : $this->_admin_page->get_trashed_question_groups($this->_per_page, $this->_current_page, false);
-        $this->_all_data_count = $this->_view != 'trash'
-            ? $this->_admin_page->get_question_groups($this->_per_page, $this->_current_page, true)
-            : $this->_admin_page->get_trashed_question_groups($this->_per_page, $this->_current_page, true);
-    }
-
-
-    protected function _set_properties()
-    {
-        $this->_wp_list_args = array(
-            'singular' => __('question group', 'event_espresso'),
-            'plural'   => __('question groups', 'event_espresso'),
-            'ajax'     => true, // for now,
-            'screen'   => $this->_admin_page->get_current_screen()->id,
-        );
-
-        $this->_columns = array(
-            'cb'              => '<input type="checkbox" />',
-            'id'              => __('ID', 'event_espresso'),
-            'name'            => __('Group Name', 'event_espresso'),
-            'description'     => __('Description', 'event_espresso'),
-            'show_group_name' => __('Show Name', 'event_espresso'),
-            'show_group_desc' => __('Show Desc', 'event_espresso'),
-        );
-
-        $this->_sortable_columns = array(
-            'id'   => array('QSG_ID' => false),
-            'name' => array('QSG_name' => false),
-        );
-
-        $this->_hidden_columns = array(
-            'id',
-        );
-
-        $this->_ajax_sorting_callback = 'update_question_group_order';
-    }
-
-
-    // not needed
-    protected function _get_table_filters()
-    {
-        return array();
-    }
-
-
-    protected function _add_view_counts()
-    {
-        $this->_views['all']['count'] = $this->_admin_page->get_question_groups(
-            $this->_per_page,
-            $this->_current_page,
-            true
-        );
-        if (EE_Registry::instance()->CAP->current_user_can(
-            'ee_delete_question_groups',
-            'espresso_registration_form_trash_question_group'
-        )) {
-            $this->_views['trash']['count'] = $this->_admin_page->get_trashed_question_groups(
-                $this->_per_page,
-                $this->_current_page,
-                true
-            );
-        }
-    }
-
-
-    public function column_cb($item)
-    {
-        $system_group = $item->get('QSG_system');
-        $has_questions_with_answers = $item->has_questions_with_answers();
-        $lock_icon = $system_group === 0 && $this->_view == 'trash' && $has_questions_with_answers
-            ? 'ee-lock-icon ee-alternate-color'
-            : 'ee-lock-icon ee-system-lock';
-        return $system_group > 0
-               || ($system_group === 0
-                    && $this->_view == 'trash'
-                    && $has_questions_with_answers
-                )
-               || ! EE_Registry::instance()->CAP->current_user_can(
-                   'ee_delete_question_groups',
-                   'espresso_registration_form_trash_question_groups',
-                   $item->ID()
-               )
-            ? '<span class="' . $lock_icon . '"></span>'
-              . sprintf(
-                  '<input type="hidden" name="hdnchk[%1$d]" value="%1$d" />',
-                  $item->ID()
-              )
-            : sprintf(
-                '<input type="checkbox" id="QSG_ID[%1$d]" name="checkbox[%1$d]" value="%1$d" />',
-                $item->ID()
-            );
-    }
-
-
-    public function column_id(EE_Question_Group $item)
-    {
-        $content = $item->ID();
-        $content .= '  <span class="show-on-mobile-view-only">' . $item->name() . '</span>';
-        return $content;
-    }
-
-
-    public function column_name(EE_Question_Group $item)
-    {
-        $actions = array();
-
-        // return $item->name();
-        if (! defined('REG_ADMIN_URL')) {
-            define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
-        }
-
-        $edit_query_args = array(
-            'action' => 'edit_question_group',
-            'QSG_ID' => $item->ID(),
-        );
-
-        $trash_query_args = array(
-            'action' => 'trash_question_group',
-            'QSG_ID' => $item->ID(),
-        );
-
-        $restore_query_args = array(
-            'action' => 'restore_question_group',
-            'QSG_ID' => $item->ID(),
-        );
-
-        $delete_query_args = array(
-            'action' => 'delete_question_group',
-            'QSG_ID' => $item->ID(),
-        );
-
-
-        $edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_FORMS_ADMIN_URL);
-        $trash_link = EE_Admin_Page::add_query_args_and_nonce($trash_query_args, EE_FORMS_ADMIN_URL);
-        $restore_link = EE_Admin_Page::add_query_args_and_nonce($restore_query_args, EE_FORMS_ADMIN_URL);
-        $delete_link = EE_Admin_Page::add_query_args_and_nonce($delete_query_args, EE_FORMS_ADMIN_URL);
-
-        if (EE_Registry::instance()->CAP->current_user_can(
-            'ee_edit_question_group',
-            'espresso_registration_form_edit_question_group',
-            $item->ID()
-        )) {
-            $actions = array(
-                'edit' => '<a href="' . $edit_link . '" title="'
-                          . esc_attr__('Edit Question Group', 'event_espresso') . '">'
-                          . __('Edit', 'event_espresso') . '</a>',
-            );
-        }
-        if ($item->get('QSG_system') < 1
-            && $this->_view != 'trash'
-            && EE_Registry::instance()->CAP->current_user_can(
-                'ee_delete_question_group',
-                'espresso_registration_form_trash_question_group',
-                $item->ID()
-            )) {
-            $actions['delete'] = '<a href="' . $trash_link . '" title="'
-                                 . esc_attr__('Delete Question Group', 'event_espresso') . '">'
-                                 . __('Trash', 'event_espresso') . '</a>';
-        }
-
-        if ($this->_view == 'trash') {
-            if (EE_Registry::instance()->CAP->current_user_can(
-                'ee_delete_question_group',
-                'espresso_registration_form_restore_question_group',
-                $item->ID()
-            )) {
-                $actions['restore'] = '<a href="' . $restore_link . '" title="'
-                                      . esc_attr__('Restore Question Group', 'event_espresso') . '">'
-                                      . __('Restore', 'event_espresso') . '</a>';
-            }
-
-            if (! $item->has_questions_with_answers()
-                && EE_Registry::instance()->CAP->current_user_can(
-                    'ee_delete_question_group',
-                    'espresso_registration_form_delete_question_group',
-                    $item->ID()
-                )) {
-                    $actions['delete'] = '<a href="' . $delete_link . '" title="'
-                                         . esc_attr__('Delete Question Group Permanently', 'event_espresso') . '">'
-                                         . __('Delete Permanently', 'event_espresso') . '</a>';
-            }
-        }
-
-        $content = EE_Registry::instance()->CAP->current_user_can(
-            'ee_edit_question_group',
-            'espresso_registration_form_edit_question_group',
-            $item->ID()
-        )
-            ? '<strong><a class="row-title" href="' . $edit_link . '">' . $item->name() . '</a></strong>'
-            : $item->name();
-        $content .= $this->row_actions($actions);
-        return $content;
-    }
-
-
-    public function column_identifier(EE_Question_Group $item)
-    {
-        return $item->identifier();
-    }
-
-
-    public function column_description(EE_Question_Group $item)
-    {
-        return $item->desc();
-    }
-
-
-    public function column_show_group_name(EE_Question_Group $item)
-    {
-        return $this->_yes_no[ $item->show_group_name() ];
-    }
-
-
-    public function column_show_group_desc(EE_Question_Group $item)
-    {
-        return $this->_yes_no[ $item->show_group_desc() ];
-    }
+	public function __construct($admin_page)
+	{
+		parent::__construct($admin_page);
+	}
+
+
+	protected function _setup_data()
+	{
+		$this->_data = $this->_view != 'trash'
+			? $this->_admin_page->get_question_groups($this->_per_page, $this->_current_page, false)
+			: $this->_admin_page->get_trashed_question_groups($this->_per_page, $this->_current_page, false);
+		$this->_all_data_count = $this->_view != 'trash'
+			? $this->_admin_page->get_question_groups($this->_per_page, $this->_current_page, true)
+			: $this->_admin_page->get_trashed_question_groups($this->_per_page, $this->_current_page, true);
+	}
+
+
+	protected function _set_properties()
+	{
+		$this->_wp_list_args = array(
+			'singular' => __('question group', 'event_espresso'),
+			'plural'   => __('question groups', 'event_espresso'),
+			'ajax'     => true, // for now,
+			'screen'   => $this->_admin_page->get_current_screen()->id,
+		);
+
+		$this->_columns = array(
+			'cb'              => '<input type="checkbox" />',
+			'id'              => __('ID', 'event_espresso'),
+			'name'            => __('Group Name', 'event_espresso'),
+			'description'     => __('Description', 'event_espresso'),
+			'show_group_name' => __('Show Name', 'event_espresso'),
+			'show_group_desc' => __('Show Desc', 'event_espresso'),
+		);
+
+		$this->_sortable_columns = array(
+			'id'   => array('QSG_ID' => false),
+			'name' => array('QSG_name' => false),
+		);
+
+		$this->_hidden_columns = array(
+			'id',
+		);
+
+		$this->_ajax_sorting_callback = 'update_question_group_order';
+	}
+
+
+	// not needed
+	protected function _get_table_filters()
+	{
+		return array();
+	}
+
+
+	protected function _add_view_counts()
+	{
+		$this->_views['all']['count'] = $this->_admin_page->get_question_groups(
+			$this->_per_page,
+			$this->_current_page,
+			true
+		);
+		if (EE_Registry::instance()->CAP->current_user_can(
+			'ee_delete_question_groups',
+			'espresso_registration_form_trash_question_group'
+		)) {
+			$this->_views['trash']['count'] = $this->_admin_page->get_trashed_question_groups(
+				$this->_per_page,
+				$this->_current_page,
+				true
+			);
+		}
+	}
+
+
+	public function column_cb($item)
+	{
+		$system_group = $item->get('QSG_system');
+		$has_questions_with_answers = $item->has_questions_with_answers();
+		$lock_icon = $system_group === 0 && $this->_view == 'trash' && $has_questions_with_answers
+			? 'ee-lock-icon ee-alternate-color'
+			: 'ee-lock-icon ee-system-lock';
+		return $system_group > 0
+			   || ($system_group === 0
+					&& $this->_view == 'trash'
+					&& $has_questions_with_answers
+				)
+			   || ! EE_Registry::instance()->CAP->current_user_can(
+				   'ee_delete_question_groups',
+				   'espresso_registration_form_trash_question_groups',
+				   $item->ID()
+			   )
+			? '<span class="' . $lock_icon . '"></span>'
+			  . sprintf(
+				  '<input type="hidden" name="hdnchk[%1$d]" value="%1$d" />',
+				  $item->ID()
+			  )
+			: sprintf(
+				'<input type="checkbox" id="QSG_ID[%1$d]" name="checkbox[%1$d]" value="%1$d" />',
+				$item->ID()
+			);
+	}
+
+
+	public function column_id(EE_Question_Group $item)
+	{
+		$content = $item->ID();
+		$content .= '  <span class="show-on-mobile-view-only">' . $item->name() . '</span>';
+		return $content;
+	}
+
+
+	public function column_name(EE_Question_Group $item)
+	{
+		$actions = array();
+
+		// return $item->name();
+		if (! defined('REG_ADMIN_URL')) {
+			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
+		}
+
+		$edit_query_args = array(
+			'action' => 'edit_question_group',
+			'QSG_ID' => $item->ID(),
+		);
+
+		$trash_query_args = array(
+			'action' => 'trash_question_group',
+			'QSG_ID' => $item->ID(),
+		);
+
+		$restore_query_args = array(
+			'action' => 'restore_question_group',
+			'QSG_ID' => $item->ID(),
+		);
+
+		$delete_query_args = array(
+			'action' => 'delete_question_group',
+			'QSG_ID' => $item->ID(),
+		);
+
+
+		$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_FORMS_ADMIN_URL);
+		$trash_link = EE_Admin_Page::add_query_args_and_nonce($trash_query_args, EE_FORMS_ADMIN_URL);
+		$restore_link = EE_Admin_Page::add_query_args_and_nonce($restore_query_args, EE_FORMS_ADMIN_URL);
+		$delete_link = EE_Admin_Page::add_query_args_and_nonce($delete_query_args, EE_FORMS_ADMIN_URL);
+
+		if (EE_Registry::instance()->CAP->current_user_can(
+			'ee_edit_question_group',
+			'espresso_registration_form_edit_question_group',
+			$item->ID()
+		)) {
+			$actions = array(
+				'edit' => '<a href="' . $edit_link . '" title="'
+						  . esc_attr__('Edit Question Group', 'event_espresso') . '">'
+						  . __('Edit', 'event_espresso') . '</a>',
+			);
+		}
+		if ($item->get('QSG_system') < 1
+			&& $this->_view != 'trash'
+			&& EE_Registry::instance()->CAP->current_user_can(
+				'ee_delete_question_group',
+				'espresso_registration_form_trash_question_group',
+				$item->ID()
+			)) {
+			$actions['delete'] = '<a href="' . $trash_link . '" title="'
+								 . esc_attr__('Delete Question Group', 'event_espresso') . '">'
+								 . __('Trash', 'event_espresso') . '</a>';
+		}
+
+		if ($this->_view == 'trash') {
+			if (EE_Registry::instance()->CAP->current_user_can(
+				'ee_delete_question_group',
+				'espresso_registration_form_restore_question_group',
+				$item->ID()
+			)) {
+				$actions['restore'] = '<a href="' . $restore_link . '" title="'
+									  . esc_attr__('Restore Question Group', 'event_espresso') . '">'
+									  . __('Restore', 'event_espresso') . '</a>';
+			}
+
+			if (! $item->has_questions_with_answers()
+				&& EE_Registry::instance()->CAP->current_user_can(
+					'ee_delete_question_group',
+					'espresso_registration_form_delete_question_group',
+					$item->ID()
+				)) {
+					$actions['delete'] = '<a href="' . $delete_link . '" title="'
+										 . esc_attr__('Delete Question Group Permanently', 'event_espresso') . '">'
+										 . __('Delete Permanently', 'event_espresso') . '</a>';
+			}
+		}
+
+		$content = EE_Registry::instance()->CAP->current_user_can(
+			'ee_edit_question_group',
+			'espresso_registration_form_edit_question_group',
+			$item->ID()
+		)
+			? '<strong><a class="row-title" href="' . $edit_link . '">' . $item->name() . '</a></strong>'
+			: $item->name();
+		$content .= $this->row_actions($actions);
+		return $content;
+	}
+
+
+	public function column_identifier(EE_Question_Group $item)
+	{
+		return $item->identifier();
+	}
+
+
+	public function column_description(EE_Question_Group $item)
+	{
+		return $item->desc();
+	}
+
+
+	public function column_show_group_name(EE_Question_Group $item)
+	{
+		return $this->_yes_no[ $item->show_group_name() ];
+	}
+
+
+	public function column_show_group_desc(EE_Question_Group $item)
+	{
+		return $this->_yes_no[ $item->show_group_desc() ];
+	}
 }

Spacing +19 added lines, -19 removed lines

@@ -122,7 +122,7 @@ 
                    'espresso_registration_form_trash_question_groups',
                    $item->ID()
                )
-            ? '<span class="' . $lock_icon . '"></span>'
+            ? '<span class="'.$lock_icon.'"></span>'
               . sprintf(
                   '<input type="hidden" name="hdnchk[%1$d]" value="%1$d" />',
                   $item->ID()
@@ -137,7 +137,7 @@ 
     public function column_id(EE_Question_Group $item)
     {
         $content = $item->ID();
-        $content .= '  <span class="show-on-mobile-view-only">' . $item->name() . '</span>';
+        $content .= '  <span class="show-on-mobile-view-only">'.$item->name().'</span>';
         return $content;
     }
 
@@ -147,7 +147,7 @@ 
         $actions = array();
 
         // return $item->name();
-        if (! defined('REG_ADMIN_URL')) {
+        if ( ! defined('REG_ADMIN_URL')) {
             define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
         }
 
@@ -183,9 +183,9 @@ 
             $item->ID()
         )) {
             $actions = array(
-                'edit' => '<a href="' . $edit_link . '" title="'
-                          . esc_attr__('Edit Question Group', 'event_espresso') . '">'
-                          . __('Edit', 'event_espresso') . '</a>',
+                'edit' => '<a href="'.$edit_link.'" title="'
+                          . esc_attr__('Edit Question Group', 'event_espresso').'">'
+                          . __('Edit', 'event_espresso').'</a>',
             );
         }
         if ($item->get('QSG_system') < 1
@@ -195,9 +195,9 @@ 
                 'espresso_registration_form_trash_question_group',
                 $item->ID()
             )) {
-            $actions['delete'] = '<a href="' . $trash_link . '" title="'
-                                 . esc_attr__('Delete Question Group', 'event_espresso') . '">'
-                                 . __('Trash', 'event_espresso') . '</a>';
+            $actions['delete'] = '<a href="'.$trash_link.'" title="'
+                                 . esc_attr__('Delete Question Group', 'event_espresso').'">'
+                                 . __('Trash', 'event_espresso').'</a>';
         }
 
         if ($this->_view == 'trash') {
@@ -206,20 +206,20 @@ 
                 'espresso_registration_form_restore_question_group',
                 $item->ID()
             )) {
-                $actions['restore'] = '<a href="' . $restore_link . '" title="'
-                                      . esc_attr__('Restore Question Group', 'event_espresso') . '">'
-                                      . __('Restore', 'event_espresso') . '</a>';
+                $actions['restore'] = '<a href="'.$restore_link.'" title="'
+                                      . esc_attr__('Restore Question Group', 'event_espresso').'">'
+                                      . __('Restore', 'event_espresso').'</a>';
             }
 
-            if (! $item->has_questions_with_answers()
+            if ( ! $item->has_questions_with_answers()
                 && EE_Registry::instance()->CAP->current_user_can(
                     'ee_delete_question_group',
                     'espresso_registration_form_delete_question_group',
                     $item->ID()
                 )) {
-                    $actions['delete'] = '<a href="' . $delete_link . '" title="'
-                                         . esc_attr__('Delete Question Group Permanently', 'event_espresso') . '">'
-                                         . __('Delete Permanently', 'event_espresso') . '</a>';
+                    $actions['delete'] = '<a href="'.$delete_link.'" title="'
+                                         . esc_attr__('Delete Question Group Permanently', 'event_espresso').'">'
+                                         . __('Delete Permanently', 'event_espresso').'</a>';
             }
         }
 
@@ -228,7 +228,7 @@ 
             'espresso_registration_form_edit_question_group',
             $item->ID()
         )
-            ? '<strong><a class="row-title" href="' . $edit_link . '">' . $item->name() . '</a></strong>'
+            ? '<strong><a class="row-title" href="'.$edit_link.'">'.$item->name().'</a></strong>'
             : $item->name();
         $content .= $this->row_actions($actions);
         return $content;
@@ -249,12 +249,12 @@ 
 
     public function column_show_group_name(EE_Question_Group $item)
     {
-        return $this->_yes_no[ $item->show_group_name() ];
+        return $this->_yes_no[$item->show_group_name()];
     }
 
 
     public function column_show_group_desc(EE_Question_Group $item)
     {
-        return $this->_yes_no[ $item->show_group_desc() ];
+        return $this->_yes_no[$item->show_group_desc()];
     }
 }

caffeinated/admin/extend/registration_form/help_tours/Registration_Form_Questions_Overview_Help_Tour.class.php

Indentation +139 added lines, -139 removed lines

@@ -28,155 +28,155 @@
 class Registration_Form_Questions_Overview_Help_Tour extends EE_Help_Tour
 {
 
-    protected function _set_tour_properties()
-    {
-        $this->_label = __('Questions Overview Tour', 'event_espresso');
-        $this->_slug = $this->_is_caf ? 'questions-overview-caf-joyride' : 'questions-overview-joyride';
-    }
+	protected function _set_tour_properties()
+	{
+		$this->_label = __('Questions Overview Tour', 'event_espresso');
+		$this->_slug = $this->_is_caf ? 'questions-overview-caf-joyride' : 'questions-overview-joyride';
+	}
 
-    protected function _set_tour_stops()
-    {
-        $this->_stops = array(
-            10  => array(
-                'content' => $this->_start(),
-            ),
-            30  => array(
-                'id'      => 'display_text',
-                'content' => $this->_display_text_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentX' => -5,
-                    'tipAdjustmentY' => -25,
-                ),
-            ),
-            40  => array(
-                'id'      => 'admin_label',
-                'content' => $this->_admin_label_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentX' => 20,
-                    'tipAdjustmentY' => -25,
-                ),
-            ),
-            50  => array(
-                'id'      => 'type',
-                'content' => $this->_type_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentX' => -5,
-                    'tipAdjustmentY' => -25,
-                ),
-            ),
-            60  => array(
-                'id'      => 'values',
-                'content' => $this->_values_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentX' => -5,
-                    'tipAdjustmentY' => -25,
-                ),
-            ),
-            70  => array(
-                'id'      => 'required',
-                'content' => $this->_required_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentY' => -20,
-                    'tipAdjustmentX' => -15,
-                ),
-            ),
-            80  => array(
-                'class'   => 'bulkactions',
-                'content' => $this->_bulk_actions_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentY' => -30,
-                    'tipAdjustmentX' => -15,
-                ),
-            ),
-            90  => array(
-                'id'      => 'event-espresso_page_espresso_registration_form-search-input',
-                'content' => $this->_search_stop(),
-                'options' => array(
-                    'tipLocation'    => 'left',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => -15,
-                ),
-            ),
-            100 => array(
-                'id'      => 'add-new-question',
-                'content' => $this->_add_new_question_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            ),
-        );
-    }
+	protected function _set_tour_stops()
+	{
+		$this->_stops = array(
+			10  => array(
+				'content' => $this->_start(),
+			),
+			30  => array(
+				'id'      => 'display_text',
+				'content' => $this->_display_text_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentX' => -5,
+					'tipAdjustmentY' => -25,
+				),
+			),
+			40  => array(
+				'id'      => 'admin_label',
+				'content' => $this->_admin_label_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentX' => 20,
+					'tipAdjustmentY' => -25,
+				),
+			),
+			50  => array(
+				'id'      => 'type',
+				'content' => $this->_type_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentX' => -5,
+					'tipAdjustmentY' => -25,
+				),
+			),
+			60  => array(
+				'id'      => 'values',
+				'content' => $this->_values_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentX' => -5,
+					'tipAdjustmentY' => -25,
+				),
+			),
+			70  => array(
+				'id'      => 'required',
+				'content' => $this->_required_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentY' => -20,
+					'tipAdjustmentX' => -15,
+				),
+			),
+			80  => array(
+				'class'   => 'bulkactions',
+				'content' => $this->_bulk_actions_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentY' => -30,
+					'tipAdjustmentX' => -15,
+				),
+			),
+			90  => array(
+				'id'      => 'event-espresso_page_espresso_registration_form-search-input',
+				'content' => $this->_search_stop(),
+				'options' => array(
+					'tipLocation'    => 'left',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => -15,
+				),
+			),
+			100 => array(
+				'id'      => 'add-new-question',
+				'content' => $this->_add_new_question_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			),
+		);
+	}
 
 
-    protected function _start()
-    {
-        $content = '<h3>' . __('Questions Overview', 'event_espresso') . '</h3>';
-        $content .= '<p>'
-                    . __(
-                        'This tour of the Questions Overview page will go over different areas of the screen to help you understand what they are used for.',
-                        'event_espresso'
-                    ) . '</p>';
+	protected function _start()
+	{
+		$content = '<h3>' . __('Questions Overview', 'event_espresso') . '</h3>';
+		$content .= '<p>'
+					. __(
+						'This tour of the Questions Overview page will go over different areas of the screen to help you understand what they are used for.',
+						'event_espresso'
+					) . '</p>';
 
-        return $content;
-    }
+		return $content;
+	}
 
-    protected function _display_text_stop()
-    {
-        return '<p>' . __('View available questions.', 'event_espresso') . '</p>';
-    }
+	protected function _display_text_stop()
+	{
+		return '<p>' . __('View available questions.', 'event_espresso') . '</p>';
+	}
 
-    protected function _admin_label_stop()
-    {
-        return '<p>' . __('View the admin label for your questions.', 'event_espresso') . '</p>';
-    }
+	protected function _admin_label_stop()
+	{
+		return '<p>' . __('View the admin label for your questions.', 'event_espresso') . '</p>';
+	}
 
-    protected function _type_stop()
-    {
-        return '<p>'
-               . __(
-                   'View the type of question. Available options are Text, Textarea, Checkboxes, Radio Buttons, Dropdown, State/Province Dropdown, Country Dropdown, and Date Picker.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _type_stop()
+	{
+		return '<p>'
+			   . __(
+				   'View the type of question. Available options are Text, Textarea, Checkboxes, Radio Buttons, Dropdown, State/Province Dropdown, Country Dropdown, and Date Picker.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _values_stop()
-    {
-        return '<p>'
-               . __(
-                   'View stored values for checkboxes, radio buttons, and select boxes.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _values_stop()
+	{
+		return '<p>'
+			   . __(
+				   'View stored values for checkboxes, radio buttons, and select boxes.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _required_stop()
-    {
-        return '<p>' . __('View if a question is required.', 'event_espresso') . '</p>';
-    }
+	protected function _required_stop()
+	{
+		return '<p>' . __('View if a question is required.', 'event_espresso') . '</p>';
+	}
 
-    protected function _bulk_actions_stop()
-    {
-        return '<p>' . __('Perform bulk actions to multiple questions.', 'event_espresso') . '</p>';
-    }
+	protected function _bulk_actions_stop()
+	{
+		return '<p>' . __('Perform bulk actions to multiple questions.', 'event_espresso') . '</p>';
+	}
 
-    protected function _search_stop()
-    {
-        return '<p>'
-               . __(
-                   'Search through questions. The following sources will be searched: Name of Question (display text).',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _search_stop()
+	{
+		return '<p>'
+			   . __(
+				   'Search through questions. The following sources will be searched: Name of Question (display text).',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _add_new_question_stop()
-    {
-        return '<p>' . __('Click here to add a new question.', 'event_espresso') . '</p>';
-    }
+	protected function _add_new_question_stop()
+	{
+		return '<p>' . __('Click here to add a new question.', 'event_espresso') . '</p>';
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -118,24 +118,24 @@ 
 
     protected function _start()
     {
-        $content = '<h3>' . __('Questions Overview', 'event_espresso') . '</h3>';
+        $content = '<h3>'.__('Questions Overview', 'event_espresso').'</h3>';
         $content .= '<p>'
                     . __(
                         'This tour of the Questions Overview page will go over different areas of the screen to help you understand what they are used for.',
                         'event_espresso'
-                    ) . '</p>';
+                    ).'</p>';
 
         return $content;
     }
 
     protected function _display_text_stop()
     {
-        return '<p>' . __('View available questions.', 'event_espresso') . '</p>';
+        return '<p>'.__('View available questions.', 'event_espresso').'</p>';
     }
 
     protected function _admin_label_stop()
     {
-        return '<p>' . __('View the admin label for your questions.', 'event_espresso') . '</p>';
+        return '<p>'.__('View the admin label for your questions.', 'event_espresso').'</p>';
     }
 
     protected function _type_stop()
@@ -144,7 +144,7 @@ 
                . __(
                    'View the type of question. Available options are Text, Textarea, Checkboxes, Radio Buttons, Dropdown, State/Province Dropdown, Country Dropdown, and Date Picker.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _values_stop()
@@ -153,17 +153,17 @@ 
                . __(
                    'View stored values for checkboxes, radio buttons, and select boxes.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _required_stop()
     {
-        return '<p>' . __('View if a question is required.', 'event_espresso') . '</p>';
+        return '<p>'.__('View if a question is required.', 'event_espresso').'</p>';
     }
 
     protected function _bulk_actions_stop()
     {
-        return '<p>' . __('Perform bulk actions to multiple questions.', 'event_espresso') . '</p>';
+        return '<p>'.__('Perform bulk actions to multiple questions.', 'event_espresso').'</p>';
     }
 
     protected function _search_stop()
@@ -172,11 +172,11 @@ 
                . __(
                    'Search through questions. The following sources will be searched: Name of Question (display text).',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _add_new_question_stop()
     {
-        return '<p>' . __('Click here to add a new question.', 'event_espresso') . '</p>';
+        return '<p>'.__('Click here to add a new question.', 'event_espresso').'</p>';
     }
 }