include diaspora mentions in personal (requires adding a Diaspora profile url because...

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index 763b3693f4191a6aee018308d8e6e1f782613ca0..2a3db597e838a5d118adecd337860bbb2b4ae38c 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -63,21 +63,21 @@ 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())
        );
 
        $saved = array();
 
-
-       
        if(count($r)) {
                foreach($r as $rr) {
                        $saved[] = array(
+                               'id'            => $rr['id'],
                                'term'                  => $rr['term'],
                                'encodedterm'   => urlencode($rr['term']),
                                'delete'                => t('Remove term'),
@@ -118,7 +118,8 @@ function network_content(&$a, $update = 0) {
        $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';
@@ -135,13 +136,21 @@ function network_content(&$a, $update = 0) {
        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') {
@@ -164,6 +173,11 @@ function network_content(&$a, $update = 0) {
                        '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'] : ''),
@@ -200,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')
@@ -249,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 .= '<div id="live-network"></div>' . "\r\n";
-                       $o .= "<script> var profile_uid = " . $_SESSION['uid'] 
-                               . "; var netargs = '" . substr($a->cmd,8)
-                               . '?f='
-                               . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '')
-                               . ((x($_GET,'search')) ? '&search=' . $_GET['search'] : '') 
-                               . ((x($_GET,'star')) ? '&star=' . $_GET['star'] : '') 
-                               . ((x($_GET,'order')) ? '&order=' . $_GET['order'] : '') 
-                               . ((x($_GET,'bmark')) ? '&bmark=' . $_GET['bmark'] : '') 
-                               . ((x($_GET,'liked')) ? '&liked=' . $_GET['liked'] : '') 
-                               . "'; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
-
        }
 
        // We aren't going to try and figure out at the item, group, and page
@@ -342,6 +340,25 @@ function network_content(&$a, $update = 0) {
                $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 .= '<div id="live-network"></div>' . "\r\n";
+               $o .= "<script> var profile_uid = " . $_SESSION['uid'] 
+                       . "; var netargs = '" . substr($a->cmd,8)
+                       . '?f='
+                       . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '')
+                       . ((x($_GET,'search')) ? '&search=' . $_GET['search'] : '') 
+                       . ((x($_GET,'star')) ? '&star=' . $_GET['star'] : '') 
+                       . ((x($_GET,'order')) ? '&order=' . $_GET['order'] : '') 
+                       . ((x($_GET,'bmark')) ? '&bmark=' . $_GET['bmark'] : '') 
+                       . ((x($_GET,'liked')) ? '&liked=' . $_GET['liked'] : '') 
+                       . ((x($_GET,'conv')) ? '&conv=' . $_GET['conv'] : '') 
+                       . "'; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
+       }
+
        $sql_extra2 = (($nouveau) ? '' : " AND `item`.`parent` = `item`.`id` ");
 
        if(x($_GET,'search')) {
@@ -352,6 +369,20 @@ function network_content(&$a, $update = 0) {
                );
        }
 
+       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