harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct parameter in include/text.php prepare_text()

Browse Source 
Also extend documentation.
This commit is contained in:
Klaus Weidenbach 2019-01-22 23:25:30 +01:00
parent ca9c29e2b6
commit ae538a2259
1 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
include/text.php
View File

@ -983,7 +983,7 @@ function contact_block() {
// There is no setting to discover if you are bi-directionally connected // There is no setting to discover if you are bi-directionally connected
// Use the ability to post comments as an indication that this relationship is more // Use the ability to post comments as an indication that this relationship is more
// than wishful thinking; even though soapbox channels and feeds will disable it. // than wishful thinking; even though soapbox channels and feeds will disable it.
if(! intval(get_abconfig(App::$profile['uid'],$rr['xchan_hash'],'their_perms','post_comments'))) { if(! intval(get_abconfig(App::$profile['uid'],$rr['xchan_hash'],'their_perms','post_comments'))) {
$rr['oneway'] = true; $rr['oneway'] = true;
@ -1109,19 +1109,19 @@ function linkify($s, $me = false) {
* @returns string * @returns string
*/ */
function sslify($s) { function sslify($s) {
// Local photo cache // Local photo cache
$str = array( $str = array(
'body' => $s, 'body' => $s,
'uid' => local_channel() 'uid' => local_channel()
); );
call_hooks('cache_body_hook', $str); call_hooks('cache_body_hook', $str);
$s = $str['body']; $s = $str['body'];
if (strpos(z_root(),'https:') === false) if (strpos(z_root(),'https:') === false)
return $s; return $s;
// By default we'll only sslify img tags because media files will probably choke. // By default we'll only sslify img tags because media files will probably choke.
// You can set sslify_everything if you want - but it will likely white-screen if it hits your php memory limit. // You can set sslify_everything if you want - but it will likely white-screen if it hits your php memory limit.
// The downside is that http: media files will likely be blocked by your browser // The downside is that http: media files will likely be blocked by your browser
@ -1452,7 +1452,7 @@ function theme_attachments(&$item) {
foreach($arr as $r) { foreach($arr as $r) {
$icon = getIconFromType($r['type']); $icon = getIconFromType($r['type']);
if($r['title']) if($r['title'])
$label = urldecode(htmlspecialchars($r['title'], ENT_COMPAT, 'UTF-8')); $label = urldecode(htmlspecialchars($r['title'], ENT_COMPAT, 'UTF-8'));
@ -1729,17 +1729,24 @@ function prepare_binary($item) {
/** /**
* @brief Given a text string, convert from bbcode to html and add smilie icons. * @brief Given a text string, convert from content_type to HTML.
*
* Take a text in plain text, html, markdown, bbcode, PDL or PHP and prepare
* it to return HTML.
*
* In bbcode this function will add smilie icons.
* *
* @param string $text * @param string $text
* @param string $content_type (optional) default text/bbcode * @param string $content_type (optional)
* @param boolean $cache (optional) default false * default 'text/bbcode', other values are 'text/plain', 'text/html',
* * 'text/markdown', 'application/x-pdl', 'application/x-php'
* @param boolean|array $opts (optional)
* default false, otherwise configuration array for bbcode()
* @return string * @return string
* The parsed $text as prepared HTML.
*/ */
function prepare_text($text, $content_type = 'text/bbcode', $opts = false) { function prepare_text($text, $content_type = 'text/bbcode', $opts = false) {
switch($content_type) { switch($content_type) {
case 'text/plain': case 'text/plain':
$s = escape_tags($text); $s = escape_tags($text);
@ -1779,8 +1786,8 @@ function prepare_text($text, $content_type = 'text/bbcode', $opts = false) {
default: default:
require_once('include/bbcode.php'); require_once('include/bbcode.php');
if(stristr($text,'[nosmile]')) if(stristr($text, '[nosmile]'))
$s = bbcode($text, [ 'cache' => $cache ]); $s = bbcode($text, ((is_array($opts)) ? $opts : [] ));
else else
$s = smilies(bbcode($text, ((is_array($opts)) ? $opts : [] ))); $s = smilies(bbcode($text, ((is_array($opts)) ? $opts : [] )));
@ -2140,7 +2147,7 @@ function legal_webbie($s) {
return ''; return '';
// WARNING: This regex may not work in a federated environment. // WARNING: This regex may not work in a federated environment.
// You will probably want something like // You will probably want something like
// preg_replace('/([^a-z0-9\_])/','',strtolower($s)); // preg_replace('/([^a-z0-9\_])/','',strtolower($s));
$r = preg_replace('/([^a-z0-9\-\_])/','',strtolower($s)); $r = preg_replace('/([^a-z0-9\-\_])/','',strtolower($s));
@ -2240,7 +2247,7 @@ function ids_to_querystr($arr,$idx = 'id',$quote = false) {
/** /**
* @brief array_elm_to_str($arr,$elm,$delim = ',') extract unique individual elements from an array of arrays and return them as a string separated by a delimiter * @brief array_elm_to_str($arr,$elm,$delim = ',') extract unique individual elements from an array of arrays and return them as a string separated by a delimiter
* similar to ids_to_querystr, but allows a different delimiter instead of a db-quote option * similar to ids_to_querystr, but allows a different delimiter instead of a db-quote option
* empty elements (evaluated after trim()) are ignored. * empty elements (evaluated after trim()) are ignored.
* @param $arr array * @param $arr array
* @param $elm array key to extract from sub-array * @param $elm array key to extract from sub-array
@ -2666,7 +2673,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $i
// get the channel name // get the channel name
// First extract the name or name fragment we are going to replace // First extract the name or name fragment we are going to replace
$name = substr($tag,(($exclusive) ? 2 : 1)); $name = substr($tag,(($exclusive) ? 2 : 1));
$newname = $name; // make a copy that we can mess with $newname = $name; // make a copy that we can mess with
$tagcid = 0; $tagcid = 0;
@ -2709,7 +2716,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $i
// select anybody by full hubloc_addr // select anybody by full hubloc_addr
if((! $r) && strpos($newname,'@')) { if((! $r) && strpos($newname,'@')) {
$r = q("SELECT * FROM xchan left join hubloc on xchan_hash = hubloc_hash $r = q("SELECT * FROM xchan left join hubloc on xchan_hash = hubloc_hash
WHERE hubloc_addr = '%s' LIMIT 1", WHERE hubloc_addr = '%s' LIMIT 1",
dbesc($newname) dbesc($newname)
); );
@ -2730,7 +2737,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $i
// $r is set if we found something // $r is set if we found something
$channel = App::get_channel(); $channel = App::get_channel();
if($r) { if($r) {
$profile = $r[0]['xchan_url']; $profile = $r[0]['xchan_url'];
$newname = $r[0]['xchan_name']; $newname = $r[0]['xchan_name'];
@ -2875,7 +2882,7 @@ function getIconFromType($type) {
'video/x-matroska' => 'fa-file-video-o' 'video/x-matroska' => 'fa-file-video-o'
); );
$catMap = [ $catMap = [
'application' => 'fa-file-code-o', 'application' => 'fa-file-code-o',
'multipart' => 'fa-folder', 'multipart' => 'fa-folder',
'audio' => 'fa-file-audio-o', 'audio' => 'fa-file-audio-o',
@ -2883,7 +2890,7 @@ function getIconFromType($type) {
'text' => 'fa-file-text-o', 'text' => 'fa-file-text-o',
'image' => 'fa=file-picture-o', 'image' => 'fa=file-picture-o',
'message' => 'fa-file-text-o' 'message' => 'fa-file-text-o'
]; ];
$iconFromType = ''; $iconFromType = '';
@ -2893,7 +2900,7 @@ function getIconFromType($type) {
} }
else { else {
$parts = explode('/',$type); $parts = explode('/',$type);
if($parts[0] && $catMap[$parts[0]]) { if($parts[0] && $catMap[$parts[0]]) {
$iconFromType = $catMap[$parts[0]]; $iconFromType = $catMap[$parts[0]];
} }
} }
@ -3149,7 +3156,7 @@ function flatten_array_recursive($arr) {
* @param string $lang Which language should be highlighted * @param string $lang Which language should be highlighted
* @return string * @return string
* Important: The returned text has the text pattern 'http' translated to '%eY9-!' which should be converted back * Important: The returned text has the text pattern 'http' translated to '%eY9-!' which should be converted back
* after further processing. This was done to prevent oembed links from occurring inside code blocks. * after further processing. This was done to prevent oembed links from occurring inside code blocks.
* See include/bbcode.php * See include/bbcode.php
*/ */
function text_highlight($s, $lang) { function text_highlight($s, $lang) {
@ -3383,7 +3390,7 @@ function unique_multidim_array($array, $key) {
$temp_array = array(); $temp_array = array();
$i = 0; $i = 0;
$key_array = array(); $key_array = array();
foreach($array as $val) { foreach($array as $val) {
if (!in_array($val[$key], $key_array)) { if (!in_array($val[$key], $key_array)) {
$key_array[$i] = $val[$key]; $key_array[$i] = $val[$key];
@ -3411,7 +3418,7 @@ function get_forum_channels($uid) {
intval($uid) intval($uid)
); );
if($x2) { if($x2) {
$xf = ids_to_querystr($x2,'xchan',true); $xf = ids_to_querystr($x2,'xchan',true);
// private forums // private forums
@ -3424,7 +3431,7 @@ function get_forum_channels($uid) {
} }
} }
$sql_extra = (($xf) ? " and ( xchan_hash in (" . $xf . ") or xchan_pubforum = 1 ) " : " and xchan_pubforum = 1 "); $sql_extra = (($xf) ? " and ( xchan_hash in (" . $xf . ") or xchan_pubforum = 1 ) " : " and xchan_pubforum = 1 ");
$r = q("select abook_id, xchan_hash, xchan_name, xchan_url, xchan_addr, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash where xchan_deleted = 0 and abook_channel = %d and abook_pending = 0 and abook_ignored = 0 and abook_blocked = 0 and abook_archived = 0 $sql_extra order by xchan_name", $r = q("select abook_id, xchan_hash, xchan_name, xchan_url, xchan_addr, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash where xchan_deleted = 0 and abook_channel = %d and abook_pending = 0 and abook_ignored = 0 and abook_blocked = 0 and abook_archived = 0 $sql_extra order by xchan_name",
intval($uid) intval($uid)
@ -3460,14 +3467,14 @@ function print_array($arr, $level = 0) {
$o .= $tabs . '[' . $k . '] => ' . print_array($v, $level + 1) . "\n"; $o .= $tabs . '[' . $k . '] => ' . print_array($v, $level + 1) . "\n";
} }
else { else {
$o .= $tabs . '[' . $k . '] => ' . print_val($v) . ",\n"; $o .= $tabs . '[' . $k . '] => ' . print_val($v) . ",\n";
} }
} }
} }
$o .= substr($tabs,0,-1) . ']' . (($level) ? ',' : ';' ). "\n"; $o .= substr($tabs,0,-1) . ']' . (($level) ? ',' : ';' ). "\n";
return $o; return $o;
} }
} }
function print_val($v) { function print_val($v) {
@ -3494,7 +3501,7 @@ function array_path_exists($str,$arr) {
} }
else { else {
return false; return false;
} }
} }
return true; return true;
} }