tagging changes - provides ability to mention a forum by using !forumname as well as the traditional red style (@forumname+). This should probably not be advertised on a wide scale until after a critical mass of sites have updated to a version containing these changes. This adds yet another option type to the ACL module which probably needs refactoring soon since it is turning into option type spaghetti.

4 files changed, 77 insertions, 27 deletions

diff --git a/include/items.php b/include/items.php
index daf41aa4b..cc209aacf 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1130,7 +1130,7 @@ function encode_item_xchan($xchan) {
 function encode_item_terms($terms,$mirror = false) {
 	$ret = array();
 
-	$allowed_export_terms = array( TERM_UNKNOWN, TERM_HASHTAG, TERM_MENTION, TERM_CATEGORY, TERM_BOOKMARK, TERM_COMMUNITYTAG );
+	$allowed_export_terms = array( TERM_UNKNOWN, TERM_HASHTAG, TERM_MENTION, TERM_CATEGORY, TERM_BOOKMARK, TERM_COMMUNITYTAG, TERM_FORUM );
 
 	if($mirror) {
 		$allowed_export_terms[] = TERM_PCATEGORY;
@@ -1178,7 +1178,7 @@ function decode_item_meta($meta) {
  * @return string
  */
 function termtype($t) {
-	$types = array('unknown','hashtag','mention','category','private_category','file','search','thing','bookmark', 'hierarchy', 'communitytag');
+	$types = array('unknown','hashtag','mention','category','private_category','file','search','thing','bookmark', 'hierarchy', 'communitytag', 'forum');
 
 	return(($types[$t]) ? $types[$t] : 'unknown');
 }
@@ -1227,6 +1227,9 @@ function decode_tags($t) {
 				case 'communitytag':
 					$tag['ttype'] = TERM_COMMUNITYTAG;
 					break;
+				case 'forum':
+					$tag['ttype'] = TERM_FORUM;
+					break;
 				default:
 				case 'unknown':
 					$tag['ttype'] = TERM_UNKNOWN;
@@ -2457,7 +2460,7 @@ function tag_deliver($uid, $item_id) {
 	 * Now we've got those out of the way. Let's see if this is a post that's tagged for re-delivery
 	 */
 
-	$terms = get_terms_oftype($item['term'],TERM_MENTION);
+	$terms = array_merge(get_terms_oftype($item['term'],TERM_MENTION),get_terms_oftype($item['term'],TERM_FORUM));
 
 	if($terms)
 		logger('tag_deliver: post mentions: ' . print_r($terms,true), LOGGER_DATA);
@@ -2492,25 +2495,46 @@ function tag_deliver($uid, $item_id) {
 		$plustagged = false;
 		$matches = array();
 
-		$pattern = '/@\!?\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($term['term'],'/') . '\[\/zrl\]/';
+		$pattern = '/[\!@]\!?\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($term['term'],'/') . '\[\/zrl\]/';
 		if(preg_match($pattern,$body,$matches))
 			$tagged = true;
 
-		$pattern = '/@\!?\[zrl\=([^\]]*?)\]((?:.(?!\[zrl\=))*?)\+\[\/zrl\]/';
+		// original red forum tagging sequence @forumname+
+		// standard forum tagging sequence !forumname
+
+		$pluspattern = '/@\!?\[zrl\=([^\]]*?)\]((?:.(?!\[zrl\=))*?)\+\[\/zrl\]/';
+
+		$forumpattern = '/\!\!?\[zrl\=([^\]]*?)\]((?:.(?!\[zrl\=))*?)\[\/zrl\]/';
 
-		// statusnet style group tags 
-		$pattern2 = '/^|[^@]\!\[zrl\=([^\]]*?)\]((?:.(?!\[zrl\=))*?)\+\[\/zrl\]/';
+		$found = false;
+
+		$max_forums = get_config('system','max_tagged_forums');
+		if(! $max_forums)
+			$max_forums = 2;
+		$matched_forums = 0;
+		$matches = array();
+
+		if(preg_match_all($pluspattern,$body,$matches,PREG_SET_ORDER)) {
+			foreach($matches as $match) {
+				$matched_forums ++;
+				if($term['url'] === $match[1] && $term['term'] === $match[2]) {
+					if($matched_forums <= $max_forums) {
+						$plustagged = true;
+						$found = true;
+						break;
+					}
+					logger('forum ' . $term['term'] . ' exceeded max_tagged_forums - ignoring');
+				}
+			}
+		}
 
-		if(preg_match_all($pattern,$body,$matches,PREG_SET_ORDER)) {
-			$max_forums = get_config('system','max_tagged_forums');
-			if(! $max_forums)
-				$max_forums = 2;
-			$matched_forums = 0;
+		if(preg_match_all($forumpattern,$body,$matches,PREG_SET_ORDER)) {
 			foreach($matches as $match) {
 				$matched_forums ++;
 				if($term['url'] === $match[1] && $term['term'] === $match[2]) {
 					if($matched_forums <= $max_forums) {
 						$plustagged = true;
+						$found = true;
 						break;
 					}
 					logger('forum ' . $term['term'] . ' exceeded max_tagged_forums - ignoring');
@@ -2609,7 +2633,8 @@ function tgroup_check($uid,$item) {
 	if(! $u)
 		return false;
 
-	$terms = get_terms_oftype($item['term'],TERM_MENTION);
+
+	$terms = array_merge(get_terms_oftype($item['term'],TERM_MENTION),get_terms_oftype($item['term'],TERM_FORUM));
 
 	if($terms)
 		logger('tgroup_check: post mentions: ' . print_r($terms,true), LOGGER_DATA);
@@ -2640,18 +2665,34 @@ function tgroup_check($uid,$item) {
 
 	$body = preg_replace('/\[share(.*?)\[\/share\]/','',$body);
 
-//	$pattern = '/@\!?\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($term['term'] . '+','/') . '\[\/zrl\]/';
 
-	$pattern = '/@\!?\[zrl\=([^\]]*?)\]((?:.(?!\[zrl\=))*?)\+\[\/zrl\]/';
+	$pluspattern = '/@\!?\[zrl\=([^\]]*?)\]((?:.(?!\[zrl\=))*?)\+\[\/zrl\]/';
+
+	$forumpattern = '/\!\!?\[zrl\=([^\]]*?)\]((?:.(?!\[zrl\=))*?)\[\/zrl\]/';
+
 
 	$found = false;
+
+	$max_forums = get_config('system','max_tagged_forums');
+	if(! $max_forums)
+		$max_forums = 2;
+	$matched_forums = 0;
 	$matches = array();
 
-	if(preg_match_all($pattern,$body,$matches,PREG_SET_ORDER)) {
-		$max_forums = get_config('system','max_tagged_forums');
-		if(! $max_forums)
-			$max_forums = 2;
-		$matched_forums = 0;
+	if(preg_match_all($pluspattern,$body,$matches,PREG_SET_ORDER)) {
+		foreach($matches as $match) {
+			$matched_forums ++;
+			if($term['url'] === $match[1] && $term['term'] === $match[2]) {
+				if($matched_forums <= $max_forums) {
+					$found = true;
+					break;
+				}
+				logger('forum ' . $term['term'] . ' exceeded max_tagged_forums - ignoring');
+			}
+		}
+	}
+
+	if(preg_match_all($forumpattern,$body,$matches,PREG_SET_ORDER)) {
 		foreach($matches as $match) {
 			$matched_forums ++;
 			if($term['url'] === $match[1] && $term['term'] === $match[2]) {
diff --git a/include/taxonomy.php b/include/taxonomy.php
index 36e05b008..23acaa24d 100644
--- a/include/taxonomy.php
+++ b/include/taxonomy.php
@@ -134,6 +134,8 @@ function format_term_for_display($term) {
 	$s = '';
 	if(($term['ttype'] == TERM_HASHTAG) || ($term['ttype'] == TERM_COMMUNITYTAG))
 		$s .= '#';
+	elseif($term['ttype'] == TERM_FORUM)
+		$s .= '!';
 	elseif($term['ttype'] == TERM_MENTION)
 		$s .= '@';
 	else
diff --git a/include/text.php b/include/text.php
index 16391bbc9..baac58e50 100644
--- a/include/text.php
+++ b/include/text.php
@@ -823,7 +823,7 @@ function get_tags($s) {
 	// Otherwise pull out single word tags. These can be @nickname, @first_last
 	// and #hash tags.
 
-	if(preg_match_all('/(?<![a-zA-Z0-9=\/\?\;])([@#!][^ \x0D\x0A,;:?\[]+)/',$s,$match)) {
+	if(preg_match_all('/(?<![a-zA-Z0-9=\/\?\;])([@#\!][^ \x0D\x0A,;:?\[]+)/',$s,$match)) {
 		foreach($match[1] as $mtch) {
 			if(substr($mtch,-1,1) === '.')
 				$mtch = substr($mtch,0,-1);
@@ -2383,9 +2383,9 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $d
 	$r = null;
 	$match = array();
 
-	$termtype = ((strpos($tag,'#') === 0)   ? TERM_HASHTAG : TERM_UNKNOWN);
-	$termtype = ((strpos($tag,'@') === 0)   ? TERM_MENTION : $termtype);
-	$termtype = ((strpos($tag,'!') === 0)   ? TERM_MENTION : $termtype);
+	$termtype = ((strpos($tag,'#') === 0)   ? TERM_HASHTAG  : TERM_UNKNOWN);
+	$termtype = ((strpos($tag,'@') === 0)   ? TERM_MENTION  : $termtype);
+	$termtype = ((strpos($tag,'!') === 0)   ? TERM_FORUM    : $termtype);
 	$termtype = ((strpos($tag,'#^[') === 0) ? TERM_BOOKMARK : $termtype);
 
 	//is it a hash tag?
@@ -2623,8 +2623,15 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $d
 			//create profile link
 			$profile = str_replace(',','%2c',$profile);
 			$url = $profile;
-			$newtag = '@' . (($exclusive) ? '!' : '') . '[zrl=' . $profile . ']' . $newname	. (($forum &&  ! $trailing_plus_name) ? '+' : '') . '[/zrl]';
-			$body = str_replace('@' . (($exclusive) ? '!' : '') . $name, $newtag, $body);
+			if($grouptag) {
+				$newtag = '!' . '[zrl=' . $profile . ']' . $newname	. '[/zrl]';
+				$body = str_replace('!' . $name, $newtag, $body);
+			}
+			else {
+				$newtag = '@' . (($exclusive) ? '!' : '') . '[zrl=' . $profile . ']' . $newname	. (($forum &&  ! $trailing_plus_name) ? '+' : '') . '[/zrl]';
+				$body = str_replace('@' . (($exclusive) ? '!' : '') . $name, $newtag, $body);
+			}
+
 			//append tag to str_tags
 			if(! stristr($str_tags,$newtag)) {
 				if(strlen($str_tags))
diff --git a/include/zot.php b/include/zot.php
index f03445781..1a9692ae9 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1432,7 +1432,7 @@ function public_recips($msg) {
 		if($msg['message']['tags']) {
 			if(is_array($msg['message']['tags']) && $msg['message']['tags']) {
 				foreach($msg['message']['tags'] as $tag) {
-					if(($tag['type'] === 'mention') && (strpos($tag['url'],z_root()) !== false)) {
+					if(($tag['type'] === 'mention' || $tag['type'] === 'forum') && (strpos($tag['url'],z_root()) !== false)) {
 						$address = basename($tag['url']);
 						if($address) {
 							$z = q("select channel_hash as hash from channel where channel_address = '%s'