" . $EM_Location->location_address . " - " . $EM_Location->location_town; + }elseif( $EM_Event->has_event_location() ) { + echo $EM_Event->get_event_location()->get_admin_column(); }else{ echo __('None','events-manager'); } diff --git a/classes/em-event.php b/classes/em-event.php index bc03fb6..5670b8e 100644 --- a/classes/em-event.php +++ b/classes/em-event.php @@ -124,6 +124,14 @@ class EM_Event extends EM_Object{ var $event_spaces; var $event_private; var $location_id; + /** + * Key name of event location type associated to this event. + * + * Events can have an event-specific location type, such as a url, webinar or another custom type instead of a regular geographical location. If this value is set, then a registered event location type is loaded and relevant saved event meta is used. + * + * @var string + */ + public $event_location_type; var $recurrence_id; var $event_status; var $blog_id = 0; @@ -178,6 +186,7 @@ class EM_Event extends EM_Object{ 'event_rsvp_spaces' => array( 'name'=>'rsvp_spaces', 'type'=>'%d', 'null'=>true ), 'event_spaces' => array( 'name'=>'spaces', 'type'=>'%d', 'null'=>true), 'location_id' => array( 'name'=>'location_id', 'type'=>'%d', 'null'=>true ), + 'event_location_type' => array( 'type'=>'%s', 'null'=>true ), 'recurrence_id' => array( 'name'=>'recurrence_id', 'type'=>'%d', 'null'=>true ), 'event_status' => array( 'name'=>'status', 'type'=>'%d', 'null'=>true ), 'event_private' => array( 'name'=>'status', 'type'=>'%d', 'null'=>true ), @@ -233,6 +242,10 @@ class EM_Event extends EM_Object{ * @var EM_Location */ var $location; + /** + * @var array + */ + var $event_location_data = array(); /** * @var EM_Bookings */ @@ -497,11 +510,12 @@ function load_postdata($event_post, $search_by = false){ //load meta data and other related information if( $event_post->post_status != 'auto-draft' ){ $event_meta = $this->get_event_meta($search_by); + if( !empty($even_meta['_event_location_type']) ) $this->event_location_type = $even_meta['_event_location_type']; //load this directly so we know further down whether this has an event location type to load //Get custom fields and post meta foreach($event_meta as $event_meta_key => $event_meta_val){ $field_name = substr($event_meta_key, 1); if($event_meta_key[0] != '_'){ - $this->event_attributes[$event_meta_key] = ( is_array($event_meta_val) ) ? $event_meta_val[0]:$event_meta_val; + $this->event_attributes[$event_meta_key] = ( is_array($event_meta_val) ) ? $event_meta_val[0]:$event_meta_val; }elseif( is_string($field_name) && !in_array($field_name, $this->post_fields) ){ if( array_key_exists($field_name, $this->fields) ){ $this->$field_name = $event_meta_val[0]; @@ -510,6 +524,7 @@ function load_postdata($event_post, $search_by = false){ } } } + if( $this->has_event_location() ) $this->get_event_location()->load_postdata($event_meta); //quick compatability fix in case _event_id isn't loaded or somehow got erased in post meta if( empty($this->event_id) && !$this->is_recurring() ){ global $wpdb; @@ -661,17 +676,42 @@ function get_post_meta(){ //reset start and end objects so they are recreated with the new dates/times if and when needed $this->start = $this->end = null; - //Get Location info - if( !get_option('dbem_locations_enabled') || (!empty($_POST['no_location']) && !get_option('dbem_require_location',true)) || (empty($_POST['location_id']) && !get_option('dbem_require_location',true) && get_option('dbem_use_select_for_locations')) ){ - $this->location_id = 0; - }elseif( !empty($_POST['location_id']) && is_numeric($_POST['location_id']) ){ - $this->location_id = absint($_POST['location_id']); + //Get Location Info + if( get_option('dbem_locations_enabled') ){ + // determine location type, with backward compatibility considerations for those overriding the location forms + $location_type = isset($_POST['location_type']) ? sanitize_key($_POST['location_type']) : 'location'; + if( !empty($_POST['no_location']) ) $location_type = 0; //backwards compat + if( $location_type == 'location' && empty($_POST['location_id']) && get_option('dbem_use_select_for_locations')) $location_type = 0; //backward compat + // assign location data + if( $location_type === 0 || $location_type === '0' ){ + // no location + $this->location_id = 0; + $this->event_location_type = null; + }elseif( $location_type == 'location' && EM_Locations::is_enabled() ){ + // a physical location, old school + $this->event_location_type = null; // if location resides in locations table, location type is null since we have a location_id table value + if( !empty($_POST['location_id']) && is_numeric($_POST['location_id']) ){ + // we're using a previously created location + $this->location_id = absint($_POST['location_id']); + }else{ + $this->location_id = null; + //we're adding a new location place, so create an empty location and populate + $this->get_location()->get_post(false); + $this->get_location()->post_content = ''; //reset post content, as it'll grab the event description otherwise + } + }else{ + // we're dealing with an event location such as a url or webinar + $this->location_id = null; // no location ID + $this->event_location_type = $location_type; + if( EM_Event_Locations\Event_Locations::is_enabled($location_type) ){ + $this->get_event_location()->get_post(); + } + } }else{ - //we're adding a new location, so create an empty location and populate - $this->location_id = null; - $this->get_location()->get_post(false); - $this->get_location()->post_content = ''; //reset post content, as it'll grab the event description otherwise + $this->location_id = 0; + $this->event_location_type = null; } + // GGG: RSVP Info (for ECs) if( empty($_POST['event_ec_rsvp_date']) ){ // If it's empty, default to the event start date @@ -724,7 +764,7 @@ function get_post_meta(){ if(get_option('dbem_attributes_enabled')){ global $allowedtags; if( !is_array($this->event_attributes) ){ $this->event_attributes = array(); } - $event_available_attributes = em_get_attributes(); + $event_available_attributes = !empty($event_available_attributes) ? $event_available_attributes : em_get_attributes(); //we use this in locations, no need to repeat if needed if( !empty($_POST['em_attributes']) && is_array($_POST['em_attributes']) ){ foreach($_POST['em_attributes'] as $att_key => $att_value ){ if( (in_array($att_key, $event_available_attributes['names']) || array_key_exists($att_key, $this->event_attributes) ) ){ @@ -921,11 +961,22 @@ function validate_meta(){ $this->add_error(__('RSVP Date cannot be after the event start.','events-manager')); } } - if( get_option('dbem_locations_enabled') && empty($this->location_id) ){ //location ids don't need validating as we're not saving a location - if( get_option('dbem_require_location',true) || $this->location_id !== 0 ){ - if( !$this->get_location()->validate() ){ + if( get_option('dbem_locations_enabled') ){ + if( $this->location_id === 0 && get_option('dbem_require_location',true) ){ + // no location chosen, yet we require a location + $this->add_error(__('No location associated with this event.', 'events-manager')); + }elseif( $this->has_location() ){ + // physical location + if( empty($this->location_id) && !$this->get_location()->validate() ){ + // new location doesn't validate $this->add_error($this->get_location()->get_errors()); + }elseif( !empty($this->location_id) && !$this->get_location()->location_id ){ + // non-existent location selected + $this->add_error( __('Please select a valid location.', 'events-manager') ); } + }elseif( $this->has_event_location() ){ + // event location, validation applies errors directly to $this + $this->get_event_location()->validate(); } } if ( count($missing_fields) > 0){ @@ -1109,6 +1160,12 @@ function save_meta(){ } } } + //update event location via post meta + if( $this->has_event_location() ){ + $this->get_event_location()->save(); + }else{ + $this->get_event_location()->reset_data(); + } //update timestamps, dates and times update_post_meta($this->post_id, '_event_start_local', $this->start()->getDateTime()); update_post_meta($this->post_id, '_event_end_local', $this->end()->getDateTime()); @@ -1303,9 +1360,10 @@ function duplicate_url($raw = false){ /** * Delete whole event, including bookings, tickets, etc. + * @param boolean $force_delete * @return boolean */ - function delete($force_delete = false){ //atm wp seems to force cp deletions anyway + function delete( $force_delete = false ){ if( $this->can_manage('delete_events', 'delete_others_events') ){ if( !is_admin() ){ include_once('em-event-post-admin.php'); @@ -1627,7 +1685,7 @@ public function get_parent(){ } /** - * Returns the location object this event belongs to. + * Returns the physical location object this event belongs to. * @return EM_Location */ function get_location() { @@ -1642,6 +1700,40 @@ function get_location() { return $this->location; } + /** + * Returns whether this event has a phyisical location assigned to it. + * @return bool + */ + public function has_location(){ + return !empty($this->location_id) || (!empty($this->location) && !empty($this->location->location_name)); + } + + /** + * Gets the event's event location (note, different from a regular event location, which uses get_location()) + * Returns implementation of Event_Location or false if no event location assigned. + * @return EM_Event_Locations\URL|EM_Event_Locations\Event_Location|false + */ + public function get_event_location(){ + if( $this->has_event_location() ){ + $EM_Location_Type = EM_Event_Locations\Event_Locations::get( $this->event_location_type, $this ); + }else{ + $EM_Location_Type = new EM_Event_Locations\Event_Location( $this ); + } + return apply_filters('em_event_get_event_location', $EM_Location_Type, $this); + } + + /** + * Returns whether the event has an event location associated with it (different from a physical location). If supplied, can check against a specific type. + * @param string $event_location_type + * @return bool + */ + public function has_event_location( $event_location_type = null ){ + if( !empty($event_location_type) ){ + return !empty($this->event_location_type) && $this->event_location_type === $event_location_type; + } + return !empty($this->event_location_type); + } + /** * Returns the location object this event belongs to. * @return EM_Person @@ -1944,10 +2036,28 @@ function output($format, $target="html") { $show_condition = (!$this->event_rsvp && get_option('dbem_rsvp_enabled')); }elseif ($condition == 'no_location'){ //does this event have a valid location? - $show_condition = ( empty($this->location_id) || !$this->get_location()->location_status ); + $show_condition = !$this->has_event_location() && !$this->has_location(); }elseif ($condition == 'has_location'){ //does this event have a valid location? - $show_condition = ( !empty($this->location_id) && $this->get_location()->location_status ); + $show_condition = ( $this->has_location() && $this->get_location()->location_status ) || $this->has_event_location(); + }elseif ($condition == 'has_location_venue'){ + //does this event have a valid physical location? + $show_condition = ( $this->has_location() && $this->get_location()->location_status ) || $this->has_event_location(); + }elseif ($condition == 'no_location_venue'){ + //does this event NOT have a valid physical location? + $show_condition = !$this->has_location(); + }elseif ($condition == 'has_event_location'){ + //does this event have a valid event location? + $show_condition = $this->has_event_location(); + }elseif ( preg_match('/^has_event_location_([a-zA-Z0-9_\-]+)$/', $condition, $type_match)){ + //event has a specific category + $show_condition = $this->has_event_location($type_match[1]); + }elseif ($condition == 'no_event_location'){ + //does this event not have a valid event location? + $show_condition = !$this->has_event_location(); + }elseif ( preg_match('/^no_event_location_([a-zA-Z0-9_\-]+)$/', $condition, $type_match)){ + //does this event NOT have a specific event location? + $show_condition = !$this->has_event_location($type_match[1]); }elseif ($condition == 'has_image'){ //does this event have an image? $show_condition = ( $this->get_image_url() != '' ); @@ -2085,6 +2195,12 @@ function output($format, $target="html") { }elseif ( preg_match('/^no_tag_([a-zA-Z0-9_\-,]+)$/', $condition, $tag_match)){ //event doesn't have this tag $show_condition = !has_term(explode(',', $tag_match[1]), EM_TAXONOMY_TAG, $this->post_id); + }elseif ( preg_match('/^has_att_([a-zA-Z0-9_\-,]+)$/', $condition, $att_match)){ + //event has a specific custom field + $show_condition = !empty($this->event_attributes[$att_match[1]]) || !empty($this->event_attributes[str_replace('_', ' ', $att_match[1])]); + }elseif ( preg_match('/^no_att_([a-zA-Z0-9_\-,]+)$/', $condition, $att_match)){ + //event has a specific custom field + $show_condition = empty($this->event_attributes[$att_match[1]]) && empty($this->event_attributes[str_replace('_', ' ', $att_match[1])]); } //other potential ones - has_attribute_... no_attribute_... has_categories_... $show_condition = apply_filters('em_event_output_show_condition', $show_condition, $condition, $conditionals[0][$key], $this); @@ -2504,6 +2620,14 @@ function output($format, $target="html") { $replace = '
' . implode('
', $this->wp_error->get_error_messages()) . '
'; + }elseif( !empty($this->error_messages) ){ + $message = '' . implode('
', $this->error_messages) . '
'; + }else{ + $message = '' . $this->getMessage() . '
'; + } + return $message; + } + + /** + * @return array|string + */ + public function get_messages(){ + if( $this->is_wp_error() ){ + return $this->wp_error->get_error_messages(); + }elseif( !empty($this->error_messages) ){ + return $this->error_messages; + }else{ + return array($this->getMessage()); + } + } + + /** + * Whether or not this exception was triggered by a WP_Error + * @return bool + */ + public function is_wp_error(){ + return is_wp_error( $this->wp_error ); + } + + /** + * Returns exception in WP_Error format, whether or not it was originally a WP_Error in the first place. + * @return WP_Error + */ + public function get_wp_error(){ + if( $this->is_wp_error() ){ + return $this->wp_error; + } + $WP_Error = new WP_Error(); + $WP_Error->add_data( $this->get_messages(), $this->getCode() ); + return $WP_Error; + } + } +} \ No newline at end of file diff --git a/classes/em-locations.php b/classes/em-locations.php index 29af972..99ca309 100644 --- a/classes/em-locations.php +++ b/classes/em-locations.php @@ -22,6 +22,16 @@ class EM_Locations extends EM_Object { protected static $context = 'location'; + + /** + * Returns whether or not locations are enabled for use with events. + * @return bool + */ + public static function is_enabled(){ + $location_types = get_option('dbem_location_types', array()); + return !empty($location_types['location']); + } + /** * Returns an array of EM_Location objects * @param array $args diff --git a/classes/em-oauth/oauth-admin-settings.php b/classes/em-oauth/oauth-admin-settings.php new file mode 100644 index 0000000..af965e2 --- /dev/null +++ b/classes/em-oauth/oauth-admin-settings.php @@ -0,0 +1,186 @@ + + + get_oauth_url(); + //we don't need to verify connections at this point, we just need to know if there are any + if( $api_client->authorization_scope == 'user' ){ + $user_id = get_current_user_id(); + $access_tokens = $api::get_user_tokens(); + }else{ + $user_id = null; + $access_tokens = $api::get_site_tokens(); + } + $oauth_accounts = array(); + $connected = $reconnect_required = false; + foreach( $access_tokens as $account_id => $oauth_account ){ + try { + $api_client->load_token( $account_id, $user_id ); + $verification = true; + } catch ( EM_Exception $e ) { + $verification = false; + } + $oauth_account['id'] = !empty($oauth_account['email']) ? $oauth_account['email'] : $account_id; + $disconnect_url_args = array( 'action' => 'em_oauth_'. $api::get_option_name(), 'callback' => 'disconnect', 'account' => $account_id, 'nonce' => wp_create_nonce('em-oauth-'. $option_name .'-disconnect-'.$account_id) ); + $oauth_account['disconnect'] = add_query_arg( $disconnect_url_args, admin_url( 'admin-ajax.php' ) ); + if( !$verification ){ + $oauth_account['reconnect'] = true; + $reconnect_required = true; + }else{ + $connected = true; + } + $oauth_accounts[] = $oauth_account; + } + if( $connected ){ + $button_url = add_query_arg( array( 'action' => 'em_oauth_'. $option_name, 'callback' => 'disconnect', 'nonce' => wp_create_nonce('em-oauth-'. $option_name .'-disconnect') ), admin_url( 'admin-ajax.php' ) ); + $button_text = count($oauth_accounts) > 1 ? __('Disconnect All', 'events-manager') : __('Disonnect', 'events-manager'); + $button_class = 'button-secondary'; + }else{ + $button_url = $oauth_url; + $button_text = __('Connect', 'events-manager'); + $button_class = 'button-primary'; + } + } + ?> + + +
+
+ SomeService_API_Client, this will be automatically deduced.
+ * @var OAuth_API
+ */
+ protected static $api_class;
+ /**
+ * @var string
+ */
+ public $id;
+ /**
+ * @var string
+ */
+ public $secret;
+ /**
+ * @var string
+ */
+ public $scope;
+ /**
+ * @var
+ */
+ public $client;
+
+ /**
+ * @var OAuth_API_Token
+ */
+ public $token;
+ /**
+ * @var string
+ */
+ public $user_id;
+ /**
+ * @var bool
+ */
+ public $authorized = false;
+
+ /**
+ * The URL without trailing slash for the API base URL, to which endpoints can be appended to.
+ * @var string
+ */
+ public $api_base = 'https://api.oauth.com';
+ /**
+ * The URL that'll be used to request an authorization code from the user. Can include strings CLIENT_ID, ACCESS_SCOPE, REDIRECT_URI, and STATE which will be replaced dynamically.
+ * @var string
+ */
+ public $oauth_authorize_url = 'https://api.oauth.com/authorize';
+ /**
+ * Required by child class unless it overrides the request_access_token() method.
+ * @var string
+ */
+ public $oauth_request_token_url = 'https://api.oauth.com/token';
+ /**
+ * Defaults to $oauuth_request_token_url if not set.
+ * @var string
+ */
+ public $oauth_refresh_token_url = null;
+ /**
+ * Required by child class unless it overrides the verify_access_token() method.
+ * @var string
+ */
+ public $oauth_verification_url = 'https://api.oauth.com/verify_token';
+ /**
+ * Required by child class unless it overrides the revoke_access_token() method.
+ * @var string
+ */
+ public $oauth_revoke_url = 'https://api.oauth.com/revoke';
+ public $oauth_authentication = 'parameters';
+ /**
+ * Whether or not an OAuth Service should pass on the state param for security check
+ * @var bool
+ */
+ public $oauth_state = true;
+
+ /**
+ * OAuth_API_Client constructor.
+ *
+ * @throws EM_Exception
+ */
+ public function __construct(){
+ // check credentials
+ $creds = array(
+ 'id' => EM_Options::get( $this->option_name. '_app_id', '', $this->option_dataset),
+ 'secret' => EM_Options::get( $this->option_name. '_app_secret', '', $this->option_dataset)
+ );
+ foreach( array('id', 'secret', 'scope') as $k ){
+ if( !empty($creds[$k]) ){
+ $this->$k = $creds[$k];
+ }elseif( empty($this->$k) ) { // constructors can be overriden to add any of the above
+ throw new EM_Exception( __('OAuth application information incomplete.', 'events-manager') );
+ }
+ }
+ if( !$this->oauth_refresh_token_url ){
+ $this->oauth_refresh_token_url = $this->oauth_request_token_url;
+ }
+ }
+
+ /**
+ * Shortcut for base class properties.
+ * @param $name
+ * @return mixed
+ */
+ public function __get( $name ){
+ $api = static::get_api_class();
+ if( $name == 'option_name' ){
+ return $api::get_option_name();
+ }elseif( $name == 'option_dataset' ){
+ return $api::get_option_dataset();
+ }elseif( $name == 'authorization_scope' ){
+ return $api::get_authorization_scope();
+ }elseif( $name == 'multiple_tokens' ){
+ return $api::supports_multiple_tokens();
+ }elseif( $name == 'token_class' ){
+ return $api::get_token_class();
+ }
+ return null;
+ }
+
+ /**
+ * @return OAuth_API
+ */
+ public static function get_api_class(){
+ // set default API class name if not defined by parent
+ if( self::$api_class === static::$api_class && class_exists(str_replace('_Client', '', get_called_class())) ){
+ static::$api_class = str_replace('_Client', '', get_called_class());
+ }
+ return static::$api_class;
+ }
+
+ /**
+ * @return mixed
+ */
+ public function get_oauth_url(){
+ $scope = is_array($this->scope) ? urlencode(implode('+', $this->scope)) : $this->scope;
+ $state_nonce = wp_create_nonce($this->option_name.'_authorize');
+ $replacements = array( urlencode($this->id), $scope, urlencode(static::get_oauth_callback_url()), $state_nonce );
+ $return = str_replace( array('CLIENT_ID','ACCESS_SCOPE','REDIRECT_URI', 'STATE'), $replacements, $this->oauth_authorize_url );
+ if( $this->oauth_state ){
+ // check there's a STATE value in the authorize url, otherwise add it proactively
+ if( !preg_match('/STATE/', $this->oauth_authorize_url) ){
+ $return = add_query_arg('state', $state_nonce, $return);
+ }
+ }
+ return $return;
+ }
+
+ /**
+ * @return string
+ */
+ public static function get_oauth_callback_url(){
+ $redirect_base_uri = defined('OAUTH_REDIRECT') ? OAUTH_REDIRECT : admin_url('admin-ajax.php'); // you can completely replace the oauth redirect link for testing locally via a proxy for example
+ if( defined('EM_OAUTH_TUNNEL') ){ // for local development or other reasons, you can replace the domain with a tunnel domain, which should be with http(s):// included
+ $redirect_base_uri = str_replace(get_home_url(), EM_OAUTH_TUNNEL, $redirect_base_uri);
+ }
+ $api = static::get_api_class();
+ $callback_action = 'em_oauth_'. $api::get_option_name();
+ return add_query_arg(array('action'=>strtolower($callback_action), 'callback'=>'authorize'), $redirect_base_uri);
+ }
+
+ /**
+ * Returns a native client for this service, in the event we want to load an SDK provided by the service.
+ * @return stdClass
+ */
+ public function client(){
+ return new stdClass();
+ }
+
+ // GET, POST, PUT, PATCH, DELETE functions
+
+ /**
+ * @param $endpoint
+ * @param array $request_args
+ * @param bool $json_decode
+ * @return array
+ * @throws EM_Exception
+ */
+ public function http_request( $endpoint, array $request_args = array(), $json_decode = true ){
+ // clean up whether endpoint or full URL is provided
+ $endpoint = str_replace($this->api_base, '', $endpoint);
+ $request_url = $this->api_base. $endpoint;
+ //$request_url = add_query_arg('access_token', $this->token->access_token, $request_url);
+ // add oauth and method heaeders
+ if( empty($request_args['headers']) ) $request_args['headers'] = array();
+ $request_args['headers']['authorization'] = 'Bearer '.$this->token->access_token;
+ $request_args['method'] = in_array($request_args['method'], array('GET','POST','PUT','PATCH','DELETE')) ? $request_args['method'] : 'GET';
+ // prepare JSON format if sending via that content type
+ if( !empty($request_args['headers']['Content-Type']) && $request_args['headers']['Content-Type'] == 'application/json' ){
+ if( !empty($request_args['body']) && (is_array($request_args['body']) || is_object($request_args['body'])) ){
+ $request_args['body'] = json_encode($request_args['body']);
+ }
+ }
+ // request and parse
+ $response = wp_remote_request($request_url, $request_args); /* @var \Requests_Response_Headers $response['headers'] */
+ if( is_wp_error($response) ){
+ throw new EM_Exception($response);
+ }elseif( $response['response']['code'] >= 300 ){ //anything not 20x will indicate an issue
+ $errors = json_decode($response['body']);
+ if( is_array($errors) ){
+ $error = current($errors);
+ }elseif( !empty($errors->code) ){
+ $error = $errors;
+ }else{
+ $error = (object) array('code' => $response['response']['code'], 'message' => $response['body']);
+ }
+ throw new EM_Exception($error->message, $error->code);
+ }
+ if( $json_decode ){
+ $response['body'] = json_decode($response['body']);
+ }
+ return $response;
+ }
+
+ /**
+ * Fetches event data from the given endpoint with supplied arguments according to Meetup API v3
+ *
+ * @param string $endpoint Full URL or endpoint accepted.
+ * @param array $args
+ * @param array $request_args
+ * @return array
+ * @throws EM_Exception
+ */
+ public function get($endpoint, array $args = array(), array $request_args = array() ){
+ $request_url = add_query_arg( $args, $this->api_base.$endpoint );
+ $request_args['method'] = 'GET';
+ return static::http_request( $request_url, $request_args );
+ }
+
+ /**
+ * @param $endpoint
+ * @param array $vars
+ * @param array $request_args
+ * @param bool $json Shorthand for setting Content-Type in headers to application/json
+ * @return array|mixed
+ * @throws EM_Exception
+ */
+ public function post($endpoint, array $vars = array(), array $request_args = array(), $json = false ){
+ $request_args['body'] = $vars;
+ $request_args = array_merge(array('method' => 'POST'), $request_args);
+ if( $json ){
+ if( empty($request_args['headers'])) $request_args['headers'] = array();
+ $request_args['headers']['Content-Type'] = 'application/json';
+ }
+ return static::http_request($endpoint, $request_args, $json);
+ }
+
+ /**
+ * @param $endpoint
+ * @param array $vars
+ * @param array $request_args
+ * @param bool $json
+ * @return array|mixed
+ * @throws EM_Exception
+ */
+ public function patch($endpoint, array $vars = array(), array $request_args = array(), $json = false ){
+ $request_args['method'] = 'PATCH';
+ return static::post($endpoint, $vars, $request_args, $json);
+ }
+
+ /**
+ * @param $endpoint
+ * @param array $vars
+ * @param array $request_args
+ * @param bool $json
+ * @return array|mixed
+ * @throws EM_Exception
+ */
+ public function put($endpoint, array $vars = array(), array $request_args = array(), $json = false ){
+ $request_args['method'] = 'PUT';
+ return static::post($endpoint, $vars, $request_args, $json);
+ }
+
+ /**
+ * @param $endpoint
+ * @param array $args
+ * @param array $request_args
+ * @return array|mixed
+ * @throws EM_Exception
+ */
+ public function delete($endpoint, array $args = array(), array $request_args = array() ){
+ $request_url = add_query_arg( $args, $this->api_base.$endpoint );
+ $request_args['method'] = 'DELETE';
+ return static::http_request( $request_url, $request_args );
+ }
+
+ // Baseic OAuth interaction functions, loading a token into client as well as requesting, refreshing, verifying and revoking tokens.
+
+ /**
+ * @param int $user_id
+ * @param int $account_id
+ * @throws EM_Exception
+ */
+ public function load_token( $account_id = null, $user_id = null ){
+ if( $this->authorization_scope !== 'user' ) $user_id = null; // user id is not relevant
+ // return value if already authorized
+ if( $this->authorized && $this->authorized = $user_id.'|'.$account_id && $this->user_id == $user_id && $this->token->id == $account_id) return;
+ // not authorized, re/load token
+ $this->authorized = $this->token = false;
+ $this->user_id = $user_id;
+ // get token information from user account
+ $this->get_access_token( $account_id );
+ // renew token if expired
+ if ( $this->token->is_expired() ) {
+ // Refresh the token if it's expired and update WP user meta.
+ $this->refresh();
+ }else{
+ $this->authorized = $user_id .'|'. $this->token->id;
+ }
+ }
+
+ /**
+ * Requests an access token from the supplied authorization code. The access token is further verified and populated with service account meta.
+ * If successful, token and meta information is saved for the user $user_id or current user if not specified.
+ * Throws an EM_Exception if unsuccessful at any stage in this process.
+ *
+ * @var string $code
+ * @var int $user_id
+ * @throws EM_Exception
+ */
+ public function request($code, $user_id = null ){
+ if( $this->authorization_scope == 'user' ){
+ $this->user_id = empty($user_id) ? get_current_user_id() : $user_id; // used in $this->save_access_token()
+ }else{
+ $this->user_id = null;
+ }
+ $access_token = $this->request_access_token($code);
+ $this->token = new OAuth_API_Token($access_token);
+ if( $this->token->refresh_token === true ) $this->token->refresh_token = false; // if no token was provided, we may be able to obtain it here, otherwise validation will fail upon refresh.
+ // verify the access token so we can establish the id of this account and then save it to user profile
+ $access_token_meta = $this->verify_access_token();
+ // now, check for previous tokens and save to it instead of overwriting (we do this in case ppl reauthorize the same account and get a new token with no refresh_token)
+ if( empty($this->token->id) ){
+ $token = $this->token;
+ try{
+ $this->get_access_token($access_token_meta['id']);
+ $this->token->refresh( $token->to_array() ); // merge in new token info to old token
+ } catch ( EM_Exception $ex ){
+ $this->token = $token; // revert back to new token
+ }
+ }
+ // refresh current or new token with the meta info and save
+ $this->token->refresh( $access_token_meta );
+ $this->save_access_token();
+ }
+
+ /**
+ * @throws EM_Exception
+ */
+ public function refresh(){
+ if ( $this->token->refresh_token ) {
+ try{
+ $access_token = $this->refresh_access_token();
+ $this->token->refresh($access_token, true);
+ $this->save_access_token();
+ $this->authorized = $this->user_id .'|'. $this->token->id;
+ }catch( EM_Exception $ex ){
+ throw new EM_Exception( array(
+ $this->option_name.'-error' => sprintf(esc_html__( 'There was an error connecting to %s: %s', 'events-manager' ), $this->service_name, "get_message(); ?>
+{$ex->getMessage()}"),
+ $this->option_name.'-token-expired' => $this->reauthorize_error_string()
+ ));
+ }
+ }else{
+ throw new EM_Exception( $this->reauthorize_error_string() );
+ }
+ }
+
+ /**
+ * Verify the token for this client by obtaining meta data of the account associated to this token and saving it to the current token.
+ * @var boolean $update_token
+ * @return boolean
+ * @throws EM_Exception
+ */
+ public function verify( $update_token = true ){
+ $access_token_meta = $this->verify_access_token();
+ // refresh current or new token with the meta info and save
+ $updated = $this->token->refresh( $access_token_meta );
+ if( $updated && $update_token ) $this->save_access_token();
+ return true; // if we get here, verification passed.
+ }
+
+ /**
+ * @return boolean
+ * @throws EM_Exception
+ */
+ public function revoke(){
+ return $this->revoke_access_token();
+ }
+
+ /* START OVERRIDABLE FUNCTIONS - THESE FUNCTIONS COULD BE OVERRIDDEN TO SPECIFICALLY DEAL WITH PARTICULAR OAUTH PROVIDERS */
+
+ /**
+ * Specific function which requests the access token from the API Service and returns the access token array, an error array if service replies.
+ * Throws an EM_Exception if there are any other connection issues.
+ *
+ * @var string $code
+ * @return array
+ * @throws EM_Exception
+ */
+ public function request_access_token( $code ){
+ $args = array(
+ 'body' => array(
+ 'client_id' => $this->id,
+ 'grant_type' => 'authorization_code',
+ 'redirect_uri' => static::get_oauth_callback_url(),
+ 'code' => $code
+ )
+ );
+ return $this->oauth_request( 'post', $this->oauth_request_token_url, $args );
+ }
+
+ /**
+ * @return array
+ * @throws EM_Exception
+ */
+ public function refresh_access_token(){
+ $args = array(
+ 'body' => array(
+ 'grant_type' => 'refresh_token',
+ 'refresh_token' => $this->token->refresh_token,
+ )
+ );
+ return $this->oauth_request('post', $this->oauth_refresh_token_url, $args);
+ }
+
+ /**
+ * Verifies an access token by obtaining further meta data about the account associated with that token.
+ * Expected return is an associative array containing the id (service account id the token belongs to), name, photo and email (optional).
+ *
+ * @return array
+ * @throws EM_Exception
+ */
+ public function verify_access_token(){
+ $request_url = str_replace('ACCESS_TOKEN', $this->token->access_token, $this->oauth_verification_url);
+ $access_token = $this->oauth_request('get', $request_url);
+ return $access_token; // we may want to override this depending on what's returned
+ }
+
+ /**
+ * @return bool
+ * @throws EM_Exception
+ */
+ public function revoke_access_token(){
+ if( empty($this->oauth_revoke_url) ) return false;
+ $request_url = str_replace('ACCESS_TOKEN', $this->token->access_token, $this->oauth_revoke_url);
+ return $this->oauth_request('get', $request_url); // we may want to override this depending on what's returned
+ }
+
+ /**
+ * @param string $method
+ * @param $request_url
+ * @param array $args
+ * @return mixed
+ * @throws EM_Exception
+ */
+ public function oauth_request($method, $request_url, $args = array() ){
+ $args = array_merge( array('headers' => array(), 'body' => array()), $args );
+ if( $this->oauth_authentication == 'basic' ){
+ $args['headers']['authorization'] = 'Basic '.base64_encode($this->id.':'.$this->secret);
+ }
+ if( $method === 'get'){
+ if( $this->oauth_authentication == 'parameters' ){
+ // add client params to URL if using get
+ $request_url = add_query_arg( array('client_id' => $this->id), $request_url );
+ }
+ $response = wp_remote_get($request_url, $args);
+ }elseif( $method === 'post' ){
+ if( $this->oauth_authentication == 'parameters' ){
+ // add auth params to body if using post
+ $args['body']['client_id'] = $this->id;
+ $args['body']['client_secret'] = $this->secret;
+ }
+ if( empty($args['Content-Type'])){
+ // by defaulut post will send this content type
+ $args['headers']['Content-Type'] = 'application/x-www-form-urlencoded';
+ }
+ $response = wp_remote_post($request_url, $args);
+ }else{
+ throw new EM_Exception('Unknown request method.');
+ }
+ if( is_wp_error($response) ){
+ throw new EM_Exception($response->get_error_messages());
+ }elseif( $response['response']['code'] != '200' ){
+ $errors = json_decode($response['body']);
+ $error = current($errors);
+ if( !empty($error->message) ){
+ $message = $error->message;
+ }elseif( !empty($error->error) ){
+ $message = $error->error;
+ }elseif( !empty($error->reason) ){
+ $message = $error->reason;
+ }elseif( is_string($error) ){
+ $message = $error;
+ }elseif( is_string($errors) ){
+ $message = $errors;
+ }else{
+ $message = var_export($errors);
+ }
+ $error_code = !empty($error->code) ? $error->code : 'oauth-error';
+ throw new EM_Exception($message, $error_code);
+ }
+ return json_decode($response['body'], true); // we may want to override this depending on what's returned
+ }
+
+ /* END OVERRIDABLE FUNCTIONS */
+
+ /**
+ * @param int $api_user_id
+ * @return string
+ */
+ public function reauthorize_error_string($api_user_id = 0 ){
+ $settings_page_url = ''. esc_html__('settings page', 'events-manager-google').'';
+ if( !$api_user_id && !empty($this->token->id) ){
+ $api_user_id = !empty($this->token->email) ? $this->token->email : $this->token->id;
+ }
+ if( $api_user_id ){
+ return sprintf(__('You need to reauthorize access to account %s by visiting the %s page.', 'events-manager-google'), $api_user_id, $settings_page_url);
+ }
+ return sprintf(__('You need to authorize access to your %s account by visiting the %s page.', 'events-manager-google'), $this->service_name, $settings_page_url);
+ }
+
+ /**
+ * Gets an access token for a specific account, or provides first account user has available, if any. If no access token is available, an EM_Exception is thrown.
+ *
+ * @param int $api_user_id The ID (e.g. number or email) of the OAuth account
+ * @return OAuth_API_Token
+ * @throws EM_Exception
+ */
+ public function get_access_token( $api_user_id = 0 ){
+ if( $this->authorization_scope == 'site' ){
+ $site_tokens = EM_Options::get($this->option_name.'_token', array(), $this->option_dataset);
+ if( !empty($site_tokens) ){
+ if( $this->multiple_tokens && !empty($api_user_id) && !empty($site_tokens[$api_user_id]) ){
+ $token_data = $site_tokens[$api_user_id];
+ $token_data['id'] = $api_user_id;
+ }else{
+ $token_data = current($site_tokens);
+ $token_data['id'] = key($site_tokens);
+ }
+ }
+ }elseif( $this->authorization_scope == 'user' ){
+ $user_tokens = get_user_meta( $this->user_id, $this->option_dataset.'_'.$this->option_name, true );
+ if( !empty($user_tokens) ){
+ if( $api_user_id ){
+ if( !empty($user_tokens[$api_user_id]) ){
+ $token_data = $user_tokens[$api_user_id];
+ $token_data['id'] = $api_user_id;
+ }
+ }elseif( !empty($user_tokens) ){
+ $token_data = current($user_tokens);
+ $token_data['id'] = key($user_tokens);
+ }
+ }
+ }
+ if( empty($token_data) ) throw new EM_Exception( $this->reauthorize_error_string($api_user_id) );
+ $this->token = new $this->token_class($token_data);
+ return $this->token;
+ }
+
+ /**
+ * Sets the access token to the user meta storage where all connected accounts for the user of that token are stored.
+ */
+ public function save_access_token(){
+ if( $this->authorization_scope == 'site' ){
+ $token = $this->token->to_array();
+ if( $this->multiple_tokens ){
+ $site_tokens = EM_Options::get($this->option_name.'_token', array(), $this->option_dataset);
+ }
+ if( empty($site_tokens) ) $site_tokens = array();
+ $site_tokens[$this->token->id] = $token;
+ EM_Options::set($this->option_name.'_token', $site_tokens, $this->option_dataset);
+ }elseif( $this->authorization_scope == 'user' ){
+ if( $this->multiple_tokens ){
+ $user_tokens = get_user_meta($this->user_id, $this->option_dataset.'_'.$this->option_name, true);
+ }
+ if( empty($user_tokens) ) $user_tokens = array();
+ $token = $this->token->to_array();
+ $user_tokens[$this->token->id] = $token;
+ update_user_meta($this->user_id, $this->option_dataset.'_'.$this->option_name, $user_tokens);
+ }
+ }
+}
\ No newline at end of file
diff --git a/classes/em-oauth/oauth-api-token.php b/classes/em-oauth/oauth-api-token.php
new file mode 100644
index 0000000..833320f
--- /dev/null
+++ b/classes/em-oauth/oauth-api-token.php
@@ -0,0 +1,88 @@
+refresh($token);
+ if( empty($token['created']) ) $this->created = time();
+ }
+
+ /**
+ * @param array $token
+ * @return boolean $updated
+ * @throws EM_Exception
+ */
+ public function refresh( $token, $reset = false ){
+ $updated = false;
+ // reset values
+ if( $reset ){
+ $this->expires_in = $this->expires_at = $this->created = 0;
+ $this->access_token = $this->refresh_token = $this->token_type = '';
+ }
+ // add new values
+ foreach( $token as $k => $v ){
+ if( empty($this->$k) || $this->$k != $token[$k] ){
+ $this->$k = $token[$k];
+ $updated = true;
+ }
+ }
+ // set values that may not have been added
+ if( empty($this->id) && !empty($this->email) ) $this->id = $this->email;
+ if( !$this->created ) $this->created = time();
+ // set expires_at, which is what we'll use for expiry checking
+ if( $this->expires_at ){
+ $this->expires_in = $this->expires_at - time();
+ }elseif( $this->created && $this->expires_in ){
+ $this->expires_at = $this->expires_in + $this->created;
+ }else{
+ $this->expires_in = $this->expires_at = time();
+ }
+ $this->verify();
+ return $updated;
+ }
+
+ /**
+ * @throws EM_Exception
+ */
+ public function verify(){
+ $missing = array();
+ foreach( array('access_token', 'expires_at') as $k ){
+ if( empty($this->$k) ) $missing[] = $k;
+ }
+ if( !empty($missing) ) throw new EM_Exception( sprintf(__('Involid token credentials, the folloiwng are missing: %s.', 'events-manager'), implode(', ', $missing)) );
+ }
+
+ public function is_expired(){
+ return $this->expires_at < time();
+ }
+
+ public function to_array(){
+ $array = array();
+ $ignore = array('id');
+ foreach( get_object_vars($this) as $k => $v ){
+ if( !in_array($k, $ignore) && !empty($this->$k) ) $array[$k] = $this->$k;
+ }
+ return $array;
+ }
+}
\ No newline at end of file
diff --git a/classes/em-oauth/oauth-api.php b/classes/em-oauth/oauth-api.php
new file mode 100644
index 0000000..14a7ae7
--- /dev/null
+++ b/classes/em-oauth/oauth-api.php
@@ -0,0 +1,251 @@
+load_token( $user_id, $api_user_id );
+ }
+ return $client;
+ }
+
+ public static function get_user_tokens( $user_id = false ){
+ if( static::$authorization_scope !== 'user' ) return array();
+ if( empty($user_id) ) $user_id = get_current_user_id();
+ $user_tokens = get_user_meta( $user_id, static::$option_dataset.'_'.static::$option_name, true );
+ if( empty($user_tokens) ) $user_tokens = array();
+ return $user_tokens;
+ }
+
+ /**
+ * @return array[OAuth_API_Token]
+ */
+ public static function get_site_tokens(){
+ if( static::$authorization_scope !== 'site' ) return array();
+ $site_tokens = EM_Options::get(static::$option_name.'_token', array(), static::$option_dataset);
+ if( empty($site_tokens) ) $site_tokens = array();
+ return $site_tokens;
+ }
+
+ /**
+ * Includes and calls the code required to handle a callback from FB to store user auth token.
+ */
+ public static function oauth_authorize() {
+ global $EM_Notices;
+ if( !empty($EM_Notices) ) $EM_Notices = new EM_Notices();
+ if( !empty($_REQUEST['code']) ){
+ try{
+ $client = static::get_client(false);
+ if( !$client->oauth_state || (!empty($_REQUEST['state']) && !wp_verify_nonce( $_REQUEST['state'], static::$option_name.'_authorize')) ){
+ $EM_Notices->add_error( sprintf( esc_html__( 'There was an error connecting to %s: %s', 'events-manager' ), static::$service_name, 'No State Provided'), true );
+ }else{
+ try {
+ $client->request( $_REQUEST['code'] );
+ $EM_Notices->add_confirm( sprintf( esc_html__( 'Your account has been successfully connected with %s!', 'events-manager' ), static::$service_name ), true);
+ } catch ( EM_Exception $e ){
+ $EM_Notices->add_error( sprintf( esc_html__( 'There was an error connecting to %s: %s', 'events-manager' ), static::$service_name, ''.$e->getMessage().'' ), true );
+ }
+ }
+ } catch ( EM_Exception $ex ){
+ $EM_Notices->add_error($ex->get_messages(), true);
+ }
+ }else{
+ $EM_Notices->add_error( sprintf( esc_html__( 'There was an error connecting to %s: %s', 'events-manager' ), static::$service_name, 'No Authorization Code Provided'), true );
+ }
+ // Redirect to settings page
+ $query_args = array( 'page' => 'events-manager-options' );
+ $url = add_query_arg( $query_args, admin_url( 'admin.php' ) );
+ wp_redirect( $url );
+ die();
+ }
+
+ /**
+ * Handles disconnecting a user from one or all their connected Google accounts, attempting to revoke their key in the process.
+ */
+ public static function oauth_disconnect(){
+ global $EM_Notices;
+ if( !empty($EM_Notices) ) $EM_Notices = new EM_Notices();
+
+ if( static::$authorization_scope == 'user' ){
+ $account_tokens = static::get_user_tokens();
+ }else{
+ $account_tokens = static::get_site_tokens();
+ }
+ $accounts_to_disconnect = array();
+ if( empty($_REQUEST['user']) && !empty($_REQUEST['nonce']) && wp_verify_nonce($_REQUEST['nonce'], 'em-oauth-'. static::$option_name .'-disconnect') ){
+ $accounts_to_disconnect = array_keys($account_tokens);
+ }elseif( !empty($_REQUEST['account']) && !empty($_REQUEST['nonce']) && wp_verify_nonce($_REQUEST['nonce'], 'em-oauth-'. static::$option_name .'-disconnect-'.$_REQUEST['account']) ){
+ if( !empty($account_tokens[$_REQUEST['account']]) ){
+ $accounts_to_disconnect[] = $_REQUEST['account'];
+ }
+ }else{
+ $EM_Notices->add_error('Missing nonce, please contact your administrator.', true);
+ }
+ if( !empty($accounts_to_disconnect) ){
+ $errors = $disconnected_accounts = array();
+ foreach( $accounts_to_disconnect as $account_id ){
+ try{
+ $client = static::get_client( get_current_user_id(), $account_id);
+ $client->revoke();
+ } catch ( EM_Exception $ex ){
+ $account_name = !empty( $client->token->email ) ? $client->token->email : $client->token->name;
+ $errors[] = "$account_name - " . $ex->getMessage();
+ } finally{
+ $disconnected_accounts[] = $account_id;
+ unset($account_tokens[$account_id]);
+ }
+ }
+ if( !empty($disconnected_accounts) ){
+ if( static::$authorization_scope == 'user' ){
+ if( empty($account_tokens) ){
+ delete_user_meta( get_current_user_id(), 'em_oauth_'.static::$option_name );
+ }else{
+ update_user_meta( get_current_user_id(), 'em_oauth_'.static::$option_name, $account_tokens );
+ }
+ }else{
+ EM_Options::set(static::$option_name.'_token', $account_tokens, static::$option_dataset);
+ }
+ $success = _n('You have successfully disconnected from your %s account.', 'You have successfully disconnected from your %s accounts.', count($accounts_to_disconnect), 'events-manager');
+ $EM_Notices->add_confirm(sprintf($success, static::$service_name), true);
+ }
+ if( !empty($errors) ){
+ $error_msg = sprintf( esc_html__('There were some issues whilst disconnecting from your %s account(s) :', 'events-manager'), static::$service_name );
+ array_unshift( $errors, $error_msg );
+ $EM_Notices->add_error( $errors, true );
+ }
+ }
+
+ // Redirect to settings page
+ $query_args = array( 'page' => 'events-manager-options' );
+ $url = add_query_arg( $query_args, admin_url( 'admin.php' ) );
+ wp_redirect( $url );
+ die();
+ }
+}
+//include dependents
+include('oauth-api-token.php');
+include('oauth-api-client.php');
+if( is_admin() ){
+ include('oauth-admin-settings.php');
+}
\ No newline at end of file
diff --git a/classes/em-object.php b/classes/em-object.php
index c53a482..7d7f161 100644
--- a/classes/em-object.php
+++ b/classes/em-object.php
@@ -634,7 +634,7 @@ public static function get_taxonomies(){
//non default taxonomy, so create new item for the taxonomies array
$tax_name = str_replace('-','_',$tax_name);
$prefix = !array_key_exists($tax_name, $taxonomies_array) ? '':'post_';
- if( is_array($tax->object_type) ){
+ if( is_array($tax->object_type) && !empty($tax->rewrite) ){
if( $event_tax || $loc_tax ){
$taxonomies_array[$prefix.$tax_name] = array('name'=>$tax_name, 'context'=>array(), 'slug'=> $tax->rewrite['slug'], 'query_var'=> $tax->query_var );
}
@@ -1028,6 +1028,7 @@ public static function get_post_search($args = array(), $filter = false, $reques
if( empty($request) ) $request = $_REQUEST;
if( !empty($request['em_search']) && empty($args['search']) ) $request['search'] = $request['em_search']; //em_search is included to circumvent wp search GET/POST clashes
$accepted_searches = !empty($accepted_searches) ? $accepted_searches : self::get_default_search();
+ $accepted_searches = array_diff($accepted_searches, array('format', 'format_header', 'format_footer'));
$accepted_searches = apply_filters('em_accepted_searches', $accepted_searches, $args);
//merge variables from the $request into $args
foreach($request as $post_key => $post_value){
diff --git a/classes/event-locations/em-event-location-url.php b/classes/event-locations/em-event-location-url.php
new file mode 100644
index 0000000..106b8ab
--- /dev/null
+++ b/classes/event-locations/em-event-location-url.php
@@ -0,0 +1,72 @@
+event->event_location_data['url'] = esc_url_raw($_POST['event_location_url']);
+ }
+ if( !empty($_POST['event_location_url_text']) ){
+ $this->event->event_location_data['text'] = sanitize_text_field($_POST['event_location_url_text']);
+ }
+ return $return;
+ }
+
+ public function validate(){
+ $result = false;
+ if( empty($this->event->event_location_data['url']) ){
+ $this->event->add_error( __('Please enter a valid URL for this event location.', 'events-manager') );
+ $result = false;
+ }
+ if( empty($this->event->event_location_data['text']) ){
+ $this->event->add_error( __('Please provide some link text for this event location URL.', 'events-manager') );
+ $result = false;
+ }
+ return $result;
+ }
+
+ public function get_link( $new_target = true ){
+ return ''. esc_html($this->text).'';
+ }
+
+ public function get_admin_column() {
+ return ''. static::get_label() . ' - ' . $this->get_link().'';
+ }
+
+ public static function get_label( $label_type = 'singular' ){
+ switch( $label_type ){
+ case 'plural':
+ return esc_html__('URLs', 'events-manager');
+ break;
+ case 'singular':
+ return esc_html__('URL', 'events-manager');
+ break;
+ }
+ return parent::get_label($label_type);
+ }
+
+ public function output( $what = null ){
+ if( $what === null ){
+ return ''. esc_html($this->text) .'';
+ }elseif( $what === '_self' ){
+ return ''. esc_html($this->text) .'';
+ }elseif( $what === '_parent' || $what === '_top' ){
+ return ''. esc_html($this->text) .'';
+ }else{
+ return parent::output($what);
+ }
+ }
+}
+URL::init();
\ No newline at end of file
diff --git a/classes/event-locations/em-event-location.php b/classes/event-locations/em-event-location.php
new file mode 100644
index 0000000..08e5d46
--- /dev/null
+++ b/classes/event-locations/em-event-location.php
@@ -0,0 +1,167 @@
+event = $EM_Event;
+ }
+ }
+
+ /**
+ * @param $name
+ * @return string|null
+ */
+ public function __get( $name ) {
+ if( $name == 'type' ){
+ return static::$type;
+ }elseif( in_array($name, $this->properties) ){
+ return isset($this->event->event_location_data[$name]) ? $this->event->event_location_data[$name] : null;
+ }
+ return null;
+ }
+
+ public function __set($name, $value) {
+ if( in_array($name, $this->properties) ){
+ $this->event->event_location_data[$name] = $value;
+ }
+ }
+
+ public function __isset($name) {
+ if( in_array($name, $this->properties) ){
+ return isset($this->event->event_location_data[$name]);
+ }
+ return false;
+ }
+
+ public function load_postdata( $event_meta = array() ){
+ if( empty($event_meta) ) $event_meta = $this->event->get_event_meta();
+ $base_key = '_event_location_'.static::$type;
+ foreach( $event_meta as $event_meta_key => $event_meta_val ){
+ if( $event_meta_key == $base_key ){
+ $this->event->event_location_data[static::$type] = ( is_array($event_meta_val) ) ? $event_meta_val[0]:$event_meta_val;
+ $this->event->event_location_data[static::$type] = maybe_unserialize($this->event->event_location_data[static::$type]);
+ }elseif( substr($event_meta_key, 0, strlen($base_key) ) == $base_key ){
+ //event location data is placed directly into the event_location_data array and referenced via get_event_location()
+ $key = str_replace('_event_location_'.static::$type.'_', '', $event_meta_key);
+ $this->event->event_location_data[$key] = ( is_array($event_meta_val) ) ? $event_meta_val[0]:$event_meta_val;
+ $this->event->event_location_data[$key] = maybe_unserialize($this->event->event_location_data[$key]);
+ }
+ }
+ }
+
+ /**
+ * @param array $post
+ * @return boolean
+ */
+ public function get_post(){
+ $this->event->event_location_data = array();
+ return true;
+ }
+
+ /**
+ * @return boolean
+ */
+ public function validate(){
+ return false;
+ }
+
+ public function save(){
+ if( is_numeric($this->event->post_id) && $this->event->post_id > 0 && static::$type !== null ){
+ $this->reset_data();
+ foreach( $this->event->event_location_data as $prop => $value ){
+ $meta_key = $prop == static::$type ? '_event_location_'.$prop : '_event_location_'.static::$type.'_'.$prop;
+ if( $value !== null ){
+ update_post_meta( $this->event->post_id, $meta_key, $value );
+ }else{
+ delete_post_meta( $this->event->post_id, $meta_key );
+ }
+ }
+ }
+ return true;
+ }
+
+ final function reset_data( $preserve_type_data = false ){
+ if( is_numeric($this->event->post_id) && $this->event->post_id > 0 ){
+ global $wpdb;
+ $result = $wpdb->query( $wpdb->prepare('DELETE FROM '.$wpdb->postmeta." WHERE post_id=%d AND meta_key LIKE '_event_location_%' AND meta_key != '_event_location_type'", $this->event->post_id) );
+ wp_cache_delete( $this->event->post_id, 'post_meta' ); //refresh cache to prevent looking at old data
+ return $result;
+ }
+ return false;
+ }
+
+ public function get_admin_column(){
+ return $this->get_label('singular');
+ }
+
+ /**
+ * Returns whether or not this event location is enabled for use.
+ * @return bool
+ */
+ public static function is_enabled(){
+ $location_types = get_option('dbem_location_types', array());
+ return !empty($location_types[static::$type]);
+ }
+
+ /**
+ * Loads admin template automatically if static $admin_template is set to a valid path in templates folder.
+ * Classes with custom forms outside of template folders can override this function and provide their own HTML that will go in the loop of event location type forms.
+ */
+ public static function load_admin_template(){
+ if( static::$admin_template ){
+ em_locate_template( static::$admin_template, true );
+ }
+ }
+
+ public static function get_label( $label_type = 'siingular' ){
+ //override and return plural name.
+ return static::$type;
+ }
+
+ public function output( $what = null ){
+ if( $what !== null && $what !== 'type' ){
+ return esc_html($this->$what);
+ }else{
+ return static::get_label();
+ }
+ }
+}
+
+//include default Event Locations
+include('em-event-location-url.php');
\ No newline at end of file
diff --git a/classes/event-locations/em-event-locations.php b/classes/event-locations/em-event-locations.php
new file mode 100644
index 0000000..6bb734a
--- /dev/null
+++ b/classes/event-locations/em-event-locations.php
@@ -0,0 +1,68 @@
+ class name.
+ * @var array
+ */
+ private static $types = array();
+
+ /**
+ * @return array[EM_Event_Location::]
+ */
+ public static function get_types(){
+ return static::$types;
+ }
+
+ /**
+ * @param string $type
+ * @param string $classname
+ * @return bool
+ */
+ public static function register( $type, $classname ){
+ self::$types[$type] = $classname;
+ return true;
+ }
+
+ /**
+ * @param string $type
+ * @return bool
+ */
+ public static function unregister( $type ){
+ if( !empty(self::$types[$type]) ){
+ unset(self::$types[$type]);
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * @param string $type
+ * @param \EM_Event $EM_Event
+ * @return bool
+ */
+ public static function get( $type = null, $EM_Event = null ){
+ if( !empty(self::$types[$type]) && class_exists(self::$types[$type]) ){
+ $location_type = self::$types[$type];
+ return new $location_type( $EM_Event );
+ }
+ return false;
+ }
+
+ /**
+ * Returns whether or not the supplied event location $type is enabled for use.
+ * @param string $type
+ * @return bool
+ */
+ public static function is_enabled( $type ){
+ $location_types = get_option('dbem_location_types', array());
+ return !empty($location_types[$type]);
+ }
+
+}
+require('em-event-location.php');
\ No newline at end of file
diff --git a/em-events.php b/em-events.php
index fc1164c..f0c3797 100644
--- a/em-events.php
+++ b/em-events.php
@@ -245,7 +245,26 @@ function em_content_wp_title($title, $sep = '', $seplocation = ''){
return $title;
}
add_filter ( 'wp_title', 'em_content_wp_title',100,3 ); //override other plugin SEO due to way EM works.
-add_filter( 'wpseo_title', 'em_content_wp_title', 100, 3 ); //WP SEO friendly
+
+/**
+ * Yoast SEO friendly short circuit, fixes issues in Yoast 14 update by changing the $sep function into the actual separator.
+ * @param $title
+ * @param string|mixed $sep
+ * @param string $seplocation
+ * @return string
+ */
+function em_content_wpseo_title($title, $sep = '', $seplocation = ''){
+ if( class_exists('WPSEO_Utils') && method_exists('WPSEO_Utils', 'get_title_separator') ){
+ $sep = WPSEO_Utils::get_title_separator();
+ }elseif( !is_string( $sep ) ){
+ $sep = '';
+ }
+ if( !is_string($seplocation) ){
+ $seplocation = '';
+ }
+ return em_content_wp_title( $title, $sep, $seplocation = '' );
+}
+add_filter( 'wpseo_title', 'em_content_wpseo_title', 100, 2 ); //WP SEO friendly
/**
* Makes sure we're in "THE Loop", which is determinied by a flag set when the_post() (start) is first called, and when have_posts() (end) returns false.
diff --git a/em-functions.php b/em-functions.php
index 30b9508..7569a76 100644
--- a/em-functions.php
+++ b/em-functions.php
@@ -653,11 +653,16 @@ function em_checkbox_items($name, $array, $saved_values, $horizontal = true) {
}
function em_options_input_text($title, $name, $description ='', $default='') {
$translate = EM_ML::is_option_translatable($name);
+ if( preg_match('/^(.+)\[(.+)?\]$/', $name, $matches) ){
+ $value = EM_Options::get($matches[2], $default, $matches[1]);
+ }else{
+ $value = get_option($name, $default);
+ }
?>
'; + $default_lang = ''; } } echo '