Empty commit

classes/class_torrent_form.php

@@ -196,6 +196,7 @@ function music_form($GenreTags) {
 			<td id="artistfields">
 				<p id="vawarning" class="hidden">Please use the multiple artists feature rather than adding 'Various Artists' as an artist, read <a href='wiki.php?action=article&amp;id=369'>this</a> for more information on why.</p>
 <?			if(!empty($Torrent['Artists'])) {
+				$FirstArtist = true;
 				foreach($Torrent['Artists'] as $Importance => $Artists) {
 					foreach($Artists as $Artist) {
 ?>
@@ -208,6 +209,10 @@ function music_form($GenreTags) {
 						<option value="6"<?=($Importance == '6' ? ' selected="selected"' : '')?>>DJ / Compiler</option>
 						<option value="3"<?=($Importance == '3' ? ' selected="selected"' : '')?>>Remixer</option>
 					</select>
+<?				if ($FirstArtist) { ?>
+					[<a href="javascript:AddArtistField()">+</a>] [<a href="javascript:RemoveArtistField()">-</a>]
+<?					$FirstArtist = false;
+				}	?>
 					<br />
 <?					}
 				}

classes/config.template

@@ -124,7 +124,7 @@ $Media = array('CD', 'DVD', 'Vinyl', 'Soundboard', 'SACD', 'DAT', 'Cassette', 'W
 $CollageCats = array(0=>'Personal', 1=>'Theme', 2=>'Genre introduction', 3=>'Discography', 4=>'Label', 5=>'Staff picks', 6=>'Charts');
 
 $ReleaseTypes = array(1=>'Album', 3=>'Soundtrack', 5=>'EP', 6=>'Anthology', 7=>'Compilation', 9=>'Single', 11=>'Live album', 13=>'Remix', 14=>'Bootleg', 15=>'Interview', 16=>'Mixtape', 21=>'Unknown');
-$ForumCats = array(1=>'Site', 5=>'Community', 10=>'Help', 8=>'Music', 20=>'Trash');
+//$ForumCats = array(1=>'Site', 5=>'Community', 10=>'Help', 8=>'Music', 20=>'Trash'); //No longer needed
 
 $ZIPGroups = array(
 	0 => 'MP3 (VBR) - High Quality',

gazelle.sql

@@ -250,6 +250,14 @@ CREATE TABLE `forums` (
   KEY `MinClassRead` (`MinClassRead`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+CREATE TABLE `forums_categories` (
+  `ID` tinyint(2) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(40) NOT NULL DEFAULT '',
+  `Sort` int(6) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`),
+  KEY `Sort` (`Sort`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
 CREATE TABLE `forums_last_read_topics` (
   `UserID` int(10) NOT NULL,
   `TopicID` int(10) NOT NULL,
@@ -1562,3 +1570,13 @@ INSERT INTO tags (ID, Name, TagType, Uses, UserID) VALUES (1, 'rock', 'genre', 0
 
 INSERT INTO schedule (NextHour, NextDay, NextBiWeekly) VALUES (0,0,0);
 
+INSERT INTO forums_categories (ID, Sort, Name) VALUES (1,1,'Site');
+
+INSERT INTO forums_categories (ID, Sort, Name) VALUES (5,5,'Community');
+
+INSERT INTO forums_categories (ID, Sort, Name) VALUES (10,10,'Help');
+
+INSERT INTO forums_categories (ID, Sort, Name) VALUES (8,8,'Music');
+
+INSERT INTO forums_categories (ID, Sort, Name) VALUES (20,20,'Trash');
+

sections/forums/index.php

@@ -7,6 +7,19 @@
 }
 
 include(SERVER_ROOT.'/sections/forums/functions.php');
+
+// Replace the old hard-coded forum categories
+unset($ForumCats);
+$ForumCats = $Cache->get_value('forums_categories');
+if ($ForumCats === false) {
+	$DB->query("SELECT ID, Name FROM forums_categories");
+	$ForumCats = array();
+	while (list($ID, $Name) =  $DB->next_record()) {
+		$ForumCats[$ID] = $Name;
+	}
+	$Cache->cache_value('forums_categories', $ForumCats, 0); //Inf cache.
+}
+
 //This variable contains all our lovely forum data
 if(!$Forums = $Cache->get_value('forums_list')) {
 	$DB->query("SELECT
@@ -29,11 +42,12 @@
 		t.IsLocked,
 		t.IsSticky
 		FROM forums AS f
+		JOIN forums_categories AS fc ON fc.ID = f.CategoryID
 		LEFT JOIN forums_topics as t ON t.ID = f.LastPostTopicID
 		LEFT JOIN users_main AS um ON um.ID=f.LastPostAuthorID
 		LEFT JOIN forums_specific_rules AS sr ON sr.ForumID = f.ID
 		GROUP BY f.ID
-		ORDER BY f.CategoryID, f.Sort");
+		ORDER BY fc.Sort, fc.Name, f.CategoryID, f.Sort");
 	$Forums = $DB->to_array('ID', MYSQLI_ASSOC, false);
 	foreach($Forums as $ForumID => $Forum) {
 		if(count($Forum['SpecificRules'])) {

sections/forums/main.php

@@ -49,6 +49,7 @@
 	$ForumDescription = display_str($ForumDescription);
 
 	if($CategoryID!=$LastCategoryID) {
+		$Row = 'b';
 		$LastCategoryID=$CategoryID;
 		if($OpenTable) { ?>
 	</table>

sections/tools/managers/forum_list.php

@@ -21,6 +21,17 @@ function class_list($Selected=0){
 $DB->query('SELECT ID, Name FROM forums ORDER BY Sort');
 $ForumArray = $DB->to_array(); // used for generating the 'parent' drop down list
 
+// Replace the old hard-coded forum categories
+unset($ForumCats);
+$ForumCats = $Cache->get_value('forums_categories');
+if ($ForumCats === false) {
+	$DB->query("SELECT ID, Name FROM forums_categories");
+	$ForumCats = array();
+	while (list($ID, $Name) =  $DB->next_record()) {
+		$ForumCats[$ID] = $Name;
+	}
+	$Cache->cache_value('forums_categories', $ForumCats, 0); //Inf cache.
+}
 
 $DB->query('SELECT
 	ID,

sections/torrents/details.php

@@ -42,7 +42,7 @@ function compare($X, $Y){
 }
 if($GroupVanityHouse){
 	$DisplayName.=' [Vanity House]';
-	$AltName.=' [VanityHouse]';
+	$AltName.=' [Vanity House]';
 }
 if($GroupCategoryID == 1) {
 	$DisplayName.=' ['.$ReleaseTypes[$ReleaseType].']';