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

Merge pull request #533 from MrPetovan/task/3878-move-include-bbcode-to-src

Browse source 
Move include/bbcode to src/ part 2: bbcode()
This commit is contained in:
Michael Vogel 2018-02-15 21:35:25 +01:00 committed by GitHub
parent c3dfc9f297 88ca2f5a1e
commit e19a443d01
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 46 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
blogger/blogger.php
View file

@ -5,6 +5,8 @@
* Version: 1.0 * Version: 1.0
* *
*/ */
use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
@ -181,10 +183,8 @@ function blogger_send(&$a, &$b)
$bl_blog = PConfig::get($b['uid'], 'blogger', 'bl_blog'); $bl_blog = PConfig::get($b['uid'], 'blogger', 'bl_blog');
if ($bl_username && $bl_password && $bl_blog) { if ($bl_username && $bl_password && $bl_blog) {
require_once('include/bbcode.php');
$title = '<title>' . (($b['title']) ? $b['title'] : L10n::t('Post from Friendica')) . '</title>'; $title = '<title>' . (($b['title']) ? $b['title'] : L10n::t('Post from Friendica')) . '</title>';
$post = $title . bbcode($b['body']); $post = $title . BBCode::convert($b['body']);
$post = xmlify($post); $post = xmlify($post);
$xml = <<< EOT $xml = <<< EOT

2
diaspora/diaspora.php
View file

@ -338,7 +338,7 @@ function diaspora_send(&$a,&$b) {
} while ($oldbody != $body); } while ($oldbody != $body);
// convert to markdown // convert to markdown
$body = bb2diaspora($body, false, true); $body = bb2diaspora($body);
// Adding the title // Adding the title
if(strlen($title)) if(strlen($title))

8
dwpost/dwpost.php
View file

@ -8,11 +8,12 @@
* Author: Cat Gray <https://free-haven.org/profile/catness> * Author: Cat Gray <https://free-haven.org/profile/catness>
*/ */
use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\Temporal;
function dwpost_install() { function dwpost_install() {
Addon::registerHook('post_local', 'addon/dwpost/dwpost.php', 'dwpost_post_local'); Addon::registerHook('post_local', 'addon/dwpost/dwpost.php', 'dwpost_post_local');
@ -178,11 +179,8 @@ function dwpost_send(&$a,&$b) {
$dw_blog = 'http://www.dreamwidth.org/interface/xmlrpc'; $dw_blog = 'http://www.dreamwidth.org/interface/xmlrpc';
if($dw_username && $dw_password && $dw_blog) { if($dw_username && $dw_password && $dw_blog) {
require_once('include/bbcode.php');
$title = $b['title']; $title = $b['title'];
$post = bbcode($b['body']); $post = BBCode::convert($b['body']);
$post = xmlify($post); $post = xmlify($post);
$tags = dwpost_get_tags($b['tag']); $tags = dwpost_get_tags($b['tag']);

9
ijpost/ijpost.php
View file

@ -8,11 +8,12 @@
* Author: Cat Gray <https://free-haven.org/profile/catness> * Author: Cat Gray <https://free-haven.org/profile/catness>
*/ */
use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\Temporal;
function ijpost_install() { function ijpost_install() {
Addon::registerHook('post_local', 'addon/ijpost/ijpost.php', 'ijpost_post_local'); Addon::registerHook('post_local', 'addon/ijpost/ijpost.php', 'ijpost_post_local');
@ -177,12 +178,8 @@ function ijpost_send(&$a,&$b) {
$ij_blog = 'http://www.insanejournal.com/interface/xmlrpc'; $ij_blog = 'http://www.insanejournal.com/interface/xmlrpc';
if($ij_username && $ij_password && $ij_blog) { if($ij_username && $ij_password && $ij_blog) {
require_once('include/bbcode.php');
require_once('include/datetime.php');
$title = $b['title']; $title = $b['title'];
$post = bbcode($b['body']); $post = BBCode::convert($b['body']);
$post = xmlify($post); $post = xmlify($post);
$tags = ijpost_get_tags($b['tag']); $tags = ijpost_get_tags($b['tag']);

8
impressum/impressum.php
View file

@ -7,9 +7,9 @@
* License: 3-clause BSD license * License: 3-clause BSD license
*/ */
require_once 'include/bbcode.php';
require_once 'mod/proxy.php'; require_once 'mod/proxy.php';
use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\L10n; use Friendica\Core\L10n;
@ -39,7 +39,7 @@ function obfuscate_email ($s) {
return $s; return $s;
} }
function impressum_footer($a, &$b) { function impressum_footer($a, &$b) {
$text = proxy_parse_html(bbcode(Config::get('impressum','footer_text'), true)); $text = proxy_parse_html(BBCode::convert(Config::get('impressum','footer_text')));
if (! $text == '') { if (! $text == '') {
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$a->get_baseurl().'/addon/impressum/impressum.css" media="all" />'; $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$a->get_baseurl().'/addon/impressum/impressum.css" media="all" />';
$b .= '<div class="clear"></div>'; $b .= '<div class="clear"></div>';
@ -50,8 +50,8 @@ function impressum_show($a,&$b) {
$b .= '<h3>'.L10n::t('Impressum').'</h3>'; $b .= '<h3>'.L10n::t('Impressum').'</h3>';
$owner = Config::get('impressum', 'owner'); $owner = Config::get('impressum', 'owner');
$owner_profile = Config::get('impressum','ownerprofile'); $owner_profile = Config::get('impressum','ownerprofile');
$postal = proxy_parse_html(bbcode(Config::get('impressum', 'postal'), true)); $postal = proxy_parse_html(BBCode::convert(Config::get('impressum', 'postal')));
$notes = proxy_parse_html(bbcode(Config::get('impressum', 'notes'), true)); $notes = proxy_parse_html(BBCode::convert(Config::get('impressum', 'notes')));
$email = obfuscate_email( Config::get('impressum','email') ); $email = obfuscate_email( Config::get('impressum','email') );
if (strlen($owner)) { if (strlen($owner)) {
if (strlen($owner_profile)) { if (strlen($owner_profile)) {

2
libertree/libertree.php
View file

@ -217,7 +217,7 @@ function libertree_send(&$a,&$b) {
} while ($oldbody != $body); } while ($oldbody != $body);
// convert to markdown // convert to markdown
$body = bb2diaspora($body, false, false); $body = bb2diaspora($body, false);
// Adding the title // Adding the title
if(strlen($title)) if(strlen($title))

8
ljpost/ljpost.php
View file

@ -8,11 +8,12 @@
* Author: Cat Gray <https://free-haven.org/profile/catness> * Author: Cat Gray <https://free-haven.org/profile/catness>
*/ */
use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\Temporal;
function ljpost_install() { function ljpost_install() {
Addon::registerHook('post_local', 'addon/ljpost/ljpost.php', 'ljpost_post_local'); Addon::registerHook('post_local', 'addon/ljpost/ljpost.php', 'ljpost_post_local');
@ -178,11 +179,8 @@ function ljpost_send(&$a,&$b) {
$lj_blog = xmlify('http://www.livejournal.com/interface/xmlrpc'); $lj_blog = xmlify('http://www.livejournal.com/interface/xmlrpc');
if($lj_username && $lj_password && $lj_blog) { if($lj_username && $lj_password && $lj_blog) {
require_once('include/bbcode.php');
$title = xmlify($b['title']); $title = xmlify($b['title']);
$post = bbcode($b['body']); $post = BBCode::convert($b['body']);
$post = xmlify($post); $post = xmlify($post);
$tags = ljpost_get_tags($b['tag']); $tags = ljpost_get_tags($b['tag']);

8
mailstream/mailstream.php
View file

@ -5,6 +5,8 @@
* Version: 1.1 * Version: 1.1
* Author: Matthew Exon <http://mat.exon.name> * Author: Matthew Exon <http://mat.exon.name>
*/ */
use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\L10n; use Friendica\Core\L10n;
@ -180,7 +182,7 @@ function mailstream_sender($item) {
} }
function mailstream_decode_subject($subject) { function mailstream_decode_subject($subject) {
$html = bbcode($subject); $html = BBCode::convert($subject);
if (!$html) { if (!$html) {
return $subject; return $subject;
} }
@ -255,7 +257,7 @@ function mailstream_send($a, $message_id, $item, $user) {
return; return;
} }
require_once(dirname(__file__).'/phpmailer/class.phpmailer.php'); require_once(dirname(__file__).'/phpmailer/class.phpmailer.php');
require_once('include/bbcode.php');
$attachments = []; $attachments = [];
mailstream_do_images($a, $item, $attachments); mailstream_do_images($a, $item, $attachments);
$frommail = Config::get('mailstream', 'frommail'); $frommail = Config::get('mailstream', 'frommail');
@ -285,7 +287,7 @@ function mailstream_send($a, $message_id, $item, $user) {
$mail->IsHTML(true); $mail->IsHTML(true);
$mail->CharSet = 'utf-8'; $mail->CharSet = 'utf-8';
$template = get_markup_template('mail.tpl', 'addon/mailstream/'); $template = get_markup_template('mail.tpl', 'addon/mailstream/');
$item['body'] = bbcode($item['body']); $item['body'] = BBCode::convert($item['body']);
$item['url'] = $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $item['id']; $item['url'] = $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $item['id'];
$mail->Body = replace_macros($template, [ $mail->Body = replace_macros($template, [
'$upstream' => L10n::t('Upstream'), '$upstream' => L10n::t('Upstream'),

5
newmemberwidget/newmemberwidget.php
View file

@ -6,8 +6,7 @@
* Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias> * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
***/ ***/
require_once 'include/bbcode.php'; use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\L10n; use Friendica\Core\L10n;
@ -31,7 +30,7 @@ function newmemberwidget_network_mod_init ( $a, $b) {
$t .= '<a href="'.$a->get_baseurl().'/profile/'.Config::get('newmemberwidget','localsupport').'" target="_new">'.L10n::t('Local Support Forum').'</a><br />'.EOL; $t .= '<a href="'.$a->get_baseurl().'/profile/'.Config::get('newmemberwidget','localsupport').'" target="_new">'.L10n::t('Local Support Forum').'</a><br />'.EOL;
$ft = Config::get('newmemberwidget','freetext'); $ft = Config::get('newmemberwidget','freetext');
if (!trim($ft)=="") if (!trim($ft)=="")
$t .= '<p>'.bbcode(trim($ft)).'</p>'; $t .= '<p>'.BBCode::convert(trim($ft)).'</p>';
$t .= '</div><div class="clear"></div>'; $t .= '</div><div class="clear"></div>';
$a->page['aside'] = $t . $a->page['aside']; $a->page['aside'] = $t . $a->page['aside'];
} }

6
notifyall/notifyall.php
View file

@ -7,6 +7,8 @@
* Author: Mike Macgirvin (Inital Author of the hubbwall Addon for the Hubzilla Project) * Author: Mike Macgirvin (Inital Author of the hubbwall Addon for the Hubzilla Project)
* Author: Rabuzarus <https://friendica.kommune4.de/profile/rabuzarus> (Port to Friendica) * Author: Rabuzarus <https://friendica.kommune4.de/profile/rabuzarus> (Port to Friendica)
*/ */
use Friendica\Content\Text\BBCode;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Util\Emailer; use Friendica\Util\Emailer;
@ -49,9 +51,9 @@ function notifyall_post(&$a) {
$subject = $_REQUEST['subject']; $subject = $_REQUEST['subject'];
$textversion = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(["\\r", "\\n"],[ "", "\n"], $text))),ENT_QUOTES,'UTF-8')); $textversion = strip_tags(html_entity_decode(BBCode::convert(stripslashes(str_replace(["\\r", "\\n"], ["", "\n"], $text))), ENT_QUOTES, 'UTF-8'));
$htmlversion = bbcode(stripslashes(str_replace(["\\r","\\n"], ["","<br />\n"],$text))); $htmlversion = BBCode::convert(stripslashes(str_replace(["\\r", "\\n"], ["", "<br />\n"], $text)));
// if this is a test, send it only to the admin(s) // if this is a test, send it only to the admin(s)
// admin_email might be a comma separated list, but we need "a@b','c@d','e@f // admin_email might be a comma separated list, but we need "a@b','c@d','e@f

8
pumpio/pumpio.php
View file

@ -6,6 +6,7 @@
* Author: Michael Vogel <http://pirati.ca/profile/heluecht> * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
*/ */
use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\L10n; use Friendica\Core\L10n;
@ -16,9 +17,9 @@ use Friendica\Model\GContact;
use Friendica\Model\Group; use Friendica\Model\Group;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Model\Queue; use Friendica\Model\Queue;
use Friendica\Util\Network;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
require 'addon/pumpio/oauth/http.php'; require 'addon/pumpio/oauth/http.php';
require 'addon/pumpio/oauth/oauth_client.php'; require 'addon/pumpio/oauth/oauth_client.php';
@ -470,12 +471,9 @@ function pumpio_send(&$a,&$b) {
$public = PConfig::get($b['uid'], "pumpio", "public"); $public = PConfig::get($b['uid'], "pumpio", "public");
if($oauth_token && $oauth_token_secret) { if($oauth_token && $oauth_token_secret) {
require_once('include/bbcode.php');
$title = trim($b['title']); $title = trim($b['title']);
$content = bbcode($b['body'], false, false, 4); $content = BBCode::convert($b['body'], false, 4);
$params = []; $params = [];

1
statusnet/statusnet.php
View file

@ -544,7 +544,6 @@ function statusnet_post_hook(App $a, &$b)
return; return;
} }
require_once 'include/bbcode.php';
$dent = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret); $dent = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
$max_char = $dent->get_maxlength(); // max. length for a dent $max_char = $dent->get_maxlength(); // max. length for a dent

15
tumblr/tumblr.php
View file

@ -342,9 +342,6 @@ function tumblr_send(&$a,&$b) {
$tmbl_blog = 'blog/'.$page.'/post'; $tmbl_blog = 'blog/'.$page.'/post';
if($oauth_token && $oauth_token_secret && $tmbl_blog) { if($oauth_token && $oauth_token_secret && $tmbl_blog) {
require_once('include/bbcode.php');
$tag_arr = []; $tag_arr = [];
$tags = ''; $tags = '';
$x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER); $x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER);
@ -381,7 +378,7 @@ function tumblr_send(&$a,&$b) {
switch ($siteinfo["type"]) { switch ($siteinfo["type"]) {
case "photo": case "photo":
$params['type'] = "photo"; $params['type'] = "photo";
$params['caption'] = bbcode($body, false, false, 4); $params['caption'] = BBCode::convert($body, false, 4);
if (isset($siteinfo["url"])) if (isset($siteinfo["url"]))
$params['link'] = $siteinfo["url"]; $params['link'] = $siteinfo["url"];
@ -392,22 +389,22 @@ function tumblr_send(&$a,&$b) {
$params['type'] = "link"; $params['type'] = "link";
$params['title'] = $title; $params['title'] = $title;
$params['url'] = $siteinfo["url"]; $params['url'] = $siteinfo["url"];
$params['description'] = bbcode($body, false, false, 4); $params['description'] = BBCode::convert($body, false, 4);
break; break;
case "audio": case "audio":
$params['type'] = "audio"; $params['type'] = "audio";
$params['external_url'] = $siteinfo["url"]; $params['external_url'] = $siteinfo["url"];
$params['caption'] = bbcode($body, false, false, 4); $params['caption'] = BBCode::convert($body, false, 4);
break; break;
case "video": case "video":
$params['type'] = "video"; $params['type'] = "video";
$params['embed'] = $siteinfo["url"]; $params['embed'] = $siteinfo["url"];
$params['caption'] = bbcode($body, false, false, 4); $params['caption'] = BBCode::convert($body, false, 4);
break; break;
default: default:
$params['type'] = "text"; $params['type'] = "text";
$params['title'] = $title; $params['title'] = $title;
$params['body'] = bbcode($b['body'], false, false, 4); $params['body'] = BBCode::convert($b['body'], false, 4);
break; break;
} }
@ -416,7 +413,7 @@ function tumblr_send(&$a,&$b) {
"<p>".$params['caption']."</p>"; "<p>".$params['caption']."</p>";
if (trim($params['caption']) == "") if (trim($params['caption']) == "")
$params['caption'] = bbcode("[quote]".$siteinfo["description"]."[/quote]", false, false, 4); $params['caption'] = BBCode::convert("[quote]" . $siteinfo["description"] . "[/quote]", false, 4);
$consumer_key = Config::get('tumblr','consumer_key'); $consumer_key = Config::get('tumblr','consumer_key');
$consumer_secret = Config::get('tumblr','consumer_secret'); $consumer_secret = Config::get('tumblr','consumer_secret');

6
windowsphonepush/windowsphonepush.php
View file

@ -25,7 +25,9 @@
* sets the counter back * sets the counter back
* count only unseen elements which are not type=activity (likes and dislikes not seen as new elements) * count only unseen elements which are not type=activity (likes and dislikes not seen as new elements)
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
@ -209,9 +211,9 @@ function windowsphonepush_cron()
if (substr($body, 0, 4) == "[url") { if (substr($body, 0, 4) == "[url") {
$body = "URL/Image ..."; $body = "URL/Image ...";
} else { } else {
require_once('include/bbcode.php');
require_once("include/html2plain.php"); require_once("include/html2plain.php");
$body = bbcode($body, false, false, 2, true);
$body = BBCode::convert($body, false, 2, true);
$body = html2plain($body, 0); $body = html2plain($body, 0);
$body = ((strlen($body) > 137) ? substr($body, 0, 137) . "..." : $body); $body = ((strlen($body) > 137) ? substr($body, 0, 137) . "..." : $body);
} }

7
wppost/wppost.php
View file

@ -145,7 +145,7 @@ function wppost_settings_post(&$a,&$b) {
PConfig::set(local_user(),'wppost','backlink',trim($_POST['wp_backlink'])); PConfig::set(local_user(),'wppost','backlink',trim($_POST['wp_backlink']));
PConfig::set(local_user(),'wppost','shortcheck',trim($_POST['wp_shortcheck'])); PConfig::set(local_user(),'wppost','shortcheck',trim($_POST['wp_shortcheck']));
$wp_backlink_text = notags(trim($_POST['wp_backlink_text'])); $wp_backlink_text = notags(trim($_POST['wp_backlink_text']));
$wp_backlink_text = bbcode($wp_backlink_text, false, false, 8); $wp_backlink_text = BBCode::convert($wp_backlink_text, false, 8);
$wp_backlink_text = html2plain($wp_backlink_text, 0, true); $wp_backlink_text = html2plain($wp_backlink_text, 0, true);
PConfig::set(local_user(),'wppost','wp_backlink_text', $wp_backlink_text); PConfig::set(local_user(),'wppost','wp_backlink_text', $wp_backlink_text);
@ -221,7 +221,6 @@ function wppost_send(&$a,&$b) {
} }
if ($wp_username && $wp_password && $wp_blog) { if ($wp_username && $wp_password && $wp_blog) {
require_once 'include/bbcode.php';
require_once 'include/html2plain.php'; require_once 'include/html2plain.php';
$wptitle = trim($b['title']); $wptitle = trim($b['title']);
@ -266,7 +265,7 @@ function wppost_send(&$a,&$b) {
// Remove the share element before fetching the first line // Remove the share element before fetching the first line
$title = trim(preg_replace("/\[share.*?\](.*?)\[\/share\]/ism","\n$1\n",$b['body'])); $title = trim(preg_replace("/\[share.*?\](.*?)\[\/share\]/ism","\n$1\n",$b['body']));
$title = html2plain(bbcode($title, false, false), 0, true)."\n"; $title = html2plain(BBCode::convert($title, false), 0, true)."\n";
$pos = strpos($title, "\n"); $pos = strpos($title, "\n");
$trailer = ""; $trailer = "";
if (($pos == 0) || ($pos > 100)) { if (($pos == 0) || ($pos > 100)) {
@ -279,7 +278,7 @@ function wppost_send(&$a,&$b) {
} }
$title = '<title>' . (($wptitle) ? $wptitle : L10n::t('Post from Friendica')) . '</title>'; $title = '<title>' . (($wptitle) ? $wptitle : L10n::t('Post from Friendica')) . '</title>';
$post = bbcode($b['body'], false, false, 4); $post = BBCode::convert($b['body'], false, 4);
// If a link goes to youtube then remove the stuff around it. Wordpress detects youtube links and embeds it // If a link goes to youtube then remove the stuff around it. Wordpress detects youtube links and embeds it
$post = preg_replace('/<a.*?href="(https?:\/\/www.youtube.com\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$post); $post = preg_replace('/<a.*?href="(https?:\/\/www.youtube.com\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$post);