eventespresso / event-espresso-core

core/libraries/rest_api/calculations/CalculatedModelFieldsFactory.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
      */
     public function createFromModel($model_name)
     {
-        return $this->createFromClassname('EventEspresso\core\libraries\rest_api\calculations\\' . $model_name);
+        return $this->createFromClassname('EventEspresso\core\libraries\rest_api\calculations\\'.$model_name);
     }
 
     /**
@@ -51,7 +51,7 @@ 
     public function createFromClassname($calculator_classname)
     {
         $calculator = $this->loader->getShared($calculator_classname);
-        if (!$calculator instanceof Base) {
+        if ( ! $calculator instanceof Base) {
             throw new UnexpectedEntityException(
                 $calculator_classname,
                 'EventEspresso\core\libraries\rest_api\calculations\Base'

Indentation +37 added lines, -37 removed lines

@@ -18,46 +18,46 @@
  */
 class CalculatedModelFieldsFactory
 {
-    private $loader;
+	private $loader;
 
-    /**
-     * CalculatedModelFieldsFactory constructor.
-     * @param LoaderInterface $loader
-     */
-    public function __construct(LoaderInterface $loader)
-    {
-        $this->loader = $loader;
-    }
+	/**
+	 * CalculatedModelFieldsFactory constructor.
+	 * @param LoaderInterface $loader
+	 */
+	public function __construct(LoaderInterface $loader)
+	{
+		$this->loader = $loader;
+	}
 
-    /**
-     * Creates the calculator class that corresponds to that particular model
-     * @since 4.9.68.p
-     * @param string $model_name
-     * @return Base
-     * @throws UnexpectedEntityException
-     */
-    public function createFromModel($model_name)
-    {
-        return $this->createFromClassname('EventEspresso\core\libraries\rest_api\calculations\\' . $model_name);
-    }
+	/**
+	 * Creates the calculator class that corresponds to that particular model
+	 * @since 4.9.68.p
+	 * @param string $model_name
+	 * @return Base
+	 * @throws UnexpectedEntityException
+	 */
+	public function createFromModel($model_name)
+	{
+		return $this->createFromClassname('EventEspresso\core\libraries\rest_api\calculations\\' . $model_name);
+	}
 
-    /**
-     * Creates the calculator class that corresponds to that classname and verifies it's of the correct type
-     * @param string $calculator_classname
-     * @return Base
-     * @throws UnexpectedEntityException
-     */
-    public function createFromClassname($calculator_classname)
-    {
-        $calculator = $this->loader->getShared($calculator_classname);
-        if (!$calculator instanceof Base) {
-            throw new UnexpectedEntityException(
-                $calculator_classname,
-                'EventEspresso\core\libraries\rest_api\calculations\Base'
-            );
-        }
-        return $calculator;
-    }
+	/**
+	 * Creates the calculator class that corresponds to that classname and verifies it's of the correct type
+	 * @param string $calculator_classname
+	 * @return Base
+	 * @throws UnexpectedEntityException
+	 */
+	public function createFromClassname($calculator_classname)
+	{
+		$calculator = $this->loader->getShared($calculator_classname);
+		if (!$calculator instanceof Base) {
+			throw new UnexpectedEntityException(
+				$calculator_classname,
+				'EventEspresso\core\libraries\rest_api\calculations\Base'
+			);
+		}
+		return $calculator;
+	}
 }
 // End of file CalculationsFactory.php
 // Location: EventEspresso\core\libraries\rest_api\calculations/CalculationsFactory.php

