making tags work

9 files changed, 163 insertions, 76 deletions

diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index ce1cdbad5..ae88eefb4 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -77,21 +77,18 @@ function networks_widget($baseurl,$selected = '') {
 
 function fileas_widget($baseurl,$selected = '') {
 	$a = get_app();
+
 	if(! local_user())
 		return '';
 
-	$saved = get_pconfig(local_user(),'system','filetags');
-	if(! strlen($saved))
-		return;
-
-	$matches = false;
 	$terms = array();
-    $cnt = preg_match_all('/\[(.*?)\]/',$saved,$matches,PREG_SET_ORDER);
-    if($cnt) {
-		foreach($matches as $mtch) {
-			$unescaped = xmlify(file_tag_decode($mtch[1]));
-			$terms[] = array('name' => $unescaped,'selected' => (($selected == $unescaped) ? 'selected' : ''));
-		}
+	$r = q("select distinct(term) from term where uid = %d and type = %d order by term asc",
+		intval(local_user()),
+		intval(TERM_FILE)
+	);
+	if(count($r)) {
+		foreach($r as $rr)
+		$terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : ''));
 	}
 
 	return replace_macros(get_markup_template('fileas_widget.tpl'),array(
@@ -108,18 +105,15 @@ function fileas_widget($baseurl,$selected = '') {
 function categories_widget($baseurl,$selected = '') {
 	$a = get_app();
 
-	$saved = get_pconfig($a->profile['profile_uid'],'system','filetags');
-	if(! strlen($saved))
-		return;
 
-	$matches = false;
 	$terms = array();
-        $cnt = preg_match_all('/<(.*?)>/',$saved,$matches,PREG_SET_ORDER);
-        if($cnt) {
-                foreach($matches as $mtch) {
-		        $unescaped = xmlify(file_tag_decode($mtch[1]));
-			$terms[] = array('name' => $unescaped,'selected' => (($selected == $unescaped) ? 'selected' : ''));
-		}
+	$r = q("select distinct(term) from term where uid = %d and type = %d order by term asc",
+		intval($a->profile['profile_uid']),
+		intval(TERM_CATEGORY)
+	);
+	if(count($r)) {
+		foreach($r as $rr)
+		$terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : ''));
 	}
 
 	return replace_macros(get_markup_template('categories_widget.tpl'),array(
diff --git a/include/conversation.php b/include/conversation.php
index 240cd374f..f81a7e7d2 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -611,13 +611,12 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 				$shareable = ((($profile_owner == local_user()) && ($item['private'] != 1)) ? true : false); 
 
 				if($page_writeable) {
-/*					if($toplevelpost) {  */
-						$likebuttons = array(
-							'like' => array( t("I like this \x28toggle\x29"), t("like")),
-							'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")),
-						);
-						if ($shareable) $likebuttons['share'] = array( t('Share this'), t('share'));
-/*					} */
+					$likebuttons = array(
+						'like' => array( t("I like this \x28toggle\x29"), t("like")),
+						'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")),
+					);
+					if ($shareable) $likebuttons['share'] = array( t('Share this'), t('share'));
+
 
 					$qc = $qcomment =  null;
 
@@ -739,10 +738,11 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 
 
 				$tags=array();
-				foreach(explode(',',$item['tag']) as $tag){
-					$tag = trim($tag);
-					if ($tag!="") $tags[] = bbcode($tag);
-				}
+				$terms = get_terms_oftype($item['term'],array(TERM_HASHTAG,TERM_MENTION,TERM_UNKNOWN));
+				if(count($terms))
+					foreach($terms as $tag)
+						$tags[] = format_term_for_display($tag);
+
 
 				// Build the HTML
 
@@ -1102,13 +1102,26 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 }
 
 
-function conv_sort($arr,$order) {
+function conv_sort($arr,$tags,$order) {
 
 	if((!(is_array($arr) && count($arr))))
 		return array();
 
 	$parents = array();
 
+
+	for($x = 0; $x < count($arr); $x ++) {
+		if(count($tags)) {
+			foreach($tags as $t) {
+				if($t['oid'] == $arr[$x]['item_id']) {
+					if(! is_array($arr[$x]['term']))
+						$arr[$x]['term'] = array();
+					$arr[$x]['term'][] = $t;
+				}
+			}
+		}
+	}
+
 	foreach($arr as $x)
 		if($x['id'] == $x['parent'])
 				$parents[] = $x;
diff --git a/include/nav.php b/include/nav.php
index e26cc8889..3f65fe919 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -156,7 +156,7 @@ function nav(&$a) {
 	$banner = get_config('system','banner');
 
 	if($banner === false) 
-		$banner .= '<a href="http://friendica.com"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="http://friendica.com">Friendica</a></span>';
+		$banner .= '<a href="http://friendica.com"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="http://friendica.com"><span class="heart">red</span></a></span>';
 
 
 	$tpl = get_markup_template('nav.tpl');
diff --git a/include/text.php b/include/text.php
index 409d40d59..f3bc94265 100644
--- a/include/text.php
+++ b/include/text.php
@@ -881,20 +881,7 @@ function prepare_body($item,$attach = false) {
 	$a = get_app();
 	call_hooks('prepare_body_init', $item); 
 
-	$cache = get_config('system','itemcache');
-
-	if (($cache != '')) {
-		$cachefile = $cache."/".$item["guid"]."-".strtotime($item["edited"])."-".hash("crc32", $item['body']);
-
-		if (file_exists($cachefile))
-			$s = file_get_contents($cachefile);
-		else {
-			$s = prepare_text($item['body']);
-			file_put_contents($cachefile, $s);
-		}
-	} else
-		$s = prepare_text($item['body']);
-
+	$s = prepare_text($item['body']);
 
 	$prep_arr = array('item' => $item, 'html' => $s);
 	call_hooks('prepare_body', $prep_arr);
@@ -938,30 +925,29 @@ function prepare_body($item,$attach = false) {
 		}
 		$s .= '<div class="clear"></div></div>';
 	}
-	$matches = false;
-	$cnt = preg_match_all('/<(.*?)>/',$item['file'],$matches,PREG_SET_ORDER);
-	if($cnt) {
-//		logger('prepare_text: categories: ' . print_r($matches,true), LOGGER_DEBUG);
-		foreach($matches as $mtch) {
+
+	$x = '';
+	$terms = get_terms_oftype($item['term'],TERM_CATEGORY);
+	if($terms) {
+		foreach($terms as $t) {
 			if(strlen($x))
 				$x .= ',';
-			$x .= xmlify(file_tag_decode($mtch[1])) 
-				. ((local_user() == $item['uid']) ? ' <a href="' . $a->get_baseurl() . '/filerm/' . $item['id'] . '?f=&cat=' . xmlify(file_tag_decode($mtch[1])) . '" title="' . t('remove') . '" >' . t('[remove]') . '</a>' : '');
+			$x .= $t['term']
+				. ((local_user() == $item['uid']) ? ' <a href="' . $a->get_baseurl() . '/filerm/' . $item['id'] . '?f=&cat=' . $t['term'] . '" title="' . t('remove') . '" >' . t('[remove]') . '</a>' : '');
 		}
 		if(strlen($x))
 			$s .= '<div class="categorytags"><span>' . t('Categories:') . ' </span>' . $x . '</div>'; 
 
 
 	}
-	$matches = false;
+
 	$x = '';
-	$cnt = preg_match_all('/\[(.*?)\]/',$item['file'],$matches,PREG_SET_ORDER);
-	if($cnt) {
-//		logger('prepare_text: filed_under: ' . print_r($matches,true), LOGGER_DEBUG);
-		foreach($matches as $mtch) {
+	$terms = get_terms_oftype($item['term'],TERM_FILE);
+	if($terms) {
+		foreach($terms as $t) {
 			if(strlen($x))
 				$x .= '&nbsp;&nbsp;&nbsp;';
-			$x .= xmlify(file_tag_decode($mtch[1])) . ' <a href="' . $a->get_baseurl() . '/filerm/' . $item['id'] . '?f=&term=' . xmlify(file_tag_decode($mtch[1])) . '" title="' . t('remove') . '" >' . t('[remove]') . '</a>';
+			$x .= $t['term'] . ' <a href="' . $a->get_baseurl() . '/filerm/' . $item['id'] . '?f=&term=' . $t['term'] . '" title="' . t('remove') . '" >' . t('[remove]') . '</a>';
 		}
 		if(strlen($x) && (local_user() == $item['uid']))
 			$s .= '<div class="filesavetags"><span>' . t('Filed under:') . ' </span>' . $x . '</div>'; 
@@ -1460,10 +1446,67 @@ function file_tag_update_pconfig($uid,$file_old,$file_new,$type = 'file') {
 		return true;
 }
 
+function store_item_tag($uid,$iid,$otype,$type,$term,$url = '') {
+	if(! $term) 
+		return false;
+	$r = q("select * from term 
+		where uid = %d and oid = %d and otype = %d and type = %d 
+		and term = '%s' and url = '%s' ",
+		intval($uid),
+		intval($iid),
+		intval($otype),
+		intval($type),
+		dbesc($term),
+		dbesc($url)
+	);
+	if(count($r))
+		return false;
+	$r = q("insert into term (uid, oid, otype, type, term, url)
+		values( %d, %d, %d, %d, '%s', '%s') ",
+		intval($uid),
+		intval($iid),
+		intval($otype),
+		intval($type),
+		dbesc($term),
+		dbesc($url)
+	);
+	return $r;
+}
+		
+function get_terms_oftype($arr,$type) {
+	$ret = array();
+	if(! (is_array($arr) && count($arr)))
+		return $ret;
+
+	if(! is_array($type))
+		$type = array($type);
+
+	foreach($type as $t)
+		foreach($arr as $x)
+			if($x['type'] == $t)
+				$ret[] = $x;
+	return $ret;
+}
+
+function format_term_for_display($term) {
+	$s = '';
+	if($term['type'] == TERM_HASHTAG)
+		$s .= '#';
+	elseif($term['type'] == TERM_MENTION)
+		$s .= '@';
+
+	if($term['url']) $s .= '<a target="extlink" href="' . $term['url'] . '">' . $term['term'] . '</a>';
+	else $s .= $term['term'];
+	return $s;
+}
+
+
+
 function file_tag_save_file($uid,$item,$file) {
 	$result = false;
 	if(! intval($uid))
 		return false;
+
 	$r = q("select file from item where id = %d and uid = %d limit 1",
 		intval($item),
 		intval($uid)
diff --git a/mod/filer.php b/mod/filer.php
index c0cca9e6d..adc6245e1 100644
--- a/mod/filer.php
+++ b/mod/filer.php
@@ -18,12 +18,18 @@ function filer_content(&$a) {
 
 	if($item_id && strlen($term)){
 		// file item
-		file_tag_save_file(local_user(),$item_id,$term);
-	} else {
-		// return filer dialog
-		$filetags = get_pconfig(local_user(),'system','filetags');
-		$filetags = file_tag_file_to_list($filetags,'file');
-                $filetags = explode(",", $filetags);
+		store_item_tag(local_user(),$item_id,TERM_OBJ_POST,TERM_FILE,$term,'');
+	} 
+	else {
+		$filetags = array();
+		$r = q("select distinct(term) from term where uid = %d and type = %d order by term asc",
+			intval(local_user()),
+			intval(TERM_FILE)
+		);
+		if(count($r)) {
+			foreach($r as $rr)
+				$filetags[] = $rr['term'];
+		}
 		$tpl = get_markup_template("filer_dialog.tpl");
 		$o = replace_macros($tpl, array(
 			'$field' => array('term', t("Save to Folder:"), '', '', $filetags, t('- select -')),
diff --git a/mod/filerm.php b/mod/filerm.php
index d2b57d447..f70816266 100644
--- a/mod/filerm.php
+++ b/mod/filerm.php
@@ -6,8 +6,8 @@ function filerm_content(&$a) {
 		killme();
 	}
 
-	$term = unxmlify(trim($_GET['term']));
-	$cat = unxmlify(trim($_GET['cat']));
+	$term = trim($_GET['term']);
+	$cat  = trim($_GET['cat']);
 
 	$category = (($cat) ? true : false);
 	if($category)
@@ -17,8 +17,14 @@ function filerm_content(&$a) {
 
 	logger('filerm: tag ' . $term . ' item ' . $item_id);
 
-	if($item_id && strlen($term))
-		file_tag_unsave_file(local_user(),$item_id,$term, $category);
+	if($item_id && strlen($term)) {
+		$r = q("delete from term where uid = %d and type = %d and oid = %d and $term = '%s' limit 1",
+			intval(local_user()),
+			intval(($category) ? FILE_CATEGORY : FILE_HASHTAG),
+			intval($item_id),
+			dbesc($term)
+		);
+	}
 
 	if(x($_SESSION,'return_url'))
 		goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
diff --git a/mod/network.php b/mod/network.php
index 35a981512..5ce7a9b57 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -643,7 +643,20 @@ function network_content(&$a, $update = 0) {
 				dbesc($parents_str)
 			);
 
-			$items = conv_sort($items,$ordering);
+			$tag_finder = array();
+			if(count($items))		
+				foreach($items as $item)
+					if(! in_array($item['item_id'],$tag_finder))
+						$tag_finder[] = $item['item_id'];
+			$tag_finder_str = implode(', ', $tag_finder);
+
+			$tags = q("select * from term where oid in ( %s ) and otype = %d",
+				dbesc($tag_finder_str),
+				intval(TERM_OBJ_POST)
+			);
+
+			$items = conv_sort($items,$tags,$ordering);
+
 
 		} else {
 			$items = array();
diff --git a/mod/profile.php b/mod/profile.php
index 24e03d6ea..b53639c35 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -279,8 +279,20 @@ function profile_content(&$a, $update = 0) {
 			intval($a->profile['profile_uid']),
 			dbesc($parents_str)
 		);
-		
-		$items = conv_sort($items,'created');
+
+		$tag_finder = array();
+		if(count($items))		
+			foreach($items as $item)
+				if(! in_array($item['item_id'],$tag_finder))
+					$tag_finder[] = $item['item_id'];
+		$tag_finder_str = implode(', ', $tag_finder);
+		$tags = q("select * from term where oid in ( '%s' ) and otype = %d",
+			dbesc($tag_finder),
+			intval(TERM_OBJ_POST)
+		);
+
+		$items = conv_sort($items,$tags,'created');
+
 	} else {
 		$items = array();
 	}
diff --git a/mod/tagrm.php b/mod/tagrm.php
index 5041145cc..957cf0d71 100644
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
@@ -11,8 +11,8 @@ function tagrm_post(&$a) {
 	if((x($_POST,'submit')) && ($_POST['submit'] === t('Cancel')))
 		goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
 
-	$tag =  ((x($_POST,'tag'))  ? hex2bin(notags(trim($_POST['tag']))) : '');
-	$item = ((x($_POST,'item')) ? intval($_POST['item'])               : 0 );
+	$tag =  ((x($_POST,'tag'))  ? trim($_POST['tag'])       : '');
+	$item = ((x($_POST,'item')) ? intval($_POST['item'])    : 0 );
 
 	$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 		intval($item),