fix wrong variable

1 files changed, 303 insertions, 303 deletions

diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php
index fa9216c97..e79a640c3 100644
--- a/Zotlabs/Module/Photos.php
+++ b/Zotlabs/Module/Photos.php
@@ -16,66 +16,66 @@ require_once('include/text.php');
 class Photos extends \Zotlabs\Web\Controller {
 
 	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);
@@ -83,30 +83,30 @@ class Photos extends \Zotlabs\Web\Controller {
 				killme();
 			return;
 		}
-	
-		$owner_record = $s[0];	
-	
+
+		$owner_record = $s[0];
+
 		$acl = new \Zotlabs\Access\AccessList(\App::$data['channel']);
-	
+
 		if((argc() > 3) && (argv(2) === 'album')) {
-	
+
 			$album = argv(3);
 
 			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')) {
-	
-		
+
+
 				$folder_hash = '';
-	 
+
 				$r = q("select * from attach where is_dir = 1 and uid = %d and hash = '%s'",
 					intval($page_owner_uid),
 					dbesc($album)
@@ -116,13 +116,13 @@ class Photos extends \Zotlabs\Web\Controller {
 					return;
 				}
 				$folder_hash = $r[0]['hash'];
-	
-	
+
+
 				$res = array();
 				$admin_delete = false;
 
 				// get the list of photos we are about to delete
-	
+
 				if(remote_channel() && (! local_channel())) {
 					$str = photos_album_get_db_idstr($page_owner_uid,$album,remote_channel());
 				}
@@ -139,7 +139,7 @@ class Photos extends \Zotlabs\Web\Controller {
 				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)
 				);
@@ -148,34 +148,34 @@ class Photos extends \Zotlabs\Web\Controller {
 						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) {	
+					if(! $admin_delete) {
 						$sync = attach_export_data(\App::$data['channel'],$folder_hash, true);
-	
-						if($sync) 
+
+						if($sync)
 							Libsync::build_sync_packet($page_owner_uid,array('file' => array($sync)));
 					}
 				}
-	
+
 			}
-			
+
 			goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address']);
 		}
-	
+
 		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']);
@@ -185,18 +185,18 @@ class Photos extends \Zotlabs\Web\Controller {
 				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) 
+
+				if($sync)
 					Libsync::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);
-			}	
+			}
 
 
 			goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . $_SESSION['album_return']);
@@ -208,10 +208,10 @@ class Photos extends \Zotlabs\Web\Controller {
 				intval($page_owner_uid)
 			);
 			if(($m) && ($m[0]['folder'] != $_POST['move_to_album'])) {
-				attach_move($page_owner_uid,argv(2),$_POST['move_to_album']);			
+				attach_move($page_owner_uid,argv(2),$_POST['move_to_album']);
 
 				$sync = attach_export_data(\App::$data['channel'], argv(2), false);
-				if($sync) 
+				if($sync)
 					Libsync::build_sync_packet($page_owner_uid,array('file' => array($sync)));
 
 				if(! ($_POST['desc'] && $_POST['newtag']))
@@ -220,28 +220,28 @@ class Photos extends \Zotlabs\Web\Controller {
 		}
 
 		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) && 
