profile wall privacy

diff --git a/mod/photos.php b/mod/photos.php
index b294f0a666c91231d4a7f1e42cd53fdee2f48947..2a808cb41d3456fea5253ecfca44964066bc8ff4 100755 (executable)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -38,21 +38,22 @@ function photos_init(&$a) {
                        $o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg" alt="' . $a->data['user']['username'] . '" /></div>';
                        $o .= '</div>';
                        
-                       $o .= '<div id="side-bar-photos-albums" class="widget">';
-                       $o .= '<h3>' . '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '">' . t('Photo Albums') . '</a></h3>';
+                       if(! intval($a->data['user']['hidewall'])) {
+                               $o .= '<div id="side-bar-photos-albums" class="widget">';
+                               $o .= '<h3>' . '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '">' . t('Photo Albums') . '</a></h3>';
                                        
-                       $o .= '<ul>';
-                       foreach($albums as $album) {
+                               $o .= '<ul>';
+                               foreach($albums as $album) {
 
-                               // don't show contact photos. We once translated this name, but then you could still access it under
-                               // a different language setting. Now we store the name in English and check in English (and translated for legacy albums).
+                                       // don't show contact photos. We once translated this name, but then you could still access it under
+                                       // a different language setting. Now we store the name in English and check in English (and translated for legacy albums).
 
-                               if((! strlen($album['album'])) || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos')))
-                                       continue;
-                               $o .= '<li>' . '<a href="photos/' . $a->argv[1] . '/album/' . bin2hex($album['album']) . '" >' . $album['album'] . '</a></li>'; 
+                                       if((! strlen($album['album'])) || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos')))
+                                               continue;
+                                       $o .= '<li>' . '<a href="photos/' . $a->argv[1] . '/album/' . bin2hex($album['album']) . '" >' . $album['album'] . '</a></li>'; 
+                               }
+                               $o .= '</ul>';
                        }
-                       $o .= '</ul>';
-
                        if(local_user() && $a->data['user']['uid'] == local_user()) {
                                $o .= '<div id="photo-albums-upload-link"><a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/upload" >' .t('Upload New Photos') . '</a></div>';
                        }

diff --git a/mod/profile.php b/mod/profile.php
index 428679ffc53e02f85f8bf573e4adb371c0557fe7..782d17d83d85fc12034291b6eb4bb2c737ee9b30 100755 (executable)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -107,7 +107,7 @@ function profile_content(&$a, $update = 0) {
 
        $is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
 
-       if($a->user['hidewall'] && (! $is_owner) && (! $remote_contact)) {
+       if($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) {
                notice( t('Access to this profile has been restricted.') . EOL);
                return;
        }