if(intval($statusnet_post) == 1) {
$statusnet_defpost = get_pconfig(local_user(),'statusnet','post_by_default');
$selected = ((intval($statusnet_defpost) == 1) ? ' checked="checked" ' : '');
- $b .= '<div class="profile-jot-net"><input type="checkbox" name="statusnet_enable"' . $selected . ' value="1" /> '
+ $b .= '<div class="profile-jot-net"><input type="checkbox" name="statusnet_enable"' . $selected . ' value="1" /> '
. t('Post to GNU Social') . '</div>';
}
}
$s .= '<label id="statusnet-disconnect-label" for="statusnet-disconnect">'. t('Clear OAuth configuration') .'</label>';
$s .= '<input id="statusnet-disconnect" type="checkbox" name="statusnet-disconnect" value="1" />';
$s .= '</div><div class="clear"></div>';
- $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
+ $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
}
}
$s .= '</div><div class="clear"></div>';
// Looking if its a reply to a GNU Social post
$hostlength = strlen($hostname) + 2;
- if ((substr($b["parent-uri"], 0, $hostlength) != $hostname."::") AND (substr($b["extid"], 0, $hostlength) != $hostname."::")
- AND (substr($b["thr-parent"], 0, $hostlength) != $hostname."::")) {
+ if ((substr($b["parent-uri"], 0, $hostlength) != $hostname."::") && (substr($b["extid"], 0, $hostlength) != $hostname."::")
+ && (substr($b["thr-parent"], 0, $hostlength) != $hostname."::")) {
logger("statusnet_post_hook: no GNU Social post ".$b["parent"]);
return;
}
$nicknameplain = "@".$nick;
logger("statusnet_post_hook: comparing ".$nickname." and ".$nicknameplain." with ".$b["body"], LOGGER_DEBUG);
- if ((strpos($b["body"], $nickname) === false) AND (strpos($b["body"], $nicknameplain) === false))
+ if ((strpos($b["body"], $nickname) === false) && (strpos($b["body"], $nicknameplain) === false))
$b["body"] = $nickname." ".$b["body"];
logger("statusnet_post_hook: parent found ".print_r($orig_post, true), LOGGER_DEBUG);
} else {
$iscomment = false;
- if($b['private'] OR !strstr($b['postopts'],'statusnet'))
+ if($b['private'] || !strstr($b['postopts'],'statusnet'))
return;
}
- if (($b['verb'] == ACTIVITY_POST) AND $b['deleted'])
+ if (($b['verb'] == ACTIVITY_POST) && $b['deleted'])
statusnet_action($a, $b["uid"], substr($orig_post["uri"], $hostlength), "delete");
if($b['verb'] == ACTIVITY_LIKE) {
$msgarr = plaintext($a, $b, $max_char, true, 7);
$msg = $msgarr["text"];
- if (($msg == "") AND isset($msgarr["title"]))
+ if (($msg == "") && isset($msgarr["title"]))
$msg = shortenmsg($msgarr["title"], $max_char - 50);
$image = "";
- if (isset($msgarr["url"]) AND ($msgarr["type"] != "photo")) {
- if ((strlen($msgarr["url"]) > 20) AND
+ if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {
+ if ((strlen($msgarr["url"]) > 20) &&
((strlen($msg." \n".$msgarr["url"]) > $max_char)))
$msg .= " \n".short_link($msgarr["url"]);
else
$msg .= " \n".$msgarr["url"];
- } elseif (isset($msgarr["image"]) AND ($msgarr["type"] != "video"))
+ } elseif (isset($msgarr["image"]) && ($msgarr["type"] != "video"))
$image = $msgarr["image"];
if ($image != "") {
$nickname = "@[url=".$orig_post["author-link"]."]".$nick."[/url]";
$nicknameplain = "@".$nick;
- if ((strpos($item["body"], $nickname) === false) AND (strpos($item["body"], $nicknameplain) === false))
+ if ((strpos($item["body"], $nickname) === false) && (strpos($item["body"], $nicknameplain) === false))
$item["body"] = $nickname." ".$item["body"];
}
$msgarr = plaintext($a, $item, $max_char, true, 7);
$msg = $msgarr["text"];
- if (isset($msgarr["url"]) AND ($msgarr["type"] != "photo"))
+ if (isset($msgarr["url"]) && ($msgarr["type"] != "photo"))
$msg .= " ".$msgarr["url"];
if (isset($msgarr["image"]))
$_REQUEST["source"] = $post->source;
$_REQUEST["extid"] = NETWORK_STATUSNET;
+ if (isset($post->id)) {
+ $_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_STATUSNET.":".$post->id);
+ }
+
//$_REQUEST["date"] = $post->created_at;
$_REQUEST["title"] = "";
if ($contact->statusnet_profile_url == "")
return(-1);
- if (function_exists("update_gcontact"))
- update_gcontact(array("url" => $contact->statusnet_profile_url,
- "network" => NETWORK_STATUSNET, "photo" => $contact->profile_image_url,
- "name" => $contact->name, "nick" => $contact->screen_name,
- "location" => $contact->location, "about" => $contact->description,
- "addr" => statusnet_address($contact), "generation" => 3));
- else {
- // Old Code
- $r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
- dbesc(normalise_link($contact->statusnet_profile_url)));
-
- if (count($r) == 0)
- q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')",
- dbesc(normalise_link($contact->statusnet_profile_url)),
- dbesc($contact->name),
- dbesc($contact->screen_name),
- dbesc($contact->profile_image_url));
- else
- q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'",
- dbesc($contact->name),
- dbesc($contact->screen_name),
- dbesc($contact->profile_image_url),
- dbesc(normalise_link($contact->statusnet_profile_url)));
-
- if (DB_UPDATE_VERSION >= "1177")
- q("UPDATE `unique_contacts` SET `location` = '%s', `about` = '%s' WHERE url = '%s'",
- dbesc($contact->location),
- dbesc($contact->description),
- dbesc(normalise_link($contact->statusnet_profile_url)));
- }
+ update_gcontact(array("url" => $contact->statusnet_profile_url,
+ "network" => NETWORK_STATUSNET, "photo" => $contact->profile_image_url,
+ "name" => $contact->name, "nick" => $contact->screen_name,
+ "location" => $contact->location, "about" => $contact->description,
+ "addr" => statusnet_address($contact), "generation" => 3));
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' AND `network` = '%s'LIMIT 1",
intval($uid), dbesc(normalise_link($contact->statusnet_profile_url)), dbesc(NETWORK_STATUSNET));
- if(!count($r) AND !$create_user)
+ if(!count($r) && !$create_user)
return(0);
- if (count($r) AND ($r[0]["readonly"] OR $r[0]["blocked"])) {
+ if (count($r) && ($r[0]["readonly"] || $r[0]["blocked"])) {
logger("statusnet_fetch_contact: Contact '".$r[0]["nick"]."' is blocked or readonly.", LOGGER_DEBUG);
return(-1);
}
// create contact record
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 ) ",
+ `location`, `about`, `writable`, `blocked`, `readonly`, `pending` )
+ VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0 ) ",
intval($uid),
dbesc(datetime_convert()),
dbesc($contact->statusnet_profile_url),
dbesc(NETWORK_STATUSNET),
intval(CONTACT_IS_FRIEND),
intval(1),
+ dbesc($contact->location),
+ dbesc($contact->description),
intval(1)
);
dbesc(datetime_convert()),
intval($contact_id)
);
-
- if (DB_UPDATE_VERSION >= "1177")
- q("UPDATE `contact` SET `location` = '%s',
- `about` = '%s'
- WHERE `id` = %d",
- dbesc($contact->location),
- dbesc($contact->description),
- intval($contact_id)
- );
-
} else {
// update profile photos once every two weeks as we have no notification of when they change.
`nurl` = '%s',
`addr` = '%s',
`name` = '%s',
- `nick` = '%s'
+ `nick` = '%s',
+ `location` = '%s',
+ `about` = '%s'
WHERE `id` = %d",
dbesc($photos[0]),
dbesc($photos[1]),
dbesc(statusnet_address($contact)),
dbesc($contact->name),
dbesc($contact->screen_name),
+ dbesc($contact->location),
+ dbesc($contact->description),
intval($r[0]['id'])
);
-
- if (DB_UPDATE_VERSION >= "1177")
- q("UPDATE `contact` SET `location` = '%s',
- `about` = '%s'
- WHERE `id` = %d",
- dbesc($contact->location),
- dbesc($contact->description),
- intval($r[0]['id'])
- );
}
}
$postarray['owner-link'] = $post->user->statusnet_profile_url;
$postarray['owner-avatar'] = $post->user->profile_image_url;
}
- if(($contactid == 0) AND !$only_existing_contact)
+ if(($contactid == 0) && !$only_existing_contact)
$contactid = $self['id'];
elseif ($contactid <= 0)
return(array());
foreach($myconv as $conv) {
// now if we find a match, it means we're in this conversation
- if(!link_compare($conv['author-link'],$user[0]["url"]) AND !link_compare($conv['author-link'],$own_user[0]["url"]))
+ if(!link_compare($conv['author-link'],$user[0]["url"]) && !link_compare($conv['author-link'],$own_user[0]["url"]))
continue;
require_once('include/enotify.php');
$items = $connection->get('statuses/home_timeline', $parameters);
if (!is_array($items)) {
- if (is_object($items) AND isset($items->error))
+ if (is_object($items) && isset($items->error))
$errormsg = $items->error;
elseif (is_object($items))
$errormsg = print_r($items, true);
- elseif (is_string($items) OR is_float($items) OR is_int($items))
+ elseif (is_string($items) || is_float($items) || is_int($items))
$errormsg = $items;
else
$errormsg = "Unknown error";
logger('statusnet_fetchhometimeline: User '.$self["nick"].' posted home timeline item '.$item);
- if ($item AND !function_exists("check_item_notification"))
+ if ($item && !function_exists("check_item_notification"))
statusnet_checknotification($a, $uid, $nick, $item, $postarray);
}
logger('statusnet_fetchhometimeline: User '.$self["nick"].' posted mention timeline item '.$item);
- if ($item AND function_exists("check_item_notification"))
+ if ($item && function_exists("check_item_notification"))
check_item_notification($item, $uid, NOTIFY_TAGSELF);
}
}
$parent_id = $r[0]['parent'];
}
- if (($item != 0) AND !function_exists("check_item_notification")) {
+ if (($item != 0) && !function_exists("check_item_notification")) {
require_once('include/enotify.php');
notification(array(
'type' => NOTIFY_TAGSELF,
logger('statusnet_complete_conversation: User '.$self["nick"].' posted home timeline item '.$item);
- if ($item AND !function_exists("check_item_notification"))
+ if ($item && !function_exists("check_item_notification"))
statusnet_checknotification($a, $uid, $nick, $item, $postarray);
}
}
$footerlink = "[url=".$expanded_url."]".$expanded_url."[/url]";
$body = str_replace($search, $footerlink, $body);
- } elseif (($oembed_data->type == "photo") AND isset($oembed_data->url) AND !$dontincludemedia)
+ } elseif (($oembed_data->type == "photo") && isset($oembed_data->url) && !$dontincludemedia)
$body = str_replace($search, "[url=".$expanded_url."][img]".$oembed_data->url."[/img][/url]", $body);
elseif ($oembed_data->type != "link")
$body = str_replace($search, "[url=".$expanded_url."]".$expanded_url."[/url]", $body);
if ($footerurl != "")
$footer = add_page_info($footerurl);
- if (($footerlink != "") AND (trim($footer) != "")) {
+ if (($footerlink != "") && (trim($footer) != "")) {
$removedlink = trim(str_replace($footerlink, "", $body));
- if (($removedlink == "") OR strstr($body, $removedlink))
+ if (($removedlink == "") || strstr($body, $removedlink))
$body = $removedlink;
$body .= $footer;
projects / friendica-addons.git / blobdiff