Tag namespace tweaks

classes/rules.class.php

@@ -67,8 +67,6 @@ class Rules {
           <li><strong>:male</strong> - Used to denote that the tag refers to a male character: <strong class="tag_male">masturbation</strong>, <strong class="tag_male">teacher</strong></li>
           <li><strong>:female</strong> - Used to denote that the tag refers to a female character: <strong class="tag_female">masturbation</strong>, <strong class="tag_female">shaved</strong></li>
         </ul>
-
-        Note: gender namespaces should <strong class="important_text">NOT</strong> be used for tags where the gender is implied, such as "<strong class="important_text_alt">lolicon</strong>" or "<strong class="important_text_alt">shotacon</strong>".
       </li>
 
       <li><strong>All uploads require a minimum of 5 tags.</strong></li>

classes/tags.class.php

@@ -136,13 +136,9 @@ class Tags {
       $ArtistName = "&artistname=" . urlencode($ArtistName) . "&action=advanced&searchsubmit=1";
     }
     foreach ($this->Tags as $Tag) {
-			$Name = $Tag;
-			$Class = "";
-			$Split = explode(':', $Tag);
-			if (count($Split) > 1 && in_array($Split[1], TAG_NAMESPACES)) {
-				$Name = $Split[0];
-				$Class = "tag_" . $Split[1];
-			}
+      $Split = self::get_name_and_class($Tag);
+      $Name = $Split['name'];
+      $Class = $Split['class'];
       if (empty($this->TagLink[$Tag])) {
         $this->TagLink[$Tag] = '<a class="' . $Class . '" href="' . $Link . $Tag . $ArtistName . '">' . $Name . '</a>';
       }
@@ -165,8 +161,12 @@ class Tags {
     if (!empty($ArtistName)) {
       $ArtistName = '&amp;artistname=' . urlencode($ArtistName) . '&amp;action=advanced&amp;searchsubmit=1';
     }
-    foreach (array_slice(self::sorted(), 0, $Max) as $TagName => $Total) { ?>
-      <li><a href="<?=$Link . display_str($TagName) . $ArtistName?>"><?=display_str($TagName)?></a> (<?=$Total?>)</li>
+    foreach (array_slice(self::sorted(), 0, $Max) as $Tag => $Total) {
+      $Split = self::get_name_and_class($Tag);
+      $Name = $Split['name'];
+      $Class = $Split['class'];
+    ?>
+      <li><a class="<?=$Class?>" href="<?=$Link . display_str($Name) . $ArtistName?>"><?=display_str($Name)?></a> (<?=$Total?>)</li>
 <?    }
   }
 
@@ -278,4 +278,22 @@ class Tags {
 
     return ['input' => $TagList, 'predicate' => implode(' ', $QueryParts)];
   }
+
+  /**
+   * Breaks a tag down into name and namespace class
+   * @param string $Tag Tag of the form 'tag' or 'tag:namespace'
+   * @return array Array keys name and class
+   *               name is the name of the tag without a namespace
+   *               class is the HTML class that should be applied to the tag, empty string if the tag has no namespace
+   */
+   public static function get_name_and_class($Tag) {
+			$Name = $Tag;
+			$Class = "";
+			$Split = explode(':', $Tag);
+			if (count($Split) > 1 && in_array($Split[1], TAG_NAMESPACES)) {
+				$Name = $Split[0];
+				$Class = "tag_" . $Split[1];
+			}
+      return array("name" => display_str($Name), "class" => display_str($Class));
+   }
 }

sections/top10/tags.php

@@ -144,12 +144,15 @@ function generate_tag_table($Caption, $Tag, $Details, $Limit, $ShowVotes = true,
   $Rank = 0;
   foreach ($Details as $Detail) {
     $Rank++;
+    $Split = Tags::get_name_and_class($Detail['Name']);
+    $DisplayName = $Split['name'];
+    $Class = $Split['class'];
 
     // print row
 ?>
   <tr class="row">
     <td class="center"><?=$Rank?></td>
-    <td><a href="<?=$URLString?><?=$Detail['Name']?>"><?=$Detail['Name']?></a></td>
+    <td><a class="<?=$Class?>" href="<?=$URLString?><?=$Detail['Name']?>"><?=$DisplayName?></a></td>
     <td class="number_column"><?=number_format($Detail['Uses'])?></td>
 <?    if ($ShowVotes) { ?>
     <td class="number_column"><?=number_format($Detail['PosVotes'])?></td>

sections/torrents/details.php

@@ -92,14 +92,10 @@ if ($TorrentTags != '') {
     $Tags[$TagKey]['score'] = ($TagPositiveVotes[$TagKey] - $TagNegativeVotes[$TagKey]);
     $Tags[$TagKey]['id'] = $TorrentTagIDs[$TagKey];
     $Tags[$TagKey]['userid'] = $TorrentTagUserIDs[$TagKey];
-		$Tags[$TagKey]['display'] = $TagName;
-		$Tags[$TagKey]['class'] = "";
-
-		$Split = explode(':', $TagName);
-		if (count($Split) > 1 && in_array($Split[1], TAG_NAMESPACES)) {
-			$Tags[$TagKey]['display'] = $Split[0];
-			$Tags[$TagKey]['class'] = "tag_" . $Split[1];
-		}
+
+    $Split = Tags::get_name_and_class($TagName);
+    $Tags[$TagKey]['display'] = $Split['name'];
+    $Tags[$TagKey]['class'] = $Split['class'];
 
   }
   uasort($Tags, 'compare');