X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=include%2Ftext.php;h=c9babba940f8f06e31770f638407bb5a3839b169;hb=a9b948d6f9a3c8b110d84096d033f3fbef864bcb;hp=71a254b251ba7497620ed7f02f17aa80ae762832;hpb=e9b083d13d9a94bd77e7fdad0f5d7795b4a2b764;p=friendica.git diff --git a/include/text.php b/include/text.php index 71a254b251..c9babba940 100644 --- a/include/text.php +++ b/include/text.php @@ -1,13 +1,14 @@ 2) && (substr($word,-2) == $noe)) { + foreach($noend as $noe) { + if((strlen($word) > 2) && (substr($word,-2) == $noe)) { $word = substr($word,0,-1); break; } } - if (substr($word,-1) == 'q') + if(substr($word,-1) == 'q') $word = substr($word,0,-1); return $word; }} @@ -178,7 +179,7 @@ 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 @@ -188,7 +189,7 @@ function xmlify($str) { /* $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,7 +232,7 @@ function xmlify($str) { return($buffer); }} -if (! function_exists('unxmlify')) { +if(! function_exists('unxmlify')) { /** * undo an xmlify * @param string $s xml escaped text @@ -250,17 +251,17 @@ 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)) { + if(! ctype_xdigit($s)) { return($s); } @@ -353,7 +354,7 @@ function paginate_data(App $a, $count = null) { return $data; } -if (! function_exists('paginate')) { +if(! function_exists('paginate')) { /** * Automatic pagination. * @@ -377,7 +378,7 @@ function paginate(App $a) { }} -if (! function_exists('alt_pager')) { +if(! function_exists('alt_pager')) { /** * Alternative pager * @param App $a App instance @@ -392,7 +393,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 +406,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,32 +418,31 @@ function expand_acl($s) { // e.g. "<1><2><3>" => array(1,2,3); $ret = array(); - if (strlen($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; }} -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 unset($item); }} -if (! function_exists('perms2str')) { +if(! function_exists('perms2str')) { /** * Convert an ACL array to a storable string * @@ -454,12 +454,12 @@ if (! function_exists('perms2str')) { */ function perms2str($p) { $ret = ''; - if (is_array($p)) + if(is_array($p)) $tmp = $p; else $tmp = explode(',',$p); - if (is_array($tmp)) { + if(is_array($tmp)) { array_walk($tmp,'sanitise_acl'); $ret = implode('',$tmp); } @@ -467,7 +467,7 @@ function perms2str($p) { }} -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 @@ -494,14 +494,14 @@ function item_new_uri($hostname,$uid, $guid = "") { dbesc($uri)); 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 @@ -518,12 +518,12 @@ function photo_new_resource() { ); 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 @@ -536,11 +536,11 @@ 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"); @@ -549,7 +549,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"); @@ -562,7 +562,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 @@ -576,18 +576,18 @@ 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"); @@ -600,7 +600,7 @@ function get_intltext_template($s) { } }} -if (! function_exists('get_markup_template')) { +if(! function_exists('get_markup_template')) { /** * load template $s * @@ -624,7 +624,7 @@ function get_markup_template($s, $root = '') { return $template; }} -if (! function_exists("get_template_file")) { +if(! function_exists("get_template_file")) { /** * * @param App $a @@ -636,10 +636,10 @@ 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"; @@ -657,7 +657,7 @@ function get_template_file($a, $filename, $root = '') { -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" @@ -674,7 +674,7 @@ if (! function_exists('attribute_contains')) { */ function attribute_contains($attr,$s) { $a = explode(' ', $attr); - if (count($a) && in_array($s,$a)) + if(count($a) && in_array($s,$a)) return true; return false; }} @@ -754,8 +754,74 @@ function logger($msg, $level = 0) { $a->save_timestamp($stamp1, "file"); }} +/** + * @brief An alternative logger for development. + * Works largely as logger() but allows developers + * to isolate particular elements they are targetting + * personally without background noise + * + * log levels: + * LOGGER_NORMAL (default) + * LOGGER_TRACE + * LOGGER_DEBUG + * LOGGER_DATA + * LOGGER_ALL + * + * @global App $a + * @global dba $db + * @global array $LOGGER_LEVELS + * @param string $msg + * @param int $level + */ + +function dlogger($msg, $level = 0) { + $a = get_app(); + global $db; + + // turn off logger in install mode + if ( + $a->module == 'install' + || ! ($db && $db->connected) + ) { + return; + } + + $logfile = get_config('system','dlogfile'); + + if (! $logfile) { + return; + } + + if (count($LOGGER_LEVELS) == 0) { + foreach (get_defined_constants() as $k => $v) { + if (substr($k, 0, 7) == "LOGGER_") { + $LOGGER_LEVELS[$v] = substr($k, 7, 7); + } + } + } + + $process_id = session_id(); + + if ($process_id == '') { + $process_id = get_app()->process_id; + } + + $callers = debug_backtrace(); + $logline = sprintf("%s@\t%s:\t%s:\t%s\t%s\t%s\n", + datetime_convert(), + $process_id, + basename($callers[0]['file']), + $callers[0]['line'], + $callers[1]['function'], + $msg + ); + + $stamp1 = microtime(true); + @file_put_contents($logfile, $logline, FILE_APPEND); + $a->save_timestamp($stamp1, "file"); +} -if (! function_exists('activity_match')) { +if(! function_exists('activity_match')) { /** * Compare activity uri. Knows about activity namespace. * @@ -764,7 +830,7 @@ if (! function_exists('activity_match')) { * @return boolean */ function activity_match($haystack,$needle) { - if (($haystack === $needle) || ((basename($needle) === $haystack) && strstr($needle,NAMESPACE_ACTIVITY_SCHEMA))) + if(($haystack === $needle) || ((basename($needle) === $haystack) && strstr($needle,NAMESPACE_ACTIVITY_SCHEMA))) return true; return false; }} @@ -818,7 +884,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; @@ -843,7 +909,7 @@ function get_tags($string) { // -if (! function_exists('qp')) { +if(! function_exists('qp')) { /** * quick and dirty quoted_printable encoding * @@ -854,7 +920,7 @@ function qp($s) { return str_replace ("%","=",rawurlencode($s)); }} -if (! function_exists('contact_block')) { +if(! function_exists('contact_block')) { /** * Get html for contact block. * @@ -867,12 +933,12 @@ 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` @@ -886,7 +952,7 @@ function contact_block() { if (dbm::is_result($r)) { $total = intval($r[0]['total']); } - if (! $total) { + if(! $total) { $contacts = t('No contacts'); $micropro = Null; @@ -965,10 +1031,10 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { $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'; @@ -978,7 +1044,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { } // 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( @@ -996,7 +1062,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { -if (! function_exists('search')) { +if(! function_exists('search')) { /** * search box * @@ -1031,7 +1097,7 @@ function search($s,$id='search-box',$url='search',$save = false, $aside = true) 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 * @@ -1041,16 +1107,16 @@ if (! function_exists('valid_email')) { function valid_email($x){ // Removed because Fabio told me so. - //if (get_config('system','disable_email_validation')) + //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)) + if(preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',$x)) return true; return false; }} -if (! function_exists('linkify')) { +if(! function_exists('linkify')) { /** * Replace naked text hyperlink with HTML formatted hyperlink * @@ -1121,7 +1187,7 @@ function get_mood_verbs() { return $arr; } -if (! function_exists('day_translate')) { +if(! function_exists('day_translate')) { /** * Translate days and months names * @@ -1141,7 +1207,7 @@ function day_translate($s) { }} -if (! function_exists('normalise_link')) { +if(! function_exists('normalise_link')) { /** * Normalize url * @@ -1155,7 +1221,7 @@ function normalise_link($url) { -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 @@ -1168,7 +1234,7 @@ if (! function_exists('link_compare')) { * */ function link_compare($a,$b) { - if (strcasecmp(normalise_link($a),normalise_link($b)) === 0) + if(strcasecmp(normalise_link($a),normalise_link($b)) === 0) return true; return false; }} @@ -1223,7 +1289,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 @@ -1250,7 +1316,7 @@ 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"] == "") $tag["url"] = $searchpath.strtolower($tag["term"]); @@ -1284,7 +1350,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); @@ -1294,23 +1360,23 @@ function prepare_body(&$item,$attach = false, $preview = false) { $as = ''; $vhead = false; $arr = explode('[/attach],',$item['attach']); - if (count($arr)) { + if(count($arr)) { $as .= ''; - foreach ($arr as $r) { + 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 $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(), @@ -1332,7 +1398,7 @@ function prepare_body(&$item,$attach = false, $preview = false) { } $filetype = strtolower(substr( $mime, 0, strpos($mime,'/') )); - if ($filetype) { + if($filetype) { $filesubtype = strtolower(substr( $mime, strpos($mime,'/') + 1 )); $filesubtype = str_replace('.', '-', $filesubtype); } @@ -1367,7 +1433,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); @@ -1419,7 +1485,7 @@ function prepare_body(&$item,$attach = false, $preview = false) { }} -if (! function_exists('prepare_text')) { +if(! function_exists('prepare_text')) { /** * Given a text string, convert from bbcode to html and add smilie icons. * @@ -1430,7 +1496,7 @@ function prepare_text($text) { require_once('include/bbcode.php'); - if (stristr($text,'[nosmile]')) + if(stristr($text,'[nosmile]')) $s = bbcode($text); else $s = Smilies::replace(bbcode($text)); @@ -1475,8 +1541,8 @@ function get_cats_and_terms($item) { $matches = false; $first = true; $cnt = preg_match_all('/<(.*?)>/',$item['file'],$matches,PREG_SET_ORDER); - if ($cnt) { - foreach ($matches as $mtch) { + if($cnt) { + foreach($matches as $mtch) { $categories[] = array( 'name' => xmlify(file_tag_decode($mtch[1])), 'url' => "#", @@ -1490,11 +1556,11 @@ function get_cats_and_terms($item) { if (count($categories)) $categories[count($categories)-1]['last'] = true; - if (local_user() == $item['uid']) { + if(local_user() == $item['uid']) { $matches = false; $first = true; $cnt = preg_match_all('/\[(.*?)\]/',$item['file'],$matches,PREG_SET_ORDER); - if ($cnt) { - foreach ($matches as $mtch) { + if($cnt) { + foreach($matches as $mtch) { $folders[] = array( 'name' => xmlify(file_tag_decode($mtch[1])), 'url' => "#", @@ -1512,7 +1578,7 @@ function get_cats_and_terms($item) { return array($categories, $folders); } -if (! function_exists('get_plink')) { +if(! function_exists('get_plink')) { /** * get private link for item * @param array $item @@ -1549,7 +1615,7 @@ function get_plink($item) { return($ret); }} -if (! function_exists('unamp')) { +if(! function_exists('unamp')) { /** * replace html amp entity with amp char * @param string $s @@ -1560,7 +1626,7 @@ function unamp($s) { }} -if (! function_exists('return_bytes')) { +if(! function_exists('return_bytes')) { /** * return number of bytes in size (K, M, G) * @param string $size_str @@ -1585,7 +1651,7 @@ function generate_user_guid() { $x = q("SELECT `uid` FROM `user` WHERE `guid` = '%s' LIMIT 1", dbesc($guid) ); - if (! count($x)) + if(! count($x)) $found = false; } while ($found == true ); return $guid; @@ -1601,7 +1667,7 @@ function base64url_encode($s, $strip_padding = false) { $s = strtr(base64_encode($s),'+/','-_'); - if ($strip_padding) + if($strip_padding) $s = str_replace('=','',$s); return $s; @@ -1613,7 +1679,7 @@ function base64url_encode($s, $strip_padding = false) { */ function base64url_decode($s) { - if (is_array($s)) { + if(is_array($s)) { logger('base64url_decode: illegal input: ' . print_r(debug_backtrace(), true)); return $s; } @@ -1624,11 +1690,11 @@ function base64url_decode($s) { * // Uncomment if you find you need it. * * $l = strlen($s); - * if (! strpos($s,'=')) { + * if(! strpos($s,'=')) { * $m = $l % 4; - * if ($m == 2) + * if($m == 2) * $s .= '=='; - * if ($m == 3) + * if($m == 3) * $s .= '='; * } * @@ -1720,10 +1786,10 @@ function bb_translate_video($s) { $matches = null; $r = preg_match_all("/\[video\](.*?)\[\/video\]/ism",$s,$matches,PREG_SET_ORDER); if ($r) { - foreach ($matches as $mtch) { - if ((stristr($mtch[1],'youtube')) || (stristr($mtch[1],'youtu.be'))) + foreach($matches as $mtch) { + if((stristr($mtch[1],'youtube')) || (stristr($mtch[1],'youtu.be'))) $s = str_replace($mtch[0],'[youtube]' . $mtch[1] . '[/youtube]',$s); - elseif (stristr($mtch[1],'vimeo')) + elseif(stristr($mtch[1],'vimeo')) $s = str_replace($mtch[0],'[vimeo]' . $mtch[1] . '[/vimeo]',$s); } } @@ -1801,13 +1867,13 @@ function reltoabs($text, $base) { * @return string */ function item_post_type($item) { - if (intval($item['event-id'])) + if(intval($item['event-id'])) return t('event'); - if (strlen($item['resource-id'])) + if(strlen($item['resource-id'])) return t('photo'); - if (strlen($item['verb']) && $item['verb'] !== ACTIVITY_POST) + if(strlen($item['verb']) && $item['verb'] !== ACTIVITY_POST) return t('activity'); - if ($item['id'] != $item['parent']) + if($item['id'] != $item['parent']) return t('comment'); return t('post'); } @@ -1827,7 +1893,7 @@ function file_tag_decode($s) { function file_tag_file_query($table,$s,$type = 'file') { - if ($type == 'file') + if($type == 'file') $str = preg_quote( '[' . str_replace('%','%%',file_tag_encode($s)) . ']' ); else $str = preg_quote( '<' . str_replace('%','%%',file_tag_encode($s)) . '>' ); @@ -1837,9 +1903,9 @@ function file_tag_file_query($table,$s,$type = 'file') { // ex. given music,video return