hankg/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests Activity

Merge pull request #208 from annando/master

Browse source 
Use of the new cache function, setting some addons in the "deprecated" status
This commit is contained in:
fabrixxm 2014-08-20 18:24:40 +02:00
commit 9acc0c9785
6 changed files with 30 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
buffer/buffer.php
View file

@ -253,9 +253,6 @@ function buffer_send(&$a,&$b) {
if($access_token) {
$buffer = new BufferApp($client_id, $client_secret, $callback_url, $access_token);
$result = q("SELECT `installed` FROM `addon` WHERE `name` = 'privacy_image_cache' AND `installed`");
$image_cache = (count($result) > 0);
require_once("include/plaintext.php");
require_once("include/network.php");
@ -308,15 +305,13 @@ function buffer_send(&$a,&$b) {
$post = plaintext($a, $item, $limit, $includedlinks);
logger("buffer_send: converted message ".$b["id"]." result: ".print_r($post, true), LOGGER_DEBUG);
// The image cache is used as a sanitizer. Buffer seems to be really picky about pictures
if ($image_cache) {
require_once("addon/privacy_image_cache/privacy_image_cache.php");
if (isset($post["image"]))
$post["image"] = $a->get_baseurl() . "/privacy_image_cache/".privacy_image_cache_cachename($post["image"]);
// The image proxy is used as a sanitizer. Buffer seems to be really picky about pictures
require_once("mod/proxy.php");
if (isset($post["image"]))
$post["image"] = proxy_url($post["image"]);
if (isset($post["preview"]))
$post["preview"] = $a->get_baseurl() . "/privacy_image_cache/".privacy_image_cache_cachename($post["preview"]);
}
if (isset($post["preview"]))
$post["preview"] = proxy_url($post["preview"]);
//if ($profile->service == "twitter") {
if ($includedlinks) {

2
editplain/editplain.php
View file

@ -4,7 +4,7 @@
* Description: This addon is deprecated and has been replaced with the "Advanced Features" setting. Admins should remove this addon when their core code is updated to include advanced feature settings.
* Version: 1.0
* Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
*
* Status: Unsupported
*
*/

7
fbpost/fbpost.php
View file

@ -1032,6 +1032,13 @@ function fbpost_fetchwall($a, $uid) {
$oembed_data = oembed_fetch_url($item->link);
$type = $oembed_data->type;
$content = "[bookmark=".$item->link."]".$item->name."[/bookmark]";
// If a link is not only attached but also added in the body, look if it can be removed in the body.
$removedlink = trim(str_replace($item->link, "", $_REQUEST["body"]));
if (($removedlink == "") OR strstr($_REQUEST["body"], $removedlink))
$_REQUEST["body"] = $removedlink;
} elseif (isset($item->name))
$content .= "[b]".$item->name."[/b]";

27
gpluspost/gpluspost.php
View file

@ -233,24 +233,25 @@ function gpluspost_send(&$a,&$b) {
if (!get_pconfig($b["uid"],'gpluspost','no_loop_prevention') and ($b['app'] == "Google+"))
return;
// Always do the export via RSS-Feed (even if NextScripts is enabled), since it doesn't hurt
$itemlist = get_pconfig($b["uid"],'gpluspost','itemlist');
$items = explode(",", $itemlist);
if (!gpluspost_nextscripts()) {
// Posting via RSS-Feed and Hootsuite
$itemlist = get_pconfig($b["uid"],'gpluspost','itemlist');
$items = explode(",", $itemlist);
$i = 0;
$newitems = array($b['id']);
foreach ($items AS $item)
if ($i++ < 9)
$newitems[] = $item;
$i = 0;
$newitems = array($b['id']);
foreach ($items AS $item)
if ($i++ < 9)
$newitems[] = $item;
$itemlist = implode(",", $newitems);
$itemlist = implode(",", $newitems);
logger('gpluspost_send: new itemlist: '.$itemlist." for uid ".$b["uid"]);
logger('gpluspost_send: new itemlist: '.$itemlist." for uid ".$b["uid"]);
set_pconfig($b["uid"],'gpluspost','itemlist', $itemlist);
set_pconfig($b["uid"],'gpluspost','itemlist', $itemlist);
// Posting via NextScripts
if (gpluspost_nextscripts()) {
} else {
// Posting via NextScripts
$username = get_pconfig($b['uid'],'gpluspost','username');
$password = get_pconfig($b['uid'],'gpluspost','password');
$page = get_pconfig($b['uid'],'gpluspost','page');

1
page/page.php
View file

@ -6,6 +6,7 @@
* Author: Mike Macgirvin <mike@macgirvin.com>
* based on pages plugin by
* Author: Michael Vogel <ike@piratenpartei.de>
* Status: Unsupported
*
*/

1
privacy_image_cache/privacy_image_cache.php
View file

@ -4,6 +4,7 @@
* Name: Privacy Image Cache
* Version: 0.1
* Author: Tobias Hößl <https://github.com/CatoTH/>
* Status: Unsupported
*/
define("PRIVACY_IMAGE_CACHE_DEFAULT_TIME", 86400); // 1 Day