Merge remote-tracking branch 'friendika-master/master' into iconpopup

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index 39679b48a14378635b58451e89abf37e67f9ed1a..42c6c0c29e56e4ef971e8d5839c093d236a862ef 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -54,6 +54,14 @@ function network_content(&$a, $update = 0) {
        }
 
        if(! $update) {
+               if(group) {
+                       if(($t = group_public_members($group)) && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
+                               $plural_form = sprintf( tt('%d member', '%d members', $t), $t);
+                               notice( sprintf( t('Warning: This group contains %s from an insecure network.'), $plural_form ) . EOL);
+                               notice( t('Private messages to this group are at risk of public disclosure.') . EOL);
+                       }
+               }
+
                $o .= '<script> $(document).ready(function() { $(\'#nav-network-link\').addClass(\'nav-selected\'); });</script>';
 
                $_SESSION['return_url'] = $a->cmd;
@@ -209,6 +217,7 @@ function network_content(&$a, $update = 0) {
                        intval($a->pager['start']),
                        intval($a->pager['itemspage'])
                );
+               
        }
        else {
 
@@ -315,11 +324,12 @@ function network_content(&$a, $update = 0) {
 
                                $drop = replace_macros($droptpl,array('$id' => $item['id']));
                                $lock = '<div class="wall-item-lock"></div>';
-
+                               
                                $o .= replace_macros($tpl,array(
                                        '$id' => $item['item_id'],
                                        '$linktitle' => t('View $name\'s profile'),
                                        '$profile_url' => $profile_link,
+                                       '$item_photo_menu' => item_photo_menu($item),
                                        '$name' => $profile_name,
                                        '$sparkle' => $sparkle,
                                        '$lock' => $lock,
@@ -543,6 +553,7 @@ function network_content(&$a, $update = 0) {
                                $indent .= ' shiny'; 
 
 
+
                        // Build the HTML
 
                        $tmp_item = replace_macros($template,array(
@@ -553,6 +564,7 @@ function network_content(&$a, $update = 0) {
                                '$wall' => t('Wall-to-Wall'),
                                '$vwall' => t('via Wall-To-Wall:'),
                                '$profile_url' => $profile_link,
+                               '$item_photo_menu' => item_photo_menu($item),
                                '$name' => $profile_name,
                                '$thumb' => $profile_avatar,
                                '$osparkle' => $osparkle,
@@ -596,4 +608,4 @@ function network_content(&$a, $update = 0) {
        }
 
        return $o;
-}
\ No newline at end of file
+}