respect hidewall

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 85a9f675927210af9d8c8b4091d29f0fe45a39e8..b892c2d122166fad77c3b0bb59accc10dd6b71af 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -305,14 +305,17 @@ function populate_acl($user = null,$celeb = false,$show_jotnets = false) {
                        }
                }
 
-               if($mail_enabled) {
-                       $selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
-                       $jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> '
-                       . t("Post to Email") . '</div>';
-               }
+               if (!$user['hidewall']) {
+                       if($mail_enabled) {
+                               $selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
+                               $jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> ' . t("Post to Email") . '</div>';
+                       }
 
-               call_hooks('jot_networks', $jotnets);
-       }
+                       call_hooks('jot_networks', $jotnets);
+               } else
+                       $jotnets .= sprintf(t('Connectors disabled, since "%s" is enabled.'),
+                                           t('Hide your profile details from unknown viewers?'));
+               }
 
        // We shouldn't need to prune deadguys from the block list. Either way they can't get the message.
        // Also no point enumerating groups and checking them, that will take place on delivery.

diff --git a/mod/events.php b/mod/events.php
index 92c128c1ddf2b77467e49d6d3066bb33da613d65..e9e1af05d8044bd26b86ddfd99a50f736fddbdca 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -507,7 +507,7 @@ function events_content(&$a) {
                        '$sh_text' => t('Share this event'),
                        '$sh_checked' => $sh_checked,
                        '$preview' => t('Preview'),
-                       '$acl' => (($cid) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $a->user),false, false)),
+                       '$acl' => (($cid) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $a->user),false)),
                        '$submit' => t('Submit')
 
                ));