core/libraries/rest_api/calculations/Base.php

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
      */
     protected function verifyCurrentUserCan($required_permission, $attempted_calculation)
     {
-        if (! current_user_can($required_permission)) {
+        if ( ! current_user_can($required_permission)) {
             throw new RestException(
                 'permission_denied',
                 sprintf(
@@ -75,6 +75,6 @@ 
     public function schemaForCalculation($calculation_index)
     {
         $schema_map = $this->schemaForCalculations();
-        return isset($schema_map[ $calculation_index ]) ? $schema_map[ $calculation_index ] : array();
+        return isset($schema_map[$calculation_index]) ? $schema_map[$calculation_index] : array();
     }
 }

Indentation +57 added lines, -57 removed lines

@@ -16,65 +16,65 @@
 class Base
 {
 
-    /**
-     * @param $required_permission
-     * @param $attempted_calculation
-     * @throws RestException
-     */
-    protected function verifyCurrentUserCan($required_permission, $attempted_calculation)
-    {
-        if (! current_user_can($required_permission)) {
-            throw new RestException(
-                'permission_denied',
-                sprintf(
-                    esc_html__(
-                    // @codingStandardsIgnoreStart
-                        'Permission denied, you cannot calculate %1$s on %2$s because you do not have the capability "%3$s"',
-                        // @codingStandardsIgnoreEnd
-                        'event_espresso'
-                    ),
-                    $attempted_calculation,
-                    EEH_Inflector::pluralize_and_lower($this->getResourceName()),
-                    $required_permission
-                )
-            );
-        }
-    }
+	/**
+	 * @param $required_permission
+	 * @param $attempted_calculation
+	 * @throws RestException
+	 */
+	protected function verifyCurrentUserCan($required_permission, $attempted_calculation)
+	{
+		if (! current_user_can($required_permission)) {
+			throw new RestException(
+				'permission_denied',
+				sprintf(
+					esc_html__(
+					// @codingStandardsIgnoreStart
+						'Permission denied, you cannot calculate %1$s on %2$s because you do not have the capability "%3$s"',
+						// @codingStandardsIgnoreEnd
+						'event_espresso'
+					),
+					$attempted_calculation,
+					EEH_Inflector::pluralize_and_lower($this->getResourceName()),
+					$required_permission
+				)
+			);
+		}
+	}
 
 
-    /**
-     * Gets the name of the resource of the called class
-     *
-     * @return string
-     */
-    public function getResourceName()
-    {
-        return substr(__CLASS__, strrpos(__CLASS__, '\\') + 1);
-    }
+	/**
+	 * Gets the name of the resource of the called class
+	 *
+	 * @return string
+	 */
+	public function getResourceName()
+	{
+		return substr(__CLASS__, strrpos(__CLASS__, '\\') + 1);
+	}
 
-    /**
-     * Returns an array to be used for the schema for the calculated fields.
-     * @since 4.9.68.p
-     * @return array keys are calculated field names (eg "optimum_sales_at_start") values are arrays {
-     * @type string $description
-     * @type string $type, eg "string", "int", "boolean", "object", "array", etc
-     * }
-     */
-    public function schemaForCalculations()
-    {
-        return array();
-    }
+	/**
+	 * Returns an array to be used for the schema for the calculated fields.
+	 * @since 4.9.68.p
+	 * @return array keys are calculated field names (eg "optimum_sales_at_start") values are arrays {
+	 * @type string $description
+	 * @type string $type, eg "string", "int", "boolean", "object", "array", etc
+	 * }
+	 */
+	public function schemaForCalculations()
+	{
+		return array();
+	}
 
-    /**
-     * Returns the json schema for the given calculation index.
-     *
-     * @since 4.9.68.p
-     * @param $calculation_index
-     * @return array
-     */
-    public function schemaForCalculation($calculation_index)
-    {
-        $schema_map = $this->schemaForCalculations();
-        return isset($schema_map[ $calculation_index ]) ? $schema_map[ $calculation_index ] : array();
-    }
+	/**
+	 * Returns the json schema for the given calculation index.
+	 *
+	 * @since 4.9.68.p
+	 * @param $calculation_index
+	 * @return array
+	 */
+	public function schemaForCalculation($calculation_index)
+	{
+		$schema_map = $this->schemaForCalculations();
+		return isset($schema_map[ $calculation_index ]) ? $schema_map[ $calculation_index ] : array();
+	}
 }

core/domain/entities/shortcodes/EspressoTicketSelector.php

Indentation +82 added lines, -82 removed lines

@@ -24,92 +24,92 @@
 {
 
 
-    /**
-     * the actual shortcode tag that gets registered with WordPress
-     *
-     * @return string
-     */
-    public function getTag()
-    {
-        return 'ESPRESSO_TICKET_SELECTOR';
-    }
+	/**
+	 * the actual shortcode tag that gets registered with WordPress
+	 *
+	 * @return string
+	 */
+	public function getTag()
+	{
+		return 'ESPRESSO_TICKET_SELECTOR';
+	}
 
 
-    /**
-     * the time in seconds to cache the results of the processShortcode() method
-     * 0 means the processShortcode() results will NOT be cached at all
-     *
-     * @return int
-     */
-    public function cacheExpiration()
-    {
-        return 0;
-    }
+	/**
+	 * the time in seconds to cache the results of the processShortcode() method
+	 * 0 means the processShortcode() results will NOT be cached at all
+	 *
+	 * @return int
+	 */
+	public function cacheExpiration()
+	{
+		return 0;
+	}
 
 
-    /**
-     * a place for adding any initialization code that needs to run prior to wp_header().
-     * this may be required for shortcodes that utilize a corresponding module,
-     * and need to enqueue assets for that module
-     *
-     * @return void
-     */
-    public function initializeShortcode()
-    {
-        add_filter('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true');
-        $this->shortcodeHasBeenInitialized();
-    }
+	/**
+	 * a place for adding any initialization code that needs to run prior to wp_header().
+	 * this may be required for shortcodes that utilize a corresponding module,
+	 * and need to enqueue assets for that module
+	 *
+	 * @return void
+	 */
+	public function initializeShortcode()
+	{
+		add_filter('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true');
+		$this->shortcodeHasBeenInitialized();
+	}
 
 
-    /**
-     * callback that runs when the shortcode is encountered in post content.
-     * IMPORTANT !!!
-     * remember that shortcode content should be RETURNED and NOT echoed out
-     *
-     * @param array $attributes
-     * @return string
-     * @throws InvalidArgumentException
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     * @throws Exception
-     */
-    public function processShortcode($attributes = array())
-    {
-        extract($attributes, EXTR_OVERWRITE);
-        $event_id = isset($event_id) ? $event_id : 0;
-        $event = EE_Registry::instance()->load_model('Event')->get_one_by_ID($event_id);
-        if (! $event instanceof EE_Event) {
-            if (WP_DEBUG === true && current_user_can('edit_pages')) {
-                new ExceptionStackTraceDisplay(
-                    new InvalidArgumentException(
-                        sprintf(
-                            esc_html__(
-                                'A valid Event ID is required to use the "%1$s" shortcode.%4$sAn Event with an ID of "%2$s" could not be found.%4$sPlease verify that the shortcode added to this post\'s content includes an "%3$s" argument and that its value corresponds to a valid Event ID.',
-                                'event_espresso'
-                            ),
-                            $this->getTag(),
-                            $event_id,
-                            'event_id',
-                            '<br />'
-                        )
-                    )
-                );
-                return '';
-            }
-            return sprintf(
-                esc_html__(
-                    'An Event with an ID of "%s" could not be found. Please contact the event administrator for assistance.',
-                    'event_espresso'
-                ),
-                $event_id
-            );
-        }
-        ob_start();
-        do_action('AHEE_event_details_before_post', $event_id);
-        espresso_ticket_selector($event);
-        do_action('AHEE_event_details_after_post');
-        return ob_get_clean();
-    }
+	/**
+	 * callback that runs when the shortcode is encountered in post content.
+	 * IMPORTANT !!!
+	 * remember that shortcode content should be RETURNED and NOT echoed out
+	 *
+	 * @param array $attributes
+	 * @return string
+	 * @throws InvalidArgumentException
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 * @throws Exception
+	 */
+	public function processShortcode($attributes = array())
+	{
+		extract($attributes, EXTR_OVERWRITE);
+		$event_id = isset($event_id) ? $event_id : 0;
+		$event = EE_Registry::instance()->load_model('Event')->get_one_by_ID($event_id);
+		if (! $event instanceof EE_Event) {
+			if (WP_DEBUG === true && current_user_can('edit_pages')) {
+				new ExceptionStackTraceDisplay(
+					new InvalidArgumentException(
+						sprintf(
+							esc_html__(
+								'A valid Event ID is required to use the "%1$s" shortcode.%4$sAn Event with an ID of "%2$s" could not be found.%4$sPlease verify that the shortcode added to this post\'s content includes an "%3$s" argument and that its value corresponds to a valid Event ID.',
+								'event_espresso'
+							),
+							$this->getTag(),
+							$event_id,
+							'event_id',
+							'<br />'
+						)
+					)
+				);
+				return '';
+			}
+			return sprintf(
+				esc_html__(
+					'An Event with an ID of "%s" could not be found. Please contact the event administrator for assistance.',
+					'event_espresso'
+				),
+				$event_id
+			);
+		}
+		ob_start();
+		do_action('AHEE_event_details_before_post', $event_id);
+		espresso_ticket_selector($event);
+		do_action('AHEE_event_details_after_post');
+		return ob_get_clean();
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
         extract($attributes, EXTR_OVERWRITE);
         $event_id = isset($event_id) ? $event_id : 0;
         $event = EE_Registry::instance()->load_model('Event')->get_one_by_ID($event_id);
-        if (! $event instanceof EE_Event) {
+        if ( ! $event instanceof EE_Event) {
             if (WP_DEBUG === true && current_user_can('edit_pages')) {
                 new ExceptionStackTraceDisplay(
                     new InvalidArgumentException(

core/libraries/messages/messenger/EE_Pdf_messenger.class.php

Spacing +4 added lines, -4 removed lines

@@ -259,7 +259,7 @@ 
             'base_css' => $this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, true, 'base', $this->_variation),
             'print_css' => $this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, true, 'print', $this->_variation),
             'main_css' => $this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, true, 'main', $this->_variation),
-            'extra_css' => EE_LIBRARIES_URL . 'messages/defaults/default/variations/pdf_base_default.css',
+            'extra_css' => EE_LIBRARIES_URL.'messages/defaults/default/variations/pdf_base_default.css',
             'main_body' => apply_filters('FHEE__EE_Pdf_messenger___send_message__main_body', wpautop($this->_content), $this->_content)
         );
         $this->_deregister_wp_hooks();
@@ -323,8 +323,8 @@ 
         $invoice_name = $this->_subject;
 
         // only load dompdf if nobody else has yet...
-        if (! class_exists('Dompdf\Dompdf')) {
-            require_once(EE_THIRD_PARTY . 'dompdf/src/Autoloader.php');
+        if ( ! class_exists('Dompdf\Dompdf')) {
+            require_once(EE_THIRD_PARTY.'dompdf/src/Autoloader.php');
             Dompdf\Autoloader::register();
         }
         $options = new Dompdf\Options();
@@ -336,7 +336,7 @@ 
         $dompdf->loadHtml($content);
         $dompdf->render();
         // forcing the browser to open a download dialog.
-        $dompdf->stream($invoice_name . ".pdf", array('Attachment' => true));
+        $dompdf->stream($invoice_name.".pdf", array('Attachment' => true));
     }
 
 

Indentation +344 added lines, -344 removed lines

@@ -15,349 +15,349 @@
 {
 
 
-    /**
-     * The following are the properties that this messenger requires for generating pdf
-     */
-
-    /**
-     * This is the pdf body generated by the template via the message type.
-     *
-     * @var string
-     */
-    protected $_content;
-
-
-    /**
-     * This is for the page title that gets displayed.  This will end up being the filename for the generated pdf.
-     *
-     * @var string
-     */
-    protected $_subject;
-
-
-    /**
-     * @return EE_Pdf_messenger
-     */
-    public function __construct()
-    {
-        // set properties
-        $this->name = 'pdf';
-        $this->description = esc_html__('This messenger is used for generating a pdf version of the message.', 'event_espresso');
-        $this->label = array(
-            'singular' => esc_html__('PDF', 'event_espresso'),
-            'plural' => esc_html__('PDFs', 'event_espresso')
-        );
-        $this->activate_on_install = true;
-
-        parent::__construct();
-    }
-
-
-    /**
-     * PDF Messenger desires execution immediately.
-     * @see  parent::send_now() for documentation.
-     * @since  4.9.0
-     * @return bool
-     */
-    public function send_now()
-    {
-        return true;
-    }
-
-
-    /**
-     * HTML Messenger allows an empty to field.
-     * @see parent::allow_empty_to_field() for documentation
-     * @since  4.9.0
-     * @return bool
-     */
-    public function allow_empty_to_field()
-    {
-        return true;
-    }
-
-
-    /**
-     * @see abstract declaration in EE_messenger for details.
-     */
-    protected function _set_admin_pages()
-    {
-        $this->admin_registered_pages = array('events_edit' => false);
-    }
-
-
-    /**
-     * @see abstract declaration in EE_messenger for details.
-     */
-    protected function _set_valid_shortcodes()
-    {
-        $this->_valid_shortcodes = array();
-    }
-
-
-    /**
-     * @see abstract declaration in EE_messenger for details.
-     */
-    protected function _set_validator_config()
-    {
-        $this->_validator_config = array(
-            'subject' => array(
-                'shortcodes' => array('recipient_details', 'organization', 'event', 'ticket', 'venue', 'primary_registration_details', 'event_author', 'email', 'event_meta', 'recipient_list', 'transaction', 'datetime_list', 'datetime')
-            ),
-            'content' => array(
-                'shortcodes' => array('recipient_details', 'organization', 'event', 'ticket', 'venue', 'primary_registration_details', 'event_author', 'email', 'event_meta', 'recipient_list', 'transaction', 'datetime_list', 'datetime')
-            ),
-            'attendee_list' => array(
-                'shortcodes' => array('attendee', 'event_list', 'ticket_list'),
-                'required' => array('[ATTENDEE_LIST]')
-            ),
-            'event_list' => array(
-                'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'venue', 'datetime_list', 'attendee', 'primary_registration_details', 'primary_registration_list', 'event_author', 'recipient_details', 'recipient_list'),
-                'required' => array('[EVENT_LIST]')
-            ),
-            'ticket_list' => array(
-                'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'primary_registration_details', 'recipient_details'),
-                'required' => array('[TICKET_LIST]')
-            ),
-            'datetime_list' => array(
-                'shortcodes' => array('datetime'),
-                'required' => array('[DATETIME_LIST]')
-            ),
-        );
-    }
-
-
-    /**
-     * Takes care of enqueuing any necessary scripts or styles for the page.  A do_action() so message types using this messenger can add their own js.
-     *
-     * @return void.
-     */
-    public function enqueue_scripts_styles()
-    {
-        parent::enqueue_scripts_styles();
-        do_action('AHEE__EE_Pdf_messenger__enqueue_scripts_styles');
-    }
-
-
-    /**
-     * _set_template_fields
-     * This sets up the fields that a messenger requires for the message to go out.
-     *
-     * @access  protected
-     * @return void
-     */
-    protected function _set_template_fields()
-    {
-        // any extra template fields that are NOT used by the messenger but will get used by a messenger field for shortcode replacement get added to the 'extra' key in an associated array indexed by the messenger field they relate to.  This is important for the Messages_admin to know what fields to display to the user.  Also, notice that the "values" are equal to the field type that messages admin will use to know what kind of field to display. The values ALSO have one index labeled "shortcode".  the values in that array indicate which ACTUAL SHORTCODE (i.e. [SHORTCODE]) is required in order for this extra field to be displayed.  If the required shortcode isn't part of the shortcodes array then the field is not needed and will not be displayed/parsed.
-        $this->_template_fields = array(
-            'subject' => array(
-                'input' => 'text',
-                'label' => esc_html__('Page Title', 'event_espresso'),
-                'type' => 'string',
-                'required' => true,
-                'validation' => true,
-                'css_class' => 'large-text',
-                'format' => '%s'
-            ),
-            'content' => '', // left empty b/c it is in the "extra array" but messenger still needs needs to know this is a field.
-            'extra' => array(
-                'content' => array(
-                    'main' => array(
-                        'input' => 'wp_editor',
-                        'label' => esc_html__('Main Content', 'event_espresso'),
-                        'type' => 'string',
-                        'required' => true,
-                        'validation' => true,
-                        'format' => '%s',
-                        'rows' => '15'
-                    ),
-                    'event_list' => array(
-                        'input' => 'wp_editor',
-                        'label' => '[EVENT_LIST]',
-                        'type' => 'string',
-                        'required' => true,
-                        'validation' => true,
-                        'format' => '%s',
-                        'rows' => '15',
-                        'shortcodes_required' => array('[EVENT_LIST]')
-                    ),
-                    'attendee_list' => array(
-                        'input' => 'textarea',
-                        'label' => '[ATTENDEE_LIST]',
-                        'type' => 'string',
-                        'required' => true,
-                        'validation' => true,
-                        'format' => '%s',
-                        'css_class' => 'large-text',
-                        'rows' => '5',
-                        'shortcodes_required' => array('[ATTENDEE_LIST]')
-                    ),
-                    'ticket_list' => array(
-                        'input' => 'textarea',
-                        'label' => '[TICKET_LIST]',
-                        'type' => 'string',
-                        'required' => true,
-                        'validation' => true,
-                        'format' => '%s',
-                        'css_class' => 'large-text',
-                        'rows' => '10',
-                        'shortcodes_required' => array('[TICKET_LIST]')
-                    ),
-                    'datetime_list' => array(
-                        'input' => 'textarea',
-                        'label' => '[DATETIME_LIST]',
-                        'type' => 'string',
-                        'required' => true,
-                        'validation' => true,
-                        'format' => '%s',
-                        'css_class' => 'large-text',
-                        'rows' => '10',
-                        'shortcodes_required' => array('[DATETIME_LIST]')
-                    )
-                )
-            )
-        );
-    }
-
-
-    /**
-     * @see definition of this method in parent
-     *
-     * @since 4.5.0
-     *
-     */
-    protected function _set_default_message_types()
-    {
-        // note currently PDF is only a secondary messenger so it never has any associated message types.
-        $this->_default_message_types = array();
-    }
-
-
-    /**
-     * @see definition of this method in parent
-     *
-     * @since 4.5.0
-     */
-    protected function _set_valid_message_types()
-    {
-        $this->_valid_message_types = array();
-    }
-
-
-    /**
-     * Generates html version of the message content and then sends it to the pdf generator.
-     *
-     *
-     * @since 4.5.0
-     *
-     * @return string.
-     */
-    protected function _send_message()
-    {
-        $this->_template_args = array(
-            'page_title' => $this->_subject,
-            'base_css' => $this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, true, 'base', $this->_variation),
-            'print_css' => $this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, true, 'print', $this->_variation),
-            'main_css' => $this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, true, 'main', $this->_variation),
-            'extra_css' => EE_LIBRARIES_URL . 'messages/defaults/default/variations/pdf_base_default.css',
-            'main_body' => apply_filters('FHEE__EE_Pdf_messenger___send_message__main_body', wpautop($this->_content), $this->_content)
-        );
-        $this->_deregister_wp_hooks();
-        add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts_styles'));
-        $content = $this->_get_main_template();
+	/**
+	 * The following are the properties that this messenger requires for generating pdf
+	 */
+
+	/**
+	 * This is the pdf body generated by the template via the message type.
+	 *
+	 * @var string
+	 */
+	protected $_content;
+
+
+	/**
+	 * This is for the page title that gets displayed.  This will end up being the filename for the generated pdf.
+	 *
+	 * @var string
+	 */
+	protected $_subject;
+
+
+	/**
+	 * @return EE_Pdf_messenger
+	 */
+	public function __construct()
+	{
+		// set properties
+		$this->name = 'pdf';
+		$this->description = esc_html__('This messenger is used for generating a pdf version of the message.', 'event_espresso');
+		$this->label = array(
+			'singular' => esc_html__('PDF', 'event_espresso'),
+			'plural' => esc_html__('PDFs', 'event_espresso')
+		);
+		$this->activate_on_install = true;
+
+		parent::__construct();
+	}
+
+
+	/**
+	 * PDF Messenger desires execution immediately.
+	 * @see  parent::send_now() for documentation.
+	 * @since  4.9.0
+	 * @return bool
+	 */
+	public function send_now()
+	{
+		return true;
+	}
+
+
+	/**
+	 * HTML Messenger allows an empty to field.
+	 * @see parent::allow_empty_to_field() for documentation
+	 * @since  4.9.0
+	 * @return bool
+	 */
+	public function allow_empty_to_field()
+	{
+		return true;
+	}
+
+
+	/**
+	 * @see abstract declaration in EE_messenger for details.
+	 */
+	protected function _set_admin_pages()
+	{
+		$this->admin_registered_pages = array('events_edit' => false);
+	}
+
+
+	/**
+	 * @see abstract declaration in EE_messenger for details.
+	 */
+	protected function _set_valid_shortcodes()
+	{
+		$this->_valid_shortcodes = array();
+	}
+
+
+	/**
+	 * @see abstract declaration in EE_messenger for details.
+	 */
+	protected function _set_validator_config()
+	{
+		$this->_validator_config = array(
+			'subject' => array(
+				'shortcodes' => array('recipient_details', 'organization', 'event', 'ticket', 'venue', 'primary_registration_details', 'event_author', 'email', 'event_meta', 'recipient_list', 'transaction', 'datetime_list', 'datetime')
+			),
+			'content' => array(
+				'shortcodes' => array('recipient_details', 'organization', 'event', 'ticket', 'venue', 'primary_registration_details', 'event_author', 'email', 'event_meta', 'recipient_list', 'transaction', 'datetime_list', 'datetime')
+			),
+			'attendee_list' => array(
+				'shortcodes' => array('attendee', 'event_list', 'ticket_list'),
+				'required' => array('[ATTENDEE_LIST]')
+			),
+			'event_list' => array(
+				'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'venue', 'datetime_list', 'attendee', 'primary_registration_details', 'primary_registration_list', 'event_author', 'recipient_details', 'recipient_list'),
+				'required' => array('[EVENT_LIST]')
+			),
+			'ticket_list' => array(
+				'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'primary_registration_details', 'recipient_details'),
+				'required' => array('[TICKET_LIST]')
+			),
+			'datetime_list' => array(
+				'shortcodes' => array('datetime'),
+				'required' => array('[DATETIME_LIST]')
+			),
+		);
+	}
+
+
+	/**
+	 * Takes care of enqueuing any necessary scripts or styles for the page.  A do_action() so message types using this messenger can add their own js.
+	 *
+	 * @return void.
+	 */
+	public function enqueue_scripts_styles()
+	{
+		parent::enqueue_scripts_styles();
+		do_action('AHEE__EE_Pdf_messenger__enqueue_scripts_styles');
+	}
+
+
+	/**
+	 * _set_template_fields
+	 * This sets up the fields that a messenger requires for the message to go out.
+	 *
+	 * @access  protected
+	 * @return void
+	 */
+	protected function _set_template_fields()
+	{
+		// any extra template fields that are NOT used by the messenger but will get used by a messenger field for shortcode replacement get added to the 'extra' key in an associated array indexed by the messenger field they relate to.  This is important for the Messages_admin to know what fields to display to the user.  Also, notice that the "values" are equal to the field type that messages admin will use to know what kind of field to display. The values ALSO have one index labeled "shortcode".  the values in that array indicate which ACTUAL SHORTCODE (i.e. [SHORTCODE]) is required in order for this extra field to be displayed.  If the required shortcode isn't part of the shortcodes array then the field is not needed and will not be displayed/parsed.
+		$this->_template_fields = array(
+			'subject' => array(
+				'input' => 'text',
+				'label' => esc_html__('Page Title', 'event_espresso'),
+				'type' => 'string',
+				'required' => true,
+				'validation' => true,
+				'css_class' => 'large-text',
+				'format' => '%s'
+			),
+			'content' => '', // left empty b/c it is in the "extra array" but messenger still needs needs to know this is a field.
+			'extra' => array(
+				'content' => array(
+					'main' => array(
+						'input' => 'wp_editor',
+						'label' => esc_html__('Main Content', 'event_espresso'),
+						'type' => 'string',
+						'required' => true,
+						'validation' => true,
+						'format' => '%s',
+						'rows' => '15'
+					),
+					'event_list' => array(
+						'input' => 'wp_editor',
+						'label' => '[EVENT_LIST]',
+						'type' => 'string',
+						'required' => true,
+						'validation' => true,
+						'format' => '%s',
+						'rows' => '15',
+						'shortcodes_required' => array('[EVENT_LIST]')
+					),
+					'attendee_list' => array(
+						'input' => 'textarea',
+						'label' => '[ATTENDEE_LIST]',
+						'type' => 'string',
+						'required' => true,
+						'validation' => true,
+						'format' => '%s',
+						'css_class' => 'large-text',
+						'rows' => '5',
+						'shortcodes_required' => array('[ATTENDEE_LIST]')
+					),
+					'ticket_list' => array(
+						'input' => 'textarea',
+						'label' => '[TICKET_LIST]',
+						'type' => 'string',
+						'required' => true,
+						'validation' => true,
+						'format' => '%s',
+						'css_class' => 'large-text',
+						'rows' => '10',
+						'shortcodes_required' => array('[TICKET_LIST]')
+					),
+					'datetime_list' => array(
+						'input' => 'textarea',
+						'label' => '[DATETIME_LIST]',
+						'type' => 'string',
+						'required' => true,
+						'validation' => true,
+						'format' => '%s',
+						'css_class' => 'large-text',
+						'rows' => '10',
+						'shortcodes_required' => array('[DATETIME_LIST]')
+					)
+				)
+			)
+		);
+	}
+
+
+	/**
+	 * @see definition of this method in parent
+	 *
+	 * @since 4.5.0
+	 *
+	 */
+	protected function _set_default_message_types()
+	{
+		// note currently PDF is only a secondary messenger so it never has any associated message types.
+		$this->_default_message_types = array();
+	}
+
+
+	/**
+	 * @see definition of this method in parent
+	 *
+	 * @since 4.5.0
+	 */
+	protected function _set_valid_message_types()
+	{
+		$this->_valid_message_types = array();
+	}
+
+
+	/**
+	 * Generates html version of the message content and then sends it to the pdf generator.
+	 *
+	 *
+	 * @since 4.5.0
+	 *
+	 * @return string.
+	 */
+	protected function _send_message()
+	{
+		$this->_template_args = array(
+			'page_title' => $this->_subject,
+			'base_css' => $this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, true, 'base', $this->_variation),
+			'print_css' => $this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, true, 'print', $this->_variation),
+			'main_css' => $this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, true, 'main', $this->_variation),
+			'extra_css' => EE_LIBRARIES_URL . 'messages/defaults/default/variations/pdf_base_default.css',
+			'main_body' => apply_filters('FHEE__EE_Pdf_messenger___send_message__main_body', wpautop($this->_content), $this->_content)
+		);
+		$this->_deregister_wp_hooks();
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts_styles'));
+		$content = $this->_get_main_template();
 //      die( $content );
-        $this->_do_pdf($content);
-        exit(0);
-    }
-
-
-    /**
-     * The purpose of this function is to de register all actions hooked into wp_head and wp_footer so that it doesn't interfere with our templates.  If users want to add any custom styles or scripts they must use the AHEE__EE_Pdf_messenger__enqueue_scripts_styles hook.
-     *
-     * @since 4.5.0
-     *
-     * @return void
-     */
-    protected function _deregister_wp_hooks()
-    {
-        remove_all_actions('wp_head');
-        remove_all_actions('wp_footer');
-        remove_all_actions('wp_print_footer_scripts');
-        remove_all_actions('wp_enqueue_scripts');
-        global $wp_scripts, $wp_styles;
-        $wp_scripts = $wp_styles = array();
-
-        // just add back in wp_enqueue_scripts and wp_print_footer_scripts cause that's all we want to load.
-        add_action('wp_head', 'wp_enqueue_scripts');
-        add_action('wp_footer', 'wp_print_footer_scripts');
-        add_action('wp_print_footer_scripts', '_wp_footer_scripts');
-    }
-
-
-    /**
-     * Overwrite parent _get_main_template for pdf purposes.
-     *
-     * @since  4.5.0
-     *
-     * @param bool $preview
-     * @return string
-     */
-    protected function _get_main_template($preview = false)
-    {
-        $wrapper_template = $this->_tmp_pack->get_wrapper('html', 'main');
-        // add message type to template_args
-        $this->_template_args['message_type'] = $this->_incoming_message_type;
-        return EEH_Template::display_template($wrapper_template, $this->_template_args, true);
-    }
-
-
-    /**
-     * This takes care of loading the dompdf library and generating the actual pdf
-     *
-     * @param string $content This is the generated html content being converted into a pdf.
-     *
-     * @return void
-     */
-    protected function _do_pdf($content = '')
-    {
-        $invoice_name = $this->_subject;
-
-        // only load dompdf if nobody else has yet...
-        if (! class_exists('Dompdf\Dompdf')) {
-            require_once(EE_THIRD_PARTY . 'dompdf/src/Autoloader.php');
-            Dompdf\Autoloader::register();
-        }
-        $options = new Dompdf\Options();
-        $options->set('isRemoteEnabled', true);
-        $options->set('isJavascriptEnabled', false);
-        if (defined('DOMPDF_FONT_DIR')) {
-            $options->setFontDir(DOMPDF_FONT_DIR);
-            $options->setFontCache(DOMPDF_FONT_DIR);
-        }
-        // Allow changing the paper size.
-        if (defined('DOMPDF_DEFAULT_PAPER_SIZE')) {
-            $options->set('defaultPaperSize', DOMPDF_DEFAULT_PAPER_SIZE);
-        }
-        $dompdf = new Dompdf\Dompdf($options);
-        // Remove all spaces between HTML tags
-        $content = preg_replace('/>\s+</', '><', $content);
-        $dompdf->loadHtml($content);
-        $dompdf->render();
-        // forcing the browser to open a download dialog.
-        $dompdf->stream($invoice_name . ".pdf", array('Attachment' => true));
-    }
-
-
-    /**
-     * @return string
-     */
-    protected function _preview()
-    {
-        return $this->_send_message();
-    }
-
-
-    protected function _set_admin_settings_fields()
-    {
-    }
+		$this->_do_pdf($content);
+		exit(0);
+	}
+
+
+	/**
+	 * The purpose of this function is to de register all actions hooked into wp_head and wp_footer so that it doesn't interfere with our templates.  If users want to add any custom styles or scripts they must use the AHEE__EE_Pdf_messenger__enqueue_scripts_styles hook.
+	 *
+	 * @since 4.5.0
+	 *
+	 * @return void
+	 */
+	protected function _deregister_wp_hooks()
+	{
+		remove_all_actions('wp_head');
+		remove_all_actions('wp_footer');
+		remove_all_actions('wp_print_footer_scripts');
+		remove_all_actions('wp_enqueue_scripts');
+		global $wp_scripts, $wp_styles;
+		$wp_scripts = $wp_styles = array();
+
+		// just add back in wp_enqueue_scripts and wp_print_footer_scripts cause that's all we want to load.
+		add_action('wp_head', 'wp_enqueue_scripts');
+		add_action('wp_footer', 'wp_print_footer_scripts');
+		add_action('wp_print_footer_scripts', '_wp_footer_scripts');
+	}
+
+
+	/**
+	 * Overwrite parent _get_main_template for pdf purposes.
+	 *
+	 * @since  4.5.0
+	 *
+	 * @param bool $preview
+	 * @return string
+	 */
+	protected function _get_main_template($preview = false)
+	{
+		$wrapper_template = $this->_tmp_pack->get_wrapper('html', 'main');
+		// add message type to template_args
+		$this->_template_args['message_type'] = $this->_incoming_message_type;
+		return EEH_Template::display_template($wrapper_template, $this->_template_args, true);
+	}
+
+
+	/**
+	 * This takes care of loading the dompdf library and generating the actual pdf
+	 *
+	 * @param string $content This is the generated html content being converted into a pdf.
+	 *
+	 * @return void
+	 */
+	protected function _do_pdf($content = '')
+	{
+		$invoice_name = $this->_subject;
+
+		// only load dompdf if nobody else has yet...
+		if (! class_exists('Dompdf\Dompdf')) {
+			require_once(EE_THIRD_PARTY . 'dompdf/src/Autoloader.php');
+			Dompdf\Autoloader::register();
+		}
+		$options = new Dompdf\Options();
+		$options->set('isRemoteEnabled', true);
+		$options->set('isJavascriptEnabled', false);
+		if (defined('DOMPDF_FONT_DIR')) {
+			$options->setFontDir(DOMPDF_FONT_DIR);
+			$options->setFontCache(DOMPDF_FONT_DIR);
+		}
+		// Allow changing the paper size.
+		if (defined('DOMPDF_DEFAULT_PAPER_SIZE')) {
+			$options->set('defaultPaperSize', DOMPDF_DEFAULT_PAPER_SIZE);
+		}
+		$dompdf = new Dompdf\Dompdf($options);
+		// Remove all spaces between HTML tags
+		$content = preg_replace('/>\s+</', '><', $content);
+		$dompdf->loadHtml($content);
+		$dompdf->render();
+		// forcing the browser to open a download dialog.
+		$dompdf->stream($invoice_name . ".pdf", array('Attachment' => true));
+	}
+
+
+	/**
+	 * @return string
+	 */
+	protected function _preview()
+	{
+		return $this->_send_message();
+	}
+
+
+	protected function _set_admin_settings_fields()
+	{
+	}
 }

core/services/validators/URLValidator.php

Indentation +10 added lines, -10 removed lines

@@ -16,16 +16,16 @@
  */
 class URLValidator
 {
-    /**
-     * Returns whether or not the URL is valid
-     * @since 4.9.68.p
-     * @param $url
-     * @return boolean
-     */
-    public function isValid($url)
-    {
-        return  esc_url_raw($url) === $url;
-    }
+	/**
+	 * Returns whether or not the URL is valid
+	 * @since 4.9.68.p
+	 * @param $url
+	 * @return boolean
+	 */
+	public function isValid($url)
+	{
+		return  esc_url_raw($url) === $url;
+	}
 }
 // End of file URLValidator.php
 // Location: ${NAMESPACE}/URLValidator.php

core/db_models/EEM_Term.model.php

Spacing +25 added lines, -25 removed lines

@@ -44,43 +44,43 @@ 
         );
         $this->_wp_core_model = true;
         $path_to_tax_model = 'Term_Taxonomy';
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Taxonomy_Protected(
+        $this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
+        $this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Taxonomy_Protected(
             $path_to_tax_model
         );
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ] = false;
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ] = false;
-        $path_to_tax_model = $path_to_tax_model . '.';
+        $this->_cap_restriction_generators[EEM_Base::caps_edit] = false;
+        $this->_cap_restriction_generators[EEM_Base::caps_delete] = false;
+        $path_to_tax_model = $path_to_tax_model.'.';
         // add cap restrictions for editing relating to the "ee_edit_*"
