-Wall cleanup

[friendica.git] / mod / profile.php

diff --git a/mod/profile.php b/mod/profile.php
index 8fa25cdbf8f39eb470fc9816dcb31dcd2008881d..3ab77a0940ef9efc5728dbfbacf3145530897ad0 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -2,7 +2,6 @@
 
 if(! function_exists('profile_load')) {
 function profile_load(&$a, $username, $profile = 0) {
-
        if(remote_user()) {
                $r = q("SELECT `profile-id` FROM `contact` WHERE `id` = %d LIMIT 1",
                        intval($_SESSION['visitor_id']));
@@ -60,12 +59,14 @@ function profile_init(&$a) {
                $which = $a->user['nickname'];
                $profile = $a->argv[1];         
        }
+
        profile_load($a,$which,$profile);
-        $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" ;
-               $uri = urlencode('acct:' . $a->user['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
-               $a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . $a->get_baseurl() . '/xrd/?uri=' . $uri . '" />' . "\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" ;
+       $uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
+       $a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . $a->get_baseurl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
+       header('Link: <' . $a->get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"');
   
        
        $dfrn_pages = array('request', 'confirm', 'notify', 'poll');
@@ -84,7 +85,7 @@ function profile_content(&$a, $update = 0) {
        $groups = array();
 
        $tab = 'posts';
-
+       $o = '';
 
        if($update) {
                // Ensure we've got a profile owner if updating.
@@ -118,6 +119,8 @@ function profile_content(&$a, $update = 0) {
                }
        }
 
+       $is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
+
        if(! $update) {
                if(x($_GET,'tab'))
                        $tab = notags(trim($_GET['tab']));
@@ -141,9 +144,17 @@ function profile_content(&$a, $update = 0) {
 
                $celeb = ((($a->profile['page-flags'] == PAGE_SOAPBOX) || ($a->profile['page-flags'] == PAGE_COMMUNITY)) ? true : false);
                if(can_write_wall($a,$a->profile['profile_uid'])) {
+
+
+                       $geotag = (($is_owner && $a->profile['allow_location']) ? load_view_file('view/jot_geotag.tpl') : '');
+
                        $tpl = load_view_file('view/jot-header.tpl');
        
-                       $a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
+                       $a->page['htmlhead'] .= replace_macros($tpl, array(
+                               '$baseurl' => $a->get_baseurl(),
+                               '$geotag'  => $geotag
+                       ));
+
                        require_once('view/acl_selectors.php');
 
                        $tpl = load_view_file("view/jot.tpl");
@@ -153,12 +164,12 @@ function profile_content(&$a, $update = 0) {
                                $lockstate = 'unlock';
                        $o .= replace_macros($tpl,array(
                                '$baseurl' => $a->get_baseurl(),
-                               '$defloc' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? $a->user['default-location'] : ''),
+                               '$defloc' => (($is_owner) ? $a->user['default-location'] : ''),
                                '$return_path' => $a->cmd,
-                               '$visitor' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? 'block' : 'none'),
+                               '$visitor' => (($is_owner) ? 'block' : 'none'),
                                '$lockstate' => $lockstate,
                                '$bang' => '',
-                               '$acl' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? populate_acl($a->user, $celeb) : ''),
+                               '$acl' => (($is_owner) ? populate_acl($a->user, $celeb) : ''),
                                '$profile_uid' => $a->profile['profile_uid']
                        ));
                }
@@ -173,18 +184,15 @@ function profile_content(&$a, $update = 0) {
 
        }
 
-       // TODO alter registration and settings and profile to update contact table when names and  photos change.  
+       // Construct permissions
 
        // default permissions - anonymous user
 
        $sql_extra = " AND `allow_cid` = '' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = '' ";
 
-
-
-
        // Profile owner - everything is visible
 
-       if(local_user() && ($_SESSION['uid'] == $a->profile['profile_uid'])) {
+       if($is_owner) {
                $sql_extra = ''; 
                
                // Oh - while we're here... reset the Unseen messages
@@ -248,7 +256,6 @@ function profile_content(&$a, $update = 0) {
 
        );
 
-
        $cmnt_tpl = load_view_file('view/comment_item.tpl');
 
        $like_tpl = load_view_file('view/like.tpl');
@@ -358,15 +365,22 @@ function profile_content(&$a, $update = 0) {
                        $drop = '';
                        $dropping = false;
 
-                       if(($item['contact-id'] == $_SESSION['visitor_id']) || ($item['uid'] == $_SESSION['uid']))
+                       if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
                                $dropping = true;
 
                        $drop = replace_macros((($dropping)? $droptpl : $fakedrop), array('$id' => $item['id']));
 
 
-                       $like    = (($alike[$item['id']]) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
-                       $dislike = (($dlike[$item['id']]) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
-
+                       $like    = ((isset($alike[$item['id']])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
+                       $dislike = ((isset($dlike[$item['id']])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
+                       $location = (($item['location']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
+                       $coord = (($item['coord']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
+                       if($coord) {
+                               if($location)
+                                       $location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
+                               else
+                                       $location = '<span class="smalltext">' . $coord . '</span>';
+                       }
 
                        $o .= replace_macros($template,array(
                                '$id' => $item['item_id'],
@@ -378,7 +392,7 @@ function profile_content(&$a, $update = 0) {
                                '$body' => bbcode($item['body']),
                                '$ago' => relative_date($item['created']),
                                '$lock' => $lock,
-                               '$location' => (($item['location']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : ''),
+                               '$location' => $location, 
                                '$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
                                '$drop' => $drop,
                                '$like' => $like,