'; + } return $o; @@ -353,10 +400,10 @@ function fbpost_post_hook(&$a,&$b) { return; // only accept comments from the item owner. Other contacts are unknown to FB. - + if(! link_compare($b['author-link'], $a->get_baseurl() . '/profile/' . $u[0]['nickname'])) return; - + logger('facebook reply id=' . $reply); } @@ -408,7 +455,7 @@ function fbpost_post_hook(&$a,&$b) { } if($b['verb'] == ACTIVITY_LIKE) - $likes = true; + $likes = true; $appid = get_config('facebook', 'appid' ); @@ -421,9 +468,9 @@ function fbpost_post_hook(&$a,&$b) { $fb_token = get_pconfig($b['uid'],'facebook','access_token'); - // post to facebook if it's a public post and we've ticked the 'post to Facebook' box, + // post to facebook if it's a public post and we've ticked the 'post to Facebook' box, // or it's a private message with facebook participants - // or it's a reply or likes action to an existing facebook post + // or it's a reply or likes action to an existing facebook post if($fb_token && ($toplevel || $b['private'] || $reply)) { logger('facebook: able to post'); @@ -506,11 +553,34 @@ function fbpost_post_hook(&$a,&$b) { $body = $body1.$body2; } + // Convert recycle signs + $body = str_replace("\t", " ", $body); + // recycle 1 + $recycle = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8'); + $body = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', "\n\t$2:\t", $body); + // recycle 2 (Test) + $recycle = html_entity_decode("◌ ", ENT_QUOTES, 'UTF-8'); + $body = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', "\n\t$2:\t", $body); + + $bodyparts = explode("\t", $body); + // Doesn't help with multiple repeats - the problem has to be solved later + if (sizeof($bodyparts) == 3) { + if (trim($bodyparts[0]) == "") + $body = trim($bodyparts[2]); + else if (trim($bodyparts[2]) == "") + $body = trim($bodyparts[0]); + else + $body = trim($bodyparts[0])."\n\n".trim($bodyparts[1])."[quote]".trim($bodyparts[2])."[/quote]"; + //$body = trim(str_replace(array(":\t", "\t"), array(":[quote]", ""), $body))."[/quote]"; + } else + $body = str_replace("\t", "", $body); + // At first convert the text to html $html = bbcode($body, false, false); // Then convert it to plain text $msg = trim($b['title']." \n\n".html2plain($html, 0, true)); + $msg = str_replace("\n«", "«", $msg); // Quickfix - the original problem lies in the html2plain conversion $msg = html_entity_decode($msg,ENT_QUOTES,'UTF-8'); // Removing multiple newlines @@ -568,24 +638,30 @@ function fbpost_post_hook(&$a,&$b) { logger('Facebook post: msg=' . $msg, LOGGER_DATA); + $video = ""; + if($likes) { $postvars = array('access_token' => $fb_token); - } - else { + } else { // message, picture, link, name, caption, description, source, place, tags + if(trim($link) != "") + if (@exif_imagetype($link) != 0) { + $image = $link; + $link = ""; + } + $postvars = array( 'access_token' => $fb_token, 'message' => $msg ); - if(trim($image) != "") { + if(trim($image) != "") $postvars['picture'] = $image; - } + if(trim($link) != "") { $postvars['link'] = $link; - // The following doesn't work - why? if ((stristr($link,'youtube')) || (stristr($link,'youtu.be')) || (stristr($link,'vimeo'))) { - $postvars['source'] = $link; + $video = $link; } } if(trim($linkname) != "") @@ -602,11 +678,41 @@ function fbpost_post_hook(&$a,&$b) { } + $post_to_page = get_pconfig($b['uid'],'facebook','post_to_page'); + $page_access_token = get_pconfig($b['uid'],'facebook','page_access_token'); + if ((intval($post_to_page) != 0) and ($page_access_token != "")) + $target = $post_to_page; + else + $target = "me"; + if($reply) { $url = 'https://graph.facebook.com/' . $reply . '/' . (($likes) ? 'likes' : 'comments'); - } else if (($link != "") or ($image != "") or ($b['title'] == '') or (strlen($msg) < 500)) { - $url = 'https://graph.facebook.com/me/feed'; - if($b['plink']) + } else if (($video != "") or (($image == "") and ($link != ""))) { + // If it is a link to a video or a link without a preview picture then post it as a link + if ($video != "") + $link = $video; + + $postvars = array( + 'access_token' => $fb_token, + 'link' => $link, + ); + if ($msg != $video) + $postvars['message'] = $msg; + + $url = 'https://graph.facebook.com/'.$target.'/links'; + } else if (($link == "") and ($image != "")) { + // If it is only an image without a page link then post this image as a photo + $postvars = array( + 'access_token' => $fb_token, + 'url' => $image, + ); + if ($msg != $image) + $postvars['message'] = $msg; + + $url = 'https://graph.facebook.com/'.$target.'/photos'; + } else if (($link != "") or ($image != "") or ($b['title'] == '') or (strlen($msg) < 500)) { + $url = 'https://graph.facebook.com/'.$target.'/feed'; + if (!get_pconfig($b['uid'],'facebook','suppress_view_on_friendica') and $b['plink']) $postvars['actions'] = '{"name": "' . t('View on Friendica') . '", "link": "' . $b['plink'] . '"}'; } else { // if its only a message and a subject and the message is larger than 500 characters then post it as note @@ -615,9 +721,13 @@ function fbpost_post_hook(&$a,&$b) { 'message' => bbcode($b['body'], false, false), 'subject' => $b['title'], ); - $url = 'https://graph.facebook.com/me/notes'; + $url = 'https://graph.facebook.com/'.$target.'/notes'; } + // Post to page? + if (!$reply and ($target != "me") and $page_access_token) + $postvars['access_token'] = $page_access_token; + logger('facebook: post to ' . $url); logger('facebook: postvars: ' . print_r($postvars,true)); @@ -642,14 +752,14 @@ function fbpost_post_hook(&$a,&$b) { add_to_queue($a->contact,NETWORK_FACEBOOK,$s); notice( t('Facebook post failed. Queued for retry.') . EOL); } - + if (isset($retj->error) && $retj->error->type == "OAuthException" && $retj->error->code == 190) { logger('Facebook session has expired due to changed password.', LOGGER_DEBUG); - + $last_notification = get_pconfig($b['uid'], 'facebook', 'session_expired_mailsent'); if (!$last_notification || $last_notification < (time() - FACEBOOK_SESSION_ERR_NOTIFICATION_INTERVAL)) { require_once('include/enotify.php'); - + $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($b['uid']) ); notification(array( 'uid' => $b['uid'], @@ -662,7 +772,7 @@ function fbpost_post_hook(&$a,&$b) { 'source_link' => $a->config["system"]["url"], 'source_photo' => $a->config["system"]["url"] . '/images/person-80.jpg', )); - + set_pconfig($b['uid'], 'facebook', 'session_expired_mailsent', time()); } else logger('Facebook: No notification, as the last one was sent on ' . $last_notification, LOGGER_DEBUG); } diff --git a/forumlist.tgz b/forumlist.tgz index fe559f33..1f303145 100644 Binary files a/forumlist.tgz and b/forumlist.tgz differ diff --git a/forumlist/forumlist.php b/forumlist/forumlist.php index 3a682446..37752462 100644 --- a/forumlist/forumlist.php +++ b/forumlist/forumlist.php @@ -26,16 +26,20 @@ function forumlist_uninstall() { } -function forumlist_getpage($uid,$showhidden = true,$randomise = false) { +function forumlist_getpage($uid,$showhidden = true,$randomise = false, $showprivate = false) { $forumlist = array(); $order = (($showhidden) ? '' : " and hidden = 0 "); - $order .= (($randomise) ? ' order by rand() ' : ' order by name asc '); + $order .= (($randomise) ? ' order by rand() ' : ' order by name asc '); + $select = "`forum` = 1"; + if ($showprivate) { + $select = "( `forum` = 1 OR `prv` = 1 )"; + } $contacts = q("SELECT `contact`.`id`, `contact`.`url`, `contact`.`name`, `contact`.`micro` from contact - WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d + WHERE `network`= 'dfrn' AND $select AND `uid` = %d and blocked = 0 and hidden = 0 and pending = 0 and archive = 0 $order ", intval($uid) @@ -66,7 +70,7 @@ function forumlist_network_mod_init($a,$b) { $randomise = intval(get_pconfig(local_user(),'forumlist','randomise')); - $contacts = forumlist_getpage($a->user['uid'],true,$randomise); + $contacts = forumlist_getpage($a->user['uid'],true,$randomise, true); if(count($contacts)) { foreach($contacts as $contact) { @@ -99,7 +103,7 @@ function forumlist_profile_advanced($a,&$b) { $randomise = true; - $contacts = forumlist_getpage($a->user['uid'],false,$randomise); + $contacts = forumlist_getpage($a->user['uid'],false,$randomise,false); $total_shown = 0; $more = false; @@ -122,7 +126,6 @@ function forumlist_profile_advanced($a,&$b) { function forumlist_plugin_settings_post($a,$post) { if(! local_user() || (! x($_POST,'forumlist-settings-submit'))) return; - // set_pconfig(local_user(),'forumlist','max_forumlists',intval($_POST['forumlist_max_forumlists'])); set_pconfig(local_user(),'forumlist','randomise',intval($_POST['forumlist_random'])); set_pconfig(local_user(),'forumlist','show_on_profile',intval($_POST['forumlist_profile'])); diff --git a/js_upload.tgz b/js_upload.tgz index 98e16c5a..5a415de7 100755 Binary files a/js_upload.tgz and b/js_upload.tgz differ diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php index 3ba5f9c4..148fde31 100755 --- a/js_upload/js_upload.php +++ b/js_upload/js_upload.php @@ -196,7 +196,13 @@ class qqUploadedFileXhr { */ function save() { $input = fopen("php://input", "r"); - $this->pathnm = tempnam(sys_get_temp_dir(),'frn'); + + $upload_dir = get_config('system','tempdir'); + if(! $upload_dir) + $upload_dir = sys_get_temp_dir(); + + $this->pathnm = tempnam($upload_dir,'frn'); + $temp = fopen($this->pathnm,"w"); $realSize = stream_copy_to_stream($input, $temp); diff --git a/ljpost/ljpost.css b/ljpost/ljpost.css index 2087d3f0..e0494c5c 100755 --- a/ljpost/ljpost.css +++ b/ljpost/ljpost.css @@ -1,6 +1,5 @@ #ljpost-enable-label, #ljpost-username-label, #ljpost-password-label, #ljpost-bydefault-label { -<<<<<<< HEAD float: left; width: 200px; margin-top: 10px; @@ -15,18 +14,3 @@ margin-top: 15px; } -======= -float: left; -width: 200px; -margin-top: 10px; -} - -#ljpost-checkbox, #ljpost-username, #ljpost-password, #ljpost-bydefault { -float: left; -margin-top: 10px; -} - -#ljpost-submit { -margin-top: 15px; -} ->>>>>>> 99d9fddb6af9e872266666038447771e42ce13b4 diff --git a/openstreetmap.tgz b/openstreetmap.tgz index 34f4bd6b..c195d151 100644 Binary files a/openstreetmap.tgz and b/openstreetmap.tgz differ diff --git a/page.tgz b/page.tgz index 21dab7b9..02140ce9 100644 Binary files a/page.tgz and b/page.tgz differ diff --git a/privacy_image_cache.tgz b/privacy_image_cache.tgz index b4c10080..8441ab65 100644 Binary files a/privacy_image_cache.tgz and b/privacy_image_cache.tgz differ diff --git a/smiley_pack.tgz b/smiley_pack.tgz index fe2689ca..2efe6332 100644 Binary files a/smiley_pack.tgz and b/smiley_pack.tgz differ diff --git a/statusnet.tgz b/statusnet.tgz index c171f2c3..72b6e928 100755 Binary files a/statusnet.tgz and b/statusnet.tgz differ diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index c8330a7e..9bbe4dcd 100755 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -495,7 +495,7 @@ function statusnet_shortenmsg($b, $max_char) { $msg = substr($msg, 0, -1); $pos = strrpos($msg, "\n"); if ($pos > 0) - $msg = substr($msg, 0, $pos-1); + $msg = substr($msg, 0, $pos); else if ($lastchar != "\n") $msg = substr($msg, 0, -3)."..."; } @@ -505,7 +505,7 @@ function statusnet_shortenmsg($b, $max_char) { while (strpos($msg, " ") !== false) $msg = str_replace(" ", " ", $msg); - return(trim($msg." ".$msglink)); + return(array("msg"=>trim($msg." ".$msglink), "image"=>$image)); } function statusnet_post_hook(&$a,&$b) { @@ -538,6 +538,7 @@ function statusnet_post_hook(&$a,&$b) { // information during shortening of potential links but do not // shorten all the links in a 200000 character long essay. + $tempfile = ""; $intelligent_shortening = get_config('statusnet','intelligent_shortening'); if (!$intelligent_shortening) { if (! $b['title']=='') { @@ -612,18 +613,32 @@ function statusnet_post_hook(&$a,&$b) { } $msg = trim($msg); - } else - $msg = statusnet_shortenmsg($b, $max_char); + $postdata = array('status' => $msg); + } else { + $msgarr = statusnet_shortenmsg($b, $max_char); + $msg = $msgarr["msg"]; + $image = $msgarr["image"]; + if ($image != "") { + $imagedata = file_get_contents($image); + $tempfile = tempnam("", "upload"); + file_put_contents($tempfile, $imagedata); + $postdata = array("status"=>$msg, "media"=>"@".$tempfile); + } else + $postdata = array("status"=>$msg); + } // and now dent it :-) if(strlen($msg)) { - $result = $dent->post('statuses/update', array('status' => $msg)); + //$result = $dent->post('statuses/update', array('status' => $msg)); + $result = $dent->post('statuses/update', $postdata); logger('statusnet_post send, result: ' . print_r($result, true). - "\nmessage: ".$msg, LOGGER_DEBUG."\nOriginal post: ".print_r($b)); + "\nmessage: ".$msg, LOGGER_DEBUG."\nOriginal post: ".print_r($b)."\nPost Data: ".print_r($postdata)); if ($result->error) { logger('Send to StatusNet failed: "' . $result->error . '"'); } } + if ($tempfile != "") + unlink($tempfile); } } diff --git a/twitter.tgz b/twitter.tgz index beeea2be..539ded93 100755 Binary files a/twitter.tgz and b/twitter.tgz differ diff --git a/twitter/twitter.php b/twitter/twitter.php index 3fcaa1de..6a93d9f1 100755 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -354,7 +354,7 @@ function twitter_shortenmsg($b) { $msg = substr($msg, 0, -1); $pos = strrpos($msg, "\n"); if ($pos > 0) - $msg = substr($msg, 0, $pos-1); + $msg = substr($msg, 0, $pos); else if ($lastchar != "\n") $msg = substr($msg, 0, -3)."..."; }