<?php
-function network_init(&$a) {
- if(! local_user()) {
+function network_init(App $a) {
+ if (! local_user()) {
notice( t('Permission denied.') . EOL);
return;
}
$is_a_date_query = false;
- if(x($_GET['cid']) && intval($_GET['cid']) != 0)
+ if (x($_GET['cid']) && intval($_GET['cid']) != 0) {
$cid = $_GET['cid'];
+ }
- if($a->argc > 1) {
- for($x = 1; $x < $a->argc; $x ++) {
- if(is_a_date_arg($a->argv[$x])) {
+ if ($a->argc > 1) {
+ for ($x = 1; $x < $a->argc; $x ++) {
+ if (is_a_date_arg($a->argv[$x])) {
$is_a_date_query = true;
break;
}
parse_str($query_string, $query_array);
array_shift($query_array);
-
// fetch last used network view and redirect if needed
- if(! $is_a_date_query) {
+ if (! $is_a_date_query) {
$sel_tabs = network_query_get_sel_tab($a);
$sel_nets = network_query_get_sel_net();
$sel_groups = network_query_get_sel_group($a);
$net_baseurl = '/network';
$net_args = array();
- if($remember_group) {
+ if ($remember_group) {
$net_baseurl .= '/' . $last_sel_groups; // Note that the group number must come before the "/new" tab selection
- }
- else if($sel_groups !== false) {
+ } elseif($sel_groups !== false) {
$net_baseurl .= '/' . $sel_groups;
}
$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;
*
* @return Array ( $no_active, $comment_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active );
*/
-function network_query_get_sel_tab($a) {
+function network_query_get_sel_tab(App $a) {
$no_active='';
$starred_active = '';
$new_active = '';
return $network;
}
-function network_query_get_sel_group($a) {
+function network_query_get_sel_group(App $a) {
$group = false;
if($a->argc >= 2 && is_numeric($a->argv[1])) {
}
-function network_content(&$a, $update = 0) {
+function network_content(App $a, $update = 0) {
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))
// 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 = "";
intval($group),
intval($_SESSION['uid'])
);
- if(! count($r)) {
+ if (! dbm::is_result($r)) {
if($update)
killme();
notice( t('No such group') . EOL );
elseif($cid) {
$r = qu("SELECT `id`,`name`,`network`,`writable`,`nurl`, `forum`, `prv`, `contact-type`, `addr`, `thumb`, `location` FROM `contact` WHERE `id` = %d
- AND NOT `blocked` 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(
$sql_order = "`item`.`id`";
$order_mode = "id";
} else {
- if (get_config('system','use_fulltext_engine'))
- $sql_extra = sprintf(" AND MATCH (`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode) ", dbesc(protect_sprintf($search)));
- else
+ // Disabled until final decision what to do with this
+ //if (get_config('system','use_fulltext_engine'))
+ // $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)) {
// 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`.`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`.`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`.`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 {
// on they just get buried deeper. It has happened to me a couple of times also.
- if((! $group) && (! $cid) && (! $star)) {
+ if (!$group && !$cid && !$star) {
- $unseen = q("SELECT `id` FROM `item` WHERE `unseen` AND `uid` = %d",
+ $unseen = q("SELECT `id` FROM `item` WHERE `unseen` AND `uid` = %d LIMIT 1",
intval(local_user()));
- if ($unseen)
+ if (dbm::is_result($unseen)) {
$r = q("UPDATE `item` SET `unseen` = 0
WHERE `unseen` = 1 AND `uid` = %d",
intval(local_user())
);
- }
- else {
- if($update_unseen) {
+ }
+ } elseif ($update_unseen) {
- $unseen = q("SELECT `id` FROM `item` ".$update_unseen);
+ $unseen = q("SELECT `id` FROM `item` ".$update_unseen. " LIMIT 1");
- if ($unseen)
- $r = q("UPDATE `item` SET `unseen` = 0 $update_unseen");
+ if (dbm::is_result($unseen)) {
+ $r = q("UPDATE `item` SET `unseen` = 0 $update_unseen");
}
}
$o .= conversation($a,$items,$mode,$update);
- if(!$update) {
- if(get_pconfig(local_user(),'system','infinite_scroll')) {
+ if (!$update) {
+ if (get_pconfig(local_user(),'system','infinite_scroll')) {
$o .= scroll_loader();
- } elseif(!get_config('system', 'old_pager')) {
+ } elseif (!get_config('system', 'old_pager')) {
$o .= alt_pager($a,count($items));
} else {
$o .= paginate($a);
/**
* @brief Get the network tabs menu
- *
+ *
* @param app $a The global App
* @return string Html of the networktab
*/
-function network_tabs($a) {
+function network_tabs(App $a) {
// item filter tabs
/// @TODO fix this logic, reduce duplication
/// $a->page['content'] .= '<div class="tabs-wrapper">';
$arr = array('tabs' => $tabs);
call_hooks('network_tabs', $arr);
-
+
$tpl = get_markup_template('common_tabs.tpl');
return replace_macros($tpl, array('$tabs' => $arr['tabs']));
projects / friendica.git / blobdiff