-        $this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
+        $this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
             array(
-                $path_to_tax_model . 'taxonomy*ee_edit_event_category' => array('!=', 'espresso_event_categories'),
+                $path_to_tax_model.'taxonomy*ee_edit_event_category' => array('!=', 'espresso_event_categories'),
             )
         );
-        $this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
+        $this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
             array(
-                $path_to_tax_model . 'taxonomy*ee_edit_venue_category' => array('!=', 'espresso_venue_categories'),
+                $path_to_tax_model.'taxonomy*ee_edit_venue_category' => array('!=', 'espresso_venue_categories'),
             )
         );
-        $this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
+        $this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
             array(
-                $path_to_tax_model . 'taxonomy*ee_edit_event_type' => array('!=', 'espresso_event_type'),
+                $path_to_tax_model.'taxonomy*ee_edit_event_type' => array('!=', 'espresso_event_type'),
             )
         );
         // add cap restrictions for deleting relating to the "ee_deleting_*"
-        $this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
+        $this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
             array(
-                $path_to_tax_model . 'taxonomy*ee_delete_event_category' => array('!=', 'espresso_event_categories'),
+                $path_to_tax_model.'taxonomy*ee_delete_event_category' => array('!=', 'espresso_event_categories'),
             )
         );
-        $this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
+        $this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
             array(
-                $path_to_tax_model . 'taxonomy*ee_delete_venue_category' => array('!=', 'espresso_venue_categories'),
+                $path_to_tax_model.'taxonomy*ee_delete_venue_category' => array('!=', 'espresso_venue_categories'),
             )
         );
