]> git.mxchange.org Git - friendica-addons.git/blobdiff - facebook/facebook.php
Merge remote branch 'upstream/master'
[friendica-addons.git] / facebook / facebook.php
old mode 100644 (file)
new mode 100755 (executable)
index 3c0a2a0..b6e4065
@@ -1,24 +1,23 @@
 <?php
 /**
  * Name: Facebook Connector
- * Version: 1.0
+ * Version: 1.1
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
+ *         Tobias Hößl <https://github.com/CatoTH/>
  */
 
 /**
- * Installing the Friendika/Facebook connector
+ * Installing the Friendica/Facebook connector
  *
  * 1. register an API key for your site from developer.facebook.com
- *   a. We'd be very happy if you include "Friendika" in the application name
- *      to increase name recognition. The Friendika icons are also present
+ *   a. We'd be very happy if you include "Friendica" in the application name
+ *      to increase name recognition. The Friendica icons are also present
  *      in the images directory and may be uploaded as a Facebook app icon.
- *      Use images/friendika-16.jpg for the Icon and images/friendika-128.jpg for the Logo.
+ *      Use images/friendica-16.jpg for the Icon and images/friendica-128.jpg for the Logo.
  *   b. The url should be your site URL with a trailing slash.
- *      You may use http://portal.friendika.com/privacy as the privacy policy
- *      URL unless your site has different requirements, and 
- *      http://portal.friendika.com as the Terms of Service URL unless
- *      you have different requirements. (Friendika is a software application
- *      and does not require Terms of Service, though your installation of it might).
+ *      Friendica is a software application and does not require a Privacy Policy 
+ *      or Terms of Service, though your installation of it might. Facebook may require
+ *      that you provide a Privacy Policy, which we find ironic.  
  *   c. Set the following values in your .htconfig.php file
  *         $a->config['facebook']['appid'] = 'xxxxxxxxxxx';
  *         $a->config['facebook']['appsecret'] = 'xxxxxxxxxxxxxxx';
  *   d. Navigate to Set Web->Site URL & Domain -> Website Settings.  Set 
  *      Site URL to yoursubdomain.yourdomain.com. Set Site Domain to your 
  *      yourdomain.com.
- * 2. Enable the facebook plugin by including it in .htconfig.php - e.g. 
- *     $a->config['system']['addon'] = 'plugin1,plugin2,facebook';
+ * 2. Visit the Facebook Settings section of the "Settings->Plugin Settings" page.
+ *    and click 'Install Facebook Connector'.
  * 3. Visit the Facebook Settings section of the "Settings->Plugin Settings" page.
  *    and click 'Install Facebook Connector'.
  * 4. This will ask you to login to Facebook and grant permission to the 
  *    plugin to do its stuff. Allow it to do so. 
- * 5. You're done. To turn it off visit the Plugin Settings page again and
+ * 5. Optional step: If you want to use Facebook Real Time Updates (so new messages
+ *    and new contacts are added ~1min after they are postet / added on FB), go to
+ *    Settings -> plugins -> facebook and press the "Activate Real-Time Updates"-button.
+ * 6. You're done. To turn it off visit the Plugin Settings page again and
  *    'Remove Facebook posting'.
  *
  * Vidoes and embeds will not be posted if there is no other content. Links 
  * authenticate to your site to establish identity. We will address this 
  * in a future release.
  */
+ /** TODO
+ * - Implement a method for the administrator to delete all configuration data the plugin has created,
+ *   e.g. the app_access_token
+ */
 
-define('FACEBOOK_MAXPOSTLEN', 420);
+// Size of maximum post length increased
+// see http://www.facebook.com/schrep/posts/203969696349811
+// define('FACEBOOK_MAXPOSTLEN', 420);
+define('FACEBOOK_MAXPOSTLEN', 63206);
+define('FACEBOOK_SESSION_ERR_NOTIFICATION_INTERVAL', 259200); // 3 days
+define('FACEBOOK_DEFAULT_POLL_INTERVAL', 60); // given in minutes
+define('FACEBOOK_MIN_POLL_INTERVAL', 5);
 
+require_once('include/security.php');
 
 function facebook_install() {
        register_hook('post_local',       'addon/facebook/facebook.php', 'facebook_post_local');
@@ -53,6 +67,7 @@ function facebook_install() {
        register_hook('jot_networks',     'addon/facebook/facebook.php', 'facebook_jot_nets');
        register_hook('connector_settings',  'addon/facebook/facebook.php', 'facebook_plugin_settings');
        register_hook('cron',             'addon/facebook/facebook.php', 'facebook_cron');
+       register_hook('enotify',          'addon/facebook/facebook.php', 'facebook_enotify');
        register_hook('queue_predeliver', 'addon/facebook/facebook.php', 'fb_queue_hook');
 }
 
@@ -63,6 +78,7 @@ function facebook_uninstall() {
        unregister_hook('jot_networks',     'addon/facebook/facebook.php', 'facebook_jot_nets');
        unregister_hook('connector_settings',  'addon/facebook/facebook.php', 'facebook_plugin_settings');
        unregister_hook('cron',             'addon/facebook/facebook.php', 'facebook_cron');
+       unregister_hook('enotify',          'addon/facebook/facebook.php', 'facebook_enotify');
        unregister_hook('queue_predeliver', 'addon/facebook/facebook.php', 'fb_queue_hook');
 
        // hook moved
@@ -77,10 +93,97 @@ function facebook_module() {}
 
 
 
-/* If a->argv[1] is a nickname, this is a callback from Facebook oauth requests. */
+// If a->argv[1] is a nickname, this is a callback from Facebook oauth requests.
+// If $_REQUEST["realtime_cb"] is set, this is a callback from the Real-Time Updates API
 
 function facebook_init(&$a) {
+       
+       if (x($_REQUEST, "realtime_cb") && x($_REQUEST, "realtime_cb")) {
+               logger("facebook_init: Facebook Real-Time callback called", LOGGER_DEBUG);
+               
+               if (x($_REQUEST, "hub_verify_token")) {
+                       // this is the verification callback while registering for real time updates
+                       
+                       $verify_token = get_config('facebook', 'cb_verify_token');
+                       if ($verify_token != $_REQUEST["hub_verify_token"]) {
+                               logger('facebook_init: Wrong Facebook Callback Verifier - expected ' . $verify_token . ', got ' . $_REQUEST["hub_verify_token"]);
+                               return;
+                       }
+                       
+                       if (x($_REQUEST, "hub_challenge")) {
+                               logger('facebook_init: Answering Challenge: ' . $_REQUEST["hub_challenge"], LOGGER_DATA);
+                               echo $_REQUEST["hub_challenge"];
+                               die();
+                       }
+               }
+               
+               require_once('include/items.php');
+               
+               // this is a status update
+               $content = file_get_contents("php://input");
+               if (is_numeric($content)) $content = file_get_contents("php://input");
+               $js = json_decode($content);
+               logger(print_r($js, true), LOGGER_DATA);
+               
+               if (!isset($js->object) || $js->object != "user" || !isset($js->entry)) {
+                       logger('facebook_init: Could not parse Real-Time Update data', LOGGER_DEBUG);
+                       return;
+               }
+               
+               $affected_users = array("feed" => array(), "friends" => array());
+               
+               foreach ($js->entry as $entry) {
+                       $fbuser = $entry->uid;
+                       foreach ($entry->changed_fields as $field) {
+                               if (!isset($affected_users[$field])) {
+                                       logger('facebook_init: Unknown field "' . $field . '"');
+                                       continue;
+                               }
+                               if (in_array($fbuser, $affected_users[$field])) continue;
+                               
+                               $r = q("SELECT `uid` FROM `pconfig` WHERE `cat` = 'facebook' AND `k` = 'self_id' AND `v` = '%s' LIMIT 1", dbesc($fbuser));
+                               if(! count($r))
+                                       continue;
+                               $uid = $r[0]['uid'];
+                               
+                               $access_token = get_pconfig($uid,'facebook','access_token');
+                               if(! $access_token)
+                                       return;
+                               
+                               switch ($field) {
+                                       case "feed":
+                                               logger('facebook_init: FB-User ' . $fbuser . ' / feed', LOGGER_DEBUG);
+                                               
+                                               if(! get_pconfig($uid,'facebook','no_wall')) {
+                                                       $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)) {
+                                                                       logger('facebook_init: wall: ' . print_r($j,true), LOGGER_DATA);
+                                                                       fb_consume_stream($uid,$j,($private_wall) ? false : true);
+                                                               } else {
+                                                                       logger('facebook_init: wall: got no data from Facebook: ' . print_r($j,true), LOGGER_NORMAL);
+                                                               }
+                                                       }
+                                               }
+                                               
+                                       break;
+                                       case "friends":
+                                               logger('facebook_init: FB-User ' . $fbuser . ' / friends', LOGGER_DEBUG);
+                                               
+                                               fb_get_friends($uid, false);
+                                               set_pconfig($uid,'facebook','friend_check',time());
+                                       break;
+                                       default:
+                                               logger('facebook_init: Unknown callback field for ' . $fbuser, LOGGER_NORMAL);
+                               }
+                               $affected_users[$field][] = $fbuser;
+                       }
+               }
+       }
 
