X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ftext.php;h=311422c5751d9af55f2399298a1b4543f94e0c50;hb=4724c7de72cd7bf40af52f0ca07fdf8313b922f4;hp=6856d28aa3e5794f2df39d698c19993d2796a42c;hpb=745bc7cf3f3990a8887fcc806a16d218f82e35db;p=friendica.git diff --git a/include/text.php b/include/text.php index 6856d28aa3..311422c575 100644 --- a/include/text.php +++ b/include/text.php @@ -2,20 +2,25 @@ /** * @file include/text.php */ + use Friendica\App; use Friendica\Content\ContactSelector; use Friendica\Content\Feature; use Friendica\Content\Smilies; +use Friendica\Content\Text\BBCode; use Friendica\Core\Addon; use Friendica\Core\Config; +use Friendica\Core\L10n; use Friendica\Core\PConfig; use Friendica\Core\System; use Friendica\Database\DBM; +use Friendica\Model\Event; +use Friendica\Model\Item; use Friendica\Model\Profile; -use Friendica\Model\Term; +use Friendica\Render\FriendicaSmarty; +use Friendica\Util\DateTimeFormat; use Friendica\Util\Map; -require_once "include/friendica_smarty.php"; require_once "mod/proxy.php"; require_once "include/conversation.php"; @@ -294,14 +299,14 @@ function paginate_data(App $a, $count = null) { if (!is_null($count)) { // minimal pager (newer / older) $data['class'] = 'pager'; - _l($data, 'prev', $url . '&page=' . ($a->pager['page'] - 1), t('newer'), 'previous' . ($a->pager['page'] == 1 ? ' disabled' : '')); - _l($data, 'next', $url . '&page=' . ($a->pager['page'] + 1), t('older'), 'next' . ($count <= 0 ? ' disabled' : '')); + _l($data, 'prev', $url . '&page=' . ($a->pager['page'] - 1), L10n::t('newer'), 'previous' . ($a->pager['page'] == 1 ? ' disabled' : '')); + _l($data, 'next', $url . '&page=' . ($a->pager['page'] + 1), L10n::t('older'), 'next' . ($count <= 0 ? ' disabled' : '')); } else { // full pager (first / prev / 1 / 2 / ... / 14 / 15 / next / last) $data['class'] = 'pagination'; if ($a->pager['total'] > $a->pager['itemspage']) { - _l($data, 'first', $url . '&page=1', t('first'), $a->pager['page'] == 1 ? 'disabled' : ''); - _l($data, 'prev', $url . '&page=' . ($a->pager['page'] - 1), t('prev'), $a->pager['page'] == 1 ? 'disabled' : ''); + _l($data, 'first', $url . '&page=1', L10n::t('first'), $a->pager['page'] == 1 ? 'disabled' : ''); + _l($data, 'prev', $url . '&page=' . ($a->pager['page'] - 1), L10n::t('prev'), $a->pager['page'] == 1 ? 'disabled' : ''); $numpages = $a->pager['total'] / $a->pager['itemspage']; @@ -335,8 +340,8 @@ function paginate_data(App $a, $count = null) { $data['pages'] = $pages; $lastpage = (($numpages > intval($numpages)) ? intval($numpages)+1 : $numpages); - _l($data, 'next', $url . '&page=' . ($a->pager['page'] + 1), t('next'), $a->pager['page'] == $lastpage ? 'disabled' : ''); - _l($data, 'last', $url . '&page=' . $lastpage, t('last'), $a->pager['page'] == $lastpage ? 'disabled' : ''); + _l($data, 'next', $url . '&page=' . ($a->pager['page'] + 1), L10n::t('next'), $a->pager['page'] == $lastpage ? 'disabled' : ''); + _l($data, 'last', $url . '&page=' . $lastpage, L10n::t('last'), $a->pager['page'] == $lastpage ? 'disabled' : ''); } } @@ -390,8 +395,8 @@ function alt_pager(App $a, $i) { function scroll_loader() { $tpl = get_markup_template("scroll_loader.tpl"); return replace_macros($tpl, [ - 'wait' => t('Loading more entries...'), - 'end' => t('The end') + 'wait' => L10n::t('Loading more entries...'), + 'end' => L10n::t('The end') ]); } @@ -484,31 +489,6 @@ function item_new_uri($hostname, $uid, $guid = "") { return $uri; } - -/** - * Generate a guaranteed unique photo ID. - * safe from birthday paradox - * - * @return string - */ -function photo_new_resource() { - - do { - $found = false; - $resource = hash('md5',uniqid(mt_rand(),true)); - $r = q("SELECT `id` FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", - dbesc($resource) - ); - - if (DBM::is_result($r)) { - $found = true; - } - } while ($found == true); - - return $resource; -} - - /** * @deprecated * wrapper to load a view template, checking for alternate @@ -613,36 +593,6 @@ function get_markup_template($s, $root = '') { return $template; } - -/** - * - * @param App $a - * @param string $filename - * @param string $root - * @return string - */ -function get_template_file($a, $filename, $root = '') { - $theme = current_theme(); - - // Make sure $root ends with a slash / - if ($root !== '' && substr($root, -1, 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(sprintf('%sview/theme/%s}/%s', $root, $a->theme_info["extends"], $filename))) { - $template_file = sprintf('%sview/theme/%s}/%s', $root, $a->theme_info["extends"], $filename); - } elseif (file_exists("{$root}/$filename")) { - $template_file = "{$root}/$filename"; - } else { - $template_file = "{$root}view/$filename"; - } - - return $template_file; -} - - /** * for html,xml parsing - let's say you've got * an attribute foobar="class1 class2 class3" @@ -721,7 +671,7 @@ function logger($msg, $level = 0) { $callers = debug_backtrace(); $logline = sprintf("%s@%s\t[%s]:%s:%s:%s\t%s\n", - datetime_convert('UTC', 'UTC', 'now', 'Y-m-d\TH:i:s\Z'), + DateTimeFormat::utcNow(DateTimeFormat::ATOM), $process_id, $LOGGER_LEVELS[$level], basename($callers[0]['file']), @@ -765,12 +715,16 @@ function dlogger($msg, $level = 0) { return; } - $logfile = Config::get('system','dlogfile'); - + $logfile = Config::get('system', 'dlogfile'); if (! $logfile) { return; } + $dlogip = Config::get('system', 'dlogip'); + if (!is_null($dlogip) && $_SERVER['REMOTE_ADDR'] != $dlogip) { + return; + } + if (count($LOGGER_LEVELS) == 0) { foreach (get_defined_constants() as $k => $v) { if (substr($k, 0, 7) == "LOGGER_") { @@ -787,7 +741,7 @@ function dlogger($msg, $level = 0) { $callers = debug_backtrace(); $logline = sprintf("%s@\t%s:\t%s:\t%s\t%s\t%s\n", - datetime_convert(), + DateTimeFormat::utcNow(), $process_id, basename($callers[0]['file']), $callers[0]['line'], @@ -927,7 +881,7 @@ function contact_block() { $total = intval($r[0]['total']); } if (!$total) { - $contacts = t('No contacts'); + $contacts = L10n::t('No contacts'); $micropro = null; } else { // Splitting the query in two parts makes it much faster @@ -951,10 +905,10 @@ function contact_block() { dbesc(implode(",", $contacts))); if (DBM::is_result($r)) { - $contacts = sprintf(tt('%d Contact','%d Contacts', $total),$total); + $contacts = L10n::tt('%d Contact', '%d Contacts', $total); $micropro = []; foreach ($r as $rr) { - $micropro[] = micropro($rr,true,'mpfriend'); + $micropro[] = micropro($rr, true, 'mpfriend'); } } } @@ -964,7 +918,7 @@ function contact_block() { $o = replace_macros($tpl, [ '$contacts' => $contacts, '$nickname' => $a->profile['nickname'], - '$viewcontacts' => t('View Contacts'), + '$viewcontacts' => L10n::t('View Contacts'), '$micropro' => $micropro, ]); @@ -1053,27 +1007,27 @@ function search($s, $id = 'search-box', $url = 'search', $save = false, $aside = if (strpos($s, '#') === 0) { $mode = 'tag'; } - $save_label = $mode === 'text' ? t('Save') : t('Follow'); + $save_label = $mode === 'text' ? L10n::t('Save') : L10n::t('Follow'); $values = [ '$s' => htmlspecialchars($s), '$id' => $id, '$action_url' => $url, - '$search_label' => t('Search'), + '$search_label' => L10n::t('Search'), '$save_label' => $save_label, '$savedsearch' => Feature::isEnabled(local_user(),'savedsearch'), - '$search_hint' => t('@name, !forum, #tags, content'), + '$search_hint' => L10n::t('@name, !forum, #tags, content'), '$mode' => $mode ]; if (!$aside) { $values['$searchoption'] = [ - t("Full Text"), - t("Tags"), - t("Contacts")]; + L10n::t("Full Text"), + L10n::t("Tags"), + L10n::t("Contacts")]; if (Config::get('system','poco_local_search')) { - $values['$searchoption'][] = t("Forums"); + $values['$searchoption'][] = L10n::t("Forums"); } } @@ -1108,7 +1062,7 @@ function linkify($s) { * Load poke verbs * * @return array index is present tense verb - value is array containing past tense verb, translation of present, translation of past + * value is array containing past tense verb, translation of present, translation of past * @hook poke_verbs pokes array */ function get_poke_verbs() { @@ -1117,12 +1071,12 @@ function get_poke_verbs() { // value is array containing past tense verb, translation of present, translation of past $arr = [ - 'poke' => ['poked', t('poke'), t('poked')], - 'ping' => ['pinged', t('ping'), t('pinged')], - 'prod' => ['prodded', t('prod'), t('prodded')], - 'slap' => ['slapped', t('slap'), t('slapped')], - 'finger' => ['fingered', t('finger'), t('fingered')], - 'rebuff' => ['rebuffed', t('rebuff'), t('rebuffed')], + 'poke' => ['poked', L10n::t('poke'), L10n::t('poked')], + 'ping' => ['pinged', L10n::t('ping'), L10n::t('pinged')], + 'prod' => ['prodded', L10n::t('prod'), L10n::t('prodded')], + 'slap' => ['slapped', L10n::t('slap'), L10n::t('slapped')], + 'finger' => ['fingered', L10n::t('finger'), L10n::t('fingered')], + 'rebuff' => ['rebuffed', L10n::t('rebuff'), L10n::t('rebuffed')], ]; Addon::callHooks('poke_verbs', $arr); return $arr; @@ -1136,11 +1090,11 @@ function get_poke_verbs() { */ function day_translate($s) { $ret = str_replace(['Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'], - [t('Monday'), t('Tuesday'), t('Wednesday'), t('Thursday'), t('Friday'), t('Saturday'), t('Sunday')], + [L10n::t('Monday'), L10n::t('Tuesday'), L10n::t('Wednesday'), L10n::t('Thursday'), L10n::t('Friday'), L10n::t('Saturday'), L10n::t('Sunday')], $s); $ret = str_replace(['January','February','March','April','May','June','July','August','September','October','November','December'], - [t('January'), t('February'), t('March'), t('April'), t('May'), t('June'), t('July'), t('August'), t('September'), t('October'), t('November'), t('December')], + [L10n::t('January'), L10n::t('February'), L10n::t('March'), L10n::t('April'), L10n::t('May'), L10n::t('June'), L10n::t('July'), L10n::t('August'), L10n::t('September'), L10n::t('October'), L10n::t('November'), L10n::t('December')], $ret); return $ret; @@ -1154,10 +1108,10 @@ function day_translate($s) { */ function day_short_translate($s) { $ret = str_replace(['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'], - [t('Mon'), t('Tue'), t('Wed'), t('Thu'), t('Fri'), t('Sat'), t('Sun')], + [L10n::t('Mon'), L10n::t('Tue'), L10n::t('Wed'), L10n::t('Thu'), L10n::t('Fri'), L10n::t('Sat'), L10n::t('Sun')], $s); $ret = str_replace(['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov','Dec'], - [t('Jan'), t('Feb'), t('Mar'), t('Apr'), t('May'), ('Jun'), t('Jul'), t('Aug'), t('Sep'), t('Oct'), t('Nov'), t('Dec')], + [L10n::t('Jan'), L10n::t('Feb'), L10n::t('Mar'), L10n::t('Apr'), L10n::t('May'), ('Jun'), L10n::t('Jul'), L10n::t('Aug'), L10n::t('Sep'), L10n::t('Oct'), L10n::t('Nov'), L10n::t('Dec')], $ret); return $ret; } @@ -1215,8 +1169,25 @@ function redir_private_images($a, &$item) } } +/** + * Sets the "rendered-html" field of the provided item + * + * Body is preserved to avoid side-effects as we modify it just-in-time for spoilers and private image links + * + * @param array $item + * @param bool $update + * + * @todo Remove reference, simply return "rendered-html" and "rendered-hash" + */ function put_item_in_cache(&$item, $update = false) { + $body = $item["body"]; + + // Add the content warning + if (!empty($item['content-warning'])) { + $item["body"] = $item['content-warning'] . '[spoiler]' . $item["body"] . '[/spoiler]'; + } + $rendered_hash = defaults($item, 'rendered-hash', ''); if ($rendered_hash == '' @@ -1224,22 +1195,19 @@ function put_item_in_cache(&$item, $update = false) || $rendered_hash != hash("md5", $item["body"]) || Config::get("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 && ($item["id"] > 0)) { dba::update('item', ['rendered-html' => $item["rendered-html"], 'rendered-hash' => $item["rendered-hash"]], ['id' => $item["id"]], false); } } + + $item["body"] = $body; } /** @@ -1267,37 +1235,37 @@ function prepare_body(&$item, $attach = false, $preview = false) { // 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); + $ev = Event::getItemHTML($item); return $ev; } - if (!Config::get('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)); + $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)); - while ($tag = dba::fetch($taglist)) { - if ($tag["url"] == "") { - $tag["url"] = $searchpath.strtolower($tag["term"]); - } + while ($tag = dba::fetch($taglist)) { + if ($tag["url"] == "") { + $tag["url"] = $searchpath . strtolower($tag["term"]); + } - $orig_tag = $tag["url"]; + $orig_tag = $tag["url"]; - $tag["url"] = best_link_url($item, $sp, $tag["url"]); + $tag["url"] = best_link_url($item, $sp, $tag["url"]); - if ($tag["type"] == TERM_HASHTAG) { - if ($orig_tag != $tag["url"]) { - $item['body'] = str_replace($orig_tag, $tag["url"], $item['body']); - } - $hashtags[] = "#".$tag["term"].""; - $prefix = "#"; - } elseif ($tag["type"] == TERM_MENTION) { - $mentions[] = "@".$tag["term"].""; - $prefix = "@"; + if ($tag["type"] == TERM_HASHTAG) { + if ($orig_tag != $tag["url"]) { + $item['body'] = str_replace($orig_tag, $tag["url"], $item['body']); } - $tags[] = $prefix."".$tag["term"].""; + + $hashtags[] = "#" . $tag["term"] . ""; + $prefix = "#"; + } elseif ($tag["type"] == TERM_MENTION) { + $mentions[] = "@" . $tag["term"] . ""; + $prefix = "@"; } - dba::close($taglist); + + $tags[] = $prefix . "" . $tag["term"] . ""; } + dba::close($taglist); $item['tags'] = $tags; $item['hashtags'] = $hashtags; @@ -1327,62 +1295,55 @@ function prepare_body(&$item, $attach = false, $preview = false) { $as = ''; $vhead = false; - $arr = explode('[/attach],', $item['attach']); - if (count($arr)) { - foreach ($arr as $r) { - $matches = false; - $icon = ''; - $cnt = preg_match_all('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$r ,$matches, PREG_SET_ORDER); - if ($cnt) { - foreach ($matches as $mtch) { - $mime = $mtch[3]; - - if ((local_user() == $item['uid']) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN)) { - $the_url = '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'), [ - '$baseurl' => System::baseUrl(), - ]); - $a->page['end'] .= replace_macros(get_markup_template('videos_end.tpl'), [ - '$baseurl' => System::baseUrl(), - ]); - } - - $id = end(explode('/', $the_url)); - $as .= replace_macros(get_markup_template('video_top.tpl'), [ - '$video' => [ - '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'; - } - - $title = ((strlen(trim($mtch[4]))) ? escape_tags(trim($mtch[4])) : escape_tags($mtch[1])); - $title .= ' ' . $mtch[2] . ' ' . t('bytes'); - - $icon = '
'; - $as .= '' . $icon . ''; - } + $matches = []; + preg_match_all('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\"(?: title=\"(.*?)\")?|', $item['attach'], $matches, PREG_SET_ORDER); + foreach ($matches as $mtch) { + $mime = $mtch[3]; + + if ((local_user() == $item['uid']) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN)) { + $the_url = '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'), [ + '$baseurl' => System::baseUrl(), + ]); + $a->page['end'] .= replace_macros(get_markup_template('videos_end.tpl'), [ + '$baseurl' => System::baseUrl(), + ]); } + + $id = end(explode('/', $the_url)); + $as .= replace_macros(get_markup_template('video_top.tpl'), [ + '$video' => [ + 'id' => $id, + 'title' => L10n::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'; } + + $title = escape_tags(trim(!empty($mtch[4]) ? $mtch[4] : $mtch[1])); + $title .= ' ' . $mtch[2] . ' ' . L10n::t('bytes'); + + $icon = '
'; + $as .= '' . $icon . ''; } + if ($as != '') { $s .= '
'.$as.'
'; } @@ -1410,7 +1371,7 @@ function prepare_body(&$item, $attach = false, $preview = false) { while ((strpos($s, $spoilersearch) !== false)) { $pos = strpos($s, $spoilersearch); $rnd = random_string(8); - $spoilerreplace = '
' . sprintf(t('Click to open/close')) . ''. + $spoilerreplace = '
' . L10n::t('Click to open/close') . ''. '