rework the way private photos are embedded to avoid url differences and also check...

[friendica.git] / mod / profile.php

diff --git a/mod/profile.php b/mod/profile.php
index 68d73fba3829b50aab8d2fb33897788ee148dfe9..69f044e89f4561f02bf4cfe357cd129cf22eec70 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -14,9 +14,10 @@ function profile_init(&$a) {
        else {
                $r = q("select nickname from user where blocked = 0 and account_expired = 0 and verified = 1 order by rand() limit 1");
                if(count($r)) {
-                       $which = $r[0]['nickname'];
+                       goaway($a->get_baseurl() . '/profile/' . $r[0]['nickname']);
                }
                else {
+                       logger('profile error: mod_profile ' . $a->query_string, LOGGER_DEBUG);
                        notice( t('Requested profile is not available.') . EOL );
                        $a->error = 404;
                        return;
@@ -31,6 +32,8 @@ function profile_init(&$a) {
 
        profile_load($a,$which,$profile);
 
+       $userblock = (($a->profile['hidewall'] && (! local_user()) && (! remote_user())) ? true : false);
+
        if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) {
                $a->page['htmlhead'] .= '<meta name="friendica.community" content="true" />';
        }
@@ -40,8 +43,8 @@ function profile_init(&$a) {
                $delegate = ((strstr($a->profile['openid'],'://')) ? $a->profile['openid'] : 'http://' . $a->profile['openid']);
                $a->page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n";
        }
-
-       if(! $blocked) {
+       // site block
+       if((! $blocked) && (! $userblock)) {
                $keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : '');
                $keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$keywords);
                if(strlen($keywords))
@@ -140,6 +143,10 @@ function profile_content(&$a, $update = 0) {
                        return $o;
                }
 
+
+               $o .= common_friends_visitor_widget($a->profile['profile_uid']);
+
+
                if(x($_SESSION,'new_member') && $_SESSION['new_member'] && $is_owner)
                        $o .= '<a href="newmember" id="newmember-tips" style="font-size: 1.2em;"><b>' . t('Tips for New Members') . '</b></a>' . EOL;