* 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
*/
$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;
$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;
if(! isset($lang))
$lang = 'en';
- if(file_exists("view/$lang$engine/$s")) {
+ if(file_exists("view/lang/$lang$engine/$s")) {
$stamp1 = microtime(true);
- $content = file_get_contents("view/$lang$engine/$s");
+ $content = file_get_contents("view/lang/$lang$engine/$s");
$a->save_timestamp($stamp1, "file");
return $content;
- } elseif(file_exists("view/en$engine/$s")) {
+ } elseif(file_exists("view/lang/en$engine/$s")) {
$stamp1 = microtime(true);
- $content = file_get_contents("view/en$engine/$s");
+ $content = file_get_contents("view/lang/en$engine/$s");
$a->save_timestamp($stamp1, "file");
return $content;
} else {
return false;
}}
-if(! function_exists('logger')) {
+if (! function_exists('logger')) {
/* setup int->string log level map */
$LOGGER_LEVELS = array();
/**
+ * @brief Logs the given message at the given log level
+ *
* log levels:
* LOGGER_NORMAL (default)
* LOGGER_TRACE
*
* @global App $a
* @global dba $db
+ * @global array $LOGGER_LEVELS
* @param string $msg
* @param int $level
*/
-function logger($msg,$level = 0) {
- // turn off logger in install mode
- global $a;
+function logger($msg, $level = 0) {
+ $a = get_app();
global $db;
global $LOGGER_LEVELS;
- if(($a->module == 'install') || (! ($db && $db->connected))) 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);
- }
+ // turn off logger in install mode
+ if (
+ $a->module == 'install'
+ || ! ($db && $db->connected)
+ ) {
+ return;
}
$debugging = get_config('system','debugging');
- $loglevel = intval(get_config('system','loglevel'));
$logfile = get_config('system','logfile');
+ $loglevel = intval(get_config('system','loglevel'));
- if((! $debugging) || (! $logfile) || ($level > $loglevel))
+ if (
+ ! $debugging
+ || ! $logfile
+ || $level > $loglevel
+ ) {
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@%s\t[%s]:%s:%s:%s\t%s\n",
- datetime_convert(),
- session_id(),
- $LOGGER_LEVELS[$level],
- basename($callers[0]['file']),
- $callers[0]['line'],
- $callers[1]['function'],
- $msg
- );
+ $logline = sprintf("%s@%s\t[%s]:%s:%s:%s\t%s\n",
+ datetime_convert(),
+ $process_id,
+ $LOGGER_LEVELS[$level],
+ 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");
- return;
}}
}}
-if(! function_exists('get_tags')) {
/**
- * Pull out all #hashtags and @person tags from $s;
+ * @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
* and strip the period from any tags which end with one.
* Returns array of tags found, or empty array.
*
- * @param string $s
- * @return array
+ * @param string $string Post content
+ * @return array List of tag and person names
*/
-function get_tags($s) {
+function get_tags($string) {
$ret = array();
// Convert hashtag links to hashtags
- $s = preg_replace("/#\[url\=([^\[\]]*)\](.*?)\[\/url\]/ism", "#$2", $s);
+ $string = preg_replace('/#\[url\=([^\[\]]*)\](.*?)\[\/url\]/ism', '#$2', $string);
// ignore anything in a code block
- $s = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$s);
+ $string = preg_replace('/\[code\](.*?)\[\/code\]/sm', '', $string);
// Force line feeds at bbtags
- $s = str_replace(array("[", "]"), array("\n[", "]\n"), $s);
+ $string = str_replace(array('[', ']'), array("\n[", "]\n"), $string);
// ignore anything in a bbtag
- $s = preg_replace('/\[(.*?)\]/sm','',$s);
+ $string = preg_replace('/\[(.*?)\]/sm', '', $string);
// Match full names against @tags including the space between first and last
// We will look these up afterward to see if they are full names or not recognisable.
- if(preg_match_all('/(@[^ \x0D\x0A,:?]+ [^ \x0D\x0A@,:?]+)([ \x0D\x0A@,:?]|$)/',$s,$match)) {
- foreach($match[1] as $mtch) {
- if(strstr($mtch,"]")) {
+ if (preg_match_all('/(@[^ \x0D\x0A,:?]+ [^ \x0D\x0A@,:?]+)([ \x0D\x0A@,:?]|$)/', $string, $matches)) {
+ foreach ($matches[1] as $match) {
+ if (strstr($match, ']')) {
// we might be inside a bbcode color tag - leave it alone
continue;
}
- if(substr($mtch,-1,1) === '.')
- $ret[] = substr($mtch,0,-1);
- else
- $ret[] = $mtch;
+ if (substr($match, -1, 1) === '.') {
+ $ret[] = substr($match, 0, -1);
+ } else {
+ $ret[] = $match;
+ }
}
}
// Otherwise pull out single word tags. These can be @nickname, @first_last
// and #hash tags.
- if(preg_match_all('/([!#@][^ \x0D\x0A,;:?]+)([ \x0D\x0A,;:?]|$)/',$s,$match)) {
- foreach($match[1] as $mtch) {
- if(strstr($mtch,"]")) {
+ if (preg_match_all('/([!#@][^\^ \x0D\x0A,;:?]+)([ \x0D\x0A,;:?]|$)/', $string, $matches)) {
+ foreach($matches[1] as $match) {
+ if (strstr($match, ']')) {
// we might be inside a bbcode color tag - leave it alone
continue;
}
- if(substr($mtch,-1,1) === '.')
- $mtch = substr($mtch,0,-1);
+ if (substr($match, -1, 1) === '.') {
+ $match = substr($match,0,-1);
+ }
// ignore strictly numeric tags like #1
- if((strpos($mtch,'#') === 0) && ctype_digit(substr($mtch,1)))
+ if ((strpos($match, '#') === 0) && ctype_digit(substr($match, 1))) {
continue;
+ }
// try not to catch url fragments
- if(strpos($s,$mtch) && preg_match('/[a-zA-z0-9\/]/',substr($s,strpos($s,$mtch)-1,1)))
+ if (strpos($string, $match) && preg_match('/[a-zA-z0-9\/]/', substr($string, strpos($string, $match) - 1, 1))) {
continue;
- $ret[] = $mtch;
+ }
+ $ret[] = $match;
}
}
return $ret;
-}}
+}
//
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) {
$micropro = Null;
} else {
- $r = q("SELECT `id`, `uid`, `addr`, `url`, `name`, `micro`, `network` FROM `contact`
- WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending`
+ // 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 `hidden` AND NOT `archive`
AND `network` IN ('%s', '%s', '%s') ORDER BY RAND() LIMIT %d",
intval($a->profile['uid']),
dbesc(NETWORK_DIASPORA),
intval($shown)
);
- if(count($r)) {
- $contacts = sprintf( tt('%d Contact','%d Contacts', $total),$total);
- $micropro = Array();
- foreach($r as $rr) {
- $micropro[] = micropro($rr,true,'mpfriend');
+ 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(dbm::is_result($r)) {
+ $contacts = sprintf( tt('%d Contact','%d Contacts', $total),$total);
+ $micropro = Array();
+ foreach($r as $rr) {
+ $micropro[] = micropro($rr,true,'mpfriend');
+ }
}
}
}
* string 'url' => The url to the profile page of the contact
* string 'addr' => The webbie of the contact (e.g.) username@friendica.com
* string 'network' => The network to which the contact belongs to
- * string 'micro' => The contact picture
+ * string 'thumb' => The contact picture
* string 'click' => js code which is performed when clicking on the contact
* @param boolean $redirect If true try to use the redir url if it's possible
- * @param string $class CSS class for the
+ * @param string $class CSS class for the
* @param boolean $textmode If true display the contacts as text links
* if false display the contacts as picture links
-
- * @return string Formatted html
+
+ * @return string Formatted html
*/
function micropro($contact, $redirect = false, $class = '', $textmode = false) {
'$click' => (($contact['click']) ? $contact['click'] : ''),
'$class' => $class,
'$url' => $url,
- '$photo' => proxy_url($contact['micro'], false, PROXY_SIZE_THUMB),
+ '$photo' => proxy_url($contact['thumb'], false, PROXY_SIZE_THUMB),
'$name' => $contact['name'],
'title' => $contact['name'] . ' [' . $contact['addr'] . ']',
'$parkle' => $sparkle,
$a = get_app();
$values = array(
- '$s' => $s,
+ '$s' => htmlspecialchars($s),
'$id' => $id,
'$action_url' => $url,
'$search_label' => t('Search'),
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) {
// intval($uid)
//);
- if(count($r)) {
+ if(dbm::is_result($r)) {
unset($deleted_tags[$key]);
}
else {
intval($item),
intval($uid)
);
- if(count($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) . ']'),
intval($item),
intval($uid)
);
- if(! count($r))
+ if(! dbm::is_result($r))
return false;
q("UPDATE `item` SET `file` = '%s' WHERE `id` = %d AND `uid` = %d",
//$r = q("select file from item where uid = %d and deleted = 0 " . file_tag_file_query('item',$file,(($cat) ? 'category' : 'file')),
//);
- if(! count($r)) {
+ if(! dbm::is_result($r)) {
$saved = get_pconfig($uid,'system','filetags');
set_pconfig($uid,'system','filetags',str_replace($pattern,'',$saved));
/**
* @brief translate and format the networkname of a contact
- *
+ *
* @param string $network
* Networkname of the contact (e.g. dfrn, rss and so on)
* @param sting $url
$s = trim(html_entity_decode($s,ENT_COMPAT));
$s = str_replace(" ","\t",$s);
- // The highlighter library insists on an opening php tag for php code blocks. If
+ // The highlighter library insists on an opening php tag for php code blocks. If
// it isn't present, nothing is highlighted. So we're going to see if it's present.
// If not, we'll add it, and then quietly remove it after we get the processed output back.
$s = '<?php' . "\n" . $s;
$tag_added = true;
}
- }
+ }
$renderer = new Text_Highlighter_Renderer_HTML($options);
$hl = Text_Highlighter::factory($lang);
projects / friendica.git / blobdiff