X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fphotos.php;h=0e9055d05dcf1cff004e54019a93a73c4847d686;hb=97e74f1570bc16ec1953748ebbcd11d65d6d70b3;hp=8d13f859a8560483094bf6a56fe796c8265127f7;hpb=624fd4450255e6f3f12eced715ad3d2bdd4016f1;p=friendica.git

diff --git a/mod/photos.php b/mod/photos.php
index 8d13f859a8..0e9055d05d 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -4,14 +4,19 @@ require_once('include/items.php');
 require_once('include/acl_selectors.php');
 require_once('include/bbcode.php');
 require_once('include/security.php');
-
+require_once('include/redir.php');
+require_once('include/tags.php');
+require_once('include/threads.php');
 
 function photos_init(&$a) {
 
+	if($a->argc > 1)
+		auto_redir($a, $a->argv[1]);
 
 	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
 		return;
 	}
+
 	$o = '';
 
 	if($a->argc > 1) {
@@ -25,26 +30,27 @@ function photos_init(&$a) {
 
 		$a->data['user'] = $r[0];
 
+		$o .= '<div class="vcard">';
+		$o .= '<div class="fn">' . $a->data['user']['username'] . '</div>';
+		$o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg') . '" alt="' . $a->data['user']['username'] . '" /></div>';
+		$o .= '</div>';
+
+
 		$sql_extra = permissions_sql($a->data['user']['uid']);
 
-		$albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d $sql_extra ",
+		$albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d $sql_extra order by created desc",
 			intval($a->data['user']['uid'])
 		);
 
 		if(count($albums)) {
 			$a->data['albums'] = $albums;
 
-			$o .= '<div class="vcard">';
-			$o .= '<div class="fn">' . $a->data['user']['username'] . '</div>';
-			$o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg') . '" alt="' . $a->data['user']['username'] . '" /></div>';
-			$o .= '</div>';
-
 			$albums_visible = ((intval($a->data['user']['hidewall']) && (! local_user()) && (! remote_user())) ? false : true);	
 
 			if($albums_visible) {
 				$o .= '<div id="side-bar-photos-albums" class="widget">';
 				$o .= '<h3>' . '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '">' . t('Photo Albums') . '</a></h3>';
-					
+
 				$o .= '<ul>';
 				foreach($albums as $album) {
 
@@ -161,6 +167,11 @@ function photos_post(&$a) {
 			return; // NOTREACHED
 		}
 
+		// Check if the user has responded to a delete confirmation query
+		if($_REQUEST['canceled']) {
+			goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+		}
+
 		$newalbum = notags(trim($_POST['albumname']));
 		if($newalbum != $album) {
 			q("UPDATE `photo` SET `album` = '%s' WHERE `album` = '%s' AND `uid` = %d",
@@ -176,6 +187,25 @@ function photos_post(&$a) {
 
 		if($_POST['dropalbum'] == t('Delete Album')) {
 
+			// Check if we should do HTML-based delete confirmation
+			if($_REQUEST['confirm']) {
+				$drop_url = $a->query_string;
+				$extra_inputs = array(
+					array('name' => 'albumname', 'value' => $_POST['albumname']),
+				);
+				$a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), array(
+					'$method' => 'post',
+					'$message' => t('Do you really want to delete this photo album and all its photos?'),
+					'$extra_inputs' => $extra_inputs,
+					'$confirm' => t('Delete Album'),
+					'$confirm_url' => $drop_url,
+					'$confirm_name' => 'dropalbum', // Needed so that confirmation will bring us back into this if statement
+					'$cancel' => t('Cancel'),
+				));
+				$a->error = 1; // Set $a->error so the other module functions don't execute
+				return;
+			}
+
 			$res = array();
 
 			// get the list of photos we are about to delete
@@ -223,6 +253,8 @@ function photos_post(&$a) {
 						dbesc($rr['parent-uri']),
 						intval($page_owner_uid)
 					);
+					create_tags_from_itemuri($rr['parent-uri'], $page_owner_uid);
+					delete_thread_uri($rr['parent-uri'], $page_owner_uid);
 
 					$drop_id = intval($rr['id']);
 
@@ -237,10 +269,32 @@ function photos_post(&$a) {
 		return; // NOTREACHED
 	}
 
+
+	// Check if the user has responded to a delete confirmation query for a single photo
+	if(($a->argc > 2) && $_REQUEST['canceled']) {
+		goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+	}
+
 	if(($a->argc > 2) && (x($_POST,'delete')) && ($_POST['delete'] == t('Delete Photo'))) {
 
 		// same as above but remove single photo
 
+		// Check if we should do HTML-based delete confirmation
+		if($_REQUEST['confirm']) {
+			$drop_url = $a->query_string;
+			$a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), array(
+				'$method' => 'post',
+				'$message' => t('Do you really want to delete this photo?'),
+				'$extra_inputs' => array(),
+				'$confirm' => t('Delete Photo'),
+				'$confirm_url' => $drop_url,
+				'$confirm_name' => 'delete', // Needed so that confirmation will bring us back into this if statement
+				'$cancel' => t('Cancel'),
+			));
+			$a->error = 1; // Set $a->error so the other module functions don't execute
+			return;
+		}
+
 		if($visitor) {
 			$r = q("SELECT `id`, `resource-id` FROM `photo` WHERE `contact-id` = %d AND `uid` = %d AND `resource-id` = '%s' LIMIT 1",
 				intval($visitor),
@@ -270,6 +324,8 @@ function photos_post(&$a) {
 					dbesc($i[0]['uri']),
 					intval($page_owner_uid)
 				);
+				create_tags_from_itemuri($i[0]['uri'], $page_owner_uid);
+				delete_thread_uri($i[0]['uri'], $page_owner_uid);
 
 				$url = $a->get_baseurl();
 				$drop_id = intval($i[0]['id']);
@@ -279,7 +335,7 @@ function photos_post(&$a) {
 			}
 		}
 
-		goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+		goaway($a->get_baseurl() . '/photos/' . $a->data['user']['nickname']);
 		return; // NOTREACHED
 	}
 
@@ -318,7 +374,7 @@ function photos_post(&$a) {
 					$width  = $ph->getWidth();
 					$height = $ph->getHeight();
 
-					$x = q("update photo set data = '%s', height = %d, width = %d where `resource-id` = '%s' and uid = %d and scale = 0 limit 1",
+					$x = q("update photo set data = '%s', height = %d, width = %d where `resource-id` = '%s' and uid = %d and scale = 0",
 						dbesc($ph->imageString()),
 						intval($height),
 						intval($width),
@@ -330,8 +386,8 @@ function photos_post(&$a) {
 						$ph->scaleImage(640);
 						$width  = $ph->getWidth();
 						$height = $ph->getHeight();
-		
-						$x = q("update photo set data = '%s', height = %d, width = %d where `resource-id` = '%s' and uid = %d and scale = 1 limit 1",
+
+						$x = q("update photo set data = '%s', height = %d, width = %d where `resource-id` = '%s' and uid = %d and scale = 1",
 							dbesc($ph->imageString()),
 							intval($height),
 							intval($width),
@@ -345,14 +401,14 @@ function photos_post(&$a) {
 						$width  = $ph->getWidth();
 						$height = $ph->getHeight();
 
-						$x = q("update photo set data = '%s', height = %d, width = %d where `resource-id` = '%s' and uid = %d and scale = 2 limit 1",
+						$x = q("update photo set data = '%s', height = %d, width = %d where `resource-id` = '%s' and uid = %d and scale = 2",
 							dbesc($ph->imageString()),
 							intval($height),
 							intval($width),
 							dbesc($resource_id),
 							intval($page_owner_uid)
 						);
-					}	
+					}
 				}
 			}
 		}
@@ -411,11 +467,11 @@ function photos_post(&$a) {
 			$arr['last-child']    = 1;
 			$arr['visible']       = $visibility;
 			$arr['origin']        = 1;
-			
+
 			$arr['body']          = '[url=' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $p[0]['resource-id'] . ']' 
 						. '[img]' . $a->get_baseurl() . '/photo/' . $p[0]['resource-id'] . '-' . $p[0]['scale'] . '.'. $ext . '[/img]' 
 						. '[/url]';
-		
+
 			$item_id = item_store($arr);
 
 		}
@@ -481,7 +537,25 @@ function photos_post(&$a) {
 									intval($profile_uid)
 								);
 							}
-							elseif(strstr($name,'_') || strstr($name,' ')) {
+							else {
+								$newname = str_replace('_',' ',$name);
+
+								//select someone from this user's contacts by name
+								$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
+										dbesc($newname),
+										intval($page_owner_uid)
+								);
+
+								if(! $r) {
+									//select someone by attag or nick and the name passed in
+									$r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
+											dbesc($name),
+											dbesc($name),
+											intval($page_owner_uid)
+									);
+								}
+							}
+/*							elseif(strstr($name,'_') || strstr($name,' ')) {
 								$newname = str_replace('_',' ',$name);
 								$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
 									dbesc($newname),
@@ -494,7 +568,7 @@ function photos_post(&$a) {
 									dbesc($name),
 									intval($page_owner_uid)
 								);
-							}
+							}*/
 							if(count($r)) {
 								$newname = $r[0]['name'];
 								$profile = $r[0]['url'];
@@ -528,7 +602,7 @@ function photos_post(&$a) {
 				$newinform .= ',';
 			$newinform .= $inform;
 
-			$r = q("UPDATE `item` SET `tag` = '%s', `inform` = '%s', `edited` = '%s', `changed` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
+			$r = q("UPDATE `item` SET `tag` = '%s', `inform` = '%s', `edited` = '%s', `changed` = '%s' WHERE `id` = %d AND `uid` = %d",
 				dbesc($newtag),
 				dbesc($newinform),
 				dbesc(datetime_convert()),
@@ -536,6 +610,8 @@ function photos_post(&$a) {
 				intval($item_id),
 				intval($page_owner_uid)
 			);
+			create_tags_from_item($item_id);
+			update_thread($item_id);
 
 			$best = 0;
 			foreach($p as $scales) {
@@ -551,7 +627,7 @@ function photos_post(&$a) {
 
 			if(count($taginfo)) {
 				foreach($taginfo as $tagged) {
-		
+
 					$uri = item_new_uri($a->get_hostname(),$page_owner_uid);
 
 					$arr = array();
@@ -581,7 +657,7 @@ function photos_post(&$a) {
 					$arr['tag']           = $tagged[4];
 					$arr['inform']        = $tagged[2];
 					$arr['origin']        = 1;
-					$arr['body']          = '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]' . ' ' . t('was tagged in a') . ' ' . '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . t('photo') . '[/url]' . ' ' . t('by') . ' ' . '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]' ;
+					$arr['body']          = sprintf( t('%1$s was tagged in %2$s by %3$s'), '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ;
 					$arr['body'] .= "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . '[img]' . $a->get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n" ;
 
 					$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $tagged[0] . '</title><id>' . $tagged[1] . '/' . $tagged[0] . '</id>';
@@ -596,7 +672,7 @@ function photos_post(&$a) {
 
 					$item_id = item_store($arr);
 					if($item_id) {
-						q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
+						q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d",
 							dbesc($a->get_baseurl() . '/display/' . $owner_record['nickname'] . '/' . $item_id),
 							intval($page_owner_uid),
 							intval($item_id)
@@ -805,14 +881,14 @@ function photos_post(&$a) {
 	$item_id = item_store($arr);
 
 	if($item_id) {
-		q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
+		q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d",
 			dbesc($a->get_baseurl() . '/display/' . $owner_record['nickname'] . '/' . $item_id),
 			intval($page_owner_uid),
 			intval($item_id)
 		);
 	}
-	
-	if($visible) 
+
+	if($visible)
 		proc_run('php', "include/notifier.php", 'wall-new', $item_id);
 
 	call_hooks('photo_post_end',intval($item_id));
@@ -842,8 +918,8 @@ function photos_content(&$a) {
 		notice( t('Public access denied.') . EOL);
 		return;
 	}
-	
-	
+
+
 	require_once('include/bbcode.php');
 	require_once('include/security.php');
 	require_once('include/conversation.php');
@@ -960,7 +1036,7 @@ function photos_content(&$a) {
 
 	// tabs
 	$_is_owner = (local_user() && (local_user() == $owner_uid));
-	$o .= profile_tabs($a,$_is_owner, $a->data['user']['nickname']);	
+	$o .= profile_tabs($a,$_is_owner, $a->data['user']['nickname']);
 
 	//
 	// dispatch request
@@ -979,7 +1055,7 @@ function photos_content(&$a) {
 
 		$albumselect = '';
 
-		
+
 		$albumselect .= '<option value="" ' . ((! $selname) ? ' selected="selected" ' : '') . '>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
 		if(count($a->data['albums'])) {
 			foreach($a->data['albums'] as $album) {
@@ -1001,25 +1077,52 @@ function photos_content(&$a) {
 
 		call_hooks('photo_upload_form',$ret);
 
-		$default_upload = '<input id="photos-upload-choose" type="file" name="userfile" /> 	<div class="photos-upload-submit-wrapper" >
-		<input type="submit" name="submit" value="' . t('Submit') . '" id="photos-upload-submit" /> </div>';
-
-
-		$r = q("select sum(octet_length(data)) as total from photo where uid = %d and scale = 0 and album != 'Contact Photos' ",
-			intval($a->data['user']['uid'])
-		);
-
+		$default_upload_box = replace_macros(get_markup_template('photos_default_uploader_box.tpl'), array());
+		$default_upload_submit = replace_macros(get_markup_template('photos_default_uploader_submit.tpl'), array(
+			'$submit' => t('Submit'),
+		));
 
+		$usage_message = '';
 		$limit = service_class_fetch($a->data['user']['uid'],'photo_upload_limit');
 		if($limit !== false) {
+
+			$r = q("select sum(datasize) as total from photo where uid = %d and scale = 0 and album != 'Contact Photos' ",
+				intval($a->data['user']['uid'])
+			);
 			$usage_message = sprintf( t("You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."), $r[0]['total'] / 1024000, $limit / 1024000 );
 		}
-		else {
-			$usage_message = sprintf( t('You have used %1$.2f Mbytes of photo storage.'), $r[0]['total'] / 1024000 );
- 		}
+
+
+		// Private/public post links for the non-JS ACL form
+		$private_post = 1;
+		if($_REQUEST['public'])
+			$private_post = 0;
+
+		$query_str = $a->query_string;
+		if(strpos($query_str, 'public=1') !== false)
+			$query_str = str_replace(array('?public=1', '&public=1'), array('', ''), $query_str);
+
+		// I think $a->query_string may never have ? in it, but I could be wrong
+		// It looks like it's from the index.php?q=[etc] rewrite that the web
+		// server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61
+		if(strpos($query_str, '?') === false)
+			$public_post_link = '?public=1';
+		else
+			$public_post_link = '&public=1';
+
 
 
 		$tpl = get_markup_template('photos_upload.tpl');
+
+		if($a->theme['template_engine'] === 'internal') {
+			$albumselect_e = template_escape($albumselect);
+			$aclselect_e = (($visitor) ? '' : template_escape(populate_acl($a->user, $celeb)));
+		}
+		else {
+			$albumselect_e = $albumselect;
+			$aclselect_e = (($visitor) ? '' : populate_acl($a->user, $celeb));
+		}
+
 		$o .= replace_macros($tpl,array(
 			'$pagename' => t('Upload Photos'),
 			'$sessid' => session_id(),
@@ -1028,12 +1131,23 @@ function photos_content(&$a) {
 			'$newalbum' => t('New album name: '),
 			'$existalbumtext' => t('or existing album name: '),
 			'$nosharetext' => t('Do not show a status post for this upload'),
-			'$albumselect' => template_escape($albumselect),
+			'$albumselect' => $albumselect_e,
 			'$permissions' => t('Permissions'),
-			'$aclselect' => (($visitor) ? '' : template_escape(populate_acl($a->user, $celeb))),
-			'$uploader' => $ret['addon_text'],
-			'$default' => (($ret['default_upload']) ? $default_upload : ''),
-			'$uploadurl' => $ret['post_url']
+			'$aclselect' => $aclselect_e,
+			'$alt_uploader' => $ret['addon_text'],
+			'$default_upload_box' => (($ret['default_upload']) ? $default_upload_box : ''),
+			'$default_upload_submit' => (($ret['default_upload']) ? $default_upload_submit : ''),
+			'$uploadurl' => $ret['post_url'],
+
+			// ACL permissions box
+			'$acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
+			'$group_perms' => t('Show to Groups'),
+			'$contact_perms' => t('Show to Contacts'),
+			'$private' => t('Private Photo'),
+			'$public' => t('Public Photo'),
+			'$is_private' => $private_post,
+			'$return_path' => $query_str,
+			'$public_link' => $public_post_link,
 
 		));
 
@@ -1068,15 +1182,23 @@ function photos_content(&$a) {
 		);
 
 		$o .= '<h3>' . $album . '</h3>';
-		
-		if($cmd === 'edit') {		
+
+		if($cmd === 'edit') {
 			if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
 				if($can_post) {
 					$edit_tpl = get_markup_template('album_edit.tpl');
+
+					if($a->theme['template_engine'] === 'internal') {
+						$album_e = template_escape($album);
+					}
+					else {
+						$album_e = $album;
+					}
+
 					$o .= replace_macros($edit_tpl,array(
 						'$nametext' => t('New album name: '),
 						'$nickname' => $a->data['user']['nickname'],
-						'$album' => template_escape($album),
+						'$album' => $album_e,
 						'$hexalbum' => bin2hex($album),
 						'$submit' => t('Submit'),
 						'$dropsubmit' => t('Delete Album')
@@ -1113,9 +1235,18 @@ function photos_content(&$a) {
 					$twist = 'rotleft';
 				else
 					$twist = 'rotright';
-				
+
 				$ext = $phototypes[$rr['type']];
 
+				if($a->theme['template_engine'] === 'internal') {
+					$imgalt_e = template_escape($rr['filename']);
+					$desc_e = template_escape($rr['desc']);
+				}
+				else {
+					$imgalt_e = $rr['filename'];
+					$desc_e = $rr['desc'];
+				}
+
 				$o .= replace_macros($tpl,array(
 					'$id' => $rr['id'],
 					'$twist' => ' ' . $twist . rand(2,4),
@@ -1123,8 +1254,8 @@ function photos_content(&$a) {
 						. (($_GET['order'] === 'posted') ? '?f=&order=posted' : ''),
 					'$phototitle' => t('View Photo'),
 					'$imgsrc' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.' .$ext,
-					'$imgalt' => template_escape($rr['filename']),
-					'$desc'=> template_escape($rr['desc'])
+					'$imgalt' => $imgalt_e,
+					'$desc'=> $desc_e
 				));
 
 		}
@@ -1133,7 +1264,7 @@ function photos_content(&$a) {
 
 		return $o;
 
-	}	
+	}
 
 
 	if($datatype === 'image') {
@@ -1150,12 +1281,12 @@ function photos_content(&$a) {
 		);
 
 		if(! count($ph)) {
-			$ph = q("SELECT `id` FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' 
+			$ph = q("SELECT `id` FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'
 				LIMIT 1",
 				intval($owner_uid),
 				dbesc($datum)
 			);
-			if(count($ph)) 
+			if(count($ph))
 				notice( t('Permission denied. Access to this item may be restricted.'));
 			else
 				notice( t('Photo not available') . EOL );
@@ -1171,11 +1302,11 @@ function photos_content(&$a) {
 			$order = 'DESC';
 
 
-		$prvnxt = q("SELECT `resource-id` FROM `photo` WHERE `album` = '%s' AND `uid` = %d AND `scale` = 0 
+		$prvnxt = q("SELECT `resource-id` FROM `photo` WHERE `album` = '%s' AND `uid` = %d AND `scale` = 0
 			$sql_extra ORDER BY `created` $order ",
 			dbesc($ph[0]['album']),
 			intval($owner_uid)
-		); 
+		);
 
 		if(count($prvnxt)) {
 			for($z = 0; $z < count($prvnxt); $z++) {
@@ -1211,7 +1342,7 @@ function photos_content(&$a) {
 		$album_link = $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($ph[0]['album']);
  		$tools = Null;
  		$lock = Null;
- 
+
 		if($can_post && ($ph[0]['uid'] == $owner_uid)) {
 			$tools = array(
 				'edit'	=> array($a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $datum . (($cmd === 'edit') ? '' : '/edit'), (($cmd === 'edit') ? t('View photo') : t('Edit photo'))),
@@ -1223,8 +1354,8 @@ function photos_content(&$a) {
 					|| strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) ) 
 					? t('Private Message')
 					: Null);
-	  		
-			
+
+
 		}
 
 		if( $cmd === 'edit') {
@@ -1241,7 +1372,11 @@ function photos_content(&$a) {
 		$photo = array(
 			'href' => $a->get_baseurl() . '/photo/' . $hires['resource-id'] . '-' . $hires['scale'] . '.' . $phototypes[$hires['type']],
 			'title'=> t('View Full Size'),
-			'src'  => $a->get_baseurl() . '/photo/' . $lores['resource-id'] . '-' . $lores['scale'] . '.' . $phototypes[$lores['type']] . '?f=&_u=' . datetime_convert('','','','ymdhis')
+			'src'  => $a->get_baseurl() . '/photo/' . $lores['resource-id'] . '-' . $lores['scale'] . '.' . $phototypes[$lores['type']] . '?f=&_u=' . datetime_convert('','','','ymdhis'),
+			'height' => $hires['height'],
+			'width' => $hires['width'],
+			'album' => $hires['album'],
+			'filename' => $hires['filename'],
 		);
 
 		if($nextlink)
@@ -1250,6 +1385,12 @@ function photos_content(&$a) {
 
 		// Do we have an item for this photo?
 
+		// FIXME! - replace following code to display the conversation with our normal
+		// conversation functions so that it works correctly and tracks changes
+		// in the evolving conversation code.
+		// The difference is that we won't be displaying the conversation head item
+		// as a "post" but displaying instead the photo it is linked to
+
 		$linked_items = q("SELECT * FROM `item` WHERE `resource-id` = '%s' $sql_extra LIMIT 1",
 			dbesc($datum)
 		);
@@ -1259,7 +1400,7 @@ function photos_content(&$a) {
 				FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 				WHERE `parent-uri` = '%s' AND `uri` != '%s' AND `item`.`deleted` = 0 and `item`.`moderated` = 0
 				AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-				AND `item`.`uid` = %d 
+				AND `item`.`uid` = %d
 				$sql_extra ",
 				dbesc($link_item['uri']),
 				dbesc($link_item['uri']),
@@ -1271,9 +1412,9 @@ function photos_content(&$a) {
 				$a->set_pager_total($r[0]['total']);
 
 
-			$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
-				`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`network`, 
-				`contact`.`rel`, `contact`.`thumb`, `contact`.`self`, 
+			$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
+				`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`network`,
+				`contact`.`rel`, `contact`.`thumb`, `contact`.`self`,
 				`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
 				FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 				WHERE `parent-uri` = '%s' AND `uri` != '%s' AND `item`.`deleted` = 0 and `item`.`moderated` = 0
@@ -1288,12 +1429,13 @@ function photos_content(&$a) {
 				intval($a->pager['itemspage'])
 
 			);
-		
+
 			if((local_user()) && (local_user() == $link_item['uid'])) {
 				q("UPDATE `item` SET `unseen` = 0 WHERE `parent` = %d and `uid` = %d",
 					intval($link_item['parent']),
 					intval(local_user())
 				);
+				update_thread($link_item['parent']);
 			}
 		}
 
@@ -1307,7 +1449,7 @@ function photos_content(&$a) {
 				if(strlen($tag_str))
 					$tag_str .= ', ';
 				$tag_str .= bbcode($t);
-			} 
+			}
 			$tags = array(t('Tags: '), $tag_str);
 			if($cmd === 'edit') {
 				$tags[] = $a->get_baseurl() . '/tagrm/' . $link_item['id'];
@@ -1319,24 +1461,64 @@ function photos_content(&$a) {
 		$edit = Null;
 		if(($cmd === 'edit') && ($can_post)) {
 			$edit_tpl = get_markup_template('photo_edit.tpl');
+
+			// Private/public post links for the non-JS ACL form
+			$private_post = 1;
+			if($_REQUEST['public'])
+				$private_post = 0;
+
+			$query_str = $a->query_string;
+			if(strpos($query_str, 'public=1') !== false)
+				$query_str = str_replace(array('?public=1', '&public=1'), array('', ''), $query_str);
+
+			// I think $a->query_string may never have ? in it, but I could be wrong
+			// It looks like it's from the index.php?q=[etc] rewrite that the web
+			// server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61
+			if(strpos($query_str, '?') === false)
+				$public_post_link = '?public=1';
+			else
+				$public_post_link = '&public=1';
+
+
+			if($a->theme['template_engine'] === 'internal') {
+				$album_e = template_escape($ph[0]['album']);
+				$caption_e = template_escape($ph[0]['desc']);
+				$aclselect_e = template_escape(populate_acl($ph[0]));
+			}
+			else {
+				$album_e = $ph[0]['album'];
+				$caption_e = $ph[0]['desc'];
+				$aclselect_e = populate_acl($ph[0]);
+			}
+
 			$edit = replace_macros($edit_tpl, array(
 				'$id' => $ph[0]['id'],
 				'$rotatecw' => t('Rotate CW (right)'),
 				'$rotateccw' => t('Rotate CCW (left)'),
-				'$album' => template_escape($ph[0]['album']),
-				'$newalbum' => t('New album name'), 
+				'$album' => $album_e,
+				'$newalbum' => t('New album name'),
 				'$nickname' => $a->data['user']['nickname'],
 				'$resource_id' => $ph[0]['resource-id'],
 				'$capt_label' => t('Caption'),
-				'$caption' => template_escape($ph[0]['desc']),
+				'$caption' => $caption_e,
 				'$tag_label' => t('Add a Tag'),
 				'$tags' => $link_item['tag'],
 				'$permissions' => t('Permissions'),
-				'$aclselect' => template_escape(populate_acl($ph[0])),
+				'$aclselect' => $aclselect_e,
 				'$help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'),
 				'$item_id' => ((count($linked_items)) ? $link_item['id'] : 0),
 				'$submit' => t('Submit'),
-				'$delete' => t('Delete Photo')
+				'$delete' => t('Delete Photo'),
+
+				// ACL permissions box
+				'$acl_data' => construct_acl_data($a, $ph[0]), // For non-Javascript ACL selector
+				'$group_perms' => t('Show to Groups'),
+				'$contact_perms' => t('Show to Contacts'),
+				'$private' => t('Private photo'),
+				'$public' => t('Public photo'),
+				'$is_private' => $private_post,
+				'$return_path' => $query_str,
+				'$public_link' => $public_post_link,
 			));
 		}
 
@@ -1354,9 +1536,10 @@ function photos_content(&$a) {
 				$likebuttons = replace_macros($like_tpl,array(
 					'$id' => $link_item['id'],
 					'$likethis' => t("I like this \x28toggle\x29"),
-					'$nolike' => t("I don't like this \x28toggle\x29"),
+					'$nolike' => (feature_enabled(local_user(), 'dislike') ? t("I don't like this \x28toggle\x29") : ''),
 					'$share' => t('Share'),
-					'$wait' => t('Please wait')
+					'$wait' => t('Please wait'),
+					'$return_path' => $a->query_string,
 				));
 			}
 
@@ -1365,7 +1548,7 @@ function photos_content(&$a) {
 				if($can_post || can_write_wall($a,$owner_uid)) {
 					if($link_item['last-child']) {
 						$comments .= replace_macros($cmnt_tpl,array(
-							'$return_path' => '', 
+							'$return_path' => '',
 							'$jsreload' => $return_url,
 							'$type' => 'wall-comment',
 							'$id' => $link_item['id'],
@@ -1378,7 +1561,8 @@ function photos_content(&$a) {
 							'$submit' => t('Submit'),
 							'$preview' => t('Preview'),
 							'$sourceapp' => t($a->sourcename),
-							'$ww' => ''
+							'$ww' => '',
+							'$rand_num' => random_digits(12)
 						));
 					}
 				}
@@ -1386,10 +1570,12 @@ function photos_content(&$a) {
 
 			$alike = array();
 			$dlike = array();
-			
+
 			$like = '';
 			$dislike = '';
 
+
+
 			// display comments
 			if(count($r)) {
 
@@ -1417,8 +1603,10 @@ function photos_content(&$a) {
 							'$myphoto' => $contact['thumb'],
 							'$comment' => t('Comment'),
 							'$submit' => t('Submit'),
+							'$preview' => t('Preview'),
 							'$sourceapp' => t($a->sourcename),
-							'$ww' => ''
+							'$ww' => '',
+							'$rand_num' => random_digits(12)
 						));
 					}
 				}
@@ -1433,30 +1621,9 @@ function photos_content(&$a) {
 						continue;
 
 					$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
-			
-					if($can_post || can_write_wall($a,$owner_uid)) {
-
-						if($item['last-child']) {
-							$comments .= replace_macros($cmnt_tpl,array(
-								'$return_path' => '',
-								'$jsreload' => $return_url,
-								'$type' => 'wall-comment',
-								'$id' => $item['item_id'],
-								'$parent' => $item['parent'],
-								'$profile_uid' =>  $owner_uid,
-								'$mylink' => $contact['url'],
-								'$mytitle' => t('This is you'),
-								'$myphoto' => $contact['thumb'],
-								'$comment' => t('Comment'),
-								'$submit' => t('Submit'),
-								'$sourceapp' => t($a->sourcename),
-								'$ww' => ''
-							));
-						}
-					}
 
 
-					if(local_user() && ($item['contact-uid'] == local_user()) 
+					if(local_user() && ($item['contact-uid'] == local_user())
 						&& ($item['network'] == 'dfrn') && (! $item['self'] )) {
 						$profile_url = $redirect_url;
 						$sparkle = ' sparkle';
@@ -1465,7 +1632,7 @@ function photos_content(&$a) {
 						$profile_url = $item['url'];
 						$sparkle = '';
 					}
- 
+
 					$diff_author = (($item['url'] !== $item['author-link']) ? true : false);
 
 					$profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
@@ -1473,50 +1640,109 @@ function photos_content(&$a) {
 
 					$profile_link = $profile_url;
 
-					$drop = '';
+					
+					
+					$dropping = (($item['contact-id'] == $contact_id) || ($item['uid'] == local_user()));
+					$drop = array(
+						'dropping' => $dropping,
+						'pagedrop' => false,
+						'select' => t('Select'),
+						'delete' => t('Delete'),
+					);
 
-					if(($item['contact-id'] == $contact_id) || ($item['uid'] == local_user()))
-						$drop = replace_macros(get_markup_template('photo_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
 
+					if($a->theme['template_engine'] === 'internal') {
+						$name_e = template_escape($profile_name);
+						$title_e = template_escape($item['title']);
+						$body_e = template_escape(bbcode($item['body']));
+					}
+					else {
+						$name_e = $profile_name;
+						$title_e = $item['title'];
+						$body_e = bbcode($item['body']);
+					}
 
 					$comments .= replace_macros($template,array(
 						'$id' => $item['item_id'],
 						'$profile_url' => $profile_link,
-						'$name' => template_escape($profile_name),
+						'$name' => $name_e,
 						'$thumb' => $profile_avatar,
 						'$sparkle' => $sparkle,
-						'$title' => template_escape($item['title']),
-						'$body' => template_escape(bbcode($item['body'])),
+						'$title' => $title_e,
+						'$body' => $body_e,
 						'$ago' => relative_date($item['created']),
 						'$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
 						'$drop' => $drop,
 						'$comment' => $comment
 					));
+
+					if($can_post || can_write_wall($a,$owner_uid)) {
+
+						if($item['last-child']) {
+							$comments .= replace_macros($cmnt_tpl,array(
+								'$return_path' => '',
+								'$jsreload' => $return_url,
+								'$type' => 'wall-comment',
+								'$id' => $item['item_id'],
+								'$parent' => $item['parent'],
+								'$profile_uid' =>  $owner_uid,
+								'$mylink' => $contact['url'],
+								'$mytitle' => t('This is you'),
+								'$myphoto' => $contact['thumb'],
+								'$comment' => t('Comment'),
+								'$submit' => t('Submit'),
+								'$preview' => t('Preview'),
+								'$sourceapp' => t($a->sourcename),
+								'$ww' => '',
+								'$rand_num' => random_digits(12)
+							));
+						}
+					}
 				}
 			}
 
 			$paginate = paginate($a);
 		}
-		
+
 		$photo_tpl = get_markup_template('photo_view.tpl');
+
+		if($a->theme['template_engine'] === 'internal') {
+			$album_e = array($album_link,template_escape($ph[0]['album']));
+			$tags_e = template_escape($tags);
+			$like_e = template_escape($like);
+			$dislike_e = template_escape($dislike);
+		}
+		else {
+			$album_e = array($album_link,$ph[0]['album']);
+			$tags_e = $tags;
+			$like_e = $like;
+			$dislike_e = $dislike;
+		}
+
 		$o .= replace_macros($photo_tpl, array(
 			'$id' => $ph[0]['id'],
-			'$album' => array($album_link,template_escape($ph[0]['album'])),
+			'$album' => $album_e,
 			'$tools' => $tools,
 			'$lock' => $lock,
 			'$photo' => $photo,
 			'$prevlink' => $prevlink,
 			'$nextlink' => $nextlink,
 			'$desc' => $ph[0]['desc'],
-			'$tags' => template_escape($tags),
-			'$edit' => $edit,	
+			'$tags' => $tags_e,
+			'$edit' => $edit,
 			'$likebuttons' => $likebuttons,
-			'$like' => template_escape($like),
-			'$dislike' => template_escape($dislike),
+			'$like' => $like_e,
+			'$dislike' => $dikslike_e,
 			'$comments' => $comments,
 			'$paginate' => $paginate,
 		));
-		
+
+		$a->page['htmlhead'] .= "\n".'<meta name="twitter:card" content="photo" />'."\n";
+		$a->page['htmlhead'] .= '<meta name="twitter:title" content="'.$photo["album"].'" />'."\n";
+		$a->page['htmlhead'] .= '<meta name="twitter:image" content="'.$photo["href"].'" />'."\n";
+		$a->page['htmlhead'] .= '<meta name="twitter:image:width" content="'.$photo["width"].'" />'."\n";
+		$a->page['htmlhead'] .= '<meta name="twitter:image:height" content="'.$photo["height"].'" />'."\n";
+
 		return $o;
 	}
 
@@ -1556,32 +1782,41 @@ function photos_content(&$a) {
 				$twist = 'rotright';
 			$ext = $phototypes[$rr['type']];
 			
+			if($a->theme['template_engine'] === 'internal') {
+				$alt_e = template_escape($rr['filename']);
+				$name_e = template_escape($rr['album']);
+			}
+			else {
+				$alt_e = $rr['filename'];
+				$name_e = $rr['album'];
+			}
+
 			$photos[] = array(
 				'id'       => $rr['id'],
 				'twist'    => ' ' . $twist . rand(2,4),
 				'link'  	=> $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
 				'title' 	=> t('View Photo'),
 				'src'     	=> $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.' . $ext,
-				'alt'     	=> template_escape($rr['filename']),
+				'alt'     	=> $alt_e,
 				'album'	=> array(
 					'link'  => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
-					'name'  => template_escape($rr['album']),
+					'name'  => $name_e,
 					'alt'   => t('View Album'),
 				),
-				
+
 			);
 		}
 	}
-	
-	$tpl = get_markup_template('photos_recent.tpl'); 
-	$o .= replace_macros($tpl,array(
+
+	$tpl = get_markup_template('photos_recent.tpl');
+	$o .= replace_macros($tpl, array(
 		'$title' => t('Recent Photos'),
 		'$can_post' => $can_post,
 		'$upload' => array(t('Upload New Photos'), $a->get_baseurl().'/photos/'.$a->data['user']['nickname'].'/upload'),
 		'$photos' => $photos,
 	));
 
-	
+
 	$o .= paginate($a);
 	return $o;
 }