X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=include%2Ftext.php;h=8d3b6a8050199ec5ec4d78ea0982af902e3a2316;hb=e24c3a5b826d2357e40a173d9e7b66048dab5b37;hp=50e2e81931724a2e29f1c7ce5bb7404a8f8fa488;hpb=c2e17cb9c4590fc253bfa2abacb4c7bf80f319ce;p=friendica.git diff --git a/include/text.php b/include/text.php index 50e2e81931..8d3b6a8050 100644 --- a/include/text.php +++ b/include/text.php @@ -12,7 +12,7 @@ if(! function_exists('replace_macros')) { * This is our template processor * * @param string|FriendicaSmarty $s the string requiring macro substitution, - * or an instance of FriendicaSmarty + * or an instance of FriendicaSmarty * @param array $r key value pairs (search => replace) * @return string substituted string */ @@ -23,7 +23,7 @@ function replace_macros($s,$r) { $a = get_app(); // pass $baseurl to all templates - $r['$baseurl'] = $a->get_baseurl(); + $r['$baseurl'] = App::get_baseurl(); $t = $a->template_engine(); @@ -369,7 +369,7 @@ if(! function_exists('paginate')) { * @param App $a App instance * @return string html for pagination #FIXME remove html */ -function paginate(&$a) { +function paginate(App &$a) { $data = paginate_data($a); $tpl = get_markup_template("paginate.tpl"); @@ -491,7 +491,7 @@ function item_new_uri($hostname,$uid, $guid = "") { $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($uri)); - if(count($r)) + if (dbm::is_result($r)) $dups = true; } while($dups == true); return $uri; @@ -515,7 +515,7 @@ function photo_new_resource() { $r = q("SELECT `id` FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", dbesc($resource) ); - if(count($r)) + if (dbm::is_result($r)) $found = true; } while($found == true); return $resource; @@ -699,7 +699,7 @@ $LOGGER_LEVELS = array(); * @param int $level */ function logger($msg, $level = 0) { - global $a; + $a = get_app(); global $db; global $LOGGER_LEVELS; @@ -770,7 +770,8 @@ function activity_match($haystack,$needle) { /** - * Pull out all #hashtags and @person tags from $string; + * @brief Pull out all #hashtags and @person tags from $string. + * * We also get @person@domain.com - which would make * the regex quite complicated as tags can also * end a sentence. So we'll run through our results @@ -873,15 +874,15 @@ function contact_block() { if((! is_array($a->profile)) || ($a->profile['hide-friends'])) return $o; $r = q("SELECT COUNT(*) AS `total` FROM `contact` - WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 - AND `hidden` = 0 AND `archive` = 0 + WHERE `uid` = %d AND NOT `self` AND NOT `blocked` + AND NOT `hidden` AND NOT `archive` AND `network` IN ('%s', '%s', '%s')", intval($a->profile['uid']), dbesc(NETWORK_DFRN), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA) ); - if(count($r)) { + if (dbm::is_result($r)) { $total = intval($r[0]['total']); } if(! $total) { @@ -891,7 +892,7 @@ function contact_block() { } else { // Splitting the query in two parts makes it much faster $r = q("SELECT `id` FROM `contact` - WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` + WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `hidden` AND NOT `archive` AND `network` IN ('%s', '%s', '%s') ORDER BY RAND() LIMIT %d", intval($a->profile['uid']), @@ -900,14 +901,15 @@ function contact_block() { dbesc(NETWORK_DIASPORA), intval($shown) ); - if ($r) { + if (dbm::is_result($r)) { $contacts = ""; foreach ($r AS $contact) $contacts[] = $contact["id"]; $r = q("SELECT `id`, `uid`, `addr`, `url`, `name`, `thumb`, `network` FROM `contact` WHERE `id` IN (%s)", dbesc(implode(",", $contacts))); - if(count($r)) { + + if (dbm::is_result($r)) { $contacts = sprintf( tt('%d Contact','%d Contacts', $total),$total); $micropro = Array(); foreach($r as $rr) { @@ -1169,33 +1171,29 @@ function link_compare($a,$b) { return false; }} - -if(! function_exists('redir_private_images')) { /** - * Find any non-embedded images in private items and add redir links to them + * @brief Find any non-embedded images in private items and add redir links to them * * @param App $a - * @param array $item + * @param array &$item The field array of an item row */ -function redir_private_images($a, &$item) { - +function redir_private_images($a, &$item) +{ $matches = false; $cnt = preg_match_all('|\[img\](http[^\[]*?/photo/[a-fA-F0-9]+?(-[0-9]\.[\w]+?)?)\[\/img\]|', $item['body'], $matches, PREG_SET_ORDER); - if($cnt) { - //logger("redir_private_images: matches = " . print_r($matches, true)); - foreach($matches as $mtch) { - if(strpos($mtch[1], '/redir') !== false) + if ($cnt) { + foreach ($matches as $mtch) { + if (strpos($mtch[1], '/redir') !== false) { continue; + } - if((local_user() == $item['uid']) && ($item['private'] != 0) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN)) { - //logger("redir_private_images: redir"); - $img_url = 'redir?f=1&quiet=1&url=' . $mtch[1] . '&conurl=' . $item['author-link']; - $item['body'] = str_replace($mtch[0], "[img]".$img_url."[/img]", $item['body']); + if ((local_user() == $item['uid']) && ($item['private'] != 0) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN)) { + $img_url = 'redir?f=1&quiet=1&url=' . urlencode($mtch[1]) . '&conurl=' . urlencode($item['author-link']); + $item['body'] = str_replace($mtch[0], '[img]' . $img_url . '[/img]', $item['body']); } } } - -}} +} function put_item_in_cache(&$item, $update = false) { @@ -1369,7 +1367,7 @@ function prepare_body(&$item,$attach = false, $preview = false) { // map if(strpos($s,'