@@ -15,11 +15,11 @@ |
||
| 15 | 15 | interface FactoryInterface |
| 16 | 16 | { |
| 17 | 17 | |
| 18 | - /** |
|
| 19 | - * @param mixed $arguments |
|
| 20 | - * @return mixed |
|
| 21 | - */ |
|
| 22 | - public static function create($arguments); |
|
| 18 | + /** |
|
| 19 | + * @param mixed $arguments |
|
| 20 | + * @return mixed |
|
| 21 | + */ |
|
| 22 | + public static function create($arguments); |
|
| 23 | 23 | |
| 24 | 24 | |
| 25 | 25 | } |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | $email_address, |
| 35 | 35 | $this->getAtIndex($email_address) |
| 36 | 36 | ); |
| 37 | - if (! checkdnsrr($domain, 'MX')) { |
|
| 37 | + if ( ! checkdnsrr($domain, 'MX')) { |
|
| 38 | 38 | // domain not found in MX records |
| 39 | 39 | throw new EmailValidationException( |
| 40 | 40 | __( |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | ) |
| 46 | 46 | ); |
| 47 | 47 | } |
| 48 | - if (! checkdnsrr($domain, 'A')) { |
|
| 48 | + if ( ! checkdnsrr($domain, 'A')) { |
|
| 49 | 49 | // domain not found in A records |
| 50 | 50 | throw new EmailValidationException( |
| 51 | 51 | __( |
@@ -15,43 +15,43 @@ |
||
| 15 | 15 | class InternationalDNS extends International |
| 16 | 16 | { |
| 17 | 17 | |
| 18 | - /** |
|
| 19 | - * Validates the email in teh same way as the parent, but also |
|
| 20 | - * verifies the domain exists. |
|
| 21 | - * |
|
| 22 | - * @param string $email_address |
|
| 23 | - * @return bool |
|
| 24 | - * @throws EmailValidationException |
|
| 25 | - */ |
|
| 26 | - public function validate($email_address) |
|
| 27 | - { |
|
| 28 | - parent::validate($email_address); |
|
| 29 | - $domain = $this->getDomainPartOfEmail( |
|
| 30 | - $email_address, |
|
| 31 | - $this->getAtIndex($email_address) |
|
| 32 | - ); |
|
| 33 | - if (! checkdnsrr($domain, 'MX')) { |
|
| 34 | - // domain not found in MX records |
|
| 35 | - throw new EmailValidationException( |
|
| 36 | - __( |
|
| 37 | - // @codingStandardsIgnoreStart |
|
| 38 | - 'Although the email address provided is formatted correctly, a valid "MX record" could not be located for that address and domain. Please enter a valid email address.', |
|
| 39 | - // @codingStandardsIgnoreEnd |
|
| 40 | - 'event_espresso' |
|
| 41 | - ) |
|
| 42 | - ); |
|
| 43 | - } |
|
| 44 | - if (! checkdnsrr($domain, 'A')) { |
|
| 45 | - // domain not found in A records |
|
| 46 | - throw new EmailValidationException( |
|
| 47 | - __( |
|
| 48 | - // @codingStandardsIgnoreStart |
|
| 49 | - 'Although the email address provided is formatted correctly, a valid "A record" could not be located for that address and domain. Please enter a valid email address.', |
|
| 50 | - // @codingStandardsIgnoreEnd |
|
| 51 | - 'event_espresso' |
|
| 52 | - ) |
|
| 53 | - ); |
|
| 54 | - } |
|
| 55 | - return true; |
|
| 56 | - } |
|
| 18 | + /** |
|
| 19 | + * Validates the email in teh same way as the parent, but also |
|
| 20 | + * verifies the domain exists. |
|
| 21 | + * |
|
| 22 | + * @param string $email_address |
|
| 23 | + * @return bool |
|
| 24 | + * @throws EmailValidationException |
|
| 25 | + */ |
|
| 26 | + public function validate($email_address) |
|
| 27 | + { |
|
| 28 | + parent::validate($email_address); |
|
| 29 | + $domain = $this->getDomainPartOfEmail( |
|
| 30 | + $email_address, |
|
| 31 | + $this->getAtIndex($email_address) |
|
| 32 | + ); |
|
| 33 | + if (! checkdnsrr($domain, 'MX')) { |
|
| 34 | + // domain not found in MX records |
|
| 35 | + throw new EmailValidationException( |
|
| 36 | + __( |
|
| 37 | + // @codingStandardsIgnoreStart |
|
| 38 | + 'Although the email address provided is formatted correctly, a valid "MX record" could not be located for that address and domain. Please enter a valid email address.', |
|
| 39 | + // @codingStandardsIgnoreEnd |
|
| 40 | + 'event_espresso' |
|
| 41 | + ) |
|
| 42 | + ); |
|
| 43 | + } |
|
| 44 | + if (! checkdnsrr($domain, 'A')) { |
|
| 45 | + // domain not found in A records |
|
| 46 | + throw new EmailValidationException( |
|
| 47 | + __( |
|
| 48 | + // @codingStandardsIgnoreStart |
|
| 49 | + 'Although the email address provided is formatted correctly, a valid "A record" could not be located for that address and domain. Please enter a valid email address.', |
|
| 50 | + // @codingStandardsIgnoreEnd |
|
| 51 | + 'event_espresso' |
|
| 52 | + ) |
|
| 53 | + ); |
|
| 54 | + } |
|
| 55 | + return true; |
|
| 56 | + } |
|
| 57 | 57 | } |
@@ -18,14 +18,14 @@ |
||
| 18 | 18 | interface EmailValidatorInterface |
| 19 | 19 | { |
| 20 | 20 | |
| 21 | - /** |
|
| 22 | - * Validates the supplied email address. If it is invalid, throws EmailValidationException |
|
| 23 | - * |
|
| 24 | - * @param string $email_address |
|
| 25 | - * @return boolean |
|
| 26 | - * @throws EmailValidationException |
|
| 27 | - */ |
|
| 28 | - public function validate($email_address); |
|
| 21 | + /** |
|
| 22 | + * Validates the supplied email address. If it is invalid, throws EmailValidationException |
|
| 23 | + * |
|
| 24 | + * @param string $email_address |
|
| 25 | + * @return boolean |
|
| 26 | + * @throws EmailValidationException |
|
| 27 | + */ |
|
| 28 | + public function validate($email_address); |
|
| 29 | 29 | |
| 30 | 30 | |
| 31 | 31 | } |
@@ -18,72 +18,72 @@ |
||
| 18 | 18 | { |
| 19 | 19 | |
| 20 | 20 | |
| 21 | - /** |
|
| 22 | - * @param string $validation_error_message |
|
| 23 | - */ |
|
| 24 | - public function __construct($validation_error_message = '') |
|
| 25 | - { |
|
| 26 | - if (! $validation_error_message) { |
|
| 27 | - $validation_error_message = esc_html__('Please enter a valid email address.', 'event_espresso'); |
|
| 28 | - } |
|
| 29 | - parent::__construct($validation_error_message); |
|
| 30 | - } |
|
| 21 | + /** |
|
| 22 | + * @param string $validation_error_message |
|
| 23 | + */ |
|
| 24 | + public function __construct($validation_error_message = '') |
|
| 25 | + { |
|
| 26 | + if (! $validation_error_message) { |
|
| 27 | + $validation_error_message = esc_html__('Please enter a valid email address.', 'event_espresso'); |
|
| 28 | + } |
|
| 29 | + parent::__construct($validation_error_message); |
|
| 30 | + } |
|
| 31 | 31 | |
| 32 | 32 | |
| 33 | 33 | |
| 34 | - /** |
|
| 35 | - * just checks the field isn't blank |
|
| 36 | - * |
|
| 37 | - * @param $normalized_value |
|
| 38 | - * @return bool |
|
| 39 | - * @throws InvalidArgumentException |
|
| 40 | - * @throws InvalidInterfaceException |
|
| 41 | - * @throws InvalidDataTypeException |
|
| 42 | - * @throws EE_Validation_Error |
|
| 43 | - */ |
|
| 44 | - public function validate($normalized_value) |
|
| 45 | - { |
|
| 46 | - if ($normalized_value && ! $this->_validate_email($normalized_value)) { |
|
| 47 | - throw new EE_Validation_Error($this->get_validation_error_message(), 'required'); |
|
| 48 | - } |
|
| 49 | - return true; |
|
| 50 | - } |
|
| 34 | + /** |
|
| 35 | + * just checks the field isn't blank |
|
| 36 | + * |
|
| 37 | + * @param $normalized_value |
|
| 38 | + * @return bool |
|
| 39 | + * @throws InvalidArgumentException |
|
| 40 | + * @throws InvalidInterfaceException |
|
| 41 | + * @throws InvalidDataTypeException |
|
| 42 | + * @throws EE_Validation_Error |
|
| 43 | + */ |
|
| 44 | + public function validate($normalized_value) |
|
| 45 | + { |
|
| 46 | + if ($normalized_value && ! $this->_validate_email($normalized_value)) { |
|
| 47 | + throw new EE_Validation_Error($this->get_validation_error_message(), 'required'); |
|
| 48 | + } |
|
| 49 | + return true; |
|
| 50 | + } |
|
| 51 | 51 | |
| 52 | 52 | |
| 53 | 53 | |
| 54 | - /** |
|
| 55 | - * @return array |
|
| 56 | - */ |
|
| 57 | - public function get_jquery_validation_rule_array() |
|
| 58 | - { |
|
| 59 | - return array('email' => true, 'messages' => array('email' => $this->get_validation_error_message())); |
|
| 60 | - } |
|
| 54 | + /** |
|
| 55 | + * @return array |
|
| 56 | + */ |
|
| 57 | + public function get_jquery_validation_rule_array() |
|
| 58 | + { |
|
| 59 | + return array('email' => true, 'messages' => array('email' => $this->get_validation_error_message())); |
|
| 60 | + } |
|
| 61 | 61 | |
| 62 | 62 | |
| 63 | 63 | |
| 64 | - /** |
|
| 65 | - * Validate an email address. |
|
| 66 | - * Provide email address (raw input) |
|
| 67 | - * |
|
| 68 | - * @param $email |
|
| 69 | - * @return bool of whether the email is valid or not |
|
| 70 | - * @throws InvalidArgumentException |
|
| 71 | - * @throws InvalidInterfaceException |
|
| 72 | - * @throws InvalidDataTypeException |
|
| 73 | - * @throws EE_Validation_Error |
|
| 74 | - */ |
|
| 75 | - private function _validate_email($email) |
|
| 76 | - { |
|
| 77 | - try { |
|
| 78 | - EmailAddressFactory::create($email); |
|
| 79 | - } catch (EmailValidationException $e) { |
|
| 80 | - throw new EE_Validation_Error( |
|
| 81 | - $e->getMessage(), |
|
| 82 | - 'invalid_email', |
|
| 83 | - $this->_input, |
|
| 84 | - $e |
|
| 85 | - ); |
|
| 86 | - } |
|
| 87 | - return true; |
|
| 88 | - } |
|
| 64 | + /** |
|
| 65 | + * Validate an email address. |
|
| 66 | + * Provide email address (raw input) |
|
| 67 | + * |
|
| 68 | + * @param $email |
|
| 69 | + * @return bool of whether the email is valid or not |
|
| 70 | + * @throws InvalidArgumentException |
|
| 71 | + * @throws InvalidInterfaceException |
|
| 72 | + * @throws InvalidDataTypeException |
|
| 73 | + * @throws EE_Validation_Error |
|
| 74 | + */ |
|
| 75 | + private function _validate_email($email) |
|
| 76 | + { |
|
| 77 | + try { |
|
| 78 | + EmailAddressFactory::create($email); |
|
| 79 | + } catch (EmailValidationException $e) { |
|
| 80 | + throw new EE_Validation_Error( |
|
| 81 | + $e->getMessage(), |
|
| 82 | + 'invalid_email', |
|
| 83 | + $this->_input, |
|
| 84 | + $e |
|
| 85 | + ); |
|
| 86 | + } |
|
| 87 | + return true; |
|
| 88 | + } |
|
| 89 | 89 | } |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | */ |
| 24 | 24 | public function __construct($validation_error_message = '') |
| 25 | 25 | { |
| 26 | - if (! $validation_error_message) { |
|
| 26 | + if ( ! $validation_error_message) { |
|
| 27 | 27 | $validation_error_message = esc_html__('Please enter a valid email address.', 'event_espresso'); |
| 28 | 28 | } |
| 29 | 29 | parent::__construct($validation_error_message); |
@@ -206,7 +206,7 @@ |
||
| 206 | 206 | function espresso_ticket_selector( $event = NULL ) { |
| 207 | 207 | if ( ! apply_filters( 'FHEE_disable_espresso_ticket_selector', FALSE ) ) { |
| 208 | 208 | espresso_load_ticket_selector(); |
| 209 | - \EED_Ticket_Selector::set_definitions(); |
|
| 209 | + \EED_Ticket_Selector::set_definitions(); |
|
| 210 | 210 | echo EED_Ticket_Selector::display_ticket_selector( $event ); |
| 211 | 211 | } |
| 212 | 212 | } |
@@ -14,12 +14,12 @@ discard block |
||
| 14 | 14 | * @param int | \EE_Event $event |
| 15 | 15 | * @return bool |
| 16 | 16 | */ |
| 17 | -function is_espresso_event( $event = NULL ) { |
|
| 18 | - if ( can_use_espresso_conditionals( __FUNCTION__ )) { |
|
| 17 | +function is_espresso_event($event = NULL) { |
|
| 18 | + if (can_use_espresso_conditionals(__FUNCTION__)) { |
|
| 19 | 19 | // extract EE_Event object from passed param regardless of what it is (within reason of course) |
| 20 | - $event = EEH_Event_View::get_event( $event ); |
|
| 20 | + $event = EEH_Event_View::get_event($event); |
|
| 21 | 21 | // do we have a valid event ? |
| 22 | - return $event instanceof EE_Event ? TRUE : FALSE; |
|
| 22 | + return $event instanceof EE_Event ? TRUE : FALSE; |
|
| 23 | 23 | } |
| 24 | 24 | return FALSE; |
| 25 | 25 | } |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | * @return bool |
| 32 | 32 | */ |
| 33 | 33 | function is_espresso_event_single() { |
| 34 | - if ( can_use_espresso_conditionals( __FUNCTION__ )) { |
|
| 34 | + if (can_use_espresso_conditionals(__FUNCTION__)) { |
|
| 35 | 35 | global $wp_query; |
| 36 | 36 | // return conditionals set by CPTs |
| 37 | 37 | return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_single : FALSE; |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | * @return bool |
| 47 | 47 | */ |
| 48 | 48 | function is_espresso_event_archive() { |
| 49 | - if ( can_use_espresso_conditionals( __FUNCTION__ )) { |
|
| 49 | + if (can_use_espresso_conditionals(__FUNCTION__)) { |
|
| 50 | 50 | global $wp_query; |
| 51 | 51 | return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_archive : FALSE; |
| 52 | 52 | } |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | * @return bool |
| 61 | 61 | */ |
| 62 | 62 | function is_espresso_event_taxonomy() { |
| 63 | - if ( can_use_espresso_conditionals( __FUNCTION__ )) { |
|
| 63 | + if (can_use_espresso_conditionals(__FUNCTION__)) { |
|
| 64 | 64 | global $wp_query; |
| 65 | 65 | return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_taxonomy : FALSE; |
| 66 | 66 | } |
@@ -74,10 +74,10 @@ discard block |
||
| 74 | 74 | * @param int | \EE_Venue $venue |
| 75 | 75 | * @return bool |
| 76 | 76 | */ |
| 77 | -function is_espresso_venue( $venue = NULL ) { |
|
| 78 | - if ( can_use_espresso_conditionals( __FUNCTION__ )) { |
|
| 77 | +function is_espresso_venue($venue = NULL) { |
|
| 78 | + if (can_use_espresso_conditionals(__FUNCTION__)) { |
|
| 79 | 79 | // extract EE_Venue object from passed param regardless of what it is (within reason of course) |
| 80 | - $venue = EEH_Venue_View::get_venue( $venue, FALSE ); |
|
| 80 | + $venue = EEH_Venue_View::get_venue($venue, FALSE); |
|
| 81 | 81 | // do we have a valid event ? |
| 82 | 82 | return $venue instanceof EE_Venue ? TRUE : FALSE; |
| 83 | 83 | } |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | * @return bool |
| 92 | 92 | */ |
| 93 | 93 | function is_espresso_venue_single() { |
| 94 | - if ( can_use_espresso_conditionals( __FUNCTION__ )) { |
|
| 94 | + if (can_use_espresso_conditionals(__FUNCTION__)) { |
|
| 95 | 95 | global $wp_query; |
| 96 | 96 | return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_single : FALSE; |
| 97 | 97 | } |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | * @return bool |
| 106 | 106 | */ |
| 107 | 107 | function is_espresso_venue_archive() { |
| 108 | - if ( can_use_espresso_conditionals( __FUNCTION__ )) { |
|
| 108 | + if (can_use_espresso_conditionals(__FUNCTION__)) { |
|
| 109 | 109 | global $wp_query; |
| 110 | 110 | return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_archive : FALSE; |
| 111 | 111 | } |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | * @return bool |
| 120 | 120 | */ |
| 121 | 121 | function is_espresso_venue_taxonomy() { |
| 122 | - if ( can_use_espresso_conditionals( __FUNCTION__ )) { |
|
| 122 | + if (can_use_espresso_conditionals(__FUNCTION__)) { |
|
| 123 | 123 | global $wp_query; |
| 124 | 124 | return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_taxonomy : FALSE; |
| 125 | 125 | } |
@@ -133,12 +133,12 @@ discard block |
||
| 133 | 133 | * @param $conditional_tag |
| 134 | 134 | * @return bool |
| 135 | 135 | */ |
| 136 | -function can_use_espresso_conditionals( $conditional_tag ) { |
|
| 137 | - if ( ! did_action( 'AHEE__EE_System__initialize' )) { |
|
| 136 | +function can_use_espresso_conditionals($conditional_tag) { |
|
| 137 | + if ( ! did_action('AHEE__EE_System__initialize')) { |
|
| 138 | 138 | EE_Error::doing_it_wrong( |
| 139 | 139 | __FUNCTION__, |
| 140 | 140 | sprintf( |
| 141 | - __( 'The "%s" conditional tag can not be used until after the "init" hook has run, but works best when used within a theme\'s template files.','event_espresso'), |
|
| 141 | + __('The "%s" conditional tag can not be used until after the "init" hook has run, but works best when used within a theme\'s template files.', 'event_espresso'), |
|
| 142 | 142 | $conditional_tag |
| 143 | 143 | ), |
| 144 | 144 | '4.4.0' |
@@ -153,13 +153,13 @@ discard block |
||
| 153 | 153 | |
| 154 | 154 | /*************************** Event Queries ***************************/ |
| 155 | 155 | |
| 156 | -if ( ! function_exists( 'espresso_get_events' )) { |
|
| 156 | +if ( ! function_exists('espresso_get_events')) { |
|
| 157 | 157 | /** |
| 158 | 158 | * espresso_get_events |
| 159 | 159 | * @param array $params |
| 160 | 160 | * @return array |
| 161 | 161 | */ |
| 162 | - function espresso_get_events( $params = array() ) { |
|
| 162 | + function espresso_get_events($params = array()) { |
|
| 163 | 163 | //set default params |
| 164 | 164 | $default_espresso_events_params = array( |
| 165 | 165 | 'limit' => 10, |
@@ -170,18 +170,18 @@ discard block |
||
| 170 | 170 | 'sort' => 'ASC' |
| 171 | 171 | ); |
| 172 | 172 | // allow the defaults to be filtered |
| 173 | - $default_espresso_events_params = apply_filters( 'espresso_get_events__default_espresso_events_params', $default_espresso_events_params ); |
|
| 173 | + $default_espresso_events_params = apply_filters('espresso_get_events__default_espresso_events_params', $default_espresso_events_params); |
|
| 174 | 174 | // grab params and merge with defaults, then extract |
| 175 | - $params = array_merge( $default_espresso_events_params, $params ); |
|
| 175 | + $params = array_merge($default_espresso_events_params, $params); |
|
| 176 | 176 | // run the query |
| 177 | - $events_query = new EventEspresso\core\domain\services\wp_queries\EventListQuery( $params ); |
|
| 177 | + $events_query = new EventEspresso\core\domain\services\wp_queries\EventListQuery($params); |
|
| 178 | 178 | // assign results to a variable so we can return it |
| 179 | 179 | $events = $events_query->have_posts() ? $events_query->posts : array(); |
| 180 | 180 | // but first reset the query and postdata |
| 181 | 181 | wp_reset_query(); |
| 182 | 182 | wp_reset_postdata(); |
| 183 | 183 | EED_Events_Archive::remove_all_events_archive_filters(); |
| 184 | - unset( $events_query ); |
|
| 184 | + unset($events_query); |
|
| 185 | 185 | return $events; |
| 186 | 186 | } |
| 187 | 187 | } |
@@ -195,33 +195,33 @@ discard block |
||
| 195 | 195 | * espresso_load_ticket_selector |
| 196 | 196 | */ |
| 197 | 197 | function espresso_load_ticket_selector() { |
| 198 | - EE_Registry::instance()->load_file( EE_MODULES . 'ticket_selector', 'EED_Ticket_Selector', 'module' ); |
|
| 198 | + EE_Registry::instance()->load_file(EE_MODULES.'ticket_selector', 'EED_Ticket_Selector', 'module'); |
|
| 199 | 199 | } |
| 200 | 200 | |
| 201 | -if ( ! function_exists( 'espresso_ticket_selector' )) { |
|
| 201 | +if ( ! function_exists('espresso_ticket_selector')) { |
|
| 202 | 202 | /** |
| 203 | 203 | * espresso_ticket_selector |
| 204 | 204 | * @param null $event |
| 205 | 205 | */ |
| 206 | - function espresso_ticket_selector( $event = NULL ) { |
|
| 207 | - if ( ! apply_filters( 'FHEE_disable_espresso_ticket_selector', FALSE ) ) { |
|
| 206 | + function espresso_ticket_selector($event = NULL) { |
|
| 207 | + if ( ! apply_filters('FHEE_disable_espresso_ticket_selector', FALSE)) { |
|
| 208 | 208 | espresso_load_ticket_selector(); |
| 209 | 209 | \EED_Ticket_Selector::set_definitions(); |
| 210 | - echo EED_Ticket_Selector::display_ticket_selector( $event ); |
|
| 210 | + echo EED_Ticket_Selector::display_ticket_selector($event); |
|
| 211 | 211 | } |
| 212 | 212 | } |
| 213 | 213 | } |
| 214 | 214 | |
| 215 | 215 | |
| 216 | - if ( ! function_exists( 'espresso_view_details_btn' )) { |
|
| 216 | + if ( ! function_exists('espresso_view_details_btn')) { |
|
| 217 | 217 | /** |
| 218 | 218 | * espresso_view_details_btn |
| 219 | 219 | * @param null $event |
| 220 | 220 | */ |
| 221 | - function espresso_view_details_btn( $event = NULL ) { |
|
| 222 | - if ( ! apply_filters( 'FHEE_disable_espresso_view_details_btn', FALSE ) ) { |
|
| 221 | + function espresso_view_details_btn($event = NULL) { |
|
| 222 | + if ( ! apply_filters('FHEE_disable_espresso_view_details_btn', FALSE)) { |
|
| 223 | 223 | espresso_load_ticket_selector(); |
| 224 | - echo EED_Ticket_Selector::display_ticket_selector( $event, TRUE ); |
|
| 224 | + echo EED_Ticket_Selector::display_ticket_selector($event, TRUE); |
|
| 225 | 225 | } |
| 226 | 226 | } |
| 227 | 227 | } |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | |
| 232 | 232 | /*************************** EEH_Event_View ***************************/ |
| 233 | 233 | |
| 234 | -if ( ! function_exists( 'espresso_load_event_list_assets' )) { |
|
| 234 | +if ( ! function_exists('espresso_load_event_list_assets')) { |
|
| 235 | 235 | /** |
| 236 | 236 | * espresso_load_event_list_assets |
| 237 | 237 | * ensures that event list styles and scripts are loaded |
@@ -240,13 +240,13 @@ discard block |
||
| 240 | 240 | */ |
| 241 | 241 | function espresso_load_event_list_assets() { |
| 242 | 242 | $event_list = EED_Events_Archive::instance(); |
| 243 | - add_action( 'AHEE__EE_System__initialize_last', array( $event_list, 'load_event_list_assets' ), 10 ); |
|
| 244 | - add_filter( 'FHEE_enable_default_espresso_css', '__return_true' ); |
|
| 243 | + add_action('AHEE__EE_System__initialize_last', array($event_list, 'load_event_list_assets'), 10); |
|
| 244 | + add_filter('FHEE_enable_default_espresso_css', '__return_true'); |
|
| 245 | 245 | } |
| 246 | 246 | } |
| 247 | 247 | |
| 248 | 248 | |
| 249 | -if ( ! function_exists( 'espresso_event_reg_button' )) { |
|
| 249 | +if ( ! function_exists('espresso_event_reg_button')) { |
|
| 250 | 250 | /** |
| 251 | 251 | * espresso_event_reg_button |
| 252 | 252 | * returns the "Register Now" button if event is active, |
@@ -258,9 +258,9 @@ discard block |
||
| 258 | 258 | * @param bool $EVT_ID |
| 259 | 259 | * @return string |
| 260 | 260 | */ |
| 261 | - function espresso_event_reg_button( $btn_text_if_active = NULL, $btn_text_if_inactive = FALSE, $EVT_ID = FALSE ) { |
|
| 262 | - $event_status = EEH_Event_View::event_active_status( $EVT_ID ); |
|
| 263 | - switch ( $event_status ) { |
|
| 261 | + function espresso_event_reg_button($btn_text_if_active = NULL, $btn_text_if_inactive = FALSE, $EVT_ID = FALSE) { |
|
| 262 | + $event_status = EEH_Event_View::event_active_status($EVT_ID); |
|
| 263 | + switch ($event_status) { |
|
| 264 | 264 | case EE_Datetime::sold_out : |
| 265 | 265 | $btn_text = __('Sold Out', 'event_espresso'); |
| 266 | 266 | $class = 'ee-pink'; |
@@ -276,10 +276,10 @@ discard block |
||
| 276 | 276 | case EE_Datetime::upcoming : |
| 277 | 277 | case EE_Datetime::active : |
| 278 | 278 | default : |
| 279 | - $btn_text =! empty( $btn_text_if_active ) ? $btn_text_if_active : __( 'Register Now', 'event_espresso' ); |
|
| 279 | + $btn_text = ! empty($btn_text_if_active) ? $btn_text_if_active : __('Register Now', 'event_espresso'); |
|
| 280 | 280 | $class = 'ee-green'; |
| 281 | 281 | } |
| 282 | - if ( $event_status < 1 && ! empty( $btn_text_if_inactive )) { |
|
| 282 | + if ($event_status < 1 && ! empty($btn_text_if_inactive)) { |
|
| 283 | 283 | $btn_text = $btn_text_if_inactive; |
| 284 | 284 | $class = 'ee-grey'; |
| 285 | 285 | } |
@@ -293,7 +293,7 @@ discard block |
||
| 293 | 293 | |
| 294 | 294 | |
| 295 | 295 | |
| 296 | -if ( ! function_exists( 'espresso_display_ticket_selector' )) { |
|
| 296 | +if ( ! function_exists('espresso_display_ticket_selector')) { |
|
| 297 | 297 | /** |
| 298 | 298 | * espresso_display_ticket_selector |
| 299 | 299 | * whether or not to display the Ticket Selector for an event |
@@ -301,14 +301,14 @@ discard block |
||
| 301 | 301 | * @param bool $EVT_ID |
| 302 | 302 | * @return boolean |
| 303 | 303 | */ |
| 304 | - function espresso_display_ticket_selector( $EVT_ID = FALSE ) { |
|
| 305 | - return EEH_Event_View::display_ticket_selector( $EVT_ID ); |
|
| 304 | + function espresso_display_ticket_selector($EVT_ID = FALSE) { |
|
| 305 | + return EEH_Event_View::display_ticket_selector($EVT_ID); |
|
| 306 | 306 | } |
| 307 | 307 | } |
| 308 | 308 | |
| 309 | 309 | |
| 310 | 310 | |
| 311 | -if ( ! function_exists( 'espresso_event_status_banner' )) { |
|
| 311 | +if ( ! function_exists('espresso_event_status_banner')) { |
|
| 312 | 312 | /** |
| 313 | 313 | * espresso_event_status |
| 314 | 314 | * returns a banner showing the event status if it is sold out, expired, or inactive |
@@ -316,13 +316,13 @@ discard block |
||
| 316 | 316 | * @param bool $EVT_ID |
| 317 | 317 | * @return string |
| 318 | 318 | */ |
| 319 | - function espresso_event_status_banner( $EVT_ID = FALSE ) { |
|
| 320 | - return EEH_Event_View::event_status( $EVT_ID ); |
|
| 319 | + function espresso_event_status_banner($EVT_ID = FALSE) { |
|
| 320 | + return EEH_Event_View::event_status($EVT_ID); |
|
| 321 | 321 | } |
| 322 | 322 | } |
| 323 | 323 | |
| 324 | 324 | |
| 325 | -if ( ! function_exists( 'espresso_event_status' )) { |
|
| 325 | +if ( ! function_exists('espresso_event_status')) { |
|
| 326 | 326 | /** |
| 327 | 327 | * espresso_event_status |
| 328 | 328 | * returns the event status if it is sold out, expired, or inactive |
@@ -331,17 +331,17 @@ discard block |
||
| 331 | 331 | * @param bool $echo |
| 332 | 332 | * @return string |
| 333 | 333 | */ |
| 334 | - function espresso_event_status( $EVT_ID = 0, $echo = TRUE ) { |
|
| 335 | - if ( $echo ) { |
|
| 336 | - echo EEH_Event_View::event_active_status( $EVT_ID ); |
|
| 334 | + function espresso_event_status($EVT_ID = 0, $echo = TRUE) { |
|
| 335 | + if ($echo) { |
|
| 336 | + echo EEH_Event_View::event_active_status($EVT_ID); |
|
| 337 | 337 | return ''; |
| 338 | 338 | } |
| 339 | - return EEH_Event_View::event_active_status( $EVT_ID ); |
|
| 339 | + return EEH_Event_View::event_active_status($EVT_ID); |
|
| 340 | 340 | } |
| 341 | 341 | } |
| 342 | 342 | |
| 343 | 343 | |
| 344 | -if ( ! function_exists( 'espresso_event_categories' )) { |
|
| 344 | +if ( ! function_exists('espresso_event_categories')) { |
|
| 345 | 345 | /** |
| 346 | 346 | * espresso_event_categories |
| 347 | 347 | * returns the terms associated with an event |
@@ -351,17 +351,17 @@ discard block |
||
| 351 | 351 | * @param bool $echo |
| 352 | 352 | * @return string |
| 353 | 353 | */ |
| 354 | - function espresso_event_categories( $EVT_ID = 0, $hide_uncategorized = TRUE, $echo = TRUE ) { |
|
| 355 | - if ( $echo ) { |
|
| 356 | - echo EEH_Event_View::event_categories( $EVT_ID, $hide_uncategorized ); |
|
| 354 | + function espresso_event_categories($EVT_ID = 0, $hide_uncategorized = TRUE, $echo = TRUE) { |
|
| 355 | + if ($echo) { |
|
| 356 | + echo EEH_Event_View::event_categories($EVT_ID, $hide_uncategorized); |
|
| 357 | 357 | return ''; |
| 358 | 358 | } |
| 359 | - return EEH_Event_View::event_categories( $EVT_ID, $hide_uncategorized ); |
|
| 359 | + return EEH_Event_View::event_categories($EVT_ID, $hide_uncategorized); |
|
| 360 | 360 | } |
| 361 | 361 | } |
| 362 | 362 | |
| 363 | 363 | |
| 364 | -if ( ! function_exists( 'espresso_event_tickets_available' )) { |
|
| 364 | +if ( ! function_exists('espresso_event_tickets_available')) { |
|
| 365 | 365 | /** |
| 366 | 366 | * espresso_event_tickets_available |
| 367 | 367 | * returns the ticket types available for purchase for an event |
@@ -371,26 +371,26 @@ discard block |
||
| 371 | 371 | * @param bool $format |
| 372 | 372 | * @return string |
| 373 | 373 | */ |
| 374 | - function espresso_event_tickets_available( $EVT_ID = 0, $echo = TRUE, $format = TRUE ) { |
|
| 375 | - $tickets = EEH_Event_View::event_tickets_available( $EVT_ID ); |
|
| 376 | - if ( is_array( $tickets ) && ! empty( $tickets )) { |
|
| 374 | + function espresso_event_tickets_available($EVT_ID = 0, $echo = TRUE, $format = TRUE) { |
|
| 375 | + $tickets = EEH_Event_View::event_tickets_available($EVT_ID); |
|
| 376 | + if (is_array($tickets) && ! empty($tickets)) { |
|
| 377 | 377 | // if formatting then $html will be a string, else it will be an array of ticket objects |
| 378 | - $html = $format ? '<ul id="ee-event-tickets-ul-' . $EVT_ID . '" class="ee-event-tickets-ul">' : array(); |
|
| 379 | - foreach ( $tickets as $ticket ) { |
|
| 380 | - if ( $ticket instanceof EE_Ticket ) { |
|
| 381 | - if ( $format ) { |
|
| 382 | - $html .= '<li id="ee-event-tickets-li-' . $ticket->ID() . '" class="ee-event-tickets-li">'; |
|
| 383 | - $html .= $ticket->name() . ' ' . EEH_Template::format_currency( $ticket->get_ticket_total_with_taxes() ); |
|
| 378 | + $html = $format ? '<ul id="ee-event-tickets-ul-'.$EVT_ID.'" class="ee-event-tickets-ul">' : array(); |
|
| 379 | + foreach ($tickets as $ticket) { |
|
| 380 | + if ($ticket instanceof EE_Ticket) { |
|
| 381 | + if ($format) { |
|
| 382 | + $html .= '<li id="ee-event-tickets-li-'.$ticket->ID().'" class="ee-event-tickets-li">'; |
|
| 383 | + $html .= $ticket->name().' '.EEH_Template::format_currency($ticket->get_ticket_total_with_taxes()); |
|
| 384 | 384 | $html .= '</li>'; |
| 385 | 385 | } else { |
| 386 | 386 | $html[] = $ticket; |
| 387 | 387 | } |
| 388 | 388 | } |
| 389 | 389 | } |
| 390 | - if ( $format ) { |
|
| 390 | + if ($format) { |
|
| 391 | 391 | $html .= '</ul>'; |
| 392 | 392 | } |
| 393 | - if ( $echo && ! $format ) { |
|
| 393 | + if ($echo && ! $format) { |
|
| 394 | 394 | echo $html; |
| 395 | 395 | return ''; |
| 396 | 396 | } |
@@ -400,7 +400,7 @@ discard block |
||
| 400 | 400 | } |
| 401 | 401 | } |
| 402 | 402 | |
| 403 | -if ( ! function_exists( 'espresso_event_date_obj' )) { |
|
| 403 | +if ( ! function_exists('espresso_event_date_obj')) { |
|
| 404 | 404 | /** |
| 405 | 405 | * espresso_event_date_obj |
| 406 | 406 | * returns the primary date object for an event |
@@ -408,13 +408,13 @@ discard block |
||
| 408 | 408 | * @param bool $EVT_ID |
| 409 | 409 | * @return object |
| 410 | 410 | */ |
| 411 | - function espresso_event_date_obj( $EVT_ID = FALSE ) { |
|
| 412 | - return EEH_Event_View::get_primary_date_obj( $EVT_ID ); |
|
| 411 | + function espresso_event_date_obj($EVT_ID = FALSE) { |
|
| 412 | + return EEH_Event_View::get_primary_date_obj($EVT_ID); |
|
| 413 | 413 | } |
| 414 | 414 | } |
| 415 | 415 | |
| 416 | 416 | |
| 417 | -if ( ! function_exists( 'espresso_event_date' )) { |
|
| 417 | +if ( ! function_exists('espresso_event_date')) { |
|
| 418 | 418 | /** |
| 419 | 419 | * espresso_event_date |
| 420 | 420 | * returns the primary date for an event |
@@ -425,22 +425,22 @@ discard block |
||
| 425 | 425 | * @param bool $echo |
| 426 | 426 | * @return string |
| 427 | 427 | */ |
| 428 | - function espresso_event_date( $date_format = '', $time_format = '', $EVT_ID = FALSE, $echo = TRUE ) { |
|
| 429 | - $date_format = ! empty( $date_format ) ? $date_format : get_option( 'date_format' ); |
|
| 430 | - $time_format = ! empty( $time_format ) ? $time_format : get_option( 'time_format' ); |
|
| 431 | - $date_format = apply_filters( 'FHEE__espresso_event_date__date_format', $date_format ); |
|
| 432 | - $time_format = apply_filters( 'FHEE__espresso_event_date__time_format', $time_format ); |
|
| 433 | - if($echo){ |
|
| 434 | - echo EEH_Event_View::the_event_date( $date_format, $time_format, $EVT_ID ); |
|
| 428 | + function espresso_event_date($date_format = '', $time_format = '', $EVT_ID = FALSE, $echo = TRUE) { |
|
| 429 | + $date_format = ! empty($date_format) ? $date_format : get_option('date_format'); |
|
| 430 | + $time_format = ! empty($time_format) ? $time_format : get_option('time_format'); |
|
| 431 | + $date_format = apply_filters('FHEE__espresso_event_date__date_format', $date_format); |
|
| 432 | + $time_format = apply_filters('FHEE__espresso_event_date__time_format', $time_format); |
|
| 433 | + if ($echo) { |
|
| 434 | + echo EEH_Event_View::the_event_date($date_format, $time_format, $EVT_ID); |
|
| 435 | 435 | return ''; |
| 436 | 436 | } |
| 437 | - return EEH_Event_View::the_event_date( $date_format, $time_format, $EVT_ID ); |
|
| 437 | + return EEH_Event_View::the_event_date($date_format, $time_format, $EVT_ID); |
|
| 438 | 438 | |
| 439 | 439 | } |
| 440 | 440 | } |
| 441 | 441 | |
| 442 | 442 | |
| 443 | -if ( ! function_exists( 'espresso_list_of_event_dates' )) { |
|
| 443 | +if ( ! function_exists('espresso_list_of_event_dates')) { |
|
| 444 | 444 | /** |
| 445 | 445 | * espresso_list_of_event_dates |
| 446 | 446 | * returns a unordered list of dates for an event |
@@ -455,40 +455,40 @@ discard block |
||
| 455 | 455 | * @param null $limit |
| 456 | 456 | * @return string |
| 457 | 457 | */ |
| 458 | - function espresso_list_of_event_dates( $EVT_ID = 0, $date_format = '', $time_format = '', $echo = TRUE, $show_expired = NULL, $format = TRUE, $add_breaks = TRUE, $limit = NULL ) { |
|
| 459 | - $date_format = ! empty( $date_format ) ? $date_format : get_option( 'date_format' ); |
|
| 460 | - $time_format = ! empty( $time_format ) ? $time_format : get_option( 'time_format' ); |
|
| 461 | - $date_format = apply_filters( 'FHEE__espresso_list_of_event_dates__date_format', $date_format ); |
|
| 462 | - $time_format = apply_filters( 'FHEE__espresso_list_of_event_dates__time_format', $time_format ); |
|
| 463 | - $datetimes = EEH_Event_View::get_all_date_obj( $EVT_ID, $show_expired, FALSE, $limit ); |
|
| 464 | - if ( ! $format ) { |
|
| 465 | - return apply_filters( 'FHEE__espresso_list_of_event_dates__datetimes', $datetimes ); |
|
| 458 | + function espresso_list_of_event_dates($EVT_ID = 0, $date_format = '', $time_format = '', $echo = TRUE, $show_expired = NULL, $format = TRUE, $add_breaks = TRUE, $limit = NULL) { |
|
| 459 | + $date_format = ! empty($date_format) ? $date_format : get_option('date_format'); |
|
| 460 | + $time_format = ! empty($time_format) ? $time_format : get_option('time_format'); |
|
| 461 | + $date_format = apply_filters('FHEE__espresso_list_of_event_dates__date_format', $date_format); |
|
| 462 | + $time_format = apply_filters('FHEE__espresso_list_of_event_dates__time_format', $time_format); |
|
| 463 | + $datetimes = EEH_Event_View::get_all_date_obj($EVT_ID, $show_expired, FALSE, $limit); |
|
| 464 | + if ( ! $format) { |
|
| 465 | + return apply_filters('FHEE__espresso_list_of_event_dates__datetimes', $datetimes); |
|
| 466 | 466 | } |
| 467 | 467 | //d( $datetimes ); |
| 468 | - if ( is_array( $datetimes ) && ! empty( $datetimes )) { |
|
| 468 | + if (is_array($datetimes) && ! empty($datetimes)) { |
|
| 469 | 469 | global $post; |
| 470 | - $html = $format ? '<ul id="ee-event-datetimes-ul-' . $post->ID . '" class="ee-event-datetimes-ul ee-clearfix">' : ''; |
|
| 471 | - foreach ( $datetimes as $datetime ) { |
|
| 472 | - if ( $datetime instanceof EE_Datetime ) { |
|
| 473 | - $html .= '<li id="ee-event-datetimes-li-' . $datetime->ID(); |
|
| 474 | - $html .= '" class="ee-event-datetimes-li ee-event-datetimes-li-' . $datetime->get_active_status() . '">'; |
|
| 470 | + $html = $format ? '<ul id="ee-event-datetimes-ul-'.$post->ID.'" class="ee-event-datetimes-ul ee-clearfix">' : ''; |
|
| 471 | + foreach ($datetimes as $datetime) { |
|
| 472 | + if ($datetime instanceof EE_Datetime) { |
|
| 473 | + $html .= '<li id="ee-event-datetimes-li-'.$datetime->ID(); |
|
| 474 | + $html .= '" class="ee-event-datetimes-li ee-event-datetimes-li-'.$datetime->get_active_status().'">'; |
|
| 475 | 475 | $datetime_name = $datetime->name(); |
| 476 | - $html .= ! empty( $datetime_name ) ? '<strong>' . $datetime_name . '</strong>' : ''; |
|
| 477 | - $html .= ! empty( $datetime_name ) && $add_breaks ? '<br />' : ''; |
|
| 478 | - $html .= '<span class="dashicons dashicons-calendar"></span><span class="ee-event-datetimes-li-daterange">' . $datetime->date_range( $date_format ) . '</span><br/>'; |
|
| 479 | - $html .= '<span class="dashicons dashicons-clock"></span><span class="ee-event-datetimes-li-timerange">' . $datetime->time_range( $time_format ) . '</span>'; |
|
| 476 | + $html .= ! empty($datetime_name) ? '<strong>'.$datetime_name.'</strong>' : ''; |
|
| 477 | + $html .= ! empty($datetime_name) && $add_breaks ? '<br />' : ''; |
|
| 478 | + $html .= '<span class="dashicons dashicons-calendar"></span><span class="ee-event-datetimes-li-daterange">'.$datetime->date_range($date_format).'</span><br/>'; |
|
| 479 | + $html .= '<span class="dashicons dashicons-clock"></span><span class="ee-event-datetimes-li-timerange">'.$datetime->time_range($time_format).'</span>'; |
|
| 480 | 480 | $datetime_description = $datetime->description(); |
| 481 | - $html .= ! empty( $datetime_description ) && $add_breaks ? '<br />' : ''; |
|
| 482 | - $html .= ! empty( $datetime_description ) ? ' - ' . $datetime_description : ''; |
|
| 483 | - $html = apply_filters( 'FHEE__espresso_list_of_event_dates__datetime_html', $html, $datetime ); |
|
| 481 | + $html .= ! empty($datetime_description) && $add_breaks ? '<br />' : ''; |
|
| 482 | + $html .= ! empty($datetime_description) ? ' - '.$datetime_description : ''; |
|
| 483 | + $html = apply_filters('FHEE__espresso_list_of_event_dates__datetime_html', $html, $datetime); |
|
| 484 | 484 | $html .= '</li>'; |
| 485 | 485 | } |
| 486 | 486 | } |
| 487 | 487 | $html .= $format ? '</ul>' : ''; |
| 488 | 488 | } else { |
| 489 | - $html = $format ? '<p><span class="dashicons dashicons-marker pink-text"></span>' . __( 'There are no upcoming dates for this event.', 'event_espresso' ) . '</p><br/>' : ''; |
|
| 489 | + $html = $format ? '<p><span class="dashicons dashicons-marker pink-text"></span>'.__('There are no upcoming dates for this event.', 'event_espresso').'</p><br/>' : ''; |
|
| 490 | 490 | } |
| 491 | - if ( $echo ) { |
|
| 491 | + if ($echo) { |
|
| 492 | 492 | echo $html; |
| 493 | 493 | return ''; |
| 494 | 494 | } |
@@ -497,7 +497,7 @@ discard block |
||
| 497 | 497 | } |
| 498 | 498 | |
| 499 | 499 | |
| 500 | -if ( ! function_exists( 'espresso_event_end_date' )) { |
|
| 500 | +if ( ! function_exists('espresso_event_end_date')) { |
|
| 501 | 501 | /** |
| 502 | 502 | * espresso_event_end_date |
| 503 | 503 | * returns the last date for an event |
@@ -508,20 +508,20 @@ discard block |
||
| 508 | 508 | * @param bool $echo |
| 509 | 509 | * @return string |
| 510 | 510 | */ |
| 511 | - function espresso_event_end_date( $date_format = '', $time_format = '', $EVT_ID = FALSE, $echo = TRUE ) { |
|
| 512 | - $date_format = ! empty( $date_format ) ? $date_format : get_option( 'date_format' ); |
|
| 513 | - $time_format = ! empty( $time_format ) ? $time_format : get_option( 'time_format' ); |
|
| 514 | - $date_format = apply_filters( 'FHEE__espresso_event_end_date__date_format', $date_format ); |
|
| 515 | - $time_format = apply_filters( 'FHEE__espresso_event_end_date__time_format', $time_format ); |
|
| 516 | - if($echo){ |
|
| 517 | - echo EEH_Event_View::the_event_end_date( $date_format, $time_format, $EVT_ID ); |
|
| 511 | + function espresso_event_end_date($date_format = '', $time_format = '', $EVT_ID = FALSE, $echo = TRUE) { |
|
| 512 | + $date_format = ! empty($date_format) ? $date_format : get_option('date_format'); |
|
| 513 | + $time_format = ! empty($time_format) ? $time_format : get_option('time_format'); |
|
| 514 | + $date_format = apply_filters('FHEE__espresso_event_end_date__date_format', $date_format); |
|
| 515 | + $time_format = apply_filters('FHEE__espresso_event_end_date__time_format', $time_format); |
|
| 516 | + if ($echo) { |
|
| 517 | + echo EEH_Event_View::the_event_end_date($date_format, $time_format, $EVT_ID); |
|
| 518 | 518 | return ''; |
| 519 | 519 | } |
| 520 | - return EEH_Event_View::the_event_end_date( $date_format, $time_format, $EVT_ID ); |
|
| 520 | + return EEH_Event_View::the_event_end_date($date_format, $time_format, $EVT_ID); |
|
| 521 | 521 | } |
| 522 | 522 | } |
| 523 | 523 | |
| 524 | -if ( ! function_exists( 'espresso_event_date_range' )) { |
|
| 524 | +if ( ! function_exists('espresso_event_date_range')) { |
|
| 525 | 525 | /** |
| 526 | 526 | * espresso_event_date_range |
| 527 | 527 | * returns the first and last chronologically ordered dates for an event (if different) |
@@ -534,31 +534,31 @@ discard block |
||
| 534 | 534 | * @param bool $echo |
| 535 | 535 | * @return string |
| 536 | 536 | */ |
| 537 | - function espresso_event_date_range( $date_format = '', $time_format = '', $single_date_format = '', $single_time_format = '', $EVT_ID = FALSE, $echo = TRUE ) { |
|
| 537 | + function espresso_event_date_range($date_format = '', $time_format = '', $single_date_format = '', $single_time_format = '', $EVT_ID = FALSE, $echo = TRUE) { |
|
| 538 | 538 | // set and filter date and time formats when a range is returned |
| 539 | - $date_format = ! empty( $date_format ) ? $date_format : get_option( 'date_format' ); |
|
| 540 | - $date_format = apply_filters( 'FHEE__espresso_event_date_range__date_format', $date_format ); |
|
| 539 | + $date_format = ! empty($date_format) ? $date_format : get_option('date_format'); |
|
| 540 | + $date_format = apply_filters('FHEE__espresso_event_date_range__date_format', $date_format); |
|
| 541 | 541 | // get the start and end date with NO time portion |
| 542 | - $the_event_date = EEH_Event_View::the_earliest_event_date( $date_format, '', $EVT_ID ); |
|
| 543 | - $the_event_end_date = EEH_Event_View::the_latest_event_date( $date_format, '', $EVT_ID ); |
|
| 542 | + $the_event_date = EEH_Event_View::the_earliest_event_date($date_format, '', $EVT_ID); |
|
| 543 | + $the_event_end_date = EEH_Event_View::the_latest_event_date($date_format, '', $EVT_ID); |
|
| 544 | 544 | // now we can determine if date range spans more than one day |
| 545 | - if ( $the_event_date != $the_event_end_date ) { |
|
| 546 | - $time_format = ! empty( $time_format ) ? $time_format : get_option( 'time_format' ); |
|
| 547 | - $time_format = apply_filters( 'FHEE__espresso_event_date_range__time_format', $time_format ); |
|
| 545 | + if ($the_event_date != $the_event_end_date) { |
|
| 546 | + $time_format = ! empty($time_format) ? $time_format : get_option('time_format'); |
|
| 547 | + $time_format = apply_filters('FHEE__espresso_event_date_range__time_format', $time_format); |
|
| 548 | 548 | $html = sprintf( |
| 549 | - __( '%1$s - %2$s', 'event_espresso' ), |
|
| 550 | - EEH_Event_View::the_earliest_event_date( $date_format, $time_format, $EVT_ID ), |
|
| 551 | - EEH_Event_View::the_latest_event_date( $date_format, $time_format, $EVT_ID ) |
|
| 549 | + __('%1$s - %2$s', 'event_espresso'), |
|
| 550 | + EEH_Event_View::the_earliest_event_date($date_format, $time_format, $EVT_ID), |
|
| 551 | + EEH_Event_View::the_latest_event_date($date_format, $time_format, $EVT_ID) |
|
| 552 | 552 | ); |
| 553 | 553 | } else { |
| 554 | 554 | // set and filter date and time formats when only a single datetime is returned |
| 555 | - $single_date_format = ! empty( $single_date_format ) ? $single_date_format : get_option( 'date_format' ); |
|
| 556 | - $single_time_format = ! empty( $single_time_format ) ? $single_time_format : get_option( 'time_format' ); |
|
| 557 | - $single_date_format = apply_filters( 'FHEE__espresso_event_date_range__single_date_format', $single_date_format ); |
|
| 558 | - $single_time_format = apply_filters( 'FHEE__espresso_event_date_range__single_time_format', $single_time_format ); |
|
| 559 | - $html = EEH_Event_View::the_earliest_event_date( $single_date_format, $single_time_format, $EVT_ID ); |
|
| 555 | + $single_date_format = ! empty($single_date_format) ? $single_date_format : get_option('date_format'); |
|
| 556 | + $single_time_format = ! empty($single_time_format) ? $single_time_format : get_option('time_format'); |
|
| 557 | + $single_date_format = apply_filters('FHEE__espresso_event_date_range__single_date_format', $single_date_format); |
|
| 558 | + $single_time_format = apply_filters('FHEE__espresso_event_date_range__single_time_format', $single_time_format); |
|
| 559 | + $html = EEH_Event_View::the_earliest_event_date($single_date_format, $single_time_format, $EVT_ID); |
|
| 560 | 560 | } |
| 561 | - if ( $echo ) { |
|
| 561 | + if ($echo) { |
|
| 562 | 562 | echo $html; |
| 563 | 563 | return ''; |
| 564 | 564 | } |
@@ -566,7 +566,7 @@ discard block |
||
| 566 | 566 | } |
| 567 | 567 | } |
| 568 | 568 | |
| 569 | -if ( ! function_exists( 'espresso_next_upcoming_datetime_obj' )) { |
|
| 569 | +if ( ! function_exists('espresso_next_upcoming_datetime_obj')) { |
|
| 570 | 570 | /** |
| 571 | 571 | * espresso_next_upcoming_datetime_obj |
| 572 | 572 | * returns the next upcoming datetime object for an event |
@@ -574,12 +574,12 @@ discard block |
||
| 574 | 574 | * @param int $EVT_ID |
| 575 | 575 | * @return EE_Datetime|null |
| 576 | 576 | */ |
| 577 | - function espresso_next_upcoming_datetime_obj( $EVT_ID = 0 ) { |
|
| 578 | - return EEH_Event_View::get_next_upcoming_date_obj( $EVT_ID ); |
|
| 577 | + function espresso_next_upcoming_datetime_obj($EVT_ID = 0) { |
|
| 578 | + return EEH_Event_View::get_next_upcoming_date_obj($EVT_ID); |
|
| 579 | 579 | } |
| 580 | 580 | } |
| 581 | 581 | |
| 582 | -if ( ! function_exists( 'espresso_next_upcoming_datetime' ) ) { |
|
| 582 | +if ( ! function_exists('espresso_next_upcoming_datetime')) { |
|
| 583 | 583 | /** |
| 584 | 584 | * espresso_next_upcoming_datetime |
| 585 | 585 | * returns the start date and time for the next upcoming event. |
@@ -590,30 +590,30 @@ discard block |
||
| 590 | 590 | * @param bool $echo |
| 591 | 591 | * @return string |
| 592 | 592 | */ |
| 593 | - function espresso_next_upcoming_datetime( $date_format = '', $time_format = '', $EVT_ID = 0, $echo = true ) { |
|
| 593 | + function espresso_next_upcoming_datetime($date_format = '', $time_format = '', $EVT_ID = 0, $echo = true) { |
|
| 594 | 594 | |
| 595 | - $date_format = ! empty( $date_format ) ? $date_format : get_option( 'date_format' ); |
|
| 596 | - $date_format = apply_filters( 'FHEE__espresso_next_upcoming_datetime__date_format', $date_format ); |
|
| 595 | + $date_format = ! empty($date_format) ? $date_format : get_option('date_format'); |
|
| 596 | + $date_format = apply_filters('FHEE__espresso_next_upcoming_datetime__date_format', $date_format); |
|
| 597 | 597 | |
| 598 | - $time_format = ! empty( $time_format ) ? $time_format : get_option( 'time_format' ); |
|
| 599 | - $time_format = apply_filters( 'FHEE__espresso_next_upcoming_datetime__time_format', $time_format ); |
|
| 598 | + $time_format = ! empty($time_format) ? $time_format : get_option('time_format'); |
|
| 599 | + $time_format = apply_filters('FHEE__espresso_next_upcoming_datetime__time_format', $time_format); |
|
| 600 | 600 | |
| 601 | - $datetime_format = trim( $date_format . ' ' . $time_format); |
|
| 601 | + $datetime_format = trim($date_format.' '.$time_format); |
|
| 602 | 602 | |
| 603 | - $datetime = espresso_next_upcoming_datetime_obj( $EVT_ID ); |
|
| 603 | + $datetime = espresso_next_upcoming_datetime_obj($EVT_ID); |
|
| 604 | 604 | |
| 605 | - if( ! $datetime instanceof EE_Datetime ) { |
|
| 605 | + if ( ! $datetime instanceof EE_Datetime) { |
|
| 606 | 606 | return ''; |
| 607 | 607 | } |
| 608 | - if ( $echo ){ |
|
| 609 | - echo $datetime->get_i18n_datetime( 'DTT_EVT_start', $datetime_format ); |
|
| 608 | + if ($echo) { |
|
| 609 | + echo $datetime->get_i18n_datetime('DTT_EVT_start', $datetime_format); |
|
| 610 | 610 | return ''; |
| 611 | 611 | } |
| 612 | - return $datetime->get_i18n_datetime( 'DTT_EVT_start', $datetime_format ); |
|
| 612 | + return $datetime->get_i18n_datetime('DTT_EVT_start', $datetime_format); |
|
| 613 | 613 | } |
| 614 | 614 | } |
| 615 | 615 | |
| 616 | -if ( ! function_exists( 'espresso_event_date_as_calendar_page' )) { |
|
| 616 | +if ( ! function_exists('espresso_event_date_as_calendar_page')) { |
|
| 617 | 617 | /** |
| 618 | 618 | * espresso_event_date_as_calendar_page |
| 619 | 619 | * returns the primary date for an event, stylized to appear as the page of a calendar |
@@ -621,15 +621,15 @@ discard block |
||
| 621 | 621 | * @param bool $EVT_ID |
| 622 | 622 | * @return string |
| 623 | 623 | */ |
| 624 | - function espresso_event_date_as_calendar_page( $EVT_ID = FALSE ) { |
|
| 625 | - EEH_Event_View::event_date_as_calendar_page( $EVT_ID ); |
|
| 624 | + function espresso_event_date_as_calendar_page($EVT_ID = FALSE) { |
|
| 625 | + EEH_Event_View::event_date_as_calendar_page($EVT_ID); |
|
| 626 | 626 | } |
| 627 | 627 | } |
| 628 | 628 | |
| 629 | 629 | |
| 630 | 630 | |
| 631 | 631 | |
| 632 | -if ( ! function_exists( 'espresso_event_link_url' )) { |
|
| 632 | +if ( ! function_exists('espresso_event_link_url')) { |
|
| 633 | 633 | /** |
| 634 | 634 | * espresso_event_link_url |
| 635 | 635 | * |
@@ -637,18 +637,18 @@ discard block |
||
| 637 | 637 | * @param bool $echo |
| 638 | 638 | * @return string |
| 639 | 639 | */ |
| 640 | - function espresso_event_link_url( $EVT_ID = 0, $echo = TRUE ) { |
|
| 641 | - if ( $echo ) { |
|
| 642 | - echo EEH_Event_View::event_link_url( $EVT_ID ); |
|
| 640 | + function espresso_event_link_url($EVT_ID = 0, $echo = TRUE) { |
|
| 641 | + if ($echo) { |
|
| 642 | + echo EEH_Event_View::event_link_url($EVT_ID); |
|
| 643 | 643 | return ''; |
| 644 | 644 | } |
| 645 | - return EEH_Event_View::event_link_url( $EVT_ID ); |
|
| 645 | + return EEH_Event_View::event_link_url($EVT_ID); |
|
| 646 | 646 | } |
| 647 | 647 | } |
| 648 | 648 | |
| 649 | 649 | |
| 650 | 650 | |
| 651 | -if ( ! function_exists( 'espresso_event_has_content_or_excerpt' )) { |
|
| 651 | +if ( ! function_exists('espresso_event_has_content_or_excerpt')) { |
|
| 652 | 652 | /** |
| 653 | 653 | * espresso_event_has_content_or_excerpt |
| 654 | 654 | * |
@@ -656,15 +656,15 @@ discard block |
||
| 656 | 656 | * @param bool $EVT_ID |
| 657 | 657 | * @return boolean |
| 658 | 658 | */ |
| 659 | - function espresso_event_has_content_or_excerpt( $EVT_ID = FALSE ) { |
|
| 660 | - return EEH_Event_View::event_has_content_or_excerpt( $EVT_ID ); |
|
| 659 | + function espresso_event_has_content_or_excerpt($EVT_ID = FALSE) { |
|
| 660 | + return EEH_Event_View::event_has_content_or_excerpt($EVT_ID); |
|
| 661 | 661 | } |
| 662 | 662 | } |
| 663 | 663 | |
| 664 | 664 | |
| 665 | 665 | |
| 666 | 666 | |
| 667 | -if ( ! function_exists( 'espresso_event_content_or_excerpt' )) { |
|
| 667 | +if ( ! function_exists('espresso_event_content_or_excerpt')) { |
|
| 668 | 668 | /** |
| 669 | 669 | * espresso_event_content_or_excerpt |
| 670 | 670 | * |
@@ -673,18 +673,18 @@ discard block |
||
| 673 | 673 | * @param bool $echo |
| 674 | 674 | * @return string |
| 675 | 675 | */ |
| 676 | - function espresso_event_content_or_excerpt( $num_words = 55, $more = NULL, $echo = TRUE ) { |
|
| 677 | - if ( $echo ) { |
|
| 678 | - echo EEH_Event_View::event_content_or_excerpt( $num_words, $more ); |
|
| 676 | + function espresso_event_content_or_excerpt($num_words = 55, $more = NULL, $echo = TRUE) { |
|
| 677 | + if ($echo) { |
|
| 678 | + echo EEH_Event_View::event_content_or_excerpt($num_words, $more); |
|
| 679 | 679 | return ''; |
| 680 | 680 | } |
| 681 | - return EEH_Event_View::event_content_or_excerpt( $num_words, $more ); |
|
| 681 | + return EEH_Event_View::event_content_or_excerpt($num_words, $more); |
|
| 682 | 682 | } |
| 683 | 683 | } |
| 684 | 684 | |
| 685 | 685 | |
| 686 | 686 | |
| 687 | -if ( ! function_exists( 'espresso_event_phone' )) { |
|
| 687 | +if ( ! function_exists('espresso_event_phone')) { |
|
| 688 | 688 | /** |
| 689 | 689 | * espresso_event_phone |
| 690 | 690 | * |
@@ -692,18 +692,18 @@ discard block |
||
| 692 | 692 | * @param bool $echo |
| 693 | 693 | * @return string |
| 694 | 694 | */ |
| 695 | - function espresso_event_phone( $EVT_ID = 0, $echo = TRUE ) { |
|
| 696 | - if ( $echo ) { |
|
| 697 | - echo EEH_Event_View::event_phone( $EVT_ID ); |
|
| 695 | + function espresso_event_phone($EVT_ID = 0, $echo = TRUE) { |
|
| 696 | + if ($echo) { |
|
| 697 | + echo EEH_Event_View::event_phone($EVT_ID); |
|
| 698 | 698 | return ''; |
| 699 | 699 | } |
| 700 | - return EEH_Event_View::event_phone( $EVT_ID ); |
|
| 700 | + return EEH_Event_View::event_phone($EVT_ID); |
|
| 701 | 701 | } |
| 702 | 702 | } |
| 703 | 703 | |
| 704 | 704 | |
| 705 | 705 | |
| 706 | -if ( ! function_exists( 'espresso_edit_event_link' )) { |
|
| 706 | +if ( ! function_exists('espresso_edit_event_link')) { |
|
| 707 | 707 | /** |
| 708 | 708 | * espresso_edit_event_link |
| 709 | 709 | * returns a link to edit an event |
@@ -712,39 +712,39 @@ discard block |
||
| 712 | 712 | * @param bool $echo |
| 713 | 713 | * @return string |
| 714 | 714 | */ |
| 715 | - function espresso_edit_event_link( $EVT_ID = 0, $echo = TRUE ) { |
|
| 716 | - if ( $echo ) { |
|
| 717 | - echo EEH_Event_View::edit_event_link( $EVT_ID ); |
|
| 715 | + function espresso_edit_event_link($EVT_ID = 0, $echo = TRUE) { |
|
| 716 | + if ($echo) { |
|
| 717 | + echo EEH_Event_View::edit_event_link($EVT_ID); |
|
| 718 | 718 | return ''; |
| 719 | 719 | } |
| 720 | - return EEH_Event_View::edit_event_link( $EVT_ID ); |
|
| 720 | + return EEH_Event_View::edit_event_link($EVT_ID); |
|
| 721 | 721 | } |
| 722 | 722 | } |
| 723 | 723 | |
| 724 | 724 | |
| 725 | -if ( ! function_exists( 'espresso_organization_name' )) { |
|
| 725 | +if ( ! function_exists('espresso_organization_name')) { |
|
| 726 | 726 | /** |
| 727 | 727 | * espresso_organization_name |
| 728 | 728 | * @param bool $echo |
| 729 | 729 | * @return string |
| 730 | 730 | */ |
| 731 | 731 | function espresso_organization_name($echo = TRUE) { |
| 732 | - if($echo){ |
|
| 733 | - echo EE_Registry::instance()->CFG->organization->get_pretty( 'name' ); |
|
| 732 | + if ($echo) { |
|
| 733 | + echo EE_Registry::instance()->CFG->organization->get_pretty('name'); |
|
| 734 | 734 | return ''; |
| 735 | 735 | } |
| 736 | - return EE_Registry::instance()->CFG->organization->get_pretty( 'name' ); |
|
| 736 | + return EE_Registry::instance()->CFG->organization->get_pretty('name'); |
|
| 737 | 737 | } |
| 738 | 738 | } |
| 739 | 739 | |
| 740 | -if ( ! function_exists( 'espresso_organization_address' )) { |
|
| 740 | +if ( ! function_exists('espresso_organization_address')) { |
|
| 741 | 741 | /** |
| 742 | 742 | * espresso_organization_address |
| 743 | 743 | * @param string $type |
| 744 | 744 | * @return string |
| 745 | 745 | */ |
| 746 | - function espresso_organization_address( $type = 'inline' ) { |
|
| 747 | - if ( EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config ) { |
|
| 746 | + function espresso_organization_address($type = 'inline') { |
|
| 747 | + if (EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config) { |
|
| 748 | 748 | $address = new EventEspresso\core\domain\entities\GenericAddress( |
| 749 | 749 | EE_Registry::instance()->CFG->organization->address_1, |
| 750 | 750 | EE_Registry::instance()->CFG->organization->address_2, |
@@ -753,129 +753,129 @@ discard block |
||
| 753 | 753 | EE_Registry::instance()->CFG->organization->zip, |
| 754 | 754 | EE_Registry::instance()->CFG->organization->CNT_ISO |
| 755 | 755 | ); |
| 756 | - return EEH_Address::format( $address, $type ); |
|
| 756 | + return EEH_Address::format($address, $type); |
|
| 757 | 757 | } |
| 758 | 758 | return ''; |
| 759 | 759 | } |
| 760 | 760 | } |
| 761 | 761 | |
| 762 | -if ( ! function_exists( 'espresso_organization_email' )) { |
|
| 762 | +if ( ! function_exists('espresso_organization_email')) { |
|
| 763 | 763 | /** |
| 764 | 764 | * espresso_organization_email |
| 765 | 765 | * @param bool $echo |
| 766 | 766 | * @return string |
| 767 | 767 | */ |
| 768 | - function espresso_organization_email( $echo = TRUE ) { |
|
| 769 | - if($echo){ |
|
| 770 | - echo EE_Registry::instance()->CFG->organization->get_pretty( 'email' ); |
|
| 768 | + function espresso_organization_email($echo = TRUE) { |
|
| 769 | + if ($echo) { |
|
| 770 | + echo EE_Registry::instance()->CFG->organization->get_pretty('email'); |
|
| 771 | 771 | return ''; |
| 772 | 772 | } |
| 773 | - return EE_Registry::instance()->CFG->organization->get_pretty( 'email' ); |
|
| 773 | + return EE_Registry::instance()->CFG->organization->get_pretty('email'); |
|
| 774 | 774 | } |
| 775 | 775 | } |
| 776 | 776 | |
| 777 | -if ( ! function_exists( 'espresso_organization_logo_url' )) { |
|
| 777 | +if ( ! function_exists('espresso_organization_logo_url')) { |
|
| 778 | 778 | /** |
| 779 | 779 | * espresso_organization_logo_url |
| 780 | 780 | * @param bool $echo |
| 781 | 781 | * @return string |
| 782 | 782 | */ |
| 783 | - function espresso_organization_logo_url( $echo = TRUE ) { |
|
| 784 | - if($echo){ |
|
| 785 | - echo EE_Registry::instance()->CFG->organization->get_pretty( 'logo_url' ); |
|
| 783 | + function espresso_organization_logo_url($echo = TRUE) { |
|
| 784 | + if ($echo) { |
|
| 785 | + echo EE_Registry::instance()->CFG->organization->get_pretty('logo_url'); |
|
| 786 | 786 | return ''; |
| 787 | 787 | } |
| 788 | - return EE_Registry::instance()->CFG->organization->get_pretty( 'logo_url' ); |
|
| 788 | + return EE_Registry::instance()->CFG->organization->get_pretty('logo_url'); |
|
| 789 | 789 | } |
| 790 | 790 | } |
| 791 | 791 | |
| 792 | -if ( ! function_exists( 'espresso_organization_facebook' )) { |
|
| 792 | +if ( ! function_exists('espresso_organization_facebook')) { |
|
| 793 | 793 | /** |
| 794 | 794 | * espresso_organization_facebook |
| 795 | 795 | * @param bool $echo |
| 796 | 796 | * @return string |
| 797 | 797 | */ |
| 798 | - function espresso_organization_facebook( $echo = TRUE ) { |
|
| 799 | - if($echo){ |
|
| 800 | - echo EE_Registry::instance()->CFG->organization->get_pretty( 'facebook' ); |
|
| 798 | + function espresso_organization_facebook($echo = TRUE) { |
|
| 799 | + if ($echo) { |
|
| 800 | + echo EE_Registry::instance()->CFG->organization->get_pretty('facebook'); |
|
| 801 | 801 | return ''; |
| 802 | 802 | } |
| 803 | - return EE_Registry::instance()->CFG->organization->get_pretty( 'facebook' ); |
|
| 803 | + return EE_Registry::instance()->CFG->organization->get_pretty('facebook'); |
|
| 804 | 804 | } |
| 805 | 805 | } |
| 806 | 806 | |
| 807 | -if ( ! function_exists( 'espresso_organization_twitter' )) { |
|
| 807 | +if ( ! function_exists('espresso_organization_twitter')) { |
|
| 808 | 808 | /** |
| 809 | 809 | * espresso_organization_twitter |
| 810 | 810 | * @param bool $echo |
| 811 | 811 | * @return string |
| 812 | 812 | */ |
| 813 | - function espresso_organization_twitter( $echo = TRUE ) { |
|
| 814 | - if($echo){ |
|
| 815 | - echo EE_Registry::instance()->CFG->organization->get_pretty( 'twitter' ); |
|
| 813 | + function espresso_organization_twitter($echo = TRUE) { |
|
| 814 | + if ($echo) { |
|
| 815 | + echo EE_Registry::instance()->CFG->organization->get_pretty('twitter'); |
|
| 816 | 816 | return ''; |
| 817 | 817 | } |
| 818 | - return EE_Registry::instance()->CFG->organization->get_pretty( 'twitter' ); |
|
| 818 | + return EE_Registry::instance()->CFG->organization->get_pretty('twitter'); |
|
| 819 | 819 | } |
| 820 | 820 | } |
| 821 | 821 | |
| 822 | -if ( ! function_exists( 'espresso_organization_linkedin' )) { |
|
| 822 | +if ( ! function_exists('espresso_organization_linkedin')) { |
|
| 823 | 823 | /** |
| 824 | 824 | * espresso_organization_linkedin |
| 825 | 825 | * @param bool $echo |
| 826 | 826 | * @return string |
| 827 | 827 | */ |
| 828 | - function espresso_organization_linkedin( $echo = TRUE ) { |
|
| 829 | - if($echo){ |
|
| 830 | - echo EE_Registry::instance()->CFG->organization->get_pretty( 'linkedin' ); |
|
| 828 | + function espresso_organization_linkedin($echo = TRUE) { |
|
| 829 | + if ($echo) { |
|
| 830 | + echo EE_Registry::instance()->CFG->organization->get_pretty('linkedin'); |
|
| 831 | 831 | return ''; |
| 832 | 832 | } |
| 833 | - return EE_Registry::instance()->CFG->organization->get_pretty( 'linkedin' ); |
|
| 833 | + return EE_Registry::instance()->CFG->organization->get_pretty('linkedin'); |
|
| 834 | 834 | } |
| 835 | 835 | } |
| 836 | 836 | |
| 837 | -if ( ! function_exists( 'espresso_organization_pinterest' )) { |
|
| 837 | +if ( ! function_exists('espresso_organization_pinterest')) { |
|
| 838 | 838 | /** |
| 839 | 839 | * espresso_organization_pinterest |
| 840 | 840 | * @param bool $echo |
| 841 | 841 | * @return string |
| 842 | 842 | */ |
| 843 | - function espresso_organization_pinterest( $echo = TRUE ) { |
|
| 844 | - if($echo){ |
|
| 845 | - echo EE_Registry::instance()->CFG->organization->get_pretty( 'pinterest' ); |
|
| 843 | + function espresso_organization_pinterest($echo = TRUE) { |
|
| 844 | + if ($echo) { |
|
| 845 | + echo EE_Registry::instance()->CFG->organization->get_pretty('pinterest'); |
|
| 846 | 846 | return ''; |
| 847 | 847 | } |
| 848 | - return EE_Registry::instance()->CFG->organization->get_pretty( 'pinterest' ); |
|
| 848 | + return EE_Registry::instance()->CFG->organization->get_pretty('pinterest'); |
|
| 849 | 849 | } |
| 850 | 850 | } |
| 851 | 851 | |
| 852 | -if ( ! function_exists( 'espresso_organization_google' )) { |
|
| 852 | +if ( ! function_exists('espresso_organization_google')) { |
|
| 853 | 853 | /** |
| 854 | 854 | * espresso_organization_google |
| 855 | 855 | * @param bool $echo |
| 856 | 856 | * @return string |
| 857 | 857 | */ |
| 858 | - function espresso_organization_google( $echo = TRUE ) { |
|
| 859 | - if($echo){ |
|
| 860 | - echo EE_Registry::instance()->CFG->organization->get_pretty( 'google' ); |
|
| 858 | + function espresso_organization_google($echo = TRUE) { |
|
| 859 | + if ($echo) { |
|
| 860 | + echo EE_Registry::instance()->CFG->organization->get_pretty('google'); |
|
| 861 | 861 | return ''; |
| 862 | 862 | } |
| 863 | - return EE_Registry::instance()->CFG->organization->get_pretty( 'google' ); |
|
| 863 | + return EE_Registry::instance()->CFG->organization->get_pretty('google'); |
|
| 864 | 864 | } |
| 865 | 865 | } |
| 866 | 866 | |
| 867 | -if ( ! function_exists( 'espresso_organization_instagram' )) { |
|
| 867 | +if ( ! function_exists('espresso_organization_instagram')) { |
|
| 868 | 868 | /** |
| 869 | 869 | * espresso_organization_instagram |
| 870 | 870 | * @param bool $echo |
| 871 | 871 | * @return string |
| 872 | 872 | */ |
| 873 | - function espresso_organization_instagram( $echo = TRUE ) { |
|
| 874 | - if($echo){ |
|
| 875 | - echo EE_Registry::instance()->CFG->organization->get_pretty( 'instagram' ); |
|
| 873 | + function espresso_organization_instagram($echo = TRUE) { |
|
| 874 | + if ($echo) { |
|
| 875 | + echo EE_Registry::instance()->CFG->organization->get_pretty('instagram'); |
|
| 876 | 876 | return ''; |
| 877 | 877 | } |
| 878 | - return EE_Registry::instance()->CFG->organization->get_pretty( 'instagram' ); |
|
| 878 | + return EE_Registry::instance()->CFG->organization->get_pretty('instagram'); |
|
| 879 | 879 | } |
| 880 | 880 | } |
| 881 | 881 | |
@@ -885,7 +885,7 @@ discard block |
||
| 885 | 885 | |
| 886 | 886 | |
| 887 | 887 | |
| 888 | -if ( ! function_exists( 'espresso_event_venues' )) { |
|
| 888 | +if ( ! function_exists('espresso_event_venues')) { |
|
| 889 | 889 | /** |
| 890 | 890 | * espresso_event_venues |
| 891 | 891 | * |
@@ -899,7 +899,7 @@ discard block |
||
| 899 | 899 | |
| 900 | 900 | |
| 901 | 901 | |
| 902 | -if ( ! function_exists( 'espresso_venue_id' )) { |
|
| 902 | +if ( ! function_exists('espresso_venue_id')) { |
|
| 903 | 903 | /** |
| 904 | 904 | * espresso_venue_name |
| 905 | 905 | * |
@@ -907,15 +907,15 @@ discard block |
||
| 907 | 907 | * @param int $EVT_ID |
| 908 | 908 | * @return string |
| 909 | 909 | */ |
| 910 | - function espresso_venue_id( $EVT_ID = 0 ) { |
|
| 911 | - $venue = EEH_Venue_View::get_venue( $EVT_ID ); |
|
| 910 | + function espresso_venue_id($EVT_ID = 0) { |
|
| 911 | + $venue = EEH_Venue_View::get_venue($EVT_ID); |
|
| 912 | 912 | return $venue instanceof EE_Venue ? $venue->ID() : 0; |
| 913 | 913 | } |
| 914 | 914 | } |
| 915 | 915 | |
| 916 | 916 | |
| 917 | 917 | |
| 918 | -if ( ! function_exists( 'espresso_is_venue_private' ) ) { |
|
| 918 | +if ( ! function_exists('espresso_is_venue_private')) { |
|
| 919 | 919 | /** |
| 920 | 920 | * Return whether a venue is private or not. |
| 921 | 921 | * @see EEH_Venue_View::get_venue() for more info on expected return results. |
@@ -924,45 +924,45 @@ discard block |
||
| 924 | 924 | * |
| 925 | 925 | * @return bool | null |
| 926 | 926 | */ |
| 927 | - function espresso_is_venue_private( $VNU_ID = 0 ) { |
|
| 928 | - return EEH_Venue_View::is_venue_private( $VNU_ID ); |
|
| 927 | + function espresso_is_venue_private($VNU_ID = 0) { |
|
| 928 | + return EEH_Venue_View::is_venue_private($VNU_ID); |
|
| 929 | 929 | } |
| 930 | 930 | } |
| 931 | 931 | |
| 932 | 932 | |
| 933 | 933 | |
| 934 | -if ( ! function_exists( 'espresso_venue_is_password_protected' ) ) { |
|
| 934 | +if ( ! function_exists('espresso_venue_is_password_protected')) { |
|
| 935 | 935 | /** |
| 936 | 936 | * returns true or false if a venue is password protected or not |
| 937 | 937 | * |
| 938 | 938 | * @param int $VNU_ID optional, the venue id to check. |
| 939 | 939 | * @return string |
| 940 | 940 | */ |
| 941 | - function espresso_venue_is_password_protected( $VNU_ID = 0 ) { |
|
| 942 | - EE_Registry::instance()->load_helper( 'Venue_View' ); |
|
| 943 | - return EEH_Venue_View::is_venue_password_protected( $VNU_ID ); |
|
| 941 | + function espresso_venue_is_password_protected($VNU_ID = 0) { |
|
| 942 | + EE_Registry::instance()->load_helper('Venue_View'); |
|
| 943 | + return EEH_Venue_View::is_venue_password_protected($VNU_ID); |
|
| 944 | 944 | } |
| 945 | 945 | } |
| 946 | 946 | |
| 947 | 947 | |
| 948 | 948 | |
| 949 | -if ( ! function_exists( 'espresso_password_protected_venue_form' ) ) { |
|
| 949 | +if ( ! function_exists('espresso_password_protected_venue_form')) { |
|
| 950 | 950 | /** |
| 951 | 951 | * Returns a password form if venue is password protected. |
| 952 | 952 | * |
| 953 | 953 | * @param int $VNU_ID optional, the venue id to check. |
| 954 | 954 | * @return string |
| 955 | 955 | */ |
| 956 | - function espresso_password_protected_venue_form( $VNU_ID = 0 ) { |
|
| 957 | - EE_Registry::instance()->load_helper( 'Venue_View' ); |
|
| 958 | - return EEH_Venue_View::password_protected_venue_form( $VNU_ID ); |
|
| 956 | + function espresso_password_protected_venue_form($VNU_ID = 0) { |
|
| 957 | + EE_Registry::instance()->load_helper('Venue_View'); |
|
| 958 | + return EEH_Venue_View::password_protected_venue_form($VNU_ID); |
|
| 959 | 959 | } |
| 960 | 960 | } |
| 961 | 961 | |
| 962 | 962 | |
| 963 | 963 | |
| 964 | 964 | |
| 965 | -if ( ! function_exists( 'espresso_venue_name' )) { |
|
| 965 | +if ( ! function_exists('espresso_venue_name')) { |
|
| 966 | 966 | /** |
| 967 | 967 | * espresso_venue_name |
| 968 | 968 | * |
@@ -972,19 +972,19 @@ discard block |
||
| 972 | 972 | * @param bool $echo |
| 973 | 973 | * @return string |
| 974 | 974 | */ |
| 975 | - function espresso_venue_name( $VNU_ID = 0, $link_to = 'details', $echo = TRUE ) { |
|
| 976 | - if($echo){ |
|
| 977 | - echo EEH_Venue_View::venue_name( $link_to, $VNU_ID ); |
|
| 975 | + function espresso_venue_name($VNU_ID = 0, $link_to = 'details', $echo = TRUE) { |
|
| 976 | + if ($echo) { |
|
| 977 | + echo EEH_Venue_View::venue_name($link_to, $VNU_ID); |
|
| 978 | 978 | return ''; |
| 979 | 979 | } |
| 980 | - return EEH_Venue_View::venue_name( $link_to, $VNU_ID ); |
|
| 980 | + return EEH_Venue_View::venue_name($link_to, $VNU_ID); |
|
| 981 | 981 | } |
| 982 | 982 | } |
| 983 | 983 | |
| 984 | 984 | |
| 985 | 985 | |
| 986 | 986 | |
| 987 | -if ( ! function_exists( 'espresso_venue_link' )) { |
|
| 987 | +if ( ! function_exists('espresso_venue_link')) { |
|
| 988 | 988 | /** |
| 989 | 989 | * espresso_venue_link |
| 990 | 990 | * |
@@ -993,14 +993,14 @@ discard block |
||
| 993 | 993 | * @param string $text |
| 994 | 994 | * @return string |
| 995 | 995 | */ |
| 996 | - function espresso_venue_link( $VNU_ID = 0, $text = '' ) { |
|
| 997 | - return EEH_Venue_View::venue_details_link( $VNU_ID, $text ); |
|
| 996 | + function espresso_venue_link($VNU_ID = 0, $text = '') { |
|
| 997 | + return EEH_Venue_View::venue_details_link($VNU_ID, $text); |
|
| 998 | 998 | } |
| 999 | 999 | } |
| 1000 | 1000 | |
| 1001 | 1001 | |
| 1002 | 1002 | |
| 1003 | -if ( ! function_exists( 'espresso_venue_description' )) { |
|
| 1003 | +if ( ! function_exists('espresso_venue_description')) { |
|
| 1004 | 1004 | /** |
| 1005 | 1005 | * espresso_venue_description |
| 1006 | 1006 | * |
@@ -1009,17 +1009,17 @@ discard block |
||
| 1009 | 1009 | * @param bool $echo |
| 1010 | 1010 | * @return string |
| 1011 | 1011 | */ |
| 1012 | - function espresso_venue_description( $VNU_ID = FALSE, $echo = TRUE ) { |
|
| 1013 | - if($echo){ |
|
| 1014 | - echo EEH_Venue_View::venue_description( $VNU_ID ); |
|
| 1012 | + function espresso_venue_description($VNU_ID = FALSE, $echo = TRUE) { |
|
| 1013 | + if ($echo) { |
|
| 1014 | + echo EEH_Venue_View::venue_description($VNU_ID); |
|
| 1015 | 1015 | return ''; |
| 1016 | 1016 | } |
| 1017 | - return EEH_Venue_View::venue_description( $VNU_ID ); |
|
| 1017 | + return EEH_Venue_View::venue_description($VNU_ID); |
|
| 1018 | 1018 | } |
| 1019 | 1019 | } |
| 1020 | 1020 | |
| 1021 | 1021 | |
| 1022 | -if ( ! function_exists( 'espresso_venue_excerpt' )) { |
|
| 1022 | +if ( ! function_exists('espresso_venue_excerpt')) { |
|
| 1023 | 1023 | /** |
| 1024 | 1024 | * espresso_venue_excerpt |
| 1025 | 1025 | * |
@@ -1028,18 +1028,18 @@ discard block |
||
| 1028 | 1028 | * @param bool $echo |
| 1029 | 1029 | * @return string |
| 1030 | 1030 | */ |
| 1031 | - function espresso_venue_excerpt( $VNU_ID = 0, $echo = TRUE ) { |
|
| 1032 | - if ( $echo ) { |
|
| 1033 | - echo EEH_Venue_View::venue_excerpt( $VNU_ID ); |
|
| 1031 | + function espresso_venue_excerpt($VNU_ID = 0, $echo = TRUE) { |
|
| 1032 | + if ($echo) { |
|
| 1033 | + echo EEH_Venue_View::venue_excerpt($VNU_ID); |
|
| 1034 | 1034 | return ''; |
| 1035 | 1035 | } |
| 1036 | - return EEH_Venue_View::venue_excerpt( $VNU_ID ); |
|
| 1036 | + return EEH_Venue_View::venue_excerpt($VNU_ID); |
|
| 1037 | 1037 | } |
| 1038 | 1038 | } |
| 1039 | 1039 | |
| 1040 | 1040 | |
| 1041 | 1041 | |
| 1042 | -if ( ! function_exists( 'espresso_venue_categories' )) { |
|
| 1042 | +if ( ! function_exists('espresso_venue_categories')) { |
|
| 1043 | 1043 | /** |
| 1044 | 1044 | * espresso_venue_categories |
| 1045 | 1045 | * returns the terms associated with a venue |
@@ -1049,17 +1049,17 @@ discard block |
||
| 1049 | 1049 | * @param bool $echo |
| 1050 | 1050 | * @return string |
| 1051 | 1051 | */ |
| 1052 | - function espresso_venue_categories( $VNU_ID = 0, $hide_uncategorized = TRUE, $echo = TRUE ) { |
|
| 1053 | - if ( $echo ) { |
|
| 1054 | - echo EEH_Venue_View::venue_categories( $VNU_ID, $hide_uncategorized ); |
|
| 1052 | + function espresso_venue_categories($VNU_ID = 0, $hide_uncategorized = TRUE, $echo = TRUE) { |
|
| 1053 | + if ($echo) { |
|
| 1054 | + echo EEH_Venue_View::venue_categories($VNU_ID, $hide_uncategorized); |
|
| 1055 | 1055 | return ''; |
| 1056 | 1056 | } |
| 1057 | - return EEH_Venue_View::venue_categories( $VNU_ID, $hide_uncategorized ); |
|
| 1057 | + return EEH_Venue_View::venue_categories($VNU_ID, $hide_uncategorized); |
|
| 1058 | 1058 | } |
| 1059 | 1059 | } |
| 1060 | 1060 | |
| 1061 | 1061 | |
| 1062 | -if ( ! function_exists( 'espresso_venue_address' )) { |
|
| 1062 | +if ( ! function_exists('espresso_venue_address')) { |
|
| 1063 | 1063 | /** |
| 1064 | 1064 | * espresso_venue_address |
| 1065 | 1065 | * returns a formatted block of html for displaying a venue's address |
@@ -1069,17 +1069,17 @@ discard block |
||
| 1069 | 1069 | * @param bool $echo |
| 1070 | 1070 | * @return string |
| 1071 | 1071 | */ |
| 1072 | - function espresso_venue_address( $type = 'multiline', $VNU_ID = 0, $echo = TRUE ) { |
|
| 1073 | - if ( $echo ) { |
|
| 1074 | - echo EEH_Venue_View::venue_address( $type, $VNU_ID ); |
|
| 1072 | + function espresso_venue_address($type = 'multiline', $VNU_ID = 0, $echo = TRUE) { |
|
| 1073 | + if ($echo) { |
|
| 1074 | + echo EEH_Venue_View::venue_address($type, $VNU_ID); |
|
| 1075 | 1075 | return ''; |
| 1076 | 1076 | } |
| 1077 | - return EEH_Venue_View::venue_address( $type, $VNU_ID ); |
|
| 1077 | + return EEH_Venue_View::venue_address($type, $VNU_ID); |
|
| 1078 | 1078 | } |
| 1079 | 1079 | } |
| 1080 | 1080 | |
| 1081 | 1081 | |
| 1082 | -if ( ! function_exists( 'espresso_venue_raw_address' )) { |
|
| 1082 | +if ( ! function_exists('espresso_venue_raw_address')) { |
|
| 1083 | 1083 | /** |
| 1084 | 1084 | * espresso_venue_address |
| 1085 | 1085 | * returns an UN-formatted string containing a venue's address |
@@ -1089,17 +1089,17 @@ discard block |
||
| 1089 | 1089 | * @param bool $echo |
| 1090 | 1090 | * @return string |
| 1091 | 1091 | */ |
| 1092 | - function espresso_venue_raw_address( $type = 'multiline', $VNU_ID = 0, $echo = TRUE ) { |
|
| 1093 | - if ( $echo ) { |
|
| 1094 | - echo EEH_Venue_View::venue_address( $type, $VNU_ID, FALSE, FALSE ); |
|
| 1092 | + function espresso_venue_raw_address($type = 'multiline', $VNU_ID = 0, $echo = TRUE) { |
|
| 1093 | + if ($echo) { |
|
| 1094 | + echo EEH_Venue_View::venue_address($type, $VNU_ID, FALSE, FALSE); |
|
| 1095 | 1095 | return ''; |
| 1096 | 1096 | } |
| 1097 | - return EEH_Venue_View::venue_address( $type, $VNU_ID, FALSE, FALSE ); |
|
| 1097 | + return EEH_Venue_View::venue_address($type, $VNU_ID, FALSE, FALSE); |
|
| 1098 | 1098 | } |
| 1099 | 1099 | } |
| 1100 | 1100 | |
| 1101 | 1101 | |
| 1102 | -if ( ! function_exists( 'espresso_venue_has_address' )) { |
|
| 1102 | +if ( ! function_exists('espresso_venue_has_address')) { |
|
| 1103 | 1103 | /** |
| 1104 | 1104 | * espresso_venue_has_address |
| 1105 | 1105 | * returns TRUE or FALSE if a Venue has address information |
@@ -1107,13 +1107,13 @@ discard block |
||
| 1107 | 1107 | * @param int $VNU_ID |
| 1108 | 1108 | * @return bool |
| 1109 | 1109 | */ |
| 1110 | - function espresso_venue_has_address( $VNU_ID = 0 ) { |
|
| 1111 | - return EEH_Venue_View::venue_has_address( $VNU_ID ); |
|
| 1110 | + function espresso_venue_has_address($VNU_ID = 0) { |
|
| 1111 | + return EEH_Venue_View::venue_has_address($VNU_ID); |
|
| 1112 | 1112 | } |
| 1113 | 1113 | } |
| 1114 | 1114 | |
| 1115 | 1115 | |
| 1116 | -if ( ! function_exists( 'espresso_venue_gmap' )) { |
|
| 1116 | +if ( ! function_exists('espresso_venue_gmap')) { |
|
| 1117 | 1117 | /** |
| 1118 | 1118 | * espresso_venue_gmap |
| 1119 | 1119 | * returns a google map for the venue address |
@@ -1124,17 +1124,17 @@ discard block |
||
| 1124 | 1124 | * @param bool $echo |
| 1125 | 1125 | * @return string |
| 1126 | 1126 | */ |
| 1127 | - function espresso_venue_gmap( $VNU_ID = 0, $map_ID = FALSE, $gmap = array(), $echo = TRUE ) { |
|
| 1128 | - if ( $echo ) { |
|
| 1129 | - echo EEH_Venue_View::venue_gmap( $VNU_ID, $map_ID, $gmap ); |
|
| 1127 | + function espresso_venue_gmap($VNU_ID = 0, $map_ID = FALSE, $gmap = array(), $echo = TRUE) { |
|
| 1128 | + if ($echo) { |
|
| 1129 | + echo EEH_Venue_View::venue_gmap($VNU_ID, $map_ID, $gmap); |
|
| 1130 | 1130 | return ''; |
| 1131 | 1131 | } |
| 1132 | - return EEH_Venue_View::venue_gmap( $VNU_ID, $map_ID, $gmap ); |
|
| 1132 | + return EEH_Venue_View::venue_gmap($VNU_ID, $map_ID, $gmap); |
|
| 1133 | 1133 | } |
| 1134 | 1134 | } |
| 1135 | 1135 | |
| 1136 | 1136 | |
| 1137 | -if ( ! function_exists( 'espresso_venue_phone' )) { |
|
| 1137 | +if ( ! function_exists('espresso_venue_phone')) { |
|
| 1138 | 1138 | /** |
| 1139 | 1139 | * espresso_venue_phone |
| 1140 | 1140 | * |
@@ -1142,18 +1142,18 @@ discard block |
||
| 1142 | 1142 | * @param bool $echo |
| 1143 | 1143 | * @return string |
| 1144 | 1144 | */ |
| 1145 | - function espresso_venue_phone( $VNU_ID = 0, $echo = TRUE ) { |
|
| 1146 | - if ( $echo ) { |
|
| 1147 | - echo EEH_Venue_View::venue_phone( $VNU_ID ); |
|
| 1145 | + function espresso_venue_phone($VNU_ID = 0, $echo = TRUE) { |
|
| 1146 | + if ($echo) { |
|
| 1147 | + echo EEH_Venue_View::venue_phone($VNU_ID); |
|
| 1148 | 1148 | return ''; |
| 1149 | 1149 | } |
| 1150 | - return EEH_Venue_View::venue_phone( $VNU_ID ); |
|
| 1150 | + return EEH_Venue_View::venue_phone($VNU_ID); |
|
| 1151 | 1151 | } |
| 1152 | 1152 | } |
| 1153 | 1153 | |
| 1154 | 1154 | |
| 1155 | 1155 | |
| 1156 | -if ( ! function_exists( 'espresso_venue_website' )) { |
|
| 1156 | +if ( ! function_exists('espresso_venue_website')) { |
|
| 1157 | 1157 | /** |
| 1158 | 1158 | * espresso_venue_website |
| 1159 | 1159 | * |
@@ -1161,18 +1161,18 @@ discard block |
||
| 1161 | 1161 | * @param bool $echo |
| 1162 | 1162 | * @return string |
| 1163 | 1163 | */ |
| 1164 | - function espresso_venue_website( $VNU_ID = 0, $echo = TRUE ) { |
|
| 1165 | - if ( $echo ) { |
|
| 1166 | - echo EEH_Venue_View::venue_website_link( $VNU_ID ); |
|
| 1164 | + function espresso_venue_website($VNU_ID = 0, $echo = TRUE) { |
|
| 1165 | + if ($echo) { |
|
| 1166 | + echo EEH_Venue_View::venue_website_link($VNU_ID); |
|
| 1167 | 1167 | return ''; |
| 1168 | 1168 | } |
| 1169 | - return EEH_Venue_View::venue_website_link( $VNU_ID ); |
|
| 1169 | + return EEH_Venue_View::venue_website_link($VNU_ID); |
|
| 1170 | 1170 | } |
| 1171 | 1171 | } |
| 1172 | 1172 | |
| 1173 | 1173 | |
| 1174 | 1174 | |
| 1175 | -if ( ! function_exists( 'espresso_edit_venue_link' )) { |
|
| 1175 | +if ( ! function_exists('espresso_edit_venue_link')) { |
|
| 1176 | 1176 | /** |
| 1177 | 1177 | * espresso_edit_venue_link |
| 1178 | 1178 | * |
@@ -1180,12 +1180,12 @@ discard block |
||
| 1180 | 1180 | * @param bool $echo |
| 1181 | 1181 | * @return string |
| 1182 | 1182 | */ |
| 1183 | - function espresso_edit_venue_link( $VNU_ID = 0, $echo = TRUE ) { |
|
| 1184 | - if($echo){ |
|
| 1185 | - echo EEH_Venue_View::edit_venue_link( $VNU_ID ); |
|
| 1183 | + function espresso_edit_venue_link($VNU_ID = 0, $echo = TRUE) { |
|
| 1184 | + if ($echo) { |
|
| 1185 | + echo EEH_Venue_View::edit_venue_link($VNU_ID); |
|
| 1186 | 1186 | return ''; |
| 1187 | 1187 | } |
| 1188 | - return EEH_Venue_View::edit_venue_link( $VNU_ID ); |
|
| 1188 | + return EEH_Venue_View::edit_venue_link($VNU_ID); |
|
| 1189 | 1189 | } |
| 1190 | 1190 | } |
| 1191 | 1191 | |
@@ -11,33 +11,33 @@ |
||
| 11 | 11 | class EE_Float_Input extends EE_Form_Input_Base |
| 12 | 12 | { |
| 13 | 13 | |
| 14 | - /** |
|
| 15 | - * @param array $input_settings |
|
| 16 | - * @throws InvalidArgumentException |
|
| 17 | - */ |
|
| 18 | - public function __construct($input_settings = array()) |
|
| 19 | - { |
|
| 20 | - $this->_set_display_strategy( |
|
| 21 | - new EE_Number_Input_Display_Strategy( |
|
| 22 | - isset($input_settings['min_value']) |
|
| 23 | - ? $input_settings['min_value'] |
|
| 24 | - : null, |
|
| 25 | - isset($input_settings['max_value']) |
|
| 26 | - ? $input_settings['max_value'] |
|
| 27 | - : null, |
|
| 28 | - isset($input_settings['step_value']) |
|
| 29 | - ? $input_settings['step_value'] |
|
| 30 | - : null |
|
| 31 | - ) |
|
| 32 | - ); |
|
| 33 | - $this->_set_normalization_strategy(new EE_Float_Normalization()); |
|
| 34 | - $this->_add_validation_strategy( |
|
| 35 | - new EE_Float_Validation_Strategy( |
|
| 36 | - isset($input_settings['validation_error_message']) |
|
| 37 | - ? $input_settings['validation_error_message'] |
|
| 38 | - : null |
|
| 39 | - ) |
|
| 40 | - ); |
|
| 41 | - parent::__construct($input_settings); |
|
| 42 | - } |
|
| 14 | + /** |
|
| 15 | + * @param array $input_settings |
|
| 16 | + * @throws InvalidArgumentException |
|
| 17 | + */ |
|
| 18 | + public function __construct($input_settings = array()) |
|
| 19 | + { |
|
| 20 | + $this->_set_display_strategy( |
|
| 21 | + new EE_Number_Input_Display_Strategy( |
|
| 22 | + isset($input_settings['min_value']) |
|
| 23 | + ? $input_settings['min_value'] |
|
| 24 | + : null, |
|
| 25 | + isset($input_settings['max_value']) |
|
| 26 | + ? $input_settings['max_value'] |
|
| 27 | + : null, |
|
| 28 | + isset($input_settings['step_value']) |
|
| 29 | + ? $input_settings['step_value'] |
|
| 30 | + : null |
|
| 31 | + ) |
|
| 32 | + ); |
|
| 33 | + $this->_set_normalization_strategy(new EE_Float_Normalization()); |
|
| 34 | + $this->_add_validation_strategy( |
|
| 35 | + new EE_Float_Validation_Strategy( |
|
| 36 | + isset($input_settings['validation_error_message']) |
|
| 37 | + ? $input_settings['validation_error_message'] |
|
| 38 | + : null |
|
| 39 | + ) |
|
| 40 | + ); |
|
| 41 | + parent::__construct($input_settings); |
|
| 42 | + } |
|
| 43 | 43 | } |
@@ -10,22 +10,22 @@ discard block |
||
| 10 | 10 | * @var int $message_template_group_id The ID for the message template group this context belongs to. |
| 11 | 11 | */ |
| 12 | 12 | $active_message = sprintf( |
| 13 | - esc_html__( |
|
| 14 | - 'The template for %1$s is currently %2$sactive%3$s.', |
|
| 15 | - 'event_espresso' |
|
| 16 | - ), |
|
| 17 | - $context_label, |
|
| 18 | - '<strong>', |
|
| 19 | - '</strong>' |
|
| 13 | + esc_html__( |
|
| 14 | + 'The template for %1$s is currently %2$sactive%3$s.', |
|
| 15 | + 'event_espresso' |
|
| 16 | + ), |
|
| 17 | + $context_label, |
|
| 18 | + '<strong>', |
|
| 19 | + '</strong>' |
|
| 20 | 20 | ); |
| 21 | 21 | $inactive_message = sprintf( |
| 22 | - esc_html__( |
|
| 23 | - 'The template for %1$s is currently %2$sinactive%3$s.', |
|
| 24 | - 'event_espresso' |
|
| 25 | - ), |
|
| 26 | - $context_label, |
|
| 27 | - '<strong>', |
|
| 28 | - '</strong>' |
|
| 22 | + esc_html__( |
|
| 23 | + 'The template for %1$s is currently %2$sinactive%3$s.', |
|
| 24 | + 'event_espresso' |
|
| 25 | + ), |
|
| 26 | + $context_label, |
|
| 27 | + '<strong>', |
|
| 28 | + '</strong>' |
|
| 29 | 29 | ); |
| 30 | 30 | ?> |
| 31 | 31 | <div class="context-active-control-container"> |
@@ -34,8 +34,8 @@ discard block |
||
| 34 | 34 | <span id="on-off-nonce-<?php echo $context; ?>" class="hidden"><?php echo $nonce; ?></span> |
| 35 | 35 | <span class="ee-on-off-toggle-label"> |
| 36 | 36 | <?php |
| 37 | - echo $is_active ? $active_message : $inactive_message; |
|
| 38 | - ?> |
|
| 37 | + echo $is_active ? $active_message : $inactive_message; |
|
| 38 | + ?> |
|
| 39 | 39 | </span> |
| 40 | 40 | <div class="hidden js-data"> |
| 41 | 41 | <span class="ee-active-message"><?php echo $active_message; ?></span> |
@@ -43,8 +43,8 @@ discard block |
||
| 43 | 43 | </div> |
| 44 | 44 | <div class="switch"> |
| 45 | 45 | <?php |
| 46 | - $checked = $is_active ? ' checked="checked"' : ''; |
|
| 47 | - ?> |
|
| 46 | + $checked = $is_active ? ' checked="checked"' : ''; |
|
| 47 | + ?> |
|
| 48 | 48 | <input data-grpid="<?php echo $message_template_group_id; ?>" id="ee-on-off-toggle-<?php echo $context; ?>" type="checkbox" class="ee-on-off-toggle ee-toggle-round-flat"<?php echo $checked; ?> value="<?php echo $on_off_action; ?>"> |
| 49 | 49 | <label for="ee-on-off-toggle-<?php echo $context; ?>"></label> |
| 50 | 50 | </div> |
@@ -8,8 +8,8 @@ discard block |
||
| 8 | 8 | $event_label = 'Testing Context Deactivation'; |
| 9 | 9 | |
| 10 | 10 | $I->wantTo( |
| 11 | - 'Test that the context activation toggle for turning on or off specific contexts for message sending works as' |
|
| 12 | - . ' expected' |
|
| 11 | + 'Test that the context activation toggle for turning on or off specific contexts for message sending works as' |
|
| 12 | + . ' expected' |
|
| 13 | 13 | ); |
| 14 | 14 | |
| 15 | 15 | $I->loginAsAdmin(); |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | $I->see('The template for Primary Registrant Recipient is currently inactive.'); |
| 35 | 35 | |
| 36 | 36 | $I->amGoingTo( |
| 37 | - 'Trigger Registration Approved Messages and verify primary registrant context is excluded from sent messages.' |
|
| 37 | + 'Trigger Registration Approved Messages and verify primary registrant context is excluded from sent messages.' |
|
| 38 | 38 | ); |
| 39 | 39 | $I->amOnDefaultEventsListTablePage(); |
| 40 | 40 | $I->click(EventsAdmin::ADD_NEW_EVENT_BUTTON_SELECTOR); |
@@ -44,9 +44,9 @@ discard block |
||
| 44 | 44 | $event_link = $I->observeLinkUrlAt(EventsAdmin::EVENT_EDITOR_VIEW_LINK_AFTER_PUBLISH_SELECTOR); |
| 45 | 45 | $event_id = $I->observeValueFromInputAt(EventsAdmin::EVENT_EDITOR_EVT_ID_SELECTOR); |
| 46 | 46 | $test_registration_details = array( |
| 47 | - 'fname' => 'ContextTestGuy', |
|
| 48 | - 'lname' => 'ContextTestDude', |
|
| 49 | - 'email' => '[email protected]', |
|
| 47 | + 'fname' => 'ContextTestGuy', |
|
| 48 | + 'lname' => 'ContextTestDude', |
|
| 49 | + 'email' => '[email protected]', |
|
| 50 | 50 | ); |
| 51 | 51 | $I->logOut(); |
| 52 | 52 | $I->amOnUrl($event_link); |
@@ -63,48 +63,48 @@ discard block |
||
| 63 | 63 | $I->amOnMessagesActivityListTablePage(); |
| 64 | 64 | //verify registrant context |
| 65 | 65 | $I->see( |
| 66 | - $test_registration_details['email'], |
|
| 67 | - MessagesAdmin::messagesActivityListTableCellSelectorFor( |
|
| 68 | - 'to', |
|
| 69 | - 'Registration Approved', |
|
| 70 | - MessagesAdmin::MESSAGE_STATUS_SENT, |
|
| 71 | - '', |
|
| 72 | - 'Registrant' |
|
| 73 | - ) |
|
| 66 | + $test_registration_details['email'], |
|
| 67 | + MessagesAdmin::messagesActivityListTableCellSelectorFor( |
|
| 68 | + 'to', |
|
| 69 | + 'Registration Approved', |
|
| 70 | + MessagesAdmin::MESSAGE_STATUS_SENT, |
|
| 71 | + '', |
|
| 72 | + 'Registrant' |
|
| 73 | + ) |
|
| 74 | 74 | ); |
| 75 | 75 | $I->deleteMessageInMessagesListTableFor( |
| 76 | - 'Registration Approved', |
|
| 77 | - MessagesAdmin::MESSAGE_STATUS_SENT, |
|
| 78 | - 'Email', |
|
| 79 | - 'Registrant' |
|
| 76 | + 'Registration Approved', |
|
| 77 | + MessagesAdmin::MESSAGE_STATUS_SENT, |
|
| 78 | + 'Email', |
|
| 79 | + 'Registrant' |
|
| 80 | 80 | ); |
| 81 | 81 | //verify admin context |
| 82 | 82 | $I->see( |
| 83 | - '[email protected]', |
|
| 84 | - MessagesAdmin::messagesActivityListTableCellSelectorFor( |
|
| 85 | - 'to', |
|
| 86 | - 'Registration Approved', |
|
| 87 | - MessagesAdmin::MESSAGE_STATUS_SENT |
|
| 88 | - ) |
|
| 83 | + '[email protected]', |
|
| 84 | + MessagesAdmin::messagesActivityListTableCellSelectorFor( |
|
| 85 | + 'to', |
|
| 86 | + 'Registration Approved', |
|
| 87 | + MessagesAdmin::MESSAGE_STATUS_SENT |
|
| 88 | + ) |
|
| 89 | 89 | ); |
| 90 | 90 | $I->deleteMessageInMessagesListTableFor( |
| 91 | - 'Registration Approved' |
|
| 91 | + 'Registration Approved' |
|
| 92 | 92 | ); |
| 93 | 93 | //verify primary registrant context is NOT present. |
| 94 | 94 | $I->dontSee( |
| 95 | - $test_registration_details['email'], |
|
| 96 | - MessagesAdmin::messagesActivityListTableCellSelectorFor( |
|
| 97 | - 'to', |
|
| 98 | - 'Registration Approved', |
|
| 99 | - MessagesAdmin::MESSAGE_STATUS_SENT, |
|
| 100 | - '', |
|
| 101 | - 'Primary Registrant' |
|
| 102 | - ) |
|
| 95 | + $test_registration_details['email'], |
|
| 96 | + MessagesAdmin::messagesActivityListTableCellSelectorFor( |
|
| 97 | + 'to', |
|
| 98 | + 'Registration Approved', |
|
| 99 | + MessagesAdmin::MESSAGE_STATUS_SENT, |
|
| 100 | + '', |
|
| 101 | + 'Primary Registrant' |
|
| 102 | + ) |
|
| 103 | 103 | ); |
| 104 | 104 | |
| 105 | 105 | $I->amGoingTo( |
| 106 | - 'Deactivate primary registrant context for Registration Approved Message Templates and restore the "To"' |
|
| 107 | - . ' field to an empty string to verify the message does not send for that context.' |
|
| 106 | + 'Deactivate primary registrant context for Registration Approved Message Templates and restore the "To"' |
|
| 107 | + . ' field to an empty string to verify the message does not send for that context.' |
|
| 108 | 108 | ); |
| 109 | 109 | $I->amOnDefaultMessageTemplateListTablePage(); |
| 110 | 110 | $I->clickToEditMessageTemplateByMessageType('registration', 'primary_attendee'); |
@@ -128,41 +128,41 @@ discard block |
||
| 128 | 128 | $I->amOnMessagesActivityListTablePage(); |
| 129 | 129 | //verify registrant context |
| 130 | 130 | $I->see( |
| 131 | - $test_registration_details['email'], |
|
| 132 | - MessagesAdmin::messagesActivityListTableCellSelectorFor( |
|
| 133 | - 'to', |
|
| 134 | - 'Registration Approved', |
|
| 135 | - MessagesAdmin::MESSAGE_STATUS_SENT, |
|
| 136 | - '', |
|
| 137 | - 'Registrant' |
|
| 138 | - ) |
|
| 131 | + $test_registration_details['email'], |
|
| 132 | + MessagesAdmin::messagesActivityListTableCellSelectorFor( |
|
| 133 | + 'to', |
|
| 134 | + 'Registration Approved', |
|
| 135 | + MessagesAdmin::MESSAGE_STATUS_SENT, |
|
| 136 | + '', |
|
| 137 | + 'Registrant' |
|
| 138 | + ) |
|
| 139 | 139 | ); |
| 140 | 140 | $I->deleteMessageInMessagesListTableFor( |
| 141 | - 'Registration Approved', |
|
| 142 | - MessagesAdmin::MESSAGE_STATUS_SENT, |
|
| 143 | - 'Email', |
|
| 144 | - 'Registrant' |
|
| 141 | + 'Registration Approved', |
|
| 142 | + MessagesAdmin::MESSAGE_STATUS_SENT, |
|
| 143 | + 'Email', |
|
| 144 | + 'Registrant' |
|
| 145 | 145 | ); |
| 146 | 146 | //verify admin context |
| 147 | 147 | $I->see( |
| 148 | - '[email protected]', |
|
| 149 | - MessagesAdmin::messagesActivityListTableCellSelectorFor( |
|
| 150 | - 'to', |
|
| 151 | - 'Registration Approved', |
|
| 152 | - MessagesAdmin::MESSAGE_STATUS_SENT |
|
| 153 | - ) |
|
| 148 | + '[email protected]', |
|
| 149 | + MessagesAdmin::messagesActivityListTableCellSelectorFor( |
|
| 150 | + 'to', |
|
| 151 | + 'Registration Approved', |
|
| 152 | + MessagesAdmin::MESSAGE_STATUS_SENT |
|
| 153 | + ) |
|
| 154 | 154 | ); |
| 155 | 155 | $I->deleteMessageInMessagesListTableFor( |
| 156 | - 'Registration Approved' |
|
| 156 | + 'Registration Approved' |
|
| 157 | 157 | ); |
| 158 | 158 | //verify primary registrant context is NOT present. |
| 159 | 159 | $I->dontSee( |
| 160 | - $test_registration_details['email'], |
|
| 161 | - MessagesAdmin::messagesActivityListTableCellSelectorFor( |
|
| 162 | - 'to', |
|
| 163 | - 'Registration Approved', |
|
| 164 | - MessagesAdmin::MESSAGE_STATUS_SENT, |
|
| 165 | - '', |
|
| 166 | - 'Primary Registrant' |
|
| 167 | - ) |
|
| 160 | + $test_registration_details['email'], |
|
| 161 | + MessagesAdmin::messagesActivityListTableCellSelectorFor( |
|
| 162 | + 'to', |
|
| 163 | + 'Registration Approved', |
|
| 164 | + MessagesAdmin::MESSAGE_STATUS_SENT, |
|
| 165 | + '', |
|
| 166 | + 'Primary Registrant' |
|
| 167 | + ) |
|
| 168 | 168 | ); |
| 169 | 169 | \ No newline at end of file |
@@ -9,9 +9,9 @@ discard block |
||
| 9 | 9 | * @ link http://www.eventespresso.com |
| 10 | 10 | * @ version 4+ |
| 11 | 11 | */ |
| 12 | -define( 'EE_THEME_FUNCTIONS_LOADED', TRUE ); |
|
| 12 | +define('EE_THEME_FUNCTIONS_LOADED', TRUE); |
|
| 13 | 13 | |
| 14 | -if ( ! function_exists( 'espresso_pagination' ) ) { |
|
| 14 | +if ( ! function_exists('espresso_pagination')) { |
|
| 15 | 15 | /** |
| 16 | 16 | * espresso_pagination |
| 17 | 17 | * |
@@ -23,21 +23,21 @@ discard block |
||
| 23 | 23 | $big = 999999999; // need an unlikely integer |
| 24 | 24 | $pagination = paginate_links( |
| 25 | 25 | array( |
| 26 | - 'base' => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ), |
|
| 26 | + 'base' => str_replace($big, '%#%', esc_url(get_pagenum_link($big))), |
|
| 27 | 27 | 'format' => '?paged=%#%', |
| 28 | - 'current' => max( 1, get_query_var( 'paged' ) ), |
|
| 28 | + 'current' => max(1, get_query_var('paged')), |
|
| 29 | 29 | 'total' => $wp_query->max_num_pages, |
| 30 | 30 | 'show_all' => true, |
| 31 | 31 | 'end_size' => 10, |
| 32 | 32 | 'mid_size' => 6, |
| 33 | 33 | 'prev_next' => true, |
| 34 | - 'prev_text' => __( '‹ PREV', 'event_espresso' ), |
|
| 35 | - 'next_text' => __( 'NEXT ›', 'event_espresso' ), |
|
| 34 | + 'prev_text' => __('‹ PREV', 'event_espresso'), |
|
| 35 | + 'next_text' => __('NEXT ›', 'event_espresso'), |
|
| 36 | 36 | 'type' => 'plain', |
| 37 | 37 | 'add_args' => false, |
| 38 | 38 | 'add_fragment' => '' |
| 39 | 39 | ) |
| 40 | 40 | ); |
| 41 | - echo ! empty( $pagination ) ? '<div class="ee-pagination-dv ee-clear-float">' . $pagination . '</div>' : ''; |
|
| 41 | + echo ! empty($pagination) ? '<div class="ee-pagination-dv ee-clear-float">'.$pagination.'</div>' : ''; |
|
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | \ No newline at end of file |