X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ftext.php;h=ffa0ad0ed66c2c3f797897147637a3feb1a233cf;hb=eb7a86f9ad2d3767469ccb813dc7888fd94ceb95;hp=b34c3e902244f57b7219521dd9d4a957790fdc4d;hpb=4000e81f1b3d423248e2919c36ea8f9f794c6b26;p=friendica.git diff --git a/include/text.php b/include/text.php index b34c3e9022..ffa0ad0ed6 100644 --- a/include/text.php +++ b/include/text.php @@ -6,10 +6,13 @@ use Friendica\App; use Friendica\Content\ContactSelector; use Friendica\Content\Feature; use Friendica\Content\Smilies; +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\Profile; use Friendica\Model\Term; use Friendica\Util\Map; @@ -82,7 +85,7 @@ function random_string($size = 64) * @return string Filtered string */ function notags($string) { - return str_replace(array("<", ">"), array('[', ']'), $string); + return str_replace(["<", ">"], ['[', ']'], $string); // High-bit filter no longer used // return str_replace(array("<",">","\xBA","\xBC","\xBE"), array('[',']','','',''), $string); @@ -112,12 +115,12 @@ function autoname($len) { return ''; } - $vowels = array('a','a','ai','au','e','e','e','ee','ea','i','ie','o','ou','u'); + $vowels = ['a','a','ai','au','e','e','e','ee','ea','i','ie','o','ou','u']; if (mt_rand(0, 5) == 4) { $vowels[] = 'y'; } - $cons = array( + $cons = [ 'b','bl','br', 'c','ch','cl','cr', 'd','dr', @@ -138,13 +141,13 @@ function autoname($len) { 'w','wh', 'x', 'z','zh' - ); + ]; - $midcons = array('ck','ct','gn','ld','lf','lm','lt','mb','mm', 'mn','mp', - 'nd','ng','nk','nt','rn','rp','rt'); + $midcons = ['ck','ct','gn','ld','lf','lm','lt','mb','mm', 'mn','mp', + 'nd','ng','nk','nt','rn','rp','rt']; - $noend = array('bl', 'br', 'cl','cr','dr','fl','fr','gl','gr', - 'kh', 'kl','kr','mn','pl','pr','rh','tr','qu','wh'); + $noend = ['bl', 'br', 'cl','cr','dr','fl','fr','gl','gr', + 'kh', 'kl','kr','mn','pl','pr','rh','tr','qu','wh']; $start = mt_rand(0,2); if ($start == 0) { @@ -279,27 +282,27 @@ function paginate_data(App $a, $count = null) { } $url = $stripped; - $data = array(); + $data = []; function _l(&$d, $name, $url, $text, $class = '') { if (strpos($url, '?') === false && ($pos = strpos($url, '&')) !== false) { $url = substr($url, 0, $pos) . '?' . substr($url, $pos + 1); } - $d[$name] = array('url' => $url, 'text' => $text, 'class' => $class); + $d[$name] = ['url' => $url, 'text' => $text, 'class' => $class]; } 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']; @@ -312,7 +315,7 @@ function paginate_data(App $a, $count = null) { $numstop = (($pagenum > ($numpages - 7)) ? $numpages : ($numstart + 8)); } - $pages = array(); + $pages = []; for ($i = $numstart; $i <= $numstop; $i++) { if ($i == $a->pager['page']) { @@ -333,8 +336,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' : ''); } } @@ -361,7 +364,7 @@ function paginate(App $a) { $data = paginate_data($a); $tpl = get_markup_template("paginate.tpl"); - return replace_macros($tpl, array("pager" => $data)); + return replace_macros($tpl, ["pager" => $data]); } @@ -376,7 +379,7 @@ function alt_pager(App $a, $i) { $data = paginate_data($a, $i); $tpl = get_markup_template("paginate.tpl"); - return replace_macros($tpl, array('pager' => $data)); + return replace_macros($tpl, ['pager' => $data]); } @@ -387,10 +390,10 @@ function alt_pager(App $a, $i) { */ function scroll_loader() { $tpl = get_markup_template("scroll_loader.tpl"); - return replace_macros($tpl, array( - 'wait' => t('Loading more entries...'), - 'end' => t('The end') - )); + return replace_macros($tpl, [ + 'wait' => L10n::t('Loading more entries...'), + 'end' => L10n::t('The end') + ]); } @@ -403,7 +406,7 @@ function scroll_loader() { function expand_acl($s) { // turn string array of angle-bracketed elements into numeric array // e.g. "<1><2><3>" => array(1,2,3); - $ret = array(); + $ret = []; if (strlen($s)) { $t = str_replace('<', '', $s); @@ -476,7 +479,7 @@ function item_new_uri($hostname, $uid, $guid = "") { $uri = "urn:X-dfrn:" . $hostname . ':' . $uid . ':' . $hash; - $dups = dba::exists('item', array('uri' => $uri)); + $dups = dba::exists('item', ['uri' => $uri]); } while ($dups == true); return $uri; @@ -662,7 +665,7 @@ function attribute_contains($attr, $s) { /* setup int->string log level map */ -$LOGGER_LEVELS = array(); +$LOGGER_LEVELS = []; /** * @brief Logs the given message at the given log level @@ -824,7 +827,7 @@ function activity_match($haystack,$needle) { * @return array List of tag and person names */ function get_tags($string) { - $ret = array(); + $ret = []; // Convert hashtag links to hashtags $string = preg_replace('/#\[url\=([^\[\]]*)\](.*?)\[\/url\]/ism', '#$2', $string); @@ -833,7 +836,7 @@ function get_tags($string) { $string = preg_replace('/\[code\](.*?)\[\/code\]/sm', '', $string); // Force line feeds at bbtags - $string = str_replace(array('[', ']'), array("\n[", "]\n"), $string); + $string = str_replace(['[', ']'], ["\n[", "]\n"], $string); // ignore anything in a bbtag $string = preg_replace('/\[(.*?)\]/sm', '', $string); @@ -925,7 +928,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 @@ -941,7 +944,7 @@ function contact_block() { intval($shown) ); if (DBM::is_result($r)) { - $contacts = array(); + $contacts = []; foreach ($r AS $contact) { $contacts[] = $contact["id"]; } @@ -949,26 +952,26 @@ function contact_block() { dbesc(implode(",", $contacts))); if (DBM::is_result($r)) { - $contacts = sprintf(tt('%d Contact','%d Contacts', $total),$total); - $micropro = Array(); + $contacts = L10n::tt('%d Contact', '%d Contacts', $total); + $micropro = []; foreach ($r as $rr) { - $micropro[] = micropro($rr,true,'mpfriend'); + $micropro[] = micropro($rr, true, 'mpfriend'); } } } } $tpl = get_markup_template('contact_block.tpl'); - $o = replace_macros($tpl, array( + $o = replace_macros($tpl, [ '$contacts' => $contacts, '$nickname' => $a->profile['nickname'], - '$viewcontacts' => t('View Contacts'), + '$viewcontacts' => L10n::t('View Contacts'), '$micropro' => $micropro, - )); + ]); - $arr = array('contacts' => $r, 'output' => $o); + $arr = ['contacts' => $r, 'output' => $o]; - call_hooks('contact_block_end', $arr); + Addon::callHooks('contact_block_end', $arr); return $o; } @@ -1011,7 +1014,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { $url = $redirect_url; $sparkle = ' sparkle'; } else { - $url = zrl($url); + $url = Profile::zrl($url); } } @@ -1020,7 +1023,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { $url = ''; } - return replace_macros(get_markup_template(($textmode)?'micropro_txt.tpl':'micropro_img.tpl'),array( + return replace_macros(get_markup_template(($textmode)?'micropro_txt.tpl':'micropro_img.tpl'),[ '$click' => defaults($contact, 'click', ''), '$class' => $class, '$url' => $url, @@ -1030,7 +1033,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { '$parkle' => $sparkle, '$redir' => $redir, - )); + ]); } /** @@ -1051,27 +1054,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 = array( + $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'] = array( - t("Full Text"), - t("Tags"), - t("Contacts")); + $values['$searchoption'] = [ + 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"); } } @@ -1114,15 +1117,15 @@ function get_poke_verbs() { // index is present tense verb // value is array containing past tense verb, translation of present, translation of past - $arr = array( - 'poke' => array('poked', t('poke'), t('poked')), - 'ping' => array('pinged', t('ping'), t('pinged')), - 'prod' => array('prodded', t('prod'), t('prodded')), - 'slap' => array('slapped', t('slap'), t('slapped')), - 'finger' => array('fingered', t('finger'), t('fingered')), - 'rebuff' => array('rebuffed', t('rebuff'), t('rebuffed')), - ); - call_hooks('poke_verbs', $arr); + $arr = [ + '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; } @@ -1133,12 +1136,12 @@ function get_poke_verbs() { * @return string Translated 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')), + $ret = str_replace(['Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','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(array('January','February','March','April','May','June','July','August','September','October','November','December'), - array(t('January'), t('February'), t('March'), t('April'), t('May'), t('June'), t('July'), t('August'), t('September'), t('October'), t('November'), t('December')), + $ret = str_replace(['January','February','March','April','May','June','July','August','September','October','November','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; @@ -1151,11 +1154,11 @@ function day_translate($s) { * @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('Sun')), + $ret = str_replace(['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', '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(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 = str_replace(['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov','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; } @@ -1168,7 +1171,7 @@ function day_short_translate($s) { * @return string */ function normalise_link($url) { - $ret = str_replace(array('https:', '//www.'), array('http:', '//'), $url); + $ret = str_replace(['https:', '//www.'], ['http:', '//'], $url); return rtrim($ret,'/'); } @@ -1234,8 +1237,8 @@ function put_item_in_cache(&$item, $update = false) $item["body"] = $body; if ($update && ($item["id"] > 0)) { - dba::update('item', array('rendered-html' => $item["rendered-html"], 'rendered-hash' => $item["rendered-hash"]), - array('id' => $item["id"]), false); + dba::update('item', ['rendered-html' => $item["rendered-html"], 'rendered-hash' => $item["rendered-hash"]], + ['id' => $item["id"]], false); } } } @@ -1254,13 +1257,13 @@ function put_item_in_cache(&$item, $update = false) function prepare_body(&$item, $attach = false, $preview = false) { $a = get_app(); - call_hooks('prepare_body_init', $item); + Addon::callHooks('prepare_body_init', $item); $searchpath = System::baseUrl() . "/search?tag="; - $tags = array(); - $hashtags = array(); - $mentions = array(); + $tags = []; + $hashtags = []; + $mentions = []; // In order to provide theme developers more possibilities, event items // are treated differently. @@ -1312,14 +1315,14 @@ function prepare_body(&$item, $attach = false, $preview = false) { put_item_in_cache($item, $update); $s = $item["rendered-html"]; - $prep_arr = array('item' => $item, 'html' => $s, 'preview' => $preview); - call_hooks('prepare_body', $prep_arr); + $prep_arr = ['item' => $item, 'html' => $s, 'preview' => $preview]; + Addon::callHooks('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); + $s = str_replace(['
', '
', '
'], [$mailquote, $mailquote, $mailquote], $s); return $s; } @@ -1344,23 +1347,23 @@ function prepare_body(&$item, $attach = false, $preview = false) { if (strpos($mime, 'video') !== false) { if (!$vhead) { $vhead = true; - $a->page['htmlhead'] .= replace_macros(get_markup_template('videos_head.tpl'), array( + $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'), array( + ]); + $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'), array( - '$video' => array( + $as .= replace_macros(get_markup_template('video_top.tpl'), [ + '$video' => [ 'id' => $id, - 'title' => t('View Video'), + 'title' => L10n::t('View Video'), 'src' => $the_url, 'mime' => $mime, - ), - )); + ], + ]); } $filetype = strtolower(substr($mime, 0, strpos($mime, '/'))); @@ -1373,7 +1376,7 @@ 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'); + $title .= ' ' . $mtch[2] . ' ' . L10n::t('bytes'); $icon = '
'; $as .= '' . $icon . ''; @@ -1408,7 +1411,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') . ''. '