X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fphotos.php;h=b74ca85d71b5b1272b277f92c872614a5bb0be7a;hb=71f71ecf46c9dfc522685d171fbaf9bc7d73b708;hp=8957751cf01bc0f7d65a4f1219e9385b921e9829;hpb=fbcb74099acfdcbc2e18a07504feb76d359ec3b4;p=friendica.git

diff --git a/mod/photos.php b/mod/photos.php
index 8957751cf0..b74ca85d71 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1,17 +1,21 @@
 <?php
-
-require_once('Photo.php');
+require_once('include/Photo.php');
 require_once('include/items.php');
-require_once('view/acl_selectors.php');
+require_once('include/acl_selectors.php');
 require_once('include/bbcode.php');
+require_once('include/security.php');
 
 function photos_init(&$a) {
 
+
+	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+		return;
+	}
 	$o = '';
 
 	if($a->argc > 1) {
 		$nick = $a->argv[1];
-		$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1",
+		$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
 			dbesc($nick)
 		);
 
@@ -20,7 +24,9 @@ function photos_init(&$a) {
 
 		$a->data['user'] = $r[0];
 
-		$albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d",
+		$sql_extra = permissions_sql($a->data['user']['uid']);
+
+		$albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d $sql_extra ",
 			intval($a->data['user']['uid'])
 		);
 
@@ -32,7 +38,11 @@ function photos_init(&$a) {
 		
 			$o .= '<ul>';
 			foreach($albums as $album) {
-				if((! strlen($album['album'])) || ($album['album'] == t('Contact Photos')))
+
+				// don't show contact photos. We once trasnlated 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).
+
+				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>'; 
 			}
@@ -42,46 +52,102 @@ function photos_init(&$a) {
 		if(! x($a->page,'aside'))
 			$a->page['aside'] = '';
 		$a->page['aside'] .= $o;
+
+
+		$a->page['htmlhead'] .= "<script> var ispublic = '" . t('everybody') . "';" ;
+
+		$a->page['htmlhead'] .= <<< EOT
+
+		$(document).ready(function() {
+
+			$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+				var selstr;
+				$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+					selstr = $(this).text();
+					$('#jot-perms-icon').removeClass('unlock').addClass('lock');
+					$('#jot-public').hide();
+				});
+				if(selstr == null) { 
+					$('#jot-perms-icon').removeClass('lock').addClass('unlock');
+					$('#jot-public').show();
+				}
+
+			}).trigger('change');
+
+		});
+
+		</script>
+EOT;
 	}
+
 	return;
 }
 
 
 
