X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ftext.php;h=4ce634b603438bab43c76dfdb0c284c7e5f71861;hb=e55f9f8f07c42d1accf28ce31a100a671f2738c9;hp=9761e5fc93d60a9e39765d697e89b8df484700bf;hpb=9c87e00dd39e7d636a72544adeaeeb0be00fb8ab;p=friendica.git diff --git a/include/text.php b/include/text.php index 9761e5fc93..4ce634b603 100644 --- a/include/text.php +++ b/include/text.php @@ -1,21 +1,16 @@ 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("include/map.php"); +require_once("mod/proxy.php"); + if(! function_exists('replace_macros')) { /** * This is our template processor - * - * @param string|FriendicaSmarty $s the string requiring macro substitution, + * + * @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 @@ -60,13 +55,13 @@ if(! function_exists('notags')) { * 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 @@ -94,12 +89,12 @@ function escape_tags($string) { }} -// 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. + * generate a string that's random, but usually pronounceable. * used to generate initial passwords * @param int $len * @return string @@ -109,7 +104,7 @@ 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'; @@ -153,7 +148,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 @@ -170,7 +165,7 @@ function autoname($len) { } } if(substr($word,-1) == 'q') - $word = substr($word,0,-1); + $word = substr($word,0,-1); return $word; }} @@ -186,11 +181,11 @@ if(! function_exists('xmlify')) { */ function xmlify($str) { /* $buffer = ''; - + $len = mb_strlen($str); for($x = 0; $x < $len; $x ++) { $char = mb_substr($str,$x,1); - + switch( $char ) { case "\r" : @@ -216,16 +211,18 @@ 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 = mb_ereg_replace(">", ">", $buffer); - + */ + $buffer = htmlspecialchars($str, ENT_QUOTES, "UTF-8"); $buffer = trim($buffer); + return($buffer); }} @@ -238,12 +235,14 @@ if(! function_exists('unxmlify')) { function unxmlify($s) { // $ret = str_replace('&','&', $s); // $ret = str_replace(array('<','>','"','''),array('<','>','"',"'"),$ret); - $ret = mb_ereg_replace('&', '&', $s); + /*$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); - return $ret; + */ + $ret = htmlspecialchars_decode($s, ENT_QUOTES); + return $ret; }} if(! function_exists('hex2bin')) { @@ -273,25 +272,25 @@ if(! function_exists('paginate_data')) { * @return Array data for pagination template */ function paginate_data(&$a, $count=null) { - $stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string); + $stripped = preg_replace('/([&?]page=[0-9]*)/','',$a->query_string); $stripped = str_replace('q=','',$stripped); $stripped = trim($stripped,'/'); $pagenum = $a->pager['page']; - if (($a->page_offset != "") AND !strstr($stripped, "&offset=")) + if (($a->page_offset != "") AND !preg_match('/[?&].offset=/', $stripped)) $stripped .= "&offset=".urlencode($a->page_offset); - if (!strpos($stripped, "?")) { - if ($pos = strpos($stripped, "&")) - $stripped = substr($stripped, 0, $pos)."?".substr($stripped, $pos + 1); - } $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); + } - $d[$name] = array('url'=>$url, 'text'=>$text, 'class'=>$class); + $d[$name] = array('url'=>$url, 'text'=>$text, 'class'=>$class); } if (!is_null($count)){ @@ -359,9 +358,9 @@ if(! function_exists('paginate')) { * 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. - * + * will limit the results to the correct items for the current page. + * The actual page handling is then accomplished at the application layer. + * * @param App $a App instance * @return string html for pagination #FIXME remove html */ @@ -388,6 +387,18 @@ function alt_pager(&$a, $i) { }} +if(! function_exists('scroll_loader')) { +/** + * Loader for infinite scrolling + * @return string html for loader + */ +function scroll_loader() { + $tpl = get_markup_template("scroll_loader.tpl"); + return replace_macros($tpl, array( + 'wait' => t('Loading more entries...'), + 'end' => t('The end') + )); +}} if(! function_exists('expand_acl')) { /** @@ -410,11 +421,11 @@ function expand_acl($s) { } } return $ret; -}} +}} if(! function_exists('sanitise_acl')) { /** - * Wrap ACL elements in angle brackets for storage + * Wrap ACL elements in angle brackets for storage * @param string $item */ function sanitise_acl(&$item) { @@ -428,10 +439,10 @@ function sanitise_acl(&$item) { if(! function_exists('perms2str')) { /** * Convert an ACL array to a storable string - * + * * Normally ACL permissions will be an array. * We'll also allow a comma-separated string. - * + * * @param string|array $p * @return string */ @@ -454,16 +465,22 @@ if(! function_exists('item_new_uri')) { /** * generate a guaranteed unique (for this domain) item ID for ATOM * safe from birthday paradox - * + * * @param string $hostname * @param int $uid * @return string */ -function item_new_uri($hostname,$uid) { +function item_new_uri($hostname,$uid, $guid = "") { do { $dups = false; - $hash = random_string(); + + if ($guid == "") + $hash = get_guid(32); + else { + $hash = $guid; + $guid = ""; + } $uri = "urn:X-dfrn:" . $hostname . ':' . $uid . ':' . $hash; @@ -482,9 +499,9 @@ if(! function_exists('photo_new_resource')) { /** * Generate a guaranteed unique photo ID. * safe from birthday paradox - * + * * @return string - */ + */ function photo_new_resource() { do { @@ -505,12 +522,12 @@ if(! function_exists('load_view_file')) { * @deprecated * wrapper to load a view template, checking for alternate * languages before falling back to the default - * + * * @global string $lang * @global App $a * @param string $s view name * @return string - */ + */ function load_view_file($s) { global $lang, $a; if(! isset($lang)) @@ -543,7 +560,7 @@ if(! function_exists('get_intltext_template')) { /** * load a view template, checking for alternate * languages before falling back to the default - * + * * @global string $lang * @param string $s view path * @return string @@ -580,7 +597,7 @@ function get_intltext_template($s) { if(! function_exists('get_markup_template')) { /** * load template $s - * + * * @param string $s * @param string $root * @return string @@ -595,15 +612,15 @@ function get_markup_template($s, $root = '') { } catch (Exception $e) { echo "
".__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 @@ -640,11 +657,11 @@ if(! function_exists('attribute_contains')) { * 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 + * 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 @@ -657,6 +674,9 @@ function attribute_contains($attr,$s) { }} if(! function_exists('logger')) { +/* setup int->string log level map */ +$LOGGER_LEVELS = array(); + /** * log levels: * LOGGER_NORMAL (default) @@ -664,7 +684,7 @@ if(! function_exists('logger')) { * LOGGER_DEBUG * LOGGER_DATA * LOGGER_ALL - * + * * @global App $a * @global dba $db * @param string $msg @@ -674,9 +694,17 @@ 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'); @@ -684,8 +712,19 @@ function logger($msg,$level = 0) { if((! $debugging) || (! $logfile) || ($level > $loglevel)) return; + $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, datetime_convert() . ':' . session_id() . ' ' . $msg . "\n", FILE_APPEND); + @file_put_contents($logfile, $logline, FILE_APPEND); $a->save_timestamp($stamp1, "file"); return; }} @@ -694,7 +733,7 @@ function logger($msg,$level = 0) { if(! function_exists('activity_match')) { /** * Compare activity uri. Knows about activity namespace. - * + * * @param string $haystack * @param string $needle * @return boolean @@ -709,18 +748,21 @@ function activity_match($haystack,$needle) { if(! function_exists('get_tags')) { /** * Pull out all #hashtags and @person tags from $s; - * We also get @person@domain.com - which would make + * 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(); + // Convert hashtag links to hashtags + $s = preg_replace("/#\[url\=([^\[\]]*)\](.*?)\[\/url\]/ism", "#$2", $s); + // ignore anything in a code block $s = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$s); @@ -749,7 +791,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 @@ -770,18 +812,18 @@ function get_tags($s) { }} -// +// if(! function_exists('qp')) { /** * quick and dirty quoted_printable encoding - * + * * @param string $s * @return string - */ + */ function qp($s) { return str_replace ("%","=",rawurlencode($s)); -}} +}} @@ -799,17 +841,23 @@ function get_mentions($item) { foreach($arr as $x) { $matches = null; if(preg_match('/@\[url=([^\]]*)\]/',$x,$matches)) { - $o .= "\t\t" . '' . "\r\n"; $o .= "\t\t" . '' . "\r\n"; + $o .= "\t\t" . '' . "\r\n"; } } + + if (!$item['private']) { + $o .= "\t\t".''."\r\n"; + $o .= "\t\t".''."\r\n"; + } + return $o; }} if(! function_exists('contact_block')) { /** * Get html for contact block. - * + * * @template contact_block.tpl * @hook contact_block_end (contacts=>array, output=>string) * @return string @@ -826,8 +874,14 @@ function contact_block() { if((! is_array($a->profile)) || ($a->profile['hide-friends'])) return $o; - $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 AND `hidden` = 0 AND `archive` = 0", - intval($a->profile['uid']) + $r = q("SELECT COUNT(*) AS `total` FROM `contact` + WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 + AND `hidden` = 0 AND `archive` = 0 + AND `network` IN ('%s', '%s', '%s')", + intval($a->profile['uid']), + dbesc(NETWORK_DFRN), + dbesc(NETWORK_OSTATUS), + dbesc(NETWORK_DIASPORA) ); if(count($r)) { $total = intval($r[0]['total']); @@ -835,10 +889,16 @@ 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", + $r = q("SELECT * FROM `contact` + WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 + AND `hidden` = 0 AND `archive` = 0 + AND `network` IN ('%s', '%s', '%s') ORDER BY RAND() LIMIT %d", intval($a->profile['uid']), + dbesc(NETWORK_DFRN), + dbesc(NETWORK_OSTATUS), + dbesc(NETWORK_DIASPORA), intval($shown) ); if(count($r)) { @@ -849,7 +909,7 @@ function contact_block() { } } } - + $tpl = get_markup_template('contact_block.tpl'); $o = replace_macros($tpl, array( '$contacts' => $contacts, @@ -867,7 +927,7 @@ function contact_block() { if(! function_exists('micropro')) { /** - * + * * @param array $contact * @param boolean $redirect * @param string $class @@ -886,7 +946,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { if($redirect) { $a = get_app(); $redirect_url = $a->get_baseurl() . '/redir/' . $contact['id']; - if(local_user() && ($contact['uid'] == local_user()) && ($contact['network'] === 'dfrn')) { + if(local_user() && ($contact['uid'] == local_user()) && ($contact['network'] === NETWORK_DFRN)) { $redir = true; $url = $redirect_url; $sparkle = ' sparkle'; @@ -898,19 +958,19 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { if($click) $url = ''; if($textmode) { - return '
'. $contact['name'] . '
' . "\r\n"; } else { - return '
' . $contact['name'] 
+			. (($url) ? ' href=' . $contact['name']
 			. '
' . "\r\n"; } }} @@ -920,29 +980,41 @@ 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 + * @param boolean $savedsearch show save search button */ -function search($s,$id='search-box',$url='/search',$save = false) { +function search($s,$id='search-box',$url='/search',$save = false, $aside = true) { $a = get_app(); - $o = '
'; - $o .= '
'; - $o .= ''; - $o .= ''; - if($save) - $o .= ''; - $o .= '
'; - return $o; + + $values = array( + '$s' => $s, + '$id' => $id, + '$action_url' => $a->get_baseurl((stristr($url,'network')) ? true : false) . $url, + '$search_label' => t('Search'), + '$save_label' => t('Save'), + '$savedsearch' => feature_enabled(local_user(),'savedsearch'), + ); + + if (!$aside) { + $values['$searchoption'] = array( + t("Full Text"), + t("Tags"), + t("Contacts")); + + if (get_config('system','poco_local_search')) + $values['$searchoption'][] = t("Forums"); + } + + return replace_macros(get_markup_template('searchbox.tpl'), $values); }} if(! function_exists('valid_email')) { /** * Check if $x is a valid email string - * + * * @param string $x * @return boolean */ @@ -978,7 +1050,7 @@ function linkify($s) { * @hook poke_verbs pokes array */ function get_poke_verbs() { - + // index is present tense verb // value is array containing past tense verb, translation of present, translation of past @@ -1000,7 +1072,7 @@ function get_poke_verbs() { * @hook mood_verbs moods array */ function get_mood_verbs() { - + $arr = array( 'happy' => t('happy'), 'sad' => t('sad'), @@ -1035,10 +1107,10 @@ if(! function_exists('smilies')) { * Replaces text emoticons with graphical images * * It is expected that this function will be called using HTML text. - * We will escape text between HTML pre and code blocks from being - * processed. - * - * At a higher level, the bbcode [nosmile] tag can be used to prevent this + * We will escape text between HTML pre and code blocks from being + * processed. + * + * At a higher level, the bbcode [nosmile] tag can be used to prevent this * function from being executed by the prepare_text() routine when preparing * bbcode source for HTML display * @@ -1050,55 +1122,56 @@ if(! function_exists('smilies')) { function smilies($s, $sample = false) { $a = get_app(); - if(intval(get_config('system','no_smilies')) + if(intval(get_config('system','no_smilies')) || (local_user() && intval(get_pconfig(local_user(),'system','no_smilies')))) return $s; $s = preg_replace_callback('/
(.*?)<\/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',
-                'red#'
+                'red#',
+		'red#matrix'
 
 	);
 
 	$icons = array(
-		'<3',
-		'</3',
-		'<\\3',
+		'<3',
+		'</3',
+		'<\\3',
 		':-)',
 		';-)',
 		':-(',
@@ -1111,7 +1184,7 @@ function smilies($s, $sample = false) {
 		':-D',
 		'8-|',
 		'8-O',
-		':-O',                
+		':-O',
 		'\\o/',
 		'o.O',
 		'O.o',
@@ -1129,7 +1202,8 @@ function smilies($s, $sample = false) {
 		':like',
 		':dislike',
 		'~friendica ~friendica',
-		'red red'
+		'redredmatrix',
+		'redredmatrix'
 	);
 
 	$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);
@@ -1164,7 +1238,7 @@ function smile_decode($m) {
 
 /**
  * expand <3333 to the correct number of hearts
- * 
+ *
  * @param string $x
  * @return string
  */
@@ -1174,7 +1248,7 @@ function preg_heart($x) {
 		return $x[0];
 	$t = '';
 	for($cnt = 0; $cnt < strlen($x[1]); $cnt ++)
-		$t .= '<3';
+		$t .= '<3';
 	$r =  str_replace($x[0],$t,$x[0]);
 	return $r;
 }
@@ -1183,7 +1257,7 @@ function preg_heart($x) {
 if(! function_exists('day_translate')) {
 /**
  * Translate days and months names
- * 
+ *
  * @param string $s
  * @return string
  */
@@ -1203,7 +1277,7 @@ function day_translate($s) {
 if(! function_exists('normalise_link')) {
 /**
  * Normalize url
- * 
+ *
  * @param string $url
  * @return string
  */
@@ -1217,15 +1291,15 @@ function normalise_link($url) {
 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.
  *
  * @param string $a first url
  * @param string $b second url
  * @return boolean True if the URLs match, otherwise False
  *
- */	
+ */
 function link_compare($a,$b) {
 	if(strcasecmp(normalise_link($a),normalise_link($b)) === 0)
 		return true;
@@ -1236,7 +1310,7 @@ function link_compare($a,$b) {
 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
  */
@@ -1260,6 +1334,28 @@ function redir_private_images($a, &$item) {
 
 }}
 
+function put_item_in_cache(&$item, $update = false) {
+
+	if (($item["rendered-hash"] != hash("md5", $item["body"])) OR ($item["rendered-hash"] == "") OR
+		($item["rendered-html"] == "") OR get_config("system", "ignore_cache")) {
+
+		// The function "redir_private_images" changes the body.
+		// I'm not sure if we should store it permanently, so we save the old value.
+		$body = $item["body"];
+
+		$a = get_app();
+		redir_private_images($a, $item);
+
+		$item["rendered-html"] = prepare_text($item["body"]);
+		$item["rendered-hash"] = hash("md5", $item["body"]);
+		$item["body"] = $body;
+
+		if ($update AND ($item["id"] != 0)) {
+			q("UPDATE `item` SET `rendered-html` = '%s', `rendered-hash` = '%s' WHERE `id` = %d",
+				dbesc($item["rendered-html"]), dbesc($item["rendered-hash"]), intval($item["id"]));
+		}
+	}
+}
 
 // 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
@@ -1268,7 +1364,7 @@ if(! function_exists('prepare_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
- * 
+ *
  * @param array $item
  * @param boolean $attach
  * @return string item body html
@@ -1276,7 +1372,7 @@ if(! function_exists('prepare_body')) {
  * @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) {
+function prepare_body(&$item,$attach = false, $preview = false) {
 
 	$a = get_app();
 	call_hooks('prepare_body_init', $item);
@@ -1311,32 +1407,10 @@ function prepare_body(&$item,$attach = false) {
 	$item['hashtags'] = $hashtags;
 	$item['mentions'] = $mentions;
 
+	put_item_in_cache($item, true);
+	$s = $item["rendered-html"];
 
-	//$cachefile = get_cachefile($item["guid"]."-".strtotime($item["edited"])."-".hash("crc32", $item['body']));
-	$cachefile = get_cachefile($item["guid"]."-".hash("md5", $item['body']));
-
-	if (($cachefile != '')) {
-		if (file_exists($cachefile)) {
-			$stamp1 = microtime(true);
-			$s = file_get_contents($cachefile);
-			$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 {
-		redir_private_images($a, $item);
-		$s = prepare_text($item['body']);
-	}
-
-
-	$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'];
 
@@ -1422,6 +1496,14 @@ function prepare_body(&$item,$attach = false) {
 	}
 	$s = $s . $as;
 
+	// map
+	if(strpos($s,'
') !== false && $item['coord']) { + $x = generate_map(trim($item['coord'])); + if($x) { + $s = preg_replace('/\
/','$0' . $x,$s); + } + } + // Look for spoiler $spoilersearch = '
'; @@ -1453,6 +1535,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); @@ -1463,7 +1552,7 @@ function prepare_body(&$item,$attach = false) { if(! function_exists('prepare_text')) { /** * Given a text string, convert from bbcode to html and add smilie icons. - * + * * @param string $text * @return string */ @@ -1476,17 +1565,17 @@ function prepare_text($text) { else $s = smilies(bbcode($text)); - return $s; + return trim($s); }} /** * return array with details for categories and folders for an item - * + * * @param array $item * @return array - * + * * [ * [ // categories array * { @@ -1504,7 +1593,7 @@ function prepare_text($text) { * 'first': 'is the first in this array? true/false', * 'last': 'is the last in this array? true/false', * } , - * .... + * .... * ] * ] */ @@ -1529,7 +1618,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; @@ -1594,10 +1683,10 @@ function feed_salmonlinks($nick) { $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; }} @@ -1609,16 +1698,31 @@ if(! function_exists('get_plink')) { */ function get_plink($item) { $a = get_app(); - $ret = array( - 'href' => $a->get_baseurl()."/display/".$a->user['nickname']."/".$item['id'], - 'title' => t('link to source'), - ); - $ret["orig"] = $ret["href"]; + 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('View on separate page'), + 'orig_title' => t('view on separate page'), + ); + + if (x($item,'plink')) { + $ret["href"] = $item['plink']; + $ret["title"] = t('link to source'); + } + + } 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)) - if (x($item,'plink')) - $ret["href"] = $item['plink']; return($ret); }} @@ -1640,17 +1744,17 @@ if(! function_exists('lang_selector')) { /** * get html for language selector * @global string $lang - * @return string + * @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)) @@ -1668,11 +1772,11 @@ 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; }} @@ -1700,7 +1804,7 @@ function return_bytes ($size_str) { function generate_user_guid() { $found = true; do { - $guid = random_string(16); + $guid = get_guid(32); $x = q("SELECT `uid` FROM `user` WHERE `guid` = '%s' LIMIT 1", dbesc($guid) ); @@ -1760,7 +1864,7 @@ function base64url_decode($s) { if (!function_exists('str_getcsv')) { /** * Parse csv string - * + * * @param string $input * @param string $delimiter * @param string $enclosure @@ -1805,13 +1909,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; @@ -1822,7 +1926,7 @@ if (!function_exists('str_getcsv')) { return false; } } -} +} /** * return div element with class 'clear' @@ -1846,7 +1950,7 @@ function bb_translate_video($s) { $s = str_replace($mtch[0],'[vimeo]' . $mtch[1] . '[/vimeo]',$s); } } - return $s; + return $s; } function html2bb_video($s) { @@ -1877,7 +1981,7 @@ function array_xmlify($val){ /** * transorm link href and img src from relative to absolute - * + * * @param string $text * @param string $base base url * @return string @@ -1890,7 +1994,7 @@ function reltoabs($text, $base) $base = rtrim($base,'/'); $base2 = $base . "/"; - + // Replace links $pattern = "/]*) href=\"(?!http|https|\/)([^\"]*)\"/"; $replace = "','[',']'),array('%3c','%3e','%5b','%5d'),$s); @@ -2013,10 +2117,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; @@ -2042,9 +2148,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]); @@ -2067,6 +2179,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; @@ -2076,11 +2190,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) . ']'); @@ -2090,14 +2207,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", @@ -2107,15 +2229,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'); @@ -2132,7 +2261,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); @@ -2165,3 +2294,34 @@ 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