eventespresso / event-espresso-core

admin_pages/venues/espresso_events_Venues_Hooks.class.php

Spacing +10 added lines, -10 removed lines

@@ -37,18 +37,18 @@ 
                 'priority'   => 'high',
                 'context'    => 'normal',
             ),
-        );/**/
+        ); /**/
 
         $this->_scripts_styles = array(
             'registers' => array(
                 'ee_event_venues'     => array(
                     'type'    => 'js',
-                    'url'     => EE_VENUES_ASSETS_URL . 'ee-event-venues-admin.js',
+                    'url'     => EE_VENUES_ASSETS_URL.'ee-event-venues-admin.js',
                     'depends' => array('jquery'),
                 ),
                 'ee_event_venues_css' => array(
                     'type' => 'css',
-                    'url'  => EE_VENUES_ASSETS_URL . 'ee-event-venues-admin.css',
+                    'url'  => EE_VENUES_ASSETS_URL.'ee-event-venues-admin.css',
                 ),
             ),
             'enqueues'  => array(
@@ -74,7 +74,7 @@ 
         // first remove default venue callback
         foreach ($callbacks as $key => $callback) {
             if ($callback[1] == '_default_venue_update') {
-                unset($callbacks[ $key ]);
+                unset($callbacks[$key]);
             }
         }
 
@@ -102,7 +102,7 @@ 
         }
 
         // cap checks
-        if (! EE_Registry::instance()->CAP->current_user_can('ee_read_others_venues', 'get_venues')) {
+        if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_venues', 'get_venues')) {
             $vnu_where['VNU_wp_user'] = get_current_user_id();
         }
 
@@ -113,14 +113,14 @@ 
         $ven_select[0] = __('Select a Venue', 'event_espresso');
         // setup venues for selector
         foreach ($venues as $venue) {
-            $ven_select[ $venue->ID() ] = $venue->name();
+            $ven_select[$venue->ID()] = $venue->name();
         }
 
         // if $ven_select does not have the existing venue attached to event then let's add that because we'll always
         // show existing attached venues even if it's trashed (or some other restricted status).
 
-        if ($evt_venue_id && ! isset($ven_select[ $evt_venue_id ])) {
-            $ven_select[ $evt_venue_id ] = $evt_venue->name();
+        if ($evt_venue_id && ! isset($ven_select[$evt_venue_id])) {
+            $ven_select[$evt_venue_id] = $evt_venue->name();
             $venues = array_merge($venues, array($evt_venue));
         }
 
@@ -184,7 +184,7 @@ 
         );
 
         $template_path = empty($venues) ? EE_VENUES_TEMPLATE_PATH . 'event_venues_metabox_content.template.php'
-            : EE_VENUES_TEMPLATE_PATH . 'event_venues_metabox_content_from_manager.template.php';
+            : EE_VENUES_TEMPLATE_PATH.'event_venues_metabox_content_from_manager.template.php';
 
         // Allow events venue metabox template args filtering.
         $template_args = apply_filters(
@@ -207,7 +207,7 @@ 
         $evt_venue = $evtobj->venues();
         $evt_venue = ! empty($evt_venue) ? array_shift($evt_venue) : null;
 
-        if (! empty($evt_venue) && $evt_venue->ID() != $venue_id) {
+        if ( ! empty($evt_venue) && $evt_venue->ID() != $venue_id) {
             $evtobj->_remove_relation_to($evt_venue->ID(), 'Venue');
         }
 

Indentation +203 added lines, -203 removed lines

@@ -16,207 +16,207 @@
 {
 
 
-    protected $_event;
-
-
-    public function __construct(EE_Admin_Page $admin_page)
-    {
-        parent::__construct($admin_page);
-    }
-
-
-    protected function _set_hooks_properties()
-    {
-        $this->_name = 'venues';
-
-        $this->_metaboxes = array(
-            0 => array(
-                'page_route' => array('edit', 'create_new'),
-                'func'       => 'venue_metabox',
-                'label'      => __('Venue Details', 'event_espresso'),
-                'priority'   => 'high',
-                'context'    => 'normal',
-            ),
-        );/**/
-
-        $this->_scripts_styles = array(
-            'registers' => array(
-                'ee_event_venues'     => array(
-                    'type'    => 'js',
-                    'url'     => EE_VENUES_ASSETS_URL . 'ee-event-venues-admin.js',
-                    'depends' => array('jquery'),
-                ),
-                'ee_event_venues_css' => array(
-                    'type' => 'css',
-                    'url'  => EE_VENUES_ASSETS_URL . 'ee-event-venues-admin.css',
-                ),
-            ),
-            'enqueues'  => array(
-                'ee_event_venues'     => array('edit', 'create_new'),
-                'ee_event_venues_css' => array('edit', 'create_new'),
-            ),
-        );
-
-        // hook into the handler for saving venue
-        add_filter(
-            'FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks',
-            array($this, 'modify_callbacks'),
-            10
-        );
-
-        // remove default ee_autosave returns for DECAF venues (not needed for CAF venues cause we have a dropdown selector)
-        add_filter('FHEE__Events_Admin_Page__ee_autosave_edit_do_decaf_venue_save', '__return_false');
-    }
-
-
-    public function modify_callbacks($callbacks)
-    {
-        // first remove default venue callback
-        foreach ($callbacks as $key => $callback) {
-            if ($callback[1] == '_default_venue_update') {
-                unset($callbacks[ $key ]);
-            }
-        }
-
-        // now let's add the caf version
-        $callbacks[] = array($this, 'caf_venue_update');
-        return $callbacks;
-    }
-
-
-    public function venue_metabox()
-    {
-        $evt_obj = $this->_adminpage_obj->get_event_object();
-        $evt_id = $evt_obj->ID();
-
-        // first let's see if we have a venue already
-        $evt_venues = ! empty($evt_id) ? $evt_obj->venues() : array();
-        $evt_venue = $evt_venues && is_array($evt_venues) ? reset($evt_venues) : null;
-        $evt_venue_id = $evt_venue instanceof EE_Venue ? $evt_venue->ID() : null;
-
-        // possibly private venues.
-        if (EE_Registry::instance()->CAP->current_user_can('ee_read_private_venues', 'get_venues')) {
-            $vnu_where['status'] = array('IN', array('publish', 'private'));
-        } else {
-            $vnu_where['status'] = 'publish';
-        }
-
-        // cap checks
-        if (! EE_Registry::instance()->CAP->current_user_can('ee_read_others_venues', 'get_venues')) {
-            $vnu_where['VNU_wp_user'] = get_current_user_id();
-        }
-
-        $vnumdl = EE_Registry::instance()->load_model('Venue');
-        $venues = $vnumdl->get_all(array($vnu_where, 'order_by' => array('VNU_name' => 'ASC')));
-
-        $ven_select = array();
-        $ven_select[0] = __('Select a Venue', 'event_espresso');
-        // setup venues for selector
-        foreach ($venues as $venue) {
-            $ven_select[ $venue->ID() ] = $venue->name();
-        }
-
-        // if $ven_select does not have the existing venue attached to event then let's add that because we'll always
-        // show existing attached venues even if it's trashed (or some other restricted status).
-
-        if ($evt_venue_id && ! isset($ven_select[ $evt_venue_id ])) {
-            $ven_select[ $evt_venue_id ] = $evt_venue->name();
-            $venues = array_merge($venues, array($evt_venue));
-        }
-
-        $template_args['venues'] = $venues;
-        $template_args['evt_venue_id'] = $evt_venue_id;
-        $venue_selector = new EE_Select_Input(
-            $ven_select,
-            array(
-                'html_name'  => 'venue_id',
-                'html_id'    => 'venue_id',
-                'html_class' => 'wide',
-                'default'    => $evt_venue_id ? $evt_venue_id : '0'
-            )
-        );
-        $template_args['venue_selector'] = $venue_selector->get_html_for_input();
-        $enable_for_gmap = new EE_Yes_No_Input(
-            array(
-                'html_name'  => 'enable_for_gmap',
-                'html_id'    => 'enable_for_gmap',
-                'default'    => $evt_venue instanceof EE_Venue ? $evt_venue->enable_for_gmap() : false
-            )
-        );
-        $template_args['enable_for_gmap'] = $enable_for_gmap->get_html_for_input();
-        $template_args['new_venue_link'] = EEH_HTML::link(
-            EE_Admin_Page::add_query_args_and_nonce(
-                array('action' => 'create_new'),
-                EE_VENUES_ADMIN_URL
-            ),
-            esc_html_x('Add new Venue', 'a link to add a new venue', 'event_espresso'),
-            esc_html_x('Add new Venue', 'a link to add a new venue', 'event_espresso'),
-            'ev_new_venue_link',
-            'button',
-            'margin-left:10px;',
-            'target="_blank"'
-        );
-
-        // Decide on an info text when there are no venues to display.
-        $no_venues_info_txt = esc_html_x(
-            'You have not created any venues yet.',
-            'Information text displayed in the venues metabox when there are no venues to display',
-            'event_espresso'
-        );
-        if (empty($venues)) {
-            $unpublished_where = $vnu_where;
-            $unpublished_where['status'] = 'draft';
-            $unpublished_venues = $vnumdl->get_all(array($unpublished_where, 'order_by' => array('VNU_name' => 'ASC')));
-            if (count($unpublished_venues) > 0) {
-                $no_venues_info_txt = esc_html_x(
-                // @codingStandardsIgnoreStart
-                    'Use the link below to publish your venue through the venue editor so it appears here for selection.',
-                    // @codingStandardsIgnoreEnd
-                    'Information text displayed in the venues metabox when there are no venues to display',
-                    'event_espresso'
-                );
-            }
-        }
-        $template_args['no_venues_info'] = EEH_HTML::p(
-            EEH_HTML::strong($no_venues_info_txt),
-            'no_venues_info',
-            'info'
-        );
-
-        $template_path = empty($venues) ? EE_VENUES_TEMPLATE_PATH . 'event_venues_metabox_content.template.php'
-            : EE_VENUES_TEMPLATE_PATH . 'event_venues_metabox_content_from_manager.template.php';
-
-        // Allow events venue metabox template args filtering.
-        $template_args = apply_filters(
-            'FHEE__espresso_events_Venues_Hooks___venue_metabox__template_args',
-            $template_args,
-            $template_path
-        );
-
-        EEH_Template::display_template($template_path, $template_args);
-    }
-
-
-    public function caf_venue_update($evtobj, $data)
-    {
-        EE_Registry::instance()->load_model('Venue');
-        $venue_id = ! empty($data['venue_id']) ? $data['venue_id'] : null;
-
-
-        // first let's check if the selected venue matches any existing venue attached to the event
-        $evt_venue = $evtobj->venues();
-        $evt_venue = ! empty($evt_venue) ? array_shift($evt_venue) : null;
-
-        if (! empty($evt_venue) && $evt_venue->ID() != $venue_id) {
-            $evtobj->_remove_relation_to($evt_venue->ID(), 'Venue');
-        }
-
-        if (empty($venue_id)) {
-            return true;
-        } //no venue to attach
-
-        // this should take care of adding to revisions as well as main post object
-        $success = $evtobj->_add_relation_to($venue_id, 'Venue');
-        return ! empty($success) ? true : false;
-    }
+	protected $_event;
+
+
+	public function __construct(EE_Admin_Page $admin_page)
+	{
+		parent::__construct($admin_page);
+	}
+
+
+	protected function _set_hooks_properties()
+	{
+		$this->_name = 'venues';
+
+		$this->_metaboxes = array(
+			0 => array(
+				'page_route' => array('edit', 'create_new'),
+				'func'       => 'venue_metabox',
+				'label'      => __('Venue Details', 'event_espresso'),
+				'priority'   => 'high',
+				'context'    => 'normal',
+			),
+		);/**/
+
+		$this->_scripts_styles = array(
+			'registers' => array(
+				'ee_event_venues'     => array(
+					'type'    => 'js',
+					'url'     => EE_VENUES_ASSETS_URL . 'ee-event-venues-admin.js',
+					'depends' => array('jquery'),
+				),
+				'ee_event_venues_css' => array(
+					'type' => 'css',
+					'url'  => EE_VENUES_ASSETS_URL . 'ee-event-venues-admin.css',
+				),
+			),
+			'enqueues'  => array(
+				'ee_event_venues'     => array('edit', 'create_new'),
+				'ee_event_venues_css' => array('edit', 'create_new'),
+			),
+		);
+
+		// hook into the handler for saving venue
+		add_filter(
+			'FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks',
+			array($this, 'modify_callbacks'),
+			10
+		);
+
+		// remove default ee_autosave returns for DECAF venues (not needed for CAF venues cause we have a dropdown selector)
+		add_filter('FHEE__Events_Admin_Page__ee_autosave_edit_do_decaf_venue_save', '__return_false');
+	}
+
+
+	public function modify_callbacks($callbacks)
+	{
+		// first remove default venue callback
+		foreach ($callbacks as $key => $callback) {
+			if ($callback[1] == '_default_venue_update') {
+				unset($callbacks[ $key ]);
+			}
+		}
+
+		// now let's add the caf version
+		$callbacks[] = array($this, 'caf_venue_update');
+		return $callbacks;
+	}
+
+
+	public function venue_metabox()
+	{
+		$evt_obj = $this->_adminpage_obj->get_event_object();
+		$evt_id = $evt_obj->ID();
+
+		// first let's see if we have a venue already
+		$evt_venues = ! empty($evt_id) ? $evt_obj->venues() : array();
+		$evt_venue = $evt_venues && is_array($evt_venues) ? reset($evt_venues) : null;
+		$evt_venue_id = $evt_venue instanceof EE_Venue ? $evt_venue->ID() : null;
+
+		// possibly private venues.
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_private_venues', 'get_venues')) {
+			$vnu_where['status'] = array('IN', array('publish', 'private'));
+		} else {
+			$vnu_where['status'] = 'publish';
+		}
+
+		// cap checks
+		if (! EE_Registry::instance()->CAP->current_user_can('ee_read_others_venues', 'get_venues')) {
+			$vnu_where['VNU_wp_user'] = get_current_user_id();
+		}
+
+		$vnumdl = EE_Registry::instance()->load_model('Venue');
+		$venues = $vnumdl->get_all(array($vnu_where, 'order_by' => array('VNU_name' => 'ASC')));
+
+		$ven_select = array();
+		$ven_select[0] = __('Select a Venue', 'event_espresso');
+		// setup venues for selector
+		foreach ($venues as $venue) {
+			$ven_select[ $venue->ID() ] = $venue->name();
+		}
+
+		// if $ven_select does not have the existing venue attached to event then let's add that because we'll always
+		// show existing attached venues even if it's trashed (or some other restricted status).
+
+		if ($evt_venue_id && ! isset($ven_select[ $evt_venue_id ])) {
+			$ven_select[ $evt_venue_id ] = $evt_venue->name();
+			$venues = array_merge($venues, array($evt_venue));
+		}
+
+		$template_args['venues'] = $venues;
+		$template_args['evt_venue_id'] = $evt_venue_id;
+		$venue_selector = new EE_Select_Input(
+			$ven_select,
+			array(
+				'html_name'  => 'venue_id',
+				'html_id'    => 'venue_id',
+				'html_class' => 'wide',
+				'default'    => $evt_venue_id ? $evt_venue_id : '0'
+			)
+		);
+		$template_args['venue_selector'] = $venue_selector->get_html_for_input();
+		$enable_for_gmap = new EE_Yes_No_Input(
+			array(
+				'html_name'  => 'enable_for_gmap',
+				'html_id'    => 'enable_for_gmap',
+				'default'    => $evt_venue instanceof EE_Venue ? $evt_venue->enable_for_gmap() : false
+			)
+		);
+		$template_args['enable_for_gmap'] = $enable_for_gmap->get_html_for_input();
+		$template_args['new_venue_link'] = EEH_HTML::link(
+			EE_Admin_Page::add_query_args_and_nonce(
+				array('action' => 'create_new'),
+				EE_VENUES_ADMIN_URL
+			),
+			esc_html_x('Add new Venue', 'a link to add a new venue', 'event_espresso'),
+			esc_html_x('Add new Venue', 'a link to add a new venue', 'event_espresso'),
+			'ev_new_venue_link',
+			'button',
+			'margin-left:10px;',
+			'target="_blank"'
+		);
+
+		// Decide on an info text when there are no venues to display.
+		$no_venues_info_txt = esc_html_x(
+			'You have not created any venues yet.',
+			'Information text displayed in the venues metabox when there are no venues to display',
+			'event_espresso'
+		);
+		if (empty($venues)) {
+			$unpublished_where = $vnu_where;
+			$unpublished_where['status'] = 'draft';
+			$unpublished_venues = $vnumdl->get_all(array($unpublished_where, 'order_by' => array('VNU_name' => 'ASC')));
+			if (count($unpublished_venues) > 0) {
+				$no_venues_info_txt = esc_html_x(
+				// @codingStandardsIgnoreStart
+					'Use the link below to publish your venue through the venue editor so it appears here for selection.',
+					// @codingStandardsIgnoreEnd
+					'Information text displayed in the venues metabox when there are no venues to display',
+					'event_espresso'
+				);
+			}
+		}
+		$template_args['no_venues_info'] = EEH_HTML::p(
+			EEH_HTML::strong($no_venues_info_txt),
+			'no_venues_info',
+			'info'
+		);
+
+		$template_path = empty($venues) ? EE_VENUES_TEMPLATE_PATH . 'event_venues_metabox_content.template.php'
+			: EE_VENUES_TEMPLATE_PATH . 'event_venues_metabox_content_from_manager.template.php';
+
+		// Allow events venue metabox template args filtering.
+		$template_args = apply_filters(
+			'FHEE__espresso_events_Venues_Hooks___venue_metabox__template_args',
+			$template_args,
+			$template_path
+		);
+
+		EEH_Template::display_template($template_path, $template_args);
+	}
+
+
+	public function caf_venue_update($evtobj, $data)
+	{
+		EE_Registry::instance()->load_model('Venue');
+		$venue_id = ! empty($data['venue_id']) ? $data['venue_id'] : null;
+
+
+		// first let's check if the selected venue matches any existing venue attached to the event
+		$evt_venue = $evtobj->venues();
+		$evt_venue = ! empty($evt_venue) ? array_shift($evt_venue) : null;
+
+		if (! empty($evt_venue) && $evt_venue->ID() != $venue_id) {
+			$evtobj->_remove_relation_to($evt_venue->ID(), 'Venue');
+		}
+
+		if (empty($venue_id)) {
+			return true;
+		} //no venue to attach
+
+		// this should take care of adding to revisions as well as main post object
+		$success = $evtobj->_add_relation_to($venue_id, 'Venue');
+		return ! empty($success) ? true : false;
+	}
 }

admin_pages/venues/templates/event_venues_metabox_content_from_manager.template.php

Indentation +11 added lines, -11 removed lines

@@ -5,14 +5,14 @@ 
             <?php echo $venue_selector; ?>
             <?php echo $new_venue_link; ?>
             <?php foreach ($venues as $venue) :
-                $selected = $evt_venue_id == $venue->ID() ? '' : ' style="display:none;"';
-                $edit_url = EE_Admin_Page::add_query_args_and_nonce(
-                    array('action' => 'edit', 'post' => $venue->ID()),
-                    EE_VENUES_ADMIN_URL
-                );
-                $state_name = is_object($venue->state_obj()) ? $venue->state_obj()->name() : null;
-                $country_name = is_object($venue->country_obj()) ? $venue->country_obj()->name() : null;
-                ?>
+				$selected = $evt_venue_id == $venue->ID() ? '' : ' style="display:none;"';
+				$edit_url = EE_Admin_Page::add_query_args_and_nonce(
+					array('action' => 'edit', 'post' => $venue->ID()),
+					EE_VENUES_ADMIN_URL
+				);
+				$state_name = is_object($venue->state_obj()) ? $venue->state_obj()->name() : null;
+				$country_name = is_object($venue->country_obj()) ? $venue->country_obj()->name() : null;
+				?>
                 <fieldset id="eebox_<?php echo $venue->ID(); ?>" class="eebox"<?php echo $selected; ?>>
                     <ul class="address-view">
                         <li>
@@ -27,9 +27,9 @@ 
                                 <br/></p>
                             <a href="<?php echo $edit_url; ?>" target="_blank">
                                 <?php _e(
-                                    'Edit this Venue',
-                                    'event_espresso'
-                                ); ?></a>
+									'Edit this Venue',
+									'event_espresso'
+								); ?></a>
                         </li>
                     </ul>
                 </fieldset>

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);
 }

