Bring up to date with private repo

sections/ajax/doujin.php

@@ -67,28 +67,28 @@ if ($Cache->get_value('doujin_json_'.$gid)) {
   preg_match($re, $gallery_page, $galmatch);
   // were we able to find the first page of the gallery?
   if ($galmatch[1]) {
-	  $image_page = file_get_contents($galmatch[1]);
+    $image_page = file_get_contents($galmatch[1]);
     $re = '/'.preg_quote('"><img id="img" src="').'([^<]*)'.preg_quote('" style=').'/';
-	  preg_match($re, $image_page, $imgmatch);
-	  // were we able to find the image url?
-	  if ($imgmatch[1]) {
-	    $cover = $imgmatch[1];
-	  }
+    preg_match($re, $image_page, $imgmatch);
+    // were we able to find the image url?
+    if ($imgmatch[1]) {
+      $cover = $imgmatch[1];
+    }
   }
 
   $json_str = array(
-    'id' => $gid,
-    'title' => html_entity_decode($json['title'], ENT_QUOTES),
-    'title_jp' => html_entity_decode($json['title_jpn'], ENT_QUOTES),
-    'artists' => $artists,
-    'circle' => $circle,
-    'censored' => $censored,
-    'year' => NULL,
-    'tags' => $tags,
-    'lang' => $lang,
-    'pages' => $json['filecount'],
+    'id'          => $gid,
+    'title'       => html_entity_decode($json['title'], ENT_QUOTES),
+    'title_jp'    => html_entity_decode($json['title_jpn'], ENT_QUOTES),
+    'artists'     => $artists,
+    'circle'      => $circle,
+    'censored'    => $censored,
+    'year'        => NULL,
+    'tags'        => $tags,
+    'lang'        => $lang,
+    'pages'       => $json['filecount'],
     'description' => '',
-    'cover' => $cover
+    'cover'       => $cover
   );
 
   $Cache->cache_value('doujin_json_'.$gid, $json_str, 86400);

sections/ajax/forum/forum.php

@@ -5,7 +5,7 @@
 
 Things to expect in $_GET:
   ForumID: ID of the forum curently being browsed
-  page:  The page the user's on.
+  page: The page the user's on.
   page = 1 is the same as no page
 
 ********************************************************************************/

sections/ajax/forum/thread.php

@@ -4,7 +4,7 @@
 
 Things to expect in $_GET:
   ThreadID: ID of the forum curently being browsed
-  page:  The page the user's on.
+  page: The page the user's on.
   page = 1 is the same as no page
 
 ********************************************************************************/

sections/ajax/inbox/inbox.php

@@ -47,7 +47,7 @@ $sql .= "AS Date
     LEFT JOIN users_main AS um2 ON um2.ID = cu.ForwardedTo";
 
 if (!empty($_GET['search']) && $_GET['searchtype'] === 'message') {
-  $sql .=  ' JOIN pm_messages AS m ON c.ID = m.ConvID';
+  $sql .= ' JOIN pm_messages AS m ON c.ID = m.ConvID';
 }
 $sql .= " WHERE ";
 if (!empty($_GET['search'])) {

sections/ajax/javfill.php

@@ -152,14 +152,14 @@ if (!$debug && $Cache->get_value('jav_json_'.$cn)) {
     'cn'          => $cn,
     'title'       => ($title ? $title : ''),
     'title_jp'    => ($title_jp ? $title_jp : ''),
-    'idols'        => ($idols ? $idols : []),
+    'idols'       => ($idols ? $idols : []),
     'year'        => ($year ? $year : ''),
     'studio'      => ($studio ? $studio : ''),
     'label'       => ($label ? $label : ''),
-    'image'        => ($image ? $image : ''),
-    'description'  => ($desc ? $desc : ''),
-    'tags'         => ($genres ? $genres : []),
-    'screens'      => ($screens ? $screens : []),
+    'image'       => ($image ? $image : ''),
+    'description' => ($desc ? $desc : ''),
+    'tags'        => ($genres ? $genres : []),
+    'screens'     => ($screens ? $screens : []),
     'degraded'    => $degraded
   );
 

sections/artist/edit.php

@@ -83,7 +83,7 @@ View::show_header('Edit artist');
     </form>
   </div>
 
-<? /*  <h2>Make into non-redirecting alias</h2>
+<? /* <h2>Make into non-redirecting alias</h2>
   <div class="box pad">
     <form class="merge_form" name="artist" action="artist.php" method="post">
       <input type="hidden" name="action" value="change_artistid" />

sections/better/folders.php

@@ -86,7 +86,7 @@ foreach ($TorrentsInfo as $TorrentID => $Info) {
         <?=$DisplayName?>
 <?  if (check_perms('admin_reports')) { ?>
         <a href="better.php?method=folders&amp;remove=<?=$TorrentID?>" class="brackets">X</a>
-<?   } ?>
+<?  } ?>
         <div class="tags"><?=$TorrentTags->format()?></div>
       </td>
     </tr>

sections/better/tags.php

@@ -87,7 +87,7 @@ foreach ($TorrentsInfo as $TorrentID => $Info) {
         <?=$DisplayName?>
 <?  if (check_perms('admin_reports')) { ?>
         <a href="better.php?method=tags&amp;remove=<?=$TorrentID?>" class="brackets">X</a>
-<?   } ?>
+<?  } ?>
         <div class="tags"><?=$TorrentTags->format()?></div>
       </td>
     </tr>

sections/collages/all_comments.php

@@ -3,7 +3,7 @@
 
 Things to expect in $_GET:
   ThreadID: ID of the forum curently being browsed
-  page:  The page the user's on.
+  page: The page the user's on.
   page = 1 is the same as no page
 
 ********************************************************************************/

sections/comments/comments.php

@@ -116,9 +116,9 @@ switch ($Action) {
   default:
     $Action = 'torrents';
     $Field1 = 'torrents.GroupID';
-    $Field2 = 'torrents_group.Name';
+    $Field2 = "COALESCE(NULLIF(tg.Name,''),NULLIF(tg.NameRJ,''),tg.NameJP) AS Name";
     $Table = 'torrents';
-    $Join[] = 'JOIN torrents_group ON torrents.GroupID = torrents_group.ID';
+    $Join[] = 'JOIN torrents_group AS tg ON torrents.GroupID = tg.ID';
     if ($Type == 'uploaded') {
       $Conditions[] = "torrents.UserID = $UserID";
       $Conditions[] = 'comments.AddedTime > torrents.Time';

sections/forums/forum.php

@@ -3,7 +3,7 @@
 
 Things to expect in $_GET:
   ForumID: ID of the forum curently being browsed
-  page:  The page the user's on.
+  page: The page the user's on.
   page = 1 is the same as no page
 
 ********************************************************************************/

sections/forums/search.php

@@ -186,7 +186,7 @@ if (empty($ThreadID)) {
           <input type="checkbox" name="forums[]" value="<?=$Forum['ID']?>" data-category="forum_category_<?=$i?>" id="forum_<?=$Forum['ID']?>"<? if (isset($_GET['forums']) && in_array($Forum['ID'], $_GET['forums'])) { echo ' checked="checked"';} ?> />
           <label for="forum_<?=$Forum['ID']?>"><?=htmlspecialchars($Forum['Name'])?></label>
         </td>
-<?   }
+<?  }
   if ($Columns % 5) { ?>
         <td colspan="<?=(5 - ($Columns % 5))?>"></td>
 <?  } ?>

sections/forums/thread.php

@@ -4,7 +4,7 @@
 
 Things to expect in $_GET:
   ThreadID: ID of the forum curently being browsed
-  page:  The page the user's on.
+  page: The page the user's on.
   page = 1 is the same as no page
 
 ********************************************************************************/

sections/inbox/compose.php

@@ -3,7 +3,7 @@
 if (empty($Return)) {
   $ToID = $_GET['to'];
 /*
-   if ($ToID == $LoggedUser['ID']) {
+  if ($ToID == $LoggedUser['ID']) {
     error('You cannot start a conversation with yourself!');
     header('Location: ' . Inbox::get_inbox_link());
   }

sections/inbox/inbox.php

@@ -51,7 +51,7 @@ $sql .= "AS Date
     LEFT JOIN users_main AS um ON um.ID = cu2.UserID";
 
 if (!empty($_GET['search']) && $_GET['searchtype'] === 'message') {
-  $sql .=  ' JOIN pm_messages AS m ON c.ID = m.ConvID';
+  $sql .= ' JOIN pm_messages AS m ON c.ID = m.ConvID';
 }
 $sql .= ' WHERE ';
 if (!empty($_GET['search'])) {

sections/index/private.php

@@ -131,9 +131,7 @@ if (($Freeleeches = $Cache->get_value('shop_freeleech_list')) === false) {
     SELECT
       TorrentID,
       UNIX_TIMESTAMP(ExpiryTime),
-      Name,
-      NameRJ,
-      NameJP,
+      COALESCE(NULLIF(Name,''), NULLIF(NameRJ,''), NameJP) AS Name,
       WikiImage
     FROM shop_freeleeches AS sf
     LEFT JOIN torrents AS t on sf.TorrentID=t.ID
@@ -150,14 +148,14 @@ if (count($Freeleeches)) {
       <ul class="stats nobullet">
 <?
   for ($i = 0; $i < count($Freeleeches); $i++) {
-    list($ID, $ExpiryTime, $Name, $NameRJ, $NameJP, $Image) = $Freeleeches[$i];
+    list($ID, $ExpiryTime, $Name, $Image) = $Freeleeches[$i];
     if ($ExpiryTime < time()) { continue; }
     $DisplayTime = '('.str_replace(['week','day','hour','min','Just now','s',' '],['w','d','h','m','0m'],time_diff($ExpiryTime, 1, false)).') ';
     $DisplayName = '<a href="torrents.php?torrentid='.$ID.'"';
     if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
       $DisplayName .= " onmouseover=\"getCover(event)\" data-cover=\"".ImageTools::process($Image)."\" onmouseleave=\"ungetCover(event)\"";
     }
-    $DisplayName .= '>'.($Name?$Name:($NameRJ?$NameRJ:$NameJP)).'</a>';
+    $DisplayName .= '>'.$Name.'</a>';
 ?>
         <li>
           <strong class="fl_time"><?=$DisplayTime?></strong>
@@ -412,21 +410,21 @@ if ($TopicID) {
 <?    } ?>
         </ul>
         <strong>Votes:</strong> <?=number_format($TotalVotes)?><br />
-<?   } else { ?>
+<?  } else { ?>
         <div id="poll_container">
         <form class="vote_form" name="poll" id="poll" action="">
           <input type="hidden" name="action" value="poll" />
           <input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
           <input type="hidden" name="topicid" value="<?=$TopicID?>" />
-<?     foreach ($Answers as $i => $Answer) { ?>
+<?    foreach ($Answers as $i => $Answer) { ?>
           <input type="radio" name="vote" id="answer_<?=$i?>" value="<?=$i?>" />
           <label for="answer_<?=$i?>"><?=display_str($Answers[$i])?></label><br />
-<?     } ?>
+<?    } ?>
           <br /><input type="radio" name="vote" id="answer_0" value="0" /> <label for="answer_0">Blank&#8202;&mdash;&#8202;Show the results!</label><br /><br />
           <input type="button" onclick="ajax.post('index.php', 'poll', function(response) { $('#poll_container').raw().innerHTML = response } );" value="Vote" />
         </form>
         </div>
-<?   } ?>
+<?  } ?>
         <br /><strong>Topic:</strong> <a href="forums.php?action=viewthread&amp;threadid=<?=$TopicID?>">Visit</a>
       </div>
     </div>

sections/questions/ajax_get_answers.php

@@ -27,7 +27,7 @@ foreach($Answers as $Answer) {
       </span>
     </div>
     <div class="pad">
-<?=      Text::full_format($Answer['Answer'])?>
+<?=     Text::full_format($Answer['Answer'])?>
     </div>
   </div>
 <?

sections/questions/answer_question.php

@@ -34,7 +34,7 @@ View::show_header('Ask the Staff', 'bbcode');
       </span>
     </div>
     <div class="pad">
-<?=      Text::full_format($Question['Question'])?>
+<?=     Text::full_format($Question['Question'])?>
     </div>
   </div>
   <div class="center box pad">

sections/questions/popular_questions.php

@@ -55,7 +55,7 @@ View::show_header('Popular Questions', 'questions,bbcode');
         </span>
       </div>
       <div class="pad">
-<?=        Text::full_format($Question['Question'])?>
+<?=       Text::full_format($Question['Question'])?>
       </div>
     </div>
 <?  } ?>

sections/questions/view_answers.php

@@ -78,7 +78,7 @@ View::show_header($UserInfo['Username'] . "'s answers", 'questions,bbcode');
       </span>
     </div>
     <div class="pad">
-<?=      Text::full_format("[quote=" . $Question['Username'] . "]". $Question['Question'] . "[/quote]\n". $Question['Answer'])?>
+<?=     Text::full_format("[quote=" . $Question['Username'] . "]". $Question['Question'] . "[/quote]\n". $Question['Answer'])?>
     </div>
   </div>
 <?  } ?>

sections/register/step1.php

@@ -75,7 +75,7 @@ if (empty($Sent)) {
 <? } else { ?>
   An email has been sent to the address that you provided. After you confirm your email address, you will be able to log into your account.
 
-<?     if ($NewInstall) {
+<?  if ($NewInstall) {
       echo "Since this is a new installation, you can log in directly without having to confirm your account.";
     }
 } ?>

sections/reportsv2/ajax_create_report.php

@@ -2,7 +2,7 @@
 /*
  * This page is for creating a report using AJAX.
  * It should have the following posted fields:
- *   [auth] => AUTH_KEY
+ *  [auth] => AUTH_KEY
  *  [torrentid] => TORRENT_ID
  *  [type] => TYPE
  *  [otherid] => OTHER_ID

sections/reportsv2/static.php

@@ -684,7 +684,7 @@ if (count($Reports) === 0) {
             | <input type="button" value="Unclaim" onclick="GiveBack(<?=$ReportID?>);" />
 <?          } else { ?>
             | <input id="grab<?=$ReportID?>" type="button" value="Claim" onclick="Grab(<?=$ReportID?>);" />
-<?          }  ?>
+<?          } ?>
             | Multi-resolve <input type="checkbox" name="multi" id="multi<?=$ReportID?>" checked="checked" />
             | <input type="button" id="submit_<?=$ReportID?>" value="Submit" onclick="TakeResolve(<?=$ReportID?>);" />
           </td>
@@ -716,7 +716,7 @@ if (count($Reports) === 0) {
         </tr>
 <?          if ($GroupID) { ?>
         <tr>
-          <td  colspan="4" style="text-align: center;">
+          <td colspan="4" style="text-align: center;">
             <input id="grab<?=$ReportID?>" type="button" value="Claim" onclick="Grab(<?=$ReportID?>);" />
           </td>
         </tr>

sections/reportsv2/takereport.php

@@ -4,7 +4,7 @@
  * It checks for (in order):
  * 1. The usual POST injections, then checks that things.
  * 2. Things that are required by the report type are filled
- *   ('1' in the report_fields array).
+ *    ('1' in the report_fields array).
  * 3. Things that are filled are filled with correct things.
  * 4. That the torrent you're reporting still exists.
  *
@@ -62,7 +62,7 @@ if (!empty($_POST['sitelink'])) {
 
 if (!empty($_POST['link'])) {
   //resource_type://domain:port/filepathname?query_string#anchor
-  //          http://    www      .foo.com                /bar
+  //          http://   www     .foo.com                /bar
   if (preg_match_all('/'.URL_REGEX.'/is', $_POST['link'], $Matches)) {
     $Links = implode(' ', $Matches[0]);
   } else {

sections/requests/new_edit.php

@@ -255,9 +255,9 @@ View::show_header(($NewRequest ? 'Create a request' : 'Edit a request'), 'reques
           <td>
             <a href="torrents.php?id=<?=$GroupID?>"><?=site_url()?>torrents.php?id=<?=$GroupID?></a><br />
             This request <?=($NewRequest ? 'will be' : 'is')?> associated with the above torrent group.
-<?    if (!$NewRequest) {  ?>
+<?    if (!$NewRequest) { ?>
             If this is incorrect, please <a href="reports.php?action=report&amp;type=request&amp;id=<?=$RequestID?>">report this request</a> so that staff can fix it.
-<?     }  ?>
+<?    } ?>
             <input type="hidden" name="groupid" value="<?=$GroupID?>" />
           </td>
         </tr>

sections/requests/request.php

@@ -370,7 +370,7 @@ $encoded_artist = urlencode($encoded_artist);
     <div class="box box2 box_request_desc">
       <div class="head"><strong>Description</strong></div>
       <div class="pad">
-<?=        Text::full_format($Request['Description']);?>
+<?=       Text::full_format($Request['Description']);?>
       </div>
     </div>
   <div id="request_comments">

sections/requests/requests.php

@@ -422,7 +422,7 @@ View::show_header($Title, 'requests');
   </form>
 <?    if (isset($PageLinks)) { ?>
   <div class="linkbox">
-    <?=  $PageLinks?>
+    <?= $PageLinks?>
   </div>
 <?    } ?>
   <table id="request_table" class="request_table border" cellpadding="6" cellspacing="1" border="0" width="100%">
@@ -535,7 +535,7 @@ View::show_header($Title, 'requests');
       </td>
       <td class="nobr">
         <span id="vote_count_<?=$RequestID?>"><?=number_format($VoteCount)?></span>
-<?     if (!$IsFilled && check_perms('site_vote')) { ?>
+<?    if (!$IsFilled && check_perms('site_vote')) { ?>
         &nbsp;&nbsp; <a href="javascript:Vote(0, <?=$RequestID?>)" class="brackets"><strong>+</strong></a>
 <?    } ?>
       </td>

sections/schedule/daily/delete_dead_torrents.php

@@ -12,9 +12,9 @@ $DB->query("
   FROM torrents AS t
     JOIN torrents_group AS tg ON tg.ID = t.GroupID
   WHERE
-    (t.last_action < '".time_minus(3600 * 24 * 28)."' AND t.last_action != 0)
+    (t.last_action < '".time_minus(3600 * 24 * 28)."' AND t.last_action IS NOT NULL)
     OR
-    (t.Time < '".time_minus(3600 * 24 * 2)."' AND t.last_action = 0)");
+    (t.Time < '".time_minus(3600 * 24 * 2)."' AND t.last_action IS NULL)");
 $Torrents = $DB->to_array(false, MYSQLI_NUM, false);
 echo 'Found '.count($Torrents)." inactive torrents to be deleted.\n";
 

sections/schedule/daily/disable_inactive_users.php

@@ -8,7 +8,7 @@ if (apcu_exists('DBKEY')) {
     FROM users_info AS ui
       JOIN users_main AS um ON um.ID = ui.UserID
       LEFT JOIN users_levels AS ul ON ul.UserID = um.ID AND ul.PermissionID = '".CELEB."'
-    WHERE um.PermissionID IN ('".USER."', '".MEMBER  ."')
+    WHERE um.PermissionID IN ('".USER."', '".MEMBER ."')
       AND um.LastAccess < '".time_minus(3600 * 24 * 110, true)."'
       AND um.LastAccess > '".time_minus(3600 * 24 * 111, true)."'
       AND um.LastAccess IS NOT NULL
@@ -27,7 +27,7 @@ if (apcu_exists('DBKEY')) {
     FROM users_info AS ui
       JOIN users_main AS um ON um.ID = ui.UserID
       LEFT JOIN users_levels AS ul ON ul.UserID = um.ID AND ul.PermissionID = '".CELEB."'
-    WHERE um.PermissionID IN ('".USER."', '".MEMBER  ."')
+    WHERE um.PermissionID IN ('".USER."', '".MEMBER ."')
       AND um.LastAccess < '".time_minus(3600 * 24 * 30 * 4)."'
       AND um.LastAccess IS NOT NULL
       AND ui.Donor = '0'

sections/schedule/daily/ratio_watch.php

@@ -124,7 +124,7 @@ if (count($UserIDs) > 0) {
   $DB->query("
     UPDATE users_info AS i
       JOIN users_main AS m ON m.ID = i.UserID
-    SET  m.can_leech = '0',
+    SET m.can_leech = '0',
       i.AdminComment = CONCAT('$sqltime - Leeching ability disabled by ratio watch system - required ratio: ', m.RequiredRatio, '\n\n', i.AdminComment)
     WHERE m.ID IN(".implode(',', $UserIDs).')');
 

sections/staffpm/common_responses.php

@@ -11,9 +11,9 @@ View::show_header('Staff PMs', 'staffpm');
   <div class="header">
     <h2>Staff PMs - Manage common responses</h2>
     <div class="linkbox">
-<?   if ($IsStaff) { ?>
+<?  if ($IsStaff) { ?>
       <a href="staffpm.php" class="brackets">View your unanswered</a>
-<?   } ?>
+<?  } ?>
       <a href="staffpm.php?view=unanswered" class="brackets">View all unanswered</a>
       <a href="staffpm.php?view=open" class="brackets">View unresolved</a>
       <a href="staffpm.php?view=resolved" class="brackets">View resolved</a>

sections/staffpm/staff_inbox.php

@@ -94,13 +94,13 @@ $Pages = Format::get_pages($Page, $NumResults, MESSAGES_PER_PAGE, 9);
   <div class="header">
     <h2><?=$ViewString?> Staff PMs</h2>
     <div class="linkbox">
-<?   if ($IsStaff) { ?>
+<?  if ($IsStaff) { ?>
       <a href="staffpm.php" class="brackets">View your unanswered</a>
-<?   } ?>
+<?  } ?>
       <a href="staffpm.php?view=unanswered" class="brackets">View all unanswered</a>
       <a href="staffpm.php?view=open" class="brackets">View unresolved</a>
       <a href="staffpm.php?view=resolved" class="brackets">View resolved</a>
-<?   if ($IsStaff) { ?>
+<?  if ($IsStaff) { ?>
       <a href="staffpm.php?action=scoreboard" class="brackets">View scoreboard</a>
 <?  } ?>
     </div>
@@ -134,9 +134,9 @@ if (!$DB->has_results()) {
 ?>
       <table class="message_table<?=($ViewString != 'Resolved' && $IsStaff) ? ' checkboxes' : '' ?>">
         <tr class="colhead">
-<?   if ($ViewString != 'Resolved' && $IsStaff) { ?>
+<?  if ($ViewString != 'Resolved' && $IsStaff) { ?>
           <td width="10"><input type="checkbox" onclick="toggleChecks('messageform', this);" /></td>
-<?   } ?>
+<?  } ?>
           <td>Subject</td>
           <td>Sender</td>
           <td>Date</td>
@@ -179,9 +179,9 @@ if (!$DB->has_results()) {
     // Table row
 ?>
         <tr class="row">
-<?     if ($ViewString != 'Resolved' && $IsStaff) { ?>
+<?    if ($ViewString != 'Resolved' && $IsStaff) { ?>
           <td class="center"><input type="checkbox" name="id[]" value="<?=$ID?>" /></td>
-<?     } ?>
+<?    } ?>
           <td><a href="staffpm.php?action=viewconv&amp;id=<?=$ID?>"><?=display_str($Subject)?></a></td>
           <td><?=$UserStr?></td>
           <td><?=time_diff($Date, 2, true)?></td>
@@ -199,7 +199,7 @@ if (!$DB->has_results()) {
   // Close table and multiresolve form
 ?>
       </table>
-<?   if ($ViewString != 'Resolved' && $IsStaff) { ?>
+<?  if ($ViewString != 'Resolved' && $IsStaff) { ?>
       <div class="submit_div">
         <input type="submit" value="Resolve selected" />
       </div>

sections/staffpm/viewconv.php

@@ -223,7 +223,7 @@ if ($ConvID = (int)$_GET['id']) {
             </optgroup>
           </select>
           <input type="button" onclick="Assign();" value="Assign" />
-<?  } elseif ($IsFLS) {  // FLS assign button ?>
+<?  } elseif ($IsFLS) { // FLS assign button ?>
           <input type="button" value="Assign to staff" onclick="location.href='staffpm.php?action=assign&amp;to=staff&amp;convid=<?=$ConvID?>';" />
           <input type="button" value="Assign to forum staff" onclick="location.href='staffpm.php?action=assign&amp;to=forum&amp;convid=<?=$ConvID?>';" />
 <?

sections/tools/managers/ajax_get_calendar_event.php

@@ -41,7 +41,7 @@ if ($_GET['id']) {
   $Categories = Calendar::$Categories;
   foreach ($Categories as $Key => $Value) {
 ?>
-          <option  value="<?=$Key?>"<?=$Key == $Event['Category'] ? ' selected="selected"' : ''?>><?=$Value?></option>
+          <option value="<?=$Key?>"<?=$Key == $Event['Category'] ? ' selected="selected"' : ''?>><?=$Value?></option>
 <?  } ?>
         </select>
       </td>
@@ -54,7 +54,7 @@ if ($_GET['id']) {
   $Importances = Calendar::$Importances;
   foreach ($Importances as $Key => $Value) {
 ?>
-          <option  value="<?=$Key?>"<?=$Key == $Event['Importance'] ? ' selected="selected"' : ''?>><?=$Value?></option>
+          <option value="<?=$Key?>"<?=$Key == $Event['Importance'] ? ' selected="selected"' : ''?>><?=$Value?></option>
 <?  } ?>
         </select>
       </td>
@@ -67,7 +67,7 @@ if ($_GET['id']) {
   $Teams = Calendar::$Teams;
   foreach ($Teams as $Key => $Value) {
 ?>
-          <option  value="<?=$Key?>"<?=$Key == $Event['Team'] ? ' selected="selected"' : ''?>><?=$Value?></option>
+          <option value="<?=$Key?>"<?=$Key == $Event['Team'] ? ' selected="selected"' : ''?>><?=$Value?></option>
 <?  } ?>
         </select>
       </td>

sections/tools/tools.php

@@ -52,7 +52,7 @@ View::show_header('Staff Tools');
     <div class="permission_subcontainer">
       <table class="layout">
         <tr class="colhead"><td>Administration</td></tr>
-<?=        $ToolsHTML ?>
+<?=       $ToolsHTML ?>
       </table>
     </div>
 <?
@@ -71,7 +71,7 @@ View::show_header('Staff Tools');
     <div class="permission_subcontainer">
       <table class="layout">
         <tr class="colhead"><td>Announcements</td></tr>
-<?=        $ToolsHTML ?>
+<?=       $ToolsHTML ?>
       </table>
     </div>
 <?
@@ -86,7 +86,7 @@ View::show_header('Staff Tools');
     <div class="permission_subcontainer">
       <table class="layout">
         <tr class="colhead"><td>Community</td></tr>
-<?=        $ToolsHTML ?>
+<?=       $ToolsHTML ?>
       </table>
     </div>
 <?
@@ -104,7 +104,7 @@ View::show_header('Staff Tools');
     <div class="permission_subcontainer">
       <table class="layout">
         <tr class="colhead"><td>Finances</td></tr>
-<?=        $ToolsHTML ?>
+<?=       $ToolsHTML ?>
       </table>
     </div>
 <?  } ?>
@@ -124,7 +124,7 @@ View::show_header('Staff Tools');
     <div class="permission_subcontainer">
       <table class="layout">
         <tr class="colhead"><td>Queue</td></tr>
-<?=        $ToolsHTML ?>
+<?=       $ToolsHTML ?>
       </table>
     </div>
 <?
@@ -142,7 +142,7 @@ View::show_header('Staff Tools');
     <div class="permission_subcontainer">
       <table class="layout">
         <tr class="colhead"><td>Managers</td></tr>
-<?=        $ToolsHTML ?>
+<?=       $ToolsHTML ?>
       </table>
     </div>
 <?
@@ -163,7 +163,7 @@ View::show_header('Staff Tools');
     <div class="permission_subcontainer">
       <table class="layout">
         <tr class="colhead"><td>Developer Sandboxes</td></tr>
-<?=        $ToolsHTML ?>
+<?=       $ToolsHTML ?>
       </table>
     </div>
 <?  } ?>
@@ -188,7 +188,7 @@ View::show_header('Staff Tools');
     <div class="permission_subcontainer">
       <table class="layout">
         <tr class="colhead"><td>Site Information</td></tr>
-<?=        $ToolsHTML ?>
+<?=       $ToolsHTML ?>
       </table>
     </div>
 <?
@@ -211,7 +211,7 @@ View::show_header('Staff Tools');
     <div class="permission_subcontainer">
       <table class="layout">
         <tr class="colhead"><td>Torrents</td></tr>
-<?=        $ToolsHTML ?>
+<?=       $ToolsHTML ?>
       </table>
     </div>
 <?
@@ -233,7 +233,7 @@ View::show_header('Staff Tools');
     <div class="permission_subcontainer">
       <table class="layout">
         <tr class="colhead"><td>Development</td></tr>
-<?=        $ToolsHTML ?>
+<?=       $ToolsHTML ?>
       </table>
     </div>
 <?  } ?>

sections/torrents/download.php

@@ -69,7 +69,7 @@ if (!is_array($Info) || !array_key_exists('PlainArtists', $Info) || empty($Info[
       t.Codec,
       tg.Year,
       tg.ID AS GroupID,
-      tg.Name,
+      COALESCE(NULLIF(tg.Name,''), NULLIF(tg.NameRJ,''), tg.NameJP) AS Name,
       tg.WikiImage,
       tg.CategoryID,
       t.Size,

sections/torrents/edit.php

@@ -1,11 +1,11 @@
 <?
 //**********************************************************************//
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Edit form ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
-// This page relies on the TORRENT_FORM class. All it does is call    //
-// the necessary functions.                        //
+// This page relies on the TORRENT_FORM class. All it does is call      //
+// the necessary functions.                                             //
 //----------------------------------------------------------------------//
 // At the bottom, there are grouping functions which are off limits to  //
-// most members.                            //
+// most members.                                                        //
 //**********************************************************************//
 
 require(SERVER_ROOT.'/classes/torrent_form.class.php');

sections/torrents/editgroup.php

@@ -19,24 +19,6 @@ if (!is_number($GroupID) || !$GroupID) {
 }
 
 // Get the torrent group name and the body of the last revision
-/*
-$DB->query("
-  SELECT
-    tg.Name,
-    wt.Image,
-    wt.Body,
-    tg.WikiImage,
-    tg.WikiBody,
-    tg.Year,
-    tg.RecordLabel,
-    tg.CatalogueNumber,
-    tg.ReleaseType,
-    tg.CategoryID,
-    tg.VanityHouse
-  FROM torrents_group AS tg
-    LEFT JOIN wiki_torrents AS wt ON wt.RevisionID = tg.RevisionID
-  WHERE tg.ID = '$GroupID'");
-  */
 $DB->query("
   SELECT
     tg.Name,
@@ -216,7 +198,7 @@ if ($CategoryID == 1) {
         <tr>
           <td class="label">
 <? if ($CategoryID == 1) {
-    echo "Studio:";
+     echo "Studio:";
    } else {
      echo "Publisher:";
    }

sections/torrents/editgroupid.php

@@ -75,7 +75,7 @@ if (empty($_POST['confirm'])) {
 
   $DB->query("
     UPDATE torrents
-    SET  GroupID = '$GroupID'
+    SET GroupID = '$GroupID'
     WHERE ID = $TorrentID");
 
   // Delete old torrent group if it's empty now

sections/torrents/takeedit.php

@@ -1,9 +1,9 @@
 <?
 //******************************************************************************//
 //--------------- Take edit ----------------------------------------------------//
-// This pages handles the backend of the 'edit torrent' function. It checks    //
-// the data, and if it all validates, it edits the values in the database    //
-// that correspond to the torrent in question.                  //
+// This pages handles the backend of the 'edit torrent' function. It checks     //
+// the data, and if it all validates, it edits the values in the database       //
+// that correspond to the torrent in question.                                  //
 //******************************************************************************//
 
 enforce_login();
@@ -16,7 +16,7 @@ $Validate = new VALIDATE;
 //******************************************************************************//
 //--------------- Set $Properties array ----------------------------------------//
 // This is used if the form doesn't validate, and when the time comes to enter  //
-// it into the database.                            //
+// it into the database.                                                        //
 //******************************************************************************//
 
 $Properties=[];

sections/torrents/takemasspm.php

@@ -1,9 +1,9 @@
 <?
 //******************************************************************************//
 //--------------- Take mass PM -------------------------------------------------//
-// This pages handles the backend of the 'Send Mass PM' function. It checks      //
-// the data, and if it all validates, it sends a PM to everyone who snatched  //
-// the torrent.                                    //
+// This pages handles the backend of the 'Send Mass PM' function. It checks     //
+// the data, and if it all validates, it sends a PM to everyone who snatched    //
+// the torrent.                                                                 //
 //******************************************************************************//
 
 authorize();

sections/upload/upload.php

@@ -120,7 +120,7 @@ $HideDNU = check_perms('torrents_hide_dnu') && !$NewDNU;
       <td width="50%"><strong>Name</strong></td>
       <td><strong>Comment</strong></td>
     </tr>
-<?   $TimeDiff = strtotime('-1 month', strtotime('now'));
+<?  $TimeDiff = strtotime('-1 month', strtotime('now'));
   foreach ($DNU as $BadUpload) {
     list($Name, $Comment, $Updated) = $BadUpload;
 ?>

sections/user/invite.php

@@ -28,9 +28,9 @@ $DB->query("
   FROM invites
   WHERE InviterID = '$UserID'
   ORDER BY Expires");
-$Pending =   $DB->to_array();
+$Pending = $DB->to_array();
 
-$OrderWays = array('username', 'email',  'joined', 'lastseen', 'uploaded', 'downloaded', 'ratio');
+$OrderWays = array('username', 'email', 'joined', 'lastseen', 'uploaded', 'downloaded', 'ratio');
 
 if (empty($_GET['order'])) {
   $CurrentOrder = 'id';

sections/user/linkedfunctions.php

@@ -225,7 +225,7 @@ function user_dupes_table($UserID) {
     }
 ?>
           </tr>
-<?  }  ?>
+<?  } ?>
           <tr>
             <td colspan="5" align="left" style="border-top: thin solid;"><strong>Comments:</strong></td>
           </tr>

sections/user/notify_edit.php

@@ -57,15 +57,15 @@ $i = 0;
 foreach ($Notifications as $N) { // $N stands for Notifications
   $i++;
   $NewFilter = $N['ID'] === false;
-  $N['Artists']    = implode(', ', explode('|', substr($N['Artists'], 1, -1)));
-  $N['Tags']      = implode(', ', explode('|', substr($N['Tags'], 1, -1)));
-  $N['NotTags']    = implode(', ', explode('|', substr($N['NotTags'], 1, -1)));
-  $N['ReleaseTypes']   = explode('|', substr($N['ReleaseTypes'], 1, -1));
+  $N['Artists']      = implode(', ', explode('|', substr($N['Artists'], 1, -1)));
+  $N['Tags']         = implode(', ', explode('|', substr($N['Tags'], 1, -1)));
+  $N['NotTags']      = implode(', ', explode('|', substr($N['NotTags'], 1, -1)));
+  $N['ReleaseTypes'] = explode('|', substr($N['ReleaseTypes'], 1, -1));
   $N['Categories']   = explode('|', substr($N['Categories'], 1, -1));
-  $N['Formats']     = explode('|', substr($N['Formats'], 1, -1));
-  $N['Encodings']   = explode('|', substr($N['Encodings'], 1, -1));
-  $N['Media']     = explode('|', substr($N['Media'], 1, -1));
-  $N['Users']     = explode('|', substr($N['Users'], 1, -1));
+  $N['Formats']      = explode('|', substr($N['Formats'], 1, -1));
+  $N['Encodings']    = explode('|', substr($N['Encodings'], 1, -1));
+  $N['Media']        = explode('|', substr($N['Media'], 1, -1));
+  $N['Users']        = explode('|', substr($N['Users'], 1, -1));
 
   $Usernames = '';
   foreach ($N['Users'] as $UserID) {

sections/user/user.php

@@ -272,7 +272,7 @@ if ($Avatar && Users::has_avatars_enabled()) {
     <div class="box box_image box_image_avatar">
       <div class="head colhead_dark">User</div>
       <div class="avatar" align="center">
-<?=        Users::show_avatar($Avatar, $UserID, $Username, $HeavyInfo['DisableAvatars'])?>
+<?=       Users::show_avatar($Avatar, $UserID, $Username, $HeavyInfo['DisableAvatars'])?>
       </div>
     </div>
 <? }

sections/userhistory/post_history.php

@@ -123,7 +123,7 @@ if ($ShowGrouped) {
 
   if ($ShowUnread) {
     $sql .= '
-      AND (  (t.IsLocked = \'0\' OR t.IsSticky = \'1\')
+      AND ( (t.IsLocked = \'0\' OR t.IsSticky = \'1\')
           AND (l.PostID < t.LastPostID OR l.PostID IS NULL)
         ) ';
   }
@@ -218,7 +218,7 @@ if (empty($Results)) {
     <colgroup>
 <?    if (Users::has_avatars_enabled()) { ?>
       <col class="col_avatar" />
-<?     } ?>
+<?    } ?>
       <col class="col_post_body" />
     </colgroup>
     <tr class="colhead_dark">
@@ -248,7 +248,7 @@ if (empty($Results)) {
 <?    if ($ViewingOwn && !in_array($TopicID, $UserSubscriptions)) { ?>
           <a href="#" onclick="Subscribe(<?=$TopicID?>); $('.subscribelink<?=$TopicID?>').remove(); return false;" class="brackets subscribelink<?=$TopicID?>">Subscribe</a>
           &nbsp;
-<?     } ?>
+<?    } ?>
           <a href="#">&uarr;</a>
         </span>
       </td>
@@ -270,7 +270,7 @@ if (empty($Results)) {
           <br />
 <?        if (check_perms('site_moderate_forums')) { ?>
           <a href="#content<?=$PostID?>" onclick="LoadEdit(<?=$PostID?>, 1);">&laquo;</a>
-<?         } ?>
+<?        } ?>
           Last edited by
           <?=Users::format_username($EditedUserID, false, false, false) ?> <?=time_diff($EditedTime, 2, true, true)?>
 <?      } ?>
@@ -281,7 +281,7 @@ if (empty($Results)) {
   $DB->set_query_id($QueryID);
 ?>
   </table>
-<?   } ?>
+<?  } ?>
   <div class="linkbox">
 <?=$Pages?>
   </div>

static/styles/beluga/style.css

@@ -99,6 +99,10 @@ h1,h2 {
   font-size: 23px;
 }
 
+#torrents .header h2 {
+  text-align: center;
+}
+
 h3,h4 {
   font-size: 18px;
 }
@@ -1188,38 +1192,6 @@ span.center_poll {
   white-space: nowrap
 }
 
-form[action="inbox.php"] .box.pad.center {
-  margin: 0;
-  width: 900px;
-  padding: 0;
-  margin-top: 10px!important;
-  background: none!important
-}
-
-form[action="inbox.php"] .box.pad table {
-  background: initial!important
-}
-
-#kb .sidebar .box.pad {
-  margin-top: 2px
-}
-
-#tvnews .head {
-  height: initial
-}
-
-#tvnews .sidebar {
-  margin-top: 27px
-}
-
-#tvschedule td {
-  border: none
-}
-
-#collages td {
-  padding: 3px
-}
-
 #collages .sign,#torrents .sign {
   padding: 5px;
   position: relative;