X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ftext.php;h=8f0ff6e73e584153fce9fa13a318181bb55495e8;hb=e4a2430967f229dd02bc97c5c66be0620b3235d8;hp=c2c6dcdfc992d15f61d94c426559652024475d3b;hpb=8cf00147b3a7d2f424b5bbd7afd0f979f3b90045;p=friendica.git diff --git a/include/text.php b/include/text.php index c2c6dcdfc9..8f0ff6e73e 100644 --- a/include/text.php +++ b/include/text.php @@ -702,20 +702,18 @@ $LOGGER_LEVELS = array(); * LOGGER_ALL * * @global App $a - * @global dba $db * @global array $LOGGER_LEVELS * @param string $msg * @param int $level */ function logger($msg, $level = 0) { $a = get_app(); - global $db; global $LOGGER_LEVELS; // turn off logger in install mode if ( $a->module == 'install' - || ! ($db && $db->connected) + || !dba::$connected ) { return; } @@ -776,7 +774,6 @@ function logger($msg, $level = 0) { * LOGGER_ALL * * @global App $a - * @global dba $db * @global array $LOGGER_LEVELS * @param string $msg * @param int $level @@ -784,12 +781,11 @@ function logger($msg, $level = 0) { function dlogger($msg, $level = 0) { $a = get_app(); - global $db; // turn off logger in install mode if ( $a->module == 'install' - || ! ($db && $db->connected) + || !dba::$connected ) { return; } @@ -1195,12 +1191,11 @@ function get_mood_verbs() { return $arr; } -if (! function_exists('day_translate')) { /** - * Translate days and months names - * - * @param string $s - * @return string + * @brief Translate days and months names. + * + * @param string $s String with day or month name. + * @return string Translated string. */ function day_translate($s) { $ret = str_replace(array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'), @@ -1212,8 +1207,23 @@ function day_translate($s) { $ret); return $ret; -}} +} +/** + * @brief Translate short days and months names. + * + * @param string $s String with short day or month name. + * @return string Translated string. + */ +function day_short_translate($s) { + $ret = str_replace(array('Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'), + array(t('Mon'), t('Tue'), t('Wed'), t('Thu'), t('Fri'), t('Sat'), t('Sund')), + $s); + $ret = str_replace(array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov','Dec'), + array(t('Jan'), t('Feb'), t('Mar'), t('Apr'), t('May'), ('Jun'), t('Jul'), t('Aug'), t('Sep'), t('Oct'), t('Nov'), t('Dec')), + $ret); + return $ret; +} if (! function_exists('normalise_link')) { /** @@ -1292,13 +1302,9 @@ function put_item_in_cache(&$item, $update = 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 - -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 + * @brief 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 @@ -1318,6 +1324,13 @@ function prepare_body(&$item, $attach = false, $preview = false) { $hashtags = array(); $mentions = array(); + // In order to provide theme developers more possibilities, event items + // are treated differently. + if ($item['object-type'] === ACTIVITY_OBJ_EVENT && isset($item['event-id'])) { + $ev = format_event_item($item); + return $ev; + } + if (!get_config('system','suppress_tags')) { $taglist = dba::p("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = ? AND `oid` = ? AND `type` IN (?, ?) ORDER BY `tid`", intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION)); @@ -1350,10 +1363,10 @@ function prepare_body(&$item, $attach = false, $preview = false) { $item['hashtags'] = $hashtags; $item['mentions'] = $mentions; - // Update the cached values if there is no "zrl=..." on the links - $update = (!local_user() and !remote_user() and ($item["uid"] == 0)); + // Update the cached values if there is no "zrl=..." on the links. + $update = (!local_user() && !remote_user() && ($item["uid"] == 0)); - // Or update it if the current viewer is the intented viewer + // Or update it if the current viewer is the intented viewer. if (($item["uid"] == local_user()) && ($item["uid"] != 0)) { $update = true; } @@ -1366,7 +1379,7 @@ function prepare_body(&$item, $attach = false, $preview = false) { $s = $prep_arr['html']; if (! $attach) { - // Replace the blockquotes with quotes that are used in mails + // Replace the blockquotes with quotes that are used in mails. $mailquote = '
'; $s = str_replace(array('
', '
', '
'), array($mailquote, $mailquote, $mailquote), $s); return $s; @@ -1379,7 +1392,7 @@ function prepare_body(&$item, $attach = false, $preview = false) { foreach ($arr as $r) { $matches = false; $icon = ''; - $cnt = preg_match_all('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$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) { $mime = $mtch[3]; @@ -1412,9 +1425,9 @@ function prepare_body(&$item, $attach = false, $preview = false) { )); } - $filetype = strtolower(substr($mime, 0, strpos($mime,'/'))); + $filetype = strtolower(substr($mime, 0, strpos($mime, '/'))); if ($filetype) { - $filesubtype = strtolower(substr($mime, strpos($mime,'/') + 1)); + $filesubtype = strtolower(substr($mime, strpos($mime, '/') + 1)); $filesubtype = str_replace('.', '-', $filesubtype); } else { $filetype = 'unkn'; @@ -1424,15 +1437,8 @@ function prepare_body(&$item, $attach = false, $preview = false) { $title = ((strlen(trim($mtch[4]))) ? escape_tags(trim($mtch[4])) : escape_tags($mtch[1])); $title .= ' ' . $mtch[2] . ' ' . t('bytes'); - if (($filetype == 'image') AND ($item['network'] == NETWORK_OSTATUS)) { - /// @todo Respect the spoiler for mastodon - $icon = ''; - $s .= '
' . $icon . ''; - } else { - $icon = '
'; - $as .= '' . $icon . ''; - } - + $icon = '
'; + $as .= '' . $icon . ''; } } } @@ -1441,19 +1447,19 @@ function prepare_body(&$item, $attach = false, $preview = false) { $s .= '
'.$as.'
'; } - // map + // Map. if (strpos($s, '
') !== false && x($item, 'coord')) { $x = generate_map(trim($item['coord'])); if ($x) { - $s = preg_replace('/\
/','$0' . $x,$s); + $s = preg_replace('/\
/', '$0' . $x, $s); } } - // Look for spoiler + // Look for spoiler. $spoilersearch = '
'; - // Remove line breaks before the spoiler + // Remove line breaks before the spoiler. while ((strpos($s, "\n" . $spoilersearch) !== false)) { $s = str_replace("\n" . $spoilersearch, $spoilersearch, $s); } @@ -1469,7 +1475,7 @@ function prepare_body(&$item, $attach = false, $preview = false) { $s = substr($s, 0, $pos) . $spoilerreplace . substr($s, $pos + strlen($spoilersearch)); } - // Look for quote with author + // Look for quote with author. $authorsearch = '
'; while ((strpos($s, $authorsearch) !== false)) { @@ -1480,7 +1486,7 @@ function prepare_body(&$item, $attach = false, $preview = false) { $s = substr($s, 0, $pos) . $authorreplace . substr($s, $pos + strlen($authorsearch)); } - // replace friendica image url size with theme preference + // 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); @@ -1490,15 +1496,13 @@ function prepare_body(&$item, $attach = false, $preview = false) { call_hooks('prepare_body_final', $prep_arr); return $prep_arr['html']; -}} - +} -if (! function_exists('prepare_text')) { /** - * Given a text string, convert from bbcode to html and add smilie icons. + * @brief Given a text string, convert from bbcode to html and add smilie icons. * - * @param string $text - * @return string + * @param string $text String with bbcode. + * @return string Formattet HTML. */ function prepare_text($text) { @@ -1511,9 +1515,7 @@ function prepare_text($text) { } return trim($s); -}} - - +} /** * return array with details for categories and folders for an item