Events: Now with guid.

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index f9a0bec238e697c0b1eb5146a4bc4fa79c44c6fc..95efc362607d05ab57bddf86a7fca7b10ff895c8 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -1,6 +1,4 @@
 <?php
-
-if(! function_exists('network_init')) {
 function network_init(&$a) {
        if(! local_user()) {
                notice( t('Permission denied.') . EOL);
@@ -151,14 +149,13 @@ function network_init(&$a) {
 
        $a->page['aside'] .= (feature_enabled(local_user(),'groups') ? group_side('network/0','network','standard',$group_id) : '');
        $a->page['aside'] .= (feature_enabled(local_user(),'forumlist_widget') ? ForumManager::widget(local_user(),$cid) : '');
-       $a->page['aside'] .= posted_date_widget($a->get_baseurl() . '/network',local_user(),false);
-       $a->page['aside'] .= networks_widget($a->get_baseurl(true) . '/network',(x($_GET, 'nets') ? $_GET['nets'] : ''));
+       $a->page['aside'] .= posted_date_widget('network',local_user(),false);
+       $a->page['aside'] .= networks_widget('network',(x($_GET, 'nets') ? $_GET['nets'] : ''));
        $a->page['aside'] .= saved_searches($search);
-       $a->page['aside'] .= fileas_widget($a->get_baseurl(true) . '/network',(x($_GET, 'file') ? $_GET['file'] : ''));
-}
+       $a->page['aside'] .= fileas_widget('network',(x($_GET, 'file') ? $_GET['file'] : ''));
+
 }
 
-if(! function_exists('saved_searches')) {
 function saved_searches($search) {
 
        if(! feature_enabled(local_user(),'savedsearch'))
@@ -207,7 +204,7 @@ function saved_searches($search) {
        ));
 
        return $o;
-}
+
 }
 
 /**
@@ -225,7 +222,6 @@ function saved_searches($search) {
  *
  * @return Array ( $no_active, $comment_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active );
  */
-if(! function_exists('network_query_get_sel_tab')) {
 function network_query_get_sel_tab($a) {
        $no_active='';
        $starred_active = '';
@@ -282,12 +278,10 @@ function network_query_get_sel_tab($a) {
 
        return array($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active);
 }
-}
 
 /**
  * Return selected network from query
  */
-if(! function_exists('network_query_get_sel_net')) {
 function network_query_get_sel_net() {
        $network = false;
 
@@ -297,9 +291,7 @@ function network_query_get_sel_net() {
 
        return $network;
 }
-}
 
-if(! function_exists('network_query_get_sel_group')) {
 function network_query_get_sel_group($a) {
        $group = false;
 
@@ -309,9 +301,8 @@ function network_query_get_sel_group($a) {
 
        return $group;
 }
-}
 
-if(! function_exists('network_content')) {
+
 function network_content(&$a, $update = 0) {
 
        require_once('include/conversation.php');
@@ -372,7 +363,7 @@ function network_content(&$a, $update = 0) {
        $tabs = array(
                array(
                        'label' => t('Commented Order'),
-                       'url'   => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''),
+                       'url'   => str_replace('/new', '', $cmd) . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''),
                        'sel'   => $all_active,
                        'title' => t('Sort by Comment Date'),
                        'id'    => 'commented-order-tab',
@@ -380,7 +371,7 @@ function network_content(&$a, $update = 0) {
                ),
                array(
                        'label' => t('Posted Order'),
-                       'url'   => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''),
+                       'url'   => str_replace('/new', '', $cmd) . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''),
                        'sel'   => $postord_active,
                        'title' => t('Sort by Post Date'),
                        'id'    => 'posted-order-tab',
@@ -391,7 +382,7 @@ function network_content(&$a, $update = 0) {
        if(feature_enabled(local_user(),'personal_tab')) {
                $tabs[] = array(
                        'label' => t('Personal'),
-                       'url'   => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&conv=1',
+                       'url'   => str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&conv=1',
                        'sel'   => $conv_active,
                        'title' => t('Posts that mention or involve you'),
                        'id'    => 'personal-tab',
@@ -402,7 +393,7 @@ function network_content(&$a, $update = 0) {
        if(feature_enabled(local_user(),'new_tab')) {
                $tabs[] = array(
                        'label' => t('New'),
-                       'url'   => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ($len_naked_cmd ? '/' : '') . 'new' . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : ''),
+                       'url'   => str_replace('/new', '', $cmd) . ($len_naked_cmd ? '/' : '') . 'new' . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : ''),
                        'sel'   => $new_active,
                        'title' => t('Activity Stream - by date'),
                        'id'    => 'activitiy-by-date-tab',
@@ -413,7 +404,7 @@ function network_content(&$a, $update = 0) {
        if(feature_enabled(local_user(),'link_tab')) {
                $tabs[] = array(
                        'label' => t('Shared Links'),
-                       'url'   => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&bmark=1',
+                       'url'   => str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&bmark=1',
                        'sel'   => $bookmarked_active,
                        'title' => t('Interesting Links'),
                        'id'    => 'shared-links-tab',
@@ -424,7 +415,7 @@ function network_content(&$a, $update = 0) {
        if(feature_enabled(local_user(),'star_posts')) {
                $tabs[] = array(
                        'label' => t('Starred'),
-                       'url'   => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&star=1',
+                       'url'   => str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&star=1',
                        'sel'   => $starred_active,
                        'title' => t('Favourite Posts'),
                        'id'    => 'starred-posts-tab',
@@ -556,7 +547,7 @@ function network_content(&$a, $update = 0) {
                        if($update)
                                killme();
                        notice( t('No such group') . EOL );
-                       goaway($a->get_baseurl(true) . '/network/0');
+                       goaway('network/0');
                        // NOTREACHED
                }
 
@@ -620,7 +611,7 @@ function network_content(&$a, $update = 0) {
                }
                else {
                        notice( t('Invalid contact.') . EOL);
-                       goaway($a->get_baseurl(true) . '/network');
+                       goaway('network');
                        // NOTREACHED
                }
        }
@@ -866,14 +857,24 @@ function network_content(&$a, $update = 0) {
 
 
        if((! $group) && (! $cid) && (! $star)) {
-               $r = q("UPDATE `item` SET `unseen` = 0
-                       WHERE `unseen` = 1 AND `uid` = %d",
-                       intval(local_user())
-               );
+
+               $unseen = q("SELECT `id` FROM `item` WHERE `unseen` AND `uid` = %d",
+                               intval(local_user()));
+
+               if ($unseen)
+                       $r = q("UPDATE `item` SET `unseen` = 0
+                               WHERE `unseen` = 1 AND `uid` = %d",
+                               intval(local_user())
+                       );
        }
        else {
-               if($update_unseen)
-                       $r = q("UPDATE `item` SET `unseen` = 0 $update_unseen");
+               if($update_unseen) {
+
+                       $unseen = q("SELECT `id` FROM `item` ".$update_unseen);
+
+                       if ($unseen)
+                               $r = q("UPDATE `item` SET `unseen` = 0 $update_unseen");
+               }
        }
 
        // Set this so that the conversation function can find out contact info for our wall-wall items
@@ -895,4 +896,4 @@ function network_content(&$a, $update = 0) {
 
        return $o;
 }
-}
+