X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnetwork.php;h=763b3693f4191a6aee018308d8e6e1f782613ca0;hb=cb05e677a96e1312263c0a1c63ee10cea62268b1;hp=927f7b24e6b0e2703785ebff9c03bd015afa0688;hpb=cb1c6dd1e37ccbbea47867faf0142e5d2f653624;p=friendica.git
diff --git a/mod/network.php b/mod/network.php
index 927f7b24e6..763b3693f4 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -42,64 +42,7 @@ function network_init(&$a) {
);
}
- // item filter tabs
- // TODO: fix this logic, reduce duplication
- $a->page['content'] .= '
';
-
- $starred_active = '';
- $new_active = '';
- $bookmarked_active = '';
- $all_active = '';
- $search_active = '';
-
- if(($a->argc > 1 && $a->argv[1] === 'new')
- || ($a->argc > 2 && $a->argv[2] === 'new')) {
- $new_active = 'active';
- }
-
- if(x($_GET,'search')) {
- $search_active = 'active';
- }
-
- if(x($_GET,'star')) {
- $starred_active = 'active';
- }
-
- if($_GET['bmark']) {
- $bookmarked_active = 'active';
- }
-
- if (($new_active == '')
- && ($starred_active == '')
- && ($bookmarked_active == '')
- && ($search_active == '')) {
- $all_active = 'active';
- }
-
- // network links moved to content to match other pages
- // all
- $a->page['content'] .= '
'
- . t('All') . '';
-
- // new
- $a->page['content'] .= '
'
- . t('New') . '';
-
- // starred
- $a->page['content'] .= '
'
- . t('Starred') . '';
-
- // bookmarks
- $a->page['content'] .= '
'
- . t('Bookmarks') . '';
-
- $a->page['content'] .= '
';
- // --- end item filter tabs
+
// search terms header
if(x($_GET,'search')) {
@@ -128,19 +71,30 @@ function saved_searches($search) {
intval(local_user())
);
- $o .= '' . "\r\n";
+
+ $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,
+ ));
+
return $o;
}
@@ -155,6 +109,85 @@ function network_content(&$a, $update = 0) {
$o = '';
+ // item filter tabs
+ // TODO: fix this logic, reduce duplication
+ //$a->page['content'] .= '';
+
+ $starred_active = '';
+ $new_active = '';
+ $bookmarked_active = '';
+ $all_active = '';
+ $search_active = '';
+
+ if(($a->argc > 1 && $a->argv[1] === 'new')
+ || ($a->argc > 2 && $a->argv[2] === 'new')) {
+ $new_active = 'active';
+ }
+
+ if(x($_GET,'search')) {
+ $search_active = 'active';
+ }
+
+ if(x($_GET,'star')) {
+ $starred_active = 'active';
+ }
+
+ if($_GET['bmark']) {
+ $bookmarked_active = 'active';
+ }
+
+ if (($new_active == '')
+ && ($starred_active == '')
+ && ($bookmarked_active == '')
+ && ($search_active == '')) {
+ $all_active = 'active';
+ }
+ $postord_active = '';
+
+ if($all_active && x($_GET,'order') && $_GET['order'] !== 'comment') {
+ $all_active = '';
+ $postord_active = 'active';
+ }
+
+
+
+ // tabs
+ $tabs = array(
+ array(
+ 'label' => t('Commented Order'),
+ 'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : ''),
+ 'sel'=>$all_active,
+ ),
+ array(
+ 'label' => t('Posted Order'),
+ 'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '?order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''),
+ 'sel'=>$postord_active,
+ ),
+
+ array(
+ 'label' => t('New'),
+ 'url' => $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '/new' . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : ''),
+ 'sel' => $new_active,
+ ),
+ array(
+ 'label' => t('Starred'),
+ 'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&star=1',
+ 'sel'=>$starred_active,
+ ),
+ array(
+ 'label' => t('Bookmarks'),
+ 'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&bmark=1',
+ 'sel'=>$bookmarked_active,
+ ),
+ );
+ $tpl = get_markup_template('common_tabs.tpl');
+ $o .= replace_macros($tpl, array('$tabs'=>$tabs));
+ // --- end item filter tabs
+
+
+
+
+
$contact_id = $a->cid;
$group = 0;
@@ -196,7 +229,7 @@ function network_content(&$a, $update = 0) {
}
}
- $o .= '';
+ nav_set_selected('network');
$_SESSION['return_url'] = $a->cmd;
@@ -304,15 +337,21 @@ function network_content(&$a, $update = 0) {
}
}
- if((! $group) && (! $cid) && (! $update))
+ if((! $group) && (! $cid) && (! $update)) {
$o .= get_birthdays();
+ $o .= get_events();
+ }
$sql_extra2 = (($nouveau) ? '' : " AND `item`.`parent` = `item`.`id` ");
- if(x($_GET,'search'))
- $sql_extra .= " AND `item`.`body` REGEXP '" . dbesc(escape_tags($_GET['search'])) . "' ";
+ if(x($_GET,'search')) {
+ $search = escape_tags($_GET['search']);
+ $sql_extra .= sprintf(" AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' ) ",
+ dbesc($search),
+ dbesc('\\]' . $search . '\\[')
+ );
+ }
-
$r = q("SELECT COUNT(*) AS `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
@@ -408,7 +447,6 @@ function network_content(&$a, $update = 0) {
if(! $update) {
$o .= paginate($a);
- $o .= cc_license();
}
return $o;