Merge branch 'master' of https://git.oppaiti.me/Oppaitime/Gazelle

classes/cache.class.php

@@ -394,12 +394,19 @@ class Cache extends MemcacheCompat {
   /**
    * Get cache server status
    *
-   * @return array (host => bool status, ...)
+   * @return array (host => int status, ...)
    */
   public function server_status() {
     $Status = [];
+    if (is_subclass_of($this, 'Memcached')) {
+      $MemcachedStats = $this->getStats();
+    }
     foreach ($this->Servers as $Server) {
-      $Status["$Server[host]:$Server[port]"] = $this->getServerStatus($Server['host'], $Server['port']);
+      if (is_subclass_of($this, 'Memcached')) {
+        $Status["$Server[host]:$Server[port]"] = gettype($MemcachedStats["$Server[host]:$Server[port]"]) == 'array' ? 1 : 0;
+      } else {
+        $Status["$Server[host]:$Server[port]"] = $this->getServerStatus($Server['host'], $Server['port']);
+      }
     }
     return $Status;
   }

classes/torrent_form.class.php

@@ -524,7 +524,7 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
             <option value="<?=$Genre?>"><?=$Genre?></option>
 <? } ?>
           </select>
-          <input type="text" id="tags" name="tags" size="60" value="<?=display_str($Torrent['TagList']) ?>"<? Users::has_autocomplete_enabled('other'); ?> />
+          <input type="text" id="tags" name="tags" size="60" value="<?=display_str(implode(', ', explode(',', $Torrent['TagList']))) ?>"<? Users::has_autocomplete_enabled('other'); ?> />
           <p class="min_padding notes"></p>
         </td>
       </tr>

sections/bookmarks/torrents.php

@@ -60,29 +60,18 @@ foreach ($GroupIDs as $GroupID) {
 
   $TorrentTags = new Tags($TagList);
 
-  /*if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4]) || !empty($ExtendedArtists[5]) || !empty($ExtendedArtists[6])) {
-      unset($ExtendedArtists[2]);
-      unset($ExtendedArtists[3]);
-      $DisplayName = Artists::display_artists($ExtendedArtists);
-  } elseif (count($Artists) > 0) {
-      $DisplayName = Artists::display_artists(array('1' => $Artists));
-  } else {
-    $DisplayName = '';
-  }*/
-
   $DisplayName = Artists::display_artists($Artists);
 
   $GroupName = empty($GroupName) ? (empty($GroupNameRJ) ? $GroupNameJP : $GroupNameRJ) : $GroupName;
 
-  $DisplayName .= '<a href="torrents.php?id='.$GroupID.'" class="tooltip" title="View torrent group" dir="ltr">'.$GroupName.'</a>';
+  $DisplayName .= '<a href="torrents.php?id='.$GroupID.'" ';
+  if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
+    $DisplayName .= 'onmouseover="getCover(event)" data-cover="'.ImageTools::process($WikiImage, 'thumb').'" onmouseleave="ungetCover(event)" ';
+  }
+  $DisplayName .= ' class="tooltip" title="View torrent group" dir="ltr">'.$GroupName.'</a>';
   if ($GroupYear > 0) {
     $DisplayName = "$DisplayName [$GroupYear]";
   }
-  /*
-  if ($GroupVanityHouse) {
-    $DisplayName .= ' [<abbr class="tooltip" title="This is a Vanity House release">VH</abbr>]';
-  }
-  */
   $SnatchedGroupClass = $GroupFlags['IsSnatched'] ? ' snatched_group' : '';
 
   // Start an output buffer, so we can store this output in $TorrentTable
@@ -91,17 +80,17 @@ foreach ($GroupIDs as $GroupID) {
       // Grouped torrents
       $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] === 1);
 ?>
-      <tr class="group discog<?=$SnatchedGroupClass?>" id="group_<?=$GroupID?>">
+      <tr class="group" id="group_<?=$GroupID?>">
         <td class="center">
           <div id="showimg_<?=$GroupID?>" class="<?=($ShowGroups ? 'hide' : 'show')?>_torrents">
