X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ftext.php;h=535c36d235f0fe81ac87c03def37bf9b937df46d;hb=12d7ca9b84cfbdae25144770d48092c58f46d783;hp=a326412411703947bc1c827c5853c0f4bf4a6c47;hpb=50e45f6942680ddf5e7e17d88bb35aa54746df32;p=friendica.git
diff --git a/include/text.php b/include/text.php
index a326412411..535c36d235 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1,27 +1,34 @@
replace)
-// returns substituted string.
-// WARNING: this is pretty basic, and doesn't properly handle search strings that are substrings of each other.
-// For instance if 'test' => "foo" and 'testing' => "bar", testing could become either bar or fooing,
-// depending on the order in which they were declared in the array.
-
require_once("include/template_processor.php");
+require_once("include/friendica_smarty.php");
+require_once("mod/proxy.php");
-if(! function_exists('replace_macros')) {
+if(! function_exists('replace_macros')) {
+/**
+ * This is our template processor
+ *
+ * @param string|FriendicaSmarty $s the string requiring macro substitution,
+ * or an instance of FriendicaSmarty
+ * @param array $r key value pairs (search => replace)
+ * @return string substituted string
+ */
function replace_macros($s,$r) {
- global $t;
-
- //$ts = microtime();
- $r = $t->replace($s,$r);
- //$tt = microtime() - $ts;
-
- //$a = get_app();
- //$a->page['debug'] .= "$tt
\n";
- return template_unescape($r);
+ $stamp1 = microtime(true);
+
+ $a = get_app();
+
+ $t = $a->template_engine();
+ try {
+ $output = $t->replace_macros($s,$r);
+ } catch (Exception $e) {
+ echo "
".__function__.": ".$e->getMessage().""; killme(); + } + + $a->save_timestamp($stamp1, "rendering"); + + return $output; }} @@ -39,23 +46,24 @@ function random_string($size = 64,$type = RANDOM_STRING_HEX) { return(substr($s,0,$size)); }} +if(! function_exists('notags')) { /** - * This is our primary input filter. + * This is our primary input filter. * * The high bit hack only involved some old IE browser, forget which (IE5/Mac?) * that had an XSS attack vector due to stripping the high-bit on an 8-bit character * after cleansing, and angle chars with the high bit set could get through as markup. - * - * This is now disabled because it was interfering with some legitimate unicode sequences - * and hopefully there aren't a lot of those browsers left. + * + * This is now disabled because it was interfering with some legitimate unicode sequences + * and hopefully there aren't a lot of those browsers left. * * Use this on any text input where angle chars are not valid or permitted * They will be replaced with safer brackets. This may be filtered further - * if these are not allowed either. + * if these are not allowed either. * + * @param string $string Input string + * @return string Filtered string */ - -if(! function_exists('notags')) { function notags($string) { return(str_replace(array("<",">"), array('[',']'), $string)); @@ -64,26 +72,37 @@ function notags($string) { // return(str_replace(array("<",">","\xBA","\xBC","\xBE"), array('[',']','','',''), $string)); }} -// use this on "body" or "content" input where angle chars shouldn't be removed, -// and allow them to be safely displayed. + if(! function_exists('escape_tags')) { +/** + * use this on "body" or "content" input where angle chars shouldn't be removed, + * and allow them to be safely displayed. + * @param string $string + * @return string + */ function escape_tags($string) { return(htmlspecialchars($string, ENT_COMPAT, 'UTF-8', false)); }} -// generate a string that's random, but usually pronounceable. +// generate a string that's random, but usually pronounceable. // used to generate initial passwords if(! function_exists('autoname')) { +/** + * generate a string that's random, but usually pronounceable. + * used to generate initial passwords + * @param int $len + * @return string + */ function autoname($len) { if($len <= 0) return ''; - $vowels = array('a','a','ai','au','e','e','e','ee','ea','i','ie','o','ou','u'); + $vowels = array('a','a','ai','au','e','e','e','ee','ea','i','ie','o','ou','u'); if(mt_rand(0,5) == 4) $vowels[] = 'y'; @@ -127,7 +146,7 @@ function autoname($len) { for ($x = 0; $x < $len; $x ++) { $r = mt_rand(0,count($table) - 1); $word .= $table[$r]; - + if($table == $vowels) $table = array_merge($cons,$midcons); else @@ -144,7 +163,7 @@ function autoname($len) { } } if(substr($word,-1) == 'q') - $word = substr($word,0,-1); + $word = substr($word,0,-1); return $word; }} @@ -153,12 +172,18 @@ function autoname($len) { // returns escaped text. if(! function_exists('xmlify')) { +/** + * escape text ($str) for XML transport + * @param string $str + * @return string Escaped text. + */ function xmlify($str) { - $buffer = ''; - - for($x = 0; $x < mb_strlen($str); $x ++) { - $char = $str[$x]; - +/* $buffer = ''; + + $len = mb_strlen($str); + for($x = 0; $x < $len; $x ++) { + $char = mb_substr($str,$x,1); + switch( $char ) { case "\r" : @@ -184,25 +209,46 @@ function xmlify($str) { default : $buffer .= $char; break; - } - } + } + }*/ + /* + $buffer = mb_ereg_replace("&", "&", $str); + $buffer = mb_ereg_replace("'", "'", $buffer); + $buffer = mb_ereg_replace('"', """, $buffer); + $buffer = mb_ereg_replace("<", "<", $buffer); + $buffer = mb_ereg_replace(">", ">", $buffer); + */ + $buffer = htmlspecialchars($str, ENT_QUOTES); $buffer = trim($buffer); + return($buffer); }} -// undo an xmlify -// pass xml escaped text ($s), returns unescaped text - if(! function_exists('unxmlify')) { +/** + * undo an xmlify + * @param string $s xml escaped text + * @return string unescaped text + */ function unxmlify($s) { - $ret = str_replace('&','&', $s); - $ret = str_replace(array('<','>','"','''),array('<','>','"',"'"),$ret); - return $ret; +// $ret = str_replace('&','&', $s); +// $ret = str_replace(array('<','>','"','''),array('<','>','"',"'"),$ret); + /*$ret = mb_ereg_replace('&', '&', $s); + $ret = mb_ereg_replace(''', "'", $ret); + $ret = mb_ereg_replace('"', '"', $ret); + $ret = mb_ereg_replace('<', "<", $ret); + $ret = mb_ereg_replace('>', ">", $ret); + */ + $ret = htmlspecialchars_decode($s, ENT_QUOTES); + return $ret; }} -// convenience wrapper, reverse the operation "bin2hex" - if(! function_exists('hex2bin')) { +/** + * convenience wrapper, reverse the operation "bin2hex" + * @param string $s + * @return number + */ function hex2bin($s) { if(! (is_string($s) && strlen($s))) return ''; @@ -214,100 +260,151 @@ function hex2bin($s) { return(pack("H*",$s)); }} -// Automatic pagination. -// To use, get the count of total items. -// Then call $a->set_pager_total($number_items); -// Optionally call $a->set_pager_itemspage($n) to the number of items to display on each page -// Then call paginate($a) after the end of the display loop to insert the pager block on the page -// (assuming there are enough items to paginate). -// When using with SQL, the setting LIMIT %d, %d => $a->pager['start'],$a->pager['itemspage'] -// will limit the results to the correct items for the current page. -// The actual page handling is then accomplished at the application layer. -if(! function_exists('paginate')) { -function paginate(&$a) { - $o = ''; +if(! function_exists('paginate_data')) { +/** + * Automatica pagination data. + * + * @param App $a App instance + * @param int $count [optional] item count (used with alt pager) + * @return Array data for pagination template + */ +function paginate_data(&$a, $count=null) { $stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string); -// $stripped = preg_replace('/&zrl=(.*?)([\?&]|$)/ism','',$stripped); - $stripped = str_replace('q=','',$stripped); $stripped = trim($stripped,'/'); $pagenum = $a->pager['page']; + + if (($a->page_offset != "") AND !preg_match('/[?&].offset=/', $stripped)) + $stripped .= "&offset=".urlencode($a->page_offset); + $url = $a->get_baseurl() . '/' . $stripped; + $data = array(); + function _l(&$d, $name, $url, $text, $class="") { + if (!strpos($url, "?")) { + if ($pos = strpos($url, "&")) + $url = substr($url, 0, $pos)."?".substr($url, $pos + 1); + } - if($a->pager['total'] > $a->pager['itemspage']) { - $o .= '
".__function__.": ".$e->getMessage().""; killme(); + } + + $a->save_timestamp($stamp1, "file"); + + return $template; +}} + +if(! function_exists("get_template_file")) { +/** + * + * @param App $a + * @param string $filename + * @param string $root + * @return string + */ +function get_template_file($a, $filename, $root = '') { $theme = current_theme(); - - if(file_exists("view/theme/$theme/$s")) - return file_get_contents("view/theme/$theme/$s"); - elseif (x($a->theme_info,"extends") && file_exists("view/theme/".$a->theme_info["extends"]."/$s")) - return file_get_contents("view/theme/".$a->theme_info["extends"]."/$s"); + + // Make sure $root ends with a slash / + if($root !== '' && $root[strlen($root)-1] !== '/') + $root = $root . '/'; + + if(file_exists("{$root}view/theme/$theme/$filename")) + $template_file = "{$root}view/theme/$theme/$filename"; + elseif (x($a->theme_info,"extends") && file_exists("{$root}view/theme/{$a->theme_info["extends"]}/$filename")) + $template_file = "{$root}view/theme/{$a->theme_info["extends"]}/$filename"; + elseif (file_exists("{$root}/$filename")) + $template_file = "{$root}/$filename"; else - return file_get_contents("view/$s"); + $template_file = "{$root}view/$filename"; + return $template_file; }} -// for html,xml parsing - let's say you've got -// an attribute foobar="class1 class2 class3" -// and you want to find out if it contains 'class3'. -// you can't use a normal sub string search because you -// might match 'notclass3' and a regex to do the job is -// possible but a bit complicated. -// pass the attribute string as $attr and the attribute you -// are looking for as $s - returns true if found, otherwise false + if(! function_exists('attribute_contains')) { +/** + * for html,xml parsing - let's say you've got + * an attribute foobar="class1 class2 class3" + * and you want to find out if it contains 'class3'. + * you can't use a normal sub string search because you + * might match 'notclass3' and a regex to do the job is + * possible but a bit complicated. + * pass the attribute string as $attr and the attribute you + * are looking for as $s - returns true if found, otherwise false + * + * @param string $attr attribute value + * @param string $s string to search + * @return boolean True if found, False otherwise + */ function attribute_contains($attr,$s) { $a = explode(' ', $attr); if(count($a) && in_array($s,$a)) @@ -468,26 +666,70 @@ function attribute_contains($attr,$s) { }} if(! function_exists('logger')) { +/* setup int->string log level map */ +$LOGGER_LEVELS = array(); + +/** + * log levels: + * LOGGER_NORMAL (default) + * LOGGER_TRACE + * LOGGER_DEBUG + * LOGGER_DATA + * LOGGER_ALL + * + * @global App $a + * @global dba $db + * @param string $msg + * @param int $level + */ function logger($msg,$level = 0) { // turn off logger in install mode global $a; global $db; + global $LOGGER_LEVELS; if(($a->module == 'install') || (! ($db && $db->connected))) return; + if (count($LOGGER_LEVELS)==0){ + foreach (get_defined_constants() as $k=>$v){ + if (substr($k,0,7)=="LOGGER_") + $LOGGER_LEVELS[$v] = substr($k,7,7); + } + } + $debugging = get_config('system','debugging'); $loglevel = intval(get_config('system','loglevel')); $logfile = get_config('system','logfile'); if((! $debugging) || (! $logfile) || ($level > $loglevel)) return; - - @file_put_contents($logfile, datetime_convert() . ':' . session_id() . ' ' . $msg . "\n", FILE_APPEND); + + $callers = debug_backtrace(); + $logline = sprintf("%s@%s\t[%s]:%s:%s:%s\t%s\n", + datetime_convert(), + session_id(), + $LOGGER_LEVELS[$level], + basename($callers[0]['file']), + $callers[0]['line'], + $callers[1]['function'], + $msg + ); + + $stamp1 = microtime(true); + @file_put_contents($logfile, $logline, FILE_APPEND); + $a->save_timestamp($stamp1, "file"); return; }} if(! function_exists('activity_match')) { +/** + * Compare activity uri. Knows about activity namespace. + * + * @param string $haystack + * @param string $needle + * @return boolean + */ function activity_match($haystack,$needle) { if(($haystack === $needle) || ((basename($needle) === $haystack) && strstr($needle,NAMESPACE_ACTIVITY_SCHEMA))) return true; @@ -495,24 +737,28 @@ function activity_match($haystack,$needle) { }} -// Pull out all #hashtags and @person tags from $s; -// We also get @person@domain.com - which would make -// the regex quite complicated as tags can also -// end a sentence. So we'll run through our results -// and strip the period from any tags which end with one. -// Returns array of tags found, or empty array. - - if(! function_exists('get_tags')) { +/** + * Pull out all #hashtags and @person tags from $s; + * We also get @person@domain.com - which would make + * the regex quite complicated as tags can also + * end a sentence. So we'll run through our results + * and strip the period from any tags which end with one. + * Returns array of tags found, or empty array. + * + * @param string $s + * @return array + */ function get_tags($s) { $ret = array(); // ignore anything in a code block - $s = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$s); - // ignore anything in a bbtag + // Force line feeds at bbtags + $s = str_replace(array("[", "]"), array("\n[", "]\n"), $s); + // ignore anything in a bbtag $s = preg_replace('/\[(.*?)\]/sm','',$s); // Match full names against @tags including the space between first and last @@ -534,7 +780,7 @@ function get_tags($s) { // Otherwise pull out single word tags. These can be @nickname, @first_last // and #hash tags. - if(preg_match_all('/([@#][^ \x0D\x0A,;:?]+)([ \x0D\x0A,;:?]|$)/',$s,$match)) { + if(preg_match_all('/([!#@][^ \x0D\x0A,;:?]+)([ \x0D\x0A,;:?]|$)/',$s,$match)) { foreach($match[1] as $mtch) { if(strstr($mtch,"]")) { // we might be inside a bbcode color tag - leave it alone @@ -555,16 +801,26 @@ function get_tags($s) { }} -// quick and dirty quoted_printable encoding +// if(! function_exists('qp')) { +/** + * quick and dirty quoted_printable encoding + * + * @param string $s + * @return string + */ function qp($s) { return str_replace ("%","=",rawurlencode($s)); -}} +}} if(! function_exists('get_mentions')) { +/** + * @param array $item + * @return string html for mentions #FIXME: remove html + */ function get_mentions($item) { $o = ''; if(! strlen($item['tag'])) @@ -582,6 +838,13 @@ function get_mentions($item) { }} if(! function_exists('contact_block')) { +/** + * Get html for contact block. + * + * @template contact_block.tpl + * @hook contact_block_end (contacts=>array, output=>string) + * @return string + */ function contact_block() { $o = ''; $a = get_app(); @@ -603,7 +866,7 @@ function contact_block() { if(! $total) { $contacts = t('No contacts'); $micropro = Null; - + } else { $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 AND `hidden` = 0 AND `archive` = 0 ORDER BY RAND() LIMIT %d", intval($a->profile['uid']), @@ -617,7 +880,7 @@ function contact_block() { } } } - + $tpl = get_markup_template('contact_block.tpl'); $o = replace_macros($tpl, array( '$contacts' => $contacts, @@ -634,6 +897,14 @@ function contact_block() { }} if(! function_exists('micropro')) { +/** + * + * @param array $contact + * @param boolean $redirect + * @param string $class + * @param boolean $textmode + * @return string #FIXME: remove html + */ function micropro($contact, $redirect = false, $class = '', $textmode = false) { if($class) @@ -658,19 +929,19 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { if($click) $url = ''; if($textmode) { - return '' . "\r\n"; } else { - return '' . "\r\n"; } }} @@ -678,19 +949,34 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { if(! function_exists('search')) { +/** + * search box + * + * @param string $s search query + * @param string $id html id + * @param string $url search url + * @param boolean $save show save search button + * @return string html for search box #FIXME: remove html + */ function search($s,$id='search-box',$url='/search',$save = false) { $a = get_app(); $o = '
(.*?)<\/pre>/ism','smile_encode',$s);
$s = preg_replace_callback('/(.*?)<\/code>/ism','smile_encode',$s);
- $texts = array(
- '<3',
- '</3',
- '<\\3',
- ':-)',
- ';-)',
- ':-(',
- ':-P',
- ':-p',
- ':-"',
- ':-"',
- ':-x',
- ':-X',
- ':-D',
- '8-|',
- '8-O',
- ':-O',
- '\\o/',
- 'o.O',
- 'O.o',
- 'o_O',
- 'O_o',
- ":'(",
- ":-!",
- ":-/",
- ":-[",
+ $texts = array(
+ '<3',
+ '</3',
+ '<\\3',
+ ':-)',
+ ';-)',
+ ':-(',
+ ':-P',
+ ':-p',
+ ':-"',
+ ':-"',
+ ':-x',
+ ':-X',
+ ':-D',
+ '8-|',
+ '8-O',
+ ':-O',
+ '\\o/',
+ 'o.O',
+ 'O.o',
+ 'o_O',
+ 'O_o',
+ ":'(",
+ ":-!",
+ ":-/",
+ ":-[",
"8-)",
- ':beer',
- ':homebrew',
- ':coffee',
+ ':beer',
+ ':homebrew',
+ ':coffee',
':facepalm',
':like',
':dislike',
- '~friendica'
+ '~friendica',
+ 'red#',
+ 'red#matrix'
);
@@ -853,7 +1143,7 @@ function smilies($s, $sample = false) {
'',
'',
'',
- '',
+ '',
'',
'',
'',
@@ -870,7 +1160,9 @@ function smilies($s, $sample = false) {
'',
'',
'',
- '~friendica '
+ '~friendica ',
+ 'redmatrix',
+ 'redmatrix'
);
$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);
@@ -902,8 +1194,13 @@ function smile_decode($m) {
return(str_replace($m[1],base64url_decode($m[1]),$m[0]));
}
-// expand <3333 to the correct number of hearts
+/**
+ * expand <3333 to the correct number of hearts
+ *
+ * @param string $x
+ * @return string
+ */
function preg_heart($x) {
$a = get_app();
if(strlen($x[1]) == 1)
@@ -917,6 +1214,12 @@ function preg_heart($x) {
if(! function_exists('day_translate')) {
+/**
+ * Translate days and months names
+ *
+ * @param string $s
+ * @return string
+ */
function day_translate($s) {
$ret = str_replace(array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'),
array( t('Monday'), t('Tuesday'), t('Wednesday'), t('Thursday'), t('Friday'), t('Saturday'), t('Sunday')),
@@ -931,70 +1234,205 @@ function day_translate($s) {
if(! function_exists('normalise_link')) {
+/**
+ * Normalize url
+ *
+ * @param string $url
+ * @return string
+ */
function normalise_link($url) {
$ret = str_replace(array('https:','//www.'), array('http:','//'), $url);
return(rtrim($ret,'/'));
}}
+
+
+if(! function_exists('link_compare')) {
/**
- *
* Compare two URLs to see if they are the same, but ignore
- * slight but hopefully insignificant differences such as if one
- * is https and the other isn't, or if one is www.something and
+ * slight but hopefully insignificant differences such as if one
+ * is https and the other isn't, or if one is www.something and
* the other isn't - and also ignore case differences.
*
- * Return true if the URLs match, otherwise false.
+ * @param string $a first url
+ * @param string $b second url
+ * @return boolean True if the URLs match, otherwise False
*
*/
-
-if(! function_exists('link_compare')) {
function link_compare($a,$b) {
if(strcasecmp(normalise_link($a),normalise_link($b)) === 0)
return true;
return false;
}}
+
+if(! function_exists('redir_private_images')) {
+/**
+ * Find any non-embedded images in private items and add redir links to them
+ *
+ * @param App $a
+ * @param array $item
+ */
+function redir_private_images($a, &$item) {
+
+ $matches = false;
+ $cnt = preg_match_all('|\[img\](http[^\[]*?/photo/[a-fA-F0-9]+?(-[0-9]\.[\w]+?)?)\[\/img\]|', $item['body'], $matches, PREG_SET_ORDER);
+ if($cnt) {
+ //logger("redir_private_images: matches = " . print_r($matches, true));
+ foreach($matches as $mtch) {
+ if(strpos($mtch[1], '/redir') !== false)
+ continue;
+
+ if((local_user() == $item['uid']) && ($item['private'] != 0) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN)) {
+ //logger("redir_private_images: redir");
+ $img_url = $a->get_baseurl() . '/redir?f=1&quiet=1&url=' . $mtch[1] . '&conurl=' . $item['author-link'];
+ $item['body'] = str_replace($mtch[0], "[img]".$img_url."[/img]", $item['body']);
+ }
+ }
+ }
+
+}}
+
+
// Given an item array, convert the body element from bbcode to html and add smilie icons.
// If attach is true, also add icons for item attachments
-
if(! function_exists('prepare_body')) {
-function prepare_body($item,$attach = false) {
+/**
+ * Given an item array, convert the body element from bbcode to html and add smilie icons.
+ * If attach is true, also add icons for item attachments
+ *
+ * @param array $item
+ * @param boolean $attach
+ * @return string item body html
+ * @hook prepare_body_init item array before any work
+ * @hook prepare_body ('item'=>item array, 'html'=>body string) after first bbcode to html
+ * @hook prepare_body_final ('item'=>item array, 'html'=>body string) after attach icons and blockquote special case handling (spoiler, author)
+ */
+function prepare_body(&$item,$attach = false, $preview = false) {
$a = get_app();
call_hooks('prepare_body_init', $item);
- $cachefile = get_cachefile($item["guid"]."-".strtotime($item["edited"])."-".hash("crc32", $item['body']));
+ $searchpath = $a->get_baseurl()."/search?tag=";
+
+ $tags=array();
+ $hashtags = array();
+ $mentions = array();
+
+ if (!get_config('system','suppress_tags')) {
+ $taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`",
+ intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION));
+
+ foreach($taglist as $tag) {
+
+ if ($tag["url"] == "")
+ $tag["url"] = $searchpath.strtolower($tag["term"]);
+
+ if ($tag["type"] == TERM_HASHTAG) {
+ $hashtags[] = "#".$tag["term"]."";
+ $prefix = "#";
+ } elseif ($tag["type"] == TERM_MENTION) {
+ $mentions[] = "@".$tag["term"]."";
+ $prefix = "@";
+ }
+ $tags[] = $prefix."".$tag["term"]."";
+ }
+ }
+
+ $item['tags'] = $tags;
+ $item['hashtags'] = $hashtags;
+ $item['mentions'] = $mentions;
+
+
+ $cachefile = get_cachefile(urlencode($item["guid"])."-".hash("md5", $item['body']));
if (($cachefile != '')) {
- if (file_exists($cachefile))
+ if (file_exists($cachefile)) {
+ $stamp1 = microtime(true);
$s = file_get_contents($cachefile);
- else {
+ $a->save_timestamp($stamp1, "file");
+ } else {
+ redir_private_images($a, $item);
$s = prepare_text($item['body']);
+
+ $stamp1 = microtime(true);
file_put_contents($cachefile, $s);
+ $a->save_timestamp($stamp1, "file");
+
+ logger('prepare_body: put item '.$item["id"].' into cachefile '.$cachefile);
}
- } else
+ } else {
+ redir_private_images($a, $item);
$s = prepare_text($item['body']);
+ }
+ require_once("mod/proxy.php");
+ $s = proxy_parse_html($s);
- $prep_arr = array('item' => $item, 'html' => $s);
+ $prep_arr = array('item' => $item, 'html' => $s, 'preview' => $preview);
call_hooks('prepare_body', $prep_arr);
$s = $prep_arr['html'];
if(! $attach) {
+ // Replace the blockquotes with quotes that are used in mails
+ $mailquote = '';
+ $s = str_replace(array('', '', ''), array($mailquote, $mailquote, $mailquote), $s);
return $s;
}
- $arr = explode(',',$item['attach']);
+ $as = '';
+ $vhead = false;
+ $arr = explode('[/attach],',$item['attach']);
if(count($arr)) {
- $s .= '';
+ $as .= '';
foreach($arr as $r) {
$matches = false;
$icon = '';
- $cnt = preg_match_all('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches, PREG_SET_ORDER);
+ $cnt = preg_match_all('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$r,$matches, PREG_SET_ORDER);
if($cnt) {
foreach($matches as $mtch) {
- $icontype = strtolower(substr($mtch[3],0,strpos($mtch[3],'/')));
+ $mime = $mtch[3];
+
+ if((local_user() == $item['uid']) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN))
+ $the_url = $a->get_baseurl() . '/redir/' . $item['contact-id'] . '?f=1&url=' . $mtch[1];
+ else
+ $the_url = $mtch[1];
+
+ if(strpos($mime, 'video') !== false) {
+ if(!$vhead) {
+ $vhead = true;
+ $a->page['htmlhead'] .= replace_macros(get_markup_template('videos_head.tpl'), array(
+ '$baseurl' => $a->get_baseurl(),
+ ));
+ $a->page['end'] .= replace_macros(get_markup_template('videos_end.tpl'), array(
+ '$baseurl' => $a->get_baseurl(),
+ ));
+ }
+
+ $id = end(explode('/', $the_url));
+ $as .= replace_macros(get_markup_template('video_top.tpl'), array(
+ '$video' => array(
+ 'id' => $id,
+ 'title' => t('View Video'),
+ 'src' => $the_url,
+ 'mime' => $mime,
+ ),
+ ));
+ }
+
+ $filetype = strtolower(substr( $mime, 0, strpos($mime,'/') ));
+ if($filetype) {
+ $filesubtype = strtolower(substr( $mime, strpos($mime,'/') + 1 ));
+ $filesubtype = str_replace('.', '-', $filesubtype);
+ }
+ else {
+ $filetype = 'unkn';
+ $filesubtype = 'unkn';
+ }
+
+ $icon = '';
+ /*$icontype = strtolower(substr($mtch[3],0,strpos($mtch[3],'/')));
switch($icontype) {
case 'video':
case 'audio':
@@ -1005,20 +1443,18 @@ function prepare_body($item,$attach = false) {
default:
$icon = '';
break;
- }
+ }*/
+
$title = ((strlen(trim($mtch[4]))) ? escape_tags(trim($mtch[4])) : escape_tags($mtch[1]));
$title .= ' ' . $mtch[2] . ' ' . t('bytes');
- if((local_user() == $item['uid']) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN))
- $the_url = $a->get_baseurl() . '/redir/' . $item['contact-id'] . '?f=1&url=' . $mtch[1];
- else
- $the_url = $mtch[1];
- $s .= '' . $icon . '';
+ $as .= '' . $icon . '';
}
}
}
- $s .= '';
+ $as .= '';
}
+ $s = $s . $as;
// Look for spoiler
@@ -1051,6 +1487,13 @@ function prepare_body($item,$attach = false) {
$s = substr($s, 0, $pos).$authorreplace.substr($s, $pos+strlen($authorsearch));
}
+ // replace friendica image url size with theme preference
+ if (x($a->theme_info,'item_image_size')){
+ $ps = $a->theme_info['item_image_size'];
+
+ $s = preg_replace('|(]+src="[^"]+/photo/[0-9a-f]+)-[0-9]|',"$1-".$ps, $s);
+ }
+
$prep_arr = array('item' => $item, 'html' => $s);
call_hooks('prepare_body_final', $prep_arr);
@@ -1058,9 +1501,13 @@ function prepare_body($item,$attach = false) {
}}
-// Given a text string, convert from bbcode to html and add smilie icons.
-
if(! function_exists('prepare_text')) {
+/**
+ * Given a text string, convert from bbcode to html and add smilie icons.
+ *
+ * @param string $text
+ * @return string
+ */
function prepare_text($text) {
require_once('include/bbcode.php');
@@ -1070,33 +1517,40 @@ function prepare_text($text) {
else
$s = smilies(bbcode($text));
- return $s;
+ return trim($s);
}}
+
/**
- * returns
- * [
- * //categories [
+ * return array with details for categories and folders for an item
+ *
+ * @param array $item
+ * @return array
+ *
+ * [
+ * [ // categories array
* {
* 'name': 'category name',
- * 'removeurl': 'url to remove this category',
- * 'first': 'is the first in this array? true/false',
+ * 'removeurl': 'url to remove this category',
+ * 'first': 'is the first in this array? true/false',
* 'last': 'is the last in this array? true/false',
* } ,
* ....
* ],
- * // folders [
+ * [ //folders array
+ * {
* 'name': 'folder name',
* 'removeurl': 'url to remove this folder',
* 'first': 'is the first in this array? true/false',
* 'last': 'is the last in this array? true/false',
* } ,
- * ....
+ * ....
* ]
- * ]
+ * ]
*/
function get_cats_and_terms($item) {
+
$a = get_app();
$categories = array();
$folders = array();
@@ -1116,7 +1570,7 @@ function get_cats_and_terms($item) {
}
}
if (count($categories)) $categories[count($categories)-1]['last'] = true;
-
+
if(local_user() == $item['uid']) {
$matches = false; $first = true;
@@ -1141,13 +1595,14 @@ function get_cats_and_terms($item) {
}
+
+if(! function_exists('feed_hublinks')) {
/**
* return atom link elements for all of our hubs
+ * @return string hub link xml elements
*/
-
-if(! function_exists('feed_hublinks')) {
function feed_hublinks() {
-
+ $a = get_app();
$hub = get_config('system','huburl');
$hubxml = '';
@@ -1158,6 +1613,8 @@ function feed_hublinks() {
$h = trim($h);
if(! strlen($h))
continue;
+ if ($h === '[internal]')
+ $h = $a->get_baseurl() . '/pubsubhubbub';
$hubxml .= '' . "\n" ;
}
}
@@ -1165,37 +1622,66 @@ function feed_hublinks() {
return $hubxml;
}}
-/* return atom link elements for salmon endpoints */
if(! function_exists('feed_salmonlinks')) {
+/**
+ * return atom link elements for salmon endpoints
+ * @param string $nick user nickname
+ * @return string salmon link xml elements
+ */
function feed_salmonlinks($nick) {
$a = get_app();
$salmon = '' . "\n" ;
- // old style links that status.net still needed as of 12/2010
+ // old style links that status.net still needed as of 12/2010
- $salmon .= ' ' . "\n" ;
- $salmon .= ' ' . "\n" ;
+ $salmon .= ' ' . "\n" ;
+ $salmon .= ' ' . "\n" ;
return $salmon;
}}
if(! function_exists('get_plink')) {
+/**
+ * get private link for item
+ * @param array $item
+ * @return boolean|array False if item has not plink, otherwise array('href'=>plink url, 'title'=>translated title)
+ */
function get_plink($item) {
- $a = get_app();
- if (x($item,'plink') && ($item['private'] != 1)) {
- return array(
- 'href' => $item['plink'],
- 'title' => t('link to source'),
- );
- }
- else {
- return false;
- }
+ $a = get_app();
+
+ if ($a->user['nickname'] != "") {
+ $ret = array(
+ //'href' => $a->get_baseurl()."/display/".$a->user['nickname']."/".$item['id'],
+ 'href' => $a->get_baseurl()."/display/".$item['guid'],
+ 'orig' => $a->get_baseurl()."/display/".$item['guid'],
+ 'title' => t('link to source'),
+ );
+
+ if (x($item,'plink'))
+ $ret["href"] = $item['plink'];
+
+ } elseif (x($item,'plink') && ($item['private'] != 1))
+ $ret = array(
+ 'href' => $item['plink'],
+ 'orig' => $item['plink'],
+ 'title' => t('link to source'),
+ );
+ else
+ $ret = array();
+
+ //if (x($item,'plink') && ($item['private'] != 1))
+
+ return($ret);
}}
if(! function_exists('unamp')) {
+/**
+ * replace html amp entity with amp char
+ * @param string $s
+ * @return string
+ */
function unamp($s) {
return str_replace('&', '&', $s);
}}
@@ -1204,14 +1690,20 @@ function unamp($s) {
if(! function_exists('lang_selector')) {
+/**
+ * get html for language selector
+ * @global string $lang
+ * @return string
+ * @template lang_selector.tpl
+ */
function lang_selector() {
global $lang;
-
+
$langs = glob('view/*/strings.php');
-
+
$lang_options = array();
$selected = "";
-
+
if(is_array($langs) && count($langs)) {
$langs[] = '';
if(! in_array('view/en/strings.php',$langs))
@@ -1229,17 +1721,22 @@ function lang_selector() {
}
}
- $tpl = get_markup_template("lang_selector.tpl");
+ $tpl = get_markup_template("lang_selector.tpl");
$o = replace_macros($tpl, array(
'$title' => t('Select an alternate language'),
'$langs' => array($lang_options, $selected),
-
+
));
return $o;
}}
if(! function_exists('return_bytes')) {
+/**
+ * return number of bytes in size (K, M, G)
+ * @param string $size_str
+ * @return number
+ */
function return_bytes ($size_str) {
switch (substr ($size_str, -1))
{
@@ -1250,6 +1747,9 @@ function return_bytes ($size_str) {
}
}}
+/**
+ * @return string
+ */
function generate_user_guid() {
$found = true;
do {
@@ -1264,7 +1764,11 @@ function generate_user_guid() {
}
-
+/**
+ * @param string $s
+ * @param boolean $strip_padding
+ * @return string
+ */
function base64url_encode($s, $strip_padding = false) {
$s = strtr(base64_encode($s),'+/','-_');
@@ -1275,6 +1779,10 @@ function base64url_encode($s, $strip_padding = false) {
return $s;
}
+/**
+ * @param string $s
+ * @return string
+ */
function base64url_decode($s) {
if(is_array($s)) {
@@ -1303,6 +1811,16 @@ function base64url_decode($s) {
if (!function_exists('str_getcsv')) {
+ /**
+ * Parse csv string
+ *
+ * @param string $input
+ * @param string $delimiter
+ * @param string $enclosure
+ * @param string $escape
+ * @param string $eol
+ * @return boolean|array False on error, otherwise array[row][column]
+ */
function str_getcsv($input, $delimiter = ',', $enclosure = '"', $escape = '\\', $eol = '\n') {
if (is_string($input) && !empty($input)) {
$output = array();
@@ -1340,13 +1858,13 @@ if (!function_exists('str_getcsv')) {
}
} else {
$line = preg_split("/".$delimiter."/",$line);
-
+
/*
* Validating against pesky extra line breaks creating false rows.
*/
if (is_array($line) && !empty($line[0])) {
$output[$line_num] = $line;
- }
+ }
}
}
return $output;
@@ -1357,8 +1875,13 @@ if (!function_exists('str_getcsv')) {
return false;
}
}
-}
+}
+/**
+ * return div element with class 'clear'
+ * @return string
+ * @deprecated
+ */
function cleardiv() {
return '';
}
@@ -1376,7 +1899,7 @@ function bb_translate_video($s) {
$s = str_replace($mtch[0],'[vimeo]' . $mtch[1] . '[/vimeo]',$s);
}
}
- return $s;
+ return $s;
}
function html2bb_video($s) {
@@ -1395,6 +1918,8 @@ function html2bb_video($s) {
/**
* apply xmlify() to all values of array $val, recursively
+ * @param array $val
+ * @return array
*/
function array_xmlify($val){
if (is_bool($val)) return $val?"true":"false";
@@ -1403,6 +1928,13 @@ function array_xmlify($val){
}
+/**
+ * transorm link href and img src from relative to absolute
+ *
+ * @param string $text
+ * @param string $base base url
+ * @return string
+ */
function reltoabs($text, $base)
{
if (empty($base))
@@ -1411,7 +1943,7 @@ function reltoabs($text, $base)
$base = rtrim($base,'/');
$base2 = $base . "/";
-
+
// Replace links
$pattern = "/]*) href=\"(?!http|https|\/)([^\"]*)\"/";
$replace = "]*) src=\"(?!http|https|\/)([^\"]*)\"/";
$replace = "]*) src=\"(?!http|https)([^\"]*)\"/";
$replace = "','[',']'),array('%3c','%3e','%5b','%5d'),$s);
@@ -1528,10 +2066,12 @@ function file_tag_update_pconfig($uid,$file_old,$file_new,$type = 'file') {
if($type == 'file') {
$lbracket = '[';
$rbracket = ']';
+ $termtype = TERM_FILE;
}
else {
$lbracket = '<';
$rbracket = '>';
+ $termtype = TERM_CATEGORY;
}
$filetags_updated = $saved;
@@ -1557,9 +2097,15 @@ function file_tag_update_pconfig($uid,$file_old,$file_new,$type = 'file') {
}
foreach($deleted_tags as $key => $tag) {
- $r = q("select file from item where uid = %d " . file_tag_file_query('item',$tag,$type),
- intval($uid)
- );
+ $r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d",
+ dbesc($tag),
+ intval(TERM_OBJ_POST),
+ intval($termtype),
+ intval($uid));
+
+ //$r = q("select file from item where uid = %d " . file_tag_file_query('item',$tag,$type),
+ // intval($uid)
+ //);
if(count($r)) {
unset($deleted_tags[$key]);
@@ -1582,6 +2128,8 @@ function file_tag_update_pconfig($uid,$file_old,$file_new,$type = 'file') {
}
function file_tag_save_file($uid,$item,$file) {
+ require_once("include/files.php");
+
$result = false;
if(! intval($uid))
return false;
@@ -1591,11 +2139,14 @@ function file_tag_save_file($uid,$item,$file) {
);
if(count($r)) {
if(! stristr($r[0]['file'],'[' . file_tag_encode($file) . ']'))
- q("update item set file = '%s' where id = %d and uid = %d limit 1",
+ q("update item set file = '%s' where id = %d and uid = %d",
dbesc($r[0]['file'] . '[' . file_tag_encode($file) . ']'),
intval($item),
intval($uid)
);
+
+ create_files_from_item($item);
+
$saved = get_pconfig($uid,'system','filetags');
if((! strlen($saved)) || (! stristr($saved,'[' . file_tag_encode($file) . ']')))
set_pconfig($uid,'system','filetags',$saved . '[' . file_tag_encode($file) . ']');
@@ -1605,14 +2156,19 @@ function file_tag_save_file($uid,$item,$file) {
}
function file_tag_unsave_file($uid,$item,$file,$cat = false) {
+ require_once("include/files.php");
+
$result = false;
if(! intval($uid))
return false;
- if($cat == true)
+ if($cat == true) {
$pattern = '<' . file_tag_encode($file) . '>' ;
- else
+ $termtype = TERM_CATEGORY;
+ } else {
$pattern = '[' . file_tag_encode($file) . ']' ;
+ $termtype = TERM_FILE;
+ }
$r = q("select file from item where id = %d and uid = %d limit 1",
@@ -1622,15 +2178,22 @@ function file_tag_unsave_file($uid,$item,$file,$cat = false) {
if(! count($r))
return false;
- q("update item set file = '%s' where id = %d and uid = %d limit 1",
+ q("update item set file = '%s' where id = %d and uid = %d",
dbesc(str_replace($pattern,'',$r[0]['file'])),
intval($item),
intval($uid)
);
- $r = q("select file from item where uid = %d and deleted = 0 " . file_tag_file_query('item',$file,(($cat) ? 'category' : 'file')),
- intval($uid)
- );
+ create_files_from_item($item);
+
+ $r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d",
+ dbesc($file),
+ intval(TERM_OBJ_POST),
+ intval($termtype),
+ intval($uid));
+
+ //$r = q("select file from item where uid = %d and deleted = 0 " . file_tag_file_query('item',$file,(($cat) ? 'category' : 'file')),
+ //);
if(! count($r)) {
$saved = get_pconfig($uid,'system','filetags');
@@ -1647,7 +2210,7 @@ function normalise_openid($s) {
function undo_post_tagging($s) {
$matches = null;
- $cnt = preg_match_all('/([@#])\[url=(.*?)\](.*?)\[\/url\]/ism',$s,$matches,PREG_SET_ORDER);
+ $cnt = preg_match_all('/([!#@])\[url=(.*?)\](.*?)\[\/url\]/ism',$s,$matches,PREG_SET_ORDER);
if($cnt) {
foreach($matches as $mtch) {
$s = str_replace($mtch[0], $mtch[1] . $mtch[3],$s);
@@ -1680,3 +2243,22 @@ function is_a_date_arg($s) {
}
return false;
}
+
+/**
+ * remove intentation from a text
+ */
+function deindent($text, $chr="[\t ]", $count=NULL) {
+ $text = fix_mce_lf($text);
+ $lines = explode("\n", $text);
+ if (is_null($count)) {
+ $m = array();
+ $k=0; while($k