use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
use Friendica\Object\Image;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
+use Friendica\Model\Item;
require_once 'mod/share.php';
require_once 'mod/parse_url.php';
function fromgplus_addon_settings_post(&$a,&$b) {
- if(! local_user())
+ if (!local_user())
return;
- if($_POST['fromgplus-submit']) {
+ if (!empty($_POST['fromgplus-submit'])) {
PConfig::set(local_user(),'fromgplus','account',trim($_POST['fromgplus-account']));
- $enable = ((x($_POST,'fromgplus-enable')) ? intval($_POST['fromgplus-enable']) : 0);
+ $enable = (x($_POST,'fromgplus-enable') ? intval($_POST['fromgplus-enable']) : 0);
PConfig::set(local_user(),'fromgplus','enable', $enable);
- $keywords = ((x($_POST, 'fromgplus-keywords')) ? intval($_POST['fromgplus-keywords']) : 0);
+ $keywords = (x($_POST, 'fromgplus-keywords') ? intval($_POST['fromgplus-keywords']) : 0);
PConfig::set(local_user(),'fromgplus', 'keywords', $keywords);
if (!$enable)
$o = replace_macros($t, [
'$submit' => L10n::t('Save Settings'),
- '$key' => ['key', L10n::t('Key'), trim(Config::get('fromgplus', 'key')), L10n::t('')],
+ '$key' => ['key', L10n::t('Key'), trim(Config::get('fromgplus', 'key')), ''],
]);
}
$_SESSION['uid'] = $uid;
unset($_REQUEST);
- $_REQUEST['type'] = 'wall';
$_REQUEST['api_source'] = true;
$_REQUEST['profile_uid'] = $uid;
$_REQUEST['source'] = $source;
- $_REQUEST['extid'] = NETWORK_GPLUS;
+ $_REQUEST['extid'] = Protocol::GPLUS;
if (isset($id)) {
- $_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_GPLUS.':'.$id);
+ $_REQUEST['message_id'] = Item::newURI($uid, Protocol::GPLUS.':'.$id);
}
// $_REQUEST['verb']
foreach($var as $val) {
$x = explode('=', $val);
- $arr[$x[0]] = $x[1];
+ if (count($x) > 1) {
+ $arr[$x[0]] = $x[1];
+ }
}
unset($val, $x, $var);
return $arr;
$cleaned = [];
$queryvar = fromgplus_parse_query($fullImage);
- if ($queryvar['url'] != "")
+ if (!empty($queryvar['url']))
$cleaned["full"] = urldecode($queryvar['url']);
else
$cleaned["full"] = $fullImage;
$cleaned["full"] = "";
$queryvar = fromgplus_parse_query($image);
- if ($queryvar['url'] != "")
+ if (!empty($queryvar['url']))
$cleaned["preview"] = urldecode($queryvar['url']);
else
$cleaned["preview"] = $image;
if (@exif_imagetype($cleaned["preview"]) == 0)
$cleaned["preview"] = "";
- if ($cleaned["full"] == "") {
+ if (empty($cleaned["full"])) {
$cleaned["full"] = $cleaned["preview"];
$cleaned["preview"] = "";
}
- if ($cleaned["full"] != "")
+ if (!empty($cleaned["full"]))
$infoFull = Image::getInfoFromURL($cleaned["full"]);
else
$infoFull = ["0" => 0, "1" => 0];
- if ($cleaned["preview"] != "")
+ if (!empty($cleaned["preview"]))
$infoPreview = Image::getInfoFromURL($cleaned["preview"]);
else
- $infoFull = ["0" => 0, "1" => 0];
+ $infoPreview = ["0" => 0, "1" => 0];
if (($infoPreview[0] >= $infoFull[0]) && ($infoPreview[1] >= $infoFull[1])) {
$temp = $cleaned["full"];
}
function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
- require_once("include/items.php");
- require_once("include/network.php");
+ require_once 'include/items.php';
$post = "";
$quote = "";
switch($attachment->objectType) {
case "video":
$pagedata["type"] = "video";
- $pagedata["url"] = original_url($attachment->url);
+ $pagedata["url"] = Network::finalUrl($attachment->url);
$pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
break;
case "article":
$pagedata["type"] = "link";
- $pagedata["url"] = original_url($attachment->url);
+ $pagedata["url"] = Network::finalUrl($attachment->url);
$pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
$images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
if ($images["full"] != "")
$pagedata["images"][0]["src"] = $images["full"];
- $quote = trim(fromgplus_html2bbcode($attachment->content));
+ if (!empty($attachment->content)) {
+ $quote = trim(fromgplus_html2bbcode($attachment->content));
+ }
- if ($quote != "")
+ if (!empty($quote)) {
$pagedata["text"] = $quote;
+ }
// Add Keywords to page link
$data = parseurl_getsiteinfo_cached($pagedata["url"], true);
}
}
- if ($images["preview"] != "") {
+ if (!empty($images["preview"])) {
$post .= "\n[url=".$images["page"]."][img]".$images["preview"]."[/img][/url]\n";
$pagedata["images"][0]["src"] = $images["preview"];
$pagedata["url"] = $images["page"];
- } elseif ($images["full"] != "") {
+ } elseif (!empty($images["full"])) {
$post .= "\n[img]".$images["full"]."[/img]\n";
$pagedata["images"][0]["src"] = $images["full"];
break;
case "photo-album":
- $pagedata["url"] = original_url($attachment->url);
+ $pagedata["url"] = Network::finalUrl($attachment->url);
$pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
$post .= "\n\n[bookmark=".$pagedata["url"]."]".$pagedata["title"]."[/bookmark]\n";
case "album":
$pagedata["type"] = "link";
- $pagedata["url"] = original_url($attachment->url);
+ $pagedata["url"] = Network::finalUrl($attachment->url);
$pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
$thumb = $attachment->thumbnails[0];
break;
case "audio":
- $pagedata["url"] = original_url($attachment->url);
+ $pagedata["url"] = Network::finalUrl($attachment->url);
$pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
$post .= "\n\n[bookmark=".$pagedata["url"]."]".$pagedata["title"]."[/bookmark]\n";
break;
$account = PConfig::get($uid,'fromgplus','account');
$key = Config::get('fromgplus','key');
- $result = fetch_url("https://www.googleapis.com/plus/v1/people/".$account."/activities/public?alt=json&pp=1&key=".$key."&maxResults=".$maxfetch);
+ $result = Network::fetchUrl("https://www.googleapis.com/plus/v1/people/".$account."/activities/public?alt=json&pp=1&key=".$key."&maxResults=".$maxfetch);
//$result = file_get_contents("google.txt");
//file_put_contents("google.txt", $result);
$lastdate = 0;
- if (!is_array($activities->items))
+ if (empty($activities->items))
return;
$reversed = array_reverse($activities->items);
if (function_exists("share_header"))
$post .= share_header($item->object->actor->displayName, $item->object->actor->url,
$item->object->actor->image->url, "",
- datetime_convert('UTC','UTC',$item->object->published),$item->object->url);
+ DateTimeFormat::utc($item->object->published),$item->object->url);
else
$post .= "[share author='".str_replace("'", "'",$item->object->actor->displayName).
"' profile='".$item->object->actor->url.
"' avatar='".$item->object->actor->image->url.
- "' posted='".datetime_convert('UTC','UTC',$item->object->published).
+ "' posted='".DateTimeFormat::utc($item->object->published).
"' link='".$item->object->url."']";
$post .= fromgplus_html2bbcode($item->object->content);