initial dfrn update to pass perms

[friendica.git] / mod / profile.php

diff --git a/mod/profile.php b/mod/profile.php
index 8fb483007fe4b899eca608692ade200bd2806cac..88e23a8a46c945488267459ea81337ccfe08d3c6 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -106,16 +106,9 @@ function profile_content(&$a, $update = 0) {
 
 
                if($tab === 'profile') {
-                       $profile_lang = get_config('system','language');
-                       if(! $profile_lang)
-                               $profile_lang = 'en';
-                       if(file_exists("view/$profile_lang/profile_advanced.php"))
-                               require_once("view/$profile_lang/profile_advanced.php");
-                       else
-                               require_once('view/profile_advanced.php');
-
+                       require_once('include/profile_advanced.php');
+                       $o .= advanced_profile($a);
                        call_hooks('profile_advanced',$o);
-
                        return $o;
                }
 
@@ -138,7 +131,8 @@ function profile_content(&$a, $update = 0) {
                                '$utubeurl' => t('Please enter a YouTube link:'),
                                '$vidurl' => t("Please enter a video\x28.ogg\x29 link/URL:"),
                                '$audurl' => t("Please enter an audio\x28.ogg\x29 link/URL:"),
-                               '$whereareu' => t('Where are you right now?') 
+                               '$whereareu' => t('Where are you right now?'),
+                               '$title' => t('Enter a title for this item') 
                        ));
 
                        require_once('include/acl_selectors.php');
@@ -169,6 +163,7 @@ function profile_content(&$a, $update = 0) {
                                '$audio' => t('Insert Vorbis [.ogg] audio'),
                                '$setloc' => t('Set your location'),
                                '$noloc' => t('Clear browser location'),
+                               '$title' => t('Set title'),
                                '$wait' => t('Please wait'),
                                '$permset' => t('Permission settings'),
                                '$content' => '',
@@ -328,6 +323,8 @@ function profile_content(&$a, $update = 0) {
                        like_puller($a,$item,$dlike,'dislike');
                }
 
+               $comments_collapsed = false;
+
                foreach($r as $item) {
 
                        $sparkle = '';          
@@ -387,6 +384,8 @@ function profile_content(&$a, $update = 0) {
                                                '$mylink' => $contact['url'],
                                                '$mytitle' => t('This is you'),
                                                '$myphoto' => $contact['thumb'],
+                                               '$comment' => t('Comment'),
+                                               '$submit' => t('Submit'),
                                                '$ww' => ''
                                        ));
                                }
@@ -398,7 +397,7 @@ function profile_content(&$a, $update = 0) {
                        // This is my profile page but I'm not the author of this post/comment. If it's somebody that's a fan or mutual friend,
                        // I can go directly to their profile as an authenticated guest.
 
-                       if(local_user() && ($item['contact-uid'] == $_SESSION['uid']) 
+                       if(local_user() && ($item['contact-uid'] == local_user()) 
                                && ($item['network'] === 'dfrn') && (! $item['self'] )) {
                                $profile_url = $redirect_url;
                                $sparkle = ' sparkle';
@@ -450,10 +449,12 @@ function profile_content(&$a, $update = 0) {
                        if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
                                $indent .= ' shiny'; 
 
+
                        $tmp_item = replace_macros($template,array(
                                '$id' => $item['item_id'],
                                '$linktitle' => t('View $name\'s profile'),
                                '$profile_url' => $profile_link,
+                               '$item_photo_menu' => item_photo_menu($item),                           
                                '$name' => $profile_name,
                                '$thumb' => $profile_avatar,
                                '$sparkle' => $sparkle,