Additional work for PR 3778

[friendica-addons.git] / gpluspost / gpluspost.php

diff --git a/gpluspost/gpluspost.php b/gpluspost/gpluspost.php
index ab0d07e8e4f2954fe0cd18b6b93b1daeb37bc52f..c8918e1cc73eb7632f6345407f938b98195a132a 100644 (file)
--- a/gpluspost/gpluspost.php
+++ b/gpluspost/gpluspost.php
@@ -5,6 +5,7 @@
  * Description: Posts to a Google+ page with the help of Hootsuite
  * Version: 0.1
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
+ * Status: Unsupported
  */
 
 function gpluspost_install() {
@@ -97,8 +98,8 @@ function gpluspost_settings(&$a,&$s) {
        if (gpluspost_nextscripts()) {
                /*
                // To-Do: Option to check the credentials if requested
-               if (($username != "") AND ($password != "")) {
-                       require_once("addon/googleplus/postToGooglePlus.php");
+               if (($username != "") && ($password != "")) {
+                       require_once("addon/gpluspost/postToGooglePlus.php");
                        $loginError = doConnectToGooglePlus2($username, $password);
                        if ($loginError)
                                $s .= '<p>Login Error. Please enter the correct credentials.</p>';
@@ -182,6 +183,9 @@ function gpluspost_settings_post(&$a,&$b) {
                        set_pconfig(local_user(),'fromgplus','account',trim($_POST['fromgplus-account']));
                        $enable = ((x($_POST,'fromgplus-enable')) ? intval($_POST['fromgplus-enable']) : 0);
                        set_pconfig(local_user(),'fromgplus','enable', $enable);
+
+                       if (!$enable)
+                               del_pconfig(local_user(),'fromgplus','lastdate');
                }
        }
 }
@@ -227,27 +231,28 @@ function gpluspost_send(&$a,&$b) {
                return;
 
        // if post comes from Google+ don't send it back
-       if (!get_pconfig($b["uid"],'gpluspost','no_loop_prevention') and ($b['app'] == "Google+"))
+       if (!get_pconfig($b["uid"],'gpluspost','no_loop_prevention') && (($b['app'] == "Google+") || ($b["extid"] == NETWORK_GPLUS)))
                return;
 
-       // Always do the export via RSS-Feed (even if NextScripts is enabled), since it doesn't hurt
-       $itemlist = get_pconfig($b["uid"],'gpluspost','itemlist');
-       $items = explode(",", $itemlist);
+       if (!gpluspost_nextscripts()) {
+               // Posting via RSS-Feed and Hootsuite
+               $itemlist = get_pconfig($b["uid"],'gpluspost','itemlist');
+               $items = explode(",", $itemlist);
 
-       $i = 0;
-       $newitems = array($b['id']);
-       foreach ($items AS $item)
-               if ($i++ < 9)
-                       $newitems[] = $item;
+               $i = 0;
+               $newitems = array($b['id']);
+               foreach ($items AS $item)
+                       if ($i++ < 9)
+                               $newitems[] = $item;
 
-       $itemlist = implode(",", $newitems);
+               $itemlist = implode(",", $newitems);
 
-       logger('gpluspost_send: new itemlist: '.$itemlist." for uid ".$b["uid"]);
+               logger('gpluspost_send: new itemlist: '.$itemlist." for uid ".$b["uid"]);
 
-       set_pconfig($b["uid"],'gpluspost','itemlist', $itemlist);
+               set_pconfig($b["uid"],'gpluspost','itemlist', $itemlist);
 
-       // Posting via NextScripts
-       if (gpluspost_nextscripts()) {
+       } else {
+               // Posting via NextScripts
                $username = get_pconfig($b['uid'],'gpluspost','username');
                $password = get_pconfig($b['uid'],'gpluspost','password');
                $page = get_pconfig($b['uid'],'gpluspost','page');
@@ -268,7 +273,7 @@ function gpluspost_send(&$a,&$b) {
                        $item["body"] = preg_replace("(\[i\](.*?)\[\/i\])ism",'_$1_',$item["body"]);
                        $item["body"] = preg_replace("(\[s\](.*?)\[\/s\])ism",'-$1-',$item["body"]);
 
-                       $data = plaintext($a, $item, 0, false);
+                       $data = plaintext($a, $item, 0, false, 9);
 
                        logger('gpluspost_send: data: '.print_r($data, true), LOGGER_DEBUG);
 
@@ -326,7 +331,7 @@ function gpluspost_queue_hook(&$a,&$b) {
 
                logger('gpluspost_queue: run');
 
-               $r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` on `contact`.`uid` = `user`.`uid` 
+               $r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` on `contact`.`uid` = `user`.`uid`
                        WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1",
                        intval($x['cid'])
                );
@@ -344,7 +349,7 @@ function gpluspost_queue_hook(&$a,&$b) {
                $success = false;
 
                if($username && $password) {
-                       require_once("addon/googleplus/postToGooglePlus.php");
+                       require_once("addon/gpluspost/postToGooglePlus.php");
 
                        logger('gpluspost_queue: able to post for user '.$username);
 
@@ -429,7 +434,7 @@ function gpluspost_init() {
                foreach ($items AS $item)
                        gpluspost_feeditem($item, $uid);
        } else {
-               $items = q("SELECT `id` FROM `item` FORCE INDEX (`received`) WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `item`.`id` = `item`.`parent` ORDER BY `received` DESC LIMIT 10");
+               $items = q("SELECT `id` FROM `item` WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `item`.`id` = `item`.`parent` ORDER BY `received` DESC LIMIT 10");
                foreach ($items AS $item)
                        gpluspost_feeditem($item["id"], $uid);
        }
@@ -522,7 +527,7 @@ function gpluspost_feeditem($pid, $uid) {
                else if ($image != "")
                        $msglink = $image;
 
-               if (($msglink == "") AND $skipwithoutlink)
+               if (($msglink == "") && $skipwithoutlink)
                        continue;
                else if ($msglink == "")
                        $msglink = $item["plink"];