X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ftext.php;h=311422c5751d9af55f2399298a1b4543f94e0c50;hb=f89904ed7786d9259f0e87c11db0358a298181ad;hp=8f0ff6e73e584153fce9fa13a318181bb55495e8;hpb=e4a2430967f229dd02bc97c5c66be0620b3235d8;p=friendica.git diff --git a/include/text.php b/include/text.php index 8f0ff6e73e..311422c575 100644 --- a/include/text.php +++ b/include/text.php @@ -1,15 +1,29 @@ template_engine(); try { - $output = $t->replace_macros($s, $r); + $output = $t->replaceMacros($s, $r); } catch (Exception $e) { echo "
" . __FUNCTION__ . ": " . $e->getMessage() . "
"; killme(); @@ -38,24 +52,25 @@ function replace_macros($s, $r) { $a->save_timestamp($stamp1, "rendering"); return $output; -}} +} +/** + * @brief Generates a pseudo-random string of hexadecimal characters + * + * @param int $size + * @return string + */ +function random_string($size = 64) +{ + $byte_size = ceil($size / 2); -// random string, there are 86 characters max in text mode, 128 for hex -// output is urlsafe + $bytes = random_bytes($byte_size); -define('RANDOM_STRING_HEX', 0x00 ); -define('RANDOM_STRING_TEXT', 0x01 ); + $return = substr(bin2hex($bytes), 0, $size); -if (! function_exists('random_string')) { -function random_string($size = 64, $type = RANDOM_STRING_HEX) { - // generate a bit of entropy and run it through the whirlpool - $s = hash('whirlpool', (string) rand() . uniqid(rand(),true) . (string) rand(), (($type == RANDOM_STRING_TEXT) ? true : false)); - $s = (($type == RANDOM_STRING_TEXT) ? str_replace("\n", "", base64url_encode($s,true)) : $s); - return(substr($s,0,$size)); -}} + return $return; +} -if (! function_exists('notags')) { /** * This is our primary input filter. * @@ -74,15 +89,13 @@ if (! function_exists('notags')) { * @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)); -}} - +// return str_replace(array("<",">","\xBA","\xBC","\xBE"), array('[',']','','',''), $string); +} -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. @@ -91,13 +104,9 @@ if (! function_exists('escape_tags')) { */ function escape_tags($string) { return htmlspecialchars($string, ENT_COMPAT, 'UTF-8', false); -}} - +} -// 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 @@ -110,12 +119,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', @@ -136,13 +145,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) { @@ -177,13 +186,9 @@ function autoname($len) { $word = substr($word, 0, -1); } return $word; -}} - +} -// escape text ($str) for XML transport -// returns escaped text. -if (! function_exists('xmlify')) { /** * escape text ($str) for XML transport * @param string $str @@ -197,7 +202,7 @@ function xmlify($str) { for ($x = 0; $x < $len; $x ++) { $char = mb_substr($str,$x,1); - switch( $char ) { + switch($char) { case "\r" : break; @@ -234,10 +239,10 @@ function xmlify($str) { $buffer = htmlspecialchars($str, ENT_QUOTES, "UTF-8"); $buffer = trim($buffer); - return($buffer); -}} + return $buffer; +} + -if (! function_exists('unxmlify')) { /** * undo an xmlify * @param string $s xml escaped text @@ -255,25 +260,7 @@ function unxmlify($s) { */ $ret = htmlspecialchars_decode($s, ENT_QUOTES); return $ret; -}} - -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 ''; - } - - if (! ctype_xdigit($s)) { - return $s; - } - - return pack("H*",$s); -}} +} /** @@ -299,27 +286,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']; @@ -332,7 +319,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']) { @@ -353,15 +340,15 @@ 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' : ''); } } return $data; } -if (! function_exists('paginate')) { + /** * Automatic pagination. * @@ -381,11 +368,11 @@ 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]); + +} -}} -if (! function_exists('alt_pager')) { /** * Alternative pager * @param App $a App instance @@ -396,24 +383,24 @@ 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]); + +} -}} -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') - )); -}} + return replace_macros($tpl, [ + 'wait' => L10n::t('Loading more entries...'), + 'end' => L10n::t('The end') + ]); +} + -if (! function_exists('expand_acl')) { /** * Turn user/group ACLs stored as angle bracketed text into arrays * @@ -423,7 +410,7 @@ if (! function_exists('expand_acl')) { 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); @@ -435,9 +422,9 @@ function expand_acl($s) { } } return $ret; -}} +} + -if (! function_exists('sanitise_acl')) { /** * Wrap ACL elements in angle brackets for storage * @param string $item @@ -448,10 +435,9 @@ function sanitise_acl(&$item) { } else { unset($item); } -}} +} -if (! function_exists('perms2str')) { /** * Convert an ACL array to a storable string * @@ -474,10 +460,9 @@ function perms2str($p) { $ret = implode('', $tmp); } return $ret; -}} +} -if (! function_exists('item_new_uri')) { /** * generate a guaranteed unique (for this domain) item ID for ATOM * safe from birthday paradox @@ -498,41 +483,12 @@ 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; -}} - -// Generate a guaranteed unique photo ID. -// safe from birthday paradox - -if (! function_exists('photo_new_resource')) { -/** - * 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; -}} - +} -if (! function_exists('load_view_file')) { /** * @deprecated * wrapper to load a view template, checking for alternate @@ -570,9 +526,9 @@ function load_view_file($s) { $content = file_get_contents($s); $a->save_timestamp($stamp1, "file"); return $content; -}} +} + -if (! function_exists('get_intltext_template')) { /** * load a view template, checking for alternate * languages before falling back to the default @@ -610,9 +566,9 @@ function get_intltext_template($s) { $a->save_timestamp($stamp1, "file"); return $content; } -}} +} + -if (! function_exists('get_markup_template')) { /** * load template $s * @@ -626,7 +582,7 @@ function get_markup_template($s, $root = '') { $a = get_app(); $t = $a->template_engine(); try { - $template = $t->get_template_file($s, $root); + $template = $t->getTemplateFile($s, $root); } catch (Exception $e) { echo "
" . __FUNCTION__ . ": " . $e->getMessage() . "
"; killme(); @@ -635,39 +591,8 @@ function get_markup_template($s, $root = '') { $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(); - - // 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; -}} - +} -if (! function_exists('attribute_contains')) { /** * for html,xml parsing - let's say you've got * an attribute foobar="class1 class2 class3" @@ -685,11 +610,11 @@ if (! function_exists('attribute_contains')) { function attribute_contains($attr, $s) { $a = explode(' ', $attr); return (count($a) && in_array($s,$a)); -}} +} + -if (! function_exists('logger')) { /* setup int->string log level map */ -$LOGGER_LEVELS = array(); +$LOGGER_LEVELS = []; /** * @brief Logs the given message at the given log level @@ -718,9 +643,9 @@ function logger($msg, $level = 0) { return; } - $debugging = get_config('system','debugging'); - $logfile = get_config('system','logfile'); - $loglevel = intval(get_config('system','loglevel')); + $debugging = Config::get('system','debugging'); + $logfile = Config::get('system','logfile'); + $loglevel = intval(Config::get('system','loglevel')); if ( ! $debugging @@ -746,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']), @@ -758,7 +683,7 @@ function logger($msg, $level = 0) { $stamp1 = microtime(true); @file_put_contents($logfile, $logline, FILE_APPEND); $a->save_timestamp($stamp1, "file"); -}} +} /** * @brief An alternative logger for development. @@ -790,12 +715,16 @@ function dlogger($msg, $level = 0) { return; } - $logfile = get_config('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_") { @@ -812,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'], @@ -825,7 +754,7 @@ function dlogger($msg, $level = 0) { $a->save_timestamp($stamp1, "file"); } -if (! function_exists('activity_match')) { + /** * Compare activity uri. Knows about activity namespace. * @@ -835,7 +764,7 @@ if (! function_exists('activity_match')) { */ function activity_match($haystack,$needle) { return (($haystack === $needle) || ((basename($needle) === $haystack) && strstr($needle, NAMESPACE_ACTIVITY_SCHEMA))); -}} +} /** @@ -851,7 +780,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); @@ -860,7 +789,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); @@ -909,9 +838,6 @@ function get_tags($string) { } -// - -if (! function_exists('qp')) { /** * quick and dirty quoted_printable encoding * @@ -920,9 +846,9 @@ if (! function_exists('qp')) { */ function qp($s) { return str_replace("%", "=", rawurlencode($s)); -}} +} + -if (! function_exists('contact_block')) { /** * Get html for contact block. * @@ -934,15 +860,12 @@ function contact_block() { $o = ''; $a = get_app(); - $shown = get_pconfig($a->profile['uid'],'system','display_friend_count'); - if ($shown === false) { - $shown = 24; - } + $shown = PConfig::get($a->profile['uid'], 'system', 'display_friend_count', 24); if ($shown == 0) { return; } - if ((! is_array($a->profile)) || ($a->profile['hide-friends'])) { + if (!is_array($a->profile) || $a->profile['hide-friends']) { return $o; } $r = q("SELECT COUNT(*) AS `total` FROM `contact` @@ -954,11 +877,11 @@ function contact_block() { dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA) ); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { $total = intval($r[0]['total']); } - if (! $total) { - $contacts = t('No contacts'); + if (!$total) { + $contacts = L10n::t('No contacts'); $micropro = null; } else { // Splitting the query in two parts makes it much faster @@ -973,38 +896,39 @@ function contact_block() { dbesc(NETWORK_DIASPORA), intval($shown) ); - if (dbm::is_result($r)) { - $contacts = array(); + if (DBM::is_result($r)) { + $contacts = []; foreach ($r AS $contact) { $contacts[] = $contact["id"]; } $r = q("SELECT `id`, `uid`, `addr`, `url`, `name`, `thumb`, `network` FROM `contact` WHERE `id` IN (%s)", dbesc(implode(",", $contacts))); - if (dbm::is_result($r)) { - $contacts = sprintf( tt('%d Contact','%d Contacts', $total),$total); - $micropro = Array(); + if (DBM::is_result($r)) { + $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; -}} +} + /** * @brief Format contacts as picture links or as texxt links @@ -1028,7 +952,7 @@ function contact_block() { function micropro($contact, $redirect = false, $class = '', $textmode = false) { // Use the contact URL if no address is available - if ($contact["addr"] == "") { + if (!x($contact, "addr")) { $contact["addr"] = $contact["url"]; } @@ -1037,14 +961,13 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { $redir = false; if ($redirect) { - $a = get_app(); $redirect_url = 'redir/' . $contact['id']; if (local_user() && ($contact['uid'] == local_user()) && ($contact['network'] === NETWORK_DFRN)) { $redir = true; $url = $redirect_url; $sparkle = ' sparkle'; } else { - $url = zrl($url); + $url = Profile::zrl($url); } } @@ -1053,8 +976,8 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { $url = ''; } - return replace_macros(get_markup_template(($textmode)?'micropro_txt.tpl':'micropro_img.tpl'),array( - '$click' => (($contact['click']) ? $contact['click'] : ''), + return replace_macros(get_markup_template(($textmode)?'micropro_txt.tpl':'micropro_img.tpl'),[ + '$click' => defaults($contact, 'click', ''), '$class' => $class, '$url' => $url, '$photo' => proxy_url($contact['thumb'], false, PROXY_SIZE_THUMB), @@ -1063,64 +986,66 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { '$parkle' => $sparkle, '$redir' => $redir, - )); + ]); } - - -if (! function_exists('search')) { /** - * search box + * Search box. + * + * @param string $s Search query. + * @param string $id HTML id + * @param string $url Search url. + * @param bool $save Show save search button. + * @param bool $aside Display the search widgit aside. * - * @param string $s search query - * @param string $id html id - * @param string $url search url - * @param boolean $savedsearch show save search button + * @return string Formatted HTML. */ -function search($s, $id = 'search-box', $url = 'search', $save = false, $aside = true) { - $a = get_app(); +function search($s, $id = 'search-box', $url = 'search', $save = false, $aside = true) +{ + $mode = 'text'; + + if (strpos($s, '#') === 0) { + $mode = 'tag'; + } + $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'), - '$save_label' => t('Save'), - '$savedsearch' => feature_enabled(local_user(),'savedsearch'), - '$search_hint' => t('@name, !forum, #tags, content'), - ); + '$search_label' => L10n::t('Search'), + '$save_label' => $save_label, + '$savedsearch' => Feature::isEnabled(local_user(),'savedsearch'), + '$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 (get_config('system','poco_local_search')) { - $values['$searchoption'][] = t("Forums"); + if (Config::get('system','poco_local_search')) { + $values['$searchoption'][] = L10n::t("Forums"); } } return replace_macros(get_markup_template('searchbox.tpl'), $values); -}} +} -if (! function_exists('valid_email')) { /** - * Check if $x is a valid email string + * @brief Check for a valid email string * - * @param string $x + * @param string $email_address * @return boolean */ -function valid_email($x){ - - /// @TODO Removed because Fabio told me so. - //if (get_config('system','disable_email_validation')) - // return true; - return preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/', $x); -}} +function valid_email($email_address) +{ + return preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/', $email_address); +} -if (! function_exists('linkify')) { /** * Replace naked text hyperlink with HTML formatted hyperlink * @@ -1130,14 +1055,14 @@ function linkify($s) { $s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\'\%\$\!\+]*)/", ' $1', $s); $s = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism",'<$1$2=$3&$4>',$s); return $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() { @@ -1145,65 +1070,31 @@ 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); - return $arr; -} - -/** - * Load moods - * @return array index is mood, value is translated mood - * @hook mood_verbs moods array - */ -function get_mood_verbs() { - - $arr = array( - 'happy' => t('happy'), - 'sad' => t('sad'), - 'mellow' => t('mellow'), - 'tired' => t('tired'), - 'perky' => t('perky'), - 'angry' => t('angry'), - 'stupefied' => t('stupified'), - 'puzzled' => t('puzzled'), - 'interested' => t('interested'), - 'bitter' => t('bitter'), - 'cheerful' => t('cheerful'), - 'alive' => t('alive'), - 'annoyed' => t('annoyed'), - 'anxious' => t('anxious'), - 'cranky' => t('cranky'), - 'disturbed' => t('disturbed'), - 'frustrated' => t('frustrated'), - 'motivated' => t('motivated'), - 'relaxed' => t('relaxed'), - 'surprised' => t('surprised'), - ); - - call_hooks('mood_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; } /** * @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'), - 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; @@ -1211,21 +1102,21 @@ function day_translate($s) { /** * @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')), + $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; } -if (! function_exists('normalise_link')) { + /** * Normalize url * @@ -1233,13 +1124,11 @@ if (! function_exists('normalise_link')) { * @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,'/'); -}} - +} -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 @@ -1253,7 +1142,8 @@ if (! function_exists('link_compare')) { */ function link_compare($a, $b) { return (strcasecmp(normalise_link($a), normalise_link($b)) === 0); -}} +} + /** * @brief Find any non-embedded images in private items and add redir links to them @@ -1279,27 +1169,45 @@ function redir_private_images($a, &$item) } } -function put_item_in_cache(&$item, $update = false) { +/** + * 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"]; - if (($item["rendered-hash"] != hash("md5", $item["body"])) || ($item["rendered-hash"] == "") || - ($item["rendered-html"] == "") || get_config("system", "ignore_cache")) { + // Add the content warning + if (!empty($item['content-warning'])) { + $item["body"] = $item['content-warning'] . '[spoiler]' . $item["body"] . '[/spoiler]'; + } - // 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"]; + $rendered_hash = defaults($item, 'rendered-hash', ''); + if ($rendered_hash == '' + || $item["rendered-html"] == "" + || $rendered_hash != hash("md5", $item["body"]) + || Config::get("system", "ignore_cache") + ) { $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', 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); } } + + $item["body"] = $body; } /** @@ -1316,48 +1224,48 @@ 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. if ($item['object-type'] === ACTIVITY_OBJ_EVENT && isset($item['event-id'])) { - $ev = format_event_item($item); + $ev = Event::getItemHTML($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)); + $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; @@ -1374,82 +1282,75 @@ 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; } $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'), array( - '$baseurl' => System::baseUrl(), - )); - $a->page['end'] .= replace_macros(get_markup_template('videos_end.tpl'), array( - '$baseurl' => System::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'; - } - - $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.'
'; } // Map. if (strpos($s, '
') !== false && x($item, 'coord')) { - $x = generate_map(trim($item['coord'])); + $x = Map::byCoordinates(trim($item['coord'])); if ($x) { $s = preg_replace('/\
/', '$0' . $x, $s); } @@ -1470,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') . ''. '