X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=fromgplus%2Ffromgplus.php;h=860438d88afaed02126f90b68d2000c3ed91fcef;hb=074493a29eff22bb38275ea5c4c958dfea156056;hp=36791310dd438ea94e11f29ac7451fc62dbd17e1;hpb=ca3c45101e7d1faac2f19dea1f49fe4300fdd04e;p=friendica-addons.git diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php index 36791310..860438d8 100644 --- a/fromgplus/fromgplus.php +++ b/fromgplus/fromgplus.php @@ -12,9 +12,14 @@ define('FROMGPLUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\L10n; +use Friendica\Core\Logger; use Friendica\Core\PConfig; +use Friendica\Core\Protocol; +use Friendica\Core\Renderer; 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'; @@ -79,14 +84,14 @@ class="settings-submit" value="' . L10n::t('Save Settings') . '" />'; 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) @@ -98,11 +103,11 @@ function fromgplus_addon_settings_post(&$a,&$b) { function fromgplus_addon_admin(&$a, &$o) { - $t = get_markup_template("admin.tpl", "addon/fromgplus/"); + $t = Renderer::getMarkupTemplate("admin.tpl", "addon/fromgplus/"); - $o = replace_macros($t, [ + $o = Renderer::replaceMacros($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')), ''], ]); } @@ -123,25 +128,25 @@ function fromgplus_cron($a,$b) { if($last) { $next = $last + ($poll_interval * 60); if($next > time()) { - logger('fromgplus: poll intervall not reached'); + Logger::log('fromgplus: poll intervall not reached'); return; } } - logger('fromgplus: cron_start'); + Logger::log('fromgplus: cron_start'); $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'fromgplus' AND `k` = 'enable' AND `v` = '1' ORDER BY RAND() "); if(count($r)) { foreach($r as $rr) { $account = PConfig::get($rr['uid'],'fromgplus','account'); if ($account) { - logger('fromgplus: fetching for user '.$rr['uid']); + Logger::log('fromgplus: fetching for user '.$rr['uid']); fromgplus_fetch($a, $rr['uid']); } } } - logger('fromgplus: cron_end'); + Logger::log('fromgplus: cron_end'); Config::set('fromgplus','last_poll', time()); } @@ -167,15 +172,14 @@ function fromgplus_post($a, $uid, $source, $body, $location, $coord, $id) { $_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'] @@ -188,15 +192,15 @@ function fromgplus_post($a, $uid, $source, $body, $location, $coord, $id) { $_REQUEST['coord'] = $coord; if (($_REQUEST['title'] == "") && ($_REQUEST['body'] == "")) { - logger('fromgplus: empty post for user '.$uid." ".print_r($_REQUEST, true)); + Logger::log('fromgplus: empty post for user '.$uid." ".print_r($_REQUEST, true)); return; } require_once('mod/item.php'); //print_r($_REQUEST); - logger('fromgplus: posting for user '.$uid." ".print_r($_REQUEST, true)); + Logger::log('fromgplus: posting for user '.$uid." ".print_r($_REQUEST, true)); item_post($a); - logger('fromgplus: done for user '.$uid); + Logger::log('fromgplus: done for user '.$uid); } function fromgplus_html2bbcode($html) { @@ -228,7 +232,9 @@ function fromgplus_parse_query($var) 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; @@ -248,7 +254,7 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) { $cleaned = []; $queryvar = fromgplus_parse_query($fullImage); - if ($queryvar['url'] != "") + if (!empty($queryvar['url'])) $cleaned["full"] = urldecode($queryvar['url']); else $cleaned["full"] = $fullImage; @@ -256,27 +262,27 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) { $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"]; @@ -325,23 +331,26 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) { switch($attachment->objectType) { case "video": $pagedata["type"] = "video"; - $pagedata["url"] = Network::originalURL($attachment->url); + $pagedata["url"] = Network::finalUrl($attachment->url); $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName); break; case "article": $pagedata["type"] = "link"; - $pagedata["url"] = Network::originalURL($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); @@ -362,11 +371,11 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) { } } - 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"]; @@ -382,7 +391,7 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) { break; case "photo-album": - $pagedata["url"] = Network::originalURL($attachment->url); + $pagedata["url"] = Network::finalUrl($attachment->url); $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName); $post .= "\n\n[bookmark=".$pagedata["url"]."]".$pagedata["title"]."[/bookmark]\n"; @@ -403,7 +412,7 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) { case "album": $pagedata["type"] = "link"; - $pagedata["url"] = Network::originalURL($attachment->url); + $pagedata["url"] = Network::finalUrl($attachment->url); $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName); $thumb = $attachment->thumbnails[0]; @@ -416,7 +425,7 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) { break; case "audio": - $pagedata["url"] = Network::originalURL($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; @@ -441,7 +450,7 @@ function fromgplus_fetch($a, $uid) { $account = PConfig::get($uid,'fromgplus','account'); $key = Config::get('fromgplus','key'); - $result = Network::fetchURL("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); @@ -453,7 +462,7 @@ function fromgplus_fetch($a, $uid) { $lastdate = 0; - if (!is_array($activities->items)) + if (empty($activities->items)) return; $reversed = array_reverse($activities->items); @@ -465,7 +474,7 @@ function fromgplus_fetch($a, $uid) { // Don't publish items that are too young if (strtotime($item->published) > (time() - 3*60)) { - logger('fromgplus_fetch: item too new '.$item->published); + Logger::log('fromgplus_fetch: item too new '.$item->published); continue; } @@ -488,8 +497,9 @@ function fromgplus_fetch($a, $uid) { case "note": $post = fromgplus_html2bbcode($item->object->content); - if (is_array($item->object->attachments)) + if (!empty($item->object->attachments)) { $post .= fromgplus_handleattachments($a, $uid, $item, $item->object->content, false); + } $coord = ""; $location = ""; @@ -519,12 +529,12 @@ function fromgplus_fetch($a, $uid) { 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->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->published). "' link='".$item->object->url."']"; $post .= fromgplus_html2bbcode($item->object->content);