X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ftext.php;h=66918e9a66e1c1fae6412acf91d0d07b7d25a093;hb=0fe832ef8aeafa1ddba793a8b084005cf070f1f4;hp=8f0ff6e73e584153fce9fa13a318181bb55495e8;hpb=cadc8aa6e83c4fbbe6b18945f78fb91bd82ea585;p=friendica.git diff --git a/include/text.php b/include/text.php index 8f0ff6e73e..66918e9a66 100644 --- a/include/text.php +++ b/include/text.php @@ -1,15 +1,23 @@ template_engine(); try { - $output = $t->replace_macros($s, $r); + $output = $t->replaceMacros($s, $r); } catch (Exception $e) { echo "
" . __FUNCTION__ . ": " . $e->getMessage() . "
"; killme(); @@ -38,24 +46,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. * @@ -77,12 +86,10 @@ function notags($string) { return str_replace(array("<", ">"), array('[', ']'), $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 +98,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 @@ -177,13 +180,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 +196,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 +233,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 +254,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); -}} +} /** @@ -361,7 +342,7 @@ function paginate_data(App $a, $count = null) { return $data; } -if (! function_exists('paginate')) { + /** * Automatic pagination. * @@ -383,9 +364,9 @@ function paginate(App $a) { $tpl = get_markup_template("paginate.tpl"); return replace_macros($tpl, array("pager" => $data)); -}} +} + -if (! function_exists('alt_pager')) { /** * Alternative pager * @param App $a App instance @@ -398,9 +379,9 @@ function alt_pager(App $a, $i) { $tpl = get_markup_template("paginate.tpl"); return replace_macros($tpl, array('pager' => $data)); -}} +} + -if (! function_exists('scroll_loader')) { /** * Loader for infinite scrolling * @return string html for loader @@ -411,9 +392,9 @@ function scroll_loader() { 'wait' => t('Loading more entries...'), 'end' => t('The end') )); -}} +} + -if (! function_exists('expand_acl')) { /** * Turn user/group ACLs stored as angle bracketed text into arrays * @@ -435,9 +416,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 +429,9 @@ function sanitise_acl(&$item) { } else { unset($item); } -}} +} -if (! function_exists('perms2str')) { /** * Convert an ACL array to a storable string * @@ -474,10 +454,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 @@ -502,12 +481,9 @@ function item_new_uri($hostname, $uid, $guid = "") { } 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 @@ -523,16 +499,15 @@ function photo_new_resource() { dbesc($resource) ); - if (dbm::is_result($r)) { + 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 +545,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 +585,9 @@ function get_intltext_template($s) { $a->save_timestamp($stamp1, "file"); return $content; } -}} +} + -if (! function_exists('get_markup_template')) { /** * load template $s * @@ -626,7 +601,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,9 +610,9 @@ function get_markup_template($s, $root = '') { $a->save_timestamp($stamp1, "file"); return $template; -}} +} + -if (! function_exists("get_template_file")) { /** * * @param App $a @@ -664,10 +639,9 @@ function get_template_file($a, $filename, $root = '') { } 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,9 +659,9 @@ 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(); @@ -718,9 +692,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 @@ -758,7 +732,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,7 +764,7 @@ function dlogger($msg, $level = 0) { return; } - $logfile = get_config('system','dlogfile'); + $logfile = Config::get('system','dlogfile'); if (! $logfile) { return; @@ -825,7 +799,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 +809,7 @@ if (! function_exists('activity_match')) { */ function activity_match($haystack,$needle) { return (($haystack === $needle) || ((basename($needle) === $haystack) && strstr($needle, NAMESPACE_ACTIVITY_SCHEMA))); -}} +} /** @@ -909,9 +883,6 @@ function get_tags($string) { } -// - -if (! function_exists('qp')) { /** * quick and dirty quoted_printable encoding * @@ -920,9 +891,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 +905,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,10 +922,10 @@ 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) { + if (!$total) { $contacts = t('No contacts'); $micropro = null; } else { @@ -973,7 +941,7 @@ function contact_block() { dbesc(NETWORK_DIASPORA), intval($shown) ); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { $contacts = array(); foreach ($r AS $contact) { $contacts[] = $contact["id"]; @@ -981,8 +949,8 @@ function contact_block() { $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); + if (DBM::is_result($r)) { + $contacts = sprintf(tt('%d Contact','%d Contacts', $total),$total); $micropro = Array(); foreach ($r as $rr) { $micropro[] = micropro($rr,true,'mpfriend'); @@ -1004,7 +972,8 @@ function contact_block() { call_hooks('contact_block_end', $arr); return $o; -}} +} + /** * @brief Format contacts as picture links or as texxt links @@ -1028,7 +997,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 +1006,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); } } @@ -1054,7 +1022,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { } return replace_macros(get_markup_template(($textmode)?'micropro_txt.tpl':'micropro_img.tpl'),array( - '$click' => (($contact['click']) ? $contact['click'] : ''), + '$click' => defaults($contact, 'click', ''), '$class' => $class, '$url' => $url, '$photo' => proxy_url($contact['thumb'], false, PROXY_SIZE_THUMB), @@ -1066,28 +1034,35 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { )); } - - -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' ? t('Save') : t('Follow'); $values = array( '$s' => htmlspecialchars($s), '$id' => $id, '$action_url' => $url, '$search_label' => t('Search'), - '$save_label' => t('Save'), - '$savedsearch' => feature_enabled(local_user(),'savedsearch'), + '$save_label' => $save_label, + '$savedsearch' => Feature::isEnabled(local_user(),'savedsearch'), '$search_hint' => t('@name, !forum, #tags, content'), + '$mode' => $mode ); if (!$aside) { @@ -1096,31 +1071,26 @@ function search($s, $id = 'search-box', $url = 'search', $save = false, $aside = t("Tags"), t("Contacts")); - if (get_config('system','poco_local_search')) { + if (Config::get('system','poco_local_search')) { $values['$searchoption'][] = 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,7 +1100,7 @@ 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; -}} +} /** @@ -1146,64 +1116,30 @@ function get_poke_verbs() { // 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')), + '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); - 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')), + array(t('Monday'), t('Tuesday'), t('Wednesday'), t('Thursday'), t('Friday'), t('Saturday'), 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')), + 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); return $ret; @@ -1211,13 +1147,13 @@ 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')), + array(t('Mon'), t('Tue'), t('Wed'), t('Thu'), t('Fri'), t('Sat'), 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')), @@ -1225,7 +1161,7 @@ function day_short_translate($s) { return $ret; } -if (! function_exists('normalise_link')) { + /** * Normalize url * @@ -1235,11 +1171,9 @@ if (! function_exists('normalise_link')) { function normalise_link($url) { $ret = str_replace(array('https:', '//www.'), array('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 +1187,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,11 +1214,15 @@ function redir_private_images($a, &$item) } } -function put_item_in_cache(&$item, $update = false) { - - if (($item["rendered-hash"] != hash("md5", $item["body"])) || ($item["rendered-hash"] == "") || - ($item["rendered-html"] == "") || get_config("system", "ignore_cache")) { +function put_item_in_cache(&$item, $update = false) +{ + $rendered_hash = defaults($item, 'rendered-hash', ''); + if ($rendered_hash == '' + || $item["rendered-html"] == "" + || $rendered_hash != hash("md5", $item["body"]) + || Config::get("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. $body = $item["body"]; @@ -1331,7 +1270,7 @@ function prepare_body(&$item, $attach = false, $preview = false) { return $ev; } - if (!get_config('system','suppress_tags')) { + if (!Config::get('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)); @@ -1449,7 +1388,7 @@ function prepare_body(&$item, $attach = false, $preview = false) { // 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); } @@ -1544,9 +1483,8 @@ function prepare_text($text) { * ] * ] */ -function get_cats_and_terms($item) { - - $a = get_app(); +function get_cats_and_terms($item) +{ $categories = array(); $folders = array(); @@ -1595,7 +1533,7 @@ function get_cats_and_terms($item) { return array($categories, $folders); } -if (! function_exists('get_plink')) { + /** * get private link for item * @param array $item @@ -1629,9 +1567,9 @@ function get_plink($item) { } return $ret; -}} +} + -if (! function_exists('unamp')) { /** * replace html amp entity with amp char * @param string $s @@ -1639,23 +1577,23 @@ if (! function_exists('unamp')) { */ function unamp($s) { return str_replace('&', '&', $s); -}} +} -if (! function_exists('return_bytes')) { /** * return number of bytes in size (K, M, G) * @param string $size_str * @return number */ -function return_bytes ($size_str) { +function return_bytes($size_str) { switch (substr ($size_str, -1)) { case 'M': case 'm': return (int)$size_str * 1048576; case 'K': case 'k': return (int)$size_str * 1024; case 'G': case 'g': return (int)$size_str * 1073741824; default: return $size_str; } -}} +} + /** * @return string @@ -1667,7 +1605,7 @@ function generate_user_guid() { $x = q("SELECT `uid` FROM `user` WHERE `guid` = '%s' LIMIT 1", dbesc($guid) ); - if (! dbm::is_result($x)) { + if (! DBM::is_result($x)) { $found = false; } } while ($found == true); @@ -1723,73 +1661,6 @@ function base64url_decode($s) { } -if (!function_exists('str_getcsv')) { - /** - * Parse csv string - * - * @param string $input - * @param string $delimiter - * @param string $enclosure - * @param string $escape - * @param string $eol - * @return boolean|array False on error, otherwise array[row][column] - */ -function str_getcsv($input, $delimiter = ',', $enclosure = '"', $escape = '\\', $eol = '\n') { - if (is_string($input) && !empty($input)) { - $output = array(); - $tmp = preg_split("/".$eol."/",$input); - if (is_array($tmp) && !empty($tmp)) { - while (list($line_num, $line) = each($tmp)) { - if (preg_match("/".$escape.$enclosure."/",$line)) { - while ($strlen = strlen($line)) { - $pos_delimiter = strpos($line,$delimiter); - $pos_enclosure_start = strpos($line,$enclosure); - if ( - is_int($pos_delimiter) && is_int($pos_enclosure_start) - && ($pos_enclosure_start < $pos_delimiter) - ) { - $enclosed_str = substr($line,1); - $pos_enclosure_end = strpos($enclosed_str,$enclosure); - $enclosed_str = substr($enclosed_str,0,$pos_enclosure_end); - $output[$line_num][] = $enclosed_str; - $offset = $pos_enclosure_end+3; - } else { - if (empty($pos_delimiter) && empty($pos_enclosure_start)) { - $output[$line_num][] = substr($line,0); - $offset = strlen($line); - } else { - $output[$line_num][] = substr($line,0,$pos_delimiter); - $offset = ( - !empty($pos_enclosure_start) - && ($pos_enclosure_start < $pos_delimiter) - ) - ?$pos_enclosure_start - :$pos_delimiter+1; - } - } - $line = substr($line,$offset); - } - } else { - $line = preg_split("/".$delimiter."/",$line); - - /* - * Validating against pesky extra line breaks creating false rows. - */ - if (is_array($line) && !empty($line[0])) { - $output[$line_num] = $line; - } - } - } - return $output; - } else { - return false; - } - } else { - return false; - } -} -} - /** * return div element with class 'clear' * @return string @@ -1845,7 +1716,7 @@ function array_xmlify($val){ /** - * transorm link href and img src from relative to absolute + * transform link href and img src from relative to absolute * * @param string $text * @param string $base base url @@ -1919,9 +1790,9 @@ function file_tag_decode($s) { function file_tag_file_query($table,$s,$type = 'file') { if ($type == 'file') { - $str = preg_quote( '[' . str_replace('%', '%%', file_tag_encode($s)) . ']' ); + $str = preg_quote('[' . str_replace('%', '%%', file_tag_encode($s)) . ']'); } else { - $str = preg_quote( '<' . str_replace('%', '%%', file_tag_encode($s)) . '>' ); + $str = preg_quote('<' . str_replace('%', '%%', file_tag_encode($s)) . '>'); } return " AND " . (($table) ? dbesc($table) . '.' : '') . "file regexp '" . dbesc($str) . "' "; } @@ -1973,20 +1844,20 @@ function file_tag_update_pconfig($uid, $file_old, $file_new, $type = 'file') { // $file_old - categories previously associated with an item // $file_new - new list of categories for an item - if (! intval($uid)) + if (!intval($uid)) { return false; - - if ($file_old == $file_new) + } + if ($file_old == $file_new) { return true; + } - $saved = get_pconfig($uid,'system','filetags'); + $saved = PConfig::get($uid, 'system', 'filetags'); if (strlen($saved)) { if ($type == 'file') { $lbracket = '['; $rbracket = ']'; $termtype = TERM_FILE; - } - else { + } else { $lbracket = '<'; $rbracket = '>'; $termtype = TERM_CATEGORY; @@ -2021,37 +1892,34 @@ function file_tag_update_pconfig($uid, $file_old, $file_new, $type = 'file') { intval($termtype), intval($uid)); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { unset($deleted_tags[$key]); - } - else { + } else { $filetags_updated = str_replace($lbracket . file_tag_encode($tag) . $rbracket,'',$filetags_updated); } } if ($saved != $filetags_updated) { - set_pconfig($uid, 'system', 'filetags', $filetags_updated); + PConfig::set($uid, 'system', 'filetags', $filetags_updated); } return true; + } elseif (strlen($file_new)) { + PConfig::set($uid, 'system', 'filetags', $file_new); } - else - if (strlen($file_new)) { - set_pconfig($uid, 'system', 'filetags', $file_new); - } - return true; + return true; } -function file_tag_save_file($uid, $item, $file) { - require_once "include/files.php"; - - $result = false; - if (! intval($uid)) +function file_tag_save_file($uid, $item, $file) +{ + if (! intval($uid)) { return false; + } + $r = q("SELECT `file` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($item), intval($uid) ); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { if (! stristr($r[0]['file'],'[' . file_tag_encode($file) . ']')) { q("UPDATE `item` SET `file` = '%s' WHERE `id` = %d AND `uid` = %d", dbesc($r[0]['file'] . '[' . file_tag_encode($file) . ']'), @@ -2060,23 +1928,22 @@ function file_tag_save_file($uid, $item, $file) { ); } - create_files_from_item($item); + Term::createFromItem($item); - $saved = get_pconfig($uid,'system','filetags'); - if ((! strlen($saved)) || (! stristr($saved, '[' . file_tag_encode($file) . ']'))) { - set_pconfig($uid, 'system', 'filetags', $saved . '[' . file_tag_encode($file) . ']'); + $saved = PConfig::get($uid, 'system', 'filetags'); + if (!strlen($saved) || !stristr($saved, '[' . file_tag_encode($file) . ']')) { + PConfig::set($uid, 'system', 'filetags', $saved . '[' . file_tag_encode($file) . ']'); } - info( t('Item filed') ); + info(t('Item filed')); } return true; } -function file_tag_unsave_file($uid, $item, $file, $cat = false) { - require_once "include/files.php"; - - $result = false; - if (! intval($uid)) +function file_tag_unsave_file($uid, $item, $file, $cat = false) +{ + if (! intval($uid)) { return false; + } if ($cat == true) { $pattern = '<' . file_tag_encode($file) . '>' ; @@ -2086,12 +1953,11 @@ function file_tag_unsave_file($uid, $item, $file, $cat = false) { $termtype = TERM_FILE; } - $r = q("SELECT `file` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($item), intval($uid) ); - if (! dbm::is_result($r)) { + if (! DBM::is_result($r)) { return false; } @@ -2101,17 +1967,17 @@ function file_tag_unsave_file($uid, $item, $file, $cat = false) { intval($uid) ); - create_files_from_item($item); + Term::createFromItem($item); $r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d", dbesc($file), intval(TERM_OBJ_POST), intval($termtype), - intval($uid)); - - if (! dbm::is_result($r)) { - $saved = get_pconfig($uid,'system','filetags'); - set_pconfig($uid, 'system', 'filetags', str_replace($pattern, '', $saved)); + intval($uid) + ); + if (!DBM::is_result($r)) { + $saved = PConfig::get($uid, 'system', 'filetags'); + PConfig::set($uid, 'system', 'filetags', str_replace($pattern, '', $saved)); } return true; @@ -2173,7 +2039,7 @@ function deindent($text, $chr = "[\t ]", $count = NULL) { } function formatBytes($bytes, $precision = 2) { - $units = array('B', 'KB', 'MB', 'GB', 'TB'); + $units = array('B', 'KB', 'MB', 'GB', 'TB'); $bytes = max($bytes, 0); $pow = floor(($bytes ? log($bytes) : 0) / log(1024)); @@ -2195,16 +2061,14 @@ function formatBytes($bytes, $precision = 2) { */ function format_network_name($network, $url = 0) { if ($network != "") { - require_once 'include/contact_selectors.php'; if ($url != "") { - $network_name = ''.network_to_name($network, $url).""; + $network_name = ''.ContactSelector::networkToName($network, $url).""; } else { - $network_name = network_to_name($network); + $network_name = ContactSelector::networkToName($network); } return $network_name; } - } /** @@ -2243,7 +2107,8 @@ function text_highlight($s, $lang) { } $renderer = new Text_Highlighter_Renderer_Html($options); - $hl = Text_Highlighter::factory($lang); + $factory = new Text_Highlighter(); + $hl = $factory->factory($lang); $hl->setRenderer($renderer); $o = $hl->highlight($s); $o = str_replace("\n", '', $o);