Issue 3873

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

diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php
index b0e5e122a6f495f6053bead165351524b69b027e..ddd517e2603bcd333a965172a33fd6d0e2698597 100644 (file)
--- a/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@@ -9,6 +9,8 @@
 require_once("mod/item.php");
 require_once("include/items.php");
 
+use Friendica\Core\PConfig;
+
 function ifttt_install() {
        register_hook('connector_settings',     'addon/ifttt/ifttt.php', 'ifttt_settings');
        register_hook('connector_settings_post','addon/ifttt/ifttt.php', 'ifttt_settings_post');
@@ -30,11 +32,11 @@ function ifttt_settings(&$a,&$s) {
         if(! local_user())
                 return;
 
-        $key = get_pconfig(local_user(),'ifttt','key');
+        $key = PConfig::get(local_user(),'ifttt','key');
 
        if (!$key) {
                $key = substr(random_string(),0,20);
-               set_pconfig(local_user(),'ifttt','key', $key);
+               PConfig::set(local_user(),'ifttt','key', $key);
        }
 
        $s .= '<span id="settings_ifttt_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_ifttt_expanded\'); openClose(\'settings_ifttt_inflated\');">';
@@ -48,7 +50,7 @@ function ifttt_settings(&$a,&$s) {
         $s .= '<div id="ifttt-configuration-wrapper">';
        $s .= '<p>'.t("Create an account at <a href='http://www.ifttt.com'>IFTTT</a>. Create three Facebook recipes that are connected with <a href='https://ifttt.com/maker'>Maker</a> (In the form 'if Facebook then Maker') with the following parameters:").'</p>';
        $s .= '<h4>URL</h4>';
-       $s .= '<p>'.$a->get_baseurl()."/ifttt/".'</p>';
+       $s .= '<p>' . $a->get_baseurl() . '/ifttt/' . $a->user['nickname'] . '</p>';
        $s .= '<h4>Method</h4>';
        $s .= '<p>POST</p>';
        $s .= '<h4>Content Type</h4>';
@@ -102,7 +104,7 @@ function ifttt_post(&$a) {
        $key = $_REQUEST["key"];
 
        // Check the key
-        if ($key != get_pconfig($uid,'ifttt','key')) {
+        if ($key != PConfig::get($uid,'ifttt','key')) {
                logger("Invalid key for user ".$uid, LOGGER_DEBUG);
                return;
        }
@@ -132,7 +134,7 @@ function ifttt_post(&$a) {
        if (isset($_REQUEST["url"]))
                $item["url"] = trim($_REQUEST["url"]);
 
-       if ((substr($item["msg"], 0, 3) == "<<<") AND (substr($item["msg"], -3, 3) == ">>>"))
+       if ((substr($item["msg"], 0, 3) == "<<<") && (substr($item["msg"], -3, 3) == ">>>"))
                $item["msg"] = substr($item["msg"], 3, -3);
 
        ifttt_message($uid, $item);
@@ -155,23 +157,25 @@ function ifttt_message($uid, $item) {
        //$_REQUEST["date"] = $item["date"];
        //$_REQUEST["uri"] = $item["url"];
 
-       if (strstr($item["url"], "facebook.com"))
+       if (strstr($item["url"], "facebook.com")) {
+               $hash = hash("ripemd128", item["url"]);
                $_REQUEST["extid"] = NETWORK_FACEBOOK;
+               $_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_FACEBOOK.":".$hash);
+       }
 
        if ($item["type"] == "link") {
                $data = query_page_info($item["link"]);
 
-               if (isset($item["title"]) AND (trim($item["title"]) != ""))
+               if (isset($item["title"]) && (trim($item["title"]) != ""))
                        $data["title"] = $item["title"];
 
-               if (isset($item["description"]) AND (trim($item["description"]) != ""))
+               if (isset($item["description"]) && (trim($item["description"]) != ""))
                        $data["text"] = $item["description"];
 
                $_REQUEST["body"] .=  add_page_info_data($data);
-       } elseif (($item["type"] == "photo") AND ($item["image"] != ""))
+       } elseif (($item["type"] == "photo") && ($item["image"] != ""))
                $_REQUEST["body"] .= "\n\n[img]".$item["image"]."[/img]\n";
 
        //print_r($_REQUEST);
        item_post($a);
 }
-?>