X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ftext.php;h=71a2564405714659f472904c2f1cf1850edd13c4;hb=2148a2bdb0cb38d3a085109eeeb6acc5d65484e6;hp=afb2cf33dc06f491ab10a9fd6379689fd57bd913;hpb=6eff506cdd8008678889ed493aabe53d93fe3b58;p=friendica.git diff --git a/include/text.php b/include/text.php index afb2cf33dc..71a2564405 100644 --- a/include/text.php +++ b/include/text.php @@ -1,13 +1,14 @@ replace) * @return string substituted string */ -function replace_macros($s,$r) { +function replace_macros($s, $r) { $stamp1 = microtime(true); @@ -25,12 +26,12 @@ function replace_macros($s,$r) { // pass $baseurl to all templates $r['$baseurl'] = App::get_baseurl(); - $t = $a->template_engine(); try { - $output = $t->replace_macros($s,$r); + $output = $t->replace_macros($s, $r); } catch (Exception $e) { - echo "
".__function__.": ".$e->getMessage()."
"; killme(); + echo "
" . __FUNCTION__ . ": " . $e->getMessage() . "
"; + killme(); } $a->save_timestamp($stamp1, "rendering"); @@ -45,15 +46,15 @@ function replace_macros($s,$r) { define('RANDOM_STRING_HEX', 0x00 ); define('RANDOM_STRING_TEXT', 0x01 ); -if(! function_exists('random_string')) { -function random_string($size = 64,$type = RANDOM_STRING_HEX) { +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); + $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)); }} -if(! function_exists('notags')) { +if (! function_exists('notags')) { /** * This is our primary input filter. * @@ -72,8 +73,7 @@ if(! function_exists('notags')) { * @return string Filtered string */ function notags($string) { - - return(str_replace(array("<",">"), array('[',']'), $string)); + return str_replace(array("<", ">"), array('[', ']'), $string); // High-bit filter no longer used // return(str_replace(array("<",">","\xBA","\xBC","\xBE"), array('[',']','','',''), $string)); @@ -81,7 +81,7 @@ function notags($string) { -if(! function_exists('escape_tags')) { +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. @@ -89,15 +89,14 @@ if(! function_exists('escape_tags')) { * @return string */ function escape_tags($string) { - - return(htmlspecialchars($string, ENT_COMPAT, 'UTF-8', false)); + 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')) { +if (! function_exists('autoname')) { /** * generate a string that's random, but usually pronounceable. * used to generate initial passwords @@ -106,12 +105,14 @@ if(! function_exists('autoname')) { */ function autoname($len) { - if($len <= 0) + if ($len <= 0) { return ''; + } $vowels = array('a','a','ai','au','e','e','e','ee','ea','i','ie','o','ou','u'); - if(mt_rand(0,5) == 4) + if (mt_rand(0, 5) == 4) { $vowels[] = 'y'; + } $cons = array( 'b','bl','br', @@ -143,10 +144,11 @@ function autoname($len) { 'kh', 'kl','kr','mn','pl','pr','rh','tr','qu','wh'); $start = mt_rand(0,2); - if($start == 0) + if ($start == 0) { $table = $vowels; - else + } else { $table = $cons; + } $word = ''; @@ -154,23 +156,25 @@ function autoname($len) { $r = mt_rand(0,count($table) - 1); $word .= $table[$r]; - if($table == $vowels) + if ($table == $vowels) { $table = array_merge($cons,$midcons); - else + } else { $table = $vowels; + } } $word = substr($word,0,$len); - foreach($noend as $noe) { - if((strlen($word) > 2) && (substr($word,-2) == $noe)) { - $word = substr($word,0,-1); + foreach ($noend as $noe) { + if ((strlen($word) > 2) && (substr($word, -2) == $noe)) { + $word = substr($word, 0, -1); break; } } - if(substr($word,-1) == 'q') - $word = substr($word,0,-1); + if (substr($word, -1) == 'q') { + $word = substr($word, 0, -1); + } return $word; }} @@ -178,17 +182,18 @@ function autoname($len) { // escape text ($str) for XML transport // returns escaped text. -if(! function_exists('xmlify')) { +if (! function_exists('xmlify')) { /** * escape text ($str) for XML transport * @param string $str * @return string Escaped text. */ function xmlify($str) { + /// @TODO deprecated code found? /* $buffer = ''; $len = mb_strlen($str); - for($x = 0; $x < $len; $x ++) { + for ($x = 0; $x < $len; $x ++) { $char = mb_substr($str,$x,1); switch( $char ) { @@ -231,13 +236,14 @@ function xmlify($str) { return($buffer); }} -if(! function_exists('unxmlify')) { +if (! function_exists('unxmlify')) { /** * undo an xmlify * @param string $s xml escaped text * @return string unescaped text */ function unxmlify($s) { + /// @TODO deprecated code found? // $ret = str_replace('&','&', $s); // $ret = str_replace(array('<','>','"','''),array('<','>','"',"'"),$ret); /*$ret = mb_ereg_replace('&', '&', $s); @@ -250,21 +256,22 @@ function unxmlify($s) { return $ret; }} -if(! function_exists('hex2bin')) { +if (! function_exists('hex2bin')) { /** * convenience wrapper, reverse the operation "bin2hex" * @param string $s * @return number */ function hex2bin($s) { - if(! (is_string($s) && strlen($s))) + if (! (is_string($s) && strlen($s))) { return ''; + } - if(! ctype_xdigit($s)) { - return($s); + if (! ctype_xdigit($s)) { + return $s; } - return(pack("H*",$s)); + return pack("H*",$s); }} @@ -286,7 +293,7 @@ function paginate_data(App $a, $count = null) { $stripped = trim($stripped, '/'); $pagenum = $a->pager['page']; - if (($a->page_offset != '') AND !preg_match('/[?&].offset=/', $stripped)) { + if (($a->page_offset != '') && !preg_match('/[?&].offset=/', $stripped)) { $stripped .= '&offset=' . urlencode($a->page_offset); } @@ -353,7 +360,7 @@ function paginate_data(App $a, $count = null) { return $data; } -if(! function_exists('paginate')) { +if (! function_exists('paginate')) { /** * Automatic pagination. * @@ -377,7 +384,7 @@ function paginate(App $a) { }} -if(! function_exists('alt_pager')) { +if (! function_exists('alt_pager')) { /** * Alternative pager * @param App $a App instance @@ -392,7 +399,7 @@ function alt_pager(App $a, $i) { }} -if(! function_exists('scroll_loader')) { +if (! function_exists('scroll_loader')) { /** * Loader for infinite scrolling * @return string html for loader @@ -405,7 +412,7 @@ function scroll_loader() { )); }} -if(! function_exists('expand_acl')) { +if (! function_exists('expand_acl')) { /** * Turn user/group ACLs stored as angle bracketed text into arrays * @@ -417,31 +424,33 @@ function expand_acl($s) { // e.g. "<1><2><3>" => array(1,2,3); $ret = array(); - if(strlen($s)) { - $t = str_replace('<','',$s); - $a = explode('>',$t); - foreach($a as $aa) { - if(intval($aa)) + if (strlen($s)) { + $t = str_replace('<', '', $s); + $a = explode('>', $t); + foreach ($a as $aa) { + if (intval($aa)) { $ret[] = intval($aa); + } } } return $ret; }} -if(! function_exists('sanitise_acl')) { +if (! function_exists('sanitise_acl')) { /** * Wrap ACL elements in angle brackets for storage * @param string $item */ function sanitise_acl(&$item) { - if(intval($item)) + if (intval($item)) { $item = '<' . intval(notags(trim($item))) . '>'; - else + } else { unset($item); + } }} -if(! function_exists('perms2str')) { +if (! function_exists('perms2str')) { /** * Convert an ACL array to a storable string * @@ -453,20 +462,21 @@ if(! function_exists('perms2str')) { */ function perms2str($p) { $ret = ''; - if(is_array($p)) + if (is_array($p)) { $tmp = $p; - else + } else { $tmp = explode(',',$p); + } - if(is_array($tmp)) { - array_walk($tmp,'sanitise_acl'); - $ret = implode('',$tmp); + if (is_array($tmp)) { + array_walk($tmp, 'sanitise_acl'); + $ret = implode('', $tmp); } return $ret; }} -if(! function_exists('item_new_uri')) { +if (! function_exists('item_new_uri')) { /** * generate a guaranteed unique (for this domain) item ID for ATOM * safe from birthday paradox @@ -475,14 +485,14 @@ if(! function_exists('item_new_uri')) { * @param int $uid * @return string */ -function item_new_uri($hostname,$uid, $guid = "") { +function item_new_uri($hostname, $uid, $guid = "") { do { $dups = false; - if ($guid == "") + if ($guid == "") { $hash = get_guid(32); - else { + } else { $hash = $guid; $guid = ""; } @@ -491,16 +501,18 @@ function item_new_uri($hostname,$uid, $guid = "") { $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($uri)); - if (dbm::is_result($r)) + if (dbm::is_result($r)) { $dups = true; - } while($dups == true); + } + } while ($dups == true); + return $uri; }} // Generate a guaranteed unique photo ID. // safe from birthday paradox -if(! function_exists('photo_new_resource')) { +if (! function_exists('photo_new_resource')) { /** * Generate a guaranteed unique photo ID. * safe from birthday paradox @@ -515,14 +527,17 @@ function photo_new_resource() { $r = q("SELECT `id` FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", dbesc($resource) ); - if (dbm::is_result($r)) + + if (dbm::is_result($r)) { $found = true; - } while($found == true); + } + } while ($found == true); + return $resource; }} -if(! function_exists('load_view_file')) { +if (! function_exists('load_view_file')) { /** * @deprecated * wrapper to load a view template, checking for alternate @@ -535,11 +550,12 @@ if(! function_exists('load_view_file')) { */ function load_view_file($s) { global $lang, $a; - if(! isset($lang)) + if (! isset($lang)) { $lang = 'en'; + } $b = basename($s); $d = dirname($s); - if(file_exists("$d/$lang/$b")) { + if (file_exists("$d/$lang/$b")) { $stamp1 = microtime(true); $content = file_get_contents("$d/$lang/$b"); $a->save_timestamp($stamp1, "file"); @@ -548,7 +564,7 @@ function load_view_file($s) { $theme = current_theme(); - if(file_exists("$d/theme/$theme/$b")) { + if (file_exists("$d/theme/$theme/$b")) { $stamp1 = microtime(true); $content = file_get_contents("$d/theme/$theme/$b"); $a->save_timestamp($stamp1, "file"); @@ -561,7 +577,7 @@ function load_view_file($s) { return $content; }} -if(! function_exists('get_intltext_template')) { +if (! function_exists('get_intltext_template')) { /** * load a view template, checking for alternate * languages before falling back to the default @@ -575,18 +591,20 @@ function get_intltext_template($s) { $a = get_app(); $engine = ''; - if($a->theme['template_engine'] === 'smarty3') + if ($a->theme['template_engine'] === 'smarty3') { $engine = "/smarty3"; + } - if(! isset($lang)) + if (! isset($lang)) { $lang = 'en'; + } - if(file_exists("view/lang/$lang$engine/$s")) { + if (file_exists("view/lang/$lang$engine/$s")) { $stamp1 = microtime(true); $content = file_get_contents("view/lang/$lang$engine/$s"); $a->save_timestamp($stamp1, "file"); return $content; - } elseif(file_exists("view/lang/en$engine/$s")) { + } elseif (file_exists("view/lang/en$engine/$s")) { $stamp1 = microtime(true); $content = file_get_contents("view/lang/en$engine/$s"); $a->save_timestamp($stamp1, "file"); @@ -599,7 +617,7 @@ function get_intltext_template($s) { } }} -if(! function_exists('get_markup_template')) { +if (! function_exists('get_markup_template')) { /** * load template $s * @@ -615,7 +633,8 @@ function get_markup_template($s, $root = '') { try { $template = $t->get_template_file($s, $root); } catch (Exception $e) { - echo "
".__function__.": ".$e->getMessage()."
"; killme(); + echo "
" . __FUNCTION__ . ": " . $e->getMessage() . "
"; + killme(); } $a->save_timestamp($stamp1, "file"); @@ -623,7 +642,7 @@ function get_markup_template($s, $root = '') { return $template; }} -if(! function_exists("get_template_file")) { +if (! function_exists("get_template_file")) { /** * * @param App $a @@ -635,28 +654,25 @@ function get_template_file($a, $filename, $root = '') { $theme = current_theme(); // Make sure $root ends with a slash / - if($root !== '' && $root[strlen($root)-1] !== '/') + if ($root !== '' && substr($root, -1, 1) !== '/') { $root = $root . '/'; + } - if(file_exists("{$root}view/theme/$theme/$filename")) + if (file_exists("{$root}view/theme/$theme/$filename")) { $template_file = "{$root}view/theme/$theme/$filename"; - elseif (x($a->theme_info,"extends") && file_exists("{$root}view/theme/{$a->theme_info["extends"]}/$filename")) - $template_file = "{$root}view/theme/{$a->theme_info["extends"]}/$filename"; - elseif (file_exists("{$root}/$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 + } else { $template_file = "{$root}view/$filename"; + } return $template_file; }} - - - - - -if(! function_exists('attribute_contains')) { +if (! function_exists('attribute_contains')) { /** * for html,xml parsing - let's say you've got * an attribute foobar="class1 class2 class3" @@ -671,11 +687,9 @@ if(! function_exists('attribute_contains')) { * @param string $s string to search * @return boolean True if found, False otherwise */ -function attribute_contains($attr,$s) { +function attribute_contains($attr, $s) { $a = explode(' ', $attr); - if(count($a) && in_array($s,$a)) - return true; - return false; + return (count($a) && in_array($s,$a)); }} if (! function_exists('logger')) { @@ -820,7 +834,7 @@ function dlogger($msg, $level = 0) { $a->save_timestamp($stamp1, "file"); } -if(! function_exists('activity_match')) { +if (! function_exists('activity_match')) { /** * Compare activity uri. Knows about activity namespace. * @@ -829,9 +843,7 @@ if(! function_exists('activity_match')) { * @return boolean */ function activity_match($haystack,$needle) { - if(($haystack === $needle) || ((basename($needle) === $haystack) && strstr($needle,NAMESPACE_ACTIVITY_SCHEMA))) - return true; - return false; + return (($haystack === $needle) || ((basename($needle) === $haystack) && strstr($needle, NAMESPACE_ACTIVITY_SCHEMA))); }} @@ -883,7 +895,7 @@ function get_tags($string) { // and #hash tags. if (preg_match_all('/([!#@][^\^ \x0D\x0A,;:?]+)([ \x0D\x0A,;:?]|$)/', $string, $matches)) { - foreach($matches[1] as $match) { + foreach ($matches[1] as $match) { if (strstr($match, ']')) { // we might be inside a bbcode color tag - leave it alone continue; @@ -908,7 +920,7 @@ function get_tags($string) { // -if(! function_exists('qp')) { +if (! function_exists('qp')) { /** * quick and dirty quoted_printable encoding * @@ -916,10 +928,10 @@ if(! function_exists('qp')) { * @return string */ function qp($s) { -return str_replace ("%","=",rawurlencode($s)); + return str_replace("%", "=", rawurlencode($s)); }} -if(! function_exists('contact_block')) { +if (! function_exists('contact_block')) { /** * Get html for contact block. * @@ -932,13 +944,16 @@ function contact_block() { $a = get_app(); $shown = get_pconfig($a->profile['uid'],'system','display_friend_count'); - if($shown === false) + if ($shown === false) { $shown = 24; - if($shown == 0) + } + 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` WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `hidden` AND NOT `archive` @@ -951,10 +966,9 @@ function contact_block() { if (dbm::is_result($r)) { $total = intval($r[0]['total']); } - if(! $total) { + if (! $total) { $contacts = t('No contacts'); - $micropro = Null; - + $micropro = null; } else { // Splitting the query in two parts makes it much faster $r = q("SELECT `id` FROM `contact` @@ -1023,28 +1037,30 @@ function contact_block() { function micropro($contact, $redirect = false, $class = '', $textmode = false) { // Use the contact URL if no address is available - if ($contact["addr"] == "") + if ($contact["addr"] == "") { $contact["addr"] = $contact["url"]; + } $url = $contact['url']; $sparkle = ''; $redir = false; - if($redirect) { + if ($redirect) { $a = get_app(); $redirect_url = 'redir/' . $contact['id']; - if(local_user() && ($contact['uid'] == local_user()) && ($contact['network'] === NETWORK_DFRN)) { + if (local_user() && ($contact['uid'] == local_user()) && ($contact['network'] === NETWORK_DFRN)) { $redir = true; $url = $redirect_url; $sparkle = ' sparkle'; - } - else + } else { $url = zrl($url); + } } // If there is some js available we don't need the url - if(x($contact,'click')) + if (x($contact, 'click')) { $url = ''; + } return replace_macros(get_markup_template(($textmode)?'micropro_txt.tpl':'micropro_img.tpl'),array( '$click' => (($contact['click']) ? $contact['click'] : ''), @@ -1061,7 +1077,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { -if(! function_exists('search')) { +if (! function_exists('search')) { /** * search box * @@ -1070,7 +1086,7 @@ if(! function_exists('search')) { * @param string $url search url * @param boolean $savedsearch show save search button */ -function search($s,$id='search-box',$url='search',$save = false, $aside = true) { +function search($s, $id = 'search-box', $url = 'search', $save = false, $aside = true) { $a = get_app(); $values = array( @@ -1089,14 +1105,15 @@ function search($s,$id='search-box',$url='search',$save = false, $aside = true) t("Tags"), t("Contacts")); - if (get_config('system','poco_local_search')) + 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')) { +if (! function_exists('valid_email')) { /** * Check if $x is a valid email string * @@ -1105,17 +1122,14 @@ if(! function_exists('valid_email')) { */ function valid_email($x){ - // Removed because Fabio told me so. - //if(get_config('system','disable_email_validation')) + /// @TODO Removed because Fabio told me so. + //if (get_config('system','disable_email_validation')) // return true; - - if(preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',$x)) - return true; - return false; + return preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/', $x); }} -if(! function_exists('linkify')) { +if (! function_exists('linkify')) { /** * Replace naked text hyperlink with HTML formatted hyperlink * @@ -1124,7 +1138,7 @@ if(! function_exists('linkify')) { 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); + return $s; }} @@ -1180,14 +1194,13 @@ function get_mood_verbs() { 'motivated' => t('motivated'), 'relaxed' => t('relaxed'), 'surprised' => t('surprised'), - 'incapable' => t('incapable of producing a suitable verb to suit this situation, despite being famed for the legendary range of additonal verbs he previously added to morechoice, morepoke, and moremoods. That\'s right, the worlds most famous verb-smith is out of verbs.'), ); call_hooks('mood_verbs', $arr); return $arr; } -if(! function_exists('day_translate')) { +if (! function_exists('day_translate')) { /** * Translate days and months names * @@ -1207,7 +1220,7 @@ function day_translate($s) { }} -if(! function_exists('normalise_link')) { +if (! function_exists('normalise_link')) { /** * Normalize url * @@ -1215,13 +1228,13 @@ if(! function_exists('normalise_link')) { * @return string */ function normalise_link($url) { - $ret = str_replace(array('https:','//www.'), array('http:','//'), $url); - return(rtrim($ret,'/')); + $ret = str_replace(array('https:', '//www.'), array('http:', '//'), $url); + return rtrim($ret,'/'); }} -if(! function_exists('link_compare')) { +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 @@ -1233,10 +1246,8 @@ if(! function_exists('link_compare')) { * @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; - return false; +function link_compare($a, $b) { + return (strcasecmp(normalise_link($a), normalise_link($b)) === 0); }} /** @@ -1265,8 +1276,8 @@ 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")) { + if (($item["rendered-hash"] != hash("md5", $item["body"])) || ($item["rendered-hash"] == "") || + ($item["rendered-html"] == "") || 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. @@ -1279,7 +1290,7 @@ function put_item_in_cache(&$item, $update = false) { $item["rendered-hash"] = hash("md5", $item["body"]); $item["body"] = $body; - if ($update AND ($item["id"] != 0)) { + if ($update && ($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"])); } @@ -1289,7 +1300,7 @@ 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')) { +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 @@ -1301,14 +1312,14 @@ 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, $preview = false) { +function prepare_body(&$item, $attach = false, $preview = false) { $a = get_app(); call_hooks('prepare_body_init', $item); - $searchpath = z_root()."/search?tag="; + $searchpath = z_root() . "/search?tag="; - $tags=array(); + $tags = array(); $hashtags = array(); $mentions = array(); @@ -1316,10 +1327,11 @@ function prepare_body(&$item,$attach = false, $preview = false) { $taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`", intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION)); - foreach($taglist as $tag) { + foreach ($taglist as $tag) { - if ($tag["url"] == "") + if ($tag["url"] == "") { $tag["url"] = $searchpath.strtolower($tag["term"]); + } if ($tag["type"] == TERM_HASHTAG) { $hashtags[] = "#".$tag["term"].""; @@ -1340,8 +1352,9 @@ function prepare_body(&$item,$attach = false, $preview = false) { $update = (!local_user() and !remote_user() and ($item["uid"] == 0)); // Or update it if the current viewer is the intented viewer - if (($item["uid"] == local_user()) AND ($item["uid"] != 0)) + if (($item["uid"] == local_user()) && ($item["uid"] != 0)) { $update = true; + } put_item_in_cache($item, $update); $s = $item["rendered-html"]; @@ -1350,7 +1363,7 @@ function prepare_body(&$item,$attach = false, $preview = false) { call_hooks('prepare_body', $prep_arr); $s = $prep_arr['html']; - if(! $attach) { + if (! $attach) { // Replace the blockquotes with quotes that are used in mails $mailquote = '
'; $s = str_replace(array('
', '
', '
'), array($mailquote, $mailquote, $mailquote), $s); @@ -1359,24 +1372,24 @@ function prepare_body(&$item,$attach = false, $preview = false) { $as = ''; $vhead = false; - $arr = explode('[/attach],',$item['attach']); - if(count($arr)) { - $as .= '
'; - foreach($arr as $r) { + $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) { + if ($cnt) { + foreach ($matches as $mtch) { $mime = $mtch[3]; - if((local_user() == $item['uid']) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN)) + 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 + } else { $the_url = $mtch[1]; + } - if(strpos($mime, 'video') !== false) { - if(!$vhead) { + if (strpos($mime, 'video') !== false) { + if (!$vhead) { $vhead = true; $a->page['htmlhead'] .= replace_macros(get_markup_template('videos_head.tpl'), array( '$baseurl' => z_root(), @@ -1388,52 +1401,45 @@ function prepare_body(&$item,$attach = false, $preview = false) { $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, + '$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 )); + $filetype = strtolower(substr($mime, 0, strpos($mime,'/'))); + if ($filetype) { + $filesubtype = strtolower(substr($mime, strpos($mime,'/') + 1)); $filesubtype = str_replace('.', '-', $filesubtype); - } - else { + } else { $filetype = 'unkn'; $filesubtype = 'unkn'; } - $icon = '
'; - /*$icontype = strtolower(substr($mtch[3],0,strpos($mtch[3],'/'))); - switch($icontype) { - case 'video': - case 'audio': - case 'image': - case 'text': - $icon = '
'; - break; - default: - $icon = '
'; - break; - }*/ - $title = ((strlen(trim($mtch[4]))) ? escape_tags(trim($mtch[4])) : escape_tags($mtch[1])); $title .= ' ' . $mtch[2] . ' ' . t('bytes'); - $as .= '' . $icon . ''; + if (($filetype == 'image') AND ($item['network'] == NETWORK_OSTATUS)) { + $icon = ''; + $s .= '
' . $icon . ''; + } else { + $icon = '
'; + $as .= '' . $icon . ''; + } + } } } - $as .= '
'; } - $s = $s . $as; + if ($as != '') { + $s .= '
'.$as.'
'; + } // map - if(strpos($s,'
') !== false && $item['coord']) { + if (strpos($s, '
') !== false && x($item, 'coord')) { $x = generate_map(trim($item['coord'])); if ($x) { $s = preg_replace('/\
/','$0' . $x,$s); @@ -1445,37 +1451,36 @@ function prepare_body(&$item,$attach = false, $preview = false) { $spoilersearch = '
'; // Remove line breaks before the spoiler - while ((strpos($s, "\n".$spoilersearch) !== false)) - $s = str_replace("\n".$spoilersearch, $spoilersearch, $s); - while ((strpos($s, "
".$spoilersearch) !== false)) - $s = str_replace("
".$spoilersearch, $spoilersearch, $s); + while ((strpos($s, "\n" . $spoilersearch) !== false)) { + $s = str_replace("\n" . $spoilersearch, $spoilersearch, $s); + } + while ((strpos($s, "
" . $spoilersearch) !== false)) { + $s = str_replace("
" . $spoilersearch, $spoilersearch, $s); + } while ((strpos($s, $spoilersearch) !== false)) { - $pos = strpos($s, $spoilersearch); $rnd = random_string(8); - $spoilerreplace = '
'.sprintf(t('Click to open/close')).''. - '