Merge pull request #668 from git-marijus/master

change the way tagrm works to allow tag removal on the fly

mod/photos.php

@@ -918,7 +918,7 @@ function photos_content(&$a) {
 				foreach($link_item['term'] as $t) {
 					$tags[$cnt] = array(0 => format_term_for_display($t));
 					if($can_post && ($ph[0]['uid'] == $owner_uid)) {
-						$tags[$cnt][1] = 'tagrm?f=&item=' . $link_item['id'];
+						$tags[$cnt][1] = 'tagrm/drop/' . $link_item['id'] . '/' . bin2hex($t['term']);   //?f=&item=' . $link_item['id'];
 						$tags[$cnt][2] = t('Remove');
 					}
 					$cnt ++;

mod/tagrm.php

@@ -52,31 +52,66 @@ function tagrm_post(&$a) {
 
 function tagrm_content(&$a) {
 
-	$o = '';
-
 	if(! local_user()) {
 		goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
 		// NOTREACHED
 	}
 
-	$item = intval($_GET['item']);
+	// remove tag on the fly if item and tag are provided
-	if(! $item) {
+	if((argc() == 4) && (argv(1) === 'drop') && intval(argv(2))) {
-		goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
-		// NOTREACHED
-	}
 
+		$item = intval(argv(2));
+		$tag = argv(3);
 
 		$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($item),
 			intval(local_user())
 		);
 
-
 		if(! $r)
 			goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
 
 		$r = fetch_post_tags($r,true);
 
+		$item = $r[0];
+
+		$new_tags = array();
+
+		if($item['term']) {
+			for($x = 0; $x < count($item['term']); $x ++) {
+				if($item['term'][$x]['term'] !== hex2bin($tag))
+					$new_tags[] = $item['term'][$x];
+			}
+		}
+
+		if($new_tags)
+			$item['term'] = $new_tags;
+		else
+			unset($item['term']);
+
+		item_store_update($item);
+
+		info( t('Tag removed') . EOL );
+		goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+
+	}
+
+	//if we got only the item print a list of tags to select
+	if((argc() == 3) && (argv(1) === 'drop') && intval(argv(2))) {
+
+		$o = '';
+
+		$item = intval(argv(2));
+
+		$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+			intval($item),
+			intval(local_user())
+		);
+
+		if(! $r)
+			goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+
+		$r = fetch_post_tags($r,true);
 
 		if(! count($r[0]['term']))
 			goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
@@ -102,3 +137,5 @@ function tagrm_content(&$a) {
 		return $o;
 
 	}
+	
+}

view/tpl/photo_view.tpl

@@ -85,7 +85,7 @@
 		<div class="photo-item-tools-left" id="in-this-photo">
 			<span id="in-this-photo-text">{{$tag_hdr}}</span>
 			{{foreach $tags as $t}}
-				{{$t.0}}{{if $edit}}<span id="tag-remove">&nbsp;<a href="{{$t.1}}"><i class="icon-remove"></i></a>&nbsp;</span>{{/if}}
+				{{$t.0}}{{if $edit}}<span id="tag-remove">&nbsp;<a href="{{$t.1}}" onclick="return confirmDelete();"><i class="icon-remove"></i></a>&nbsp;</span>{{/if}}
 			{{/foreach}}
 		</div>
 		{{/if}}