Routing: Remove IDs from tags URLs, use menu item of tags view as default for tag view (#11166)

* Remove id from tags, use tags list menu item as default for tag

* Code style, remove useless code, feature: first Itemid for tags view, second Itemid for default tag view

Author: csthomas

components/com_tags/helpers/route.php

@@ -94,6 +94,38 @@ public static function getTagRoute($id)
 			{
 				$link .= '&Itemid=' . $item;
 			}
+			else
+			{
+				$needles = array('tags' => array(1, 0));
+
+				if ($item = self::_findItem($needles))
+				{
+					$link .= '&Itemid=' . $item;
+				}
+			}
+		}
+
+		return $link;
+	}
+
+	/**
+	 * Tries to load the router for the tags view.
+	 *
+	 * @return  string  URL link to pass to JRoute
+	 *
+	 * @since   3.7
+	 */
+	public static function getTagsRoute()
+	{
+		$needles = array(
+			'tags'  => array(0)
+		);
+
+		$link = 'index.php?option=com_tags&view=tags';
+
+		if ($item = self::_findItem($needles))
+		{
+			$link .= '&Itemid=' . $item;
 		}
 
 		return $link;
@@ -153,6 +185,10 @@ protected static function _findItem($needles = null)
 								}
 							}
 						}
+						elseif ($view == 'tags')
+						{
+							self::$lookup[$lang]['tags'][] = $item->id;
+						}
 					}
 				}
 			}

components/com_tags/router.php

@@ -103,6 +103,13 @@ public function build(&$query)
 		for ($i = 0; $i < $total; $i++)
 		{
 			$segments[$i] = str_replace(':', '-', $segments[$i]);
+			$position     = strpos($segments[$i], '-');
+
+			if ($position)
+			{
+				// Remove id from segment
+				$segments[$i] = substr($segments[$i], $position + 1);
+			}
 		}
 
 		return $segments;
@@ -137,19 +144,47 @@ public function parse(&$segments)
 		if (!isset($item))
 		{
 			$vars['view'] = $segments[0];
-			$vars['id']   = $segments[$count - 1];
+			$vars['id']   = $this->fixSegment($segments[$count - 1]);
 
 			return $vars;
 		}
 
-		// From the tags view, we can only jump to a tag.
-		$id = (isset($item->query['id']) && $item->query['id'] > 1) ? $item->query['id'] : 'root';
-
-		$vars['id'] = $segments[0];
+		$vars['id'] = $this->fixSegment($segments[0]);
 		$vars['view'] = 'tag';
 
 		return $vars;
 	}
+
+	/**
+	 * Try to add missing id to segment
+	 *
+	 * @param   string  $segment  One piece of segment of the URL to parse
+	 *
+	 * @return  string  The segment with founded id
+	 *
+	 * @since   3.7
+	*/
+	protected function fixSegment($segment)
+	{
+		$db = JFactory::getDbo();
+
+		// Try to find tag id
+		$alias = str_replace(':', '-', $segment);
+
+		$query = $db->getQuery(true)
+			->select('id')
+			->from($db->quoteName('#__tags'))
+			->where($db->quoteName('alias') . " = " . $db->quote($alias));
+
+		$id = $db->setQuery($query)->loadResult();
+
+		if ($id)
+		{
+			$segment = "$id:$alias";
+		}
+
+		return $segment;
+	}
 }
 
 /**