Merge branch 'other-creators' of tricidious/Gazelle into master

classes/torrent_form.class.php

@@ -916,6 +916,30 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
         <td><input type="text" id="title_jp" name="title_jp" size="60" value="<?=display_str($Torrent['TitleJP'])?>" <?=$this->Disabled?>/></td>
       </tr>
 <? } ?>
+      <tr>
+        <td class="label">Creators/Authors (Optional):</td>
+        <td id="idolfields">
+      <?      if (!empty($Torrent['Artists'])) {
+          foreach ($Torrent['Artists'] as $Num => $Artist) { ?>
+            <input type="text" id="idols_<?=$Num?>" name="idols[]" size="45" value="<?=display_str($Artist['name'])?>" <?=$this->Disabled?> />
+            <? if ($Num == 0) { ?>
+              <a class="add_artist_button brackets">+</a> <a class="remove_artist_button brackets">&minus;</a>
+            <? }
+            }
+          } else { ?>
+            <input type="text" id="idols_0" name="idols[]" size="45" value="" <?=$this->Disabled?> />
+            <a class="add_artist_button brackets">+</a> <a class="remove_artist_button brackets">&minus;</a>
+      <?        } ?>
+        </td>
+      </tr>
+      <tr>
+        <td class="label">Publisher (Optional):</td>
+        <td><input type="text" id="studio" name="studio" size="60" value="<?=display_str($Torrent['Studio']) ?>" <?=$this->Disabled?>/></td>
+      </tr>
+      <tr>
+        <td class="label">DLsite ID:</td>
+        <td><input type="text" id="dlsiteid" name="dlsiteid" size="8" maxlength="8" value="<?=display_str($Torrent['DLsiteID'])?>" <?=$this->Disabled?>/></td>
+      </tr>
       <tr>
         <td class="label">Censored?:</td>
         <td>

sections/artist/artist.php

