personal tab on network page

diff --git a/boot.php b/boot.php
index b07249260dd0c5615a5c14adf3a1f88812d90dbb..2d937f2c44309910bd470b8ae9622ea20648ec24 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -9,9 +9,9 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1179' );
+define ( 'FRIENDICA_VERSION',      '2.3.1180' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
-define ( 'DB_UPDATE_VERSION',      1106      );
+define ( 'DB_UPDATE_VERSION',      1107      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );

diff --git a/database.sql b/database.sql
index 0599dd3e4883b65f1ca87c55f569e3d16ae43c26..279dd8f8762c615deee3be5e1da2ebc0e719977a 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -248,6 +248,7 @@ CREATE TABLE IF NOT EXISTS `item` (
   KEY `last-child` (`last-child`),
   KEY `unseen` (`unseen`),
   KEY `wall` (`wall`),
+  KEY `author-link` (`author-link`),
   FULLTEXT KEY `title` (`title`),
   FULLTEXT KEY `body` (`body`),
   FULLTEXT KEY `tag` (`tag`),

diff --git a/mod/network.php b/mod/network.php
index 9f421053ad68d745673a5e8b41abf42edcecd27b..ace67dcfbb8b3c876c7c27dc8c0beaa0f295c4a9 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -63,7 +63,8 @@ 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 = '';
 
@@ -118,7 +119,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 +137,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 +174,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 +215,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')
@@ -340,6 +356,7 @@ function network_content(&$a, $update = 0) {
                        . ((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";
        }
 
@@ -353,6 +370,17 @@ 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('www.','',$myurl);
+               $sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where `author-link` regexp '%s') ",
+                       dbesc($myurl)
+               );
+       }
+
+
+
        $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

diff --git a/update.php b/update.php
index 45169f1ef8305664c34431f25ed40eee896b2563..0a3a1e7f16669a15f0051896ada7c9568d338ca4 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1106 );
+define( 'UPDATE_VERSION' , 1107 );
 
 /**
  *
@@ -913,4 +913,9 @@ function update_1105() {
 }
 
 
+function update_1106() {
+       q("ALTER TABLE `item` ADD INDEX ( `author-link` ) ");
+
+}
+