X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnetwork.php;h=2a3db597e838a5d118adecd337860bbb2b4ae38c;hb=0c24784f5e92e0c8269f255e962312574871f2f0;hp=9488cd973a144ee317c253024b2037766a7adc9f;hpb=939449602a58838f81045c9a0e9a205c8fa9e6bd;p=friendica.git
diff --git a/mod/network.php b/mod/network.php
index 9488cd973a..2a3db597e8 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')) {
@@ -120,27 +63,38 @@ function saved_searches($search) {
$srchurl = '/network'
. ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '')
. ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '')
- . ((x($_GET,'bmark')) ? '?bmark=' . $_GET['bmark'] : '');
+ . ((x($_GET,'bmark')) ? '?bmark=' . $_GET['bmark'] : '')
+ . ((x($_GET,'conv')) ? '?conv=' . $_GET['conv'] : '');
$o = '';
- $r = q("select `term` from `search` WHERE `uid` = %d",
+ $r = q("select `id`,`term` from `search` WHERE `uid` = %d",
intval(local_user())
);
- $o .= '';
+
+ $starred_active = '';
+ $new_active = '';
+ $bookmarked_active = '';
+ $all_active = '';
+ $search_active = '';
+ $conv_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($_GET['conv']) {
+ $conv_active = 'active';
+ }
+
+
+ if (($new_active == '')
+ && ($starred_active == '')
+ && ($bookmarked_active == '')
+ && ($conv_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('Personal'),
+ 'url' => $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&conv=1',
+ 'sel' => $conv_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;
@@ -167,6 +214,7 @@ function network_content(&$a, $update = 0) {
$bmark = ((x($_GET,'bmark')) ? intval($_GET['bmark']) : 0);
$order = ((x($_GET,'order')) ? notags($_GET['order']) : 'comment');
$liked = ((x($_GET,'liked')) ? intval($_GET['liked']) : 0);
+ $conv = ((x($_GET,'conv')) ? intval($_GET['conv']) : 0);
if(($a->argc > 2) && $a->argv[2] === 'new')
@@ -216,23 +264,6 @@ function network_content(&$a, $update = 0) {
$o .= status_editor($a,$x);
- // The special div is needed for liveUpdate to kick in for this page.
- // We only launch liveUpdate if you are on the front page, you aren't
- // filtering by group and also you aren't writing a comment (the last
- // criteria is discovered in javascript).
-
- $o .= '
' . "\r\n";
- $o .= "\r\n";
-
}
// We aren't going to try and figure out at the item, group, and page
@@ -304,15 +335,54 @@ function network_content(&$a, $update = 0) {
}
}
- if((! $group) && (! $cid) && (! $update))
+ if((! $group) && (! $cid) && (! $update)) {
$o .= get_birthdays();
+ $o .= get_events();
+ }
+
+ if(! $update) {
+ // The special div is needed for liveUpdate to kick in for this page.
+ // We only launch liveUpdate if you aren't filtering in some incompatible
+ // way and also you aren't writing a comment (discovered in javascript).
+
+ $o .= '
' . "\r\n";
+ $o .= "\r\n";
+ }
$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 . '\\[')
+ );
+ }
+
+ if($conv) {
+ $myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname'];
+ $myurl = substr($myurl,strpos($myurl,'://')+3);
+ $myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
+ $diasp_url = str_replace('/profile/','/u/',$myurl);
+ $sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` regexp '%s' or `tag` regexp '%s' or tag regexp '%s' )) ",
+ dbesc($myurl . '$'),
+ dbesc($myurl . '\\]'),
+ dbesc($diasp_url . '\\]')
+ );
+ }
+
+
-
$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