X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Ftag.php;h=3096b75b395b281115c8a9578f843cddb5db85f9;hb=2f99a257a0d8bd773ea96249b13b134fcfbc99cd;hp=c0201d1a83cdf7f563d2dfdf56eb9ad30b7dd780;hpb=575f70545171f6f5c94214ce88e5b07a1f517810;p=quix0rs-gnu-social.git

diff --git a/actions/tag.php b/actions/tag.php
index c0201d1a83..3096b75b39 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -21,162 +21,152 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/actions/showstream.php');
 define('TAGS_PER_PAGE', 100);
-define('AGE_FACTOR', 864000.0);
-
-class TagAction extends StreamAction {
-
-	function handle($args) {
-
-		parent::handle($args);
-
-		# Looks like we're good; show the header
-
-		if (isset($args['tag']) && $args['tag']) {
-			$tag = $args['tag'];
-			common_show_header(sprintf(_("Notices tagged with %s"), $tag),
-							   array($this, 'show_header'), $tag,
-							   array($this, 'show_top'));
-
-			$this->show_notices($tag);
-		} else {
-			common_show_header(_("Tags"),
-							   array($this, 'show_header'), '',
-							   array($this, 'show_top'));
-			$this->show_tags();
-		}
-
-		common_show_footer();
-	}
-
-	function show_header($tag = false) {
-		if (false && $tag) {
-			common_element('link', array('rel' => 'alternate',
-										 'href' => common_local_url('tagrss', array('tag' => $tag)),
-										 'type' => 'application/rss+xml',
-										 'title' => sprintf(_('Feed for tag %s'), $tag)));
-		}
-	}
-
-	function get_instructions() {
-		return _('Showing most popular tags from the last week');
-	}
-
-	function show_top($tag = false) {
-		if (!$tag) {
-			$instr = $this->get_instructions();
-			$output = common_markup_to_html($instr);
-			common_element_start('div', 'instructions');
-			common_raw($output);
-			common_element_end('div');
-		}
-
-		common_element_start('ul', array('id' => 'nav_views'));
-
-		common_menu_item(common_local_url('tags'),
-						 _('Recent Tags'),
-						 _('Recent Tags'),
-						 !$tag);
-		if ($tag) {
-			common_menu_item(common_local_url('tag', array('tag' => $tag)),
-							 '#' . $tag,
-							 sprintf(_("Notices tagged with %s"), $tag),
-							 true);
-		}
-		common_element_end('ul');
-	}
-
-	function show_tags()
-	{
-		# This should probably be cached rather than recalculated
-		$tags = DB_DataObject::factory('Notice_tag');
-		$tags->selectAdd('max(notice_id) as last_notice_id');
-		$tags->selectAdd(sprintf('sum(exp(-(now() - created)/%f)) as weight', AGE_FACTOR));
-		$tags->groupBy('tag');
-		$tags->orderBy('weight DESC');
-
-		# $tags->whereAdd('created > "' . strftime('%Y-%m-%d %H:%M:%S', strtotime('-1 MONTH')) . '"');
-
-		$tags->limit(TAGS_PER_PAGE);
-
-		$cnt = $tags->find();
-
-		if ($cnt > 0) {
-			common_element_start('p', 'tagcloud');
-			
-			$tw = array();
-			$sum = 0;
-			while ($tags->fetch()) {
-				$tw[$tags->tag] = $tags->weight;
-				$sum += $tags->weight;
-			}
-			
-			foreach ($tw as $tag => $weight) {
-				$this->show_tag($tag, $weight, $weight/$sum);
-			}
-			
-			common_element_end('p');
-		}
-	}
-
-	function show_tag($tag, $weight, $relative) {
-		
-		# XXX: these should probably tune to the size of the site
-		if ($relative > 0.1) {
-			$cls =  'largest';
-		} else if ($relative > 0.05) {
-			$cls = 'verylarge';
-		} else if ($relative > 0.02) {
-			$cls = 'large';
-		} else if ($relative > 0.01) {
-			$cls = 'medium';
-		} else if ($relative > 0.005) {
-			$cls = 'small';
-		} else if ($relative > 0.002) {
-			$cls = 'verysmall';
-		} else {
-			$cls = 'smallest';
-		}
-		
-		common_element('a', array('class' => "$cls weight-$weight relative-$relative",
-								  'href' => common_local_url('tag', array('tag' => $tag))),
-					   $tag);
-		common_text(' ');
-	}
-	
-	function show_notices($tag) {
-
-		$tags = DB_DataObject::factory('Notice_tag');
-
-		$tags->tag = $tag;
-
-		$tags->orderBy('created DESC');
-
-		$page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
-
-		$tags->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
-
-		$cnt = $tags->find();
-
-		if ($cnt > 0) {
-			common_element_start('ul', array('id' => 'notices'));
-			for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
-				if ($tags->fetch()) {
-					$notice = new Notice();
-					$notice->id = $tags->notice_id;
-					$result = $notice->find(true);
-					if (!$result) {
-						continue;
-					}
-					$this->show_notice($notice);
-				} else {
-					// shouldn't happen!
-					break;
-				}
-			}
-			common_element_end('ul');
-		}
-
-		common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
-						  $page, 'tag', array('tag' => $tag));
-	}
+
+class TagAction extends StreamAction
+{
+
+    function handle($args)
+    {
+
+        parent::handle($args);
+
+        # Looks like we're good; show the header
+
+        if (isset($args['tag']) && $args['tag']) {
+            $tag = $args['tag'];
+            common_show_header(sprintf(_("Notices tagged with %s"), $tag),
+                               array($this, 'show_header'), $tag,
+                               array($this, 'show_top'));
+            $this->show_notices($tag);
+        } else {
+            common_show_header(_("Tags"),
+                               array($this, 'show_header'), '',
+                               array($this, 'show_top'));
+            $this->show_tags();
+        }
+
+        common_show_footer();
+    }
+
+    function show_header($tag = false)
+    {
+        if ($tag) {
+            $this->element('link', array('rel' => 'alternate',
+                                         'href' => common_local_url('tagrss', array('tag' => $tag)),
+                                         'type' => 'application/rss+xml',
+                                         'title' => sprintf(_('Feed for tag %s'), $tag)));
+        }
+    }
+
+    function get_instructions()
+    {
+        return _('Showing most popular tags from the last week');
+    }
+
+    function show_top($tag = false)
+    {
+        if (!$tag) {
+            $instr = $this->get_instructions();
+            $output = common_markup_to_html($instr);
+            $this->elementStart('div', 'instructions');
+            $this->raw($output);
+            $this->elementEnd('div');
+            $this->public_views_menu();
+        }
+        else {
+            $this->show_feeds_list(array(0=>array('href'=>common_local_url('tagrss'),
+                                                  'type' => 'rss',
+                                                  'version' => 'RSS 1.0',
+                                                  'item' => 'tagrss')));
+        }
+    }
+
+    function show_tags()
+    {
+        # This should probably be cached rather than recalculated
+        $tags = DB_DataObject::factory('Notice_tag');
+
+        #Need to clear the selection and then only re-add the field
+        #we are grouping by, otherwise it's not a valid 'group by'
+        #even though MySQL seems to let it slide...
+        $tags->selectAdd();
+        $tags->selectAdd('tag');
+
+        #Add the aggregated columns...
+        $tags->selectAdd('max(notice_id) as last_notice_id');
+        if(common_config('db','type')=='pgsql') {
+            $calc='sum(exp(-extract(epoch from (now()-created))/%s)) as weight';
+        } else {
+            $calc='sum(exp(-(now() - created)/%s)) as weight';
+        }
+        $tags->selectAdd(sprintf($calc, common_config('tag', 'dropoff')));
+        $tags->groupBy('tag');
+        $tags->orderBy('weight DESC');
+
+        # $tags->whereAdd('created > "' . strftime('%Y-%m-%d %H:%M:%S', strtotime('-1 MONTH')) . '"');
+
+        $tags->limit(TAGS_PER_PAGE);
+
+        $cnt = $tags->find();
+
+        if ($cnt > 0) {
+            $this->elementStart('p', 'tagcloud');
+
+            $tw = array();
+            $sum = 0;
+            while ($tags->fetch()) {
+                $tw[$tags->tag] = $tags->weight;
+                $sum += $tags->weight;
+            }
+
+            ksort($tw);
+
+            foreach ($tw as $tag => $weight) {
+                $this->show_tag($tag, $weight, $weight/$sum);
+            }
+
+            $this->elementEnd('p');
+        }
+    }
+
+    function show_tag($tag, $weight, $relative)
+    {
+
+        # XXX: these should probably tune to the size of the site
+        if ($relative > 0.1) {
+            $cls =  'largest';
+        } else if ($relative > 0.05) {
+            $cls = 'verylarge';
+        } else if ($relative > 0.02) {
+            $cls = 'large';
+        } else if ($relative > 0.01) {
+            $cls = 'medium';
+        } else if ($relative > 0.005) {
+            $cls = 'small';
+        } else if ($relative > 0.002) {
+            $cls = 'verysmall';
+        } else {
+            $cls = 'smallest';
+        }
+
+        $this->element('a', array('class' => "$cls weight-$weight relative-$relative",
+                                  'href' => common_local_url('tag', array('tag' => $tag))),
+                       $tag);
+        $this->text(' ');
+    }
+
+    function show_notices($tag)
+    {
+
+        $cnt = 0;
+
+        $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+
+        $notice = Notice_tag::getStream($tag, (($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
+
+        $cnt = $this->show_notice_list($notice);
+
+        common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
+                          $page, 'tag', array('tag' => $tag));
+    }
 }