-        $this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
+        $this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
             array(
-                $path_to_tax_model . 'taxonomy*ee_delete_event_type' => array('!=', 'espresso_event_type'),
+                $path_to_tax_model.'taxonomy*ee_delete_event_type' => array('!=', 'espresso_event_type'),
             )
         );
         parent::__construct($timezone);
@@ -185,7 +185,7 @@ 
         }
         $post_tag_row = reset($post_tag_results);
         $post_tag = $this->instantiate_class_from_array_or_object($post_tag_row);
-        if (! $post_tag instanceof EE_Term) {
+        if ( ! $post_tag instanceof EE_Term) {
             return null;
         }
 
@@ -216,10 +216,10 @@ 
             )
         );
         foreach ($post_tags as $key => $post_tag) {
-            if (! isset($post_tags[ $key ]->post_type)) {
-                $post_tags[ $key ]->post_type = array();
+            if ( ! isset($post_tags[$key]->post_type)) {
+                $post_tags[$key]->post_type = array();
             }
-            $post_tags[ $key ]->post_type[] = 'espresso_events';
+            $post_tags[$key]->post_type[] = 'espresso_events';
         }
         return $post_tags;
     }
@@ -244,10 +244,10 @@ 
             )
         );
         foreach ($post_tags as $key => $post_tag) {
-            if (! isset($post_tags[ $key ]->post_type)) {
-                $post_tags[ $key ]->post_type = array();
+            if ( ! isset($post_tags[$key]->post_type)) {
+                $post_tags[$key]->post_type = array();
             }
-            $post_tags[ $key ]->post_type[] = 'espresso_venues';
+            $post_tags[$key]->post_type[] = 'espresso_venues';
         }
         return $post_tags;
     }