-            <a href="#" class="tooltip show_torrents_link" onclick="toggle_group(<?=$GroupID?>, this, event);" title="Collapse this group. Hold &quot;Ctrl&quot; while clicking to collape all groups on this page."></a>
+            <a class="tooltip show_torrents_link" onclick="toggle_group(<?=$GroupID?>, this, event);" title="Collapse this group. Hold &quot;Ctrl&quot; while clicking to collape all groups on this page."></a>
           </div>
         </td>
         <td class="center">
-          <div title="<?=$TorrentTags->title()?>" class="tooltip <?=Format::css_category($GroupCategoryID)?> <?=$TorrentTags->css_name()?>"></div>
+          <div title="<?=$TorrentTags->title()?>" class="tooltip <?=Format::css_category($GroupCategoryID)?>"></div>
         </td>
         <td colspan="5">
-          <strong><?=$DisplayName?></strong>
+          <?=$DisplayName?>
           <span style="text-align: right;" class="float_right">
             <?=time_diff($AddedTime);?>
 <?    if (!$Sneaky) { ?>
@@ -113,46 +102,10 @@ foreach ($GroupIDs as $GroupID) {
         </td>
       </tr>
 <?
-    $LastRemasterYear = '-';
-    $LastRemasterTitle = '';
-    $LastRemasterRecordLabel = '';
-    $LastRemasterCatalogueNumber = '';
-    $LastMedia = '';
-
-    $EditionID = 0;
-    unset($FirstUnknown);
-
     foreach ($Torrents as $TorrentID => $Torrent) {
-/*
-      if ($Torrent['Remastered'] && !$Torrent['RemasterYear']) {
-        $FirstUnknown = !isset($FirstUnknown);
-      }
-*/
       $SnatchedTorrentClass = $Torrent['IsSnatched'] ? ' snatched_torrent' : '';
-/*
-      if (
-        $Torrent['RemasterTitle'] != $LastRemasterTitle
-        || $Torrent['RemasterYear'] != $LastRemasterYear
-        || $Torrent['RemasterRecordLabel'] != $LastRemasterRecordLabel
-        || $Torrent['RemasterCatalogueNumber'] != $LastRemasterCatalogueNumber
-        || $FirstUnknown
-        || $Torrent['Media'] != $LastMedia
-      ) {
-        $EditionID++;
 ?>
-  <tr class="group_torrent groupid_<?=$GroupID?> edition<?=$SnatchedGroupClass . (!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] === 1 ? ' hidden' : '')?>">
-    <td colspan="7" class="edition_info"><strong><a href="#" onclick="toggle_edition(<?=$GroupID?>, <?=$EditionID?>, this, event)" class="tooltip" title="Collapse this edition. Hold &quot;Ctrl&quot; while clicking to collapse all editions in this torrent group.">&minus;</a> <?=Torrents::edition_string($Torrent, $Group)?></strong></td>
-  </tr>
-<?
-      }
-      $LastRemasterTitle = $Torrent['RemasterTitle'];
-      $LastRemasterYear = $Torrent['RemasterYear'];
-      $LastRemasterRecordLabel = $Torrent['RemasterRecordLabel'];
-      $LastRemasterCatalogueNumber = $Torrent['RemasterCatalogueNumber'];
-      $LastMedia = $Torrent['Media'];
-*/
-?>
-  <tr class="group_torrent torrent_row groupid_<?=$GroupID?> edition_<?=$EditionID?><?=$SnatchedTorrentClass . $SnatchedGroupClass . (!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] === 1 ? ' hidden' : '')?>">
+  <tr class="group_torrent torrent_row groupid_<?=$GroupID?> <?=$SnatchedTorrentClass . $SnatchedGroupClass . (!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] === 1 ? ' hidden' : '')?>">
     <td colspan="3">
       <span>[ <a href="torrents.php?action=download&amp;id=<?=$TorrentID?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>" class="tooltip" title="Download">DL</a>
 <?      if (Torrents::can_use_token($Torrent)) { ?>
@@ -177,7 +130,11 @@ foreach ($GroupIDs as $GroupID) {
 
     $DisplayName = Artists::display_artists(Artists::get_artist($GroupID));
 
-    $DisplayName .= '<a href="torrents.php?id='.$GroupID.'" class="tooltip" title="View torrent group" dir="ltr">'.$GroupName.'</a>';
+    $DisplayName .= '<a href="torrents.php?id='.$GroupID.'" ';
+    if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
+      $DisplayName .= 'onmouseover="getCover(event)" data-cover="'.ImageTools::process($WikiImage, 'thumb').'" onmouseleave="ungetCover(event)" ';
+    }
+    $DisplayName .=' class="tooltip" title="View torrent group" dir="ltr">'.$GroupName.'</a>';
 
     if ($Torrent['IsSnatched']) {
       $DisplayName .= ' ' . Format::torrent_label('Snatched!');
@@ -194,7 +151,7 @@ foreach ($GroupIDs as $GroupID) {
   <tr class="torrent torrent_row<?=$SnatchedTorrentClass . $SnatchedGroupClass?>" id="group_<?=$GroupID?>">
     <td></td>
     <td class="center">
-      <div title="<?=$TorrentTags->title()?>" class="tooltip <?=Format::css_category($GroupCategoryID)?> <?=$TorrentTags->css_name()?>">
+      <div title="<?=$TorrentTags->title()?>" class="tooltip <?=Format::css_category($GroupCategoryID)?>">
       </div>
     </td>
     <td>
@@ -209,7 +166,7 @@ foreach ($GroupIDs as $GroupID) {
 <?    if (!$Sneaky) { ?>
       <span class="float_right float_clear"><a href="#group_<?=$GroupID?>" class="brackets remove_bookmark" onclick="Unbookmark('torrent', <?=$GroupID?>, ''); return false;">Remove bookmark</a></span>
 <?    } ?>
-      <strong><?=$DisplayName?></strong>
+      <?=$DisplayName?>
       <div class="tags"><?=$TorrentTags->format()?></div>
 
     </td>
@@ -227,13 +184,6 @@ foreach ($GroupIDs as $GroupID) {
   ob_start();
 
   $DisplayName = '';
-  /*if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4]) || !empty($ExtendedArtists[5])|| !empty($ExtendedArtists[6])) {
-    unset($ExtendedArtists[2]);
-    unset($ExtendedArtists[3]);
-    $DisplayName .= Artists::display_artists($ExtendedArtists, false);
-  } elseif (count($Artists) > 0) {
-    $DisplayName .= Artists::display_artists(array('1' => $Artists), false);
-  }*/
 
   $DisplayName .= Artists::display_artists($Artists, false);
 
@@ -244,17 +194,6 @@ foreach ($GroupIDs as $GroupID) {
   $Tags = display_str($TorrentTags->format());
   $PlainTags = implode(', ', $TorrentTags->get_tags());
 ?>
-<? /* ?>
-    <li class="image_group_<?=$GroupID?>">
-      <a href="torrents.php?id=<?=$GroupID?>" class="bookmark_<?=$GroupID?>">
-<?  if ($WikiImage) { ?>
-        <img class="tooltip_interactive" src="<?=ImageTools::process($WikiImage, 'thumb')?>" alt="<?=$DisplayName?>" title="<?=$DisplayName?> <br /> <?=$Tags?>" data-title-plain="<?="$DisplayName ($PlainTags)"?>" width="118" />
-<?  } else { ?>
-        <div style="width: 107px; padding: 5px;"><?=$DisplayName?></div>
-<?  } ?>
-      </a>
-    </li>
-<? */ ?>
 <div class='collage_image image_group_<?=$GroupID?>'>
       <a href="torrents.php?id=<?=$GroupID?>" class="bookmark_<?=$GroupID?>">
 <?  if (!$WikiImage) {
@@ -355,7 +294,7 @@ View::show_header($Title, 'browse,collage,wall');
 if ($CollageCovers !== 0) { ?>
     <div id="coverart" class="box">
       <div class="head" id="coverhead"><strong>Cover art</strong></div>
-      <div class="collage_images" id="collage_page0">
+      <div class="collage_images" id="collage_page0" data-wall-child=".collage_image" data-wall-size="4", data-wall-min="2">
 <?
   $Page1 = array_slice($Collage, 0, $CollageCovers);
   foreach ($Page1 as $Group) {
@@ -363,16 +302,6 @@ if ($CollageCovers !== 0) { ?>
   }
 ?>
       </div>
-      <script>
-        $('.collage_image img').on('load', function() {
-          var test = true
-          $('.collage_image img').toArray().forEach(function(el) {
-            if (!el.complete) test = false
-          })
-          if (test) wall('.collage_images', '.collage_image', 4)
-        })
-        wall('.collage_images', '.collage_image', 4)
-      </script>
     </div>
 <?  if ($NumGroups > $CollageCovers) { ?>
     <div class="linkbox pager" style="clear: left;" id="pageslinksdiv">
@@ -386,7 +315,7 @@ if ($CollageCovers !== 0) { ?>
       <span id="lastpage" class="<?=(ceil($NumGroups / $CollageCovers) === 2 ? 'invisible' : '')?>"> | <a href="#" id="lastpage" class="pageslink" onclick="collageShow.page(<?=(ceil($NumGroups / $CollageCovers) - 1)?>, this); return false;">Last &gt;&gt;</a></span>
     </div>
     <script type="text/javascript">
-      collageShow.init(<?=json_encode($CollagePages)?>);
+      $(()=>collageShow.init(<?=json_encode($CollagePages)?>));
     </script>
 <?
   }

sections/collages/torrent_collage.php

@@ -105,7 +105,7 @@ foreach ($GroupIDs as $GroupID) {
           <div title="<?=$TorrentTags->title()?>" class="tooltip <?=Format::css_category($GroupCategoryID)?> <?=$TorrentTags->css_name()?>"></div>
         </td>
         <td colspan="5">
-          <strong><?=$DisplayName?></strong>
+          <?=$DisplayName?>
 <?    if (Bookmarks::has_bookmarked('torrent', $GroupID)) { ?>
           <span class="remove_bookmark float_right">
             <a class="float_right" href="#" id="bookmarklink_torrent_<?=$GroupID?>" class="remove_bookmark brackets" onclick="Unbookmark('torrent', <?=$GroupID?>, 'Bookmark'); return false;">Remove bookmark</a>
@@ -178,7 +178,7 @@ foreach ($GroupIDs as $GroupID) {
 <?    } ?>
             | <a href="reportsv2.php?action=report&amp;id=<?=$TorrentID?>" class="tooltip" title="Report">RP</a>
           </span>
-          <strong><?=$DisplayName?></strong>
+          <?=$DisplayName?>
           <div class="tags"><?=$TorrentTags->format()?></div>
         </td>
         <td class="number_column nobr"><?=Format::get_size($Torrent['Size'])?></td>
@@ -543,9 +543,9 @@ if ($CollageCovers != 0) { ?>
       <span id="nextpage"><a href="#" class="pageslink" onclick="collageShow.nextPage(); return false;"><strong>Next &gt;</strong></a></span>
       <span id="lastpage" class="<?=(ceil($NumGroups / $CollageCovers) == 2 ? 'invisible' : '')?>"> | <a href="#" class="pageslink" onclick="collageShow.page(<?=ceil($NumGroups / $CollageCovers) - 1?>, this); return false;"><strong>Last &gt;&gt;</strong></a></span>
     </div>
-    <script type="text/javascript">//<![CDATA[
-      $(document).ready(function(){collageShow.init(<?=json_encode($CollagePages)?>)});
-    //]]></script>
+    <script type="text/javascript">
+      $(()=>collageShow.init(<?=json_encode($CollagePages)?>));
+    </script>
 <?
   }
 }

sections/inbox/massdelete_handle.php

@@ -1,9 +1,7 @@
 <?
+authorize();
 
-/* replace
 $UserID = $LoggedUser['ID'];
-authorize();
-replace */
 
 if (!isset($_POST['messages']) || !is_array($_POST['messages'])) {
   error('You forgot to select messages to delete.');
@@ -33,22 +31,24 @@ if (isset($_POST['delete'])) {
   $DB->query("
     UPDATE pm_conversations_users
     SET
-      InInbox='0',
-      InSentbox='0',
-      Sticky='0',
-      UnRead='0'
+      InInbox = '0',
+      InSentbox = '0',
+      Sticky = '0',
+      UnRead = '0'
     WHERE ConvID IN($ConvIDs)
-      AND UserID=$UserID");
+      AND UserID = $UserID");
 } elseif (isset($_POST['unread'])) {
   $DB->query("
     UPDATE pm_conversations_users
-    SET Unread='1'
-    WHERE ConvID IN($ConvIDs) AND UserID=$UserID");
+    SET Unread = '1'
+    WHERE ConvID IN($ConvIDs)
+    AND InInbox = '1'
+    AND UserID = $UserID");
 } elseif (isset($_POST['read'])) {
   $DB->query("
     UPDATE pm_conversations_users
-    SET Unread='0'
-    WHERE ConvID IN($ConvIDs) AND UserID=$UserID");
+    SET Unread = '0'
+    WHERE ConvID IN($ConvIDs) AND UserID = $UserID");
 }
 $Cache->delete_value('inbox_new_'.$UserID);
 

sections/inbox/takeedit.php

@@ -3,13 +3,11 @@ authorize();
 
 $UserID = $LoggedUser['ID'];
 $ConvID = $_POST['convid'];
-if (!is_number($ConvID)) {
-  error(404);
-}
+
 $DB->query("
   SELECT UserID
   FROM pm_conversations_users
-  WHERE UserID='$UserID' AND ConvID='$ConvID'");
+  WHERE UserID = ? AND ConvID = ?", $UserID, $ConvID);
 if (!$DB->has_results()) {
   error(403);
 }
@@ -18,27 +16,29 @@ if (isset($_POST['delete'])) {
   $DB->query("
     UPDATE pm_conversations_users
     SET
-      InInbox='0',
-      InSentbox='0',
-      Sticky='0'
-    WHERE ConvID='$ConvID' AND UserID='$UserID'");
+      InInbox = '0',
+      InSentbox = '0',
+      Sticky = '0'
+    WHERE ConvID = ? AND UserID = ?", $ConvID, $UserID);
 } else {
   if (isset($_POST['sticky'])) {
     $DB->query("
       UPDATE pm_conversations_users
-      SET Sticky='1'
-      WHERE ConvID='$ConvID' AND UserID='$UserID'");
+      SET Sticky = '1'
+      WHERE ConvID = ? AND UserID = ?", $ConvID, $UserID);
   } else {
     $DB->query("
       UPDATE pm_conversations_users
-      SET Sticky='0'
-      WHERE ConvID='$ConvID' AND UserID='$UserID'");
+      SET Sticky = '0'
+      WHERE ConvID = ? AND UserID = ?", $ConvID, $UserID);
   }
   if (isset($_POST['mark_unread'])) {
     $DB->query("
       UPDATE pm_conversations_users
-      SET Unread='1'
-      WHERE ConvID='$ConvID' AND UserID='$UserID'");
+      SET Unread = '1'
+      WHERE ConvID = ?
+      AND InInbox = '1'
+      AND UserID = ?", $ConvID, $UserID);
     $Cache->increment('inbox_new_'.$UserID);
   }
 }

sections/reportsv2/array.php

@@ -32,7 +32,7 @@ $Types = array(
         'upload' => '0',
         'warn' => '0',
         'delete' => '1',
-        'pm' => '[rule]r1.1.3[/rule]. Your torrent was reported becasue it was a duplicate of another torrent.'
+        'pm' => '[rule]r1.1.4[/rule]. Your torrent was reported because it was a duplicate of another torrent.'
       )
     ),
     'banned' => array(
@@ -40,6 +40,7 @@ $Types = array(
       'reason' => '14',
       'title' => 'Specifically Banned',
       'report_messages' => array(
+        'Note that this report form is for content that is banned by name, not content that breaks a general uploading rule.',
         'Please specify exactly which entry on the Do Not Upload list this is violating.'
       ),
       'report_fields' => array(

sections/rules/upload.php

@@ -168,7 +168,7 @@ View::show_header('Uploading Rules', 'rules');
             <li id="r1.2.6"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r1.2.6">1.2.6.</a>
               <strong>Torrents should never have [REQ] or [REQUEST] in the title or artist name.</strong> If you fill a request using the <a href="requests.php">Requests system</a>, everyone who voted for it will be automatically notified.
             </li>
-            <li id="r1.2.7"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r1.2.7">1.2.7.</a> <strong>Torrent titles must accurately reflect the actual titles.</strong> Use proper capitalization when giving titles. Typing titless in all lowercase letters or all capital letters is unacceptable and makes the torrent trumpable. Exceptions: If the album uses special capitalization, then you may follow that convention.</li>
+            <li id="r1.2.7"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r1.2.7">1.2.7.</a> <strong>Torrent titles must accurately reflect the actual titles.</strong> Use proper capitalization when giving titles. Typing titles in all lowercase letters or all capital letters is unacceptable and makes the torrent trumpable. Exceptions: If the album uses special capitalization, then you may follow that convention.</li>
             <li id="r1.2.8"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r1.2.8">1.2.8.</a>
               <strong>The Artist field in the torrent name should contain only the artist name.</strong> Do not add additional information about the artist in the artist field unless the work credits the artist in that manner. It is recommended that you search existing torrents for the artist name so that you can be sure that you name the artist the exact same way. A torrent with a proper artist name will be grouped with the existing torrents for that artist on a common artist page, and thus will be easy to find. Capitalization problems will also make a torrent trumpable. Labeling the artist incorrectly prevents your torrent from being grouped with the other torrents for the same artist.
             </li>

sections/upload/upload_handle.php

@@ -270,8 +270,8 @@ if (count($TooLongPaths) > 0) {
   $Names = implode(' <br />', $TooLongPaths);
   $Err = "The torrent contained one or more files with too long a name:<br /> $Names";
 }
-$FilePath = db_string($DirName);
-$FileString = db_string(implode("\n", $TmpFileList));
+$FilePath = $DirName;
+$FileString = implode("\n", $TmpFileList);
 $Debug->set_flag('upload: torrent decoded');
 
 if (!empty($Err)) { // Show the upload form, with the data the user entered
@@ -476,20 +476,20 @@ if ($DB->has_results()) {
   $FreeLeechTags = $DB->to_array('Name');
   foreach ($FreeLeechTags as $Tag => $Exp) {
     if ($Tag == 'global' || in_array($Tag, $Tags)) {
-      $T['FreeTorrent'] = 1;
-      $T['FreeLeechType'] = 3;
+      $T['FreeTorrent'] = '1';
+      $T['FreeLeechType'] = '3';
       break;
     }
   }
 } else {
-  $T['FreeTorrent'] = 0;
-  $T['FreeLeechType'] = 0;
+  $T['FreeTorrent'] = '0';
+  $T['FreeLeechType'] = '0';
 }
 
 // movie and anime ISOs are neutral leech, and receive a BP bounty
 if (($Type == 'Movies' || $Type == 'Anime') && ($T['Container'] == 'ISO' || $T['Container'] == 'M2TS' || $T['Container'] == 'VOB IFO')) {
-  $T['FreeTorrent'] = 2;
-  $T['FreeLeechType'] = 2;
+  $T['FreeTorrent'] = '2';
+  $T['FreeLeechType'] = '2';
 }
 
 // Torrent
@@ -675,14 +675,8 @@ if (empty($ArtistsUnescaped)) {
 if (!empty($ArtistsUnescaped)) {
   $ArtistNameList = [];
   $GuestArtistNameList = [];
-  foreach ($ArtistsUnescaped as $Importance => $Artists) {
-    foreach ($Artists as $Artist) {
-      if ($Importance == 1 || $Importance == 4 || $Importance == 5 || $Importance == 6) {
-        $ArtistNameList[] = "Artists LIKE '%|".db_string(str_replace('\\', '\\\\', $Artist['name']), true)."|%'";
-      } else {
-        $GuestArtistNameList[] = "Artists LIKE '%|".db_string(str_replace('\\', '\\\\', $Artist['name']), true)."|%'";
-      }
-    }
+  foreach ($ArtistsUnescaped as $Importance => $Artist) {
+    $ArtistNameList[] = "Artists LIKE '%|".db_string(str_replace('\\', '\\\\', $Artist['name']), true)."|%'";
   }
   // Don't add notification if >2 main artists or if tracked artist isn't a main artist
   if (count($ArtistNameList) > 2 || $Artist['name'] == 'Various Artists') {

sections/user/edit.php

@@ -376,22 +376,11 @@ echo $Val->GenerateJS('userform');
         </td>
       </tr>
       <tr id="comm_avatars_tr">
-        <td class="label tooltip" title="This option allows you to disable all avatars, show all avatars (with a placeholder for users without avatars), show all avatars &lt;em&gt;or&lt;/em&gt; an identicon set (for users without avatars), or replace all avatars with an identicon set of your choosing." data-title-plain="This option allows you to disable all avatars, show all avatars (with a placeholder for users without avatars), show all avatars or an identicon set (for users without avatars), or replace all avatars with an identicon set of your choosing."><strong>Avatar display (posts)</strong></td>
+        <td class="label tooltip" title="This option allows you to disable all avatars or show all avatars with a placeholder for users without avatars." data-title-plain="This option allows you to disable all avatars or show all avatars with a placeholder for users without avatars."><strong>Avatar display (posts)</strong></td>
         <td>
-          <select name="disableavatars" id="disableavatars" onclick="ToggleIdenticons();">
+          <select name="disableavatars" id="disableavatars">
             <option value="1"<?=$SiteOptions['DisableAvatars'] == 1 ? ' selected="selected"' : ''?>>Disable avatars</option>
             <option value="0"<?=$SiteOptions['DisableAvatars'] == 0 ? ' selected="selected"' : ''?>>Show avatars</option>
-            <option value="2"<?=$SiteOptions['DisableAvatars'] == 2 ? ' selected="selected"' : ''?>>Show avatars or:</option>
-            <option value="3"<?=$SiteOptions['DisableAvatars'] == 3 ? ' selected="selected"' : ''?>>Replace all avatars with:</option>
-          </select>
-          <select name="identicons" id="identicons">
-            <option value="0"<?=$SiteOptions['Identicons'] == 0 ? ' selected="selected"' : ''?>>Identicon</option>
-            <option value="1"<?=$SiteOptions['Identicons'] == 1 ? ' selected="selected"' : ''?>>MonsterID</option>
-            <option value="2"<?=$SiteOptions['Identicons'] == 2 ? ' selected="selected"' : ''?>>Wavatar</option>
-            <option value="3"<?=$SiteOptions['Identicons'] == 3 ? ' selected="selected"' : ''?>>Retro</option>
-            <option value="4"<?=$SiteOptions['Identicons'] == 4 ? ' selected="selected"' : ''?>>Robots 1</option>
-            <option value="5"<?=$SiteOptions['Identicons'] == 5 ? ' selected="selected"' : ''?>>Robots 2</option>
-            <option value="6"<?=$SiteOptions['Identicons'] == 6 ? ' selected="selected"' : ''?>>Robots 3</option>
           </select>
         </td>
       </tr>

static/functions/validate_upload.js

@@ -18,6 +18,7 @@ $(() => {
     if ($('#album_desc').raw().value.length < 10) {
       hard_error('The group description is too short')
     }
+
     if ($('#file').raw().value.slice(-8).toLowerCase() != '.torrent') {
       soft_error('The file selected does not appear to be a .torrent file')
     }
@@ -28,6 +29,9 @@ $(() => {
     if (!$('#image').raw().value) {
       soft_error('You did not include a cover image, which is mandatory if one exists')
     }
+    if ($('#media_tr select').raw().value == 'DVD' && (['720p','1080i','1080p','4K'].includes($('#ressel').raw().value) || +$('#resolution').raw().value.split('x')[1] > 576)) {
+      soft_error('Your selected resolution is too high to be a DVD. Are you sure the media type should be DVD and not WEB?')
+    }
   })
   $('#tags').on('blur', e => $('#tags').raw().value = $('#tags').raw().value.split(',').map(t=>t.trim()).filter(t=>t).join(', '))
 })

static/styles/global.css

@@ -102,6 +102,7 @@ ul.collage_images img {
 
 div.collage_image {
   width: 20%;
+  display: inline-block;
 }
 
 [data-toggle-target], [data-quote-jump], .clickable {