X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fphotos.php;h=6d147a6f55a694f9696650828a2cbb0730ebd5ad;hb=389b7de451eb8e684b48e2c96598f1d12c1465d9;hp=1ec16898bf761f784d0d0b652b403959d8e3e4e2;hpb=6b8585d48d67d109102e33a32311d76a45762667;p=friendica.git

diff --git a/mod/photos.php b/mod/photos.php
index 1ec16898bf..6d147a6f55 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -17,6 +17,8 @@ function photos_init(&$a) {
 		return;
 	}
 
+	nav_set_selected('home');
+
 	$o = '';
 
 	if($a->argc > 1) {
@@ -29,50 +31,76 @@ function photos_init(&$a) {
 			return;
 
 		$a->data['user'] = $r[0];
+		$a->profile_uid = $r[0]['uid'];
+		$is_owner = (local_user() && (local_user() == $a->profile_uid));
+
+		$profilephoto = $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg');
+
+		$tpl = get_markup_template("vcard-widget.tpl");
 
-		$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>';
+		$vcard_widget .= replace_macros($tpl, array(
+			'$name' => $a->data['user']['username'],
+			'$photo' => $profilephoto
+		));
 
 
 		$sql_extra = permissions_sql($a->data['user']['uid']);
 
-		$albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d $sql_extra order by created desc",
-			intval($a->data['user']['uid'])
+		$albums = q("SELECT count(distinct `resource-id`) AS `total`, `album` FROM `photo` WHERE `uid` = %d  AND `album` != '%s' AND `album` != '%s'
+			$sql_extra group by album order by created desc",
+			intval($a->data['user']['uid']),
+			dbesc('Contact Photos'),
+			dbesc( t('Contact Photos'))
 		);
 
-		if(count($albums)) {
-			$a->data['albums'] = $albums;
+		$albums_visible = ((intval($a->data['user']['hidewall']) && (! local_user()) && (! remote_user())) ? false : true);
 
-			$albums_visible = ((intval($a->data['user']['hidewall']) && (! local_user()) && (! remote_user())) ? false : true);	
+		// add various encodings to the array so we can just loop through and pick them out in a template
+		$ret = array('success' => false);
 
-			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>';
+		if($albums) {
+			$a->data['albums'] = $albums;
+			if ($albums_visible)
+				$ret['success'] = true;
 
-				$o .= '<ul>';
-				foreach($albums as $album) {
+			$ret['albums'] = array();
+			foreach($albums as $k => $album) {
+				//hide profile photos to others
+				if((! $is_owner) && (! remote_user()) && ($album['album'] == t('Profile Photos')))
+					continue;
+				$entry = array(
+					'text'      => $album['album'],
+					'total'     => $album['total'],
+					'url'       => z_root() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album['album']),
+					'urlencode' => urlencode($album['album']),
+					'bin2hex'   => bin2hex($album['album'])
+				);
+				$ret['albums'][] = $entry;
+			}
+		}
 
-					// don't show contact photos. We once translated this name, but then you could still access it under
-					// a different language setting. Now we store the name in English and check in English (and translated for legacy albums).
+		$albums = $ret;
 
-					if((! strlen($album['album'])) || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos')))
-						continue;
-					$o .= '<li>' . '<a href="photos/' . $a->argv[1] . '/album/' . bin2hex($album['album']) . '" >' . $album['album'] . '</a></li>'; 
-				}
-				$o .= '</ul>';
-			}
-			if(local_user() && $a->data['user']['uid'] == local_user()) {
-				$o .= '<div id="photo-albums-upload-link"><a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/upload" >' .t('Upload New Photos') . '</a></div>';
-			}
+		if(local_user() && $a->data['user']['uid'] == local_user())
+			$can_post = true;
 
-			$o .= '</div>';
+		if($albums['success']) {
+			$photo_albums_widget = replace_macros(get_markup_template('photo_albums.tpl'),array(
+				'$nick'     => $a->data['user']['nickname'],
+				'$title'    => t('Photo Albums'),
+				'recent'    => t('Recent Photos'),
+				'$albums'   => $albums['albums'],
+				'$baseurl'  => z_root(),
+				'$upload'   => array( t('Upload New Photos'), $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/upload'),
+				'$can_post' => $can_post
+			));
 		}
 
+
 		if(! x($a->page,'aside'))
 			$a->page['aside'] = '';
-		$a->page['aside'] .= $o;
+		$a->page['aside'] .= $vcard_widget;
+		$a->page['aside'] .= $photo_albums_widget;
 
 
 		$tpl = get_markup_template("photos_head.tpl");
@@ -135,7 +163,7 @@ function photos_post(&$a) {
 		killme();
 	}
 
-	$r = q("SELECT `contact`.*, `user`.`nickname` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` 
+	$r = q("SELECT `contact`.*, `user`.`nickname` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid`
 		WHERE `user`.`uid` = %d AND `self` = 1 LIMIT 1",
 		intval($page_owner_uid)
 	);
@@ -146,7 +174,7 @@ function photos_post(&$a) {
 		killme();
 	}
 
-	$owner_record = $r[0];	
+	$owner_record = $r[0];
 
 
 	if(($a->argc > 3) && ($a->argv[2] === 'album')) {
@@ -341,7 +369,6 @@ function photos_post(&$a) {
 
 	if(($a->argc > 2) && ((x($_POST,'desc') !== false) || (x($_POST,'newtag') !== false)) || (x($_POST,'albname') !== 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);
@@ -357,7 +384,7 @@ function photos_post(&$a) {
 			$albname = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y');
 
 
-		if((x($_POST,'rotate') !== false) && 
+		if((x($_POST,'rotate') !== false) &&
 		   ( (intval($_POST['rotate']) == 1) || (intval($_POST['rotate']) == 2) )) {
 			logger('rotate');
 
@@ -436,19 +463,19 @@ function photos_post(&$a) {
 		$visibility = 0;
 		if($p[0]['desc'] !== $desc || strlen($rawtags))
 			$visibility = 1;
-		
+
 		if(! $item_id) {
 
 			// Create item container
 
 			$title = '';
 			$uri = item_new_uri($a->get_hostname(),$page_owner_uid);
-			
+
 			$arr = array();
 
 			$arr['uid']           = $page_owner_uid;
 			$arr['uri']           = $uri;
-			$arr['parent-uri']    = $uri; 
+			$arr['parent-uri']    = $uri;
 			$arr['type']          = 'photo';
 			$arr['wall']          = 1;
 			$arr['resource-id']   = $p[0]['resource-id'];
@@ -468,8 +495,8 @@ function photos_post(&$a) {
 			$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]' 
+			$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);
@@ -513,12 +540,12 @@ function photos_post(&$a) {
 							if(count($links)) {
 								foreach($links as $link) {
 									if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
-        		            			$profile = $link['@attributes']['href'];
+							$profile = $link['@attributes']['href'];
 									if($link['@attributes']['rel'] === 'salmon') {
 										$salmon = '$url:' . str_replace(',','%sc',$link['@attributes']['href']);
 										if(strlen($inform))
 											$inform .= ',';
-                    					$inform .= $salmon;
+							$inform .= $salmon;
 									}
 								}
 							}
@@ -586,14 +613,17 @@ function photos_post(&$a) {
 							if(strlen($str_tags))
 								$str_tags .= ',';
 							$profile = str_replace(',','%2c',$profile);
-							$str_tags .= '@[url=' . $profile . ']' . $newname	. '[/url]';
+							$str_tags .= '@[url='.$profile.']'.$newname.'[/url]';
 						}
+					} elseif (strpos($tag,'#') === 0) {
+						$tagname = substr($tag, 1);
+						$str_tags .= '#[url='.$a->get_baseurl()."/search?tag=".$tagname.']'.$tagname.'[/url]';
 					}
 				}
 			}
 
 			$newtag = $old_tag;
-			if(strlen($newtag) && strlen($str_tags)) 
+			if(strlen($newtag) && strlen($str_tags))
 				$newtag .= ',';
 			$newtag .= $str_tags;
 
@@ -672,11 +702,11 @@ function photos_post(&$a) {
 
 					$item_id = item_store($arr);
 					if($item_id) {
-						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)
-						);
+						//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)
+						//);
 
 						proc_run('php',"include/notifier.php","tag","$item_id");
 					}
@@ -718,7 +748,7 @@ function photos_post(&$a) {
 	 * overwhelm the data stream with a hundred newly uploaded photos.
 	 * So we will make the first photo uploaded to this album in the last several hours
 	 * visible by default, the rest will become visible over time when and if
-	 * they acquire comments, likes, dislikes, and/or tags 
+	 * they acquire comments, likes, dislikes, and/or tags
 	 *
 	 */
 
@@ -730,7 +760,7 @@ function photos_post(&$a) {
 		$visible = 1;
 	else
 		$visible = 0;
-	
+
 	if(intval($_REQUEST['not_visible']) || $_REQUEST['not_visible'] === 'true')
 		$visible = 0;
 
@@ -762,7 +792,7 @@ function photos_post(&$a) {
 	$maximagesize = get_config('system','maximagesize');
 
 	if(($maximagesize) && ($filesize > $maximagesize)) {
-		notice( t('Image exceeds size limit of ') . $maximagesize . EOL);
+		notice( sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL);
 		@unlink($src);
 		$foo = 0;
 		call_hooks('photo_post_end',$foo);
@@ -796,7 +826,7 @@ function photos_post(&$a) {
 		call_hooks('photo_post_end',$foo);
 		killme();
 	}
-		
+
 
 	$ph = new Photo($imagedata, $type);
 
@@ -844,7 +874,7 @@ function photos_post(&$a) {
 		$ph->store($page_owner_uid, $visitor, $photo_hash, $filename, $album, 2, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
 		$smallest = 2;
 	}
-	
+
 	$basename = basename($filename);
 	$uri = item_new_uri($a->get_hostname(), $page_owner_uid);
 
@@ -874,19 +904,19 @@ function photos_post(&$a) {
 	$arr['visible']       = $visible;
 	$arr['origin']        = 1;
 
-	$arr['body']          = '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo_hash . ']' 
-				. '[img]' . $a->get_baseurl() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/img]' 
+	$arr['body']          = '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo_hash . ']'
+				. '[img]' . $a->get_baseurl() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/img]'
 				. '[/url]';
 
 	$item_id = item_store($arr);
 
-	if($item_id) {
-		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($item_id) {
+	//	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)
 		proc_run('php', "include/notifier.php", 'wall-new', $item_id);
@@ -934,7 +964,7 @@ function photos_content(&$a) {
 	$_SESSION['photo_return'] = $a->cmd;
 
 	//
-	// Parse arguments 
+	// Parse arguments
 	//
 
 	if($a->argc > 3) {
@@ -1035,8 +1065,8 @@ function photos_content(&$a) {
 	$o = "";
 
 	// tabs
-	$_is_owner = (local_user() && (local_user() == $owner_uid));
-	$o .= profile_tabs($a,$_is_owner, $a->data['user']['nickname']);
+	$is_owner = (local_user() && (local_user() == $owner_uid));
+	$o .= profile_tabs($a,$is_owner, $a->data['user']['nickname']);
 
 	//
 	// dispatch request
@@ -1066,8 +1096,6 @@ function photos_content(&$a) {
 			}
 		}
 
-		$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
-
 		$uploader = '';
 
 		$ret = array('post_url' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'],
@@ -1116,11 +1144,11 @@ function photos_content(&$a) {
 
 		if($a->theme['template_engine'] === 'internal') {
 			$albumselect_e = template_escape($albumselect);
-			$aclselect_e = (($visitor) ? '' : template_escape(populate_acl($a->user, $celeb)));
+			$aclselect_e = (($visitor) ? '' : template_escape(populate_acl($a->user)));
 		}
 		else {
 			$albumselect_e = $albumselect;
-			$aclselect_e = (($visitor) ? '' : populate_acl($a->user, $celeb));
+			$aclselect_e = (($visitor) ? '' : populate_acl($a->user));
 		}
 
 		$o .= replace_macros($tpl,array(
@@ -1151,14 +1179,14 @@ function photos_content(&$a) {
 
 		));
 
-		return $o; 
+		return $o;
 	}
 
 	if($datatype === 'album') {
 
 		$album = hex2bin($datum);
 
-		$r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s' 
+		$r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s'
 			AND `scale` <= 4 $sql_extra GROUP BY `resource-id`",
 			intval($owner_uid),
 			dbesc($album)
@@ -1173,7 +1201,7 @@ function photos_content(&$a) {
 		else
 			$order = 'DESC';
 
-		$r = q("SELECT `resource-id`, `id`, `filename`, type, max(`scale`) AS `scale`, `desc` FROM `photo` WHERE `uid` = %d AND `album` = '%s' 
+		$r = q("SELECT `resource-id`, `id`, `filename`, type, max(`scale`) AS `scale`, `desc` FROM `photo` WHERE `uid` = %d AND `album` = '%s'
 			AND `scale` <= 4 $sql_extra GROUP BY `resource-id` ORDER BY `created` $order LIMIT %d , %d",
 			intval($owner_uid),
 			dbesc($album),
@@ -1181,8 +1209,6 @@ function photos_content(&$a) {
 			intval($a->pager['itemspage'])
 		);
 
-		$o .= '<h3>' . $album . '</h3>';
-
 		if($cmd === 'edit') {
 			if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
 				if($can_post) {
@@ -1209,25 +1235,18 @@ function photos_content(&$a) {
 		else {
 			if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
 				if($can_post) {
-					$o .= '<div id="album-edit-link"><a href="'. $a->get_baseurl() . '/photos/' 
-						. $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/edit' . '">' 
-						. t('Edit Album') . '</a></div>';
+					$edit = array(t('Edit Album'), $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/edit');
  				}
 			}
 		}
 
 		if($_GET['order'] === 'posted')
-			$o .=  '<div class="photos-upload-link" ><a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '" >' . t('Show Newest First') . '</a></div>';
+			$order =  array(t('Show Newest First'), $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album));
 		else
-			$o .= '<div class="photos-upload-link" ><a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?f=&order=posted" >' . t('Show Oldest First') . '</a></div>';
-
-
-		if($can_post) {
-			$o .= '<div class="photos-upload-link" ><a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album) . '" >' . t('Upload New Photos') . '</a></div>';
-		}
+			$order = array(t('Show Oldest First'), $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?f=&order=posted');
 
+		$photos = array();
 
-		$tpl = get_markup_template('photo_album.tpl');
 		if(count($r))
 			$twist = 'rotright';
 			foreach($r as $rr) {
@@ -1247,19 +1266,30 @@ function photos_content(&$a) {
 					$desc_e = $rr['desc'];
 				}
 
-				$o .= replace_macros($tpl,array(
-					'$id' => $rr['id'],
-					'$twist' => ' ' . $twist . rand(2,4),
-					'$photolink' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id']
+				$photos[] = array(
+					'id' => $rr['id'],
+					'twist' => ' ' . $twist . rand(2,4),
+					'link' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id']
 						. (($_GET['order'] === 'posted') ? '?f=&order=posted' : ''),
-					'$phototitle' => t('View Photo'),
-					'$imgsrc' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.' .$ext,
-					'$imgalt' => $imgalt_e,
-					'$desc'=> $desc_e
-				));
-
+					'title' => t('View Photo'),
+					'src' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.' .$ext,
+					'alt' => $imgalt_e,
+					'desc'=> $desc_e,
+					'ext' => $ext,
+					'hash'=> $rr['resource_id'],
+				);
 		}
-		$o .= '<div id="photo-album-end"></div>';
+
+		$tpl = get_markup_template('photo_album.tpl');
+		$o .= replace_macros($tpl, array(
+				'$photos' => $photos,
+				'$album' => $album,
+				'$can_post' => $can_post,
+				'$upload' => array(t('Upload New Photos'), $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album)),
+				'$order' => $order,
+				'$edit' => $edit
+			));
+
 		$o .= paginate($a);
 
 		return $o;
@@ -1274,7 +1304,7 @@ function photos_content(&$a) {
 		//$o = '';
 		// fetch image, item containing image, then comments
 
-		$ph = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' 
+		$ph = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'
 			$sql_extra ORDER BY `scale` ASC ",
 			intval($owner_uid),
 			dbesc($datum)
@@ -1350,8 +1380,8 @@ function photos_content(&$a) {
 			);
 
 			// lock
-			$lock = ( ( ($ph[0]['uid'] == local_user()) && (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid']) 
-					|| strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) ) 
+			$lock = ( ( ($ph[0]['uid'] == local_user()) && (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid'])
+					|| strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) )
 					? t('Private Message')
 					: Null);
 
@@ -1493,19 +1523,18 @@ function photos_content(&$a) {
 
 			$edit = replace_macros($edit_tpl, array(
 				'$id' => $ph[0]['id'],
-				'$rotatecw' => t('Rotate CW (right)'),
-				'$rotateccw' => t('Rotate CCW (left)'),
-				'$album' => $album_e,
-				'$newalbum' => t('New album name'),
+				'$album' => array('albname', t('New album name'), $album_e,''),
+				'$caption' => array('desc', t('Caption'), $caption_e, ''),
+				'$tags' => array('newtag', t('Add a Tag'), "", t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping')),
+				'$rotate_none' => array('rotate',t('Do not rotate'),0,'', true),
+				'$rotate_cw' => array('rotate',t('Rotate CW (right)'),1,''),
+				'$rotate_ccw' => array('rotate',t('Rotate CCW (left)'),2,''),
+
 				'$nickname' => $a->data['user']['nickname'],
 				'$resource_id' => $ph[0]['resource-id'],
-				'$capt_label' => t('Caption'),
-				'$caption' => $caption_e,
-				'$tag_label' => t('Add a Tag'),
-				'$tags' => $link_item['tag'],
 				'$permissions' => t('Permissions'),
 				'$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'),
@@ -1624,7 +1653,7 @@ function photos_content(&$a) {
 
 
 					if(local_user() && ($item['contact-uid'] == local_user())
-						&& ($item['network'] == 'dfrn') && (! $item['self'] )) {
+						&& ($item['network'] == NETWORK_DFRN) && (! $item['self'] )) {
 						$profile_url = $redirect_url;
 						$sparkle = ' sparkle';
 					}
@@ -1640,10 +1669,15 @@ function photos_content(&$a) {
 
 					$profile_link = $profile_url;
 
-					$drop = '';
 
-					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')));
+
+					$dropping = (($item['contact-id'] == $contact_id) || ($item['uid'] == local_user()));
+					$drop = array(
+						'dropping' => $dropping,
+						'pagedrop' => false,
+						'select' => t('Select'),
+						'delete' => t('Delete'),
+					);
 
 
 					if($a->theme['template_engine'] === 'internal') {
@@ -1744,7 +1778,7 @@ function photos_content(&$a) {
 	// Default - show recent photos with upload link (if applicable)
 	//$o = '';
 
-	$r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' 
+	$r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s'
 		$sql_extra GROUP BY `resource-id`",
 		intval($a->data['user']['uid']),
 		dbesc('Contact Photos'),
@@ -1756,7 +1790,7 @@ function photos_content(&$a) {
 	}
 
 	$r = q("SELECT `resource-id`, `id`, `filename`, type, `album`, max(`scale`) AS `scale` FROM `photo`
-		WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s'  
+		WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s'
 		$sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d",
 		intval($a->data['user']['uid']),
 		dbesc('Contact Photos'),
@@ -1771,12 +1805,16 @@ function photos_content(&$a) {
 	if(count($r)) {
 		$twist = 'rotright';
 		foreach($r as $rr) {
+			//hide profile photos to others
+			if((! $is_owner) && (! remote_user()) && ($rr['album'] == t('Profile Photos')))
+					continue;
+			
 			if($twist == 'rotright')
 				$twist = 'rotleft';
 			else
 				$twist = 'rotright';
 			$ext = $phototypes[$rr['type']];
-			
+
 			if($a->theme['template_engine'] === 'internal') {
 				$alt_e = template_escape($rr['filename']);
 				$name_e = template_escape($rr['album']);
@@ -1787,8 +1825,8 @@ function photos_content(&$a) {
 			}
 
 			$photos[] = array(
-				'id'       => $rr['id'],
-				'twist'    => ' ' . $twist . rand(2,4),
+				'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,