@@ -267,7 +267,7 @@ 
     {
         if ($model === EEM_Term::instance()) {
             $taxonomies = get_taxonomies(array('show_in_rest' => true));
-            if (! empty($taxonomies)) {
+            if ( ! empty($taxonomies)) {
                 $model_query_params[0]['Term_Taxonomy.taxonomy'] = array('IN', $taxonomies);
             }
         }

Indentation +237 added lines, -237 removed lines

@@ -14,263 +14,263 @@
 class EEM_Term extends EEM_Base
 {
 
-    // private instance of the Attendee object
-    protected static $_instance = null;
+	// private instance of the Attendee object
+	protected static $_instance = null;
 
 
 
-    /**
-     *__construct
-     *
-     * @param string $timezone
-     */
-    protected function __construct($timezone = null)
-    {
-        $this->singular_item = esc_html__('Term', 'event_espresso');
-        $this->plural_item = esc_html__('Terms', 'event_espresso');
-        $this->_tables = array(
-            'Term' => new EE_Primary_Table('terms', 'term_id'),
-        );
-        $this->_fields = array(
-            'Term' => array(
-                'term_id'    => new EE_Primary_Key_Int_Field('term_id', esc_html__('Term ID', 'event_espresso')),
-                'name'       => new EE_Plain_Text_Field('name', esc_html__('Term Name', 'event_espresso'), false, ''),
-                'slug'       => new EE_Slug_Field('slug', esc_html__('Term Slug', 'event_espresso'), false),
-                'term_group' => new EE_Integer_Field('term_group', esc_html__("Term Group", "event_espresso"), false, 0),
-            ),
-        );
-        $this->_model_relations = array(
-            'Term_Taxonomy' => new EE_Has_Many_Relation(),
-        );
-        $this->_wp_core_model = true;
-        $path_to_tax_model = 'Term_Taxonomy';
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Taxonomy_Protected(
-            $path_to_tax_model
-        );
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ] = false;
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ] = false;
-        $path_to_tax_model = $path_to_tax_model . '.';
-        // add cap restrictions for editing relating to the "ee_edit_*"
-        $this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
-            array(
-                $path_to_tax_model . 'taxonomy*ee_edit_event_category' => array('!=', 'espresso_event_categories'),
-            )
-        );
-        $this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
-            array(
-                $path_to_tax_model . 'taxonomy*ee_edit_venue_category' => array('!=', 'espresso_venue_categories'),
-            )
-        );
-        $this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
-            array(
-                $path_to_tax_model . 'taxonomy*ee_edit_event_type' => array('!=', 'espresso_event_type'),
-            )
-        );
-        // add cap restrictions for deleting relating to the "ee_deleting_*"
-        $this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
-            array(
-                $path_to_tax_model . 'taxonomy*ee_delete_event_category' => array('!=', 'espresso_event_categories'),
-            )
-        );
-        $this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
-            array(
-                $path_to_tax_model . 'taxonomy*ee_delete_venue_category' => array('!=', 'espresso_venue_categories'),
-            )
-        );
-        $this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
-            array(
-                $path_to_tax_model . 'taxonomy*ee_delete_event_type' => array('!=', 'espresso_event_type'),
-            )
-        );
-        parent::__construct($timezone);
-        add_filter('FHEE__Read__create_model_query_params', array('EEM_Term', 'rest_api_query_params'), 10, 3);
-    }
+	/**
+	 *__construct
+	 *
+	 * @param string $timezone
+	 */
+	protected function __construct($timezone = null)
+	{
+		$this->singular_item = esc_html__('Term', 'event_espresso');
+		$this->plural_item = esc_html__('Terms', 'event_espresso');
+		$this->_tables = array(
+			'Term' => new EE_Primary_Table('terms', 'term_id'),
+		);
+		$this->_fields = array(
+			'Term' => array(
+				'term_id'    => new EE_Primary_Key_Int_Field('term_id', esc_html__('Term ID', 'event_espresso')),
+				'name'       => new EE_Plain_Text_Field('name', esc_html__('Term Name', 'event_espresso'), false, ''),
+				'slug'       => new EE_Slug_Field('slug', esc_html__('Term Slug', 'event_espresso'), false),
+				'term_group' => new EE_Integer_Field('term_group', esc_html__("Term Group", "event_espresso"), false, 0),
+			),
+		);
+		$this->_model_relations = array(
+			'Term_Taxonomy' => new EE_Has_Many_Relation(),
+		);
+		$this->_wp_core_model = true;
+		$path_to_tax_model = 'Term_Taxonomy';
+		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Taxonomy_Protected(
+			$path_to_tax_model
+		);
+		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = false;
+		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = false;
+		$path_to_tax_model = $path_to_tax_model . '.';
+		// add cap restrictions for editing relating to the "ee_edit_*"
+		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
+			array(
+				$path_to_tax_model . 'taxonomy*ee_edit_event_category' => array('!=', 'espresso_event_categories'),
+			)
+		);
+		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
+			array(
+				$path_to_tax_model . 'taxonomy*ee_edit_venue_category' => array('!=', 'espresso_venue_categories'),
+			)
+		);
+		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
+			array(
+				$path_to_tax_model . 'taxonomy*ee_edit_event_type' => array('!=', 'espresso_event_type'),
+			)
+		);
+		// add cap restrictions for deleting relating to the "ee_deleting_*"
+		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
+			array(
+				$path_to_tax_model . 'taxonomy*ee_delete_event_category' => array('!=', 'espresso_event_categories'),
+			)
+		);
+		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
+			array(
+				$path_to_tax_model . 'taxonomy*ee_delete_venue_category' => array('!=', 'espresso_venue_categories'),
+			)
+		);
+		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
+			array(
+				$path_to_tax_model . 'taxonomy*ee_delete_event_type' => array('!=', 'espresso_event_type'),
+			)
+		);
+		parent::__construct($timezone);
+		add_filter('FHEE__Read__create_model_query_params', array('EEM_Term', 'rest_api_query_params'), 10, 3);
+	}
 
 
 
