isolate all the tagadelic core code into a class and reuse it

2 files changed, 48 insertions, 85 deletions

diff --git a/Zotlabs/Text/Tagadelic.php b/Zotlabs/Text/Tagadelic.php
new file mode 100644
index 000000000..55ecf2d75
--- /dev/null
+++ b/Zotlabs/Text/Tagadelic.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Zotlabs\Text;
+
+
+class Tagadelic {
+
+	static public function calc($arr) {
+
+		$tags = array();
+		$min = 1e9;
+		$max = -1e9;
+
+		$x = 0;
+		if(! $arr)
+			return array();
+
+		foreach($arr as $rr) {
+			$tags[$x][0] = $rr['term'];
+			$tags[$x][1] = log($rr['total']);
+			$tags[$x][2] = 0;
+			$min = min($min,$tags[$x][1]);
+			$max = max($max,$tags[$x][1]);
+			$x ++;
+		}
+
+		usort($tags,'self::tags_sort');
+
+		$range = max(.01, $max - $min) * 1.0001;
+
+		for($x = 0; $x < count($tags); $x ++) {
+			$tags[$x][2] = 1 + floor(9 * ($tags[$x][1] - $min) / $range);
+		}
+
+		return $tags;
+	}
+
+	static public function tags_sort($a,$b) {
+		if(strtolower($a[0]) == strtolower($b[0]))
+			return 0;
+		return((strtolower($a[0]) < strtolower($b[0])) ? -1 : 1);
+	}
+
+}
\ No newline at end of file
diff --git a/include/taxonomy.php b/include/taxonomy.php
index cc83f0605..e43f5e5d0 100644
--- a/include/taxonomy.php
+++ b/include/taxonomy.php
@@ -156,51 +156,16 @@ function tagadelic($uid, $count = 0, $authors = '', $owner = '', $flags = 0, $re
 	if(! $r)
 		return array();
 
-	// Find minimum and maximum log-count.
-	$tags = array();
-	$min = 1e9;
-	$max = -1e9;
-
-	$x = 0;
-	foreach($r as $rr) {
-		$tags[$x][0] = $rr['term'];
-		$tags[$x][1] = log($rr['total']);
-		$tags[$x][2] = 0;
-		$min = min($min,$tags[$x][1]);
-		$max = max($max,$tags[$x][1]);
-		$x ++;
-	}
-
-	usort($tags,'tags_sort');
-
-	$range = max(.01, $max - $min) * 1.0001;
-
-	for($x = 0; $x < count($tags); $x ++) {
-		$tags[$x][2] = 1 + floor(9 * ($tags[$x][1] - $min) / $range);
-	}
-
-	return $tags;
-}
-
-
-
-
-
-
-function tags_sort($a,$b) {
-	if(strtolower($a[0]) == strtolower($b[0]))
-		return 0;
+	return Zotlabs\Text\Tagadelic::calc($r);
 
-	return((strtolower($a[0]) < strtolower($b[0])) ? -1 : 1);
 }
 
-
 function dir_tagadelic($count = 0) {
 
 	$count = intval($count);
 
 	// Fetch tags
-	$r = q("select xtag_term, count(xtag_term) as total from xtag where xtag_flags = 0
+	$r = q("select xtag_term as term, count(xtag_term) as total from xtag where xtag_flags = 0
 		group by xtag_term order by total desc %s",
 		((intval($count)) ? "limit $count" : '')
 	);
@@ -208,30 +173,9 @@ function dir_tagadelic($count = 0) {
 	if(! $r)
 		return array();
 
-	// Find minimum and maximum log-count.
-	$tags = array();
-	$min = 1e9;
-	$max = -1e9;
-
-	$x = 0;
-	foreach($r as $rr) {
-		$tags[$x][0] = $rr['xtag_term'];
-		$tags[$x][1] = log($rr['total']);
-		$tags[$x][2] = 0;
-		$min = min($min,$tags[$x][1]);
-		$max = max($max,$tags[$x][1]);
-		$x ++;
-	}
-
-	usort($tags,'tags_sort');
 
-	$range = max(.01, $max - $min) * 1.0001;
+	return Zotlabs\Text\Tagadelic::calc($r);
 
-	for($x = 0; $x < count($tags); $x ++) {
-		$tags[$x][2] = 1 + floor(9 * ($tags[$x][1] - $min) / $range);
-	}
-
-	return $tags;
 }
 
 
@@ -270,36 +214,11 @@ function app_tagadelic($count = 0) {
 	if(! $r)
 		return array();
 
-	// Find minimum and maximum log-count.
-	$tags = array();
-	$min = 1e9;
-	$max = -1e9;
-
-	$x = 0;
-	foreach($r as $rr) {
-		$tags[$x][0] = $rr['term'];
-		$tags[$x][1] = log($rr['total']);
-		$tags[$x][2] = 0;
-		$min = min($min,$tags[$x][1]);
-		$max = max($max,$tags[$x][1]);
-		$x ++;
-	}
-
-	usort($tags,'tags_sort');
+	return Zotlabs\Text\Tagadelic::calc($r);
 
-	$range = max(.01, $max - $min) * 1.0001;
-
-	for($x = 0; $x < count($tags); $x ++) {
-		$tags[$x][2] = 1 + floor(9 * ($tags[$x][1] - $min) / $range);
-	}
-
-	return $tags;
 }
 
 
-
-
-
 function tagblock($link,$uid,$count = 0,$authors = '',$owner = '', $flags = 0,$restrict = 0,$type = TERM_HASHTAG) {
 	$o = '';