FEATURE: AppID/Secret can now be entered on the plugin's admin page. BUG: if a connec...

diff --git a/facebook/facebook.php b/facebook/facebook.php
index 8fcde40332e7ff02fc6c94a675e947c16510a017..9f873284e54a90e00699f35a1ab6bd56fca70302 100755 (executable)
--- a/facebook/facebook.php
+++ b/facebook/facebook.php
@@ -464,9 +464,21 @@ function facebook_content(&$a) {
                info( t('Updating contacts') . EOL);
        }
 
-
-       $fb_installed = get_pconfig(local_user(),'facebook','post');
-
+       $o = '';
+       
+       $fb_installed = false;
+       if (get_pconfig(local_user(),'facebook','post')) {
+               $access_token = get_pconfig(local_user(),'facebook','access_token');
+               if ($access_token) {
+                       $private_wall = intval(get_pconfig($uid,'facebook','private_wall'));
+                       $s = fetch_url('https://graph.facebook.com/me/feed?access_token=' . $access_token);
+                       if($s) {
+                               $j = json_decode($s);
+                               if (isset($j->data)) $fb_installed = true;
+                       }
+               }
+       }
+       
        $appid = get_config('facebook','appid');
 
        if(! $appid) {
@@ -629,17 +641,39 @@ function facebook_plugin_settings(&$a,&$b) {
 
 
 function facebook_plugin_admin(&$a, &$o){
+       $o = '<input type="hidden" name="form_security_token" value="' . get_form_security_token("fbsave") . '">';
        
-       $activated = facebook_check_realtime_active();
-       if ($activated) {
-               $o = t('Real-Time Updates are activated.') . '<br><br>';
-               $o .= '<input type="submit" name="real_time_deactivate" value="' . t('Deactivate Real-Time Updates') . '">';
-       } else {
-               $o = t('Real-Time Updates not activated.') . '<br><input type="submit" name="real_time_activate" value="' . t('Activate Real-Time Updates') . '">';
+       $o .= '<h4>' . t('Facebook API Key') . '</h4>';
+       
+       $appid  = get_config('facebook', 'appid'  );
+       $appsecret = get_config('facebook', 'appsecret' );
+       
+       $o .= '<label for="fb_appid">' . t('App-ID / API-Key') . '</label><input name="appid" type="text" value="' . escape_tags($appid ? $appid : "") . '"><br style="clear: both;">';
+       $o .= '<label for="fb_appsecret">' . t('Application secret') . '</label><input name="appsecret" type="text" value="' . escape_tags($appsecret ? $appsecret : "") . '"><br style="clear: both;">';
+       $o .= '<input type="submit" name="fb_save_keys" value="' . t('Save') . '">';
+       
+       if ($appid && $appsecret) {
+               $o .= '<h4>' . t('Real-Time Updates') . '</h4>';
+               
+               $activated = facebook_check_realtime_active();
+               if ($activated) {
+                       $o .= t('Real-Time Updates are activated.') . '<br><br>';
+                       $o .= '<input type="submit" name="real_time_deactivate" value="' . t('Deactivate Real-Time Updates') . '">';
+               } else {
+                       $o .= t('Real-Time Updates not activated.') . '<br><input type="submit" name="real_time_activate" value="' . t('Activate Real-Time Updates') . '">';
+               }
        }
 }
 
 function facebook_plugin_admin_post(&$a, &$o){
+       check_form_security_token_redirectOnErr('/admin/plugins/facebook', 'fbsave');
+       
+       if (x($_REQUEST,'fb_save_keys')) {
+               set_config('facebook', 'appid', $_REQUEST['appid']);
+               set_config('facebook', 'appsecret', $_REQUEST['appsecret']);
+               del_config('facebook', 'app_access_token');
+               info(t('The new values have been saved.'));
+       }
        if (x($_REQUEST,'real_time_activate')) {
                facebook_subscription_add_users();
        }
@@ -1448,8 +1482,8 @@ function fb_get_app_access_token() {
                logger('fb_get_app_access_token: appid and/or appsecret not set', LOGGER_DEBUG);
                return false;
        }
-       
-       $x = fetch_url('https://graph.facebook.com/oauth/access_token?client_id=' . $appid . '&client_secret=' . $appsecret . "&grant_type=client_credentials");
+       logger('https://graph.facebook.com/oauth/access_token?client_id=' . $appid . '&client_secret=' . $appsecret . '&grant_type=client_credentials', LOGGER_DATA);
+       $x = fetch_url('https://graph.facebook.com/oauth/access_token?client_id=' . $appid . '&client_secret=' . $appsecret . '&grant_type=client_credentials');
        
        if(strpos($x,'access_token=') !== false) {
                logger('fb_get_app_access_token: returned access token: ' . $x, LOGGER_DATA);
@@ -1480,8 +1514,7 @@ function facebook_subscription_del_users() {
        del_config('facebook', 'realtime_active');
 }
 
-function facebook_subscription_add_users() {
-       
+function facebook_subscription_add_users($second_try = false) {
        $a = get_app();
        $access_token = fb_get_app_access_token();
        
@@ -1502,9 +1535,18 @@ function facebook_subscription_add_users() {
        del_config('facebook', 'cb_verify_token');
        
        if ($j) {
+               $x = json_decode($j);
                logger("Facebook reponse: " . $j, LOGGER_DATA);
-               
-               if (facebook_check_realtime_active()) set_config('facebook', 'realtime_active', 1);
+               if (isset($x->error)) {
+                       logger('facebook_subscription_add_users: got an error: ' . $j);
+                       if ($x->error->type == "OAuthException" && $x->error->code == 190) {
+                               del_config('facebook', 'app_access_token');
+                               if ($second_try === false) facebook_subscription_add_users(true);
+                       }
+               } else {
+                       logger('facebook_subscription_add_users: sucessful');
+                       if (facebook_check_realtime_active()) set_config('facebook', 'realtime_active', 1);
+               }
        };
 }