+       
        if($a->argc != 2)
                return;
        $nick = $a->argv[1];
@@ -92,8 +195,8 @@ function facebook_init(&$a) {
                return;
 
        $uid           = $r[0]['uid'];
-       $auth_code     = (($_GET['code']) ? $_GET['code'] : '');
-       $error         = (($_GET['error_description']) ? $_GET['error_description'] : '');
+       $auth_code     = (x($_GET, 'code') ? $_GET['code'] : '');
+       $error         = (x($_GET, 'error_description') ? $_GET['error_description'] : '');
 
 
        if($error)
@@ -120,7 +223,7 @@ function facebook_init(&$a) {
                        if(get_pconfig($uid,'facebook','no_linking') === false)
                                set_pconfig($uid,'facebook','no_linking',1);
                        fb_get_self($uid);
-                       fb_get_friends($uid);
+                       fb_get_friends($uid, true);
                        fb_consume_all($uid);
 
                }
@@ -141,116 +244,50 @@ function fb_get_self($uid) {
        }
 }
 
-
-
-function fb_get_friends($uid) {
-
-       $r = q("SELECT `uid` FROM `user` WHERE `uid` = %d AND `account_expired` = 0 LIMIT 1",
-               intval($uid)
+function fb_get_friends_sync_new($uid, $access_token, $person) {
+       $link = 'http://facebook.com/profile.php?id=' . $person->id;
+       
+       $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1",
+               intval($uid),
+               dbesc($link)
        );
-       if(! count($r))
-               return;
-
-       $access_token = get_pconfig($uid,'facebook','access_token');
-
-       $no_linking = get_pconfig($uid,'facebook','no_linking');
-       if($no_linking)
-               return;
+       
+       if (count($r) == 0) {
+               logger('fb_get_friends: new contact found: ' . $link, LOGGER_DEBUG);
+               
+               fb_get_friends_sync_full($uid, $access_token, $person);
+       }
+}
 
-       if(! $access_token)
-               return;
-       $s = fetch_url('https://graph.facebook.com/me/friends?access_token=' . $access_token);
+function fb_get_friends_sync_full($uid, $access_token, $person) {
+       $s = fetch_url('https://graph.facebook.com/' . $person->id . '?access_token=' . $access_token);
        if($s) {
-               logger('facebook: fb_get_friends: ' . $s, LOGGER_DATA);
-               $j = json_decode($s);
-               logger('facebook: fb_get_friends: json: ' . print_r($j,true), LOGGER_DATA);
-               if(! $j->data)
-                       return;
-               foreach($j->data as $person) {
-                       $s = fetch_url('https://graph.facebook.com/' . $person->id . '?access_token=' . $access_token);
-                       if($s) {
-                               $jp = json_decode($s);
-                               logger('fb_get_friends: info: ' . print_r($jp,true), LOGGER_DATA);
+               $jp = json_decode($s);
+               logger('fb_get_friends: info: ' . print_r($jp,true), LOGGER_DATA);
 
-                               // always use numeric link for consistency
+               // always use numeric link for consistency
 
-                               $jp->link = 'http://facebook.com/profile.php?id=' . $person->id;
+               $jp->link = 'http://facebook.com/profile.php?id=' . $person->id;
 
-                               // check if we already have a contact
+               // If its a page then set the first name from the username
+               if (!$jp->first_name and $jp->username)
+                       $jp->first_name = $jp->username;
 
-                               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1",
-                                       intval($uid),
-                                       dbesc($jp->link)
-                               );                      
+               // check if we already have a contact
 
-                               if(count($r)) {
-
-                                       // check that we have all the photos, this has been known to fail on occasion
-
-                                       if((! $r[0]['photo']) || (! $r[0]['thumb']) || (! $r[0]['micro'])) {  
-                                               require_once("Photo.php");
-
-                                               $photos = import_profile_photo('https://graph.facebook.com/' . $jp->id . '/picture', $uid, $r[0]['id']);
-
-                                               $r = q("UPDATE `contact` SET `photo` = '%s', 
-                                                       `thumb` = '%s',
-                                                       `micro` = '%s', 
-                                                       `name-date` = '%s', 
-                                                       `uri-date` = '%s', 
-                                                       `avatar-date` = '%s'
-                                                       WHERE `id` = %d LIMIT 1
-                                               ",
-                                                       dbesc($photos[0]),
-                                                       dbesc($photos[1]),
-                                                       dbesc($photos[2]),
-                                                       dbesc(datetime_convert()),
-                                                       dbesc(datetime_convert()),
-                                                       dbesc(datetime_convert()),
-                                                       intval($r[0]['id'])
-                                               );                      
-                                       }       
-                                       continue;
-                               }
-                               else {
-
-                                       // create contact record 
-                                       $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`, 
-                                               `name`, `nick`, `photo`, `network`, `rel`, `priority`,
-                                               `writable`, `blocked`, `readonly`, `pending` )
-                                               VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ",
-                                               intval($uid),
-                                               dbesc(datetime_convert()),
-                                               dbesc($jp->link),
-                                               dbesc(normalise_link($jp->link)),
-                                               dbesc(''),
-                                               dbesc(''),
-                                               dbesc($jp->id),
-                                               dbesc('facebook ' . $jp->id),
-                                               dbesc($jp->name),
-                                               dbesc(($jp->nickname) ? $jp->nickname : strtolower($jp->first_name)),
-                                               dbesc('https://graph.facebook.com/' . $jp->id . '/picture'),
-                                               dbesc(NETWORK_FACEBOOK),
-                                               intval(CONTACT_IS_FRIEND),
-                                               intval(1),
-                                               intval(1)
-                                       );
-                               }
+               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1",
+                       intval($uid),
+                       dbesc($jp->link)
+               );                      
 
-                               $r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1",
-                                       dbesc($jp->link),
-                                       intval($uid)
-                               );
-
-                               if(! count($r)) {
-                                       continue;
-                               }
+               if(count($r)) {
 
-                               $contact = $r[0];
-                               $contact_id  = $r[0]['id'];
+                       // check that we have all the photos, this has been known to fail on occasion
 
+                       if((! $r[0]['photo']) || (! $r[0]['thumb']) || (! $r[0]['micro'])) {  
                                require_once("Photo.php");
 
-                               $photos = import_profile_photo($r[0]['photo'],$uid,$contact_id);
+                               $photos = import_profile_photo('https://graph.facebook.com/' . $jp->id . '/picture', $uid, $r[0]['id']);
 
                                $r = q("UPDATE `contact` SET `photo` = '%s', 
                                        `thumb` = '%s',
@@ -266,11 +303,102 @@ function fb_get_friends($uid) {
                                        dbesc(datetime_convert()),
                                        dbesc(datetime_convert()),
                                        dbesc(datetime_convert()),
-                                       intval($contact_id)
+                                       intval($r[0]['id'])
                                );                      
+                       }       
+                       return;
+               }
+               else {
 
-                       }
+                       // create contact record 
+                       $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`, 
+                               `name`, `nick`, `photo`, `network`, `rel`, `priority`,
+                               `writable`, `blocked`, `readonly`, `pending` )
+                               VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ",
+                               intval($uid),
+                               dbesc(datetime_convert()),
+                               dbesc($jp->link),
+                               dbesc(normalise_link($jp->link)),
+                               dbesc(''),
+                               dbesc(''),
+                               dbesc($jp->id),
+                               dbesc('facebook ' . $jp->id),
+                               dbesc($jp->name),
+                               dbesc(($jp->nickname) ? $jp->nickname : strtolower($jp->first_name)),
+                               dbesc('https://graph.facebook.com/' . $jp->id . '/picture'),
+                               dbesc(NETWORK_FACEBOOK),
+                               intval(CONTACT_IS_FRIEND),
+                               intval(1),
+                               intval(1)
+                       );
+               }
+
+               $r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1",
+                       dbesc($jp->link),
+                       intval($uid)
+               );
+
+               if(! count($r)) {
+                       return;
                }
+
+               $contact = $r[0];
+               $contact_id  = $r[0]['id'];
+
+               require_once("Photo.php");
+
+               $photos = import_profile_photo($r[0]['photo'],$uid,$contact_id);
+
+               $r = q("UPDATE `contact` SET `photo` = '%s', 
+                       `thumb` = '%s',
+                       `micro` = '%s', 
+                       `name-date` = '%s', 
+                       `uri-date` = '%s', 
+                       `avatar-date` = '%s'
+                       WHERE `id` = %d LIMIT 1
+               ",
+                       dbesc($photos[0]),
+                       dbesc($photos[1]),
+                       dbesc($photos[2]),
+                       dbesc(datetime_convert()),
+                       dbesc(datetime_convert()),
+                       dbesc(datetime_convert()),
+                       intval($contact_id)
+               );                      
+
+       }
+}
+
+// if $fullsync is true, only new contacts are searched for
+
+function fb_get_friends($uid, $fullsync = true) {
+
+       $r = q("SELECT `uid` FROM `user` WHERE `uid` = %d AND `account_expired` = 0 LIMIT 1",
+               intval($uid)
+       );
+       if(! count($r))
+               return;
+
+       $access_token = get_pconfig($uid,'facebook','access_token');
+
+       $no_linking = get_pconfig($uid,'facebook','no_linking');
+       if($no_linking)
+               return;
+
+       if(! $access_token)
+               return;
+       $s = fetch_url('https://graph.facebook.com/me/friends?access_token=' . $access_token);
+       if($s) {
+               logger('facebook: fb_get_friends: ' . $s, LOGGER_DATA);
+               $j = json_decode($s);
+               logger('facebook: fb_get_friends: json: ' . print_r($j,true), LOGGER_DATA);
+               if(! $j->data)
+                       return;
+               foreach($j->data as $person)
+                       if ($fullsync)
+                               fb_get_friends_sync_full($uid, $access_token, $person);
+                       else
+                               fb_get_friends_sync_new($uid, $access_token, $person);
        }
 }
 