-    /**
-     * retrieves a list of all EE event categories
-     *
-     * @access public
-     * @param bool $show_uncategorized
-     * @return \EE_Base_Class[]
-     */
-    public function get_all_ee_categories($show_uncategorized = false)
-    {
-        $where_params = array(
-            'Term_Taxonomy.taxonomy' => 'espresso_event_categories',
-            'NOT'                    => array('name' => esc_html__('Uncategorized', 'event_espresso')),
-        );
-        if ($show_uncategorized) {
-            unset($where_params['NOT']);
-        }
-        return EEM_Term::instance()->get_all(
-            array(
-                $where_params,
-                'order_by' => array('name' => 'ASC'),
-            )
-        );
-    }
+	/**
+	 * retrieves a list of all EE event categories
+	 *
+	 * @access public
+	 * @param bool $show_uncategorized
+	 * @return \EE_Base_Class[]
+	 */
+	public function get_all_ee_categories($show_uncategorized = false)
+	{
+		$where_params = array(
+			'Term_Taxonomy.taxonomy' => 'espresso_event_categories',
+			'NOT'                    => array('name' => esc_html__('Uncategorized', 'event_espresso')),
+		);
+		if ($show_uncategorized) {
+			unset($where_params['NOT']);
+		}
+		return EEM_Term::instance()->get_all(
+			array(
+				$where_params,
+				'order_by' => array('name' => 'ASC'),
+			)
+		);
+	}
 
 
 
