Revert Photos.php code

1 files changed, 1357 insertions, 245 deletions

diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php
index 967a3b703..b87c586da 100644
--- a/Zotlabs/Module/Photos.php
+++ b/Zotlabs/Module/Photos.php
@@ -1,312 +1,1424 @@
 <?php
-
-
 namespace Zotlabs\Module;
 
+require_once('include/photo/photo_driver.php');
+require_once('include/photos.php');
+require_once('include/items.php');
+require_once('include/acl_selectors.php');
+require_once('include/bbcode.php');
 require_once('include/security.php');
 require_once('include/attach.php');
-require_once('include/photo/photo_driver.php');
+require_once('include/text.php');
 
-class Photo extends \Zotlabs\Web\Controller {
 
-	function init() {
+class Photos extends \Zotlabs\Web\Controller {
 
-		$streaming = null;
-		$channel = null;
-		$person = 0;
-		$renew = false;
-
-		switch(argc()) {
-			case 4:
-				$person = argv(3);
-				$res    = argv(2);
-				$type   = argv(1);
-				break;
-			case 2:
-				$photo = argv(1);
-				break;
-			case 1:
-			default:
+	function init() {
+	
+		if(observer_prohibited()) {
+			return;
+		}
+	
+		if(argc() > 1) {
+			$nick = argv(1);
+	
+			profile_load($nick);
+	
+			$channelx = channelx_by_nick($nick);
+	
+			if(! $channelx)
+				return;
+	
+			\App::$data['channel'] = $channelx;
+	
+			$observer = \App::get_observer();
+			\App::$data['observer'] = $observer;
+	
+			$observer_xchan = (($observer) ? $observer['xchan_hash'] : '');
+	
+			head_set_icon(\App::$data['channel']['xchan_photo_s']);
+	
+			\App::$page['htmlhead'] .= "<script> var profile_uid = " . ((\App::$data['channel']) ? \App::$data['channel']['channel_id'] : 0) . "; </script>" ;
+	
+		}
+	
+		return;
+	}
+	
+	
+	
+	function post() {
+	
+		logger('mod-photos: photos_post: begin' , LOGGER_DEBUG);
+	
+		logger('mod_photos: REQUEST ' . print_r($_REQUEST,true), LOGGER_DATA);
+		logger('mod_photos: FILES '   . print_r($_FILES,true), LOGGER_DATA);
+	
+		$ph = photo_factory('');
+	
+		$phototypes = $ph->supportedTypes();
+	
+		$can_post  = false;
+	
+		$page_owner_uid = \App::$data['channel']['channel_id'];
+	
+		if(perm_is_allowed($page_owner_uid,get_observer_hash(),'write_storage'))
+			$can_post = true;
+	
+		if(! $can_post) {
+			notice( t('Permission denied.') . EOL );
+			if(is_ajax())
+				killme();
+			return;
+		}
+	
+		$s = abook_self($page_owner_uid);
+	
+		if(! $s) {
+			notice( t('Page owner information could not be retrieved.') . EOL);
+			logger('mod_photos: post: unable to locate contact record for page owner. uid=' . $page_owner_uid);
+			if(is_ajax())
 				killme();
-				// NOTREACHED
+			return;
 		}
+	
+		$owner_record = $s[0];	
+	
+		$acl = new \Zotlabs\Access\AccessList(\App::$data['channel']);
+	
+		if((argc() > 3) && (argv(2) === 'album')) {
+	
+			$album = argv(3);
 
-		$cache_mode = array(
-			'on' => false,
-			'age' => 86400,
-			'exp' => true,
-			'leak' => false
-		);
-		call_hooks('cache_mode_hook', $cache_mode);
+			if(! photos_album_exists($page_owner_uid, get_observer_hash(), $album)) {
+				notice( t('Album not found.') . EOL);
+				goaway(z_root() . '/' . $_SESSION['photo_return']);
+			}
+	
+	
+			/*
+			 * DELETE photo album and all its photos
+			 */
+	
+			if($_REQUEST['dropalbum'] == t('Delete Album')) {
+	
 		
-		$observer_xchan = get_observer_hash();
-		$ismodified = $_SERVER['HTTP_IF_MODIFIED_SINCE'];
+				$folder_hash = '';
+	 
+				$r = q("select * from attach where is_dir = 1 and uid = %d and hash = '%s'",
+					intval($page_owner_uid),
+					dbesc($album)
+				);
+				if(! $r) {
+					notice( t('Album not found.') . EOL);
+					return;
+				}
+				$folder_hash = $r[0]['hash'];
+	
+	
+				$res = array();
+				$admin_delete = false;
 
-		if(isset($type)) {
+				// get the list of photos we are about to delete
 	
-			/**
-			 * Profile photos - Access controls on default profile photos are not honoured since they need to be exchanged with remote sites.
-			 * 
-			 */
-			 
-			$default = get_default_profile_photo();
-			 
-			if($type === 'profile') {
-				switch($res) {
-					case 'm':
-						$resolution = 5;
-						$default = get_default_profile_photo(80);
-						break;
-					case 's':
-						$resolution = 6;
-						$default = get_default_profile_photo(48);
-						break;
-					case 'l':
-					default:
-						$resolution = 4;
-						break;
+				if(remote_channel() && (! local_channel())) {
+					$str = photos_album_get_db_idstr($page_owner_uid,$album,remote_channel());
+				}
+				elseif(local_channel()) {
+					$str = photos_album_get_db_idstr(local_channel(),$album);
 				}
+				elseif(is_site_admin()) {
+					$str = photos_album_get_db_idstr_admin($page_owner_uid,$album);
+					$admin_delete = true;
+				}
+				else {
+					$str = null;
+				}
+				if(! $str) {
+					goaway(z_root() . '/' . $_SESSION['photo_return']);
+				}
+	
+				$r = q("select id from item where resource_id in ( $str ) and resource_type = 'photo' and uid = %d " . item_normal(),
+					intval($page_owner_uid)
+				);
+				if($r) {
+					foreach($r as $i) {
+						attach_delete($page_owner_uid, $i['resource_id'], true );
+					}
+				}
+	
+				// remove the associated photos in case they weren't attached to an item
+	
+				q("delete from photo where resource_id in ( $str ) and uid = %d",
+					intval($page_owner_uid)
+				);
+	
+				// @FIXME do the same for the linked attach
+	
+				if($folder_hash) {
+					attach_delete($page_owner_uid, $folder_hash, true );
+
+					if(! $admin_delete) {	
+						$sync = attach_export_data(\App::$data['channel'],$folder_hash, true);
+	
+						if($sync) 
+							build_sync_packet($page_owner_uid,array('file' => array($sync)));
+					}
+				}
+	
 			}
+			
+			goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address']);
+		}
 	
-			$modified = filemtime($default);
-			$default = z_root() . '/' . $default;
-			$uid = $person;
+		if((argc() > 2) && (x($_REQUEST,'delete')) && ($_REQUEST['delete'] === t('Delete Photo'))) {
+			// same as above but remove single photo
+	
+			$ob_hash = get_observer_hash();
+			if(! $ob_hash)
+				goaway(z_root() . '/' . $_SESSION['photo_return']);
+
+			$r = q("SELECT id, resource_id FROM photo WHERE ( xchan = '%s' or uid = %d ) AND resource_id = '%s' LIMIT 1",
+				dbesc($ob_hash),
+				intval(local_channel()),
+				dbesc(argv(2))
+			);
+	
+			if($r) {
+				attach_delete($page_owner_uid, $r[0]['resource_id'], true );
+				$sync = attach_export_data(\App::$data['channel'],$r[0]['resource_id'], true);
+	
+				if($sync) 
+					build_sync_packet($page_owner_uid,array('file' => array($sync)));
+			}
+			elseif(is_site_admin()) {
+				// If the admin deletes a photo, don't sync
+				attach_delete($page_owner_uid, argv(2), true);
+			}	
 
-			$d = [ 'imgscale' => $resolution, 'channel_id' => $uid, 'default' => $default, 'data'  => '', 'mimetype' => '' ];
-			call_hooks('get_profile_photo',$d);
 
-			$resolution = $d['imgscale'];
-			$uid        = $d['channel_id']; 	
-			$default    = $d['default'];
-			$data       = $d['data'];
-			$mimetype   = $d['mimetype'];
+			goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . $_SESSION['album_return']);
+		}
+
+		if((argc() > 2) && array_key_exists('move_to_album',$_POST)) {
+			$m = q("select folder from attach where hash = '%s' and uid = %d limit 1",
+				dbesc(argv(2)),
+				intval($page_owner_uid)
+			);
+			if(($m) && ($m[0]['folder'] != $_POST['move_to_album'])) {
+				attach_move($page_owner_uid,argv(2),$_POST['move_to_album']);			
+
+				$sync = attach_export_data(\App::$data['channel'],argv(2),true);
+				if($sync) 
+					build_sync_packet($page_owner_uid,array('file' => array($sync)));
+
+				if(! ($_POST['desc'] && $_POST['newtag']))
+					goaway(z_root() . '/' . $_SESSION['photo_return']);
+			}
+		}
 
-			if(! $data) {
-				$r = q("SELECT * FROM photo WHERE imgscale = %d AND uid = %d AND photo_usage = %d LIMIT 1",
-					intval($resolution),
-					intval($uid),
-					intval(PHOTO_PROFILE)
+		if((argc() > 2) && ((x($_POST,'desc') !== false) || (x($_POST,'newtag') !== false))) {
+	
+			$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);
+
+			$is_nsfw     = ((x($_POST,'adult'))   ? intval($_POST['adult'])         : 0);
+		
+			$acl->set_from_array($_POST);
+			$perm = $acl->get();
+	
+			$resource_id = argv(2);
+	
+			if((x($_POST,'rotate') !== false) && 
+			   ( (intval($_POST['rotate']) == 1) || (intval($_POST['rotate']) == 2) )) {
+				logger('rotate');
+	
+				$r = q("select * from photo where resource_id = '%s' and uid = %d and imgscale = 0 limit 1",
+					dbesc($resource_id),
+					intval($page_owner_uid)
 				);
+				if(count($r)) {
+					$d = (($r[0]['os_storage']) ? @file_get_contents(dbunescbin($r[0]['content'])) : dbunescbin($r[0]['content']));
+					$ph = photo_factory($d, $r[0]['mimetype']);
+					if($ph->is_valid()) {
+						$rotate_deg = ( (intval($_POST['rotate']) == 1) ? 270 : 90 );
+						$ph->rotate($rotate_deg);
+	
+						$width  = $ph->getWidth();
+						$height = $ph->getHeight();
+						
+						if(intval($r[0]['os_storage'])) {
+							@file_put_contents($r[0]['content'],$ph->imageString());
+							$data = $r[0]['content'];
+							$fsize = @filesize($r[0]['content']);
+							q("update attach set filesize = %d where hash = '%s' and uid = %d",
+								intval($fsize),
+								dbesc($resource_id),
+								intval($page_owner_uid)
+							);
+						}
+						else {
+							$data = $ph->imageString();
+							$fsize = strlen($data);
+						}
+	
+						$x = q("update photo set edited = '%s', content = '%s', filesize = %d, height = %d, width = %d where resource_id = '%s' and uid = %d and imgscale = 0",
+							dbesc(datetime_convert()),
+							dbescbin($data),
+							intval($fsize),
+							intval($height),
+							intval($width),
+							dbesc($resource_id),
+							intval($page_owner_uid)
+						);
+	
+						if($width > 1024 || $height > 1024) 
+							$ph->scaleImage(1024);
+	
+						$width  = $ph->getWidth();
+						$height = $ph->getHeight();
+						$data = $ph->imageString();
+						$fsize = strlen($data);
+	
+						$x = q("update photo set edited = '%s', content = '%s', filesize = %d, height = %d, width = %d where resource_id = '%s' and uid = %d and imgscale = 1",
+							dbesc(datetime_convert()),
+							dbescbin($data),
+							intval($fsize),
+							intval($height),
+							intval($width),
+							dbesc($resource_id),
+							intval($page_owner_uid)
+						);
+	
+	
+						if($width > 640 || $height > 640) 
+							$ph->scaleImage(640);
+	
+						$width  = $ph->getWidth();
+						$height = $ph->getHeight();
+						$data = $ph->imageString();
+						$fsize = strlen($data);
+	
+						$x = q("update photo set edited = '%s', content = '%s', filesize = %d, height = %d, width = %d where resource_id = '%s' and uid = %d and imgscale = 2",
+							dbesc(datetime_convert()),
+							dbescbin($data),
+							intval($fsize),
+							intval($height),
+							intval($width),
+							dbesc($resource_id),
+							intval($page_owner_uid)
+						);
+	
+	
+						if($width > 320 || $height > 320) 
+							$ph->scaleImage(320);
+	
+						$width  = $ph->getWidth();
+						$height = $ph->getHeight();
+						$data = $ph->imageString();
+						$fsize = strlen($data);
+	
+						$x = q("update photo set edited = '%s', content = '%s', filesize = %d, height = %d, width = %d where resource_id = '%s' and uid = %d and imgscale = 3",
+							dbesc(datetime_convert()),
+							dbescbin($data),
+							intval($fsize),
+							intval($height),
+							intval($width),
+							dbesc($resource_id),
+							intval($page_owner_uid)
+						);
+					}
+				}
+			}
+	
+			$p = q("SELECT mimetype, is_nsfw, description, resource_id, imgscale, allow_cid, allow_gid, deny_cid, deny_gid FROM photo WHERE resource_id = '%s' AND uid = %d ORDER BY imgscale DESC",
+				dbesc($resource_id),
+				intval($page_owner_uid)
+			);
+			if($p) {
+				$ext = $phototypes[$p[0]['mimetype']];
+	
+				$r = q("UPDATE photo SET description = '%s', allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' WHERE resource_id = '%s' AND uid = %d",
+					dbesc($desc),
+					dbesc($perm['allow_cid']),
+					dbesc($perm['allow_gid']),
+					dbesc($perm['deny_cid']),
+					dbesc($perm['deny_gid']),
+					dbesc($resource_id),
+					intval($page_owner_uid)
+				);
+			}
+	
+			$item_private = (($str_contact_allow || $str_group_allow || $str_contact_deny || $str_group_deny) ? true : false);
+	
+			$old_is_nsfw = $p[0]['is_nsfw'];
+			if($old_is_nsfw != $is_nsfw) {
+				$r = q("update photo set is_nsfw = %d where resource_id = '%s' and uid = %d",
+					intval($is_nsfw),
+					dbesc($resource_id),
+					intval($page_owner_uid)
+				);
+			}
+	
+			/* Don't make the item visible if the only change was the album name */
+	
+			$visibility = 0;
+			if($p[0]['description'] !== $desc || strlen($rawtags))
+				$visibility = 1;
+	
+			if(! $item_id) {
+				$item_id = photos_create_item(\App::$data['channel'],get_observer_hash(),$p[0],$visibility);
+	
+			}
+	
+			if($item_id) {
+				$r = q("SELECT * FROM item WHERE id = %d AND uid = %d LIMIT 1",
+					intval($item_id),
+					intval($page_owner_uid)
+				);
+	
 				if($r) {
-					$modified = strtotime($r[0]['edited'] . "Z");
-					$data = dbunescbin($r[0]['content']);
-					$mimetype = $r[0]['mimetype'];
+					$old_tag    = $r[0]['tag'];
+					$old_inform = $r[0]['inform'];
 				}
-				if(intval($r[0]['os_storage']))
-					$data = file_get_contents($data);
 			}
-
-			if(! $data) {
-			    $x = z_fetch_url($default,true,0,[ 'novalidate' => true ]);
-			    $data = ($x['success'] ? $x['body'] : EMPTY_STR);
-			    $mimetype = 'image/png';
+	
+	
+			// make sure the linked item has the same permissions as the photo regardless of any other changes
+			$x = q("update item set allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s', item_private = %d
+				where id = %d",
+					dbesc($perm['allow_cid']),
+					dbesc($perm['allow_gid']),
+					dbesc($perm['deny_cid']),
+					dbesc($perm['deny_gid']),
+					intval($acl->is_private()),
+					intval($item_id)
+			);
+	
+			// make sure the attach has the same permissions as the photo regardless of any other changes
+			$x = q("update attach set allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' where hash = '%s' and uid = %d and is_photo = 1",
+					dbesc($perm['allow_cid']),
+					dbesc($perm['allow_gid']),
+					dbesc($perm['deny_cid']),
+					dbesc($perm['deny_gid']),
+					dbesc($resource_id),
+					intval($page_owner_uid)
+			);
+	
+	
+	
+			if(strlen($rawtags)) {
+	
+				$str_tags = '';
+				$inform   = '';
+	
+				// if the new tag doesn't have a namespace specifier (@foo or #foo) give it a mention
+	
+				$x = substr($rawtags,0,1);
+				if($x !== '@' && $x !== '#')
+					$rawtags = '@' . $rawtags;
+	
+				require_once('include/text.php');
+				$profile_uid = \App::$profile['profile_uid'];
+	
+				$results = linkify_tags($a, $rawtags, (local_channel()) ? local_channel() : $profile_uid);
+	
+				$success = $results['success'];
+				$post_tags = array();
+	
+				foreach($results as $result) {
+					$success = $result['success'];
+					if($success['replaced']) {
+						$post_tags[] = array(
+							'uid'   => $profile_uid, 
+							'ttype'  => $success['termtype'],
+							'otype' => TERM_OBJ_POST,
+							'term'  => $success['term'],
+							'url'   => $success['url']
+						); 				
+					}
+				}
+	
+				$r = q("select * from item where id = %d and uid = %d limit 1",
+					intval($item_id),
+					intval($page_owner_uid)
+				);
+	
+				if($r) {
+					$r = fetch_post_tags($r,true);
+					$datarray = $r[0];
+					if($post_tags) {
+						if((! array_key_exists('term',$datarray)) || (! is_array($datarray['term'])))
+							$datarray['term'] = $post_tags;
+						else
+							$datarray['term'] = array_merge($datarray['term'],$post_tags);  
+					}
+					item_store_update($datarray,$execflag);
+				}
+	
 			}
+
+			$sync = attach_export_data(\App::$data['channel'],$resource_id);
+	
+			if($sync) 
+				build_sync_packet($page_owner_uid,array('file' => array($sync)));
+		
+			goaway(z_root() . '/' . $_SESSION['photo_return']);
+			return; // NOTREACHED
+	
+	
 		}
-		else {
 	
-			/**
-			 * Other photos
-			 */
 	
-			/* Check for a cookie to indicate display pixel density, in order to detect high-resolution
-			   displays. This procedure was derived from the "Retina Images" by Jeremey Worboys,
-			   used in accordance with the Creative Commons Attribution 3.0 Unported License.
-			   Project link: https://github.com/Retina-Images/Retina-Images
-			   License link: http://creativecommons.org/licenses/by/3.0/
-			*/
+		/**
+		 * default post action - upload a photo
+		 */
+	
+		$channel  = \App::$data['channel'];
+		$observer = \App::$data['observer'];
+	
+		$_REQUEST['source'] = 'photos';
+		require_once('include/attach.php');
+	
+		if(! local_channel()) {
+			$_REQUEST['contact_allow'] = expand_acl($channel['channel_allow_cid']);
+			$_REQUEST['group_allow']   = expand_acl($channel['channel_allow_gid']);
+			$_REQUEST['contact_deny']  = expand_acl($channel['channel_deny_cid']);
+			$_REQUEST['group_deny']    = expand_acl($channel['channel_deny_gid']);
+		}
+	
+
+		$matches = [];
+		$partial = false;
+
 
-			// @FIXME It seems this part doesn't work because we are not setting such cookie
-			$cookie_value = false;
-			if (isset($_COOKIE['devicePixelRatio'])) {
-			  $cookie_value = intval($_COOKIE['devicePixelRatio']);
+
+		if(array_key_exists('HTTP_CONTENT_RANGE',$_SERVER)) {
+			$pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/',$_SERVER['HTTP_CONTENT_RANGE'],$matches);
+			if($pm) {
+				logger('Content-Range: ' . print_r($matches,true));
+				$partial = true;
+			}
+		}
+
+		if($partial) {
+			$x = save_chunk($channel,$matches[1],$matches[2],$matches[3]);
+
+			if($x['partial']) {
+				header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0));
+				json_return_and_die($result);
 			}
 			else {
-			  // Force revalidation of cache on next request
-			  // $prvcachecontrol = 'no-cache';
-			  $status = 'no cookie';
+				header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0));
+
+				$_FILES['userfile'] = [
+					'name'     => $x['name'],
+					'type'     => $x['type'],
+					'tmp_name' => $x['tmp_name'],
+					'error'    => $x['error'],
+					'size'     => $x['size']
+				];
+			}
+		}
+		else {	
+			if(! array_key_exists('userfile',$_FILES)) {
+				$_FILES['userfile'] = [
+					'name'     => $_FILES['files']['name'],
+					'type'     => $_FILES['files']['type'],
+					'tmp_name' => $_FILES['files']['tmp_name'],
+					'error'    => $_FILES['files']['error'],
+					'size'     => $_FILES['files']['size']
+				];
 			}
+		}
+
+		$r = attach_store($channel,get_observer_hash(), '', $_REQUEST);
 	
-			$resolution = 0;
+		if(! $r['success']) {
+			notice($r['message'] . EOL);
+			goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address']);
+		}		
+
+		goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . $r['data']['folder']);
 	
-			if(strpos($photo,'.') !== false)
-				$photo = substr($photo,0,strpos($photo,'.'));
-		
-			if(substr($photo,-2,1) == '-') {
-				$resolution = intval(substr($photo,-1,1));
-				$photo = substr($photo,0,-2);
-				// If viewing on a high-res screen, attempt to serve a higher resolution image:
-				if ($resolution == 2 && ($cookie_value > 1))
-				    $resolution = 1;
-			}
+	}
+	
+	
+	
+	function get() {
+	
+		// URLs:
+		// photos/name
+		// photos/name/album/xxxxx (xxxxx is album name)
+		// photos/name/image/xxxxx
+	
+	
+		if(observer_prohibited()) {
+			notice( t('Public access denied.') . EOL);
+			return;
+		}
+	
+		$unsafe = ((array_key_exists('unsafe',$_REQUEST) && $_REQUEST['unsafe']) ? 1 : 0);
 			
-			$r = q("SELECT uid, photo_usage, display_path FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1",
-				dbesc($photo),
-				intval($resolution)
+		require_once('include/bbcode.php');
+		require_once('include/security.php');
+		require_once('include/conversation.php');
+	
+		if(! x(\App::$data,'channel')) {
+			notice( t('No photos selected') . EOL );
+			return;
+		}
+	
+		$ph = photo_factory('');
+		$phototypes = $ph->supportedTypes();
+	
+		$_SESSION['photo_return'] = \App::$cmd;
+	
+		//
+		// Parse arguments 
+		//
+	
+		$can_comment = perm_is_allowed(\App::$profile['profile_uid'],get_observer_hash(),'post_comments');
+	
+		if(argc() > 3) {
+			$datatype = argv(2);
+			$datum = argv(3);
+		} else {
+			if(argc() > 2) {
+				$datatype = argv(2);
+				$datum = '';
+			}
+			else
+				$datatype = 'summary';
+		}
+	
+		if(argc() > 4)
+			$cmd = argv(4);
+		else
+			$cmd = 'view';
+	
+		//
+		// Setup permissions structures
+		//
+	
+		$can_post       = false;
+		$visitor        = 0;
+	
+	
+		$owner_uid = \App::$data['channel']['channel_id'];
+		$owner_aid = \App::$data['channel']['channel_account_id'];
+	
+		$observer = \App::get_observer();
+	
+		$can_post = perm_is_allowed($owner_uid,$observer['xchan_hash'],'write_storage');
+		$can_view = perm_is_allowed($owner_uid,$observer['xchan_hash'],'view_storage');
+	
+		if(! $can_view) {
+			notice( t('Access to this item is restricted.') . EOL);
+			return;
+		}
+	
+		$sql_item = item_permissions_sql($owner_uid,get_observer_hash());
+		$sql_extra = permissions_sql($owner_uid,get_observer_hash(),'photo');
+		$sql_attach = permissions_sql($owner_uid,get_observer_hash(),'attach');
+
+		nav_set_selected('Photos');
+	
+		$o = '<script src="vendor/blueimp/jquery-file-upload/js/vendor/jquery.ui.widget.js"></script>
+			<script src="vendor/blueimp/jquery-file-upload/js/jquery.iframe-transport.js"></script>
+			<script src="vendor/blueimp/jquery-file-upload/js/jquery.fileupload.js"></script>';
+
+
+		$o .= "<script> var profile_uid = " . \App::$profile['profile_uid'] 
+			. "; var netargs = '?f='; var profile_page = " . \App::$pager['page'] . "; </script>\r\n";
+	
+		$_is_owner = (local_channel() && (local_channel() == $owner_uid));
+	
+		/**
+		 * Display upload form
+		 */
+	
+		if( $can_post) {
+	
+			$uploader = '';
+	
+			$ret = array('post_url' => z_root() . '/photos/' . \App::$data['channel']['channel_address'],
+					'addon_text' => $uploader,
+					'default_upload' => true);
+	
+			call_hooks('photo_upload_form',$ret);
+	
+			/* Show space usage */
+	
+			$r = q("select sum(filesize) as total from photo where aid = %d and imgscale = 0 ",
+				intval(\App::$data['channel']['channel_account_id'])
 			);
-			if($r) {
-				$allowed = (-1);
-
-				$u = intval($r[0]['photo_usage']);
-				if($u) {
-					$allowed = 1;
-					if($u === PHOTO_COVER) 
-						if($resolution < PHOTO_RES_COVER_1200)
-							$allowed = (-1);
-					if($u === PHOTO_PROFILE)
-						if(! in_array($resolution,[4,5,6]))
-							$allowed = (-1);
-					if($u === PHOTO_CACHE) {
-						// Validate cache
-						$cache = array(
-							'resid' => $photo,
-							'uid' => $r[0]['uid'],
-							'status' => false
-						);
-						if($cache_mode['on'])
-							call_hooks('cache_url_hook', $cache);
-						if(! $cache['status']) {
-							$url = htmlspecialchars_decode($r[0]['display_path']);
-							call_hooks('cache_sslify_hook', $url);
-							header("Location: " . $url);
-							killme();
-						}
-					}
-				}
+	
+	
+			$limit = engr_units_to_bytes(service_class_fetch(\App::$data['channel']['channel_id'],'photo_upload_limit'));
+			if($limit !== false) {
+				$usage_message = sprintf( t("%1$.2f MB of %2$.2f MB photo storage used."), $r[0]['total'] / 1024000, $limit / 1024000 );
+			}
+			else {
+				$usage_message = sprintf( t('%1$.2f MB photo storage used.'), $r[0]['total'] / 1024000 );
+	 		}
+	
+			if($_is_owner) {
+				$channel = \App::get_channel();
+	
+				$acl = new \Zotlabs\Access\AccessList($channel);
+				$channel_acl = $acl->get();
+	
+				$lockstate = (($acl->is_private()) ? 'lock' : 'unlock');
+			}
+	
+			$aclselect = (($_is_owner) ? populate_acl($channel_acl,false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_storage')) : '');
+	
+			// this is wrong but is to work around an issue with js_upload wherein it chokes if these variables
+			// don't exist. They really should be set to a parseable representation of the channel's default permissions 
+			// which can be processed by getSelected() 
+	
+			if(! $aclselect) {
+				$aclselect = '<input id="group_allow" type="hidden" name="allow_gid[]" value="" /><input id="contact_allow" type="hidden" name="allow_cid[]" value="" /><input id="group_deny" type="hidden" name="deny_gid[]" value="" /><input id="contact_deny" type="hidden" name="deny_cid[]" value="" />';
+			}
 
-				if($allowed === (-1))
-					$allowed = attach_can_view($r[0]['uid'],$observer_xchan,$photo);
+			$selname = '';
 
-				$channel = channelx_by_n($r[0]['uid']);
+			if($datum) {
+				$h = attach_by_hash_nodata($datum,get_observer_hash());
+				$selname = $h['data']['display_path'];
+			}	
 
-				// Now we'll see if we can access the photo
-				$e = q("SELECT * FROM photo WHERE resource_id = '%s' AND imgscale = %d $sql_extra LIMIT 1",
-					dbesc($photo),
-					intval($resolution)
-				);
-				
-				$exists = (($e) ? true : false);
-			
-				if($exists && $allowed) {
-					$expires = strtotime($e[0]['expires'] . 'Z');
-					$data = dbunescbin($e[0]['content']);
-					$filesize = $e[0]['filesize'];
-					$mimetype = $e[0]['mimetype'];
-					$modified = strtotime($e[0]['edited'] . 'Z');
-
-					if(intval($e[0]['os_storage'])) {
-						$streaming = $data;
-					}
-					if($e[0]['allow_cid'] != '' || $e[0]['allow_gid'] != '' || $e[0]['deny_gid'] != '' || $e[0]['deny_gid'] != '')
-						$prvcachecontrol = 'no-store, no-cache, must-revalidate';
+	
+			$albums = ((array_key_exists('albums', \App::$data)) ? \App::$data['albums'] : photos_albums_list(\App::$data['channel'],\App::$data['observer']));
+	
+			if(! $selname) {
+				$def_album = get_pconfig(\App::$data['channel']['channel_id'],'system','photo_path');
+				if($def_album) {
+					$selname = filepath_macro($def_album);
+					$albums['album'][] = array('text' => $selname);
 				}
-				else {
-					if(! $allowed) {
-						http_status_exit(403,'forbidden');
-					}
-					if(! $exists) {
-						http_status_exit(404,'not found');
-					}
+			}
+	
+			$tpl = get_markup_template('photos_upload.tpl');
+			$upload_form = replace_macros($tpl,array(
+				'$pagename' => t('Upload Photos'),
+				'$sessid' => session_id(),
+				'$usage' => $usage_message,
+				'$nickname' => \App::$data['channel']['channel_address'],
+				'$newalbum_label' => t('Enter an album name'),
+				'$newalbum_placeholder' => t('or select an existing album (doubleclick)'),
+				'$visible' => array('visible', t('Create a status post for this upload'), 0,'', array(t('No'), t('Yes')), 'onclick="showHideBodyTextarea();"'),
+				'$caption' => array('description', t('Title (optional)')),
+				'$body' => array('body', t('Description (optional)'),'', 'Description will only appear in the status post'),
+				'$albums' => $albums['albums'],
+				'$selname' => $selname,
+				'$permissions' => t('Permissions'),
+				'$aclselect' => $aclselect,
+				'$allow_cid' => acl2json($channel_acl['allow_cid']),
+				'$allow_gid' => acl2json($channel_acl['allow_gid']),
+				'$deny_cid' => acl2json($channel_acl['deny_cid']),
+				'$deny_gid' => acl2json($channel_acl['deny_gid']),
+				'$lockstate' => $lockstate,
+				'$uploader' => $ret['addon_text'],
+				'$default' => (($ret['default_upload']) ? true : false),
+				'$uploadurl' => $ret['post_url'],
+				'$submit' => t('Upload')
+	
+			));
+	
+		}
+	
+		//
+		// dispatch request
+		//
+	
+		/*
+		 * Display a single photo album
+		 */
+	
+		if($datatype === 'album') {
 
-				}
+			head_add_link([ 
+				'rel'   => 'alternate',
+				'type'  => 'application/json+oembed',
+				'href'  => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$query_string),
+				'title' => 'oembed'
+			]);
+
+			if($x = photos_album_exists($owner_uid, get_observer_hash(), $datum)) {
+				\App::set_pager_itemspage(60);
+				$album = $x['display_path'];
 			} 
+			else {
+				goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address']);
+			}
+
+			if($_GET['order'] === 'posted')
+				$order = 'ASC';
 			else
-				http_status_exit(404,'not found');
-		}
+				$order = 'DESC';
 
-		header_remove('Pragma');
+			$r = q("SELECT p.resource_id, p.id, p.filename, p.mimetype, p.imgscale, p.description, p.created FROM photo p INNER JOIN
+					(SELECT resource_id, max(imgscale) imgscale FROM photo left join attach on folder = '%s' and photo.resource_id = attach.hash WHERE attach.uid = %d AND imgscale <= 4 AND photo_usage IN ( %d, %d ) and is_nsfw = %d $sql_extra GROUP BY resource_id) ph 
+					ON (p.resource_id = ph.resource_id AND p.imgscale = ph.imgscale)
+				ORDER BY created $order LIMIT %d OFFSET %d",
+				dbesc($x['hash']),
+				intval($owner_uid),
+				intval(PHOTO_NORMAL),
+				intval(PHOTO_PROFILE),
+				intval($unsafe),
+				intval(\App::$pager['itemspage']),
+				intval(\App::$pager['start'])
+			);
 
-        if($ismodified === gmdate("D, d M Y H:i:s", $modified) . " GMT") {
-			header_remove('Expires');
-			header_remove('Cache-Control');
-			header_remove('Set-Cookie');
-			http_status_exit(304,'not modified');
-        }
+			// edit album name
+			$album_edit = null;
 
-		if(! isset($data)) {
-			if(isset($resolution)) {
-				switch($resolution) {
-					case 4:
-						$default = get_default_profile_photo();
-						break;
-					case 5:
-						$default = get_default_profile_photo(80);
-						break;
-					case 6:
-						$default = get_default_profile_photo(48);
-						break;
-					default:
-						killme();
-						// NOTREACHED
-						break;
+			if($can_post) {
+				$album_e = $album;
+				$albums = ((array_key_exists('albums', \App::$data)) ? \App::$data['albums'] : photos_albums_list(\App::$data['channel'],\App::$data['observer']));
+	
+				// @fixme - syncronise actions with DAV
+		
+	//				$edit_tpl = get_markup_template('album_edit.tpl');
+	//				$album_edit = replace_macros($edit_tpl,array(
+	//					'$nametext' => t('Enter a new album name'),
+	//					'$name_placeholder' => t('or select an existing one (doubleclick)'),
+	//					'$nickname' => \App::$data['channel']['channel_address'],
+	//					'$album' => $album_e,
+	//					'$albums' => $albums['albums'],
+	//					'$hexalbum' => bin2hex($album),
+	//					'$submit' => t('Submit'),
+	//					'$dropsubmit' => t('Delete Album')
+	//				));
+	
+			}
+	
+			if($_GET['order'] === 'posted')
+				$order =  array(t('Show Newest First'), z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . $datum);
+			else
+				$order = array(t('Show Oldest First'), z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . $datum . '?f=&order=posted');
+	
+			$photos = array();
+			if(count($r)) {
+				$twist = 'rotright';
+				foreach($r as $rr) {
+	
+					if($twist == 'rotright')
+						$twist = 'rotleft';
+					else
+						$twist = 'rotright';
+					
+					$ext = $phototypes[$rr['mimetype']];
+	
+					$imgalt_e = $rr['filename'];
+					$desc_e = $rr['description'];
+	
+					$imagelink = (z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/image/' . $rr['resource_id']
+					. (($_GET['order'] === 'posted') ? '?f=&order=posted' : ''));
+	
+					$photos[] = array(
+						'id' => $rr['id'],
+						'twist' => ' ' . $twist . rand(2,4),
+						'link' => $imagelink,
+						'title' => t('View Photo'),
+						'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['imgscale'] . '.' .$ext,
+						'alt' => $imgalt_e,
+						'desc'=> $desc_e,
+						'ext' => $ext,
+						'hash'=> $rr['resource_id'],
+						'unknown' => t('Unknown')
+					);
 				}
-				$x = z_fetch_url(z_root() . '/' . $default,true,0,[ 'novalidate' => true ]);
-				$data = ($x['success'] ? $x['body'] : EMPTY_STR);
-				$mimetype = 'image/png';
 			}
-		}
 	
-		if(isset($res) && intval($res) && $res < 500) {
-			$ph = photo_factory($data, $mimetype);
-			if($ph->is_valid()) {
-				$ph->scaleImageSquare($res);
-				$data = $ph->imageString();
-				$mimetype = $ph->getType();
+			if($_REQUEST['aj']) {
+				if($photos) {
+					$o = replace_macros(get_markup_template('photosajax.tpl'),array(
+						'$photos' => $photos,
+						'$album_id' => $datum
+					));
+				}
+				else {
+					$o = '<div id="content-complete"></div>';
+				}
+				echo $o;
+				killme();
 			}
-		}
+			else {
+				$o .= "<script> var page_query = '" . escape_tags($_GET['q']) . "'; var extra_args = '" . extra_query_args() . "' ; </script>";
+				$tpl = get_markup_template('photo_album.tpl');
+				$o .= replace_macros($tpl, array(
+					'$photos' => $photos,
+					'$album' => $album,
+					'$album_id' => $datum,
+					'$album_edit' => array(t('Edit Album'), $album_edit),
+					'$can_post' => $can_post,
+					'$upload' => array(t('Add Photos'), z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/upload/' . $datum),
+					'$order' => $order,
+					'$upload_form' => $upload_form,
+					'$usage' => $usage_message
+				));
+	
+			}
+	
+			if((! $photos) && ($_REQUEST['aj'])) {
+				$o .= '<div id="content-complete"></div>';
+				echo $o;
+				killme();
+			}
+	
+			return $o;
+	
+		}	
+	
+		/** 
+		 * Display one photo
+		 */
+	
+		if($datatype === 'image') {
+	
+			\App::$page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$cmd) . '" title="oembed" />' . "\r\n";
+	
+			$x = q("select folder from attach where hash = '%s' and uid = %d $sql_attach limit 1",
+				dbesc($datum),
+				intval($owner_uid)
+			);
 
-		if(isset($prvcachecontrol)) {
+			// fetch image, item containing image, then comments
 	
-			// it is a private photo that they have no permission to view.
-			// tell the browser not to cache it, in case they authenticate
-			// and subsequently have permission to see it
+			$ph = q("SELECT id,aid,uid,xchan,resource_id,created,edited,title,description,album,filename,mimetype,height,width,filesize,imgscale,photo_usage,is_nsfw,allow_cid,allow_gid,deny_cid,deny_gid FROM photo WHERE uid = %d AND resource_id = '%s' 
+				$sql_extra ORDER BY imgscale ASC ",
+				intval($owner_uid),
+				dbesc($datum)
+			);
 	
-			header("Cache-Control: " . $prvcachecontrol);
+			if(! ($ph && $x)) {
 	
-		}
-		else {
-			// The photo cache default is 1 day to provide a privacy trade-off,
-			// as somebody reducing photo permissions on a photo that is already 
-			// "in the wild" won't be able to stop the photo from being viewed
-			// for this amount amount of time once it is in the browser cache.
-			// The privacy expectations of your site members and their perception 
-			// of privacy where it affects the entire project may be affected.
-			// This has performance considerations but we highly recommend you 
-			// leave it alone. 
-	
-			$maxage = $cache_mode['age'];
-
-			if($cache_mode['exp'] || (! isset($expires)) || (isset($expires) && $expires - 60 < time()))
-				$expires = time() + $maxage;
+				/* Check again - this time without specifying permissions */
+	
+				$ph = q("SELECT id FROM photo WHERE uid = %d AND resource_id = '%s' LIMIT 1",
+					intval($owner_uid),
+					dbesc($datum)
+				);
+				if($ph) 
+					notice( t('Permission denied. Access to this item may be restricted.') . EOL);
+				else
+					notice( t('Photo not available') . EOL );
+				return;
+			}
+	
+	
+	
+			$prevlink = '';
+			$nextlink = '';
+	
+			if($_GET['order'] === 'posted')
+				$order = 'ASC';
 			else
-				$maxage = $expires - time();
+				$order = 'DESC';
+	
+
+			$prvnxt = q("SELECT hash FROM attach WHERE folder = '%s' AND uid = %d AND is_photo = 1
+				$sql_attach ORDER BY created $order ",
+				dbesc($x[0]['folder']),
+				intval($owner_uid)
+			); 
+
+			if(count($prvnxt)) {
+				for($z = 0; $z < count($prvnxt); $z++) {
+					if($prvnxt[$z]['hash'] == $ph[0]['resource_id']) {
+						$prv = $z - 1;
+						$nxt = $z + 1;
+						if($prv < 0)
+							$prv = count($prvnxt) - 1;
+						if($nxt >= count($prvnxt))
+							$nxt = 0;
+						break;
+					}
+				}
+	
+				$prevlink = z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/image/' . $prvnxt[$prv]['hash'] . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '');
+				$nextlink = z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/image/' . $prvnxt[$nxt]['hash'] . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '');
+	 		}
+	
+	
+			if(count($ph) == 1)
+				$hires = $lores = $ph[0];
+			if(count($ph) > 1) {
+				if($ph[1]['imgscale'] == 2) {
+					// original is 640 or less, we can display it directly
+					$hires = $lores = $ph[0];
+				}
+				else {
+				$hires = $ph[0];
+				$lores = $ph[1];
+				}
+			}
+	
+			$album_link = z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . $x[0]['folder'];
+	 		$tools = Null;
+	 		$lock = Null;
+	 
+			if($can_post && ($ph[0]['uid'] == $owner_uid)) {
+				$tools = array(
+					'profile'=>array(z_root() . '/profile_photo/use/'.$ph[0]['resource_id'], t('Use as profile photo')),
+					'cover'=>array(z_root() . '/cover_photo/use/'.$ph[0]['resource_id'], t('Use as cover photo')),
+				);
+			}
+	
+			// lockstate
+			$lockstate = ( ( (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid'])
+					|| strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) )
+					? array('lock', t('Private Photo'))
+					: array('unlock', Null));
+	
+			\App::$page['htmlhead'] .= '<script>$(document).keydown(function(event) {' . "\n";
+			if($prevlink)
+				\App::$page['htmlhead'] .= 'if(event.ctrlKey && event.keyCode == 37) { event.preventDefault(); window.location.href = \'' . $prevlink . '\'; }' . "\n";
+			if($nextlink)
+				\App::$page['htmlhead'] .= 'if(event.ctrlKey && event.keyCode == 39) { event.preventDefault(); window.location.href = \'' . $nextlink . '\'; }' . "\n";
+			\App::$page['htmlhead'] .= '});</script>';
+	
+			if($prevlink)
+				$prevlink = array($prevlink, t('Previous'));
+	
+			$photo = array(
+				'href' => z_root() . '/photo/' . $hires['resource_id'] . '-' . $hires['imgscale'] . '.' . $phototypes[$hires['mimetype']],
+				'title'=> t('View Full Size'),
+				'src'  => z_root() . '/photo/' . $lores['resource_id'] . '-' . $lores['imgscale'] . '.' . $phototypes[$lores['mimetype']] . '?f=&_u=' . datetime_convert('','','','ymdhis')
+			);
+	
+			if($nextlink)
+				$nextlink = array($nextlink, t('Next'));
+	
+	
+			// Do we have an item for this photo?
+	
+			$linked_items = q("SELECT * FROM item WHERE resource_id = '%s' and resource_type = 'photo' 
+				$sql_item LIMIT 1",
+				dbesc($datum)
+			);
+	
+			$map = null;
+	
+			if($linked_items) {
+	
+				xchan_query($linked_items);
+				$linked_items = fetch_post_tags($linked_items,true);
+	
+				$link_item = $linked_items[0];
+				$item_normal = item_normal();
+	
+				$r = q("select * from item where parent_mid = '%s' 
+					$item_normal and uid = %d $sql_item ",
+					dbesc($link_item['mid']),
+					intval($link_item['uid'])
+	
+				);
+	
+				if($r) {
+					xchan_query($r);
+					$r = fetch_post_tags($r,true);
+					$r = conv_sort($r,'commented');
+				}
+	
+				$tags = array();
+				if($link_item['term']) {
+					$cnt = 0;
+					foreach($link_item['term'] as $t) {
+						$tags[$cnt] = array(0 => format_term_for_display($t));
+						if($can_post && ($ph[0]['uid'] == $owner_uid)) {
+							$tags[$cnt][1] = 'tagrm/drop/' . $link_item['id'] . '/' . bin2hex($t['term']);   //?f=&item=' . $link_item['id'];
+							$tags[$cnt][2] = t('Remove');
+						}
+						$cnt ++;
+					}
+				}
+	
+				if((local_channel()) && (local_channel() == $link_item['uid'])) {
+					q("UPDATE item SET item_unseen = 0 WHERE parent = %d and uid = %d and item_unseen = 1",
+						intval($link_item['parent']),
+						intval(local_channel())
+					);
+				}
+	
+				if($link_item['coord']) {
+					$map = generate_map($link_item['coord']);
+				}
+			}
+	
+	//		logger('mod_photo: link_item' . print_r($link_item,true));
+	
+			// FIXME - remove this when we move to conversation module 
+	
+			$r = $r[0]['children'];
+
+			$edit = null;
+			if($can_post) {
+
+				$album_e = $ph[0]['album'];
+				$caption_e = $ph[0]['description'];
+				$aclselect_e = (($_is_owner) ? populate_acl($ph[0], true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_storage')) : '');
+				$albums = ((array_key_exists('albums', \App::$data)) ? \App::$data['albums'] : photos_albums_list(\App::$data['channel'],\App::$data['observer']));
+	
+				$_SESSION['album_return'] = bin2hex($ph[0]['album']);
+
+				$folder_list = attach_folder_select_list($ph[0]['uid']);
+	
+				$edit = [
+					'edit' => t('Edit photo'),
+					'id' => $link_item['id'],
+					'rotatecw'             => t('Rotate CW (right)'),
+					'rotateccw'            => t('Rotate CCW (left)'),
+					'albums'               => $albums['albums'],
+					'album'                => $album_e,
+					'album_select'         => [ 'move_to_album', t('Move photo to album'), $x[0]['folder'], '', $folder_list ],
+					'newalbum_label'       => t('Enter a new album name'),
+					'newalbum_placeholder' => t('or select an existing one (doubleclick)'),
+					'nickname'             => \App::$data['channel']['channel_address'],
+					'resource_id'          => $ph[0]['resource_id'],
+					'capt_label'           => t('Title (optional)'),
+					'caption'              => $caption_e,
+					'tag_label'            => t('Add a Tag'),
+					'permissions'          => t('Permissions'),
+					'aclselect'            => $aclselect_e,
+					'allow_cid'            => acl2json($ph[0]['allow_cid']),
+					'allow_gid'            => acl2json($ph[0]['allow_gid']),
+					'deny_cid'             => acl2json($ph[0]['deny_cid']),
+					'deny_gid'             => acl2json($ph[0]['deny_gid']),
+					'lockstate'            => $lockstate[0],
+					'help_tags'            => t('Example: @bob, @Barbara_Jensen, @jim@example.com'),
+					'item_id'              => ((count($linked_items)) ? $link_item['id'] : 0),
+					'adult_enabled'        => feature_enabled($owner_uid,'adult_photo_flagging'),
+					'adult'                => array('adult',t('Flag as adult in album view'), intval($ph[0]['is_nsfw']),''),
+					'submit'               => t('Submit'),
+					'delete'               => t('Delete Photo')
+				];
+			}
+	
+			if(count($linked_items)) {
+	
+				$cmnt_tpl = get_markup_template('comment_item.tpl');
+				$tpl = get_markup_template('photo_item.tpl');
+				$return_url = \App::$cmd;
+	
+				$like_tpl = get_markup_template('like_noshare.tpl');
+	
+				$likebuttons = '';
+	
+				if($observer && ($can_post || $can_comment)) {
+					$likebuttons = [
+						'id'       => $link_item['id'],
+						'likethis' => t("I like this \x28toggle\x29"),
+						'nolike'   => t("I don't like this \x28toggle\x29"),
+						'share'    => t('Share'),
+						'wait'     => t('Please wait')
+					];
+				}
+	
+				$comments = '';
+				if(! $r) {
+					if($observer && ($can_post || $can_comment)) {
+						$feature_auto_save_draft = ((feature_enabled($owner_uid, 'auto_save_draft')) ? "true" : "false");
+						$commentbox = replace_macros($cmnt_tpl,array(
+							'$return_path' => '', 
+							'$mode' => 'photos',
+							'$jsreload' => $return_url,
+							'$type' => 'wall-comment',
+							'$id' => $link_item['id'],
+							'$parent' => $link_item['id'],
+							'$profile_uid' =>  $owner_uid,
+							'$mylink' => $observer['xchan_url'],
+							'$mytitle' => t('This is you'),
+							'$myphoto' => $observer['xchan_photo_s'],
+							'$comment' => t('Comment'),
+							'$submit' => t('Submit'),
+							'$preview' => t('Preview'),
+							'$ww' => '',
+							'$feature_encrypt' => false,
+							'$auto_save_draft' => $feature_auto_save_draft
+						));
+					}
+				}
+	
+				$alike = array();
+				$dlike = array();
+				
+				$like = '';
+				$dislike = '';
+	
+				$conv_responses = array(
+					'like' => array('title' => t('Likes','title')),'dislike' => array('title' => t('Dislikes','title')),
+					'agree' => array('title' => t('Agree','title')),'disagree' => array('title' => t('Disagree','title')), 'abstain' => array('title' => t('Abstain','title')), 
+					'attendyes' => array('title' => t('Attending','title')), 'attendno' => array('title' => t('Not attending','title')), 'attendmaybe' => array('title' => t('Might attend','title'))
+				);
+	
+	
+	
+	
+				if($r) {
+	
+					foreach($r as $item) {
+						builtin_activity_puller($item, $conv_responses);
+					}
+	
+					$like_count = ((x($alike,$link_item['mid'])) ? $alike[$link_item['mid']] : '');
+					$like_list = ((x($alike,$link_item['mid'])) ? $alike[$link_item['mid'] . '-l'] : '');
+
+					if(is_array($like_list) && (count($like_list) > MAX_LIKERS)) {
+						$like_list_part = array_slice($like_list, 0, MAX_LIKERS);
+						array_push($like_list_part, '<a href="#" data-toggle="modal" data-target="#likeModal-' . $this->get_id() . '"><b>' . t('View all') . '</b></a>');
+					} else {
+						$like_list_part = '';
+					}
+					$like_button_label = tt('Like','Likes',$like_count,'noun');
+	
+					//if (feature_enabled($conv->get_profile_owner(),'dislike')) {
+						$dislike_count = ((x($dlike,$link_item['mid'])) ? $dlike[$link_item['mid']] : '');
+						$dislike_list = ((x($dlike,$link_item['mid'])) ? $dlike[$link_item['mid'] . '-l'] : '');
+						$dislike_button_label = tt('Dislike','Dislikes',$dislike_count,'noun');
+						if (is_array($dislike_list) && (count($dislike_list) > MAX_LIKERS)) {
+							$dislike_list_part = array_slice($dislike_list, 0, MAX_LIKERS);
+							array_push($dislike_list_part, '<a href="#" data-toggle="modal" data-target="#dislikeModal-' . $this->get_id() . '"><b>' . t('View all') . '</b></a>');
+						} else {
+							$dislike_list_part = '';
+						}
+					//}
+	
+	
+					$like    = ((isset($alike[$link_item['mid']])) ? format_like($alike[$link_item['mid']],$alike[$link_item['mid'] . '-l'],'like',$link_item['mid']) : '');
+					$dislike = ((isset($dlike[$link_item['mid']])) ? format_like($dlike[$link_item['mid']],$dlike[$link_item['mid'] . '-l'],'dislike',$link_item['mid']) : '');
+	
+					// display comments
+	
+					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 = z_root() . '/redir/' . $item['cid'] ;
+				
+	
+						$profile_url = zid($item['author']['xchan_url']);
+						$sparkle = '';
+	
+	
+						$profile_name   = $item['author']['xchan_name'];
+						$profile_avatar = $item['author']['xchan_photo_m'];
+	
+						$profile_link = $profile_url;
+	
+						$drop = '';
+	
+						if($observer['xchan_hash'] === $item['author_xchan'] || $observer['xchan_hash'] === $item['owner_xchan'])
+							$drop = replace_macros(get_markup_template('photo_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
+	
+	
+						$name_e = $profile_name;
+						$title_e = $item['title'];
+						unobscure($item);
+						$body_e = prepare_text($item['body'],$item['mimetype']);
+	
+						$comments .= replace_macros($template,array(
+							'$id' => $item['id'],
+							'$mode' => 'photos',
+							'$profile_url' => $profile_link,
+							'$name' => $name_e,
+							'$thumb' => $profile_avatar,
+							'$sparkle' => $sparkle,
+							'$title' => $title_e,
+							'$body' => $body_e,
+							'$ago' => relative_date($item['created']),
+							'$indent' => (($item['parent'] != $item['id']) ? ' comment' : ''),
+							'$drop' => $drop,
+							'$comment' => $comment
+						));
+	
+					}
+				
+					if($observer && ($can_post || $can_comment)) {
+						$commentbox = replace_macros($cmnt_tpl,array(
+							'$return_path' => '',
+							'$jsreload' => $return_url,
+							'$type' => 'wall-comment',
+							'$id' => $link_item['id'],
+							'$parent' => $link_item['id'],
+							'$profile_uid' =>  $owner_uid,
+							'$mylink' => $observer['xchan_url'],
+							'$mytitle' => t('This is you'),
+							'$myphoto' => $observer['xchan_photo_s'],
+							'$comment' => t('Comment'),
+							'$submit' => t('Submit'),
+							'$ww' => ''
+						));
+					}
+	
+				}
+				$paginate = paginate($a);
+			}
 			
-		 	header("Expires: " . gmdate("D, d M Y H:i:s", $expires) . " GMT");
-			header("Cache-Control: max-age=" . $maxage);
+			$album_e = array($album_link,$ph[0]['album']);
+			$like_e = $like;
+			$dislike_e = $dislike;
 	
+	
+			$response_verbs = array('like');
+			if(feature_enabled($owner_uid,'dislike'))
+				$response_verbs[] = 'dislike';
+	
+			$responses = get_responses($conv_responses,$response_verbs,'',$link_item);
+
+			$hookdata = [
+				'onclick' => '$.colorbox({href: \'' . $photo['href'] . '\'}); return false;',
+				'raw_photo' => $ph[0],
+				'nickname' => \App::$data['channel']['channel_address']
+			];
+			call_hooks('photo_view_filter', $hookdata);
+	
+			$photo_tpl = get_markup_template('photo_view.tpl');
+			$o .= replace_macros($photo_tpl, array(
+				'$id' => $ph[0]['id'],
+				'$album' => $album_e,
+				'$tools_label' => t('Photo Tools'),
+				'$tools' => $tools,
+				'$lock' => $lockstate[1],
+				'$photo' => $photo,
+				'$prevlink' => $prevlink,
+				'$nextlink' => $nextlink,
+				'$desc' => $ph[0]['description'],
+				'$filename' => $ph[0]['filename'],
+				'$unknown' => t('Unknown'),
+				'$tag_hdr' => t('In This Photo:'),
+				'$tags' => $tags,
+				'responses' => $responses,
+				'$edit' => $edit,	
+				'$map' => $map,
+				'$map_text' => t('Map'),
+				'$likebuttons' => $likebuttons,
+				'$like' => $like_e,
+				'$dislike' => $dislike_e,
+				'$like_count' => $like_count,
+				'$like_list' => $like_list,
+				'$like_list_part' => $like_list_part,
+				'$like_button_label' => $like_button_label,
+				'$like_modal_title' => t('Likes','noun'),
+				'$dislike_modal_title' => t('Dislikes','noun'),
+				'$dislike_count' => $dislike_count,  //((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_count : ''),
+				'$dislike_list' => $dislike_list, //((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_list : ''),
+				'$dislike_list_part' => $dislike_list_part, //((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_list_part : ''),
+				'$dislike_button_label' => $dislike_button_label, //((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_button_label : ''),
+				'$modal_dismiss' => t('Close'),
+				'$comments' => $comments,
+				'$commentbox' => $commentbox,
+				'$paginate' => $paginate,
+				'$onclick' => $hookdata['onclick']
+			));
+	
+			\App::$data['photo_html'] = $o;
+			
+			return $o;
 		}
+	
+		// Default - show recent photos with upload link (if applicable)
+		//$o = '';
+	
+		\App::$page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$cmd) . '" title="oembed" />' . "\r\n";
+	
+
+		\App::set_pager_itemspage(60);
+		
+		$r = q("SELECT p.resource_id, p.id, p.filename, p.mimetype, p.album, p.imgscale, p.created, p.display_path 
+			FROM photo p 
+			INNER JOIN ( SELECT resource_id, max(imgscale) imgscale FROM photo 
+				WHERE photo.uid = %d AND photo_usage IN ( %d, %d ) 
+				AND is_nsfw = %d $sql_extra group by resource_id ) ph 
+			ON (p.resource_id = ph.resource_id and p.imgscale = ph.imgscale) 
+			ORDER by p.created DESC LIMIT %d OFFSET %d",
+			intval(\App::$data['channel']['channel_id']),
+			intval(PHOTO_NORMAL),
+			intval(PHOTO_PROFILE),
+			intval($unsafe),
+			intval(\App::$pager['itemspage']),
+			intval(\App::$pager['start'])
+		);
+	
+	
+	
+		$photos = array();
+		if($r) {
+			$twist = 'rotright';
+			foreach($r as $rr) {
 
-		header("Content-type: " . $mimetype);
-		header("Last-Modified: " . gmdate("D, d M Y H:i:s", $modified) . " GMT");
-		header("Content-Length: " . (isset($filesize) ? $filesize : strlen($data)));
+				if(! attach_can_view_folder(\App::$data['channel']['channel_id'],get_observer_hash(),$rr['resource_id']))
+					continue;
 
-		// If it's a file resource, stream it. 
-		if($streaming && $channel) {
-			if(strpos($streaming,'store') !== false)
-				$istream = fopen($streaming,'rb');
-			else
-				$istream = fopen('store/' . $channel['channel_address'] . '/' . $streaming,'rb');
-			$ostream = fopen('php://output','wb');
-			if($istream && $ostream) {
-				pipe_streams($istream,$ostream);
-				fclose($istream);
-				fclose($ostream);
+				if($twist == 'rotright')
+					$twist = 'rotleft';
+				else
+					$twist = 'rotright';
+				$ext = $phototypes[$rr['mimetype']];
+				
+				$alt_e = $rr['filename'];
+				$name_e = dirname($rr['display_path']);
+
+				$photos[] = array(
+					'id'       => $rr['id'],
+					'twist'    => ' ' . $twist . rand(2,4),
+					'link'  	=> z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/image/' . $rr['resource_id'],
+					'title' 	=> t('View Photo'),
+					'src'     	=> z_root() . '/photo/' . $rr['resource_id'] . '-' . ((($rr['imgscale']) == 6) ? 4 : $rr['imgscale']) . '.' . $ext,
+					'alt'     	=> $alt_e,
+					'album'	=> array(
+						'name'  => $name_e,
+					),
+					
+				);
+			}
+		}
+		
+		if($_REQUEST['aj']) {
+			if($photos) {
+				$o = replace_macros(get_markup_template('photosajax.tpl'),array(
+					'$photos' => $photos,
+					'$album_id' => bin2hex(t('Recent Photos'))
+				));
+			}
+			else {
+				$o = '<div id="content-complete"></div>';
 			}
+			echo $o;
+			killme();
 		}
 		else {
-			echo $data;
+			$o .= "<script> var page_query = '" . escape_tags($_GET['q']) . "'; var extra_args = '" . extra_query_args() . "' ; </script>";
+			$tpl = get_markup_template('photos_recent.tpl'); 
+			$o .= replace_macros($tpl, array(
+				'$title' => t('Recent Photos'),
+				'$album_id' => bin2hex(t('Recent Photos')),
+				'$can_post' => $can_post,
+				'$upload' => array(t('Add Photos'), z_root().'/photos/'.\App::$data['channel']['channel_address'].'/upload'),
+				'$photos' => $photos,
+				'$upload_form' => $upload_form,
+				'$usage' => $usage_message
+			));
+	
 		}
-
-		killme();
+	
+		if((! $photos) && ($_REQUEST['aj'])) {
+			$o .= '<div id="content-complete"></div>';
+			echo $o;
+			killme();
+		}
+	
+	//	paginate($a);
+		return $o;
 	}
 	
+	
 }