admin_pages/venues/templates/event_venues_metabox_content.template.php

Indentation +3 added lines, -3 removed lines

@@ -5,9 +5,9 @@
                 <?php echo $no_venues_info; ?>
                 <p><a href="admin.php?page=espresso_venues" target="_blank">
                         <?php echo __(
-                            'Add venues to the Venue Manager',
-                            'event_espresso'
-                        ) ?></a></p>
+							'Add venues to the Venue Manager',
+							'event_espresso'
+						) ?></a></p>
             </fieldset>
         </td>
     </tr>

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 {

core/services/validators/JsonValidator.php

Spacing +6 added lines, -6 removed lines

@@ -32,19 +32,19 @@ 
      */
     public function isValid($file, $func, $line)
     {
-        if (! defined('JSON_ERROR_RECURSION')) {
+        if ( ! defined('JSON_ERROR_RECURSION')) {
             define('JSON_ERROR_RECURSION', 6);
         }
-        if (! defined('JSON_ERROR_INF_OR_NAN')) {
+        if ( ! defined('JSON_ERROR_INF_OR_NAN')) {
             define('JSON_ERROR_INF_OR_NAN', 7);
         }
-        if (! defined('JSON_ERROR_UNSUPPORTED_TYPE')) {
+        if ( ! defined('JSON_ERROR_UNSUPPORTED_TYPE')) {
             define('JSON_ERROR_UNSUPPORTED_TYPE', 8);
         }
-        if (! defined('JSON_ERROR_INVALID_PROPERTY_NAME')) {
+        if ( ! defined('JSON_ERROR_INVALID_PROPERTY_NAME')) {
             define('JSON_ERROR_INVALID_PROPERTY_NAME', 9);
         }
-        if (! defined('JSON_ERROR_UTF16')) {
+        if ( ! defined('JSON_ERROR_UTF16')) {
             define('JSON_ERROR_UTF16', 10);
         }
         switch (json_last_error()) {
@@ -84,7 +84,7 @@ 
                 $error = ': Unknown error';
                 break;
         }
-        EE_Error::add_error('JSON decoding failed' . $error, $file, $func, $line);
+        EE_Error::add_error('JSON decoding failed'.$error, $file, $func, $line);
         return false;
     }
 }

Indentation +72 added lines, -72 removed lines

@@ -18,76 +18,76 @@
 class JsonValidator
 {
 
-    /**
-     * Call this method IMMEDIATELY after json_decode() and
-     * it will will return true if the decoded JSON was valid,
-     * or return false after adding an error if not valid.
-     * The actual JSON file does not need to be supplied,
-     * but details re: code execution location are required.
-     * ex:
-     * JsonValidator::isValid(__FILE__, __METHOD__, __LINE__)
-     *
-     * @param string $file
-     * @param string $func
-     * @param string $line
-     * @return boolean
-     * @since 4.9.70.p
-     */
-    public function isValid($file, $func, $line)
-    {
-        if (! defined('JSON_ERROR_RECURSION')) {
-            define('JSON_ERROR_RECURSION', 6);
-        }
-        if (! defined('JSON_ERROR_INF_OR_NAN')) {
-            define('JSON_ERROR_INF_OR_NAN', 7);
-        }
-        if (! defined('JSON_ERROR_UNSUPPORTED_TYPE')) {
-            define('JSON_ERROR_UNSUPPORTED_TYPE', 8);
-        }
-        if (! defined('JSON_ERROR_INVALID_PROPERTY_NAME')) {
-            define('JSON_ERROR_INVALID_PROPERTY_NAME', 9);
-        }
-        if (! defined('JSON_ERROR_UTF16')) {
-            define('JSON_ERROR_UTF16', 10);
-        }
-        switch (json_last_error()) {
-            case JSON_ERROR_NONE:
-                return true;
-            case JSON_ERROR_DEPTH:
-                $error = ': Maximum stack depth exceeded';
-                break;
-            case JSON_ERROR_STATE_MISMATCH:
-                $error = ': Invalid or malformed JSON';
-                break;
-            case JSON_ERROR_CTRL_CHAR:
-                $error = ': Control character error, possible malformed JSON';
-                break;
-            case JSON_ERROR_SYNTAX:
-                $error = ': Syntax error, malformed JSON';
-                break;
-            case JSON_ERROR_UTF8:
-                $error = ': Malformed UTF-8 characters, possible malformed JSON';
-                break;
-            case JSON_ERROR_RECURSION:
-                $error = ': One or more recursive references in the value to be encoded';
-                break;
-            case JSON_ERROR_INF_OR_NAN:
-                $error = ': One or more NAN or INF values in the value to be encoded';
-                break;
-            case JSON_ERROR_UNSUPPORTED_TYPE:
-                $error = ': A value of a type that cannot be encoded was given';
-                break;
-            case JSON_ERROR_INVALID_PROPERTY_NAME:
-                $error = ': A property name that cannot be encoded was given';
-                break;
-            case JSON_ERROR_UTF16:
-                $error = ': Malformed UTF-16 characters, possibly incorrectly encoded';
-                break;
-            default:
-                $error = ': Unknown error';
-                break;
-        }
-        EE_Error::add_error('JSON decoding failed' . $error, $file, $func, $line);
-        return false;
-    }
+	/**
+	 * Call this method IMMEDIATELY after json_decode() and
+	 * it will will return true if the decoded JSON was valid,
+	 * or return false after adding an error if not valid.
+	 * The actual JSON file does not need to be supplied,
+	 * but details re: code execution location are required.
+	 * ex:
+	 * JsonValidator::isValid(__FILE__, __METHOD__, __LINE__)
+	 *
+	 * @param string $file
+	 * @param string $func
+	 * @param string $line
+	 * @return boolean
+	 * @since 4.9.70.p
+	 */
+	public function isValid($file, $func, $line)
+	{
+		if (! defined('JSON_ERROR_RECURSION')) {
+			define('JSON_ERROR_RECURSION', 6);
+		}
+		if (! defined('JSON_ERROR_INF_OR_NAN')) {
+			define('JSON_ERROR_INF_OR_NAN', 7);
+		}
+		if (! defined('JSON_ERROR_UNSUPPORTED_TYPE')) {
+			define('JSON_ERROR_UNSUPPORTED_TYPE', 8);
+		}
+		if (! defined('JSON_ERROR_INVALID_PROPERTY_NAME')) {
+			define('JSON_ERROR_INVALID_PROPERTY_NAME', 9);
+		}
+		if (! defined('JSON_ERROR_UTF16')) {
+			define('JSON_ERROR_UTF16', 10);
+		}
+		switch (json_last_error()) {
+			case JSON_ERROR_NONE:
+				return true;
+			case JSON_ERROR_DEPTH:
+				$error = ': Maximum stack depth exceeded';
+				break;
+			case JSON_ERROR_STATE_MISMATCH:
+				$error = ': Invalid or malformed JSON';
+				break;
+			case JSON_ERROR_CTRL_CHAR:
+				$error = ': Control character error, possible malformed JSON';
+				break;
+			case JSON_ERROR_SYNTAX:
+				$error = ': Syntax error, malformed JSON';
+				break;
+			case JSON_ERROR_UTF8:
+				$error = ': Malformed UTF-8 characters, possible malformed JSON';
+				break;
+			case JSON_ERROR_RECURSION:
+				$error = ': One or more recursive references in the value to be encoded';
+				break;
+			case JSON_ERROR_INF_OR_NAN:
+				$error = ': One or more NAN or INF values in the value to be encoded';
+				break;
+			case JSON_ERROR_UNSUPPORTED_TYPE:
+				$error = ': A value of a type that cannot be encoded was given';
+				break;
+			case JSON_ERROR_INVALID_PROPERTY_NAME:
+				$error = ': A property name that cannot be encoded was given';
+				break;
+			case JSON_ERROR_UTF16:
+				$error = ': Malformed UTF-16 characters, possibly incorrectly encoded';
+				break;
+			default:
+				$error = ': Unknown error';
+				break;
+		}
+		EE_Error::add_error('JSON decoding failed' . $error, $file, $func, $line);
+		return false;
+	}
 }

core/domain/services/blocks/EventAttendeesBlockRenderer.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
         $template_args['attributes'] = $attributes;
         $template_args['attendees'] = $this->attendee_model->get_all($this->getQueryParams($attributes));
         return EEH_Template::display_template(
-            $this->templateRootPath() . 'event-attendees.php',
+            $this->templateRootPath().'event-attendees.php',
             $template_args,
             true
         );

Indentation +118 added lines, -118 removed lines

@@ -20,133 +20,133 @@
 class EventAttendeesBlockRenderer extends BlockRenderer
 {
 
-    /**
-     * @var EEM_Attendee
-     */
-    private $attendee_model;
+	/**
+	 * @var EEM_Attendee
+	 */
+	private $attendee_model;
 
-    public function __construct(DomainInterface $domain, EEM_Attendee $attendee_model)
-    {
-        $this->attendee_model = $attendee_model;
-        parent::__construct($domain);
-    }
+	public function __construct(DomainInterface $domain, EEM_Attendee $attendee_model)
+	{
+		$this->attendee_model = $attendee_model;
+		parent::__construct($domain);
+	}
 
 
-    /**
-     * Renders the block.
-     *
-     * @param array $attributes  Expect already validated and sanitized array of attributes for use in generating the
-     *                           query and the template output.
-     * @return string
-     * @throws DomainException
-     * @throws EE_Error
-     */
-    public function render(array $attributes)
-    {
-        $attributes = $this->parseGlobalIDs($attributes);
-        $template_args['attributes'] = $attributes;
-        $template_args['attendees'] = $this->attendee_model->get_all($this->getQueryParams($attributes));
-        return EEH_Template::display_template(
-            $this->templateRootPath() . 'event-attendees.php',
-            $template_args,
-            true
-        );
-    }
+	/**
+	 * Renders the block.
+	 *
+	 * @param array $attributes  Expect already validated and sanitized array of attributes for use in generating the
+	 *                           query and the template output.
+	 * @return string
+	 * @throws DomainException
+	 * @throws EE_Error
+	 */
+	public function render(array $attributes)
+	{
+		$attributes = $this->parseGlobalIDs($attributes);
+		$template_args['attributes'] = $attributes;
+		$template_args['attendees'] = $this->attendee_model->get_all($this->getQueryParams($attributes));
+		return EEH_Template::display_template(
+			$this->templateRootPath() . 'event-attendees.php',
+			$template_args,
+			true
+		);
+	}
 
 
-    /**
-     * Get query parameters for model query.
-     *
-     * @param array $attributes
-     * @return array
-     */
-    private function parseGlobalIDs(array $attributes)
-    {
-        // if ticket ID is set, then that's all we need to run the query
-        $ticket = isset($attributes['ticket']) ? $attributes['ticket'] : '';
-        $datetime = isset($attributes['datetime']) ? $attributes['datetime'] : '';
-        $event = isset($attributes['event']) ? $attributes['event'] : '';
-        if ($ticket !== '') {
-            $ticketId = $this->parseGUID($ticket);
-            $attributes['ticketId'] = $ticketId;
-        } elseif ($datetime !== '') {
-            $datetimeId = $this->parseGUID($datetime);
-            $attributes['datetimeId'] = $datetimeId;
-        } elseif ($event !== '') {
-            $eventId = $this->parseGUID($event);
-            $attributes['eventId'] = $eventId;
-        }
-        // remove unnecessary data so it doesn't get added to the query vars
-        unset($attributes['ticket'], $attributes['datetime'], $attributes['event']);
-        return $attributes;
-    }
+	/**
+	 * Get query parameters for model query.
+	 *
+	 * @param array $attributes
+	 * @return array
+	 */
+	private function parseGlobalIDs(array $attributes)
+	{
+		// if ticket ID is set, then that's all we need to run the query
+		$ticket = isset($attributes['ticket']) ? $attributes['ticket'] : '';
+		$datetime = isset($attributes['datetime']) ? $attributes['datetime'] : '';
+		$event = isset($attributes['event']) ? $attributes['event'] : '';
+		if ($ticket !== '') {
+			$ticketId = $this->parseGUID($ticket);
+			$attributes['ticketId'] = $ticketId;
+		} elseif ($datetime !== '') {
+			$datetimeId = $this->parseGUID($datetime);
+			$attributes['datetimeId'] = $datetimeId;
+		} elseif ($event !== '') {
+			$eventId = $this->parseGUID($event);
+			$attributes['eventId'] = $eventId;
+		}
+		// remove unnecessary data so it doesn't get added to the query vars
+		unset($attributes['ticket'], $attributes['datetime'], $attributes['event']);
+		return $attributes;
+	}
 
 
-    /**
-     * Get query parameters for model query.
-     *
-     * @param array $attributes
-     * @return array
-     */
-    private function getQueryParams(array $attributes)
-    {
-        return array(
-            0 => $this->getWhereQueryPart($attributes),
-            'default_where_conditions' => 'this_model_only',
-            'limit' => $attributes['limit'],
-            'group_by' => array('ATT_ID'),
-            'order_by' => $this->getOrderByQueryPart($attributes)
-        );
-    }
+	/**
+	 * Get query parameters for model query.
+	 *
+	 * @param array $attributes
+	 * @return array
+	 */
+	private function getQueryParams(array $attributes)
+	{
+		return array(
+			0 => $this->getWhereQueryPart($attributes),
+			'default_where_conditions' => 'this_model_only',
+			'limit' => $attributes['limit'],
+			'group_by' => array('ATT_ID'),
+			'order_by' => $this->getOrderByQueryPart($attributes)
+		);
+	}
 
 
-    /**
-     * Get where query part for query parameters for model query.
-     *
-     * @param array $attributes
-     * @return array
-     */
-    private function getWhereQueryPart(array $attributes)
-    {
-        $where = array();
-        if ($attributes['ticketId'] > 0) {
-            $where['Registration.TKT_ID'] = $attributes['ticketId'];
-        } elseif ($attributes['datetimeId'] > 0) {
-            $where['Registration.Ticket.Datetime.DTT_ID'] = $attributes['datetimeId'];
-        } else {
-            $where['Registration.EVT_ID'] = $attributes['eventId'];
-        }
-        $where['Registration.STS_ID'] = $attributes['status'];
-        return $where;
-    }
+	/**
+	 * Get where query part for query parameters for model query.
+	 *
+	 * @param array $attributes
+	 * @return array
+	 */
+	private function getWhereQueryPart(array $attributes)
+	{
+		$where = array();
+		if ($attributes['ticketId'] > 0) {
+			$where['Registration.TKT_ID'] = $attributes['ticketId'];
+		} elseif ($attributes['datetimeId'] > 0) {
+			$where['Registration.Ticket.Datetime.DTT_ID'] = $attributes['datetimeId'];
+		} else {
+			$where['Registration.EVT_ID'] = $attributes['eventId'];
+		}
+		$where['Registration.STS_ID'] = $attributes['status'];
+		return $where;
+	}
 
 
-    /**
-     * Get order by query part for query parameters for model query.
-     *
-     * @param array $attributes
-     * @return array
-     */
-    private function getOrderByQueryPart(array $attributes)
-    {
-        $order = $attributes['order'];
-        switch ($attributes['orderBy']) {
-            case 'id':
-                $order_by = array('ATT_ID' => $order);
-                break;
-            case 'lastNameOnly':
-                $order_by = array('ATT_lname' => $order);
-                break;
-            case 'firstNameOnly':
-                $order_by = array('ATT_fname' => $order);
-                break;
-            case 'firstThenLastName':
-                $order_by = array('ATT_fname' => $order, 'ATT_lname' => $order);
-                break;
-            default:
-                $order_by = array('ATT_lname' => $order, 'ATT_fname' => $order);
-                break;
-        }
-        return $order_by;
-    }
+	/**
+	 * Get order by query part for query parameters for model query.
+	 *
+	 * @param array $attributes
+	 * @return array
+	 */
+	private function getOrderByQueryPart(array $attributes)
+	{
+		$order = $attributes['order'];
+		switch ($attributes['orderBy']) {
+			case 'id':
+				$order_by = array('ATT_ID' => $order);
+				break;
+			case 'lastNameOnly':
+				$order_by = array('ATT_lname' => $order);
+				break;
+			case 'firstNameOnly':
+				$order_by = array('ATT_fname' => $order);
+				break;
+			case 'firstThenLastName':
+				$order_by = array('ATT_fname' => $order, 'ATT_lname' => $order);
+				break;
+			default:
+				$order_by = array('ATT_lname' => $order, 'ATT_fname' => $order);
+				break;
+		}
+		return $order_by;
+	}
 }

core/services/blocks/BlockRendererInterface.php

Indentation +7 added lines, -7 removed lines

@@ -14,11 +14,11 @@
 interface BlockRendererInterface
 {
 
-    /**
-     * This receives an array of attributes and returns rendered content for the block using those attributes.
-     *
-     * @param array $attributes
-     * @return string Rendered Content
-     */
-    public function render(array $attributes);
+	/**
+	 * This receives an array of attributes and returns rendered content for the block using those attributes.
+	 *
+	 * @param array $attributes
+	 * @return string Rendered Content
+	 */
+	public function render(array $attributes);
 }

core/services/blocks/BlockRenderer.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
      */
     private function setTemplateRootPath()
     {
-        $this->template_root_path = $this->domain->pluginPath() . 'ui/blocks/';
+        $this->template_root_path = $this->domain->pluginPath().'ui/blocks/';
     }
 
 

Indentation +44 added lines, -44 removed lines

@@ -15,57 +15,57 @@
 abstract class BlockRenderer implements BlockRendererInterface
 {
 
-    /**
-     * @var DomainInterface
-     */
-    protected $domain;
+	/**
+	 * @var DomainInterface
+	 */
+	protected $domain;
 
-    /**
-     * @var string
-     */
-    private $template_root_path;
+	/**
+	 * @var string
+	 */
+	private $template_root_path;
 
 
-    /**
-     * BlockRenderer constructor.
-     *
-     * @param DomainInterface $domain
-     */
-    public function __construct(DomainInterface $domain)
-    {
-        $this->domain = $domain;
-        $this->setTemplateRootPath();
-    }
+	/**
+	 * BlockRenderer constructor.
+	 *
+	 * @param DomainInterface $domain
+	 */
+	public function __construct(DomainInterface $domain)
+	{
+		$this->domain = $domain;
+		$this->setTemplateRootPath();
+	}
 
 
-    /**
-     * Sets the root path to the main block template.
-     */
-    private function setTemplateRootPath()
-    {
-        $this->template_root_path = $this->domain->pluginPath() . 'ui/blocks/';
-    }
+	/**
+	 * Sets the root path to the main block template.
+	 */
+	private function setTemplateRootPath()
+	{
+		$this->template_root_path = $this->domain->pluginPath() . 'ui/blocks/';
+	}
 
 
-    /**
-     * Exposes the root path for the main block template.
-     * @return string
-     */
-    public function templateRootPath()
-    {
-        return $this->template_root_path;
-    }
+	/**
+	 * Exposes the root path for the main block template.
+	 * @return string
+	 */
+	public function templateRootPath()
+	{
+		return $this->template_root_path;
+	}
 
 
-    /**
-     * converts GraphQL GUID into EE DB ID
-     *
-     * @param string $GUID
-     * @return int
-     */
-    protected function parseGUID($GUID)
-    {
-        $parts = Relay::fromGlobalId($GUID);
-        return ! empty($parts['id']) ? $parts['id'] : 0;
-    }
+	/**
+	 * converts GraphQL GUID into EE DB ID
+	 *
+	 * @param string $GUID
+	 * @return int
+	 */
+	protected function parseGUID($GUID)
+	{
+		$parts = Relay::fromGlobalId($GUID);
+		return ! empty($parts['id']) ? $parts['id'] : 0;
+	}
 }