X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Fnetwork.php;h=a1181a74cb3a295777c42e54d5262c8630aa00f1;hb=221cfa8c22b724228ed24618569cabcae582d331;hp=9cfeda1026b9e8e3f51f8cadaa1a0f4c758e2d82;hpb=cc16369b6f45eff2c0faa91bda96ae619f9f80e4;p=friendica.git diff --git a/mod/network.php b/mod/network.php index 9cfeda1026..a1181a74cb 100644 --- a/mod/network.php +++ b/mod/network.php @@ -1,17 +1,18 @@ 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; } @@ -24,9 +25,8 @@ function network_init(&$a) { 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); @@ -41,10 +41,9 @@ function network_init(&$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; } @@ -100,7 +99,7 @@ function network_init(&$a) { $redir_url = ($net_queries ? $net_baseurl."?".$net_queries : $net_baseurl); - goaway($a->get_baseurl() . $redir_url); + goaway(App::get_baseurl() . $redir_url); } } @@ -126,7 +125,7 @@ function network_init(&$a) { intval(local_user()), dbesc($search) ); - if(! dbm::is_result($r)) { + if (! dbm::is_result($r)) { q("INSERT INTO `search` ( `uid`,`term` ) VALUES ( %d, '%s') ", intval(local_user()), dbesc($search) @@ -183,13 +182,13 @@ function saved_searches($search) { $saved = array(); if (dbm::is_result($r)) { - foreach($r as $rr) { + 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']), ); } } @@ -197,10 +196,10 @@ function saved_searches($search) { $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; @@ -222,7 +221,7 @@ function saved_searches($search) { * * @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 = ''; @@ -293,7 +292,7 @@ function network_query_get_sel_net() { 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])) { @@ -304,11 +303,11 @@ function network_query_get_sel_group($a) { } -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); } @@ -463,7 +462,7 @@ function network_content(&$a, $update = 0) { intval($group), intval($_SESSION['uid']) ); - if(! dbm::is_result($r)) { + if (! dbm::is_result($r)) { if($update) killme(); notice( t('No such group') . EOL ); @@ -575,9 +574,10 @@ function network_content(&$a, $update = 0) { $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`.`id`"; $order_mode = "id"; @@ -599,21 +599,6 @@ function network_content(&$a, $update = 0) { $pager_sql = ''; } 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` 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 (dbm::is_result($r)) { - $a->set_pager_total($r[0]['total']); - } - } - // check if we serve a mobile device and get the user settings // accordingly if ($a->is_mobile) { @@ -729,7 +714,7 @@ function network_content(&$a, $update = 0) { intval($parents), intval($max_comments + 1) ); - + if (dbm::is_result($thread_items)) $items = array_merge($items, $thread_items); } @@ -763,24 +748,23 @@ function network_content(&$a, $update = 0) { // 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"); } } @@ -789,15 +773,13 @@ function network_content(&$a, $update = 0) { $mode = (($nouveau) ? 'network-new' : 'network'); - $o .= conversation($a,$items,$mode,$update); + $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')) { - $o .= alt_pager($a,count($items)); } else { - $o .= paginate($a); + $o .= alt_pager($a, count($items)); } } @@ -806,11 +788,11 @@ function network_content(&$a, $update = 0) { /** * @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'] .= '