@@ -294,6 +422,8 @@ function facebook_post(&$a) {
                set_pconfig($uid,'facebook','private_wall',$private_wall);
        
 
+               set_pconfig($uid,'facebook','blocked_apps',escape_tags(trim($_POST['blocked_apps'])));
+
                $linkvalue = ((x($_POST,'facebook_linking')) ? intval($_POST['facebook_linking']) : 0);
                set_pconfig($uid,'facebook','no_linking', (($linkvalue) ? 0 : 1));
 
@@ -313,7 +443,7 @@ function facebook_post(&$a) {
                elseif(intval($no_linking) && intval($linkvalue)) {
                        // FB linkage is now allowed - import stuff.
                        fb_get_self($uid);
-                       fb_get_friends($uid);
+                       fb_get_friends($uid, true);
                        fb_consume_all($uid);
                }
 
@@ -338,13 +468,25 @@ function facebook_content(&$a) {
        }
 
        if($a->argc > 1 && $a->argv[1] === 'friends') {
-               fb_get_friends(local_user());
+               fb_get_friends(local_user(), true);
                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) {
@@ -401,6 +543,12 @@ function facebook_content(&$a) {
 
                $o .= '<p>' . t('If you choose to link conversations and leave both of these boxes unchecked, your Facebook profile wall will be merged with your profile wall on this website and your privacy settings on this website will be used to determine who may see the conversations.') . '</p>';
 
+
+               $blocked_apps = get_pconfig(local_user(),'facebook','blocked_apps');
+
+               $o .= '<div><label id="blocked-apps-label" for="blocked-apps">' . t('Comma separated applications to ignore') . ' </label></div>';
+       $o .= '<div><textarea id="blocked-apps" name="blocked_apps" >' . htmlspecialchars($blocked_apps) . '</textarea></div>';
+
                $o .= '<input type="submit" name="submit" value="' . t('Submit') . '" /></form></div>';
        }
 
@@ -415,7 +563,7 @@ function facebook_cron($a,$b) {
        
        $poll_interval = intval(get_config('facebook','poll_interval'));
        if(! $poll_interval)
-               $poll_interval = 3600;
+               $poll_interval = FACEBOOK_DEFAULT_POLL_INTERVAL;
 
        if($last) {
                $next = $last + $poll_interval;
@@ -450,13 +598,40 @@ function facebook_cron($a,$b) {
                        if($last_friend_check) 
                                $next_friend_check = $last_friend_check + 86400;
                        if($next_friend_check <= time()) {
-                               fb_get_friends($rr['uid']);
+                               fb_get_friends($rr['uid'], true);
                                set_pconfig($rr['uid'],'facebook','friend_check',time());
                        }
                        fb_consume_all($rr['uid']);
                }
-       }       
-
+       }
+       
+       if (get_config('facebook', 'realtime_active') == 1) {
+               if (!facebook_check_realtime_active()) {
+                       
+                       logger('facebook_cron: Facebook is not sending Real-Time Updates any more, although it is supposed to. Trying to fix it...', LOGGER_NORMAL);
+                       facebook_subscription_add_users();
+                       
+                       if (facebook_check_realtime_active()) 
+                               logger('facebook_cron: Successful', LOGGER_NORMAL);
+                       else {
+                               logger('facebook_cron: Failed', LOGGER_NORMAL);
+                               
+                               if(strlen($a->config['admin_email']) && !get_config('facebook', 'realtime_err_mailsent')) {
+                                       $res = mail($a->config['admin_email'], t('Problems with Facebook Real-Time Updates'), 
+                                               "Hi!\n\nThere's a problem with the Facebook Real-Time Updates that cannot be solved automatically. Maybe a permission issue?\n\nPlease try to re-activate it on " . $a->config["system"]["url"] . "/admin/plugins/facebook\n\nThis e-mail will only be sent once.",
+                                               'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+                                               . 'Content-type: text/plain; charset=UTF-8' . "\n"
+                                               . 'Content-transfer-encoding: 8bit'
+                                       );
+                                       
+                                       set_config('facebook', 'realtime_err_mailsent', 1);
+                               }
+                       }
+               } else { // !facebook_check_realtime_active()
+                       del_config('facebook', 'realtime_err_mailsent');
+               }
+       }
+       
        set_config('facebook','last_poll', time());
 
 }
@@ -472,6 +647,70 @@ 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") . '">';
+       
+       $o .= '<h4>' . t('Facebook API Key') . '</h4>';
+       
+       $appid  = get_config('facebook', 'appid'  );
+       $appsecret = get_config('facebook', 'appsecret' );
+       $poll_interval = get_config('facebook', 'poll_interval' );
+       if (!$poll_interval) $poll_interval = FACEBOOK_DEFAULT_POLL_INTERVAL;
+       
+       $ret1 = q("SELECT `v` FROM `config` WHERE `cat` = 'facebook' AND `k` = 'appid' LIMIT 1");
+       $ret2 = q("SELECT `v` FROM `config` WHERE `cat` = 'facebook' AND `k` = 'appsecret' LIMIT 1");
+       if ((count($ret1) > 0 && $ret1[0]['v'] != $appid) || (count($ret2) > 0 && $ret2[0]['v'] != $appsecret)) $o .= t('Error: it appears that you have specified the App-ID and -Secret in your .htconfig.php file. As long as they are specified there, they cannot be set using this form.<br><br>');
+       
+       $working_connection = false;
+       if ($appid && $appsecret) {
+               $subs = facebook_subscriptions_get();
+               if ($subs === null) $o .= t('Error: the given API Key seems to be incorrect (the application access token could not be retrieved).') . '<br>';
+               elseif (is_array($subs)) {
+                       $o .= t('The given API Key seems to work correctly.') . '<br>';
+                       $working_connection = true;
+               } else $o .= t('The correctness of the API Key could not be detected. Somthing strange\'s going on.') . '<br>';
+       }
+       
+       $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 .= '<label for="fb_poll_interval">' . sprintf(t('Polling Interval (min. %1$s minutes)'), FACEBOOK_MIN_POLL_INTERVAL) . '</label><input name="poll_interval" type="number" min="' . FACEBOOK_MIN_POLL_INTERVAL . '" value="' . $poll_interval . '"><br style="clear: both;">';
+       $o .= '<input type="submit" name="fb_save_keys" value="' . t('Save') . '">';
+       
+       if ($working_connection) {
+               $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']);
+               $poll_interval = IntVal($_REQUEST['poll_interval']);
+               if ($poll_interval >= FACEBOOK_MIN_POLL_INTERVAL) set_config('facebook', 'poll_interval', $poll_interval);
+               del_config('facebook', 'app_access_token');
+               info(t('The new values have been saved.'));
+       }
+       if (x($_REQUEST,'real_time_activate')) {
+               facebook_subscription_add_users();
+       }
+       if (x($_REQUEST,'real_time_deactivate')) {
+               facebook_subscription_del_users();
+       }
+}
+
 function facebook_jot_nets(&$a,&$b) {
        if(! local_user())
                return;
@@ -497,6 +736,7 @@ function facebook_post_hook(&$a,&$b) {
         */
 
        require_once('include/group.php');
+       require_once('include/html2plain.php');
 
        logger('Facebook post');
 
@@ -505,23 +745,37 @@ function facebook_post_hook(&$a,&$b) {
 
        $toplevel = (($b['id'] == $b['parent']) ? true : false);
 
-       if(strstr($b['postopts'],'facebook')) {
 
-               $linking = ((get_pconfig($b['uid'],'facebook','no_linking')) ? 0 : 1);
+       $linking = ((get_pconfig($b['uid'],'facebook','no_linking')) ? 0 : 1);
 
-               if((! $toplevel) && ($linking)) {
-                       $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-                               intval($b['parent']),
-                               intval($b['uid'])
-                       );
-                       if(count($r) && substr($r[0]['uri'],0,4) === 'fb::')
-                               $reply = substr($r[0]['uri'],4);
-                       elseif(count($r) && substr($r[0]['extid'],0,4) === 'fb::')
-                               $reply = substr($r[0]['extid'],4);
-                       else
-                               return;
-                       logger('facebook reply id=' . $reply);
-               }
+       if((! $toplevel) && ($linking)) {
+               $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                       intval($b['parent']),
+                       intval($b['uid'])
+               );
+               if(count($r) && substr($r[0]['uri'],0,4) === 'fb::')
+                       $reply = substr($r[0]['uri'],4);
+               elseif(count($r) && substr($r[0]['extid'],0,4) === 'fb::')
+                       $reply = substr($r[0]['extid'],4);
+               else
+                       return;
+
+               $u = q("SELECT * FROM user where uid = %d limit 1",
+                       intval($b['uid'])
+               );
+               if(! count($u))
+                       return;
+
+               // only accept comments from the item owner. Other contacts are unknown to FB.
+               if(! link_compare($b['author-link'], $a->get_baseurl() . '/profile/' . $u[0]['nickname']))
+                       return;
+               
+
+               logger('facebook reply id=' . $reply);
+       }
+
+       if(strstr($b['postopts'],'facebook') || ($b['private']) || ($reply)) {
 
                if($b['private'] && $reply === false) {
                        $allow_people = expand_acl($b['allow_cid']);
@@ -603,7 +857,8 @@ function facebook_post_hook(&$a,&$b) {
                                if($b['verb'] == ACTIVITY_DISLIKE)
                                        $msg = trim(strip_tags(bbcode($msg)));
 
-                               $search_str = $a->get_baseurl() . '/search';
+                               // Old code
+                               /*$search_str = $a->get_baseurl() . '/search';
 
                                if(preg_match("/\[url=(.*?)\](.*?)\[\/url\]/is",$msg,$matches)) {
 
@@ -616,6 +871,12 @@ function facebook_post_hook(&$a,&$b) {
                                        }
                                }
 
+                               // strip tag links to avoid link clutter, this really should be 
+                               // configurable because we're losing information
+
+                               $msg = preg_replace("/\#\[url=(.*?)\](.*?)\[\/url\]/is",'#$2',$msg);
+
+                               // provide the link separately for normal links
                                $msg = preg_replace("/\[url=(.*?)\](.*?)\[\/url\]/is",'$2 $1',$msg);
 
                                if(preg_match("/\[img\](.*?)\[\/img\]/is",$msg,$matches))
@@ -624,31 +885,91 @@ function facebook_post_hook(&$a,&$b) {
                                $msg = preg_replace("/\[img\](.*?)\[\/img\]/is", t('Image: ') . '$1', $msg);
 
                                if((strpos($link,z_root()) !== false) && (! $image))
-                                       $image = $a->get_baseurl() . '/images/friendika-64.jpg';
+                                       $image = $a->get_baseurl() . '/images/friendica-64.jpg';
+
+                               $msg = trim(strip_tags(bbcode($msg)));*/
+
+                               // New code
+
+                               // Looking for the first image
+                               $image = '';
+                               if(preg_match("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/is",$b['body'],$matches))
+                                       $image = $matches[3];
+
+                               if ($image != '')
+                                       if(preg_match("/\[img\](.*?)\[\/img\]/is",$b['body'],$matches))
+                                               $image = $matches[1];
+
+                               // Checking for a bookmark element
+                               $body = $b['body'];
+                               if (strpos($body, "[bookmark") !== false) {
+                                       // splitting the text in two parts:
+                                       // before and after the bookmark
+                                       $pos = strpos($body, "[bookmark");
+                                       $body1 = substr($body, 0, $pos);
+                                       $body2 = substr($body, $pos);
+
+                                       // Removing the bookmark and all quotes after the bookmark
+                                       // they are mostly only the content after the bookmark.
+                                       $body2 = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'',$body2);
+                                       $body2 = preg_replace("/\[quote\=([^\]]*)\](.*?)\[\/quote\]/ism",'',$body2);
+                                       $body2 = preg_replace("/\[quote\](.*?)\[\/quote\]/ism",'',$body2);
+
+                                       $body = $body1.$body2;
+                               }
+
+                               // At first convert the text to html
+                               $html = bbcode($body);
 
-                               $msg = trim(strip_tags(bbcode($msg)));
+                               // Then convert it to plain text
+                               $msg = trim($b['title']." \n\n".html2plain($html, 0, true));
                                $msg = html_entity_decode($msg,ENT_QUOTES,'UTF-8');
 
-                               // add any attachments as text urls
+                               // Removing multiple newlines
+                               while (strpos($msg, "\n\n\n") !== false)
+                                       $msg = str_replace("\n\n\n", "\n\n", $msg);
 
-                           $arr = explode(',',$b['attach']);
+                               // add any attachments as text urls
+                               $arr = explode(',',$b['attach']);
 
-                           if(count($arr)) {
+                               if(count($arr)) {
                                        $msg .= "\n";
-                               foreach($arr as $r) {
-                               $matches = false;
+                                       foreach($arr as $r) {
+                                               $matches = false;
                                                $cnt = preg_match('|\[attach\]href=\"(.*?)\" size=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches);
                                                if($cnt) {
-                                                       $msg .= $matches[1];
+                                                       $msg .= "\n".$matches[1];
                                                }
                                        }
                                }
 
+                               $link = '';
+                               $linkname = '';
+                               // look for bookmark-bbcode and handle it with priority
+                               if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches)) {
+                                       $link = $matches[1];
+                                       $linkname = $matches[2];
+                               }
+
+                               // If there is no bookmark element then take the first link
+                               if ($link == '') {
+                                       $links = collecturls($html);
+                                       if (sizeof($links) > 0) {
+                                               reset($links);
+                                               $link = current($links);
+                                       }
+                               }
+
+                               // Remove trailing and leading spaces
+                               $msg = trim($msg);
+
+                               // Since facebook increased the maxpostlen massively this never should happen again :)
                                if (strlen($msg) > FACEBOOK_MAXPOSTLEN) {
                                        $shortlink = "";
                                        require_once('library/slinky.php');
 
-                                       $display_url = $a->get_baseurl() . '/display/' . $a->user['nickname'] . '/' . $b['id'];
+                                       $display_url = $b['plink'];
+
                                        $slinky = new Slinky( $display_url );
                                        // setup a cascade of shortening services
                                        // try to get a short link from these services
@@ -660,7 +981,19 @@ function facebook_post_hook(&$a,&$b) {
                                        $msg = substr($msg, 0, FACEBOOK_MAXPOSTLEN - strlen($shortlink) - 4);
                                        $msg .= '... ' . $shortlink;
                                }
-                               if(! strlen($msg))
+
+                               // Fallback - if message is empty
+                               if(!strlen($msg))
+                                       $msg = $link;
+
+                               if(!strlen($msg))
+                                       $msg = $image;
+
+                               if(!strlen($msg))
+                                       $msg = $linkname;
+
+                               // If there is nothing to post then exit
+                               if(!strlen($msg))
                                        return;
 
                                logger('Facebook post: msg=' . $msg, LOGGER_DATA);
@@ -681,7 +1014,7 @@ function facebook_post_hook(&$a,&$b) {
                                                $postvars['name'] = $linkname;
                                }
 
-                               if(($b['private']) && (! $b['parent'])) {
+                               if(($b['private']) && ($toplevel)) {
                                        $postvars['privacy'] = '{"value": "CUSTOM", "friends": "SOME_FRIENDS"';
                                        if(count($allow_arr))
                                                $postvars['privacy'] .= ',"allow": "' . implode(',',$allow_arr) . '"';
@@ -697,17 +1030,18 @@ function facebook_post_hook(&$a,&$b) {
                                else { 
                                        $url = 'https://graph.facebook.com/me/feed';
                                        if($b['plink'])
-                                               $postvars['actions'] = '{"name": "' . t('View on Friendika') . '", "link": "' .  $b['plink'] . '"}';
+                                               $postvars['actions'] = '{"name": "' . t('View on Friendica') . '", "link": "' .  $b['plink'] . '"}';
                                }
 
                                logger('facebook: post to ' . $url);
                                logger('facebook: postvars: ' . print_r($postvars,true));
 
                                // "test_mode" prevents anything from actually being posted.
-                               // Otherwise, let's do it. 
+                               // Otherwise, let's do it.
 
                                if(! get_config('facebook','test_mode')) {
                                        $x = post_url($url, $postvars);
+                                       logger('Facebook post returns: ' . $x, LOGGER_DEBUG);
 
                                        $retj = json_decode($x);
                                        if($retj->id) {
@@ -723,15 +1057,45 @@ function facebook_post_hook(&$a,&$b) {
                                                        add_to_queue($a->contact,NETWORK_FACEBOOK,$s);
                                                        notice( t('Facebook post failed. Queued for retry.') . EOL);
                                                }
+                                               
+                                               if (isset($retj->error) && $retj->error->type == "OAuthException" && $retj->error->code == 190) {
+                                                       logger('Facebook session has expired due to changed password.', LOGGER_DEBUG);
+                                                       
+                                                       $last_notification = get_pconfig($b['uid'], 'facebook', 'session_expired_mailsent');
+                                                       if (!$last_notification || $last_notification < (time() - FACEBOOK_SESSION_ERR_NOTIFICATION_INTERVAL)) {
+                                                               require_once('include/enotify.php');
+                                                       
+                                                               $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($b['uid']) );
+                                                               notification(array(
+                                                                       'uid' => $b['uid'],
+                                                                       'type' => NOTIFY_SYSTEM,
+                                                                       'system_type' => 'facebook_connection_invalid',
+                                                                       'language'     => $r[0]['language'],
+                                                                       'to_name'      => $r[0]['username'],
+                                                                       'to_email'     => $r[0]['email'],
+                                                                       'source_name'  => t('Administrator'),
+                                                                       'source_link'  => $a->config["system"]["url"],
+                                                                       'source_photo' => $a->config["system"]["url"] . '/images/person-80.jpg',
+                                                               ));
+                                                               
+                                                               set_pconfig($b['uid'], 'facebook', 'session_expired_mailsent', time());
+                                                       } else logger('Facebook: No notification, as the last one was sent on ' . $last_notification, LOGGER_DEBUG);
+                                               }
                                        }
-                                       
-                                       logger('Facebook post returns: ' . $x, LOGGER_DEBUG);
                                }
                        }
                }
        }
 }
 
+function facebook_enotify(&$app, &$data) {
+       if (x($data, 'params') && $data['params']['type'] == NOTIFY_SYSTEM && x($data['params'], 'system_type') && $data['params']['system_type'] == 'facebook_connection_invalid') {
+               $data['itemlink'] = '/facebook';
+               $data['epreamble'] = $data['preamble'] = t('Your Facebook connection became invalid. Please Re-authenticate.');
+               $data['subject'] = t('Facebook connection became invalid');
+               $data['body'] = sprintf( t("Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3\$sre-authenticate the Facebook-connector%4\$s."), $data['params']['to_name'], "[url=" . $app->config["system"]["url"] . "]" . $app->config["sitename"] . "[/url]", "[url=" . $app->config["system"]["url"] . "/facebook]", "[/url]");
+       }
+}
 
 function facebook_post_local(&$a,&$b) {
 
@@ -743,10 +1107,10 @@ function facebook_post_local(&$a,&$b) {
        if((local_user()) && (local_user() == $b['uid'])) {
 
                $fb_post   = intval(get_pconfig(local_user(),'facebook','post'));
-               $fb_enable = (($fb_post && x($_POST,'facebook_enable')) ? intval($_POST['facebook_enable']) : 0);
+               $fb_enable = (($fb_post && x($_REQUEST,'facebook_enable')) ? intval($_REQUEST['facebook_enable']) : 0);
 
                // if API is used, default to the chosen settings
-               if($_POST['api_source'] && intval(get_pconfig(local_user(),'facebook','post_by_default')))
+               if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'facebook','post_by_default')))
                        $fb_enable = 1;
 
                if(! $fb_enable)
@@ -817,6 +1181,46 @@ function fb_queue_hook(&$a,&$b) {
        }
 }
 
+function fb_get_timeline($access_token, &$since) {
+
+       $entries->data = array();
+       $newest = 0;
+
+       $url = 'https://graph.facebook.com/me/home?access_token='.$access_token;
+
+       if ($since != 0)
+               $url .= "&since=".$since;
+
+       do {
+               $s = fetch_url($url);
+               $j = json_decode($s);
+               $oldestdate = time();
+               if (isset($j->data))
+                       foreach ($j->data as $entry) {
+                               $created = strtotime($entry->created_time);
+
+                               if ($newest < $created)
+                                       $newest = $created;
+
+                               if ($created >= $since)
+                                       $entries->data[] = $entry;
+
+                               if ($created <= $oldestdate)
+                                       $oldestdate = $created;
+                       }
+               else
+                       break;
+
+               $url = $j->paging->next;
+
+       } while (($oldestdate > $since) and ($since != 0) and ($url != ''));
+
+       if ($newest > $since)
+               $since = $newest;
+
+       return($entries);
+}
+
 function fb_consume_all($uid) {
 
        require_once('include/items.php');
@@ -830,17 +1234,42 @@ function fb_consume_all($uid) {
                $s = fetch_url('https://graph.facebook.com/me/feed?access_token=' . $access_token);
                if($s) {
                        $j = json_decode($s);
-                       logger('fb_consume_stream: wall: ' . print_r($j,true), LOGGER_DATA);
-                       fb_consume_stream($uid,$j,($private_wall) ? false : true);
+                       if (isset($j->data)) {
+                               logger('fb_consume_stream: wall: ' . print_r($j,true), LOGGER_DATA);
+                               fb_consume_stream($uid,$j,($private_wall) ? false : true);
+                       } else {
+                               logger('fb_consume_stream: wall: got no data from Facebook: ' . print_r($j,true), LOGGER_NORMAL);
+                       }
                }
        }
-       $s = fetch_url('https://graph.facebook.com/me/home?access_token=' . $access_token);
-       if($s) {
-               $j = json_decode($s);
+       // Get the last date
+       $lastdate = get_pconfig($uid,'facebook','lastdate');
+       // fetch all items since the last date
+       $j = fb_get_timeline($access_token, &$lastdate);
+       if (isset($j->data)) {
                logger('fb_consume_stream: feed: ' . print_r($j,true), LOGGER_DATA);
                fb_consume_stream($uid,$j,false);
-       }
 
+               // Write back the last date
+               set_pconfig($uid,'facebook','lastdate', $lastdate);
+       } else
+               logger('fb_consume_stream: feed: got no data from Facebook: ' . print_r($j,true), LOGGER_NORMAL);
+}
+
+function fb_get_photo($uid,$link) {
+       $access_token = get_pconfig($uid,'facebook','access_token');
+       if(! $access_token || (! stristr($link,'facebook.com/photo.php')))
+               return "";
+               //return "\n" . '[url=' . $link . ']' . t('link') . '[/url]';
+       $ret = preg_match('/fbid=([0-9]*)/',$link,$match);
+       if($ret)
+               $photo_id = $match[1];
+       $x = fetch_url('https://graph.facebook.com/' . $photo_id . '?access_token=' . $access_token);
+       $j = json_decode($x);
+       if($j->picture)
+               return "\n\n" . '[url=' . $link . '][img]' . $j->picture . '[/img][/url]';
+       //else
+       //      return "\n" . '[url=' . $link . ']' . t('link') . '[/url]';
 }
 
 function fb_consume_stream($uid,$j,$wall = false) {
@@ -848,7 +1277,7 @@ function fb_consume_stream($uid,$j,$wall = false) {
        $a = get_app();
 
 
-       $user = q("SELECT `nickname`, `blockwall` FROM `user` WHERE `uid` = %d AND `account_expired` = 0 LIMIT 1",
+       $user = q("SELECT * FROM `user` WHERE `uid` = %d AND `account_expired` = 0 LIMIT 1",
                intval($uid)
        );
        if(! count($user))
@@ -864,6 +1293,8 @@ function fb_consume_stream($uid,$j,$wall = false) {
                intval($uid)
        );
 
+       $blocked_apps = get_pconfig($uid,'facebook','blocked_apps');
+       $blocked_apps_arr = explode(',',$blocked_apps);
 
        $self_id = get_pconfig($uid,'facebook','self_id');
        if(! count($j->data) || (! strlen($self_id)))
@@ -897,6 +1328,10 @@ function fb_consume_stream($uid,$j,$wall = false) {
                        if($from->id == $self_id)
                                $datarray['contact-id'] = $self[0]['id'];
                        else {
+                               // Looking if user is known - if not he is added
+                               $access_token = get_pconfig($uid, 'facebook', 'access_token');
+                               fb_get_friends_sync_new($uid, $access_token, $from);
+
                                $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
                                        dbesc($from->id),
                                        intval($uid)
@@ -906,13 +1341,12 @@ function fb_consume_stream($uid,$j,$wall = false) {
                        }
 
                        // don't store post if we don't have a contact
-
                        if(! x($datarray,'contact-id')) {
-                               logger('no contact: post ignored');
-                               continue; 
+                               logger('facebook: no contact '.$from->name.' '.$from->id.'. post ignored');
+                               continue;
                        }
 
-                       $datarray['verb'] = ACTIVITY_POST;                                              
+                       $datarray['verb'] = ACTIVITY_POST;
                        if($wall) {
                                $datarray['owner-name'] = $self[0]['name'];
                                $datarray['owner-link'] = $self[0]['url'];
@@ -922,22 +1356,124 @@ function fb_consume_stream($uid,$j,$wall = false) {
                                $datarray['app'] = strip_tags($entry->application->name);
                        else
                                $datarray['app'] = 'facebook';
+
+                       $found_blocked = false;
+
+                       if(count($blocked_apps_arr)) {
+                               foreach($blocked_apps_arr as $bad_appl) {
+                                       if(strlen(trim($bad_appl)) && (stristr($datarray['app'],trim($bad_appl)))) {
+                                               $found_blocked = true;
+                                       }
+                               }
+                       }
+                               
+                       if($found_blocked) {
+                               logger('facebook: blocking application: ' . $datarray['app']);
+                               continue;
+                       }
+
                        $datarray['author-name'] = $from->name;
                        $datarray['author-link'] = 'http://facebook.com/profile.php?id=' . $from->id;
                        $datarray['author-avatar'] = 'https://graph.facebook.com/' . $from->id . '/picture';
                        $datarray['plink'] = $datarray['author-link'] . '&v=wall&story_fbid=' . substr($entry->id,strpos($entry->id,'_') + 1);
 
-                       $datarray['body'] = $entry->message;
-                       if($entry->picture)
-                               $datarray['body'] .= "\n\n" . '[img]' . $entry->picture . '[/img]';
-                       if($entry->link)
-                               $datarray['body'] .= "\n" . linkify($entry->link);
-                       if($entry->name)
-                               $datarray['body'] .= "\n" . $entry->name;
-                       if($entry->caption)
-                               $datarray['body'] .= "\n" . $entry->caption;
+                       logger('facebook: post '.$entry->id.' from '.$from->name);
+
+                       $datarray['body'] = escape_tags($entry->message);
+
+                       if($entry->name and $entry->link)
+                               $datarray['body'] .= "\n\n[bookmark=".$entry->link."]".$entry->name."[/bookmark]";
+                       elseif ($entry->name)
+                               $datarray['body'] .= "\n\n[b]" . $entry->name."[/b]";
+
+                       if($entry->caption) {
+                               if(!$entry->name and $entry->link)
+                                       $datarray['body'] .= "\n\n[bookmark=".$entry->link."]".$entry->caption."[/bookmark]";
+                               else
+                                       $datarray['body'] .= "[i]" . $entry->caption."[/i]\n";
+                       }
+
+                       if(!$entry->caption and !$entry->name) {
+                               if ($entry->link)
+                                       $datarray['body'] .= "\n[url]".$entry->link."[/url]\n";
+                               else
+                                       $datarray['body'] .= "\n";
+                       }
+
+                       $quote = "";
                        if($entry->description)
-                               $datarray['body'] .= "\n" . $entry->description;
+                               $quote = $entry->description;
+
+                       if ($entry->properties)
+                               foreach ($entry->properties as $property)
+                                       $quote .= "\n".$property->name.": [url=".$property->href."]".$property->text."[/url]";
+
+                       if ($quote)
+                               $datarray['body'] .= "\n[quote]".$quote."[/quote]";
+
+                       // Only import the picture when the message is no video
+                       // oembed display a picture of the video as well 
+                       if ($entry->type != "video") {
+                               if($entry->picture && $entry->link) {
+                                       $datarray['body'] .= "\n" . '[url=' . $entry->link . '][img]'.$entry->picture.'[/img][/url]';   
+                               }
+                               else {
+                                       if($entry->picture)
+                                               $datarray['body'] .= "\n" . '[img]' . $entry->picture . '[/img]';
+                                       // if just a link, it may be a wall photo - check
+                                       if($entry->link)
+                                               $datarray['body'] .= fb_get_photo($uid,$entry->link);
+                               }
+                       }
+
+                       if (($datarray['app'] == "Events") and $entry->actions)
+                               foreach ($entry->actions as $action)
+                                       if ($action->name == "View")
+                                               $datarray['body'] .= " [url=".$action->link."]".$entry->story."[/url]";
+
+                       // Just as a test - to see if these are the missing entries
+                       //if(trim($datarray['body']) == '')
+                       //      $datarray['body'] = $entry->story;
+
+                       // Adding the "story" text to see if there are useful data in it (testing)
+                       //if (($datarray['app'] != "Events") and $entry->story)
+                       //      $datarray['body'] .= "\n".$entry->story;
+
+                       if(trim($datarray['body']) == '') {
+                               logger('facebook: empty body '.$entry->id.' '.print_r($entry, true));
+                               continue;
+                       }
+
+                       $datarray['body'] .= "\n";
+
+                       if ($entry->icon)
+                               $datarray['body'] .= "[img]".$entry->icon."[/img] &nbsp; ";
+
+                       if ($entry->actions)
+                               foreach ($entry->actions as $action)
+                                       if (($action->name != "Comment") and ($action->name != "Like"))
+                                               $datarray['body'] .= "[url=".$action->link."]".$action->name."[/url] &nbsp; ";
+
+                       $datarray['body'] = trim($datarray['body']);
+
+                       //if(($datarray['body'] != '') and ($uid == 1))
+                       //      $datarray['body'] .= "[noparse]".print_r($entry, true)."[/noparse]";
+
+                       if ($entry->place->name or $entry->place->location->street or 
+                               $entry->place->location->city or $entry->place->location->Denmark) {
+                               $datarray['coord'] = '';
+                               if ($entry->place->name)
+                                       $datarray['coord'] .= $entry->place->name;
+                               if ($entry->place->location->street)
+                                       $datarray['coord'] .= $entry->place->location->street;
+                               if ($entry->place->location->city)
+                                       $datarray['coord'] .= " ".$entry->place->location->city;
+                               if ($entry->place->location->country)
+                                       $datarray['coord'] .= " ".$entry->place->location->country;
+                       } else if ($entry->place->location->latitude and $entry->place->location->longitude)
+                               $datarray['coord'] = substr($entry->place->location->latitude, 0, 8)
+                                                       .' '.substr($entry->place->location->longitude, 0, 8);
+
                        $datarray['created'] = datetime_convert('UTC','UTC',$entry->created_time);
                        $datarray['edited'] = datetime_convert('UTC','UTC',$entry->updated_time);
 
@@ -946,14 +1482,14 @@ function fb_consume_stream($uid,$j,$wall = false) {
 
                        if($entry->privacy && $entry->privacy->value !== 'EVERYONE') {
                                $datarray['private'] = 1;
-                               $datarray['allow_cid'] = '<' . $uid . '>';
+                               $datarray['allow_cid'] = '<' . $self[0]['id'] . '>';
                        }
-                       
+
                        $top_item = item_store($datarray);
                        $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                                intval($top_item),
                                intval($uid)
-                       );                      
+                       );
                        if(count($r)) {
                                $orig_post = $r[0];
                                logger('fb: new top level item posted');
@@ -1080,8 +1616,242 @@ function fb_consume_stream($uid,$j,$wall = false) {
                                $cmntdata['author-avatar'] = 'https://graph.facebook.com/' . $cmnt->from->id . '/picture';
                                $cmntdata['body'] = $cmnt->message;
                                $item = item_store($cmntdata);                  
+                               
+                               $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
+                                       dbesc($orig_post['uri']),
+                                       intval($uid)
+                               );
+
+                               if(count($myconv)) {
+                                       $importer_url = $a->get_baseurl() . '/profile/' . $user[0]['nickname'];
+
+                                       foreach($myconv as $conv) {
+
+                                               // now if we find a match, it means we're in this conversation
+       
+                                               if(! link_compare($conv['author-link'],$importer_url))
+                                                       continue;
+
+                                               require_once('include/enotify.php');
+                                                               
+                                               $conv_parent = $conv['parent'];
+
+                                               notification(array(
+                                                       'type'         => NOTIFY_COMMENT,
+                                                       'notify_flags' => $user[0]['notify-flags'],
+                                                       'language'     => $user[0]['language'],
+                                                       'to_name'      => $user[0]['username'],
+                                                       'to_email'     => $user[0]['email'],
+                                                       'uid'          => $user[0]['uid'],
+                                                       'item'         => $cmntdata,
+                                                       'link'             => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $item,
+                                                       'source_name'  => $cmntdata['author-name'],
+                                                       'source_link'  => $cmntdata['author-link'],
+                                                       'source_photo' => $cmntdata['author-avatar'],
+                                                       'verb'         => ACTIVITY_POST,
+                                                       'otype'        => 'item',
+                                                       'parent'       => $conv_parent,
+                                               ));
+
+                                               // only send one notification
+                                               break;
+                                       }
+                               }
                        }
                }
        }
 }
 
+
+function fb_get_app_access_token() {
+       
+       $acc_token = get_config('facebook','app_access_token');
+       
+       if ($acc_token !== false) return $acc_token;
+       
+       $appid = get_config('facebook','appid');
+       $appsecret = get_config('facebook', 'appsecret');
+       
+       if ($appid === false || $appsecret === false) {
+               logger('fb_get_app_access_token: appid and/or appsecret not set', LOGGER_DEBUG);
+               return false;
+       }
+       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);
+       
+               $token = str_replace('access_token=', '', $x);
+               if(strpos($token,'&') !== false)
+                       $token = substr($token,0,strpos($token,'&'));
+               
+               if ($token == "") {
+                       logger('fb_get_app_access_token: empty token: ' . $x, LOGGER_DEBUG);
+                       return false;
+               }
+               set_config('facebook','app_access_token',$token);
+               return $token;
+       } else {
+               logger('fb_get_app_access_token: response did not contain an access_token: ' . $x, LOGGER_DATA);
+               return false;
+       }
+}
+
+function facebook_subscription_del_users() {
+       $a = get_app();
+       $access_token = fb_get_app_access_token();
+       
+       $url = "https://graph.facebook.com/" . get_config('facebook', 'appid'  ) . "/subscriptions?access_token=" . $access_token;
+       facebook_delete_url($url);
+       
+       if (!facebook_check_realtime_active()) del_config('facebook', 'realtime_active');
+}
+
+function facebook_subscription_add_users($second_try = false) {
+       $a = get_app();
+       $access_token = fb_get_app_access_token();
+       
+       $url = "https://graph.facebook.com/" . get_config('facebook', 'appid'  ) . "/subscriptions?access_token=" . $access_token;
+       
+       list($usec, $sec) = explode(" ", microtime());
+       $verify_token = sha1($usec . $sec . rand(0, 999999999));
+       set_config('facebook', 'cb_verify_token', $verify_token);
+       
+       $cb = $a->get_baseurl() . '/facebook/?realtime_cb=1';
+       
+       $j = post_url($url,array(
+               "object" => "user",
+               "fields" => "feed,friends",
+               "callback_url" => $cb,
+               "verify_token" => $verify_token,
+       ));
+       del_config('facebook', 'cb_verify_token');
+       
+       if ($j) {
+               $x = json_decode($j);
+               logger("Facebook reponse: " . $j, LOGGER_DATA);
+               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);
+               }
+       };
+}
+
+function facebook_subscriptions_get() {
+       
+       $access_token = fb_get_app_access_token();
+       if (!$access_token) return null;
+       
+       $url = "https://graph.facebook.com/" . get_config('facebook', 'appid'  ) . "/subscriptions?access_token=" . $access_token;
+       $j = fetch_url($url);
+       $ret = null;
+       if ($j) {
+               $x = json_decode($j);
+               if (isset($x->data)) $ret = $x->data;
+       }
+       return $ret;
+}
+
+
+function facebook_check_realtime_active() {
+       $ret = facebook_subscriptions_get();
+       if (is_null($ret)) return false;
+       if (is_array($ret)) foreach ($ret as $re) if (is_object($re) && $re->object == "user") return true;
+       return false;
+}
+
+
+
+
+// DELETE-request to $url
+
+if(! function_exists('facebook_delete_url')) {
+function facebook_delete_url($url,$headers = null, &$redirects = 0, $timeout = 0) {
+       $a = get_app();
+       $ch = curl_init($url);
+       if(($redirects > 8) || (! $ch)) 
+               return false;
+
+       curl_setopt($ch, CURLOPT_HEADER, true);
+       curl_setopt($ch, CURLOPT_RETURNTRANSFER,true);
+       curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE");
+       curl_setopt($ch, CURLOPT_USERAGENT, "Friendica");
+
+       if(intval($timeout)) {
+               curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
+       }
+       else {
+               $curl_time = intval(get_config('system','curl_timeout'));
+               curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60));
+       }
+
+       if(defined('LIGHTTPD')) {
+               if(!is_array($headers)) {
+                       $headers = array('Expect:');
+               } else {
+                       if(!in_array('Expect:', $headers)) {
+                               array_push($headers, 'Expect:');
+                       }
+               }
+       }
+       if($headers)
+               curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+
+       $check_cert = get_config('system','verifyssl');
+       curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
+       $prx = get_config('system','proxy');
+       if(strlen($prx)) {
+               curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1);
+               curl_setopt($ch, CURLOPT_PROXY, $prx);
+               $prxusr = get_config('system','proxyuser');
+               if(strlen($prxusr))
+                       curl_setopt($ch, CURLOPT_PROXYUSERPWD, $prxusr);
+       }
+
+       $a->set_curl_code(0);
+
+       // don't let curl abort the entire application
+       // if it throws any errors.
+
+       $s = @curl_exec($ch);
+
+       $base = $s;
+       $curl_info = curl_getinfo($ch);
+       $http_code = $curl_info['http_code'];
+
+       $header = '';
+
+       // Pull out multiple headers, e.g. proxy and continuation headers
+       // allow for HTTP/2.x without fixing code
+
+       while(preg_match('/^HTTP\/[1-2].+? [1-5][0-9][0-9]/',$base)) {
+               $chunk = substr($base,0,strpos($base,"\r\n\r\n")+4);
+               $header .= $chunk;
+               $base = substr($base,strlen($chunk));
+       }
+
+       if($http_code == 301 || $http_code == 302 || $http_code == 303) {
+        $matches = array();
+        preg_match('/(Location:|URI:)(.*?)\n/', $header, $matches);
+        $url = trim(array_pop($matches));
+        $url_parsed = @parse_url($url);
+        if (isset($url_parsed)) {
+            $redirects++;
+            return delete_url($url,$headers,$redirects,$timeout);
+        }
+    }
+       $a->set_curl_code($http_code);
+       $body = substr($s,strlen($header));
+
+       $a->set_curl_headers($header);
+
+       curl_close($ch);
+       return($body);
+}}