fbpost: Posting to groups enabled

twitter/statusnet: Bug fixed where messages were shortened too much.

diff --git a/fbpost/fbpost.php b/fbpost/fbpost.php
index 0131132055cb17c7660075ab78d2bf78415a9006..8c45d004b89e1c8a8c87d1b1ce5ce1992fa041ea 100644 (file)
--- a/fbpost/fbpost.php
+++ b/fbpost/fbpost.php
@@ -209,7 +209,7 @@ function fbpost_content(&$a) {
                $o .= '<div id="fbpost-enable-wrapper">';
 
                $o .= '<a href="https://www.facebook.com/dialog/oauth?client_id=' . $appid . '&redirect_uri=' 
-                       . $a->get_baseurl() . '/fbpost/' . $a->user['nickname'] . '&scope=publish_stream,manage_pages,offline_access">' . t('Install Facebook Post connector for this account.') . '</a>';
+                       . $a->get_baseurl() . '/fbpost/' . $a->user['nickname'] . '&scope=publish_stream,manage_pages,user_groups,friends_groups,offline_access">' . t('Install Facebook Post connector for this account.') . '</a>';
                $o .= '</div>';
        }
 
@@ -221,7 +221,7 @@ function fbpost_content(&$a) {
                $o .= '<div id="fbpost-enable-wrapper">';
 
                $o .= '<a href="https://www.facebook.com/dialog/oauth?client_id=' . $appid . '&redirect_uri=' 
-                       . $a->get_baseurl() . '/fbpost/' . $a->user['nickname'] . '&scope=publish_stream,manage_pages,offline_access">' . t('Re-authenticate [This is necessary whenever your Facebook password is changed.]') . '</a>';
+                       . $a->get_baseurl() . '/fbpost/' . $a->user['nickname'] . '&scope=publish_stream,manage_pages,user_groups,friends_groups,offline_access">' . t('Re-authenticate [This is necessary whenever your Facebook password is changed.]') . '</a>';
                $o .= '</div>';
 
                $o .= '<div id="fbpost-post-default-form">';
@@ -242,7 +242,7 @@ function fbpost_content(&$a) {
                $x = file_get_contents($url."?access_token=".$fb_token);
                $accounts = json_decode($x);
 
-               $o .= t("Post to page:")."<select name='post_to_page'>";
+               $o .= t("Post to page/group:")."<select name='post_to_page'>";
                if (intval($post_to_page) == 0)
                        $o .= "<option value='0-0' selected>".t('None')."</option>";
                else
@@ -255,6 +255,18 @@ function fbpost_content(&$a) {
                                else
                                        $o .= "<option value='".$account->id."-".$account->access_token."'>".$account->name."</option>";
                }
+
+               $url = 'https://graph.facebook.com/me/groups';
+               $x = file_get_contents($url."?access_token=".$fb_token);
+               $groups = json_decode($x);
+
+               foreach($groups->data as $group) {
+                       if ($post_to_page == $group->id)
+                               $o .= "<option value='".$group->id."-0' selected>".$group->name."</option>";
+                       else
+                               $o .= "<option value='".$group->id."-0'>".$group->name."</option>";
+               }
+
                $o .= "</select>";
 
                $o .= '<p><input type="submit" name="submit" value="' . t('Submit') . '" /></form></div>';
@@ -661,7 +673,7 @@ function fbpost_post_hook(&$a,&$b) {
                                }
 
                                // Post to page?
-                               if (!$reply and $target != "me")
+                               if (!$reply and ($target != "me") and $page_access_token)
                                        $postvars['access_token'] = $page_access_token;
 
                                logger('facebook: post to ' . $url);

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index bdbb4d4ac928e6437e69519917c097b4cf64a962..3bbe417163bc88b742a7c2f921d20c96dee16c21 100755 (executable)
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -495,7 +495,7 @@ function statusnet_shortenmsg($b, $max_char) {
                $msg = substr($msg, 0, -1);
                $pos = strrpos($msg, "\n");
                if ($pos > 0)
-                       $msg = substr($msg, 0, $pos-1);
+                       $msg = substr($msg, 0, $pos);
                else if ($lastchar != "\n")
                        $msg = substr($msg, 0, -3)."...";
        }

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 3fcaa1de33517e47d67fc3334e49a42cf073b9ca..6a93d9f15303c059c6928d0e14b0b193285afc60 100755 (executable)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -354,7 +354,7 @@ function twitter_shortenmsg($b) {
                $msg = substr($msg, 0, -1);
                $pos = strrpos($msg, "\n");
                if ($pos > 0)
-                       $msg = substr($msg, 0, $pos-1);
+                       $msg = substr($msg, 0, $pos);
                else if ($lastchar != "\n")
                        $msg = substr($msg, 0, -3)."...";
        }