+
+			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)) {
-					
+
 					$ph = photo_factory(@file_get_contents(dbunescbin($r[0]['content'])), $r[0]['mimetype']);
 					if($ph->is_valid()) {
 						$rotate_deg = ( (intval($_POST['rotate']) == 1) ? 270 : 90 );
@@ -255,12 +255,12 @@ class Photos extends \Zotlabs\Web\Controller {
 							dbesc($resource_id),
 							intval($page_owner_uid)
 						);
-						
+
 						$ph->saveImage(dbunescbin($r[0]['content']));
-						
-						$arr = [ 
+
+						$arr = [
 							'aid'          => get_account_id(),
-							'uid'          => intval($page_owner_uid), 
+							'uid'          => intval($page_owner_uid),
 							'resource_id'  => dbesc($resource_id),
 							'filename'     => $r[0]['filename'],
 							'imgscale'	   => 0,
@@ -277,28 +277,28 @@ class Photos extends \Zotlabs\Web\Controller {
 
 						unset($arr['os_syspath']);
 
-						if($width > 1024 || $height > 1024) 
+						if($width > 1024 || $height > 1024)
 							$ph->scaleImage(1024);
 						$ph->storeThumbnail($arr, PHOTO_RES_1024);
 
-						if($width > 640 || $height > 640) 
+						if($width > 640 || $height > 640)
 							$ph->scaleImage(640);
 						$ph->storeThumbnail($arr, PHOTO_RES_640);
 
-						if($width > 320 || $height > 320) 
+						if($width > 320 || $height > 320)
 							$ph->scaleImage(320);
 						$ph->storeThumbnail($arr, PHOTO_RES_320);
 					}
 				}
 			}
-	
+
 			$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']),
@@ -309,9 +309,9 @@ class Photos extends \Zotlabs\Web\Controller {
 					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",
@@ -320,31 +320,31 @@ class Photos extends \Zotlabs\Web\Controller {
 					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) {
 					$old_tag    = $r[0]['tag'];
 					$old_inform = $r[0]['inform'];
 				}
 			}
-	
-	
+
+
 			// 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",
@@ -355,7 +355,7 @@ class Photos extends \Zotlabs\Web\Controller {
 					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']),
@@ -365,46 +365,46 @@ class Photos extends \Zotlabs\Web\Controller {
 					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($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, 
+							'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];
@@ -412,42 +412,42 @@ class Photos extends \Zotlabs\Web\Controller {
 						if((! array_key_exists('term',$datarray)) || (! is_array($datarray['term'])))
 							$datarray['term'] = $post_tags;
 						else
-							$datarray['term'] = array_merge($datarray['term'],$post_tags);  
+							$datarray['term'] = array_merge($datarray['term'],$post_tags);
 					}
 					item_store_update($datarray,$execflag);
 				}
-	
+
 			}
 
 			$sync = attach_export_data(\App::$data['channel'],$resource_id);
-	
-			if($sync) 
+
+			if($sync)
 				Libsync::build_sync_packet($page_owner_uid,array('file' => array($sync)));
-		
+
 			goaway(z_root() . '/' . $_SESSION['photo_return']);
 			return; // NOTREACHED
-	
-	
+
+
 		}
-	
-	
+
+
 		/**
 		 * 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;
@@ -467,7 +467,7 @@ class Photos extends \Zotlabs\Web\Controller {
 
 			if($x['partial']) {
 				header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0));
-				json_return_and_die($result);
+				json_return_and_die($x);
 			}
 			else {
 				header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0));
@@ -481,7 +481,7 @@ class Photos extends \Zotlabs\Web\Controller {
 				];
 			}
 		}
-		else {	
+		else {
 			if(! array_key_exists('userfile',$_FILES)) {
 				$_FILES['userfile'] = [
 					'name'     => $_FILES['files']['name'],
@@ -494,53 +494,53 @@ class Photos extends \Zotlabs\Web\Controller {
 		}
 
 		$r = attach_store($channel,get_observer_hash(), '', $_REQUEST);
-	
+
 		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']);
-	
+
 	}
-	
-	
-	
+
+
+
 	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);
-			
+
 		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 
+		// 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);
@@ -552,70 +552,70 @@ class Photos extends \Zotlabs\Web\Controller {
 			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'] 
+		$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'])
 			);
-	
-	
+
+
 			$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 );
@@ -623,22 +623,22 @@ class Photos extends \Zotlabs\Web\Controller {
 			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() 
-	
+			// 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="" />';
 			}
@@ -648,11 +648,11 @@ class Photos extends \Zotlabs\Web\Controller {
 			if($datum) {
 				$h = attach_by_hash_nodata($datum,get_observer_hash());
 				$selname = $h['data']['display_path'];
-			}	
+			}
+
 
-	
 			$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) {
@@ -660,7 +660,7 @@ class Photos extends \Zotlabs\Web\Controller {
 					$albums['album'][] = array('text' => $selname);
 				}
 			}
-	
+
 			$tpl = get_markup_template('photos_upload.tpl');
 			$upload_form = replace_macros($tpl,array(
 				'$pagename' => t('Upload Photos'),
@@ -685,22 +685,22 @@ class Photos extends \Zotlabs\Web\Controller {
 				'$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([ 
+			head_add_link([
 				'rel'   => 'alternate',
 				'type'  => 'application/json+oembed',
 				'href'  => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$query_string),
@@ -710,7 +710,7 @@ class Photos extends \Zotlabs\Web\Controller {
 			if($x = photos_album_exists($owner_uid, get_observer_hash(), $datum)) {
 				\App::set_pager_itemspage(30);
 				$album = $x['display_path'];
-			} 
+			}
 			else {
 				goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address']);
 			}
@@ -721,7 +721,7 @@ class Photos extends \Zotlabs\Web\Controller {
 				$order = 'DESC';
 
 			$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 
+					(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']),
@@ -739,9 +739,9 @@ class Photos extends \Zotlabs\Web\Controller {
 			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'),
@@ -753,32 +753,32 @@ class Photos extends \Zotlabs\Web\Controller {
 	//					'$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),
@@ -793,7 +793,7 @@ class Photos extends \Zotlabs\Web\Controller {
 					);
 				}
 			}
-	
+
 			if($_REQUEST['aj']) {
 				if($photos) {
 					$o = replace_macros(get_markup_template('photosajax.tpl'),array(
@@ -821,71 +821,71 @@ class Photos extends \Zotlabs\Web\Controller {
 					'$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)
 			);
 
 			// fetch image, item containing image, then comments
-	
-			$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' 
+
+			$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)
 			);
-	
+
 			if(! ($ph && $x)) {
-	
+
 				/* 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) 
+				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
 				$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++) {
@@ -899,12 +899,12 @@ class Photos extends \Zotlabs\Web\Controller {
 						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) {
@@ -917,74 +917,74 @@ class Photos extends \Zotlabs\Web\Controller {
 				$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']]
 			);
-	
+
 			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' 
+
+			$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' 
+
+				$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;
@@ -997,23 +997,23 @@ class Photos extends \Zotlabs\Web\Controller {
 						$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 
-	
+
+			// FIXME - remove this when we move to conversation module
+
 			$r = $r[0]['children'];
 
 			$edit = null;
@@ -1023,11 +1023,11 @@ class Photos extends \Zotlabs\Web\Controller {
 				$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'],
@@ -1058,17 +1058,17 @@ class Photos extends \Zotlabs\Web\Controller {
 					'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'],
@@ -1078,12 +1078,12 @@ class Photos extends \Zotlabs\Web\Controller {
 						'wait'     => t('Please wait')
 					];
 				}
-	
+
 				$comments = '';
 				if(! $r) {
 					if($observer && ($can_post || $can_comment)) {
 						$commentbox = replace_macros($cmnt_tpl,array(
-							'$return_path' => '', 
+							'$return_path' => '',
 							'$mode' => 'photos',
 							'$jsreload' => $return_url,
 							'$type' => 'wall-comment',
@@ -1101,28 +1101,28 @@ class Photos extends \Zotlabs\Web\Controller {
 						));
 					}
 				}
-	
+
 				$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')), 
+					'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'] : '');
 
@@ -1133,7 +1133,7 @@ class Photos extends \Zotlabs\Web\Controller {
 						$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'] : '');
@@ -1145,44 +1145,44 @@ class Photos extends \Zotlabs\Web\Controller {
 							$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',
@@ -1197,9 +1197,9 @@ class Photos extends \Zotlabs\Web\Controller {
 							'$drop' => $drop,
 							'$comment' => $comment
 						));
-	
+
 					}
-				
+
 					if($observer && ($can_post || $can_comment)) {
 						$commentbox = replace_macros($cmnt_tpl,array(
 							'$return_path' => '',
@@ -1216,20 +1216,20 @@ class Photos extends \Zotlabs\Web\Controller {
 							'$ww' => ''
 						));
 					}
-	
+
 				}
 				$paginate = paginate($a);
 			}
-			
+
 			$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 = [
@@ -1238,7 +1238,7 @@ class Photos extends \Zotlabs\Web\Controller {
 				'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'],
@@ -1255,7 +1255,7 @@ class Photos extends \Zotlabs\Web\Controller {
 				'$tag_hdr' => t('In This Photo:'),
 				'$tags' => $tags,
 				'responses' => $responses,
-				'$edit' => $edit,	
+				'$edit' => $edit,
 				'$map' => $map,
 				'$map_text' => t('Map'),
 				'$likebuttons' => $likebuttons,
@@ -1277,26 +1277,26 @@ class Photos extends \Zotlabs\Web\Controller {
 				'$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(30);
-		
-		$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) 
+
+		$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),
@@ -1305,9 +1305,9 @@ class Photos extends \Zotlabs\Web\Controller {
 			intval(\App::$pager['itemspage']),
 			intval(\App::$pager['start'])
 		);
-	
-	
-	
+
+
+
 		$photos = array();
 		if($r) {
 			$twist = 'rotright';
@@ -1321,7 +1321,7 @@ class Photos extends \Zotlabs\Web\Controller {
 				else
 					$twist = 'rotright';
 				$ext = $phototypes[$rr['mimetype']];
-				
+
 				$alt_e = $rr['filename'];
 				$name_e = dirname($rr['display_path']);
 
@@ -1335,11 +1335,11 @@ class Photos extends \Zotlabs\Web\Controller {
 					'album'	=> array(
 						'name'  => $name_e,
 					),
-					
+
 				);
 			}
 		}
-		
+
 		if($_REQUEST['aj']) {
 			if($photos) {
 				$o = replace_macros(get_markup_template('photosajax.tpl'),array(
@@ -1355,7 +1355,7 @@ class Photos extends \Zotlabs\Web\Controller {
 		}
 		else {
 			$o .= "<script> var page_query = '" . escape_tags(urlencode($_GET['q'])) . "'; var extra_args = '" . extra_query_args() . "' ; </script>";
-			$tpl = get_markup_template('photos_recent.tpl'); 
+			$tpl = get_markup_template('photos_recent.tpl');
 			$o .= replace_macros($tpl, array(
 				'$title' => t('Recent Photos'),
 				'$album_id' => bin2hex(t('Recent Photos')),
@@ -1365,18 +1365,18 @@ class Photos extends \Zotlabs\Web\Controller {
 				'$upload_form' => $upload_form,
 				'$usage' => $usage_message
 			));
-	
+
 		}
-	
+
 		if((! $photos) && ($_REQUEST['aj'])) {
 			$o .= '<div id="content-complete"></div>';
 			echo $o;
 			killme();
 		}
-	
+
 	//	paginate($a);
 		return $o;
 	}
-	
-	
+
+
 }