@@ -652,19 +652,15 @@ if ($NumRequests > 0) {
   foreach ($Requests as $RequestID => $Request) {
       $CategoryName = $Categories[$Request['CategoryID'] - 1];
       $Title = empty($Request['Title']) ? (empty($Request['TitleRJ']) ? display_str($Request['TitleJP']) : display_str($Request['TitleRJ'])) : display_str($Request['Title']);
-      if ($CategoryName != 'Other') {
-        $ArtistForm = Requests::get_artists($RequestID);
-        $ArtistLink = Artists::display_artists($ArtistForm, true, true);
-        $FullName = $ArtistLink."<a href=\"requests.php?action=view&amp;id=$RequestID\"><span dir=\"ltr\">$Title</span></a>";
+      $ArtistForm = Requests::get_artists($RequestID);
+      $ArtistLink = Artists::display_artists($ArtistForm, true, true);
+      $FullName = $ArtistLink."<a href=\"requests.php?action=view&amp;id=$RequestID\"><span dir=\"ltr\">$Title</span></a>";
 
-        if ($Request['CatalogueNumber']) {
-          $FullName .= " [$Request[CatalogueNumber]]";
-        }
-        if ($Request['DLSiteID']) {
-          $FullName.= " [$Request[DLSiteID]]";
-        }
-      } else {
-        $FullName = "<a href=\"requests.php?action=view&amp;id=$RequestID\" dir=\"ltr\">$Title</a>";
+      if ($Request['CatalogueNumber']) {
+        $FullName .= " [$Request[CatalogueNumber]]";
+      }
+      if ($Request['DLSiteID']) {
+        $FullName.= " [$Request[DLSiteID]]";
       }
 
       if (!empty($Tags[$RequestID])) {

sections/requests/new_edit.php

@@ -53,9 +53,7 @@ if (!$NewRequest) {
       error(403);
     }
 
-    if ($CategoryName != 'Other') {
-      $ArtistForm = Requests::get_artists($RequestID);
-    }
+    $ArtistForm = Requests::get_artists($RequestID);
 
     $Tags = implode(', ', $Request['Tags']);
   }

sections/requests/request.php

@@ -30,28 +30,18 @@ if ($Request['CategoryID'] === '0') {
 $Title = empty($Request['Title']) ? (empty($Request['TitleRJ']) ? $Request['TitleJP'] : $Request['TitleRJ']) : $Request['Title'];
 
 //Do we need to get artists?
-if ($CategoryName != 'Other') {
-  $ArtistForm = Requests::get_artists($RequestID);
-  $ArtistName = Artists::display_artists($ArtistForm, false, true);
-  $ArtistLink = Artists::display_artists($ArtistForm, true, true);
-
-  if ($IsFilled) {
-    $DisplayLink = "$ArtistLink<a href=\"torrents.php?torrentid=$Request[TorrentID]\" dir=\"ltr\">$Title</a>";
-  } else {
-    $DisplayLink = $ArtistLink.'<span dir="ltr">'.$Title."</span>";
-  }
-
-  $FullName = $ArtistName.$Title;
+$ArtistForm = Requests::get_artists($RequestID);
+$ArtistName = Artists::display_artists($ArtistForm, false, true);
+$ArtistLink = Artists::display_artists($ArtistForm, true, true);
 
+if ($IsFilled) {
+  $DisplayLink = "$ArtistLink<a href=\"torrents.php?torrentid=$Request[TorrentID]\" dir=\"ltr\">$Title</a>";
 } else {
-  if ($IsFilled) {
-    $DisplayLink = "<a href=\"torrents.php?torrentid=$Request[TorrentID]\" dir=\"ltr\">$Title</a>";
-  } else {
-    $DisplayLink = "<span dir=\"ltr\">$Title</span>";
-  }
-  $FullName = $Title;
+  $DisplayLink = $ArtistLink.'<span dir="ltr">'.$Title."</span>";
 }
 
+$FullName = $ArtistName.$Title;
+
 $Extra = "";
 
 if (!empty($Request['TitleRJ']) && $Request['TitleRJ'] != $Title) {
@@ -135,24 +125,26 @@ $encoded_artist = urlencode($encoded_artist);
     </div>
 <?
   }
-  if ($CategoryName != 'Other') {
-    $ArtistVariant = "";
-    switch ($CategoryName) {
-      case "Movies":
-        $ArtistVariant = "Idols";
-        break;
-      case "Anime":
-        $ArtistVariant = "Studios";
-        break;
-      case "Manga":
-        $ArtistVariant = "Artists";
-        break;
-      case "Games":
-        $ArtistVariant = "Developers";
-        break;
-      default:
-        $ArtistVariant = "Artists";
-    }
+  $ArtistVariant = "";
+  switch ($CategoryName) {
+    case "Movies":
+      $ArtistVariant = "Idols";
+      break;
+    case "Anime":
+      $ArtistVariant = "Studios";
+      break;
+    case "Manga":
+      $ArtistVariant = "Artists";
+      break;
+    case "Games":
+      $ArtistVariant = "Developers";
+      break;
+    case "Other":
+      $ArtistVariant = "Creators";
+      break;
+    default:
+      $ArtistVariant = "Artists";
+  }
 ?>
     <div class="box box_artists">
       <div class="head"><strong><?=$ArtistVariant?></strong></div>
@@ -164,7 +156,6 @@ $encoded_artist = urlencode($encoded_artist);
 <?    } ?>
       </ul>
     </div>
-<?  } ?>
     <div class="box box_tags">
       <div class="head"><strong>Tags</strong></div>
       <ul class="stats nobullet">

sections/requests/requests.php

@@ -493,29 +493,25 @@ View::show_header($Title, 'requests');
 
     $Title = empty($Request['Title']) ? (empty($Request['TitleRJ']) ? $Request['TitleJP'] : $Request['TitleRJ']) : $Request['Title'];
 
-    if ($CategoryName != 'Other') {
-      $ArtistForm = Requests::get_artists($RequestID);
-      $ArtistLink = Artists::display_artists($ArtistForm, true, true);
-      $FullName = "$ArtistLink<a href=\"requests.php?action=view&amp;id=$RequestID\"><span ";
-      if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
-        $FullName .= 'onmouseover="getCover(event)" data-cover="'.ImageTools::process($Request['Image']).'" onmouseleave="ungetCover(event)" ';
-      }
-      $FullName .= "dir=\"ltr\">$Title</span></a>";
+    $ArtistForm = Requests::get_artists($RequestID);
+    $ArtistLink = Artists::display_artists($ArtistForm, true, true);
+    $FullName = "$ArtistLink<a href=\"requests.php?action=view&amp;id=$RequestID\"><span ";
+    if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
+      $FullName .= 'onmouseover="getCover(event)" data-cover="'.ImageTools::process($Request['Image']).'" onmouseleave="ungetCover(event)" ';
+    }
+    $FullName .= "dir=\"ltr\">$Title</span></a>";
 
-      $ExtraInfo = '';
+    $ExtraInfo = '';
 
-      if (!empty($Request['CatalogueNumber'])) {
-        $ExtraInfo .= " [$Request[CatalogueNumber]]";
-      }
+    if (!empty($Request['CatalogueNumber'])) {
+      $ExtraInfo .= " [$Request[CatalogueNumber]]";
+    }
 
-      if (!empty($Request['DLsiteID'])) {
-        $ExtraInfo .= " [$Request[DLsiteID]]";
-      }
-      if ($ExtraInfo) {
-        $FullName .= " $ExtraInfo";
-      }
-    } else {
-      $FullName = "<a href=\"requests.php?action=view&amp;id=$RequestID\" dir=\"ltr\">$Title</a>";
+    if (!empty($Request['DLsiteID'])) {
+      $ExtraInfo .= " [$Request[DLsiteID]]";
+    }
+    if ($ExtraInfo) {
+      $FullName .= " $ExtraInfo";
     }
     $Tags = $Request['Tags'];
 ?>

sections/requests/take_fill.php

@@ -89,19 +89,16 @@ if ($RequestCategoryID !== '0' && $TorrentCategoryID !== $RequestCategoryID) {
 
 $CategoryName = $Categories[$RequestCategoryID - 1];
 
-if ($CategoryName != 'Other') {
-  if ($RequestCatalogueNumber) {
-    if (str_replace('-', '', strtolower($TorrentCatalogueNumber)) !== str_replace('-', '', strtolower($RequestCatalogueNumber))) {
-      $Err = "This request requires the catalogue number $RequestCatalogueNumber";
-    }
+if ($RequestCatalogueNumber) {
+  if (str_replace('-', '', strtolower($TorrentCatalogueNumber)) !== str_replace('-', '', strtolower($RequestCatalogueNumber))) {
+    $Err = "This request requires the catalogue number $RequestCatalogueNumber";
   }
+}
 
-  if ($RequestDLSiteID) {
-    if (strtolower($TorrentDLSiteID) !== strtolower($RequestDLSiteID)) {
-      $Err = "This request requires DLSite ID $RequestDLSiteID";
-    }
+if ($RequestDLSiteID) {
+  if (strtolower($TorrentDLSiteID) !== strtolower($RequestDLSiteID)) {
+    $Err = "This request requires DLSite ID $RequestDLSiteID";
   }
-
 }
 
 // Fill request
@@ -117,13 +114,9 @@ $DB->query("
     TimeFilled = '".sqltime()."'
   WHERE ID = $RequestID");
 
-if ($CategoryName != 'Other') {
-  $ArtistForm = Requests::get_artists($RequestID);
-  $ArtistName = Artists::display_artists($ArtistForm, false, true);
-  $FullName = $ArtistName.$Title;
-} else {
-  $FullName = $Title;
-}
+$ArtistForm = Requests::get_artists($RequestID);
+$ArtistName = Artists::display_artists($ArtistForm, false, true);
+$FullName = $ArtistName.$Title;
 
 $DB->query("
   SELECT UserID

sections/requests/take_new_edit.php

@@ -106,25 +106,22 @@ if (empty($_POST['description'])) {
   $Description = trim($_POST['description']);
 }
 
-if ($CategoryName != 'Other') {
-  if (empty($_POST['artists'])) {
-    $Err = 'You did not enter any artists.';
-  } else {
-    $Artists = $_POST['artists'];
-  }
-
-  //Not required
-  if (!empty($_POST['cataloguenumber']) && $CategoryName == 'Movies') {
-    $CatalogueNumber = trim($_POST['cataloguenumber']);
-  } else {
-    $CatalogueNumber = '';
-  }
-  if (!empty($_POST['dlsiteid']) && $CategoryName == 'Games') {
-    $DLSiteID = trim($_POST['dlsiteid']);
-  } else {
-    $DLSiteID = '';
-  }
+if (empty($_POST['artists']) && $CategoryName != 'Other') {
+  $Err = 'You did not enter any artists.';
+} else {
+  $Artists = $_POST['artists'];
+}
 
+//Not required
+if (!empty($_POST['cataloguenumber']) && $CategoryName == 'Movies') {
+  $CatalogueNumber = trim($_POST['cataloguenumber']);
+} else {
+  $CatalogueNumber = '';
+}
+if (!empty($_POST['dlsiteid']) && $CategoryName == 'Games') {
+  $DLSiteID = trim($_POST['dlsiteid']);
+} else {
+  $DLSiteID = '';
 }
 
 // GroupID
@@ -150,20 +147,18 @@ if (!empty($_POST['groupid'])) {
 }
 
 //For refilling on error
-if ($CategoryName != 'Other') {
-  $ArtistNames = [];
-  $ArtistForm = [];
-  for ($i = 0; $i < count($Artists); $i++) {
-    if (trim($Artists[$i]) !== '') {
-      if (!in_array($Artists[$i], $ArtistNames)) {
-        $ArtistForm[] = array('name' => trim($Artists[$i]));
-        $ArtistNames[] = trim($Artists[$i]);
-      }
+$ArtistNames = [];
+$ArtistForm = [];
+for ($i = 0; $i < count($Artists); $i++) {
+  if (trim($Artists[$i]) !== '') {
+    if (!in_array($Artists[$i], $ArtistNames)) {
+      $ArtistForm[] = array('name' => trim($Artists[$i]));
+      $ArtistNames[] = trim($Artists[$i]);
     }
   }
-  if (!isset($ArtistNames[0])) {
-    unset($ArtistForm);
-  }
+}
+if (!isset($ArtistNames[0])) {
+  unset($ArtistForm);
 }
 
 if (!empty($Err)) {
@@ -291,7 +286,7 @@ if ($GroupID) {
  * 2. For each artist that didn't exist, create an artist.
  * 3. Create a row in the requests_artists table for each artist, based on the ID.
  */
-if (isset($CategoryName) && $CategoryName != "Other" && isset($ArtistForm)) {
+if (isset($ArtistForm)) {
   foreach ($ArtistForm as $Num => $Artist) {
     //1. See if each artist given already exists and if it does, grab the ID.
     $DB->query("
@@ -416,11 +411,7 @@ if ($NewRequest) {
 
   $AnnounceTitle = empty($Title) ? (empty($TitleRJ) ? $TitleJP : $TitleRJ) : $Title;
 
-  if ($CategoryName != 'Other') {
-    $Announce = "\"$AnnounceTitle\"".(isset($ArtistForm)?(' - '.Artists::display_artists($ArtistForm, false, false)):'').' '.site_url()."requests.php?action=view&id=$RequestID - ".implode(' ', $Tags);
-  } else {
-    $Announce = "\"$AnnounceTitle\" - ".site_url()."requests.php?action=view&id=$RequestID - ".implode(' ', $Tags);
-  }
+  $Announce = "\"$AnnounceTitle\"".(isset($ArtistForm)?(' - '.Artists::display_artists($ArtistForm, false, false)):'').' '.site_url()."requests.php?action=view&id=$RequestID - ".implode(' ', $Tags);
   send_irc('PRIVMSG '.BOT_REQUEST_CHAN.' '.$Announce);
 
 } else {

sections/requests/take_unfill.php

@@ -45,13 +45,9 @@ $DB->query("
 
 $CategoryName = $Categories[$CategoryID - 1];
 
-if ($CategoryName != 'Other') {
-  $ArtistForm = Requests::get_artists($RequestID);
-  $ArtistName = Artists::display_artists($ArtistForm, false, true);
-  $FullName = $ArtistName.$Title;
-} else {
-  $FullName = $Title;
-}
+$ArtistForm = Requests::get_artists($RequestID);
+$ArtistName = Artists::display_artists($ArtistForm, false, true);
+$FullName = $ArtistName.$Title;
 
 $RequestVotes = Requests::get_votes_array($RequestID);
 

sections/torrents/details.php

@@ -243,10 +243,6 @@ $Index++;
 <?    } ?>
 
   </div>
-<?
-if ($Categories[$GroupCategoryID - 1] != 'Other') {
-  $ShownWith = false;
-?>
     <div class="box box_artists">
       <div class="head"><strong>Artists</strong>
       <?=check_perms('torrents_edit') ? '<span class="edit_artists"><a onclick="ArtistManager(); return false;" href="#" class="brackets float_right">Edit</a></span>' : ''?>
@@ -276,7 +272,6 @@ if ($Categories[$GroupCategoryID - 1] != 'Other') {
     </div>
 <?
     }
-  }
 ?>
     <div class="box box_tags">
       <div class="head">

sections/torrents/user.php

@@ -506,11 +506,7 @@ foreach ($Categories as $CatKey => $CatName) {
 
     $TorrentTags = new Tags($TagList);
 
-    if ($Categories[$GroupCategoryID-1] != 'Other') {
-      $DisplayName = Artists::display_artists($Artists);
-    } else {
-      $DisplayName = '';
-    }
+    $DisplayName = Artists::display_artists($Artists);
     $DisplayName .= '<a href="torrents.php?id='.$GroupID.'&amp;torrentid='.$TorrentID.'" ';
     if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
       $DisplayName .= 'onmouseover="getCover(event)" data-cover="'.ImageTools::process($WikiImage).'" onmouseleave="ungetCover()" ';

sections/upload/upload_handle.php

@@ -89,12 +89,16 @@ if (isset($Properties['GroupID'])) {
   $Properties['Artists'] = Artists::get_artist($Properties['GroupID']);
 }
 
-if ($Type == 'Movies' || $Type == 'Manga' || $Type == 'Anime' || $Type == 'Games' ) {
+if ($Type == 'Movies' || $Type == 'Manga' || $Type == 'Anime' || $Type == 'Games') {
   if (empty($_POST['idols'])) {
     $Err = "You didn't enter any goils";
   } else {
     $Artists = $_POST['idols'];
   }
+} elseif ($Type == 'Other') {
+  if (!empty($_POST['idols'])) {
+    $Artists = $_POST['idols'];
+  }
 }
 
 if (!empty($_POST['requestid'])) {
@@ -193,7 +197,7 @@ if (!is_uploaded_file($TorrentName) || !filesize($TorrentName)) {
 //Multiple artists!
 
 $LogName = '';
-if (empty($Properties['GroupID']) && empty($ArtistForm) && ($Type == 'Movies' || $Type == 'Anime' || $Type == 'Manga' || $Type == 'Games')) {
+if (empty($Properties['GroupID']) && empty($ArtistForm)) {
   $ArtistNames = [];
   $ArtistForm = [];
   for ($i = 0; $i < count($Artists); $i++) {
@@ -205,7 +209,7 @@ if (empty($Properties['GroupID']) && empty($ArtistForm) && ($Type == 'Movies' ||
     }
   }
   $LogName .= Artists::display_artists($ArtistForm, false, true, false);
-} elseif (($Type == 'Movies' || $Type == 'Anime' || $Type == 'Manga' || $Type == 'Games') && empty($ArtistForm)) {
+} elseif (empty($ArtistForm)) {
   $DB->query("
     SELECT ta.ArtistID, ag.Name
     FROM torrents_artists AS ta
@@ -327,24 +331,53 @@ if (!preg_match('/^'.IMAGE_REGEX.'$/i', $Properties['Image'])) {
   $T['Image'] = "''";
 }
 
-if ($Type == 'Movies' || $Type == 'Anime' || $Type == 'Manga' || $Type == 'Games') {
-  // Does it belong in a group?
-  if ($Properties['GroupID']) {
-    $DB->query("
+// Does it belong in a group?
+if ($Properties['GroupID']) {
+  $DB->query("
+    SELECT
+      ID,
+      WikiImage,
+      WikiBody,
+      RevisionID,
+      Name,
+      Year,
+      TagList
+    FROM torrents_group
+    WHERE id = ".$Properties['GroupID']);
+  if ($DB->has_results()) {
+    // Don't escape tg.Name. It's written directly to the log table
+    list($GroupID, $WikiImage, $WikiBody, $RevisionID, $Properties['Title'], $Properties['Year'], $Properties['TagList']) = $DB->next_record(MYSQLI_NUM, array(4));
+    $Properties['TagList'] = str_replace(array(' ', '.', '_'), array(', ', '.', '.'), $Properties['TagList']);
+    if (!$Properties['Image'] && $WikiImage) {
+      $Properties['Image'] = $WikiImage;
+      $T['Image'] = "'".db_string($WikiImage)."'";
+    }
+    if (strlen($WikiBody) > strlen($Body)) {
+      $Body = $WikiBody;
+      if (!$Properties['Image'] || $Properties['Image'] == $WikiImage) {
+        $NoRevision = true;
+      }
+    }
+    $Properties['Artist'] = Artists::display_artists(Artists::get_artist($GroupID), false, false);
+  }
+}
+if (!isset($GroupID) || !$GroupID) {
+  foreach ($ArtistForm as $Num => $Artist) {
+    /*$DB->query("
       SELECT
-        ID,
-        WikiImage,
-        WikiBody,
-        RevisionID,
-        Name,
-        Year,
-        TagList
-      FROM torrents_group
-      WHERE id = ".$Properties['GroupID']);
+        tg.id,
+        tg.WikiImage,
+        tg.WikiBody,
+        tg.RevisionID
+      FROM torrents_group AS tg
+        LEFT JOIN torrents_artists AS ta ON ta.GroupID = tg.ID
+        LEFT JOIN artists_group AS ag ON ta.ArtistID = ag.ArtistID
+      WHERE ag.Name = '".db_string($Artist['name'])."'
+        AND tg.Name = ".$T['Title']."
+        AND tg.Year = ".$T['Year']);
+
     if ($DB->has_results()) {
-      // Don't escape tg.Name. It's written directly to the log table
-      list($GroupID, $WikiImage, $WikiBody, $RevisionID, $Properties['Title'], $Properties['Year'], $Properties['TagList']) = $DB->next_record(MYSQLI_NUM, array(4));
-      $Properties['TagList'] = str_replace(array(' ', '.', '_'), array(', ', '.', '.'), $Properties['TagList']);
+      list($GroupID, $WikiImage, $WikiBody, $RevisionID) = $DB->next_record();
       if (!$Properties['Image'] && $WikiImage) {
         $Properties['Image'] = $WikiImage;
         $T['Image'] = "'".db_string($WikiImage)."'";
@@ -355,58 +388,27 @@ if ($Type == 'Movies' || $Type == 'Anime' || $Type == 'Manga' || $Type == 'Games
           $NoRevision = true;
         }
       }
-      $Properties['Artist'] = Artists::display_artists(Artists::get_artist($GroupID), false, false);
-    }
-  }
-  if (!isset($GroupID) || !$GroupID) {
-    foreach ($ArtistForm as $Num => $Artist) {
-      /*$DB->query("
-        SELECT
-          tg.id,
-          tg.WikiImage,
-          tg.WikiBody,
-          tg.RevisionID
-        FROM torrents_group AS tg
-          LEFT JOIN torrents_artists AS ta ON ta.GroupID = tg.ID
-          LEFT JOIN artists_group AS ag ON ta.ArtistID = ag.ArtistID
-        WHERE ag.Name = '".db_string($Artist['name'])."'
-          AND tg.Name = ".$T['Title']."
-          AND tg.Year = ".$T['Year']);
+      $ArtistForm = Artists::get_artist($GroupID);
+      //This torrent belongs in a group
+      break;
 
+    } else {*/
+      // The album hasn't been uploaded. Try to get the artist IDs
+      $DB->query("
+        SELECT
+          ArtistID,
+          Name
+        FROM artists_group
+        WHERE Name = '".db_string($Artist['name'])."'");
       if ($DB->has_results()) {
-        list($GroupID, $WikiImage, $WikiBody, $RevisionID) = $DB->next_record();
-        if (!$Properties['Image'] && $WikiImage) {
-          $Properties['Image'] = $WikiImage;
-          $T['Image'] = "'".db_string($WikiImage)."'";
-        }
-        if (strlen($WikiBody) > strlen($Body)) {
-          $Body = $WikiBody;
-          if (!$Properties['Image'] || $Properties['Image'] == $WikiImage) {
-            $NoRevision = true;
-          }
-        }
-        $ArtistForm = Artists::get_artist($GroupID);
-        //This torrent belongs in a group
-        break;
-
-      } else {*/
-        // The album hasn't been uploaded. Try to get the artist IDs
-        $DB->query("
-          SELECT
-            ArtistID,
-            Name
-          FROM artists_group
-          WHERE Name = '".db_string($Artist['name'])."'");
-        if ($DB->has_results()) {
-          while (list($ArtistID, $Name) = $DB->next_record(MYSQLI_NUM, false)) {
-            if (!strcasecmp($Artist['name'], $Name)) {
-              $ArtistForm[$Num] = array('id' => $ArtistID, 'name' => $Name);
-              break;
-            }
+        while (list($ArtistID, $Name) = $DB->next_record(MYSQLI_NUM, false)) {
+          if (!strcasecmp($Artist['name'], $Name)) {
+            $ArtistForm[$Num] = array('id' => $ArtistID, 'name' => $Name);
+            break;
           }
         }
-      //}
-    }
+      }
+    //}
   }
 }
 
@@ -417,7 +419,7 @@ $LogName .= $Properties['Title'];
 $IsNewGroup = !isset($GroupID) || !$GroupID;
 
 //----- Start inserts
-if ((!isset($GroupID) || !$GroupID) && ($Type != 'Other')) {
+if ((!isset($GroupID) || !$GroupID)) {
   //array to store which artists we have added already, to prevent adding an artist twice
   $ArtistsAdded = [];
   foreach ($ArtistForm as $Num => $Artist) {
@@ -454,14 +456,12 @@ if (!isset($GroupID) || !$GroupID) {
     VALUES
       ($TypeID, ".$T['Title'].", ".$T['TitleRJ'].", ".$T['TitleJP'].", ".$T['Year'].", ".$T['Series'].", ".$T['Studio'].", ".$T['CatalogueNumber'].", " . $T['Pages'] . ", '".sqltime()."', '".db_string($Body)."', ".$T['Image'].", ".$T['DLsiteID'].")");
   $GroupID = $DB->inserted_id();
-  if ($Type == 'Movies' || $Type == 'Anime' || $Type == 'Manga' || $Type == 'Games') {
-    foreach ($ArtistForm as $Num => $Artist) {
-      $DB->query("
-        INSERT IGNORE INTO torrents_artists (GroupID, ArtistID, UserID)
-        VALUES ($GroupID, ".$Artist['id'].', '.$LoggedUser['ID'].")");
-      $Cache->increment('stats_album_count');
-      $Cache->delete_value('artist_groups_'.$Artist['id']);
-    }
+  foreach ($ArtistForm as $Num => $Artist) {
+    $DB->query("
+      INSERT IGNORE INTO torrents_artists (GroupID, ArtistID, UserID)
+      VALUES ($GroupID, ".$Artist['id'].', '.$LoggedUser['ID'].")");
+    $Cache->increment('stats_album_count');
+    $Cache->delete_value('artist_groups_'.$Artist['id']);
   }
   $Cache->increment('stats_group_count');
 
@@ -694,9 +694,8 @@ if (function_exists('fastcgi_finish_request')) {
 //--------------------------- IRC announce and feeds ---------------------------//
 $Announce = '';
 
-if ($Type != 'Other') {
-  $Announce .= Artists::display_artists($ArtistForm, false);
-}
+$Announce .= Artists::display_artists($ArtistForm, false);
+
 $Announce .= empty($Properties['Title']) ? (empty($Properties['TitleRJ']) ? trim($Properties['TitleJP']) : trim($Properties['TitleRJ'])) : trim($Properties['Title']);
 $Announce .= ' ';
 if ($Type != 'Other') {