Merge pull request #48 from xylusthemes/fb_api_change

Change facebook api version

includes/class-xt-facebook-events-facebook.php

@@ -45,7 +45,7 @@ public function __construct() {
 		$xtfe_user_token_options = get_option( 'xtfe_user_token_options', array() );
 		$this->fb_app_id = isset( $options['facebook_app_id'] ) ? $options['facebook_app_id'] : '';
 		$this->fb_app_secret = isset( $options['facebook_app_secret'] ) ? $options['facebook_app_secret'] : '';
-		$this->fb_graph_url = 'https://graph.facebook.com/v15.0/';
+		$this->fb_graph_url = 'https://graph.facebook.com/v19.0/';
 		$this->fb_access_token = isset( $xtfe_user_token_options['access_token'] ) ? $xtfe_user_token_options['access_token'] : '';
 		add_shortcode( 'wpfb_events', array( $this, 'render_facebook_events' ) );
 		add_action( 'admin_post_xtfe_clear_cache', array( $this, 'xtfe_clear_events_cache' ) );
@@ -451,12 +451,12 @@ public function get_events_for_facebook_page( $facebook_args ) {
 		}
 
 		$page_token = false;
-		$user_fb_pages = get_option('xtfe_fb_user_pages', array() );
+		$user_fb_pages = get_option('xtfe_user_token_options', array() );
 		if( !empty( $user_fb_pages ) ){
 			$page_data = $this->get_organizer_name_by_id( $facebook_page_id, true );
-			if( isset( $page_data->id ) && isset( $user_fb_pages[$page_data->id] ) ){
-				if( isset( $user_fb_pages[$page_data->id]['access_token'] ) && $user_fb_pages[$page_data->id]['access_token'] !== ''){
-					$page_token = $user_fb_pages[$page_data->id]['access_token'];
+			if( isset( $page_data->id ) && isset( $user_fb_pages['access_token'] ) ){
+				if( isset( $user_fb_pages['access_token'] ) && $user_fb_pages['access_token'] !== ''){
+					$page_token = $user_fb_pages['access_token'];
 				}
 			}
 		}

includes/class-xt-facebook-events-fb-authorize.php

@@ -35,14 +35,14 @@ function xtfe_facebook_authorize_user() {
 			$app_id = isset( $xtfe_options['facebook_app_id'] ) ? $xtfe_options['facebook_app_id'] : '';
 			$app_secret = isset( $xtfe_options['facebook_app_secret'] ) ? $xtfe_options['facebook_app_secret'] : '';
 			$redirect_url = admin_url( 'admin-post.php?action=xtfe_facebook_authorize_callback' );
-			$api_version = 'v15.0';
+			$api_version = 'v19.0';
 			$param_url = urlencode($redirect_url);
 			$xtfe_session_state = md5(uniqid(rand(), TRUE));
 			setcookie("xtfe_session_state", $xtfe_session_state, "0", "/");
 
 			if( $app_id != '' && $app_secret != '' ){
 
-				$dialog_url = "https://www.facebook.com/" . $api_version . "/dialog/oauth?client_id=" . $app_id . "&redirect_uri=" . $param_url . "&state=" . $xtfe_session_state . "&scope=groups_access_member_info,user_events,pages_show_list,pages_manage_metadata,pages_read_engagement,pages_read_user_content";
+				$dialog_url = "https://www.facebook.com/" . $api_version . "/dialog/oauth?client_id=" . $app_id . "&redirect_uri=" . $param_url . "&state=" . $xtfe_session_state . "&scope=pages_show_list,pages_manage_metadata,pages_read_engagement,pages_read_user_content,page_events";
 				header("Location: " . $dialog_url);
 
 			}else{
@@ -66,7 +66,7 @@ function xtfe_facebook_authorize_user_callback() {
 			$app_id = isset( $xtfe_options['facebook_app_id'] ) ? $xtfe_options['facebook_app_id'] : '';
 			$app_secret = isset( $xtfe_options['facebook_app_secret'] ) ? $xtfe_options['facebook_app_secret'] : '';
 			$redirect_url = admin_url('admin-post.php?action=xtfe_facebook_authorize_callback');
-			$api_version = 'v15.0';
+			$api_version = 'v19.0';
 			$param_url = urlencode($redirect_url);
 
 			if( $app_id != '' && $app_secret != '' ){