]> git.mxchange.org Git - friendica.git/blobdiff - mod/photos.php
Merge branch 'master' of git://github.com/friendika/friendika
[friendica.git] / mod / photos.php
index 81f3614b33407880a34fec9adf9c655fd6f68b8f..f29c393869cd4eda108f3ab16be3e5b8ff7a3470 100644 (file)
@@ -1,13 +1,17 @@
 <?php
 
-require_once('Photo.php');
-require_once('view/acl_selectors.php');
+require_once('include/Photo.php');
+require_once('include/items.php');
+require_once('include/acl_selectors.php');
+require_once('include/bbcode.php');
 
 function photos_init(&$a) {
 
+       $o = '';
+
        if($a->argc > 1) {
                $nick = $a->argv[1];
-               $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1",
+               $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
                        dbesc($nick)
                );
 
@@ -34,10 +38,13 @@ function photos_init(&$a) {
                        }
                        $o .= '</ul>';
                }
+
+               if(! x($a->page,'aside'))
+                       $a->page['aside'] = '';
                $a->page['aside'] .= $o;
        }
 
-
+       return;
 }
 
 
@@ -45,24 +52,48 @@ function photos_init(&$a) {
 
 function photos_post(&$a) {
 
+       $can_post  = false;
+       $visitor   = 0;
 
-        if(! local_user()) {
-                notice( t('Permission denied.') . EOL );
-                killme();
-        }
+       $page_owner_uid = $a->data['user']['uid'];
+       $community_page = (($a->data['user']['page-flags'] == PAGE_COMMUNITY) ? true : false);
 
+       if((local_user()) && (local_user() == $page_owner_uid))
+               $can_post = true;
+       else {
+               if($community_page && remote_user()) {
+                       $r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
+                               intval(remote_user()),
+                               intval($page_owner_uid)
+                       );
+                       if(count($r)) {
+                               $can_post = true;
+                               $visitor = remote_user();
+                       }
+               }
+       }
 
+       if(! $can_post) {
+               notice( t('Permission denied.') . EOL );
+               killme();
+       }
 
-       $r = q("SELECT * FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` 
+       $r = q("SELECT `contact`.*, `user`.`nickname` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` 
                WHERE `user`.`uid` = %d AND `self` = 1 LIMIT 1",
-               intval($_SESSION['uid'])
+               intval($page_owner_uid)
        );
 
-       $contact_record = $r[0];        
+       if(! count($r)) {
+               notice( t('Contact information unavailable') . EOL);
+               logger('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid);
+               killme();
+       }
+
+       $owner_record = $r[0];  
 
 
-       if(($a->argc > 2) && ($a->argv[1] == 'album')) {
-               $album = hex2bin($a->argv[2]);
+       if(($a->argc > 3) && ($a->argv[2] === 'album')) {
+               $album = hex2bin($a->argv[3]);
 
                if($album == t('Profile Photos') || $album == t('Contact Photos')) {
                        goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
@@ -71,7 +102,7 @@ function photos_post(&$a) {
 
                $r = q("SELECT count(*) FROM `photo` WHERE `album` = '%s' AND `uid` = %d",
                        dbesc($album),
-                       intval($_SESSION['uid'])
+                       intval($page_owner_uid)
                );
                if(! count($r)) {
                        notice( t('Album not found.') . EOL);
@@ -84,20 +115,33 @@ function photos_post(&$a) {
                        q("UPDATE `photo` SET `album` = '%s' WHERE `album` = '%s' AND `uid` = %d",
                                dbesc($newalbum),
                                dbesc($album),
-                               intval($_SESSION['uid'])
+                               intval($page_owner_uid)
                        );
                        $newurl = str_replace(bin2hex($album),bin2hex($newalbum),$_SESSION['photo_return']);
                        goaway($a->get_baseurl() . '/' . $newurl);
                        return; // NOTREACHED
                }
 
+
                if($_POST['dropalbum'] == t('Delete Album')) {
 
                        $res = array();
-                       $r = q("SELECT distinct(`resource-id`) as `rid` FROM `photo` WHERE `uid` = %d AND `album` = '%s'",
-                               intval($_SESSION['uid']),
-                               dbesc($album)
-                       );
+
+                       // get the list of photos we are about to delete
+
+                       if($visitor) {
+                               $r = q("SELECT distinct(`resource-id`) as `rid` FROM `photo` WHERE `contact-id` = %d AND `uid` = %d AND `album` = '%s'",
+                                       intval($visitor),
+                                       intval($page_owner_uid),
+                                       dbesc($album)
+                               );
+                       }
+                       else {
+                               $r = q("SELECT distinct(`resource-id`) as `rid` FROM `photo` WHERE `uid` = %d AND `album` = '%s'",
+                                       intval(local_user()),
+                                       dbesc($album)
+                               );
+                       }
                        if(count($r)) {
                                foreach($r as $rr) {
                                        $res[] = "'" . dbesc($rr['rid']) . "'" ;
@@ -107,19 +151,26 @@ function photos_post(&$a) {
                                goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
                                return; // NOTREACHED
                        }
+
                        $str_res = implode(',', $res);
 
+                       // remove the associated photos
+
                        q("DELETE FROM `photo` WHERE `resource-id` IN ( $str_res ) AND `uid` = %d",
-                               intval($_SESSION['uid'])
+                               intval($page_owner_uid)
                        );
+
+                       // find and delete the corresponding item with all the comments and likes/dislikes
+
                        $r = q("SELECT `parent-uri` FROM `item` WHERE `resource-id` IN ( $str_res ) AND `uid` = %d",
-                               intval($_SESSION['uid'])
+                               intval($page_owner_uid)
                        );
                        if(count($r)) {
                                foreach($r as $rr) {
-                                       q("UPDATE `item` SET `deleted` = 1 WHERE `parent-uri` = '%s' AND `uid` = %d",
+                                       q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
+                                               dbesc(datetime_convert()),
                                                dbesc($rr['parent-uri']),
-                                               intval($_SESSION['uid'])
+                                               intval($page_owner_uid)
                                        );
 
                                        $drop_id = intval($rr['id']);
@@ -138,31 +189,43 @@ function photos_post(&$a) {
                return; // NOTREACHED
        }
 
-       if(($a->argc > 1) && (x($_POST,'delete')) && ($_POST['delete'] == t('Delete Photo'))) {
-               $r = q("SELECT `id` FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' LIMIT 1",
-                       intval($_SESSION['uid']),
-                       dbesc($a->argv[1])
-               );
+       if(($a->argc > 2) && (x($_POST,'delete')) && ($_POST['delete'] == t('Delete Photo'))) {
+
+               // same as above but remove single photo
+
+               if($visitor) {
+                       $r = q("SELECT `id`, `resource-id` FROM `photo` WHERE `contact-id` = %d AND `uid` = %d AND `resource-id` = '%s' LIMIT 1",
+                               intval($visitor),
+                               intval($page_owner_uid),
+                               dbesc($a->argv[2])
+                       );
+               }
+               else {
+                       $r = q("SELECT `id`, `resource-id` FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' LIMIT 1",
+                               intval(local_user()),
+                               dbesc($a->argv[2])
+                       );
+               }
                if(count($r)) {
                        q("DELETE FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'",
-                               intval($_SESSION['uid']),
+                               intval($page_owner_uid),
                                dbesc($r[0]['resource-id'])
                        );
                        $i = q("SELECT * FROM `item` WHERE `resource-id` = '%s' AND `uid` = %d LIMIT 1",
                                dbesc($r[0]['resource-id']),
-                               intval($_SESSION['uid'])
+                               intval($page_owner_uid)
                        );
                        if(count($i)) {
-                               q("UPDATE `item` SET `deleted` = 1 WHERE `parent-uri` = '%s' AND `uid` = %d",
+                               q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
+                                       dbesc(datetime_convert()),
+                                       dbesc(datetime_convert()),
                                        dbesc($i[0]['uri']),
-                                       intval($_SESSION['uid'])
+                                       intval($page_owner_uid)
                                );
 
                                $url = $a->get_baseurl();
                                $drop_id = intval($i[0]['id']);
                                $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-                               
-                               // send the notification upstream/downstream as the case may be
 
                                if($i[0]['visible'])
                                        proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" & ",
@@ -174,98 +237,236 @@ function photos_post(&$a) {
                return; // NOTREACHED
        }
 
+       if(($a->argc > 2) && ((x($_POST,'desc') !== false) || (x($_POST,'newtag') !== false))) {
 
-
-       if(($a->argc > 1) && (x($_POST,'desc') !== false)) {
-               $desc = notags(trim($_POST['desc']));
-               $tags = notags(trim($_POST['tags']));
-               $item_id = intval($_POST['item_id']);
-               $resource_id = $a->argv[1];
+               $desc        = ((x($_POST,'desc'))    ? notags(trim($_POST['desc']))   : '');
+               $rawtags     = ((x($_POST,'newtag'))  ? notags(trim($_POST['newtag'])) : '');
+               $item_id     = ((x($_POST,'item_id')) ? intval($_POST['item_id'])      : 0);
+               $resource_id = $a->argv[2];
 
                $p = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d ORDER BY `scale` DESC",
                        dbesc($resource_id),
-                       intval($_SESSION['uid'])
+                       intval($page_owner_uid)
                );
-               if(count($r)) {
+               if((count($p)) && ($p[0]['desc'] !== $desc)) {
                        $r = q("UPDATE `photo` SET `desc` = '%s' WHERE `resource-id` = '%s' AND `uid` = %d",
                                dbesc($desc),
                                dbesc($resource_id),
-                               intval($_SESSION['uid'])
+                               intval($page_owner_uid)
                        );
                }
                if(! $item_id) {
 
+                       // Create item container
+
                        $title = '';
                        $basename = basename($filename);
+                       $uri = item_new_uri($a->get_hostname(),$page_owner_uid);
+
+                       $arr = array();
+
+                       $arr['uid']           = $page_owner_uid;
+                       $arr['uri']           = $uri;
+                       $arr['parent-uri']    = $uri; 
+                       $arr['type']          = 'photo';
+                       $arr['wall']          = 1;
+                       $arr['resource-id']   = $p[0]['resource-id'];
+                       $arr['contact-id']    = $owner_record['id'];
+                       $arr['owner-name']    = $owner_record['name'];
+                       $arr['owner-link']    = $owner_record['url'];
+                       $arr['owner-avatar']  = $owner_record['thumb'];
+                       $arr['author-name']   = $owner_record['name'];
+                       $arr['author-link']   = $owner_record['url'];
+                       $arr['author-avatar'] = $owner_record['thumb'];
+                       $arr['title']         = $title;
+                       $arr['allow_cid']     = $p[0]['allow_cid'];
+                       $arr['allow_gid']     = $p[0]['allow_gid'];
+                       $arr['deny_cid']      = $p[0]['deny_cid'];
+                       $arr['deny_gid']      = $p[0]['deny_gid'];
+                       $arr['last-child']    = 1;
+                       $arr['body']          = '[url=' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $p[0]['resource-id'] . ']' 
+                                               . '[img]' . $a->get_baseurl() . '/photo/' . $p[0]['resource-id'] . '-' . $p[0]['scale'] . '.jpg' . '[/img]' 
+                                               . '[/url]';
+               
+                       $item_id = item_store($arr);
 
-                       // Create item container
+               }
 
-                       $body = '[url=' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $p[0]['resource-id'] . ']' 
-                               . '[img]' . $a->get_baseurl() . '/photo/' . $p[0]['resource-id'] . '-' . $p[0]['scale'] . '.jpg' . '[/img]' 
-                               . '[/url]';
+               if($item_id) {
+                       $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                               intval($item_id),
+                               intval($page_owner_uid)
+                       );
+               }
+               if(count($r)) {
+                       $old_tag    = $r[0]['tag'];
+                       $old_inform = $r[0]['inform'];
+               }
 
-                       do {
-                               $dups = false;
-                               $item_hash = random_string();
-
-                               $uri = "urn:X-dfrn:" . $a->get_hostname() . ':' . $_SESSION['uid'] .  ':' . $item_hash;
-
-                               $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
-                               dbesc($uri));
-                               if(count($r))
-                                       $dups = true;
-                       } while($dups == true);
-
-
-                       $r = q("INSERT INTO `item` (`uid`, `type`, `resource-id`, `contact-id`,
-                               `owner-name`,`owner-link`,`owner-avatar`, `created`,
-                               `edited`, `uri`, `parent-uri`, `title`, `body`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`)
-                               VALUES( %d, '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
-                               intval($_SESSION['uid']),
-                               dbesc('photo'),
-                               dbesc($p[0]['resource-id']),                    
-                               intval($contact_record['id']),
-                               dbesc($contact_record['name']),
-                               dbesc($contact_record['url']),
-                               dbesc($contact_record['thumb']),
-                               datetime_convert(),
-                               datetime_convert(),
-                               dbesc($uri),
-                               dbesc($uri),
-                               dbesc($title),
-                               dbesc($body),
-                               dbesc($p[0]['allow_cid']),
-                               dbesc($p[0]['allow_gid']),
-                               dbesc($p[0]['deny_cid']),
-                               dbesc($p[0]['deny_gid'])
+               if(strlen($rawtags)) {
+
+                       $str_tags = '';
+                       $inform   = '';
+
+                       // if the new tag doesn't have a namespace specifier (@foo or #foo) give it a hashtag
+
+                       $x = substr($rawtags,0,1);
+                       if($x !== '@' && $x !== '#')
+                               $rawtags = '#' . $rawtags;
+
+                       $taginfo = array();
+                       $tags = get_tags($rawtags);
+
+                       if(count($tags)) {
+                               foreach($tags as $tag) {
+                                       if(strpos($tag,'@') === 0) {
+                                               $name = substr($tag,1);
+                                               if((strpos($name,'@')) || (strpos($name,'http://'))) {
+                                                       $newname = $name;
+                                                       $links = @lrdd($name);
+                                                       if(count($links)) {
+                                                               foreach($links as $link) {
+                                                                       if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
+                                                       $profile = $link['@attributes']['href'];
+                                                                       if($link['@attributes']['rel'] === 'salmon') {
+                                                                               $salmon = '$url:' . str_replace(',','%sc',$link['@attributes']['href']);
+                                                                               if(strlen($inform))
+                                                                                       $inform .= ',';
+                                                       $inform .= $salmon;
+                                                                       }
+                                                               }
+                                                       }
+                                                       $taginfo[] = array($newname,$profile,$salmon);
+                                               }
+                                               else {
+                                                       $newname = $name;
+                                                       if(strstr($name,'_')) {
+                                                               $newname = str_replace('_',' ',$name);
+                                                               $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
+                                                                       dbesc($newname),
+                                                                       intval($page_owner_uid)
+                                                               );
+                                                       }
+                                                       else {
+                                                               $r = q("SELECT * FROM `contact` WHERE `nick` = '%s' AND `uid` = %d LIMIT 1",
+                                                                       dbesc($name),
+                                                                       intval($page_owner_uid)
+                                                               );
+                                                       }
+                                                       if(count($r)) {
+                                                               $newname = $r[0]['name'];
+                                                               $profile = $r[0]['url'];
+                                                               $notify = 'cid:' . $r[0]['id'];
+                                                               if(strlen($inform))
+                                                                       $inform .= ',';
+                                                               $inform .= $notify;
+                                                       }
+                                               }
+                                               if($profile) {
+                                                       if(substr($notify,0,4) === 'cid:')
+                                                               $taginfo[] = array($newname,$profile,$notify,$r[0],'@[url=' . str_replace(',','%2c',$profile) . ']' . $newname  . '[/url]');
+                                                       else
+                                                               $taginfo[] = array($newname,$profile,$notify,null,$str_tags .= '@[url=' . $profile . ']' . $newname     . '[/url]');
+                                                       if(strlen($str_tags))
+                                                               $str_tags .= ',';
+                                                       $profile = str_replace(',','%2c',$profile);
+                                                       $str_tags .= '@[url=' . $profile . ']' . $newname       . '[/url]';
+                                               }
+                                       }
+                               }
+                       }
 
+                       $newtag = $old_tag;
+                       if(strlen($newtag) && strlen($str_tags)) 
+                               $newtag .= ',';
+                       $newtag .= $str_tags;
+
+                       $newinform = $old_inform;
+                       if(strlen($newinform) && strlen($inform))
+                               $newinform .= ',';
+                       $newinform .= $inform;
+
+                       $r = q("UPDATE `item` SET `tag` = '%s', `inform` = '%s', `edited` = '%s', `changed` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                               dbesc($newtag),
+                               dbesc($newinform),
+                               dbesc(datetime_convert()),
+                               dbesc(datetime_convert()),
+                               intval($item_id),
+                               intval($page_owner_uid)
                        );
-                       if($r) {
-       
-                               $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
-                                       dbesc($uri)
-                               );
-                               if(count($r))
-                                       $item_id = $r[0]['id'];
-                                       q("UPDATE `item` SET `parent` = %d, `last-child` = 1 WHERE `id` = %d LIMIT 1",
-                                       intval($r[0]['id']),
-                                       intval($r[0]['id'])
-                               );
+
+                       $best = 0;
+                       foreach($p as $scales) {
+                               if(intval($scales['scale']) == 2) {
+                                       $best = 2;
+                                       break;
+                               }
+                               if(intval($scales['scale']) == 4) {
+                                       $best = 4;
+                                       break;
+                               }
                        }
-               }
 
-               $r = q("UPDATE `item` SET `tag` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
-                       dbesc($tags),
-                       intval($item_id),
-                       intval($_SESSION['uid'])
-               );
+                       if(count($taginfo)) {
+                               foreach($taginfo as $tagged) {
+               
+                                       $uri = item_new_uri($a->get_hostname(),$page_owner_uid);
+
+                                       $arr = array();
+
+                                       $arr['uid']           = $page_owner_uid;
+                                       $arr['uri']           = $uri;
+                                       $arr['parent-uri']    = $uri;
+                                       $arr['type']          = 'activity';
+                                       $arr['wall']          = 1;
+                                       $arr['contact-id']    = $owner_record['id'];
+                                       $arr['owner-name']    = $owner_record['name'];
+                                       $arr['owner-link']    = $owner_record['url'];
+                                       $arr['owner-avatar']  = $owner_record['thumb'];
+                                       $arr['author-name']   = $owner_record['name'];
+                                       $arr['author-link']   = $owner_record['url'];
+                                       $arr['author-avatar'] = $owner_record['thumb'];
+                                       $arr['title']         = '';
+                                       $arr['allow_cid']     = $p[0]['allow_cid'];
+                                       $arr['allow_gid']     = $p[0]['allow_gid'];
+                                       $arr['deny_cid']      = $p[0]['deny_cid'];
+                                       $arr['deny_gid']      = $p[0]['deny_gid'];
+                                       $arr['last-child']    = 1;
+                                       $arr['visible']       = 1;
+                                       $arr['verb']          = ACTIVITY_TAG;
+                                       $arr['object-type']   = ACTIVITY_OBJ_PERSON;
+                                       $arr['target-type']   = ACTIVITY_OBJ_PHOTO;
+                                       $arr['tag']           = $tagged[4];
+                                       $arr['inform']        = $tagged[2];
+
+                                       $arr['body']          = '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]' . ' ' . t('was tagged in a') . ' ' . '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . t('photo') . '[/url]' . ' ' . t('by') . ' ' . '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]' ;
+                                       $arr['body'] .= "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . '[img]' . $a->get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.jpg' . '[/img][/url]' . "\n" ;
+
+                                       $arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $tagged[0] . '</title><id>' . $tagged[1] . '/' . $tagged[0] . '</id>';
+                                       $arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $tagged[1] . '" />' . "\n");
+                                       if($tagged[3])
+                                               $arr['object'] .= xmlify('<link rel="photo" type="image/jpeg" href="' . $tagged[3]['photo'] . '" />' . "\n");
+                                       $arr['object'] .= '</link></object>' . "\n";
+
+                                       $arr['target'] = '<target><type>' . ACTIVITY_OBJ_PHOTO . '</type><title>' . $p[0]['desc'] . '</title><id>'
+                                               . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '</id>';
+                                       $arr['target'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '" />' . "\n" . '<link rel="preview" type="image/jpeg" href="' . $a->get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.jpg' . '" />') . '</link></target>';
+
+                                       $item_id = item_store($arr);
+                                       $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+                                       proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"tag\" \"$item_id\" & ",
+                                               array(),$foo));
+                               }
+
+                       }
 
+               }
                goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
                return; // NOTREACHED
        }
 
 
-
+       // default post action - upload a photo
 
        if(! x($_FILES,'userfile'))
                killme();
@@ -287,50 +488,35 @@ function photos_post(&$a) {
 
        $r = q("SELECT * FROM `photo` WHERE `album` = '%s' AND `uid` = %d",
                dbesc($album),
-               intval($_SESSION['uid'])
+               intval($page_owner_uid)
        );
        if((! count($r)) || ($album == t('Profile Photos')))
                $visible = 1;
        else
-               $visibile = 0;
+               $visible = 0;
 
-       $str_group_allow = '';
-       $group_allow = $_POST['group_allow'];
-       if(is_array($group_allow)) {
-               array_walk($group_allow,'sanitise_acl');
-               $str_group_allow = implode('',$group_allow);
-       }
 
-       $str_contact_allow = '';
-       $contact_allow = $_POST['contact_allow'];
-       if(is_array($contact_allow)) {
-               array_walk($contact_allow,'sanitise_acl');
-               $str_contact_allow = implode('',$contact_allow);
-       }
+       $str_group_allow   = perms2str($_POST['group_allow']);
+       $str_contact_allow = perms2str($_POST['contact_allow']);
+       $str_group_deny    = perms2str($_POST['group_deny']);
+       $str_contact_deny  = perms2str($_POST['contact_deny']);
 
-       $str_group_deny = '';
-       $group_deny = $_POST['group_deny'];
-       if(is_array($group_deny)) {
-               array_walk($group_deny,'sanitise_acl');
-               $str_group_deny = implode('',$group_deny);
-       }
-
-       $str_contact_deny = '';
-       $contact_deny = $_POST['contact_deny'];
-       if(is_array($contact_deny)) {
-               array_walk($contact_deny,'sanitise_acl');
-               $str_contact_deny = implode('',$contact_deny);
-       }
+       $src               = $_FILES['userfile']['tmp_name'];
+       $filename          = basename($_FILES['userfile']['name']);
+       $filesize          = intval($_FILES['userfile']['size']);
 
+       $maximagesize = get_config('system','maximagesize');
 
-       $src      = $_FILES['userfile']['tmp_name'];
-       $filename = basename($_FILES['userfile']['name']);
-       $filesize = intval($_FILES['userfile']['size']);
+       if(($maximagesize) && ($filesize > $maximagesize)) {
+               notice( t('Image exceeds size limit of ') . $maximagesize . EOL);
+               @unlink($src);
+               return;
+       }
 
        $imagedata = @file_get_contents($src);
        $ph = new Photo($imagedata);
 
-       if(! ($image = $ph->getImage())) {
+       if(! $ph->is_valid()) {
                notice( t('Unable to process image.') . EOL );
                @unlink($src);
                killme();
@@ -343,9 +529,9 @@ function photos_post(&$a) {
 
        $smallest = 0;
 
-       $photo_hash = hash('md5',uniqid(mt_rand(),true));
-       
-       $r = $ph->store($_SESSION['uid'], 0, $photo_hash, $filename, $album, 0 , 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
+       $photo_hash = photo_new_resource();
+
+       $r = $ph->store($page_owner_uid, $visitor, $photo_hash, $filename, $album, 0 , 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
 
        if(! $r) {
                notice( t('Image upload failed.') . EOL );
@@ -354,71 +540,49 @@ function photos_post(&$a) {
 
        if($width > 640 || $height > 640) {
                $ph->scaleImage(640);
-               $ph->store($_SESSION['uid'], 0, $photo_hash, $filename, $album, 1, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
+               $ph->store($page_owner_uid, $visitor, $photo_hash, $filename, $album, 1, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
                $smallest = 1;
        }
 
        if($width > 320 || $height > 320) {
                $ph->scaleImage(320);
-               $ph->store($_SESSION['uid'], 0, $photo_hash, $filename, $album, 2, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
+               $ph->store($page_owner_uid, $visitor, $photo_hash, $filename, $album, 2, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
                $smallest = 2;
        }
        
        $basename = basename($filename);
+       $uri = item_new_uri($a->get_hostname(), $page_owner_uid);
 
        // Create item container
 
-       $body = '[url=' . $a->get_baseurl() . '/photos/' . $contact_record['nickname'] . '/image/' . $photo_hash . ']' 
-               . '[img]' . $a->get_baseurl() . "/photo/{$photo_hash}-{$smallest}.jpg" . '[/img]' 
-               . '[/url]';
-
-       do {
-               $dups = false;
-               $item_hash = random_string();
 
-               $uri = "urn:X-dfrn:" . $a->get_hostname() . ':' . $_SESSION['uid'] . ':' . $item_hash;
+       $arr = array();
+
+       $arr['uid']           = $page_owner_uid;
+       $arr['uri']           = $uri;
+       $arr['parent-uri']    = $uri;
+       $arr['type']          = 'photo';
+       $arr['wall']          = 1;
+       $arr['resource-id']   = $photo_hash;
+       $arr['contact-id']    = $owner_record['id'];
+       $arr['owner-name']    = $owner_record['name'];
+       $arr['owner-link']    = $owner_record['url'];
+       $arr['owner-avatar']  = $owner_record['thumb'];
+       $arr['author-name']   = $owner_record['name'];
+       $arr['author-link']   = $owner_record['url'];
+       $arr['author-avatar'] = $owner_record['thumb'];
+       $arr['title']         = '';
+       $arr['allow_cid']     = $str_contact_allow;
+       $arr['allow_gid']     = $str_group_allow;
+       $arr['deny_cid']      = $str_contact_deny;
+       $arr['deny_gid']      = $str_group_deny;
+       $arr['last-child']    = 1;
+       $arr['visible']       = $visible;
+       $arr['body']          = '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo_hash . ']' 
+                               . '[img]' . $a->get_baseurl() . "/photo/{$photo_hash}-{$smallest}.jpg" . '[/img]' 
+                               . '[/url]';
 
-               $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
-               dbesc($uri));
-               if(count($r))
-                       $dups = true;
-       } while($dups == true);
-
-
-       $r = q("INSERT INTO `item` (`uid`, `type`, `resource-id`, `contact-id`,`owner-name`,`owner-link`,`owner-avatar`, `created`,
-               `edited`, `uri`, `parent-uri`, `title`, `body`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `visible`)
-               VALUES( %d, '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d )",
-               intval($_SESSION['uid']),
-               dbesc('photo'),
-               dbesc($photo_hash),                     
-               intval($contact_record['id']),
-               dbesc($contact_record['name']),
-               dbesc($contact_record['url']),
-               dbesc($contact_record['thumb']),
-               datetime_convert(),
-               datetime_convert(),
-               dbesc($uri),
-               dbesc($uri),
-               dbesc($title),
-               dbesc($body),
-               dbesc($str_contact_allow),
-               dbesc($str_group_allow),
-               dbesc($str_contact_deny),
-               dbesc($str_group_deny),
-               intval($visible)
-       );
-       if($r) {
-
-               $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
-                       dbesc($uri)
-               );
-               if(count($r))
-                       q("UPDATE `item` SET `parent` = %d, `last-child` = 1 WHERE `id` = %d LIMIT 1",
-                       intval($r[0]['id']),
-                       intval($r[0]['id'])
-               );
-       
-       }
+       $item_id = item_store($arr);
 
        if(! $java_upload) {
                goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
@@ -458,7 +622,7 @@ function photos_content(&$a) {
                $datatype = $a->argv[2];
                $datum = $a->argv[3];
        }
-       elseif(($a->argc > 2) && ($a->argv[2] == 'upload'))
+       elseif(($a->argc > 2) && ($a->argv[2] === 'upload'))
                $datatype = 'upload';
        else
                $datatype = 'summary';
@@ -472,11 +636,52 @@ function photos_content(&$a) {
        // Setup permissions structures
        //
 
+       $can_post       = false;
+       $visitor        = 0;
+       $contact        = null;
+       $remote_contact = false;
+
        $owner_uid = $a->data['user']['uid'];
 
-       if(remote_user()) {
+       $community_page = (($a->data['user']['page-flags'] == PAGE_COMMUNITY) ? true : false);
+
+       if((local_user()) && (local_user() == $owner_uid))
+               $can_post = true;
+       else {
+               if($community_page && remote_user()) {
+                       $r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
+                               intval(remote_user()),
+                               intval($owner_uid)
+                       );
+                       if(count($r)) {
+                               $can_post = true;
+                               $contact  = $r[0];
+                               $remote_contact = true;
+                               $visitor = remote_user();
+                       }
+               }
+       }
+
+       // perhaps they're visiting - but not a community page, so they wouldn't have write access
+
+       if(remote_user() && (! $visitor)) {
                $contact_id = $_SESSION['visitor_id'];
                $groups = init_groups_visitor($contact_id);
+               $r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
+                       intval(remote_user()),
+                       intval($owner_uid)
+               );
+               if(count($r)) {
+                       $contact = $r[0];
+                       $remote_contact = true;
+               }
+       }
+
+       if(! $remote_contact) {
+               if(local_user()) {
+                       $contact_id = $_SESSION['cid'];
+                       $contact = $a->contact;
+               }
        }
 
        // default permissions - anonymous user
@@ -485,7 +690,7 @@ function photos_content(&$a) {
 
        // Profile owner - everything is visible
 
-       if(local_user() && ($_SESSION['uid'] == $owner_uid)) {
+       if(local_user() && (local_user() == $owner_uid)) {
                $sql_extra = '';        
        }
        elseif(remote_user()) {
@@ -501,8 +706,8 @@ function photos_content(&$a) {
                          AND ( `allow_gid` = '' OR `allow_gid` REGEXP '%s' )
                          AND ( `deny_gid`  = '' OR NOT `deny_gid` REGEXP '%s') ",
 
-                       intval($_SESSION['visitor_id']),
-                       intval($_SESSION['visitor_id']),
+                       intval(remote_user()),
+                       intval(remote_user()),
                        dbesc($gs),
                        dbesc($gs)
                );
@@ -513,8 +718,8 @@ function photos_content(&$a) {
        //
 
 
-       if($datatype == 'upload') {
-               if( ! (local_user() && ($_SESSION['uid'] == $a->data['user']['uid']))) {
+       if($datatype === 'upload') {
+               if(! ($can_post)) {
                        notice( t('Permission denied.'));
                        return;
                }
@@ -523,48 +728,51 @@ function photos_content(&$a) {
                $albumselect .= '<option value="" selected="selected" >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
                if(count($a->data['albums'])) {
                        foreach($a->data['albums'] as $album) {
-                               if(($album['album'] == '') || ($album['album'] == t('Contact Photos')))
+                               if(($album['album'] === '') || ($album['album'] == t('Contact Photos')))
                                        continue;
                                $albumselect .= '<option value="' . $album['album'] . '">' . $album['album'] . '</option>';
                        }
                }
+
+               $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
+
                $albumselect .= '</select>';
-               $tpl = file_get_contents('view/photos_upload.tpl');
+               $tpl = load_view_file('view/photos_upload.tpl');
                $o .= replace_macros($tpl,array(
                        '$pagename' => t('Upload Photos'),
                        '$sessid' => session_id(),
+                       '$nickname' => $a->data['user']['nickname'],
                        '$newalbum' => t('New album name: '),
                        '$existalbumtext' => t('or existing album name: '),
                        '$filestext' => t('Select files to upload: '),
                        '$albumselect' => $albumselect,
                        '$permissions' => t('Permissions'),
-                       '$aclselect' => populate_acl($a->user),
+                       '$aclselect' => (($visitor) ? '' : populate_acl($a->user, $celeb)),
                        '$archive' => $a->get_baseurl() . '/jumploader_z.jar',
-                       '$nojava' => t('Use the following controls only if the Java uploader (above) fails to launch.'),
-                       '$uploadurl' => $a->get_baseurl() . '/photos',
+                       '$nojava' => t('Use the following controls only if the Java uploader [above] fails to launch.'),
+                       '$uploadurl' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'],
                        '$submit' => t('Submit')
                ));
 
                return $o; 
-
        }
 
-       if($datatype == 'album') {
+       if($datatype === 'album') {
 
                $album = hex2bin($datum);
 
                $r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s' 
                        $sql_extra GROUP BY `resource-id`",
-                       intval($a->data['user']['uid']),
+                       intval($owner_uid),
                        dbesc($album)
                );
                if(count($r))
                        $a->set_pager_total(count($r));
 
 
-               $r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s' 
+               $r = q("SELECT `resource-id`, `id`, `filename`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s' 
                        $sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d",
-                       intval($a->data['user']['uid']),
+                       intval($owner_uid),
                        dbesc($album),
                        intval($a->pager['start']),
                        intval($a->pager['itemspage'])
@@ -572,12 +780,13 @@ function photos_content(&$a) {
 
                $o .= '<h3>' . $album . '</h3>';
                
-               if($cmd == 'edit') {            
+               if($cmd === 'edit') {           
                        if(($album != t('Profile Photos')) && ($album != t('Contact Photos'))) {
-                               if(local_user() && ($_SESSION['uid'] == $a->data['user']['uid'])) {
-                                       $edit_tpl = file_get_contents('view/album_edit.tpl');
+                               if($can_post) {
+                                       $edit_tpl = load_view_file('view/album_edit.tpl');
                                        $o .= replace_macros($edit_tpl,array(
                                                '$nametext' => t('New album name: '),
+                                               '$nickname' => $a->data['user']['nickname'],
                                                '$album' => $album,
                                                '$hexalbum' => bin2hex($album),
                                                '$submit' => t('Submit'),
@@ -588,14 +797,14 @@ function photos_content(&$a) {
                }
                else {
                        if(($album != t('Profile Photos')) && ($album != t('Contact Photos'))) {
-                               if(local_user() && ($_SESSION['uid'] == $a->data['user']['uid'])) {
+                               if($can_post) {
                                        $o .= '<div id="album-edit-link"><a href="'. $a->get_baseurl() . '/photos/' 
                                                . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/edit' . '">' 
                                                . t('Edit Album') . '</a></div>';
                                }
                        }
                }
-               $tpl = file_get_contents('view/photo_album.tpl');
+               $tpl = load_view_file('view/photo_album.tpl');
                if(count($r))
                        foreach($r as $rr) {
                                $o .= replace_macros($tpl,array(
@@ -613,16 +822,17 @@ function photos_content(&$a) {
        }       
 
 
-       if($datatype == 'image') {
+       if($datatype === 'image') {
 
                require_once('security.php');
                require_once('bbcode.php');
 
+               $o = '<div id="live-display"></div>' . "\r\n";
                // fetch image, item containing image, then comments
 
                $ph = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' 
                        $sql_extra ORDER BY `scale` ASC ",
-                       intval($a->data['user']['uid']),
+                       intval($owner_uid),
                        dbesc($datum)
                );
 
@@ -647,7 +857,7 @@ function photos_content(&$a) {
                
                $o .= '<h3>' . '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($ph[0]['album']) . '">' . $ph[0]['album'] . '</a></h3>';
  
-               if(local_user() && ($ph[0]['uid'] == $_SESSION['uid'])) {
+               if($can_post && ($ph[0]['uid'] == $owner_uid)) {
                        $o .= '<div id="photo-edit-link-wrap" ><a id="photo-edit-link" href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $datum . '/edit' . '">' . t('Edit photo') . '</a></div>';
                }
 
@@ -660,19 +870,20 @@ function photos_content(&$a) {
 
                // Do we have an item for this photo?
 
-               $i1 = q("SELECT * FROM `item` WHERE `resource-id` = '%s' $sql_extra LIMIT 1",
+               $linked_items = q("SELECT * FROM `item` WHERE `resource-id` = '%s' $sql_extra LIMIT 1",
                        dbesc($datum)
                );
-               if(count($i1)) {
-//dbg(2);
+               if(count($linked_items)) {
+                       $link_item = $linked_items[0];
                        $r = q("SELECT COUNT(*) AS `total`
                                FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
                                WHERE `parent-uri` = '%s' AND `uri` != '%s' AND `item`.`deleted` = 0
-                               AND NOT `item`.`type` IN ( 'remote', 'net-comment') 
-                               AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
+                               AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+                               AND `item`.`uid` = %d 
                                $sql_extra ",
-                               dbesc($i1[0]['uri']),
-                               dbesc($i1[0]['uri'])
+                               dbesc($link_item['uri']),
+                               dbesc($link_item['uri']),
+                               intval($link_item['uid'])
 
                        );
 
@@ -681,103 +892,190 @@ function photos_content(&$a) {
 
 
                        $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
-                               `contact`.`name`, `contact`.`photo`, `contact`.`url`, 
-                               `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, 
+                               `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`network`, 
+                               `contact`.`rel`, `contact`.`thumb`, `contact`.`self`, 
                                `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
                                FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
                                WHERE `parent-uri` = '%s' AND `uri` != '%s' AND `item`.`deleted` = 0
-                               AND NOT `item`.`type` IN ( 'remote', 'net-comment') 
                                AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+                               AND `item`.`uid` = %d
                                $sql_extra
                                ORDER BY `parent` DESC, `id` ASC LIMIT %d ,%d ",
-                               dbesc($i1[0]['uri']),
-                               dbesc($i1[0]['uri']),
+                               dbesc($link_item['uri']),
+                               dbesc($link_item['uri']),
+                               intval($link_item['uid']),
                                intval($a->pager['start']),
                                intval($a->pager['itemspage'])
 
                        );
+               
+                       if((local_user()) && (local_user() == $link_item['uid'])) {
+                               q("UPDATE `item` SET `unseen` = 0 WHERE `parent` = %d and `uid` = %d",
+                                       intval($link_item['parent']),
+                                       intval(local_user())
+                               );
+                       }
                }
 
                $o .= '<div id="photo-caption" >' . $ph[0]['desc'] . '</div>';
 
-               if(count($i1) && strlen($i1[0]['tag'])) {
+               if(count($linked_items) && strlen($link_item['tag'])) {
+                       $arr = explode(',',$link_item['tag']);
                        // parse tags and add links     
-                       $o .= '<div id="in-this-photo-text">' . t('In this photo: ') . '</div>';
-                       $o .= '<div id="in-this-photo">' . $i1[0]['tag'] . '</div>';
+                       $o .= '<div id="in-this-photo-text">' . t('Tags: ') . '</div>';
+                       $o .= '<div id="in-this-photo">';
+                       $tag_str = '';
+                       foreach($arr as $t) {
+                               if(strlen($tag_str))
+                                       $tag_str .= ', ';
+                               $tag_str .= bbcode($t);
+                       } 
+                       $o .= $tag_str . '</div>';
+                       if($cmd === 'edit')
+                               $o .= '<div id="tag-remove"><a href="' . $a->get_baseurl() . '/tagrm/' . $link_item['id'] . '">' . t('[Remove any tag]') . '</a></div>';
                }
 
-               if($cmd == 'edit') {
-                       $edit_tpl = file_get_contents('view/photo_edit.tpl');
+
+               if(($cmd === 'edit') && ($can_post)) {
+                       $edit_tpl = load_view_file('view/photo_edit.tpl');
                        $o .= replace_macros($edit_tpl, array(
                                '$id' => $ph[0]['id'],
+                               '$nickname' => $a->data['user']['nickname'],
                                '$resource_id' => $ph[0]['resource-id'],
                                '$capt_label' => t('Caption'),
                                '$caption' => $ph[0]['desc'],
-                               '$tag_label' => t('Tags'),
-                               '$tags' => $i1[0]['tag'],
-                               '$item_id' => ((count($i1)) ? $i1[0]['id'] : 0),
+                               '$tag_label' => t('Add a Tag'),
+                               '$tags' => $link_item['tag'],
+                               '$help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'),
+                               '$item_id' => ((count($linked_items)) ? $link_item['id'] : 0),
                                '$submit' => t('Submit'),
                                '$delete' => t('Delete Photo')
-
                        ));
                }
 
-               if(count($i1)) {
-                       // pull out how many people like the photo
+               if(count($linked_items)) {
 
-                       $cmnt_tpl = file_get_contents('view/comment_item.tpl');
-                       $tpl = file_get_contents('view/photo_item.tpl');
+                       $cmnt_tpl = load_view_file('view/comment_item.tpl');
+                       $tpl = load_view_file('view/photo_item.tpl');
                        $return_url = $a->cmd;
 
-                       if(can_write_wall($a,$a->data['user']['uid'])) {
-                               if($i1[0]['last-child']) {
-                                       $o .= replace_macros($cmnt_tpl,array(
-                                               '$return_path' => $return_url,
-                                               '$type' => 'wall-comment',
-                                               '$id' => $i1[0]['id'],
-                                               '$parent' => $i1[0]['id'],
-                                               '$profile_uid' =>  $a->data['user']['uid'],
-                                               '$ww' => ''
-                                       ));
+                       $like_tpl = load_view_file('view/like.tpl');
+
+                       $likebuttons = '';
+
+                       if($can_post || can_write_wall($a,$owner_uid))
+                               $likebuttons = replace_macros($like_tpl,array('$id' => $link_item['id']));
+
+                       if(! count($r)) {
+                               $o .= '<div id="photo-like-div">';
+                               $o .= $likebuttons;
+                               $o .= '</div>';
+
+                               if($can_post || can_write_wall($a,$owner_uid)) {
+                                       if($link_item['last-child']) {
+                                               $o .= replace_macros($cmnt_tpl,array(
+                                                       '$return_path' => $return_url,
+                                                       '$type' => 'wall-comment',
+                                                       '$id' => $link_item['id'],
+                                                       '$parent' => $link_item['id'],
+                                                       '$profile_uid' =>  $owner_uid,
+                                                       '$mylink' => $contact['url'],
+                                                       '$mytitle' => t('This is you'),
+                                                       '$myphoto' => $contact['thumb'],
+                                                       '$ww' => ''
+                                               ));
+                                       }
                                }
                        }
 
+                       $alike = array();
+                       $dlike = array();
 
                        // display comments
                        if(count($r)) {
+
+                               foreach($r as $item) {
+                                       like_puller($a,$item,$alike,'like');
+                                       like_puller($a,$item,$dlike,'dislike');
+                               }
+
+                   $like    = ((isset($alike[$link_item['id']])) ? format_like($alike[$link_item['id']],$alike[$link_item['id'] . '-l'],'like',$link_item['id']) : '');
+                               $dislike = ((isset($dlike[$link_item['id']])) ? format_like($dlike[$link_item['id']],$dlike[$link_item['id'] . '-l'],'dislike',$link_item['id']) : '');
+
+                               $o .= '<div id="photo-like-div">';
+                               $o .= $likebuttons;
+                               $o .= $like;
+                               $o .= $dislike;
+                               $o .= '</div>';
+
+
+
+                               if($can_post || can_write_wall($a,$owner_uid)) {
+                                       if($link_item['last-child']) {
+                                               $o .= replace_macros($cmnt_tpl,array(
+                                                       '$return_path' => $return_url,
+                                                       '$type' => 'wall-comment',
+                                                       '$id' => $link_item['id'],
+                                                       '$parent' => $link_item['id'],
+                                                       '$profile_uid' =>  $owner_uid,
+                                                       '$mylink' => $contact['url'],
+                                                       '$mytitle' => t('This is you'),
+                                                       '$myphoto' => $contact['thumb'],
+                                                       '$ww' => ''
+                                               ));
+                                       }
+                               }
+
+
                                foreach($r as $item) {
                                        $comment = '';
                                        $template = $tpl;
-                       
+                                       $sparkle = '';
+
+                                       if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) && ($item['id'] != $item['parent']))
+                                               continue;
+
                                        $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
                        
-                                       if(can_write_wall($a,$a->data['user']['uid'])) {
+                                       if($can_post || can_write_wall($a,$owner_uid)) {
+
                                                if($item['last-child']) {
                                                        $comment = replace_macros($cmnt_tpl,array(
                                                                '$return_path' => $return_url,
                                                                '$type' => 'wall-comment',
                                                                '$id' => $item['item_id'],
                                                                '$parent' => $item['parent'],
-                                                               '$profile_uid' =>  $a->data['user']['uid'],
+                                                               '$profile_uid' =>  $owner_uid,
+                                                               '$mylink' => $contact['url'],
+                                                               '$mytitle' => t('This is you'),
+                                                               '$myphoto' => $contact['thumb'],
                                                                '$ww' => ''
                                                        ));
                                                }
                                        }
 
-                                       $profile_url = $item['url'];
 
-                                       if(local_user() && ($item['contact-uid'] == $_SESSION['uid']
-                                               && ($item['rel'] == DIRECTION_IN || $item['rel'] == DIRECTION_BOTH) && (! $item['self'] ))
+                                       if(local_user() && ($item['contact-uid'] == local_user()
+                                               && ($item['network'] == 'dfrn') && (! $item['self'] )) {
                                                $profile_url = $redirect_url;
+                                               $sparkle = ' sparkle';
+                                       }
+                                       else {
+                                               $profile_url = $item['url'];
+                                               $sparkle = '';
+                                       }
  
-                                       $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']);
-                                       $profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
+                                       $diff_author = (($item['url'] !== $item['author-link']) ? true : false);
+
+                                       $profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
+                                       $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $item['thumb']);
+
                                        $profile_link = $profile_url;
 
                                        $drop = '';
 
-                                       if(($item['contact-id'] == $_SESSION['visitor_id']) || ($item['uid'] == $_SESSION['uid']))
-                                               $drop = replace_macros(file_get_contents('view/wall_item_drop.tpl'), array('$id' => $item['id']));
+                                       if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
+                                               $drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id']));
 
 
                                        $o .= replace_macros($template,array(
@@ -785,6 +1083,7 @@ function photos_content(&$a) {
                                                '$profile_url' => $profile_link,
                                                '$name' => $profile_name,
                                                '$thumb' => $profile_avatar,
+                                               '$sparkle' => $sparkle,
                                                '$title' => $item['title'],
                                                '$body' => bbcode($item['body']),
                                                '$ago' => relative_date($item['created']),
@@ -801,6 +1100,7 @@ function photos_content(&$a) {
        }
 
        // Default - show recent photos with upload link (if applicable)
+       $o = '';
 
        $r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s' 
                $sql_extra GROUP BY `resource-id`",
@@ -811,7 +1111,8 @@ function photos_content(&$a) {
                $a->set_pager_total(count($r));
 
 
-       $r = q("SELECT `resource-id`, `album`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s' 
+       $r = q("SELECT `resource-id`, `id`, `filename`, `album`, max(`scale`) AS `scale` FROM `photo`
+               WHERE `uid` = %d AND `album` != '%s' 
                $sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d",
                intval($a->data['user']['uid']),
                dbesc( t('Contact Photos')),
@@ -821,12 +1122,12 @@ function photos_content(&$a) {
 
        $o .= '<h3>' . t('Recent Photos') . '</h3>';
 
-       if( local_user() && ($_SESSION['uid'] == $a->data['user']['uid'])) {
+       if($can_post) {
                $o .= '<div id="photo-top-links"><a id="photo-top-upload-link" href="'. $a->get_baseurl() . '/photos/' 
                        . $a->data['user']['nickname'] . '/upload' . '">' . t('Upload New Photos') . '</a></div>';
        }
 
-       $tpl = file_get_contents('view/photo_top.tpl');
+       $tpl = load_view_file('view/photo_top.tpl');
        if(count($r)) {
                foreach($r as $rr) {
                        $o .= replace_macros($tpl,array(
@@ -835,8 +1136,8 @@ function photos_content(&$a) {
                                        . '/image/' . $rr['resource-id'],
                                '$phototitle' => t('View Photo'),
                                '$imgsrc' => $a->get_baseurl() . '/photo/' 
-                                       . $rr['resource-id'] . '-' . $rr['scale'] . '.jpg',
-                               '$albumlink' => $a->get_baseurl . '/photos/' 
+                                       . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.jpg',
+                               '$albumlink' => $a->get_baseurl() . '/photos/' 
                                        . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
                                '$albumname' => $rr['album'],
                                '$albumalt' => t('View Album'),