X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fphotos.php;h=854c6ee1418f2f81e62c12f6ab4f6d8ea04d5786;hb=8c245a5d2f4e6882211ac17561f86537a7089c73;hp=c80a82e6609906d03bb4f52cc09af4d3a7abfc9f;hpb=bed0391e6fb058c9f1165e40cdac552f2819808b;p=friendica.git

diff --git a/mod/photos.php b/mod/photos.php
index c80a82e660..854c6ee141 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -182,13 +182,11 @@ foreach($_FILES AS $key => $val) {
 					);
 
 					$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_path,"include/notifier.php","drop","$drop_id");
+						proc_run('php',"include/notifier.php","drop","$drop_id");
 				}
 			}
 		}
@@ -232,11 +230,9 @@ foreach($_FILES AS $key => $val) {
 
 				$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_path,"include/notifier.php","drop","$drop_id");
+					proc_run('php',"include/notifier.php","drop","$drop_id");
 			}
 		}
 
@@ -244,24 +240,46 @@ foreach($_FILES AS $key => $val) {
 		return; // NOTREACHED
 	}
 
-	if(($a->argc > 2) && ((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[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($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($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
@@ -291,6 +309,7 @@ foreach($_FILES AS $key => $val) {
 			$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]';
@@ -460,9 +479,8 @@ foreach($_FILES AS $key => $val) {
 					$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));
-					proc_run($php_path,"include/notifier.php","tag","$item_id");
+					if($item_id)
+						proc_run('php',"include/notifier.php","tag","$item_id");
 				}
 
 			}
@@ -817,7 +835,7 @@ function photos_content(&$a) {
 			$a->set_pager_itemspage(20);
 		}
 
-		$r = q("SELECT `resource-id`, `id`, `filename`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s' 
+		$r = q("SELECT `resource-id`, `id`, `filename`, max(`scale`) AS `scale`, `desc` FROM `photo` WHERE `uid` = %d AND `album` = '%s' 
 			$sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d",
 			intval($owner_uid),
 			dbesc($album),
@@ -859,7 +877,8 @@ 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']
 				));
 
 		}
@@ -909,6 +928,7 @@ function photos_content(&$a) {
 		if($can_post && ($ph[0]['uid'] == $owner_uid)) {
 			$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>';
 			
+			$o .= ' - <a id="photo-toprofile-link" href="' . $a->get_baseurl() . '/profile_photo/use/'.$ph[0]['resource-id'].'">'.t('Use as profile photo').'</a>';
 			// lock
 			$o .= ( ( ($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'])) ) 
@@ -997,12 +1017,16 @@ function photos_content(&$a) {
 			$edit_tpl = load_view_file('view/photo_edit.tpl');
 			$o .= 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'),
@@ -1020,8 +1044,14 @@ function photos_content(&$a) {
 
 			$likebuttons = '';
 
-			if($can_post || can_write_wall($a,$owner_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' => $item['id'],
+					'$likethis' => t("I like this \x28toggle\x29"),
+					'$nolike' => t("I don't like this \x28toggle\x29"),
+					'$wait' => t('Please wait') 
+				));
+			}
 
 			if(! count($r)) {
 				$o .= '<div id="photo-like-div">';
@@ -1031,7 +1061,8 @@ function photos_content(&$a) {
 				if($can_post || can_write_wall($a,$owner_uid)) {
 					if($link_item['last-child']) {
 						$o .= replace_macros($cmnt_tpl,array(
-							'$return_path' => $return_url,
+							'$return_path' => '', 
+							'$jsreload' => $return_url,
 							'$type' => 'wall-comment',
 							'$id' => $link_item['id'],
 							'$parent' => $link_item['id'],
@@ -1056,7 +1087,7 @@ 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">';
@@ -1070,7 +1101,8 @@ function photos_content(&$a) {
 				if($can_post || can_write_wall($a,$owner_uid)) {
 					if($link_item['last-child']) {
 						$o .= replace_macros($cmnt_tpl,array(
-							'$return_path' => $return_url,
+							'$return_path' => '',
+							'$jsreload' => $return_url,
 							'$type' => 'wall-comment',
 							'$id' => $link_item['id'],
 							'$parent' => $link_item['id'],
@@ -1098,7 +1130,8 @@ function photos_content(&$a) {
 
 						if($item['last-child']) {
 							$comment = replace_macros($cmnt_tpl,array(
-								'$return_path' => $return_url,
+								'$return_path' => '',
+								'$jsreload' => $return_url,
 								'$type' => 'wall-comment',
 								'$id' => $item['item_id'],
 								'$parent' => $item['parent'],
@@ -1132,7 +1165,7 @@ function photos_content(&$a) {
 					$drop = '';
 
 					if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
-						$drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id']));
+						$drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
 
 
 					$o .= replace_macros($template,array(