diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php index 88d2622ff..ab93b0423 100644 --- a/fromgplus/fromgplus.php +++ b/fromgplus/fromgplus.php @@ -7,14 +7,18 @@ * */ +define('FACEBOOK_DEFAULT_POLL_INTERVAL', 60); // given in minutes + function fromgplus_install() { register_hook('plugin_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings'); register_hook('plugin_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post'); + register_hook('cron', 'addon/fromgplus/fromgplus.php', 'fromgplus_cron'); } function fromgplus_uninstall() { unregister_hook('plugin_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings'); unregister_hook('plugin_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post'); + unregister_hook('cron', 'addon/fromgplus/fromgplus.php', 'fromgplus_cron'); } function fromgplus_addon_settings(&$a,&$s) { @@ -55,129 +59,314 @@ function fromgplus_addon_settings_post(&$a,&$b) { info( t('Google+ Import Settings saved.') . EOL); } } -/* -function html2bbcode($html) { + +function fromgplus_cron($a,$b) { + $last = get_config('fromgplus','last_poll'); + + $poll_interval = intval(get_config('fromgplus','poll_interval')); + if(! $poll_interval) + $poll_interval = FROMGPLUS_DEFAULT_POLL_INTERVAL; + + if($last) { + $next = $last + ($poll_interval * 60); + if($next > time()) { + logger('fromgplus: poll intervall not reached'); + return; + } + } + + logger('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 = get_pconfig($rr['uid'],'fromgplus','account'); + if ($account) { + logger('fromgplus: fetching for user '.$rr['uid']); + fromgplus_fetch($a, $rr['uid']); + } + } + } + + logger('fromgplus: cron_end'); + + set_config('fromgplus','last_poll', time()); +} + +function fromgplus_post($a, $uid, $source, $body, $location) { + + $uid = 2; + + $body = trim($body); + + if (substr($body, 0, 3) == "[b]") { + $pos = strpos($body, "[/b]"); + $title = substr($body, 3, $pos-3); + $body = trim(substr($body, $pos+4)); + } else + $title = ""; + + $_SESSION['authenticated'] = true; + $_SESSION['uid'] = $uid; + + $_REQUEST['type'] = 'wall'; + $_REQUEST['api_source'] = true; + + $_REQUEST['profile_uid'] = $uid; + $_REQUEST['source'] = $source; + + // $_REQUEST['verb'] + // $_REQUEST['parent'] + // $_REQUEST['parent_uri'] + + $_REQUEST['title'] = $title; + $_REQUEST['body'] = $body; + $_REQUEST['location'] = $location; + + logger('fromgplus: posting for user '.$uid); + + require_once('mod/item.php'); + //print_r($_REQUEST); + item_post($a); +} + +function fromgplus_html2bbcode($html) { $bbcode = html_entity_decode($html, ENT_QUOTES, 'UTF-8'); - $bbcode = str_replace(array("\n"), array(""), $bbcode); - $bbcode = str_replace(array("", ""), array("[b]", "[/b]"), $bbcode); - $bbcode = str_replace(array("", ""), array("[i]", "[/i]"), $bbcode); - $bbcode = str_replace(array("", ""), array("[s]", "[/s]"), $bbcode); - $bbcode = str_replace(array("
"), array("\n"), $bbcode); + $bbcode = str_ireplace(array("\n"), array(""), $bbcode); + $bbcode = str_ireplace(array("", ""), array("[b]", "[/b]"), $bbcode); + $bbcode = str_ireplace(array("", ""), array("[i]", "[/i]"), $bbcode); + $bbcode = str_ireplace(array("", ""), array("[s]", "[/s]"), $bbcode); + $bbcode = str_ireplace(array("
"), array("\n"), $bbcode); + $bbcode = str_ireplace(array("
"), array("\n"), $bbcode); + $bbcode = str_ireplace(array("
"), array("\n"), $bbcode); $bbcode = trim(strip_tags($bbcode)); return($bbcode); } -function friendicapost($post) { - global $friendica; +function fromgplus_parse_query($var) + { + /** + * Use this function to parse out the query array element from + * the output of parse_url(). + */ + $var = parse_url($var, PHP_URL_QUERY); + $var = html_entity_decode($var); + $var = explode('&', $var); + $arr = array(); - $api = new Statusnet($friendica["user"], $friendica["pw"], "GooglePlus", $friendica["server"]); - $ret = $api->updateStatus($post); - $api->endSession(); + foreach($var as $val) { + $x = explode('=', $val); + $arr[$x[0]] = $x[1]; + } + unset($val, $x, $var); + return $arr; } -function handleattachments($item) { +function fromgplus_cleanupgoogleproxy($fullImage, $image) { + + $preview = "/w".$fullImage->width."-h".$fullImage->height."/"; + $preview2 = "/w".$fullImage->width."-h".$fullImage->height."-p/"; + $fullImage = str_replace(array($preview, $preview2), array("/", "/"), $fullImage->url); + + $preview = "/w".$image->width."-h".$image->height."/"; + $preview2 = "/w".$image->width."-h".$image->height."-p/"; + $image = str_replace(array($preview, $preview2), array("/", "/"), $image->url); + + $cleaned = array(); + + $queryvar = fromgplus_parse_query($fullImage); + if ($queryvar['url'] != "") + $cleaned["full"] = urldecode($queryvar['url']); + else + $cleaned["full"] = $fullImage; + if (@exif_imagetype($cleaned["full"]) == 0) + $cleaned["full"] = ""; + + $queryvar = fromgplus_parse_query($image); + if ($queryvar['url'] != "") + $cleaned["preview"] = urldecode($queryvar['url']); + else + $cleaned["preview"] = $image; + if (@exif_imagetype($cleaned["preview"]) == 0) + $cleaned["preview"] = ""; + + if ($cleaned["full"] == "") { + $cleaned["full"] = $cleaned["preview"]; + $cleaned["preview"] = ""; + } + + if ($cleaned["full"] == $cleaned["preview"]) + $cleaned["preview"] = ""; + + if ($cleaned["full"] == "") + if (@exif_imagetype($fullImage) != 0) + $cleaned["full"] = $fullImage; + + if ($cleaned["full"] == "") + if (@exif_imagetype($image) != 0) + $cleaned["full"] = $fullImage; + + return($cleaned); +} + +function fromgplus_handleattachments($item) { $post = ""; + $quote = ""; foreach ($item->object->attachments as $attachment) { switch($attachment->objectType) { case "video": - //$post .= "\n\n[url=".$attachment->url."]". - // "[size=large][b]".html2bbcode($attachment->displayName)."[/b][/size][/url]\n"; - $post .= "\n\n[bookmark=".$attachment->url."]".html2bbcode($attachment->displayName)."[/bookmark]\n"; + $post .= "\n\n[bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n"; - //if (strpos($attachment->embed->url, "youtube.com")) - // $post .= "[youtube]".$attachment->url."[/youtube]\n"; - //else - /// $post .= "[url=".$attachment->url."][img]".$attachment->image->url."[/img][/url]\n"; + /*$images = cleanupgoogleproxy($attachment->fullImage, $attachment->image); + if ($images["preview"] != "") + $post .= "\n[url=".$images["full"]."][img]".$images["preview"]."[/img][/url]\n"; + elseif ($images["full"] != "") + $post .= "\n[img]".$images["full"]."[/img]\n";*/ - ///$post .= "[quote]".trim(html2bbcode($attachment->content))."[/quote]"; break; case "article": - //$post .= "\n\n[url=".$attachment->url."]". - // "[size=large][b]".html2bbcode($attachment->displayName)."[/b][/size][/url]\n"; - $post .= "\n\n[bookmark=".$attachment->url."]".html2bbcode($attachment->displayName)."[/bookmark]\n"; - $post .= "[quote]".trim(html2bbcode($attachment->content))."[/quote]"; + $post .= "\n\n[bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n"; + + $images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image); + if ($images["preview"] != "") + $post .= "\n[url=".$images["full"]."][img]".$images["preview"]."[/img][/url]\n"; + elseif ($images["full"] != "") + $post .= "\n[img]".$images["full"]."[/img]\n"; + + //$post .= "[quote]".trim(fromgplus_html2bbcode($attachment->content))."[/quote]"; + $quote = trim(fromgplus_html2bbcode($attachment->content)); + if ($quote != "") + $quote = "\n[quote]".$quote."[/quote]"; break; case "photo": - //$post .= "\n\n[url=".$attachment->fullImage->url."]". - // "[img]".$attachment->fullImage->url."[/img][/url]\n"; - $post .= "\n\n[img]".$attachment->fullImage->url."[/img]\n"; + $images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image); + if ($images["preview"] != "") + $post .= "\n[url=".$images["full"]."][img]".$images["preview"]."[/img][/url]\n"; + elseif ($images["full"] != "") + $post .= "\n[img]".$images["full"]."[/img]\n"; + if ($attachment->displayName != "") - $post .= html2bbcode($attachment->displayName)."\n"; + $post .= fromgplus_html2bbcode($attachment->displayName)."\n"; break; case "photo-album": - $post .= "\n\n[url=".$attachment->url."]". - "[size=large][b]".html2bbcode($attachment->displayName)."[/b][/size][/url]\n"; + $post .= "\n\n[bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n"; + + $images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image); + if ($images["preview"] != "") + $post .= "\n[url=".$images["full"]."][img]".$images["preview"]."[/img][/url]\n"; + elseif ($images["full"] != "") + $post .= "\n[img]".$images["full"]."[/img]\n"; + break; - default: - print_r($attachment); - die(); + case "album": + foreach($attachment->thumbnails as $thumb) { + $preview = "/w".$thumb->image->width."-h".$thumb->image->height."/"; + $preview2 = "/w".$thumb->image->width."-h".$thumb->image->height."-p/"; + $image = str_replace(array($preview, $preview2), array("/", "/"), $thumb->image->url); + + $post .= "\n[url=".$thumb->url."][img]".$image."[/img][/url]\n"; + } break; + //default: + // die($attachment->objectType); } } - return($post); + return($post.$quote); } -$result = -file_get_contents("https://www.googleapis.com/plus/v1/people/".$google["id"]."/activities/public?alt=json&pp=1&key=".$google["key"]."&maxResults=".$google["maxfetch"]); -$activities = json_decode($result); +function fromgplus_fetch($a, $uid) { + $maxfetch = 20; -$state = array("lastid"=>''); -if (file_exists($statefile)) - $state = unserialize(file_get_contents($statefile)); + $account = get_pconfig($uid,'fromgplus','account'); + $key = get_config('fromgplus','key'); -$lastid = ""; + $result = file_get_contents("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); -foreach($activities->items as $item) { - if ($item->id == $state["lastid"]) - break; + $activities = json_decode($result); - if ($lastid == "") - $lastid = $item->id; + $initiallastdate = get_pconfig($uid,'fromgplus','lastdate'); - switch($item->object->objectType) { - case "note": - $post = html2bbcode($item->object->content); + $lastdate = 0; - if (is_array($item->object->attachments)) - $post .= handleattachments($item); - friendicapost($post); - break; + $reversed = array_reverse($activities->items); - case "activity": - $post = html2bbcode($item->annotation)."\n"; - //$post .= html2bbcode("♲ "); - $post .= html2bbcode("♻ "); - $post .= "[url=".$item->object->actor->url."]".$item->object->actor->displayName."[/url]"; - $post .= " \n"; - //$post .= "[quote]"; + foreach($reversed as $item) { + if (strtotime($item->published) <= $initiallastdate) + continue; - $post .= html2bbcode($item->object->content); + if ($lastdate < strtotime($item->published)) + $lastdate = strtotime($item->published); - if (is_array($item->object->attachments)) - $post .= "\n".trim(handleattachments($item)); + if ($item->access->description == "Public") + switch($item->object->objectType) { + case "note": + $post = fromgplus_html2bbcode($item->object->content); - //$post .= "[/quote]"; + if (is_array($item->object->attachments)) + $post .= fromgplus_handleattachments($item); - friendicapost($post); - break; + // geocode, placeName + if (isset($item->address)) + $location = $item->address; + else + $location = ""; - default: - print_r($item); - die(); - break; + fromgplus_post($a, $uid, $item->provider->title, $post, $location); + + break; + + case "activity": + $post = fromgplus_html2bbcode($item->annotation)."\n"; + $post .= fromgplus_html2bbcode("♲"); + //$post .= html2bbcode("♻"); + //$post .= fromgplus_html2bbcode("◌"); + $post .= " [url=".$item->object->actor->url."]".$item->object->actor->displayName."[/url] \n"; + $post .= fromgplus_html2bbcode($item->object->content); + + if (is_array($item->object->attachments)) + $post .= "\n".trim(fromgplus_handleattachments($item)); + + if (isset($item->address)) + $location = $item->address; + else + $location = ""; + + fromgplus_post($a, $uid, $item->provider->title, $post, $location); + break; + } } + if ($lastdate != 0) + set_pconfig($uid,'fromgplus','lastdate', $lastdate); } -if ($lastid != "") { - $state['lastid'] = $lastid; - file_put_contents($statefile, serialize($state)); +/* +// Test +$test1 = array(); +$test2 = array(); +require_once("boot.php"); +require_once("include/bbcode.php"); +require_once("include/html2plain.php"); + +if(@is_null($a)) { + $a = new App; } + +if(@is_null($db)) { + @include(".htconfig.php"); + require_once("include/dba.php"); + $db = new dba($db_host, $db_user, $db_pass, $db_data); + unset($db_host, $db_user, $db_pass, $db_data); +}; + +fromgplus_cron($a, $test2); */ diff --git a/privacy_image_cache/privacy_image_cache.php b/privacy_image_cache/privacy_image_cache.php index 2dcaa199e..472990071 100644 --- a/privacy_image_cache/privacy_image_cache.php +++ b/privacy_image_cache/privacy_image_cache.php @@ -100,7 +100,7 @@ function privacy_image_cache_init() { $img_str = fetch_url($_REQUEST['url'],true); - $tempfile = tempnam("", "cache"); + $tempfile = tempnam(get_config("system","temppath"), "cache"); file_put_contents($tempfile, $img_str); $mime = image_type_to_mime_type(exif_imagetype($tempfile)); unlink($tempfile); diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 9bbe4dcd1..09d01c4f4 100755 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -620,7 +620,7 @@ function statusnet_post_hook(&$a,&$b) { $image = $msgarr["image"]; if ($image != "") { $imagedata = file_get_contents($image); - $tempfile = tempnam("", "upload"); + $tempfile = tempnam(get_config("system","temppath"), "upload"); file_put_contents($tempfile, $imagedata); $postdata = array("status"=>$msg, "media"=>"@".$tempfile); } else