Reformatted stuff, improved query

diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index fee569e94da5cbde46b0b346d073df1356461f06..1e35db2c784964eeeead30ac6ae9eaa5389d3481 100644 (file)
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -90,7 +90,7 @@ function networks_widget($baseurl,$selected = '') {
 
        $extra_sql = unavailable_networks();
 
-       $r = q("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = %d AND NOT `self` $extra_sql ORDER BY `network`",
+       $r = q("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = %d AND `network` != '' $extra_sql ORDER BY `network`",
                intval(local_user())
        );
 

diff --git a/mod/network.php b/mod/network.php
index 12223494a740747d96ef9de253aab169069bd925..ad0347ba0c1ca99956f2bd1cd16a38734a9db693 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -773,14 +773,12 @@ function network_content(App $a, $update = 0) {
                                intval(local_user())
                        );
                }
-       } else {
-               if ($update_unseen) {
+       } elseif ($update_unseen) {
 
-                       $unseen = q("SELECT `id` FROM `item` ".$update_unseen. " LIMIT 1");
+               $unseen = q("SELECT `id` FROM `item` ".$update_unseen. " LIMIT 1");
 
-                       if (dbm::is_result($unseen)) {
-                               $r = q("UPDATE `item` SET `unseen` = 0 $update_unseen");
-                       }
+               if (dbm::is_result($unseen)) {
+                       $r = q("UPDATE `item` SET `unseen` = 0 $update_unseen");
                }
        }
 
@@ -791,10 +789,10 @@ function network_content(App $a, $update = 0) {
 
        $o .= conversation($a,$items,$mode,$update);
 
-       if(!$update) {
-               if(get_pconfig(local_user(),'system','infinite_scroll')) {
+       if (!$update) {
+               if (get_pconfig(local_user(),'system','infinite_scroll')) {
                        $o .= scroll_loader();
-               } elseif(!get_config('system', 'old_pager')) {
+               } elseif (!get_config('system', 'old_pager')) {
                        $o .= alt_pager($a,count($items));
                } else {
                        $o .= paginate($a);