Merge branch 'pull'

[friendica.git] / mod / profile.php

diff --git a/mod/profile.php b/mod/profile.php
index f4b6bfaf1c231f9f403381e45a9690cbba5c2131..a453f72f1f94124c1bcb649fb4d9e9eb81cbcde0 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -2,8 +2,7 @@
 
 function profile_init(&$a) {
 
-       if((get_config('system','block_public')) && (! local_user()) && (! remote_user()))
-               return;
+       $blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
 
        if($a->argc > 1)
                $which = $a->argv[1];
@@ -21,7 +20,7 @@ function profile_init(&$a) {
 
        profile_load($a,$which,$profile);
 
-       if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] & PAGE_COMMUNITY)) {
+       if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) {
                $a->page['htmlhead'] .= '<meta name="friendika.community" content="true" />';
        }
        if(x($a->profile,'openidserver'))                               
@@ -31,10 +30,12 @@ function profile_init(&$a) {
                $a->page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n";
        }
 
-       $keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : '');
-       $keywords = str_replace(array(',',' ',',,'),array(' ',',',','),$keywords);
-       if(strlen($keywords))
-               $a->page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\r\n" ;
+       if(! $blocked) {
+               $keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : '');
+               $keywords = str_replace(array(',',' ',',,'),array(' ',',',','),$keywords);
+               if(strlen($keywords))
+                       $a->page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\r\n" ;
+       }
 
        $a->page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . (($a->profile['net-publish']) ? 'true' : 'false') . '" />' . "\r\n" ;
        $a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . $a->get_baseurl() . '/dfrn_poll/' . $which .'" />' . "\r\n" ;
@@ -69,8 +70,9 @@ function profile_content(&$a, $update = 0) {
                $a->profile['profile_uid'] = $update;
        }
        else {
-               if($a->profile['profile_uid'] == local_user())          
-                       $o .= '<script> $(document).ready(function() { $(\'#nav-home-link\').addClass(\'nav-selected\'); });</script>';
+               if($a->profile['profile_uid'] == local_user()) {
+                       nav_set_selected('home');
+               }
        }
 
        $contact = null;
@@ -108,18 +110,7 @@ function profile_content(&$a, $update = 0) {
                if(x($_GET,'tab'))
                        $tab = notags(trim($_GET['tab']));
 
-               $tpl = get_markup_template('profile_tabs.tpl');
-
-               $o .= replace_macros($tpl,array(
-                       '$url' => $a->get_baseurl() . '/' . $a->cmd,
-                       '$phototab' => $a->get_baseurl() . '/photos/' . $a->profile['nickname'],
-                       '$status' => t('Status'),
-                       '$profile' => t('Profile'),
-                       '$photos' => t('Photos'),
-                       '$events' => (($is_owner) ? t('Events') : ''),
-                       '$notes' => (($is_owner) ?      t('Personal Notes') : ''),
-                       '$activetab' => $tab,
-               ));
+               $o.=profile_tabs($a, $is_owner, $a->profile['nickname']);
 
 
                if($tab === 'profile') {
@@ -129,6 +120,8 @@ function profile_content(&$a, $update = 0) {
                        return $o;
                }
 
+
+
                if(x($_SESSION,'new_member') && $_SESSION['new_member'] && $is_owner)
                        $o .= '<a href="newmember">' . t('Tips for New Members') . '</a>' . EOL;
 
@@ -236,9 +229,7 @@ function profile_content(&$a, $update = 0) {
        $o .= conversation($a,$r,'profile',$update);
 
        if(! $update) {
-               
                $o .= paginate($a);
-               $o .= '<div class="cc-license">' . t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.') . '</div>';
        }
 
        return $o;