-    /**
-     * retrieves a list of all post_tags associated with an EE CPT
-     *
-     * @access public
-     * @param string $post_type
-     * @return array
-     */
-    public function get_all_CPT_post_tags($post_type = '')
-    {
-        switch ($post_type) {
-            case 'espresso_events':
-                return $this->get_all_event_post_tags();
-                break;
-            case 'espresso_venues':
-                return $this->get_all_venue_post_tags();
-                break;
-            default:
-                $event_tags = $this->get_all_event_post_tags();
-                $venue_tags = $this->get_all_venue_post_tags();
-                return array_merge($event_tags, $venue_tags);
-        }
-    }
+	/**
+	 * retrieves a list of all post_tags associated with an EE CPT
+	 *
+	 * @access public
+	 * @param string $post_type
+	 * @return array
+	 */
+	public function get_all_CPT_post_tags($post_type = '')
+	{
+		switch ($post_type) {
+			case 'espresso_events':
+				return $this->get_all_event_post_tags();
+				break;
+			case 'espresso_venues':
+				return $this->get_all_venue_post_tags();
+				break;
+			default:
+				$event_tags = $this->get_all_event_post_tags();
+				$venue_tags = $this->get_all_venue_post_tags();
+				return array_merge($event_tags, $venue_tags);
+		}
+	}
 
 
-    /**
-     * returns an EE_Term object for the given tag
-     * if it has been utilized by any EE_Events or EE_Venues
-     *
-     * @param string $tag
-     * @return EE_Term|null
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function get_post_tag_for_event_or_venue($tag)
-    {
-        $post_tag_results = $this->get_all_wpdb_results(
-            array(
-                array(
-                    'slug' => $tag,
-                    'Term_Taxonomy.taxonomy' => 'post_tag',
-                    'OR' => array(
-                        'Term_Taxonomy.Venue.post_type' => 'espresso_venues',
-                        'Term_Taxonomy.Event.post_type' => 'espresso_events',
-                    ),
-                ),
-                'default_where_conditions' => 'none',
-                'extra_selects' => array(
-                    'event_post_type' => array('Term_Taxonomy___Event_CPT.post_type', '%s'),
-                    'venue_post_type' => array('Term_Taxonomy___Venue_CPT.post_type', '%s')
-                ),
-                'group_by' => array(
-                    'event_post_type',
-                    'venue_post_type',
-                ),
-                'limit' => 2
-            )
-        );
+	/**
+	 * returns an EE_Term object for the given tag
+	 * if it has been utilized by any EE_Events or EE_Venues
+	 *
+	 * @param string $tag
+	 * @return EE_Term|null
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function get_post_tag_for_event_or_venue($tag)
+	{
+		$post_tag_results = $this->get_all_wpdb_results(
+			array(
+				array(
+					'slug' => $tag,
+					'Term_Taxonomy.taxonomy' => 'post_tag',
+					'OR' => array(
+						'Term_Taxonomy.Venue.post_type' => 'espresso_venues',
+						'Term_Taxonomy.Event.post_type' => 'espresso_events',
+					),
+				),
+				'default_where_conditions' => 'none',
+				'extra_selects' => array(
+					'event_post_type' => array('Term_Taxonomy___Event_CPT.post_type', '%s'),
+					'venue_post_type' => array('Term_Taxonomy___Venue_CPT.post_type', '%s')
+				),
+				'group_by' => array(
+					'event_post_type',
+					'venue_post_type',
+				),
+				'limit' => 2
+			)
+		);
 
-        $post_types = array();
-        foreach ((array) $post_tag_results as $row) {
-            if ($row['event_post_type'] === 'espresso_events') {
-                $post_types[] = EEM_Event::instance()->post_type();
-            } elseif ($row['venue_post_type'] === 'espresso_venues') {
-                $post_types[] = EEM_Venue::instance()->post_type();
-            }
-        }
-        $post_tag_row = reset($post_tag_results);
-        $post_tag = $this->instantiate_class_from_array_or_object($post_tag_row);
-        if (! $post_tag instanceof EE_Term) {
-            return null;
-        }
+		$post_types = array();
+		foreach ((array) $post_tag_results as $row) {
+			if ($row['event_post_type'] === 'espresso_events') {
+				$post_types[] = EEM_Event::instance()->post_type();
+			} elseif ($row['venue_post_type'] === 'espresso_venues') {
+				$post_types[] = EEM_Venue::instance()->post_type();
+			}
+		}
+		$post_tag_row = reset($post_tag_results);
+		$post_tag = $this->instantiate_class_from_array_or_object($post_tag_row);
+		if (! $post_tag instanceof EE_Term) {
+			return null;
+		}
 
-        if ($post_tag->post_type === null) {
-            $post_tag->post_type = array();
-        }
-        $post_tag->post_type = array_merge($post_tag->post_type, array_unique($post_types));
-        return $post_tag;
-    }
+		if ($post_tag->post_type === null) {
+			$post_tag->post_type = array();
+		}
+		$post_tag->post_type = array_merge($post_tag->post_type, array_unique($post_types));
+		return $post_tag;
+	}
 
 
 
-    /**
-     * get_all_event_post_tags
-     *
-     * @return EE_Base_Class[]
-     */
-    public function get_all_event_post_tags()
-    {
-        $post_tags = EEM_Term::instance()->get_all(
-            array(
-                array(
-                    'Term_Taxonomy.taxonomy'        => 'post_tag',
-                    'Term_Taxonomy.Event.post_type' => 'espresso_events',
-                ),
-                'order_by'   => array('name' => 'ASC'),
-                'force_join' => array('Term_Taxonomy.Event'),
-            )
-        );
-        foreach ($post_tags as $key => $post_tag) {
-            if (! isset($post_tags[ $key ]->post_type)) {
-                $post_tags[ $key ]->post_type = array();
-            }
-            $post_tags[ $key ]->post_type[] = 'espresso_events';
-        }
-        return $post_tags;
-    }
+	/**
+	 * get_all_event_post_tags
+	 *
+	 * @return EE_Base_Class[]
+	 */
+	public function get_all_event_post_tags()
+	{
+		$post_tags = EEM_Term::instance()->get_all(
+			array(
+				array(
+					'Term_Taxonomy.taxonomy'        => 'post_tag',
+					'Term_Taxonomy.Event.post_type' => 'espresso_events',
+				),
+				'order_by'   => array('name' => 'ASC'),
+				'force_join' => array('Term_Taxonomy.Event'),
+			)
+		);
+		foreach ($post_tags as $key => $post_tag) {
+			if (! isset($post_tags[ $key ]->post_type)) {
+				$post_tags[ $key ]->post_type = array();
+			}
+			$post_tags[ $key ]->post_type[] = 'espresso_events';
+		}
+		return $post_tags;
+	}
 
 
 
-    /**
-     * get_all_venue_post_tags
-     *
-     * @return EE_Base_Class[]
-     */
-    public function get_all_venue_post_tags()
-    {
-        $post_tags = EEM_Term::instance()->get_all(
-            array(
-                array(
-                    'Term_Taxonomy.taxonomy'        => 'post_tag',
-                    'Term_Taxonomy.Venue.post_type' => 'espresso_venues',
-                ),
-                'order_by'   => array('name' => 'ASC'),
-                'force_join' => array('Term_Taxonomy'),
-            )
-        );
-        foreach ($post_tags as $key => $post_tag) {
-            if (! isset($post_tags[ $key ]->post_type)) {
-                $post_tags[ $key ]->post_type = array();
-            }
-            $post_tags[ $key ]->post_type[] = 'espresso_venues';
-        }
-        return $post_tags;
-    }
+	/**
+	 * get_all_venue_post_tags
+	 *
+	 * @return EE_Base_Class[]
+	 */
+	public function get_all_venue_post_tags()
+	{
+		$post_tags = EEM_Term::instance()->get_all(
+			array(
+				array(
+					'Term_Taxonomy.taxonomy'        => 'post_tag',
+					'Term_Taxonomy.Venue.post_type' => 'espresso_venues',
+				),
+				'order_by'   => array('name' => 'ASC'),
+				'force_join' => array('Term_Taxonomy'),
+			)
+		);
+		foreach ($post_tags as $key => $post_tag) {
+			if (! isset($post_tags[ $key ]->post_type)) {
+				$post_tags[ $key ]->post_type = array();
+			}
+			$post_tags[ $key ]->post_type[] = 'espresso_venues';
+		}
+		return $post_tags;
+	}
 
 
 
-    /**
-     * Makes sure that during REST API queries, we only return terms
-     * for term taxonomies which should be shown in the rest api
-     *
-     * @param array    $model_query_params
-     * @param array    $querystring_query_params
-     * @param EEM_Base $model
-     * @return array
-     */
-    public static function rest_api_query_params($model_query_params, $querystring_query_params, $model)
-    {
-        if ($model === EEM_Term::instance()) {
-            $taxonomies = get_taxonomies(array('show_in_rest' => true));
-            if (! empty($taxonomies)) {
-                $model_query_params[0]['Term_Taxonomy.taxonomy'] = array('IN', $taxonomies);
-            }
-        }
-        return $model_query_params;
-    }
+	/**
+	 * Makes sure that during REST API queries, we only return terms
+	 * for term taxonomies which should be shown in the rest api
+	 *
+	 * @param array    $model_query_params
+	 * @param array    $querystring_query_params
+	 * @param EEM_Base $model
+	 * @return array
+	 */
+	public static function rest_api_query_params($model_query_params, $querystring_query_params, $model)
+	{
+		if ($model === EEM_Term::instance()) {
+			$taxonomies = get_taxonomies(array('show_in_rest' => true));
+			if (! empty($taxonomies)) {
+				$model_query_params[0]['Term_Taxonomy.taxonomy'] = array('IN', $taxonomies);
+			}
+		}
+		return $model_query_params;
+	}
 }

core/domain/services/contexts/RequestTypeContextFactoryInterface.php

Indentation +5 added lines, -5 removed lines

@@ -15,9 +15,9 @@
 interface RequestTypeContextFactoryInterface
 {
 
-    /**
-     * @param string $slug
-     * @return RequestTypeContext
-     */
-    public function create($slug);
+	/**
+	 * @param string $slug
+	 * @return RequestTypeContext
+	 */
+	public function create($slug);
 }

core/services/request/middleware/SetRequestTypeContextChecker.php

Indentation +37 added lines, -37 removed lines