-
 function photos_post(&$a) {
 
+	logger('mod/photos.php: photos_post(): begin' , 'LOGGER_DEBUG');
+
+	foreach($_REQUEST AS $key => $val) {
+		logger('mod/photos.php: photos_post(): $_REQUEST key: ' . $key . ' val: ' . $val , 'LOGGER_DEBUG');
+	}
 
-	if(! local_user()) {
+	foreach($_FILES AS $key => $val) {
+		logger('mod/photos.php: photos_post(): $_FILES key: ' . $key . ' val: ' . $val , 'LOGGER_DEBUG');
+	}
+
+	$can_post  = false;
+	$visitor   = 0;
+
+	$page_owner_uid = $a->data['user']['uid'];
+	$community_page = (($a->data['user']['page-flags'] == PAGE_COMMUNITY) ? true : false);
+
+	if((local_user()) && (local_user() == $page_owner_uid))
+		$can_post = true;
+	else {
+		if($community_page && remote_user()) {
+			$r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
+				intval(remote_user()),
+				intval($page_owner_uid)
+			);
+			if(count($r)) {
+				$can_post = true;
+				$visitor = remote_user();
+			}
+		}
+	}
+
+	if(! $can_post) {
 		notice( t('Permission denied.') . EOL );
 		killme();
 	}
 
 	$r = q("SELECT `contact`.*, `user`.`nickname` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` 
 		WHERE `user`.`uid` = %d AND `self` = 1 LIMIT 1",
-		intval(local_user())
+		intval($page_owner_uid)
 	);
 
 	if(! count($r)) {
 		notice( t('Contact information unavailable') . EOL);
-		logger('photos_post: unable to locate contact record for logged in user. uid=' . local_user());
+		logger('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid);
 		killme();
 	}
 
-	$contact_record = $r[0];	
+	$owner_record = $r[0];	
 
 
-	if(($a->argc > 2) && ($a->argv[1] === 'album')) {
-		$album = hex2bin($a->argv[2]);
+	if(($a->argc > 3) && ($a->argv[2] === 'album')) {
+		$album = hex2bin($a->argv[3]);
 
-		if($album == t('Profile Photos') || $album == t('Contact Photos')) {
+		if($album === t('Profile Photos') || $album === 'Contact Photos' || $album === t('Contact Photos')) {
 			goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
 			return; // NOTREACHED
 		}
 
 		$r = q("SELECT count(*) FROM `photo` WHERE `album` = '%s' AND `uid` = %d",
 			dbesc($album),
-			intval(local_user())
+			intval($page_owner_uid)
 		);
 		if(! count($r)) {
 			notice( t('Album not found.') . EOL);
@@ -94,20 +160,33 @@ function photos_post(&$a) {
 			q("UPDATE `photo` SET `album` = '%s' WHERE `album` = '%s' AND `uid` = %d",
 				dbesc($newalbum),
 				dbesc($album),
-				intval(local_user())
+				intval($page_owner_uid)
 			);
 			$newurl = str_replace(bin2hex($album),bin2hex($newalbum),$_SESSION['photo_return']);
 			goaway($a->get_baseurl() . '/' . $newurl);
 			return; // NOTREACHED
 		}
 
+
 		if($_POST['dropalbum'] == t('Delete Album')) {
 
 			$res = array();
-			$r = q("SELECT distinct(`resource-id`) as `rid` FROM `photo` WHERE `uid` = %d AND `album` = '%s'",
-				intval(local_user()),
-				dbesc($album)
-			);
+
+			// get the list of photos we are about to delete
+
+			if($visitor) {
+				$r = q("SELECT distinct(`resource-id`) as `rid` FROM `photo` WHERE `contact-id` = %d AND `uid` = %d AND `album` = '%s'",
+					intval($visitor),
+					intval($page_owner_uid),
+					dbesc($album)
+				);
+			}
+			else {
+				$r = q("SELECT distinct(`resource-id`) as `rid` FROM `photo` WHERE `uid` = %d AND `album` = '%s'",
+					intval(local_user()),
+					dbesc($album)
+				);
+			}
 			if(count($r)) {
 				foreach($r as $rr) {
 					$res[] = "'" . dbesc($rr['rid']) . "'" ;
@@ -117,31 +196,34 @@ function photos_post(&$a) {
 				goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
 				return; // NOTREACHED
 			}
+
 			$str_res = implode(',', $res);
 
+			// remove the associated photos
+
 			q("DELETE FROM `photo` WHERE `resource-id` IN ( $str_res ) AND `uid` = %d",
-				intval(local_user())
+				intval($page_owner_uid)
 			);
+
+			// find and delete the corresponding item with all the comments and likes/dislikes
+
 			$r = q("SELECT `parent-uri` FROM `item` WHERE `resource-id` IN ( $str_res ) AND `uid` = %d",
-				intval(local_user())
+				intval($page_owner_uid)
 			);
 			if(count($r)) {
 				foreach($r as $rr) {
 					q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
 						dbesc(datetime_convert()),
 						dbesc($rr['parent-uri']),
-						intval(local_user())
+						intval($page_owner_uid)
 					);
 
 					$drop_id = intval($rr['id']);
-					$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
 
 					// send the notification upstream/downstream as the case may be
 
 					if($rr['visible'])
-						proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" & ",
-							array(),$foo));
-
+						proc_run('php',"include/notifier.php","drop","$drop_id");
 				}
 			}
 		}
@@ -149,35 +231,45 @@ function photos_post(&$a) {
 		return; // NOTREACHED
 	}
 
-	if(($a->argc > 1) && (x($_POST,'delete')) && ($_POST['delete'] == t('Delete Photo'))) {
-		$r = q("SELECT `id`, `resource-id` FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' LIMIT 1",
-			intval(local_user()),
-			dbesc($a->argv[1])
-		);
+	if(($a->argc > 2) && (x($_POST,'delete')) && ($_POST['delete'] == t('Delete Photo'))) {
+
+		// same as above but remove single photo
+
+		if($visitor) {
+			$r = q("SELECT `id`, `resource-id` FROM `photo` WHERE `contact-id` = %d AND `uid` = %d AND `resource-id` = '%s' LIMIT 1",
+				intval($visitor),
+				intval($page_owner_uid),
+				dbesc($a->argv[2])
+			);
+		}
+		else {
+			$r = q("SELECT `id`, `resource-id` FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' LIMIT 1",
+				intval(local_user()),
+				dbesc($a->argv[2])
+			);
+		}
 		if(count($r)) {
 			q("DELETE FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'",
-				intval(local_user()),
+				intval($page_owner_uid),
 				dbesc($r[0]['resource-id'])
 			);
 			$i = q("SELECT * FROM `item` WHERE `resource-id` = '%s' AND `uid` = %d LIMIT 1",
 				dbesc($r[0]['resource-id']),
-				intval(local_user())
+				intval($page_owner_uid)
 			);
 			if(count($i)) {
 				q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
 					dbesc(datetime_convert()),
 					dbesc(datetime_convert()),
 					dbesc($i[0]['uri']),
-					intval(local_user())
+					intval($page_owner_uid)
 				);
 
 				$url = $a->get_baseurl();
 				$drop_id = intval($i[0]['id']);
-				$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
 
 				if($i[0]['visible'])
-					proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" & ",
-						array(),$foo));
+					proc_run('php',"include/notifier.php","drop","$drop_id");
 			}
 		}
 
@@ -185,53 +277,77 @@ function photos_post(&$a) {
 		return; // NOTREACHED
 	}
 
-	if(($a->argc > 1) && ((x($_POST,'desc') !== false) || (x($_POST,'newtag') !== false))) {
+	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);
+		$albname     = ((x($_POST,'albname')) ? notags(trim($_POST['albname'])) : '');
+		$str_group_allow   = perms2str($_POST['group_allow']);
+		$str_contact_allow = perms2str($_POST['contact_allow']);
+		$str_group_deny    = perms2str($_POST['group_deny']);
+		$str_contact_deny  = perms2str($_POST['contact_deny']);
 
-		$desc        = ((x($_POST,'desc'))    ? notags(trim($_POST['desc']))   : '');
-		$rawtags     = ((x($_POST,'newtag'))  ? notags(trim($_POST['newtag'])) : '');
-		$item_id     = ((x($_POST,'item_id')) ? intval($_POST['item_id'])      : 0);
-		$resource_id = $a->argv[1];
+		$resource_id = $a->argv[2];
+
+		if(! strlen($albname))
+			$albname = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y');
+		
 
 		$p = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d ORDER BY `scale` DESC",
 			dbesc($resource_id),
-			intval(local_user())
+			intval($page_owner_uid)
 		);
-		if((count($p)) && ($p[0]['desc'] !== $desc)) {
-			$r = q("UPDATE `photo` SET `desc` = '%s' WHERE `resource-id` = '%s' AND `uid` = %d",
+		if(count($p)) {
+			$r = q("UPDATE `photo` SET `desc` = '%s', `album` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' WHERE `resource-id` = '%s' AND `uid` = %d",
 				dbesc($desc),
+				dbesc($albname),
+				dbesc($str_contact_allow),
+				dbesc($str_group_allow),
+				dbesc($str_contact_deny),
+				dbesc($str_group_deny),
 				dbesc($resource_id),
-				intval(local_user())
+				intval($page_owner_uid)
 			);
 		}
+
+		/* Don't make the item visible if the only change was the album name */
+
+		$visibility = 0;
+		if($p[0]['desc'] !== $desc || strlen($rawtags))
+			$visibility = 1;
+		
 		if(! $item_id) {
 
 			// Create item container
 
 			$title = '';
 			$basename = basename($filename);
-			$uri = item_new_uri($a->get_hostname(),local_user());
+			$uri = item_new_uri($a->get_hostname(),$page_owner_uid);
 
 			$arr = array();
 
-			$arr['uid']           = local_user();
+			$arr['uid']           = $page_owner_uid;
 			$arr['uri']           = $uri;
 			$arr['parent-uri']    = $uri; 
 			$arr['type']          = 'photo';
 			$arr['wall']          = 1;
 			$arr['resource-id']   = $p[0]['resource-id'];
-			$arr['contact-id']    = $contact_record['id'];
-			$arr['owner-name']    = $contact_record['name'];
-			$arr['owner-link']    = $contact_record['url'];
-			$arr['owner-avatar']  = $contact_record['thumb'];
-			$arr['author-name']   = $contact_record['name'];
-			$arr['author-link']   = $contact_record['url'];
-			$arr['author-avatar'] = $contact_record['thumb'];
+			$arr['contact-id']    = $owner_record['id'];
+			$arr['owner-name']    = $owner_record['name'];
+			$arr['owner-link']    = $owner_record['url'];
+			$arr['owner-avatar']  = $owner_record['thumb'];
+			$arr['author-name']   = $owner_record['name'];
+			$arr['author-link']   = $owner_record['url'];
+			$arr['author-avatar'] = $owner_record['thumb'];
 			$arr['title']         = $title;
 			$arr['allow_cid']     = $p[0]['allow_cid'];
 			$arr['allow_gid']     = $p[0]['allow_gid'];
 			$arr['deny_cid']      = $p[0]['deny_cid'];
 			$arr['deny_gid']      = $p[0]['deny_gid'];
 			$arr['last-child']    = 1;
+			$arr['visible']       = $visibility;
+			
 			$arr['body']          = '[url=' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $p[0]['resource-id'] . ']' 
 						. '[img]' . $a->get_baseurl() . '/photo/' . $p[0]['resource-id'] . '-' . $p[0]['scale'] . '.jpg' . '[/img]' 
 						. '[/url]';
@@ -243,7 +359,7 @@ function photos_post(&$a) {
 		if($item_id) {
 			$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 				intval($item_id),
-				intval(local_user())
+				intval($page_owner_uid)
 			);
 		}
 		if(count($r)) {
@@ -267,6 +383,8 @@ function photos_post(&$a) {
 
 			if(count($tags)) {
 				foreach($tags as $tag) {
+					if(isset($profile))
+						unset($profile);
 					if(strpos($tag,'@') === 0) {
 						$name = substr($tag,1);
 						if((strpos($name,'@')) || (strpos($name,'http://'))) {
@@ -288,17 +406,18 @@ function photos_post(&$a) {
 						}
 						else {
 							$newname = $name;
-							if(strstr($name,'_')) {
+							if(strstr($name,'_') || strstr($name,' ')) {
 								$newname = str_replace('_',' ',$name);
 								$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
 									dbesc($newname),
-									intval(local_user())
+									intval($page_owner_uid)
 								);
 							}
 							else {
-								$r = q("SELECT * FROM `contact` WHERE `nick` = '%s' AND `uid` = %d LIMIT 1",
+								$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(local_user())
+									intval($page_owner_uid)
 								);
 							}
 							if(count($r)) {
@@ -340,7 +459,7 @@ function photos_post(&$a) {
 				dbesc(datetime_convert()),
 				dbesc(datetime_convert()),
 				intval($item_id),
-				intval(local_user())
+				intval($page_owner_uid)
 			);
 
 			$best = 0;
@@ -358,22 +477,22 @@ function photos_post(&$a) {
 			if(count($taginfo)) {
 				foreach($taginfo as $tagged) {
 		
-					$uri = item_new_uri($a->get_hostname(),local_user());
+					$uri = item_new_uri($a->get_hostname(),$page_owner_uid);
 
 					$arr = array();
 
-					$arr['uid']           = local_user();
+					$arr['uid']           = $page_owner_uid;
 					$arr['uri']           = $uri;
 					$arr['parent-uri']    = $uri;
 					$arr['type']          = 'activity';
 					$arr['wall']          = 1;
-					$arr['contact-id']    = $contact_record['id'];
-					$arr['owner-name']    = $contact_record['name'];
-					$arr['owner-link']    = $contact_record['url'];
-					$arr['owner-avatar']  = $contact_record['thumb'];
-					$arr['author-name']   = $contact_record['name'];
-					$arr['author-link']   = $contact_record['url'];
-					$arr['author-avatar'] = $contact_record['thumb'];
+					$arr['contact-id']    = $owner_record['id'];
+					$arr['owner-name']    = $owner_record['name'];
+					$arr['owner-link']    = $owner_record['url'];
+					$arr['owner-avatar']  = $owner_record['thumb'];
+					$arr['author-name']   = $owner_record['name'];
+					$arr['author-link']   = $owner_record['url'];
+					$arr['author-avatar'] = $owner_record['thumb'];
 					$arr['title']         = '';
 					$arr['allow_cid']     = $p[0]['allow_cid'];
 					$arr['allow_gid']     = $p[0]['allow_gid'];
@@ -387,8 +506,8 @@ function photos_post(&$a) {
 					$arr['tag']           = $tagged[4];
 					$arr['inform']        = $tagged[2];
 
-					$arr['body']          = '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]' . ' ' . t('was tagged in a') . ' ' . '[url=' . $a->get_baseurl() . '/photos/' . $contact_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . t('photo') . '[/url]' . ' ' . t('by') . ' ' . '[url=' . $contact_record['url'] . ']' . $contact_record['name'] . '[/url]' ;
-					$arr['body'] .= "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $contact_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . '[img]' . $a->get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.jpg' . '[/img][/url]' . "\n" ;
+					$arr['body']          = '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]' . ' ' . t('was tagged in a') . ' ' . '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . t('photo') . '[/url]' . ' ' . t('by') . ' ' . '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]' ;
+					$arr['body'] .= "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . '[img]' . $a->get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.jpg' . '[/img][/url]' . "\n" ;
 
 					$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $tagged[0] . '</title><id>' . $tagged[1] . '/' . $tagged[0] . '</id>';
 					$arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $tagged[1] . '" />' . "\n");
@@ -397,13 +516,19 @@ function photos_post(&$a) {
 					$arr['object'] .= '</link></object>' . "\n";
 
 					$arr['target'] = '<target><type>' . ACTIVITY_OBJ_PHOTO . '</type><title>' . $p[0]['desc'] . '</title><id>'
-						. $a->get_baseurl() . '/photos/' . $contact_record['nickname'] . '/image/' . $p[0]['resource-id'] . '</id>';
-					$arr['target'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $a->get_baseurl() . '/photos/' . $contact_record['nickname'] . '/image/' . $p[0]['resource-id'] . '" />' . "\n" . '<link rel="preview" type="image/jpeg" href="' . $a->get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.jpg' . '" />') . '</link></target>';
+						. $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '</id>';
+					$arr['target'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '" />' . "\n" . '<link rel="preview" type="image/jpeg" href="' . $a->get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.jpg' . '" />') . '</link></target>';
 
 					$item_id = item_store($arr);
-					$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-					proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"tag\" \"$item_id\" & ",
-						array(),$foo));
+					if($item_id) {
+						q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
+							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");
+					}
 				}
 
 			}
@@ -414,18 +539,20 @@ function photos_post(&$a) {
 	}
 
 
-	// default post action - upload a photo
+	/**
+	 * default post action - upload a photo
+	 */
 
-	if(! x($_FILES,'userfile'))
-		killme();
+	call_hooks('photo_post_init', $_POST);
 
-	if($_POST['partitionCount'])
-		$java_upload = true;
-	else
-		$java_upload = false;
+	/**
+	 * Determine the album to use
+	 */
 
-	$album =  notags(trim($_POST['album']));
-	$newalbum = notags(trim($_POST['newalbum']));
+	$album    = notags(trim($_REQUEST['album']));
+	$newalbum = notags(trim($_REQUEST['newalbum']));
+
+	logger('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , 'LOGGER_DEBUG');
 
 	if(! strlen($album)) {
 		if(strlen($newalbum))
@@ -434,83 +561,129 @@ function photos_post(&$a) {
 			$album = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y');
 	}
 
-	$r = q("SELECT * FROM `photo` WHERE `album` = '%s' AND `uid` = %d",
+	/**
+	 *
+	 * We create a wall item for every photo, but we don't want to
+	 * 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 
+	 *
+	 */
+
+	$r = q("SELECT * FROM `photo` WHERE `album` = '%s' AND `uid` = %d AND `created` > UTC_TIMESTAMP() - INTERVAL 3 HOUR ",
 		dbesc($album),
-		intval(local_user())
+		intval($page_owner_uid)
 	);
 	if((! count($r)) || ($album == t('Profile Photos')))
 		$visible = 1;
 	else
 		$visible = 0;
 
+	$str_group_allow   = perms2str(((is_array($_REQUEST['group_allow']))   ? $_REQUEST['group_allow']   : explode(',',$_REQUEST['group_allow'])));
+	$str_contact_allow = perms2str(((is_array($_REQUEST['contact_allow'])) ? $_REQUEST['contact_allow'] : explode(',',$_REQUEST['contact_allow'])));
+	$str_group_deny    = perms2str(((is_array($_REQUEST['group_deny']))    ? $_REQUEST['group_deny']    : explode(',',$_REQUEST['group_deny'])));
+	$str_contact_deny  = perms2str(((is_array($_REQUEST['contact_deny']))  ? $_REQUEST['contact_deny']  : explode(',',$_REQUEST['contact_deny'])));
+
+	$ret = array('src' => '', 'filename' => '', 'filesize' => 0);
 
-	$str_group_allow   = perms2str($_POST['group_allow']);
-	$str_contact_allow = perms2str($_POST['contact_allow']);
-	$str_group_deny    = perms2str($_POST['group_deny']);
-	$str_contact_deny  = perms2str($_POST['contact_deny']);
+	call_hooks('photo_post_file',$ret);
 
-	$src               = $_FILES['userfile']['tmp_name'];
-	$filename          = basename($_FILES['userfile']['name']);
-	$filesize          = intval($_FILES['userfile']['size']);
+	if(x($ret,'src') && x($ret,'filesize')) {
+		$src      = $ret['src'];
+		$filename = $ret['filename'];
+		$filesize = $ret['filesize'];
+	}
+	else {
+		$src        = $_FILES['userfile']['tmp_name'];
+		$filename   = basename($_FILES['userfile']['name']);
+		$filesize   = intval($_FILES['userfile']['size']);
+	}
+
+
+	logger('photos: upload: received file: ' . $filename . ' as ' . $src . ' ' . $filesize . ' bytes', LOGGER_DEBUG);
+
+	$maximagesize = get_config('system','maximagesize');
+
+	if(($maximagesize) && ($filesize > $maximagesize)) {
+		notice( t('Image exceeds size limit of ') . $maximagesize . EOL);
+		@unlink($src);
+		$foo = 0;
+		call_hooks('photo_post_end',$foo);
+		return;
+	}
+
+	if(! $filesize) {
+		notice( t('Image file is empty.') . EOL);
+		@unlink($src);
+		$foo = 0;
+		call_hooks('photo_post_end',$foo);
+		return;
+	}
+
+	logger('mod/photos.php: photos_post(): loading the contents of ' . $src , 'LOGGER_DEBUG');
 
 	$imagedata = @file_get_contents($src);
 	$ph = new Photo($imagedata);
 
 	if(! $ph->is_valid()) {
+		logger('mod/photos.php: photos_post(): unable to process image' , 'LOGGER_DEBUG');
 		notice( t('Unable to process image.') . EOL );
 		@unlink($src);
+		$foo = 0;
+		call_hooks('photo_post_end',$foo);
 		killme();
 	}
 
 	@unlink($src);
 
-	$width = $ph->getWidth();
+	$width  = $ph->getWidth();
 	$height = $ph->getHeight();
 
 	$smallest = 0;
 
 	$photo_hash = photo_new_resource();
 
-	$r = $ph->store(local_user(), 0, $photo_hash, $filename, $album, 0 , 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
+	$r = $ph->store($page_owner_uid, $visitor, $photo_hash, $filename, $album, 0 , 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
 
 	if(! $r) {
+		logger('mod/photos.php: photos_post(): image store failed' , 'LOGGER_DEBUG');
 		notice( t('Image upload failed.') . EOL );
 		killme();
 	}
 
 	if($width > 640 || $height > 640) {
 		$ph->scaleImage(640);
-		$ph->store(local_user(), 0, $photo_hash, $filename, $album, 1, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
+		$ph->store($page_owner_uid, $visitor, $photo_hash, $filename, $album, 1, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
 		$smallest = 1;
 	}
 
 	if($width > 320 || $height > 320) {
 		$ph->scaleImage(320);
-		$ph->store(local_user(), 0, $photo_hash, $filename, $album, 2, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
+		$ph->store($page_owner_uid, $visitor, $photo_hash, $filename, $album, 2, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
 		$smallest = 2;
 	}
 	
 	$basename = basename($filename);
-	$uri = item_new_uri($a->get_hostname(), local_user());
+	$uri = item_new_uri($a->get_hostname(), $page_owner_uid);
 
 	// Create item container
 
-
 	$arr = array();
 
-	$arr['uid']           = local_user();
+	$arr['uid']           = $page_owner_uid;
 	$arr['uri']           = $uri;
 	$arr['parent-uri']    = $uri;
 	$arr['type']          = 'photo';
 	$arr['wall']          = 1;
 	$arr['resource-id']   = $photo_hash;
-	$arr['contact-id']    = $contact_record['id'];
-	$arr['owner-name']    = $contact_record['name'];
-	$arr['owner-link']    = $contact_record['url'];
-	$arr['owner-avatar']  = $contact_record['thumb'];
-	$arr['author-name']   = $contact_record['name'];
-	$arr['author-link']   = $contact_record['url'];
-	$arr['author-avatar'] = $contact_record['thumb'];
+	$arr['contact-id']    = $owner_record['id'];
+	$arr['owner-name']    = $owner_record['name'];
+	$arr['owner-link']    = $owner_record['url'];
+	$arr['owner-avatar']  = $owner_record['thumb'];
+	$arr['author-name']   = $owner_record['name'];
+	$arr['author-link']   = $owner_record['url'];
+	$arr['author-avatar'] = $owner_record['thumb'];
 	$arr['title']         = '';
 	$arr['allow_cid']     = $str_contact_allow;
 	$arr['allow_gid']     = $str_group_allow;
@@ -518,20 +691,30 @@ function photos_post(&$a) {
 	$arr['deny_gid']      = $str_group_deny;
 	$arr['last-child']    = 1;
 	$arr['visible']       = $visible;
-	$arr['body']          = '[url=' . $a->get_baseurl() . '/photos/' . $contact_record['nickname'] . '/image/' . $photo_hash . ']' 
+	$arr['body']          = '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo_hash . ']' 
 				. '[img]' . $a->get_baseurl() . "/photo/{$photo_hash}-{$smallest}.jpg" . '[/img]' 
 				. '[/url]';
 
 	$item_id = item_store($arr);
 
-	if(! $java_upload) {
-		goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
-		return; // NOTREACHED
+	if($item_id) {
+		q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
+			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);
 
-	killme();
-	return; // NOTREACHED
+	call_hooks('photo_post_end',intval($item_id));
 
+	// addon uploaders should call "killme()" [e.g. exit] within the photo_post_end hook
+	// if they do not wish to be redirected
+
+	goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+	// NOTREACHED
 }
 
 
@@ -547,6 +730,16 @@ function photos_content(&$a) {
 	// photos/name/image/xxxxx/edit
 
 
+	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+		notice( t('Public access denied.') . EOL);
+		return;
+	}
+
+
+	require_once('include/bbcode.php');
+	require_once('include/security.php');
+	require_once('include/conversation.php');
+
 	if(! x($a->data,'user')) {
 		notice( t('No photos selected') . EOL );
 		return;
@@ -576,18 +769,39 @@ function photos_content(&$a) {
 	// Setup permissions structures
 	//
 
+	$can_post       = false;
+	$visitor        = 0;
+	$contact        = null;
+	$remote_contact = false;
+
 	$owner_uid = $a->data['user']['uid'];
 
+	$community_page = (($a->data['user']['page-flags'] == PAGE_COMMUNITY) ? true : false);
 
+	if((local_user()) && (local_user() == $owner_uid))
+		$can_post = true;
+	else {
+		if($community_page && remote_user()) {
+			$r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
+				intval(remote_user()),
+				intval($owner_uid)
+			);
+			if(count($r)) {
+				$can_post = true;
+				$contact  = $r[0];
+				$remote_contact = true;
+				$visitor = remote_user();
+			}
+		}
+	}
 
-	$contact = null;
-	$remote_contact = false;
+	// perhaps they're visiting - but not a community page, so they wouldn't have write access
 
-	if(remote_user()) {
+	if(remote_user() && (! $visitor)) {
 		$contact_id = $_SESSION['visitor_id'];
 		$groups = init_groups_visitor($contact_id);
-		$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-			intval($contact_id),
+		$r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
+			intval(remote_user()),
 			intval($owner_uid)
 		);
 		if(count($r)) {
@@ -603,35 +817,28 @@ function photos_content(&$a) {
 		}
 	}
 
+	if($a->data['user']['hidewall'] && (local_user() != $owner_uid) && (! $remote_contact)) {
+		notice( t('Access to this item is restricted.') . EOL);
+		return;
+	}
 
-	// default permissions - anonymous user
-
-	$sql_extra = " AND `allow_cid` = '' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = '' ";
+	$sql_extra = permissions_sql($owner_uid,$remote_contact,$groups);
 
-	// Profile owner - everything is visible
+	$o = "";
 
-	if(local_user() && (local_user() == $owner_uid)) {
-		$sql_extra = ''; 	
-	}
-	elseif(remote_user()) {
-		// authenticated visitor - here lie dragons
-		$gs = '<<>>'; // should be impossible to match
-		if(count($groups)) {
-			foreach($groups as $g)
-				$gs .= '|<' . intval($g) . '>';
-		} 
-		$sql_extra = sprintf(
-			" AND ( `allow_cid` = '' OR `allow_cid` REGEXP '<%d>' ) 
-			  AND ( `deny_cid`  = '' OR  NOT `deny_cid` REGEXP '<%d>' ) 
-			  AND ( `allow_gid` = '' OR `allow_gid` REGEXP '%s' )
-			  AND ( `deny_gid`  = '' OR NOT `deny_gid` REGEXP '%s') ",
-
-			intval($_SESSION['visitor_id']),
-			intval($_SESSION['visitor_id']),
-			dbesc($gs),
-			dbesc($gs)
-		);
-	}
+	// tabs
+	$tpl = get_markup_template('profile_tabs.tpl');
+	$_is_owner = (local_user() && (local_user() == $owner_uid));
+	$o .= replace_macros($tpl,array(
+		'$url' => $a->get_baseurl() . '/profile/' .$a->data['user']['nickname'],
+		'$phototab' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'],
+		'$status' => t('Status'),
+		'$profile' => t('Profile'),
+		'$photos' => t('Photos'),
+		'$events' => (($_is_owner) ? t('Events') : ''),
+		'$notes' => (($_is_owner) ? 	t('Personal Notes') : ''),
+		'$activetab' => "photos",
+	));	
 
 	//
 	// dispatch request
@@ -639,7 +846,7 @@ function photos_content(&$a) {
 
 
 	if($datatype === 'upload') {
-		if( ! (local_user() && (local_user() == $a->data['user']['uid']))) {
+		if(! ($can_post)) {
 			notice( t('Permission denied.'));
 			return;
 		}
@@ -648,7 +855,7 @@ function photos_content(&$a) {
 		$albumselect .= '<option value="" selected="selected" >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
 		if(count($a->data['albums'])) {
 			foreach($a->data['albums'] as $album) {
-				if(($album['album'] === '') || ($album['album'] == t('Contact Photos')))
+				if(($album['album'] === '') || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos')))
 					continue;
 				$albumselect .= '<option value="' . $album['album'] . '">' . $album['album'] . '</option>';
 			}
@@ -657,24 +864,39 @@ function photos_content(&$a) {
 		$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
 
 		$albumselect .= '</select>';
-		$tpl = load_view_file('view/photos_upload.tpl');
+
+		$uploader = '';
+
+		$ret = array('post_url' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'],
+				'addon_text' => $uploader,
+				'default_upload' => true);
+
+
+		call_hooks('photo_upload_form',$ret);
+
+		$default_upload = '<input type="file" name="userfile" /> 	<div class="photos-upload-submit-wrapper" >
+		<input type="submit" name="submit" value="' . t('Submit') . '" id="photos-upload-submit" /> </div>';
+
+
+ 
+
+		$tpl = get_markup_template('photos_upload.tpl');
 		$o .= replace_macros($tpl,array(
 			'$pagename' => t('Upload Photos'),
 			'$sessid' => session_id(),
+			'$nickname' => $a->data['user']['nickname'],
 			'$newalbum' => t('New album name: '),
 			'$existalbumtext' => t('or existing album name: '),
-			'$filestext' => t('Select files to upload: '),
 			'$albumselect' => $albumselect,
 			'$permissions' => t('Permissions'),
-			'$aclselect' => populate_acl($a->user, $celeb),
-			'$archive' => $a->get_baseurl() . '/jumploader_z.jar',
-			'$nojava' => t('Use the following controls only if the Java uploader [above] fails to launch.'),
-			'$uploadurl' => $a->get_baseurl() . '/photos',
-			'$submit' => t('Submit')
+			'$aclselect' => (($visitor) ? '' : populate_acl($a->user, $celeb)),
+			'$uploader' => $ret['addon_text'],
+			'$default' => (($ret['default_upload']) ? $default_upload : ''),
+			'$uploadurl' => $ret['post_url']
+
 		));
 
 		return $o; 
-
 	}
 
 	if($datatype === 'album') {
@@ -682,17 +904,18 @@ function photos_content(&$a) {
 		$album = hex2bin($datum);
 
 		$r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s' 
-			$sql_extra GROUP BY `resource-id`",
-			intval($a->data['user']['uid']),
+			AND `scale` <= 4 $sql_extra GROUP BY `resource-id`",
+			intval($owner_uid),
 			dbesc($album)
 		);
-		if(count($r))
+		if(count($r)) {
 			$a->set_pager_total(count($r));
+			$a->set_pager_itemspage(20);
+		}
 
-
-		$r = q("SELECT `resource-id`, `id`, `filename`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s' 
-			$sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d",
-			intval($a->data['user']['uid']),
+		$r = q("SELECT `resource-id`, `id`, `filename`, 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` DESC LIMIT %d , %d",
+			intval($owner_uid),
 			dbesc($album),
 			intval($a->pager['start']),
 			intval($a->pager['itemspage'])
@@ -701,11 +924,12 @@ function photos_content(&$a) {
 		$o .= '<h3>' . $album . '</h3>';
 		
 		if($cmd === 'edit') {		
-			if(($album != t('Profile Photos')) && ($album != t('Contact Photos'))) {
-				if(local_user() && (local_user() == $a->data['user']['uid'])) {
-					$edit_tpl = load_view_file('view/album_edit.tpl');
+			if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
+				if($can_post) {
+					$edit_tpl = get_markup_template('album_edit.tpl');
 					$o .= replace_macros($edit_tpl,array(
 						'$nametext' => t('New album name: '),
+						'$nickname' => $a->data['user']['nickname'],
 						'$album' => $album,
 						'$hexalbum' => bin2hex($album),
 						'$submit' => t('Submit'),
@@ -715,15 +939,15 @@ function photos_content(&$a) {
 			}
 		}
 		else {
-			if(($album != t('Profile Photos')) && ($album != t('Contact Photos'))) {
-				if(local_user() && (local_user() == $a->data['user']['uid'])) {
+			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>';
  				}
 			}
 		}
-		$tpl = load_view_file('view/photo_album.tpl');
+		$tpl = get_markup_template('photo_album.tpl');
 		if(count($r))
 			foreach($r as $rr) {
 				$o .= replace_macros($tpl,array(
@@ -731,11 +955,14 @@ function photos_content(&$a) {
 					'$photolink' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
 					'$phototitle' => t('View Photo'),
 					'$imgsrc' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.jpg',
-					'$imgalt' => $rr['filename']
+					'$imgalt' => $rr['filename'],
+					'$desc'=> $rr['desc']
 				));
 
 		}
 		$o .= '<div id="photo-album-end"></div>';
+		$o .= paginate($a);
+
 		return $o;
 
 	}	
@@ -743,15 +970,14 @@ function photos_content(&$a) {
 
 	if($datatype === 'image') {
 
-		require_once('security.php');
-		require_once('bbcode.php');
 
-		$o = '<div id="live-display"></div>' . "\r\n";
+
+		//$o = '';
 		// fetch image, item containing image, then comments
 
 		$ph = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' 
 			$sql_extra ORDER BY `scale` ASC ",
-			intval($a->data['user']['uid']),
+			intval($owner_uid),
 			dbesc($datum)
 		);
 
@@ -760,6 +986,32 @@ function photos_content(&$a) {
 			return;
 		}
 
+		$prevlink = '';
+		$nextlink = '';
+
+		$prvnxt = q("SELECT `resource-id` FROM `photo` WHERE `album` = '%s' AND `uid` = %d AND `scale` = 0 
+			$sql_extra ORDER BY `created` DESC ",
+			dbesc($ph[0]['album']),
+			intval($owner_uid)
+		); 
+
+		if(count($prvnxt)) {
+			for($z = 0; $z < count($prvnxt); $z++) {
+				if($prvnxt[$z]['resource-id'] == $ph[0]['resource-id']) {
+					$prv = $z - 1;
+					$nxt = $z + 1;
+					if($prv < 0)
+						$prv = count($prvnxt) - 1;
+					if($nxt >= count($prvnxt))
+						$nxt = 0;
+					break;
+				}
+			}
+			$prevlink = $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$prv]['resource-id'] ;
+			$nextlink = $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$nxt]['resource-id'] ;
+ 		}
+
+
 		if(count($ph) == 1)
 			$hires = $lores = $ph[0];
 		if(count($ph) > 1) {
@@ -773,18 +1025,36 @@ function photos_content(&$a) {
 			}
 		}
 
-		
-		$o .= '<h3>' . '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($ph[0]['album']) . '">' . $ph[0]['album'] . '</a></h3>';
+		$album_link = $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($ph[0]['album']);
+ 		$tools = Null;
+ 		$lock = Null;
  
-		if(local_user() && ($ph[0]['uid'] == local_user())) {
-			$o .= '<div id="photo-edit-link-wrap" ><a id="photo-edit-link" href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $datum . '/edit' . '">' . t('Edit photo') . '</a></div>';
+		if($can_post && ($ph[0]['uid'] == $owner_uid)) {
+			$tools = array(
+				'edit'	=> array($a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $datum . '/edit', t('Edit photo')),
+				'profile'=>array($a->get_baseurl() . '/profile_photo/use/'.$ph[0]['resource-id'], t('Use as profile photo')),
+			);
+
+			// 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'])) ) 
+					? t('Private Message')
+					: Null);
+	  		
+			
 		}
 
+		if($prevlink)
+			$prevlink = array($prevlink, '<div class="icon prev"></div>') ;
 
-		$o .= '<a href="' . $a->get_baseurl() . '/photo/' 
-			. $hires['resource-id'] . '-' . $hires['scale'] . '.jpg" title="' 
-			. t('View Full Size') . '" ><img src="' . $a->get_baseurl() . '/photo/' 
-			. $lores['resource-id'] . '-' . $lores['scale'] . '.jpg' . '" /></a>';
+		$photo = array(
+			'href' => $a->get_baseurl() . '/photo/' . $hires['resource-id'] . '-' . $hires['scale'] . '.jpg',
+			'title'=> t('View Full Size'),
+			'src'  => $a->get_baseurl() . '/photo/' . $lores['resource-id'] . '-' . $lores['scale'] . '.jpg'
+		);
+
+		if($nextlink)
+			$nextlink = array($nextlink, '<div class="icon next"></div>');
 
 
 		// Do we have an item for this photo?
@@ -836,69 +1106,83 @@ function photos_content(&$a) {
 			}
 		}
 
-		$o .= '<div id="photo-caption" >' . $ph[0]['desc'] . '</div>';
+		$tags=Null;
 
 		if(count($linked_items) && strlen($link_item['tag'])) {
 			$arr = explode(',',$link_item['tag']);
-			// parse tags and add links	
-			$o .= '<div id="in-this-photo-text">' . t('Tags: ') . '</div>';
-			$o .= '<div id="in-this-photo">';
+			// parse tags and add links
 			$tag_str = '';
 			foreach($arr as $t) {
 				if(strlen($tag_str))
 					$tag_str .= ', ';
 				$tag_str .= bbcode($t);
 			} 
-			$o .= $tag_str . '</div>';
+			$tags = array(t('Tags: '), $tag_str);
+			if($cmd === 'edit') {
+				$tags[] = $a->get_baseurl() . '/tagrm/' . $link_item['id'];
+				$tags[] = t('[Remove any tag]');
+			}
 		}
 
 
-		if($cmd === 'edit') {
-			$edit_tpl = load_view_file('view/photo_edit.tpl');
-			$o .= replace_macros($edit_tpl, array(
+		$edit = Null;
+		if(($cmd === 'edit') && ($can_post)) {
+			$edit_tpl = get_markup_template('photo_edit.tpl');
+			$edit = replace_macros($edit_tpl, array(
 				'$id' => $ph[0]['id'],
+				'$album' => $ph[0]['album'],
+				'$newalbum' => t('New album name'), 
+				'$nickname' => $a->data['user']['nickname'],
 				'$resource_id' => $ph[0]['resource-id'],
 				'$capt_label' => t('Caption'),
 				'$caption' => $ph[0]['desc'],
 				'$tag_label' => t('Add a Tag'),
 				'$tags' => $link_item['tag'],
+				'$permissions' => t('Permissions'),
+				'$aclselect' => populate_acl($ph[0]),
 				'$help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'),
 				'$item_id' => ((count($linked_items)) ? $link_item['id'] : 0),
 				'$submit' => t('Submit'),
 				'$delete' => t('Delete Photo')
-
 			));
 		}
 
 		if(count($linked_items)) {
 
-			$cmnt_tpl = load_view_file('view/comment_item.tpl');
-			$tpl = load_view_file('view/photo_item.tpl');
+			$cmnt_tpl = get_markup_template('comment_item.tpl');
+			$tpl = get_markup_template('photo_item.tpl');
 			$return_url = $a->cmd;
 
-			$like_tpl = load_view_file('view/like.tpl');
+			$like_tpl = get_markup_template('like_noshare.tpl');
 
 			$likebuttons = '';
 
-			if(can_write_wall($a,$a->data['user']['uid']))
-				$likebuttons = replace_macros($like_tpl,array('$id' => $link_item['id']));
+			if($can_post || can_write_wall($a,$owner_uid)) {
+				$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"),
+					'$share' => t('Share'),
+					'$wait' => t('Please wait')
+				));
+			}
 
+			$comments = '';
 			if(! count($r)) {
-				$o .= '<div id="photo-like-div">';
-				$o .= $likebuttons;
-				$o .= '</div>';
-
-				if(can_write_wall($a,$a->data['user']['uid'])) {
+				if($can_post || can_write_wall($a,$owner_uid)) {
 					if($link_item['last-child']) {
-						$o .= replace_macros($cmnt_tpl,array(
-							'$return_path' => $return_url,
+						$comments .= replace_macros($cmnt_tpl,array(
+							'$return_path' => '', 
+							'$jsreload' => $return_url,
 							'$type' => 'wall-comment',
 							'$id' => $link_item['id'],
 							'$parent' => $link_item['id'],
-							'$profile_uid' =>  $a->data['user']['uid'],
+							'$profile_uid' =>  $owner_uid,
 							'$mylink' => $contact['url'],
 							'$mytitle' => t('This is you'),
 							'$myphoto' => $contact['thumb'],
+							'$comment' => t('Comment'),
+							'$submit' => t('Submit'),
 							'$ww' => ''
 						));
 					}
@@ -907,6 +1191,9 @@ function photos_content(&$a) {
 
 			$alike = array();
 			$dlike = array();
+			
+			$like = '';
+			$dislike = '';
 
 			// display comments
 			if(count($r)) {
@@ -916,28 +1203,25 @@ function photos_content(&$a) {
 					like_puller($a,$item,$dlike,'dislike');
 				}
 
-	            $like    = ((isset($alike[$link_item['id']])) ? format_like($alike[$link_item['id']],$alike[$link_item['id'] . '-l'],'like',$link_item['id']) : '');
+				$like    = ((isset($alike[$link_item['id']])) ? format_like($alike[$link_item['id']],$alike[$link_item['id'] . '-l'],'like',$link_item['id']) : '');
 				$dislike = ((isset($dlike[$link_item['id']])) ? format_like($dlike[$link_item['id']],$dlike[$link_item['id'] . '-l'],'dislike',$link_item['id']) : '');
 
-				$o .= '<div id="photo-like-div">';
-				$o .= $likebuttons;
-				$o .= $like;
-				$o .= $dislike;
-				$o .= '</div>';
 
 
-
-				if(can_write_wall($a,$a->data['user']['uid'])) {
+				if($can_post || can_write_wall($a,$owner_uid)) {
 					if($link_item['last-child']) {
-						$o .= replace_macros($cmnt_tpl,array(
-							'$return_path' => $return_url,
+						$comments .= replace_macros($cmnt_tpl,array(
+							'$return_path' => '',
+							'$jsreload' => $return_url,
 							'$type' => 'wall-comment',
 							'$id' => $link_item['id'],
 							'$parent' => $link_item['id'],
-							'$profile_uid' =>  $a->data['user']['uid'],
+							'$profile_uid' =>  $owner_uid,
 							'$mylink' => $contact['url'],
 							'$mytitle' => t('This is you'),
 							'$myphoto' => $contact['thumb'],
+							'$comment' => t('Comment'),
+							'$submit' => t('Submit'),
 							'$ww' => ''
 						));
 					}
@@ -954,18 +1238,21 @@ function photos_content(&$a) {
 
 					$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
 			
-					if(can_write_wall($a,$a->data['user']['uid'])) {
+					if($can_post || can_write_wall($a,$owner_uid)) {
 
 						if($item['last-child']) {
-							$comment = replace_macros($cmnt_tpl,array(
-								'$return_path' => $return_url,
+							$comments .= replace_macros($cmnt_tpl,array(
+								'$return_path' => '',
+								'$jsreload' => $return_url,
 								'$type' => 'wall-comment',
 								'$id' => $item['item_id'],
 								'$parent' => $item['parent'],
-								'$profile_uid' =>  $a->data['user']['uid'],
+								'$profile_uid' =>  $owner_uid,
 								'$mylink' => $contact['url'],
 								'$mytitle' => t('This is you'),
 								'$myphoto' => $contact['thumb'],
+								'$comment' => t('Comment'),
+								'$submit' => t('Submit'),
 								'$ww' => ''
 							));
 						}
@@ -982,17 +1269,20 @@ function photos_content(&$a) {
 						$sparkle = '';
 					}
  
-					$profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']);
-					$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
+					$diff_author = (($item['url'] !== $item['author-link']) ? true : false);
+
+					$profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
+					$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $item['thumb']);
+
 					$profile_link = $profile_url;
 
 					$drop = '';
 
-					if(($item['contact-id'] == $_SESSION['visitor_id']) || ($item['uid'] == local_user()))
-						$drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id']));
+					if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
+						$drop = replace_macros(get_markup_template('photo_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
 
 
-					$o .= replace_macros($template,array(
+					$comments .= replace_macros($template,array(
 						'$id' => $item['item_id'],
 						'$profile_url' => $profile_link,
 						'$name' => $profile_name,
@@ -1008,27 +1298,50 @@ function photos_content(&$a) {
 				}
 			}
 
-			$o .= paginate($a);
+			$paginate = paginate($a);
 		}
+		
+		$photo_tpl = get_markup_template('photo_view.tpl');
+		$o .= replace_macros($photo_tpl, array(
+			'$id' => $ph[0]['id'],
+			'$album' => array($album_link,$ph[0]['album']),
+			'$tools' => $tools,
+			'$lock' => $lock,
+			'$photo' => $photo,
+			'$prevlink' => $prevlink,
+			'$nextlink' => $nextlink,
+			'$desc' => $ph[0]['desc'],
+			'$tags' => $tags,
+			'$edit' => $edit,	
+			'$likebuttons' => $likebuttons,
+			'$like' => $like,
+			'$dislike' => $dislike,
+			'$comments' => $comments,
+			'$paginate' => $paginate,
+		));
+		
 		return $o;
 	}
 
 	// Default - show recent photos with upload link (if applicable)
-	$o = '';
+	//$o = '';
 
-	$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 `album` != '%s' 
 		$sql_extra GROUP BY `resource-id`",
 		intval($a->data['user']['uid']),
+		dbesc('Contact Photos'),
 		dbesc( t('Contact Photos'))
 	);
-	if(count($r))
+	if(count($r)) {
 		$a->set_pager_total(count($r));
-
+		$a->set_pager_itemspage(20);
+	}
 
 	$r = q("SELECT `resource-id`, `id`, `filename`, `album`, max(`scale`) AS `scale` FROM `photo`
-		WHERE `uid` = %d 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'),
 		dbesc( t('Contact Photos')),
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])
@@ -1036,30 +1349,29 @@ function photos_content(&$a) {
 
 	$o .= '<h3>' . t('Recent Photos') . '</h3>';
 
-	if( local_user() && (local_user() == $a->data['user']['uid'])) {
+	if($can_post) {
 		$o .= '<div id="photo-top-links"><a id="photo-top-upload-link" href="'. $a->get_baseurl() . '/photos/' 
 			. $a->data['user']['nickname'] . '/upload' . '">' . t('Upload New Photos') . '</a></div>';
 	}
 
-	$tpl = load_view_file('view/photo_top.tpl');
+	$tpl = get_markup_template('photo_top.tpl');
 	if(count($r)) {
 		foreach($r as $rr) {
 			$o .= replace_macros($tpl,array(
-				'$id' => $rr['id'],
-				'$photolink' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] 
-					. '/image/' . $rr['resource-id'],
+				'$id'         => $rr['id'],
+				'$photolink'  => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
 				'$phototitle' => t('View Photo'),
-				'$imgsrc' => $a->get_baseurl() . '/photo/' 
-					. $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.jpg',
-				'$albumlink' => $a->get_baseurl() . '/photos/' 
-					. $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
-				'$albumname' => $rr['album'],
-				'$albumalt' => t('View Album'),
-				'$imgalt' => $rr['filename']
+				'$imgsrc'     => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.jpg',
+				'$albumlink'  => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
+				'$albumname'  => $rr['album'],
+				'$albumalt'   => t('View Album'),
+				'$imgalt'     => $rr['filename']
 			));
 
 		}
 		$o .= '<div id="photo-top-end"></div>';
 	}
+	$o .= paginate($a);
 	return $o;
 }
+