<?php
function network_init(&$a) {
- if(! local_user()) {
+ if (! local_user()) {
notice( t('Permission denied.') . EOL);
return;
}
$redir_url = ($net_queries ? $net_baseurl."?".$net_queries : $net_baseurl);
- goaway($a->get_baseurl() . $redir_url);
+ goaway(App::get_baseurl() . $redir_url);
}
}
intval(local_user()),
dbesc($search)
);
- if(! count($r)) {
+ if (! dbm::is_result($r)) {
q("INSERT INTO `search` ( `uid`,`term` ) VALUES ( %d, '%s') ",
intval(local_user()),
dbesc($search)
$saved = array();
- if(count($r)) {
- foreach($r as $rr) {
+ if (dbm::is_result($r)) {
+ foreach ($r as $rr) {
$saved[] = array(
- 'id' => $rr['id'],
- 'term' => $rr['term'],
- 'encodedterm' => urlencode($rr['term']),
- 'delete' => t('Remove term'),
- 'selected' => ($search==$rr['term']),
+ 'id' => $rr['id'],
+ 'term' => $rr['term'],
+ 'encodedterm' => urlencode($rr['term']),
+ 'delete' => t('Remove term'),
+ 'selected' => ($search==$rr['term']),
);
}
}
$tpl = get_markup_template("saved_searches_aside.tpl");
$o = replace_macros($tpl, array(
- '$title' => t('Saved Searches'),
- '$add' => t('add'),
- '$searchbox' => search($search,'netsearch-box',$srchurl,true),
- '$saved' => $saved,
+ '$title' => t('Saved Searches'),
+ '$add' => t('add'),
+ '$searchbox' => search($search,'netsearch-box',$srchurl,true),
+ '$saved' => $saved,
));
return $o;
require_once('include/conversation.php');
- if(! local_user()) {
+ if (! local_user()) {
$_SESSION['return_url'] = $a->query_string;
return login(false);
}
);
$str = '';
- if(count($r))
+ if (dbm::is_result($r))
foreach($r as $rr)
$str .= '<' . $rr['id'] . '>';
if(strlen($str))
if($group) {
if(($t = group_public_members($group)) && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
- notice( sprintf( tt('Warning: This group contains %s member from an insecure network.',
- 'Warning: This group contains %s members from an insecure network.',
- $t), $t ) . EOL);
- notice( t('Private messages to this group are at risk of public disclosure.') . EOL);
+ notice(sprintf(tt("Warning: This group contains %s member from a network that doesn't allow non public messages.",
+ "Warning: This group contains %s members from a network that doesn't allow non public messages.",
+ $t), $t).EOL);
+ notice(t("Messages in this group won't be send to these receivers.").EOL);
}
}
// desired.
$sql_post_table = "";
- $sql_options = (($star) ? " and starred = 1 " : '');
- $sql_options .= (($bmark) ? " and bookmark = 1 " : '');
+ $sql_options = (($star) ? " AND `thread`.`starred` " : '');
+ $sql_options .= (($bmark) ? " AND `thread`.`bookmark` " : '');
$sql_extra = $sql_options;
$sql_extra2 = "";
$sql_extra3 = "";
if ($nouveau OR strlen($file) OR $update) {
$sql_table = "`item`";
$sql_parent = "`parent`";
+ $sql_post_table = " INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent`";
}
$sql_nets = (($nets) ? sprintf(" and $sql_table.`network` = '%s' ", dbesc($nets)) : '');
intval($group),
intval($_SESSION['uid'])
);
- if(! count($r)) {
+ if (! dbm::is_result($r)) {
if($update)
killme();
notice( t('No such group') . EOL );
$gcontact_str_self = $self[0]["gid"];
}
- $sql_post_table = " INNER JOIN `item` AS `temp1` ON `temp1`.`id` = ".$sql_table.".".$sql_parent;
- $sql_extra3 .= " AND ($sql_table.`contact-id` IN ($contact_str) ";
- $sql_extra3 .= " OR ($sql_table.`contact-id` = '$contact_str_self' AND `temp1`.`allow_gid` LIKE '".protect_sprintf('%<'.intval($group).'>%')."' AND `temp1`.`private`))";
+ $sql_post_table .= " INNER JOIN `item` AS `temp1` ON `temp1`.`id` = ".$sql_table.".".$sql_parent;
+ $sql_extra3 .= " AND (`thread`.`contact-id` IN ($contact_str) ";
+ $sql_extra3 .= " OR (`thread`.`contact-id` = '$contact_str_self' AND `temp1`.`allow_gid` LIKE '".protect_sprintf('%<'.intval($group).'>%')."' AND `temp1`.`private`))";
} else {
$sql_extra3 .= " AND false ";
info( t('Group is empty'));
elseif($cid) {
$r = qu("SELECT `id`,`name`,`network`,`writable`,`nurl`, `forum`, `prv`, `contact-type`, `addr`, `thumb`, `location` FROM `contact` WHERE `id` = %d
- AND `blocked` = 0 AND `pending` = 0 LIMIT 1",
+ AND (NOT `blocked` OR `pending`) LIMIT 1",
intval($cid)
);
- if(count($r)) {
+ if (dbm::is_result($r)) {
$sql_extra = " AND ".$sql_table.".`contact-id` = ".intval($cid);
$entries[0] = array(
if($tag) {
$sql_extra = "";
- $sql_post_table = sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
+ $sql_post_table .= sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
dbesc(protect_sprintf($search)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG), intval(local_user()));
$sql_order = "`item`.`id`";
$order_mode = "id";
$sql_extra = sprintf(" AND MATCH (`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode) ", dbesc(protect_sprintf($search)));
else
$sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search))));
- $sql_order = "`item`.`received`";
- $order_mode = "received";
+ $sql_order = "`item`.`id`";
+ $order_mode = "id";
}
}
if(strlen($file)) {
- $sql_post_table = sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
+ $sql_post_table .= sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
dbesc(protect_sprintf($file)), intval(TERM_OBJ_POST), intval(TERM_FILE), intval(local_user()));
$sql_order = "`item`.`id`";
$order_mode = "id";
// only setup pagination on initial page view
$pager_sql = '';
- }
- else {
+ } else {
if(get_config('system', 'old_pager')) {
$r = qu("SELECT COUNT(*) AS `total`
FROM $sql_table $sql_post_table INNER JOIN `contact` ON `contact`.`id` = $sql_table.`contact-id`
- AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+ AND (NOT `contact`.`blocked` OR `contact`.`pending`)
WHERE $sql_table.`uid` = %d AND $sql_table.`visible` AND NOT $sql_table.`deleted`
$sql_extra2 $sql_extra3
$sql_extra $sql_nets ",
intval($_SESSION['uid'])
);
- if(count($r)) {
+ if (dbm::is_result($r)) {
$a->set_pager_total($r[0]['total']);
}
}
$simple_update = (($update) ? " AND `item`.`unseen` " : '');
if ($sql_order == "")
- $sql_order = "`item`.`received`";
+ $sql_order = "`item`.`id`";
// "New Item View" - show all items unthreaded in reverse created date order
$items = qu("SELECT %s FROM $sql_table $sql_post_table %s
$r = qu("SELECT `item`.`parent` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid`
FROM $sql_table $sql_post_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
- AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+ AND (NOT `contact`.`blocked` OR `contact`.`pending`)
WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`deleted` $sql_extra4
AND NOT `item`.`moderated` AND `item`.`unseen`
$sql_extra3 $sql_extra $sql_nets
} else {
$r = qu("SELECT `thread`.`iid` AS `item_id`, `thread`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid`
FROM $sql_table $sql_post_table STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
- AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+ AND (NOT `contact`.`blocked` OR `contact`.`pending`)
WHERE `thread`.`uid` = %d AND `thread`.`visible` AND NOT `thread`.`deleted`
AND NOT `thread`.`moderated`
$sql_extra2 $sql_extra3 $sql_extra $sql_nets
$parents_str = '';
$date_offset = "";
- if(dbm::is_result($r)) {
+ if (dbm::is_result($r)) {
foreach($r as $rr)
if(! in_array($rr['item_id'],$parents_arr))
$parents_arr[] = $rr['item_id'];
intval($parents),
intval($max_comments + 1)
);
- $items = array_merge($items, $thread_items);
+
+ if (dbm::is_result($thread_items))
+ $items = array_merge($items, $thread_items);
}
$items = conv_sort($items,$ordering);
} else {
projects / friendica.git / blobdiff