MrPetovan/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #483 from MrPetovan/task/fix-scrutinizer-issues

Browse source 
Fix unused code in buffer, statusnet and twitter
This commit is contained in:
Michael Vogel 2018-01-04 20:59:43 +01:00 committed by GitHub
commit 007cbc881e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
buffer/buffer.php
View file

@ -5,8 +5,9 @@
* Version: 0.2 * Version: 0.2
* Author: Michael Vogel <http://pirati.ca/profile/heluecht> * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
*/ */
require('addon/buffer/bufferapp.php'); require 'addon/buffer/bufferapp.php';
use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
@ -236,8 +237,8 @@ function buffer_post_local(&$a,&$b) {
$b['postopts'] .= 'buffer'; $b['postopts'] .= 'buffer';
} }
function buffer_send(&$a,&$b) { function buffer_send(App $a, &$b)
{
if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
return; return;
@ -331,7 +332,7 @@ function buffer_send(&$a,&$b) {
$item["body"] = preg_replace("(\[s\](.*?)\[\/s\])ism",'-$1-',$item["body"]); $item["body"] = preg_replace("(\[s\](.*?)\[\/s\])ism",'-$1-',$item["body"]);
} }
$post = plaintext($a, $item, $limit, $includedlinks, $htmlmode); $post = plaintext($item, $limit, $includedlinks, $htmlmode);
logger("buffer_send: converted message ".$b["id"]." result: ".print_r($post, true), LOGGER_DEBUG); logger("buffer_send: converted message ".$b["id"]." result: ".print_r($post, true), LOGGER_DEBUG);
// The image proxy is used as a sanitizer. Buffer seems to be really picky about pictures // The image proxy is used as a sanitizer. Buffer seems to be really picky about pictures

4
statusnet/statusnet.php
View file

@ -637,7 +637,7 @@ function statusnet_post_hook(App $a, &$b)
$tempfile = ""; $tempfile = "";
require_once "include/plaintext.php"; require_once "include/plaintext.php";
require_once "include/network.php"; require_once "include/network.php";
$msgarr = plaintext($a, $b, $max_char, true, 7); $msgarr = plaintext($b, $max_char, true, 7);
$msg = $msgarr["text"]; $msg = $msgarr["text"];
if (($msg == "") && isset($msgarr["title"])) if (($msg == "") && isset($msgarr["title"]))
@ -806,7 +806,7 @@ function statusnet_prepare_body(App $a, &$b)
} }
} }
$msgarr = plaintext($a, $item, $max_char, true, 7); $msgarr = plaintext($item, $max_char, true, 7);
$msg = $msgarr["text"]; $msg = $msgarr["text"];
if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) { if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {

6
twitter/twitter.php
View file

@ -523,7 +523,7 @@ function twitter_post_hook(App $a, &$b)
$max_char = 280; $max_char = 280;
require_once "include/plaintext.php"; require_once "include/plaintext.php";
$msgarr = plaintext($a, $b, $max_char, true, 8); $msgarr = plaintext($b, $max_char, true, 8);
$msg = $msgarr["text"]; $msg = $msgarr["text"];
if (($msg == "") && isset($msgarr["title"])) { if (($msg == "") && isset($msgarr["title"])) {
@ -592,7 +592,7 @@ function twitter_post_hook(App $a, &$b)
// ----------------- // -----------------
$max_char = 280; $max_char = 280;
require_once "include/plaintext.php"; require_once "include/plaintext.php";
$msgarr = plaintext($a, $b, $max_char, true, 8); $msgarr = plaintext($b, $max_char, true, 8);
$msg = $msgarr["text"]; $msg = $msgarr["text"];
if (($msg == "") && isset($msgarr["title"])) { if (($msg == "") && isset($msgarr["title"])) {
@ -789,7 +789,7 @@ function twitter_prepare_body(App $a, &$b)
} }
} }
$msgarr = plaintext($a, $item, $max_char, true, 8); $msgarr = plaintext($item, $max_char, true, 8);
$msg = $msgarr["text"]; $msg = $msgarr["text"];
if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) { if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {