From 11c16f1123940bcde4feca2b2c3070a54bb4c4ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Wed, 17 May 2017 18:28:00 +0200 Subject: [PATCH] Continued: - added more curly braces - replaced if (blaFoo()) { return true; } return false; with return blaFoo(); - added spaces MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- include/text.php | 288 ++++++++++++++++++++++++++--------------------- 1 file changed, 158 insertions(+), 130 deletions(-) diff --git a/include/text.php b/include/text.php index d904f7cbaa..d1ccb3c96c 100644 --- a/include/text.php +++ b/include/text.php @@ -2,11 +2,11 @@ use Friendica\App; -require_once("include/template_processor.php"); -require_once("include/friendica_smarty.php"); -require_once("include/Smilies.php"); -require_once("include/map.php"); -require_once("mod/proxy.php"); +require_once "include/template_processor.php"; +require_once "include/friendica_smarty.php"; +require_once "include/Smilies.php"; +require_once "include/map.php"; +require_once "mod/proxy.php"; if (! function_exists('replace_macros')) { /** @@ -17,7 +17,7 @@ if (! function_exists('replace_macros')) { * @param array $r key value pairs (search => replace) * @return string substituted string */ -function replace_macros($s,$r) { +function replace_macros($s, $r) { $stamp1 = microtime(true); @@ -26,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"); @@ -47,10 +47,10 @@ define('RANDOM_STRING_HEX', 0x00 ); define('RANDOM_STRING_TEXT', 0x01 ); if (! function_exists('random_string')) { -function random_string($size = 64,$type = RANDOM_STRING_HEX) { +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)); }} @@ -73,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)); @@ -90,8 +89,7 @@ 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); }} @@ -107,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', @@ -144,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 = ''; @@ -155,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); + 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; }} @@ -186,6 +189,7 @@ if (! function_exists('xmlify')) { * @return string Escaped text. */ function xmlify($str) { + /// @TODO deprecated code found? /* $buffer = ''; $len = mb_strlen($str); @@ -239,6 +243,7 @@ if (! function_exists('unxmlify')) { * @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); @@ -258,14 +263,15 @@ if (! function_exists('hex2bin')) { * @return number */ function hex2bin($s) { - if (! (is_string($s) && strlen($s))) + if (! (is_string($s) && strlen($s))) { return ''; - - if (! ctype_xdigit($s)) { - return($s); } - return(pack("H*",$s)); + if (! ctype_xdigit($s)) { + return $s; + } + + return pack("H*",$s); }} @@ -421,9 +427,10 @@ function expand_acl($s) { if (strlen($s)) { $t = str_replace('<','',$s); $a = explode('>',$t); - foreach ($a as $aa) { - if (intval($aa)) + foreach($a as $aa) { + if (intval($aa)) { $ret[] = intval($aa); + } } } return $ret; @@ -476,14 +483,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 = ""; } @@ -492,9 +499,11 @@ 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); + return $uri; }} @@ -516,9 +525,12 @@ 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); + return $resource; }} @@ -536,8 +548,9 @@ 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")) { @@ -576,11 +589,13 @@ 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")) { $stamp1 = microtime(true); @@ -616,7 +631,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"); @@ -636,17 +652,19 @@ 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 !== '' && $root[strlen($root) - 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("{$root}view/theme/{$a->theme_info[\"extends\"]}/$filename")) { + $template_file = "{$root}view/theme/{$a->theme_info[\"extends\"]}/$filename"; + } elseif (file_exists("{$root}/$filename")) { $template_file = "{$root}/$filename"; - else + } else { $template_file = "{$root}view/$filename"; + } return $template_file; }} @@ -672,11 +690,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')) { @@ -830,9 +846,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))); }} @@ -917,7 +931,7 @@ if (! function_exists('qp')) { * @return string */ function qp($s) { -return str_replace ("%","=",rawurlencode($s)); + return str_replace("%", "=", rawurlencode($s)); }} if (! function_exists('contact_block')) { @@ -933,13 +947,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` @@ -954,8 +971,7 @@ function contact_block() { } 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` @@ -1024,8 +1040,9 @@ 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 = ''; @@ -1038,14 +1055,15 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { $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'] : ''), @@ -1071,7 +1089,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( @@ -1090,8 +1108,9 @@ 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); @@ -1106,13 +1125,10 @@ if (! function_exists('valid_email')) { */ function valid_email($x){ - // Removed because Fabio told me so. + /// @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); }} @@ -1125,7 +1141,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; }} @@ -1215,8 +1231,8 @@ 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,'/'); }} @@ -1234,9 +1250,7 @@ if (! function_exists('link_compare')) { * */ function link_compare($a,$b) { - if (strcasecmp(normalise_link($a),normalise_link($b)) === 0) - return true; - return false; + return (strcasecmp(normalise_link($a), normalise_link($b)) === 0); }} /** @@ -1318,8 +1332,9 @@ function prepare_body(&$item,$attach = false, $preview = false) { foreach ($taglist as $tag) { - if ($tag["url"] == "") + if ($tag["url"] == "") { $tag["url"] = $searchpath.strtolower($tag["term"]); + } if ($tag["type"] == TERM_HASHTAG) { $hashtags[] = "#".$tag["term"].""; @@ -1433,7 +1448,7 @@ function prepare_body(&$item,$attach = false, $preview = false) { $s = $s . $as; // map - if (strpos($s,'
') !== false && $item['coord']) { + if (strpos($s, '
') !== false && $item['coord']) { $x = generate_map(trim($item['coord'])); if ($x) { $s = preg_replace('/\
/','$0' . $x,$s); @@ -1445,37 +1460,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')).''. - '