keep FB out of private notes

diff --git a/include/socgraph.php b/include/socgraph.php
index 592779089785a4fc36bee616e0a0cf6fcd20670a..eccb133cc65ed78b271c40ecf2877a6125cd1a4d 100644 (file)
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -71,20 +71,24 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
 
                $name = $entry->displayName;
 
-               foreach($entry->urls as $url) {
-                       if($url->type == 'profile') {
-                               $profile_url = $url->value;
-                               continue;
-                       }
-                       if($url->type == 'webfinger') {
-                               $connect_url = str_replace('acct:' , '', $url->value);
-                               continue;
+               if(isset($entry->urls)) {
+                       foreach($entry->urls as $url) {
+                               if($url->type == 'profile') {
+                                       $profile_url = $url->value;
+                                       continue;
+                               }
+                               if($url->type == 'webfinger') {
+                                       $connect_url = str_replace('acct:' , '', $url->value);
+                                       continue;
+                               }
                        }
-               } 
-               foreach($entry->photos as $photo) {
-                       if($photo->type == 'profile') {
-                               $profile_photo = $photo->value;
-                               continue;
+               }
+               if(isset($entry->photos)) { 
+                       foreach($entry->photos as $photo) {
+                               if($photo->type == 'profile') {
+                                       $profile_photo = $photo->value;
+                                       continue;
+                               }
                        }
                }
 

diff --git a/mod/network.php b/mod/network.php
index e59839ccc1ea615e2b1e11af66d8fd3e651191fd..f43eeb67e643233c5d9d42a9dc52d56965c4002d 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -108,6 +108,10 @@ function network_content(&$a, $update = 0) {
        return login(false);
        }
 
+       $arr = array('query' => $a->query_string);
+
+       call_hooks('network_content_init', $arr);
+
        $o = '';
 
        // item filter tabs
@@ -157,7 +161,7 @@ function network_content(&$a, $update = 0) {
                        $all_active = 'active';
        }
 
-
+       
        $postord_active = '';
 
        if($all_active && x($_GET,'order') && $_GET['order'] !== 'comment') {

diff --git a/mod/notes.php b/mod/notes.php
index e6e2b44fb0c3714365fb46c72433c693018bbb79..0072ce447f1d98179f5925348b778a1813c6460f 100644 (file)
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -81,7 +81,7 @@ function notes_content(&$a,$update = false) {
        $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`.`moderated` = 0 AND `item`.`deleted` = 0
-               AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
+               AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1
                AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0
                $sql_extra ",
                intval(local_user())
@@ -96,7 +96,7 @@ function notes_content(&$a,$update = false) {
        $r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact-uid`
                FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
                WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
-               AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+               AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1
                AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0
                $sql_extra
                ORDER BY `item`.`created` DESC LIMIT %d ,%d ",

diff --git a/view/theme/slackr/theme.php b/view/theme/slackr/theme.php
index 99e061a2fc7108e320a73887fece46ffc49f7d54..516132f5c7fdb74e10d97e792fa4e84cddbc77fa 100644 (file)
--- a/view/theme/slackr/theme.php
+++ b/view/theme/slackr/theme.php
@@ -45,6 +45,7 @@ function cmtBbClose(id) {
 }
 $(document).ready(function() {
 
+
 $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
 
 $('.group-edit-icon').hover(