@@ -18,41 +18,41 @@
 class SetRequestTypeContextChecker extends Middleware
 {
 
-    /**
-     * converts a Request to a Response
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @return ResponseInterface
-     * @throws InvalidArgumentException
-     */
-    public function handleRequest(RequestInterface $request, ResponseInterface $response)
-    {
-        $this->request  = $request;
-        $this->response = $response;
-        /** @var RequestTypeContextDetector $request_type_context_detector */
-        $request_type_context_detector = $this->loader->getShared(
-            'EventEspresso\core\domain\services\contexts\RequestTypeContextDetector',
-            array(
-                $this->request,
-                $this->loader->getShared(
-                    'EventEspresso\core\domain\services\contexts\RequestTypeContextFactory',
-                    array($this->loader)
-                ),
-                array(
-                    'DOING_AJAX' => defined('DOING_AJAX') && DOING_AJAX,
-                    'WP_CLI'     => defined('WP_CLI') && WP_CLI,
-                    'is_admin'   => is_admin(),
-                )
-            )
-        );
-        $request_type_context          = $request_type_context_detector->detectRequestTypeContext();
-        $request_type_context_checker  = $this->loader->getShared(
-            'EventEspresso\core\domain\services\contexts\RequestTypeContextChecker',
-            array($request_type_context)
-        );
-        $this->request->setRequestTypeContextChecker($request_type_context_checker);
-        $this->response = $this->processRequestStack($this->request, $this->response);
-        return $this->response;
-    }
+	/**
+	 * converts a Request to a Response
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @return ResponseInterface
+	 * @throws InvalidArgumentException
+	 */
+	public function handleRequest(RequestInterface $request, ResponseInterface $response)
+	{
+		$this->request  = $request;
+		$this->response = $response;
+		/** @var RequestTypeContextDetector $request_type_context_detector */
+		$request_type_context_detector = $this->loader->getShared(
+			'EventEspresso\core\domain\services\contexts\RequestTypeContextDetector',
+			array(
+				$this->request,
+				$this->loader->getShared(
+					'EventEspresso\core\domain\services\contexts\RequestTypeContextFactory',
+					array($this->loader)
+				),
+				array(
+					'DOING_AJAX' => defined('DOING_AJAX') && DOING_AJAX,
+					'WP_CLI'     => defined('WP_CLI') && WP_CLI,
+					'is_admin'   => is_admin(),
+				)
+			)
+		);
+		$request_type_context          = $request_type_context_detector->detectRequestTypeContext();
+		$request_type_context_checker  = $this->loader->getShared(
+			'EventEspresso\core\domain\services\contexts\RequestTypeContextChecker',
+			array($request_type_context)
+		);
+		$this->request->setRequestTypeContextChecker($request_type_context_checker);
+		$this->response = $this->processRequestStack($this->request, $this->response);
+		return $this->response;
+	}
 }

core/libraries/form_sections/inputs/EE_Country_Select_Input.php

Indentation +70 added lines, -70 removed lines

@@ -14,80 +14,80 @@
  */
 class EE_Country_Select_Input extends EE_Select_Input
 {
-    /**
-     * $input_settings key used for detecting the "get" option
-     */
-    const OPTION_GET_KEY = 'get';
+	/**
+	 * $input_settings key used for detecting the "get" option
+	 */
+	const OPTION_GET_KEY = 'get';
 
-    /**
-     * indicates that ALL countries should be retrieved from the db for the input
-     */
-    const OPTION_GET_ALL = 'all';
+	/**
+	 * indicates that ALL countries should be retrieved from the db for the input
+	 */
+	const OPTION_GET_ALL = 'all';
 
-    /**
-     * indicates that only ACTIVE countries should be retrieved from the db for the input
-     */
-    const OPTION_GET_ACTIVE = 'active';
+	/**
+	 * indicates that only ACTIVE countries should be retrieved from the db for the input
+	 */
+	const OPTION_GET_ACTIVE = 'active';
 
 
-    /**
-     * @param array $country_options
-     * @param array $input_settings
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function __construct($country_options = null, $input_settings = array())
-    {
-        $get = isset($input_settings[ self::OPTION_GET_KEY ])
-            ? $input_settings[ self::OPTION_GET_KEY ]
-            : self::OPTION_GET_ACTIVE;
-        $country_options = apply_filters(
-            'FHEE__EE_Country_Select_Input____construct__country_options',
-            $this->get_country_answer_options($country_options, $get),
-            $this,
-            $get
-        );
-        $input_settings['html_class'] = isset($input_settings['html_class'])
-            ? $input_settings['html_class'] . ' ee-country-select-js'
-            : 'ee-country-select-js';
-        parent::__construct($country_options, $input_settings);
-    }
+	/**
+	 * @param array $country_options
+	 * @param array $input_settings
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function __construct($country_options = null, $input_settings = array())
+	{
+		$get = isset($input_settings[ self::OPTION_GET_KEY ])
+			? $input_settings[ self::OPTION_GET_KEY ]
+			: self::OPTION_GET_ACTIVE;
+		$country_options = apply_filters(
+			'FHEE__EE_Country_Select_Input____construct__country_options',
+			$this->get_country_answer_options($country_options, $get),
+			$this,
+			$get
+		);
+		$input_settings['html_class'] = isset($input_settings['html_class'])
+			? $input_settings['html_class'] . ' ee-country-select-js'
+			: 'ee-country-select-js';
+		parent::__construct($country_options, $input_settings);
+	}
 
 
-    /**
-     * get_country_answer_options
-     *
-     * @param array  $country_options
-     * @param string $get
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function get_country_answer_options($country_options = null, $get = self::OPTION_GET_ACTIVE)
-    {
-        // if passed something that is NOT an array
-        if (! is_array($country_options)) {
-            // get possibly cached list of countries
-            $countries = $get === self::OPTION_GET_ALL
-                ? EEM_Country::instance()->get_all_countries()
-                : EEM_Country::instance()->get_all_active_countries();
-            if (! empty($countries)) {
-                $country_options[''] = '';
-                foreach ($countries as $country) {
-                    if ($country instanceof EE_Country) {
-                        $country_options[ $country->ID() ] = $country->name();
-                    }
-                }
-            } else {
-                $country_options = array();
-            }
-        }
-        return $country_options;
-    }
+	/**
+	 * get_country_answer_options
+	 *
+	 * @param array  $country_options
+	 * @param string $get
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function get_country_answer_options($country_options = null, $get = self::OPTION_GET_ACTIVE)
+	{
+		// if passed something that is NOT an array
+		if (! is_array($country_options)) {
+			// get possibly cached list of countries
+			$countries = $get === self::OPTION_GET_ALL
+				? EEM_Country::instance()->get_all_countries()
+				: EEM_Country::instance()->get_all_active_countries();
+			if (! empty($countries)) {
+				$country_options[''] = '';
+				foreach ($countries as $country) {
+					if ($country instanceof EE_Country) {
+						$country_options[ $country->ID() ] = $country->name();
+					}
+				}
+			} else {
+				$country_options = array();
+			}
+		}
+		return $country_options;
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -41,8 +41,8 @@ 
      */
     public function __construct($country_options = null, $input_settings = array())
     {
-        $get = isset($input_settings[ self::OPTION_GET_KEY ])
-            ? $input_settings[ self::OPTION_GET_KEY ]
+        $get = isset($input_settings[self::OPTION_GET_KEY])
+            ? $input_settings[self::OPTION_GET_KEY]
             : self::OPTION_GET_ACTIVE;
         $country_options = apply_filters(
             'FHEE__EE_Country_Select_Input____construct__country_options',
@@ -51,7 +51,7 @@ 
             $get
         );
         $input_settings['html_class'] = isset($input_settings['html_class'])
-            ? $input_settings['html_class'] . ' ee-country-select-js'
+            ? $input_settings['html_class'].' ee-country-select-js'
             : 'ee-country-select-js';
         parent::__construct($country_options, $input_settings);
     }
@@ -72,16 +72,16 @@ 
     public function get_country_answer_options($country_options = null, $get = self::OPTION_GET_ACTIVE)
     {
         // if passed something that is NOT an array
-        if (! is_array($country_options)) {
+        if ( ! is_array($country_options)) {
             // get possibly cached list of countries
             $countries = $get === self::OPTION_GET_ALL
                 ? EEM_Country::instance()->get_all_countries()
                 : EEM_Country::instance()->get_all_active_countries();
-            if (! empty($countries)) {
+            if ( ! empty($countries)) {
                 $country_options[''] = '';
                 foreach ($countries as $country) {
                     if ($country instanceof EE_Country) {
-                        $country_options[ $country->ID() ] = $country->name();
+                        $country_options[$country->ID()] = $country->name();
                     }
                 }
             } else {