Enable wiki search and other small edits

design/privateheader.php

@@ -1,4 +1,4 @@
-<?
+<?php
 
 define('FOOTER_FILE', SERVER_ROOT.'/design/privatefooter.php');
 
@@ -26,16 +26,15 @@ define('FOOTER_FILE', SERVER_ROOT.'/design/privatefooter.php');
   <link rel="alternate" type="application/rss+xml"
       href="feeds.php?feed=torrents_notify_<?=G::$LoggedUser['torrent_pass']?>&amp;user=<?=G::$LoggedUser['ID']?>&amp;auth=<?=G::$LoggedUser['RSS_Auth']?>&amp;passkey=<?=G::$LoggedUser['torrent_pass']?>&amp;authkey=<?=G::$LoggedUser['AuthKey']?>"
       title="<?=SITE_NAME?> - P.T.N.">
-<?
+<?php
 if (isset(G::$LoggedUser['Notify'])) {
-  foreach (G::$LoggedUser['Notify'] as $Filter) {
-    list($FilterID, $FilterName) = $Filter;
-?>
+    foreach (G::$LoggedUser['Notify'] as $Filter) {
+        list($FilterID, $FilterName) = $Filter; ?>
   <link rel="alternate" type="application/rss+xml"
       href="feeds.php?feed=torrents_notify_<?=$FilterID?>_<?=G::$LoggedUser['torrent_pass']?>&amp;user=<?=G::$LoggedUser['ID']?>&amp;auth=<?=G::$LoggedUser['RSS_Auth']?>&amp;passkey=<?=G::$LoggedUser['torrent_pass']?>&amp;authkey=<?=G::$LoggedUser['AuthKey']?>&amp;name=<?=urlencode($FilterName)?>"
       title="<?=SITE_NAME?> - <?=display_str($FilterName)?>">
-<?
-  }
+<?php
+    }
 }
 ?>
   <link rel="alternate" type="application/rss+xml"
@@ -59,57 +58,56 @@ if (isset(G::$LoggedUser['Notify'])) {
   <link rel="stylesheet" type="text/css"
       href="<?=STATIC_SERVER?>styles/global.css?v=<?=filemtime(SERVER_ROOT.STATIC_SERVER.'styles/global.css')?>">
   <link rel="stylesheet" href="<?=STATIC_SERVER?>styles/tooltipster/style.css?v=<?=filemtime(SERVER_ROOT.STATIC_SERVER.'styles/tooltipster/style.css')?>" type="text/css" media="screen">
-<?
+<?php
 if (empty(G::$LoggedUser['StyleURL'])) {
-  if (($StyleColors = G::$Cache->get_value('stylesheet_colors')) === false) {
-    G::$DB->query('SELECT LOWER(REPLACE(Name, " ", "_")) AS Name, Color FROM stylesheets WHERE COLOR IS NOT NULL');
-    while (list($StyleName, $StyleColor) = G::$DB->next_record()) {
-      $StyleColors[$StyleName] = $StyleColor;
+    if (($StyleColors = G::$Cache->get_value('stylesheet_colors')) === false) {
+        G::$DB->query('SELECT LOWER(REPLACE(Name, " ", "_")) AS Name, Color FROM stylesheets WHERE COLOR IS NOT NULL');
+        while (list($StyleName, $StyleColor) = G::$DB->next_record()) {
+            $StyleColors[$StyleName] = $StyleColor;
+        }
+        G::$Cache->cache_value('stylesheet_colors', $StyleColors, 0);
     }
-    G::$Cache->cache_value('stylesheet_colors', $StyleColors, 0);
-  }
-  if (isset($StyleColors[G::$LoggedUser['StyleName']])) { ?>
+    if (isset($StyleColors[G::$LoggedUser['StyleName']])) { ?>
 <meta name="theme-color" content="<?=$StyleColors[G::$LoggedUser['StyleName']]?>">
-<? } ?>
+<?php } ?>
 <link rel="stylesheet" type="text/css" title="<?=G::$LoggedUser['StyleName']?>" media="screen" href="<?=STATIC_SERVER?>styles/<?=G::$LoggedUser['StyleName']?>/style.css?v=<?=filemtime(SERVER_ROOT.STATIC_SERVER.'styles/'.G::$LoggedUser['StyleName'].'/style.css')?>">
-<?
+<?php
 } else {
-  $StyleURLInfo = parse_url(G::$LoggedUser['StyleURL']);
-  if (substr(G::$LoggedUser['StyleURL'], -4) == '.css'
+        $StyleURLInfo = parse_url(G::$LoggedUser['StyleURL']);
+        if (substr(G::$LoggedUser['StyleURL'], -4) == '.css'
       && empty($StyleURLInfo['query']) && empty($StyleURLInfo['fragment'])
       && ($StyleURLInfo['host'] == SITE_DOMAIN)
       && file_exists(SERVER_ROOT.$StyleURLInfo['path'])) {
-    $StyleURL = G::$LoggedUser['StyleURL'].'?v='.filemtime(SERVER_ROOT.$StyleURLInfo['path']);
-  } else {
-    $StyleURL = G::$LoggedUser['StyleURL'];
-  }
-?>
+            $StyleURL = G::$LoggedUser['StyleURL'].'?v='.filemtime(SERVER_ROOT.$StyleURLInfo['path']);
+        } else {
+            $StyleURL = G::$LoggedUser['StyleURL'];
+        } ?>
 <link rel="stylesheet" type="text/css" media="screen" href="<?=$StyleURL?>" title="External CSS">
-<?
-}
+<?php
+    }
 $ExtraCSS = explode(',', $CSSIncludes);
 foreach ($ExtraCSS as $CSS) {
-  if (trim($CSS) == '') {
-    continue;
-  }
-?>
+    if (trim($CSS) == '') {
+        continue;
+    } ?>
   <link rel="stylesheet" type="text/css" media="screen" href="<?=STATIC_SERVER."styles/$CSS/style.css?v=".filemtime(SERVER_ROOT.STATIC_SERVER."styles/$CSS/style.css")?>">
-<?
+<?php
 }
 
 $Scripts = array_merge(array('jquery', 'global', 'ajax.class', 'jquery.autocomplete', 'autocomplete', 'tooltipster'), explode(',', $JSIncludes));
 foreach ($Scripts as $Script) {
-  if (trim($Script) == '') { continue; }
-  $Async = (in_array($Script, ['jquery','global','ajax.class'])) ? '' : 'async';
-  if (($ScriptStats = G::$Cache->get_value("script_stats_$Script")) === false || $ScriptStats['mtime'] != filemtime(SERVER_ROOT.STATIC_SERVER."functions/$Script.js")) {
-    $ScriptStats['mtime'] = filemtime(SERVER_ROOT.STATIC_SERVER."functions/$Script.js");
-    $ScriptStats['hash'] = base64_encode(hash_file(INTEGRITY_ALGO, SERVER_ROOT.STATIC_SERVER."functions/$Script.js", true));
-    $ScriptStats['algo'] = INTEGRITY_ALGO;
-    G::$Cache->cache_value("script_stats_$Script", $ScriptStats);
-  }
-?>
+    if (trim($Script) == '') {
+        continue;
+    }
+    $Async = (in_array($Script, ['jquery','global','ajax.class'])) ? '' : 'async';
+    if (($ScriptStats = G::$Cache->get_value("script_stats_$Script")) === false || $ScriptStats['mtime'] != filemtime(SERVER_ROOT.STATIC_SERVER."functions/$Script.js")) {
+        $ScriptStats['mtime'] = filemtime(SERVER_ROOT.STATIC_SERVER."functions/$Script.js");
+        $ScriptStats['hash'] = base64_encode(hash_file(INTEGRITY_ALGO, SERVER_ROOT.STATIC_SERVER."functions/$Script.js", true));
+        $ScriptStats['algo'] = INTEGRITY_ALGO;
+        G::$Cache->cache_value("script_stats_$Script", $ScriptStats);
+    } ?>
   <script src="<?=STATIC_SERVER."functions/$Script.js?v=$ScriptStats[mtime]"?>" type="text/javascript" integrity="<?="$ScriptStats[algo]-$ScriptStats[hash]"?>" <?=$Async?>></script>
-<?
+<?php
 }
 
 global $ClassLevels;
@@ -121,24 +119,24 @@ $UseNoty = $NotificationsManager->use_noty();
 $NewSubscriptions = false;
 $NotificationSpans = [];
 foreach ($Notifications as $Type => $Notification) {
-  if ($Type === NotificationsManager::SUBSCRIPTIONS) {
-    $NewSubscriptions = true;
-  }
-  if ($UseNoty) {
-    $NotificationSpans[] = "<span class=\"noty-notification\" style=\"display: none;\" data-noty-type=\"$Type\" data-noty-id=\"$Notification[id]\" data-noty-importance=\"$Notification[importance]\" data-noty-url=\"$Notification[url]\">$Notification[message]</span>";
-  }
+    if ($Type === NotificationsManager::SUBSCRIPTIONS) {
+        $NewSubscriptions = true;
+    }
+    if ($UseNoty) {
+        $NotificationSpans[] = "<span class=\"noty-notification\" style=\"display: none;\" data-noty-type=\"$Type\" data-noty-id=\"$Notification[id]\" data-noty-importance=\"$Notification[importance]\" data-noty-url=\"$Notification[url]\">$Notification[message]</span>";
+    }
 }
 if ($UseNoty && !empty($NotificationSpans)) {
-  NotificationsManagerView::load_js();
+    NotificationsManagerView::load_js();
 }
 if ($NotificationsManager->is_skipped(NotificationsManager::SUBSCRIPTIONS)) {
-  $NewSubscriptions = Subscriptions::has_new_subscriptions();
+    $NewSubscriptions = Subscriptions::has_new_subscriptions();
 }
 ?>
 </head>
-<?
+<?php
   if (!empty(G::$LoggedUser['StyleAdditions'])) {
-    $BodyStyles = 'style_'.implode(' style_', G::$LoggedUser['StyleAdditions']);
+      $BodyStyles = 'style_'.implode(' style_', G::$LoggedUser['StyleAdditions']);
   }
 ?>
 <body id="<?=$Document == 'collages' ? 'collage' : $Document?>" class="<?=($BodyStyles??'')?>">
@@ -196,9 +194,9 @@ if ($NotificationsManager->is_skipped(NotificationsManager::SUBSCRIPTIONS)) {
               <a href="staffpm.php">Staff Inbox</a>
               <a href="torrents.php?type=uploaded&amp;userid=<?=G::$LoggedUser['ID']?>">Uploads</a>
               <a href="bookmarks.php?type=torrents">Bookmarks</a>
-<?  if (check_perms('site_torrents_notify')) { ?>
+<?php  if (check_perms('site_torrents_notify')) { ?>
               <a href="user.php?action=notify">Notifications</a>
-<?  } ?>
+<?php  } ?>
               <a href="userhistory.php?action=subscriptions">Subscriptions</a>
               <a href="comments.php">Comments</a>
               <a href="friends.php">Friends</a>
@@ -207,22 +205,22 @@ if ($NotificationsManager->is_skipped(NotificationsManager::SUBSCRIPTIONS)) {
           </li>
         </ul>
       </div>
-<?
+<?php
 if (isset(G::$LoggedUser['SearchType']) && G::$LoggedUser['SearchType']) { // Advanced search
-  $UseAdvancedSearch = true;
-} else {
-  $UseAdvancedSearch = false;
-}
+                $UseAdvancedSearch = true;
+            } else {
+                $UseAdvancedSearch = false;
+            }
 ?>
       <div id="searchbars">
         <form class="search_form" name="torrents" action="torrents.php" method="get">
-<?  if ($UseAdvancedSearch) { ?>
+<?php  if ($UseAdvancedSearch) { ?>
           <input type="hidden" name="action" value="advanced">
-<?  } ?>
+<?php  } ?>
           <input id="torrentssearch" aria-label="Search torrents" accesskey="t" spellcheck="false" autocomplete="off" placeholder="Torrents" type="text" name="<?=$UseAdvancedSearch ? 'advgroupname' : 'searchstr' ?>" size="17">
         </form>
         <form class="search_form" name="artists" action="artist.php" method="get">
-          <input id="artistsearch"<?=Users::has_autocomplete_enabled('search')?> aria-label="Search artists" accesskey="a" spellcheck="false" autocomplete="off" placeholder="Artists" type="text" name="artistname" size="17">
+          <input id="artistsearch"<?=Users::has_autocomplete_enabled('search')?> aria-label="Search authors" accesskey="a" spellcheck="false" autocomplete="off" placeholder="Authors" type="text" name="artistname" size="17">
         </form>
         <form class="search_form" name="requests" action="requests.php" method="get">
           <input id="requestssearch" aria-label="Search requests" spellcheck="false" autocomplete="off" placeholder="Requests" type="text" name="search" size="17">
@@ -231,12 +229,11 @@ if (isset(G::$LoggedUser['SearchType']) && G::$LoggedUser['SearchType']) { // Ad
           <input value="search" type="hidden" name="action">
           <input id="forumssearch" aria-label="Search forums" spellcheck="false" autocomplete="off" placeholder="Forums" type="text" name="search" size="17">
         </form>
-<!--
         <form class="search_form" name="wiki" action="wiki.php" method="get">
           <input type="hidden" name="action" value="search">
-          <input value="Wiki" placeholder="Wiki" type="text" name="search" size="17">
+          <input id="wikisearch" aria-label="Search wiki" spellcheck="false" autocomplete="off" placeholder="Wiki" type="text" name="search" size="17">
+
         </form>
--->
         <form class="search_form" name="log" action="log.php" method="get">
           <input id="logsearch" aria-label="Search log" spellcheck="false" autocomplete="off" placeholder="Log" type="text" name="search" size="17">
         </form>
@@ -250,23 +247,23 @@ if (isset(G::$LoggedUser['SearchType']) && G::$LoggedUser['SearchType']) { // Ad
           <li id="nav_upload" class="brackets<?=Format::add_class($PageID, array('upload'), 'active', false)?>">
             <a href="upload.php">Upload</a>
           </li>
-<?
+<?php
 if (check_perms('site_send_unlimited_invites')) {
-  $Invites = ' (∞)';
+    $Invites = ' (∞)';
 } elseif (G::$LoggedUser['Invites'] > 0) {
-  $Invites = ' ('.G::$LoggedUser['Invites'].')';
+    $Invites = ' ('.G::$LoggedUser['Invites'].')';
 } else {
-  $Invites = '';
+    $Invites = '';
 }
 ?>
           <li id="nav_invite" class="brackets<?=Format::add_class($PageID, array('user','invite'), 'active', false)?>">
             <a href="user.php?action=invite">Invite<?=$Invites?></a>
           </li>
-<? if (FEATURE_DONATE) { ?>
+<?php if (FEATURE_DONATE) { ?>
           <li id="nav_donate" class="brackets<?=Format::add_class($PageID, array('donate'), 'active', false)?>">
             <a href="donate.php">Donate</a>
           </li>
-<? } ?>
+<?php } ?>
           <li id="nav_staff" class="brackets<?=Format::add_class($PageID, array('staff'), 'active', false)?>">
             <a href="staff.php">Staff</a>
           </li>
@@ -283,12 +280,12 @@ if (check_perms('site_send_unlimited_invites')) {
           <li id="stats_ratio">
             Ratio: <span class="stat"><?=Format::get_ratio_html(G::$LoggedUser['BytesUploaded'], G::$LoggedUser['BytesDownloaded'])?></span>
           </li>
-<?  if (!empty(G::$LoggedUser['RequiredRatio']) && G::$LoggedUser['RequiredRatio'] > 0) { ?>
+<?php  if (!empty(G::$LoggedUser['RequiredRatio']) && G::$LoggedUser['RequiredRatio'] > 0) { ?>
           <li id="stats_required">
             <a href="rules.php?p=ratio">Required</a>:
             <span class="stat tooltip" title="<?=number_format(G::$LoggedUser['RequiredRatio'], 5)?>"><?=number_format(G::$LoggedUser['RequiredRatio'], 2)?></span>
           </li>
-<?  }
+<?php  }
 
   if (G::$LoggedUser['FLTokens'] > 0) { ?>
           <li id="fl_tokens">
@@ -297,7 +294,7 @@ if (check_perms('site_send_unlimited_invites')) {
               <a href="userhistory.php?action=token_history&amp;userid=<?=G::$LoggedUser['ID']?>"><?=G::$LoggedUser['FLTokens']?></a>
             </span>
           </li>
-<?  }
+<?php  }
 ?>
           <li id="bonus_points">
             <a href="wiki.php?action=article&amp;name=bonuspoints"><?=BONUS_POINTS?></a>:
@@ -305,230 +302,229 @@ if (check_perms('site_send_unlimited_invites')) {
               <a href="store.php"><?=number_format(G::$LoggedUser['BonusPoints'])?></a>
             </span>
           </li>
-<?  if (G::$LoggedUser['HnR'] > 0) { ?>
+<?php  if (G::$LoggedUser['HnR'] > 0) { ?>
           <li id="hnr">
             <a href="snatchlist.php">HnRs</a>:
             <span class="stat">
               <a><?=G::$LoggedUser['HnR']?></a>
             </span>
           </li>
-<?  }
+<?php  }
 ?>
         </ul>
       </div>
-<? if (!apcu_exists('DBKEY')) { ?>
+<?php if (!apcu_exists('DBKEY')) { ?>
       <a id="dbcrypt" class="tooltip" href="wiki.php?action=article&amp;name=databaseencryption" title="Database is not fully decrypted. Site functionality will be reduced until staff can provide the decryption key. Click to learn more."></a>
-<? } ?>
+<?php } ?>
     </div>
-<?
+<?php
 //Start handling alert bars
 $Alerts = [];
 $ModBar = [];
 
 // Staff blog
 if (check_perms('users_mod')) {
-  global $SBlogReadTime, $LatestSBlogTime;
-  if (!$SBlogReadTime && ($SBlogReadTime = G::$Cache->get_value('staff_blog_read_'.G::$LoggedUser['ID'])) === false) {
-    G::$DB->query("
+    global $SBlogReadTime, $LatestSBlogTime;
+    if (!$SBlogReadTime && ($SBlogReadTime = G::$Cache->get_value('staff_blog_read_'.G::$LoggedUser['ID'])) === false) {
+        G::$DB->query("
       SELECT Time
       FROM staff_blog_visits
       WHERE UserID = ".G::$LoggedUser['ID']);
-    if (list($SBlogReadTime) = G::$DB->next_record()) {
-      $SBlogReadTime = strtotime($SBlogReadTime);
-    } else {
-      $SBlogReadTime = 0;
+        if (list($SBlogReadTime) = G::$DB->next_record()) {
+            $SBlogReadTime = strtotime($SBlogReadTime);
+        } else {
+            $SBlogReadTime = 0;
+        }
+        G::$Cache->cache_value('staff_blog_read_'.G::$LoggedUser['ID'], $SBlogReadTime, 1209600);
     }
-    G::$Cache->cache_value('staff_blog_read_'.G::$LoggedUser['ID'], $SBlogReadTime, 1209600);
-  }
-  if (!$LatestSBlogTime && ($LatestSBlogTime = G::$Cache->get_value('staff_blog_latest_time')) === false) {
-    G::$DB->query("
+    if (!$LatestSBlogTime && ($LatestSBlogTime = G::$Cache->get_value('staff_blog_latest_time')) === false) {
+        G::$DB->query("
       SELECT MAX(Time)
       FROM staff_blog");
-    list($LatestSBlogTime) = G::$DB->next_record();
-    if ($LatestSBlogTime) {
-      $LatestSBlogTime = strtotime($LatestSBlogTime);
-    } else {
-      $LatestSBlogTime = 0;
+        list($LatestSBlogTime) = G::$DB->next_record();
+        if ($LatestSBlogTime) {
+            $LatestSBlogTime = strtotime($LatestSBlogTime);
+        } else {
+            $LatestSBlogTime = 0;
+        }
+        G::$Cache->cache_value('staff_blog_latest_time', $LatestSBlogTime, 1209600);
+    }
+    if ($SBlogReadTime < $LatestSBlogTime) {
+        $Alerts[] = '<a href="staffblog.php">New staff blog post!</a>';
     }
-    G::$Cache->cache_value('staff_blog_latest_time', $LatestSBlogTime, 1209600);
-  }
-  if ($SBlogReadTime < $LatestSBlogTime) {
-    $Alerts[] = '<a href="staffblog.php">New staff blog post!</a>';
-  }
 }
 
 // Inbox
 if ($NotificationsManager->is_traditional(NotificationsManager::INBOX)) {
-  $NotificationsManager->load_inbox();
-  $NewMessages = $NotificationsManager->get_notifications();
-  if (isset($NewMessages[NotificationsManager::INBOX])) {
-    $Alerts[] = NotificationsManagerView::format_traditional($NewMessages[NotificationsManager::INBOX]);
-  }
-  $NotificationsManager->clear_notifications_array();
+    $NotificationsManager->load_inbox();
+    $NewMessages = $NotificationsManager->get_notifications();
+    if (isset($NewMessages[NotificationsManager::INBOX])) {
+        $Alerts[] = NotificationsManagerView::format_traditional($NewMessages[NotificationsManager::INBOX]);
+    }
+    $NotificationsManager->clear_notifications_array();
 }
 
 if (G::$LoggedUser['RatioWatch']) {
-  $Alerts[] = '<a href="rules.php?p=ratio">Ratio Watch</a>: You have '.time_diff(G::$LoggedUser['RatioWatchEnds'], 3).' to get your ratio over your required ratio or your leeching abilities will be disabled.';
+    $Alerts[] = '<a href="rules.php?p=ratio">Ratio Watch</a>: You have '.time_diff(G::$LoggedUser['RatioWatchEnds'], 3).' to get your ratio over your required ratio or your leeching abilities will be disabled.';
 } elseif (G::$LoggedUser['CanLeech'] != 1) {
-  $Alerts[] = '<a href="rules.php?p=ratio">Ratio Watch</a>: Your downloading privileges are disabled until you meet your required ratio.';
+    $Alerts[] = '<a href="rules.php?p=ratio">Ratio Watch</a>: Your downloading privileges are disabled until you meet your required ratio.';
 }
 
 // Torrents
 if ($NotificationsManager->is_traditional(NotificationsManager::TORRENTS)) {
-  $NotificationsManager->load_torrent_notifications();
-  $NewTorrents = $NotificationsManager->get_notifications();
-  if (isset($NewTorrents[NotificationsManager::TORRENTS])) {
-    $Alerts[] = NotificationsManagerView::format_traditional($NewTorrents[NotificationsManager::TORRENTS]);
-  }
-  $NotificationsManager->clear_notifications_array();
+    $NotificationsManager->load_torrent_notifications();
+    $NewTorrents = $NotificationsManager->get_notifications();
+    if (isset($NewTorrents[NotificationsManager::TORRENTS])) {
+        $Alerts[] = NotificationsManagerView::format_traditional($NewTorrents[NotificationsManager::TORRENTS]);
+    }
+    $NotificationsManager->clear_notifications_array();
 }
 
 // Contests
 if ($ContestSettings = G::$Cache->get_value('contest_settings')) {
-  if (time() > $ContestSettings['start'] && time() < $ContestSettings['end']) {
-    $Alerts[] = '<a href="/contest.php">A Contest is Underway!</a>';
-  }
+    if (time() > $ContestSettings['start'] && time() < $ContestSettings['end']) {
+        $Alerts[] = '<a href="/contest.php">A Contest is Underway!</a>';
+    }
 }
 
 if (check_perms('users_mod')) {
-  $ModBar[] = '<a href="tools.php">Toolbox</a>';
+    $ModBar[] = '<a href="tools.php">Toolbox</a>';
 }
 if (check_perms('users_mod')) {
-  $NumStaffPMs = G::$Cache->get_value('num_staff_pms_'.G::$LoggedUser['ID']);
-  if ($NumStaffPMs === false) {
-    if (check_perms('users_mod')) {
-
-      $LevelCap = 1000;
+    $NumStaffPMs = G::$Cache->get_value('num_staff_pms_'.G::$LoggedUser['ID']);
+    if ($NumStaffPMs === false) {
+        if (check_perms('users_mod')) {
+            $LevelCap = 1000;
 
-      G::$DB->query("
+            G::$DB->query("
         SELECT COUNT(ID)
         FROM staff_pm_conversations
         WHERE Status = 'Unanswered'
           AND (AssignedToUser = ".G::$LoggedUser['ID']."
             OR (LEAST('$LevelCap', Level) <= '".G::$LoggedUser['EffectiveClass']."'
               AND Level <= ".G::$LoggedUser['Class']."))");
-    }
-    if (G::$LoggedUser['PermissionID'] == FORUM_MOD) {
-      G::$DB->query("
+        }
+        if (G::$LoggedUser['PermissionID'] == FORUM_MOD) {
+            G::$DB->query("
         SELECT COUNT(ID)
         FROM staff_pm_conversations
         WHERE Status='Unanswered'
           AND (AssignedToUser = ".G::$LoggedUser['ID']."
             OR Level = '". $Classes[FORUM_MOD]['Level'] . "')");
+        }
+        list($NumStaffPMs) = G::$DB->next_record();
+        G::$Cache->cache_value('num_staff_pms_'.G::$LoggedUser['ID'], $NumStaffPMs, 1000);
     }
-    list($NumStaffPMs) = G::$DB->next_record();
-    G::$Cache->cache_value('num_staff_pms_'.G::$LoggedUser['ID'], $NumStaffPMs , 1000);
-  }
 
-  if ($NumStaffPMs > 0) {
-    $ModBar[] = '<a href="staffpm.php">'.$NumStaffPMs.' Staff PMs</a>';
-  }
+    if ($NumStaffPMs > 0) {
+        $ModBar[] = '<a href="staffpm.php">'.$NumStaffPMs.' Staff PMs</a>';
+    }
 }
 if (check_perms('admin_reports')) {
-// Torrent reports code
-  $NumTorrentReports = G::$Cache->get_value('num_torrent_reportsv2');
-  if ($NumTorrentReports === false) {
-    G::$DB->query("
+    // Torrent reports code
+    $NumTorrentReports = G::$Cache->get_value('num_torrent_reportsv2');
+    if ($NumTorrentReports === false) {
+        G::$DB->query("
       SELECT COUNT(ID)
       FROM reportsv2
       WHERE Status = 'New'");
-    list($NumTorrentReports) = G::$DB->next_record();
-    G::$Cache->cache_value('num_torrent_reportsv2', $NumTorrentReports, 0);
-  }
+        list($NumTorrentReports) = G::$DB->next_record();
+        G::$Cache->cache_value('num_torrent_reportsv2', $NumTorrentReports, 0);
+    }
 
-  $ModBar[] = '<a href="reportsv2.php">'.$NumTorrentReports.(($NumTorrentReports == 1) ? ' Report' : ' Reports').'</a>';
+    $ModBar[] = '<a href="reportsv2.php">'.$NumTorrentReports.(($NumTorrentReports == 1) ? ' Report' : ' Reports').'</a>';
 
-// Other reports code
-  $NumOtherReports = G::$Cache->get_value('num_other_reports');
-  if ($NumOtherReports === false) {
-    G::$DB->query("
+    // Other reports code
+    $NumOtherReports = G::$Cache->get_value('num_other_reports');
+    if ($NumOtherReports === false) {
+        G::$DB->query("
       SELECT COUNT(ID)
       FROM reports
       WHERE Status = 'New'");
-    list($NumOtherReports) = G::$DB->next_record();
-    G::$Cache->cache_value('num_other_reports', $NumOtherReports, 0);
-  }
+        list($NumOtherReports) = G::$DB->next_record();
+        G::$Cache->cache_value('num_other_reports', $NumOtherReports, 0);
+    }
 
-  if ($NumOtherReports > 0) {
-    $ModBar[] = '<a href="reports.php">'.$NumOtherReports.(($NumTorrentReports == 1) ? ' Other report' : ' Other reports').'</a>';
-  }
+    if ($NumOtherReports > 0) {
+        $ModBar[] = '<a href="reports.php">'.$NumOtherReports.(($NumTorrentReports == 1) ? ' Other report' : ' Other reports').'</a>';
+    }
 } elseif (check_perms('project_team')) {
-  $NumUpdateReports = G::$Cache->get_value('num_update_reports');
-  if ($NumUpdateReports === false) {
-    G::$DB->query("
+    $NumUpdateReports = G::$Cache->get_value('num_update_reports');
+    if ($NumUpdateReports === false) {
+        G::$DB->query("
       SELECT COUNT(ID)
       FROM reports
       WHERE Status = 'New'
         AND Type = 'request_update'");
-    list($NumUpdateReports) = G::$DB->next_record();
-    G::$Cache->cache_value('num_update_reports', $NumUpdateReports, 0);
-  }
+        list($NumUpdateReports) = G::$DB->next_record();
+        G::$Cache->cache_value('num_update_reports', $NumUpdateReports, 0);
+    }
 
-  if ($NumUpdateReports > 0) {
-    $ModBar[] = '<a href="reports.php">Request update reports</a>';
-  }
+    if ($NumUpdateReports > 0) {
+        $ModBar[] = '<a href="reports.php">Request update reports</a>';
+    }
 } elseif (check_perms('site_moderate_forums')) {
-  $NumForumReports = G::$Cache->get_value('num_forum_reports');
-  if ($NumForumReports === false) {
-    G::$DB->query("
+    $NumForumReports = G::$Cache->get_value('num_forum_reports');
+    if ($NumForumReports === false) {
+        G::$DB->query("
       SELECT COUNT(ID)
       FROM reports
       WHERE Status = 'New'
         AND Type IN('artist_comment', 'collages_comment', 'post', 'requests_comment', 'thread', 'torrents_comment')");
-    list($NumForumReports) = G::$DB->next_record();
-    G::$Cache->cache_value('num_forum_reports', $NumForumReports, 0);
-  }
+        list($NumForumReports) = G::$DB->next_record();
+        G::$Cache->cache_value('num_forum_reports', $NumForumReports, 0);
+    }
 
-  if ($NumForumReports > 0) {
-    $ModBar[] = '<a href="reports.php">'.$NumForumReports.(($NumForumReports == 1) ? ' Forum report' : ' Forum reports').'</a>';
-  }
+    if ($NumForumReports > 0) {
+        $ModBar[] = '<a href="reports.php">'.$NumForumReports.(($NumForumReports == 1) ? ' Forum report' : ' Forum reports').'</a>';
+    }
 }
 
 if (check_perms('users_mod')) {
-  $NumDeleteRequests = G::$Cache->get_value('num_deletion_requests');
-  if ($NumDeleteRequests === false) {
-    G::$DB->query("SELECT COUNT(*) FROM deletion_requests");
-    list($NumDeleteRequests) = G::$DB->next_record();
-    G::$Cache->cache_value('num_deletion_requests', $NumDeleteRequests);
-  }
-  if ($NumDeleteRequests > 0) {
-    $ModBar[] = '<a href="tools.php?action=expunge_requests">' . $NumDeleteRequests . " Expunge request".($NumDeleteRequests > 1 ? 's' : '')."</a>";
-  }
+    $NumDeleteRequests = G::$Cache->get_value('num_deletion_requests');
+    if ($NumDeleteRequests === false) {
+        G::$DB->query("SELECT COUNT(*) FROM deletion_requests");
+        list($NumDeleteRequests) = G::$DB->next_record();
+        G::$Cache->cache_value('num_deletion_requests', $NumDeleteRequests);
+    }
+    if ($NumDeleteRequests > 0) {
+        $ModBar[] = '<a href="tools.php?action=expunge_requests">' . $NumDeleteRequests . " Expunge request".($NumDeleteRequests > 1 ? 's' : '')."</a>";
+    }
 }
 
 if (check_perms('users_mod') && FEATURE_EMAIL_REENABLE) {
-  $NumEnableRequests = G::$Cache->get_value(AutoEnable::CACHE_KEY_NAME);
-  if ($NumEnableRequests === false) {
-    G::$DB->query("SELECT COUNT(1) FROM users_enable_requests WHERE Outcome IS NULL");
-    list($NumEnableRequests) = G::$DB->next_record();
-    G::$Cache->cache_value(AutoEnable::CACHE_KEY_NAME, $NumEnableRequests);
-  }
+    $NumEnableRequests = G::$Cache->get_value(AutoEnable::CACHE_KEY_NAME);
+    if ($NumEnableRequests === false) {
+        G::$DB->query("SELECT COUNT(1) FROM users_enable_requests WHERE Outcome IS NULL");
+        list($NumEnableRequests) = G::$DB->next_record();
+        G::$Cache->cache_value(AutoEnable::CACHE_KEY_NAME, $NumEnableRequests);
+    }
 
-  if ($NumEnableRequests > 0) {
-    $ModBar[] = '<a href="tools.php?action=enable_requests">' . $NumEnableRequests . " Enable requests</a>";
-  }
+    if ($NumEnableRequests > 0) {
+        $ModBar[] = '<a href="tools.php?action=enable_requests">' . $NumEnableRequests . " Enable requests</a>";
+    }
 }
 
 if (!empty($Alerts) || !empty($ModBar)) { ?>
       <div id="alerts">
-<?  foreach ($Alerts as $Alert) { ?>
+<?php  foreach ($Alerts as $Alert) { ?>
         <div class="alertbar"><?=$Alert?></div>
-<?
+<?php
   }
   if (!empty($ModBar)) { ?>
         <div class="alertbar modbar">
           <?=implode(' ', $ModBar); echo "\n"?>
         </div>
-<?  }
+<?php  }
 if (check_perms('site_debug') && !apcu_exists('DBKEY')) { ?>
         <div class="alertbar error">
           Warning: <a href="tools.php?action=database_key">no DB key</a>
         </div>
-<?  } ?>
+<?php  } ?>
       </div>
-<?
+<?php
 }
-//Done handling alertbars
+// Done handling alertbars
 ?>
 
     <div id="content">

sections/donate/donate.php

@@ -47,7 +47,7 @@ View::show_header('Donate');
     If you prefer to make a tax-deductible donation to an organization beyond my financial grasp, donations to the
     <a href="https://www.boslab.org/donate" target="_blank">Boston Open Science Laboratory (BosLab)</a>
     are honored the same as direct donations.
-    Please note in the comment field that your donation is on behalf of <?= SITE_NAME ?> from your username.
+    Please note in the comment field that your donation is on <?= SITE_NAME ?>'s behalf and to credit your username.
     </p>
   </div>
 
@@ -57,16 +57,16 @@ View::show_header('Donate');
       Please see <a href="https://www.patreon.com/biotorrents" target="_blank"><?= SITE_NAME ?>'s Patreon</a> for a detailed overview of funding
       goals.
       There are some benefits to donating that culmulate at each tier pledged.
-      Each tier's awards include those already listed.
+      Each tier's awards include those already listed, and the tier system only applies to recurring donations.
       Bitcoin donations are privately negotiable.
 
       <ul>
-        <li><strong>Bronze:</strong> A donor badge and forum access for your user account on the BioTorrents.de website
+        <li><strong>Bronze.</strong> A donor badge and forum access for your user account on the BioTorrents.de website
         </li>
-        <li><strong>Silver:</strong> Unlimited API calls to the BioTorrents.de database</li>
-        <li><strong>Gold:</strong> Monthly Skype calls to discuss wetlab and software ideas.
-          My expertise includes fungal biotechnology, nonprofit administration, and LEMP development</li>
-        <li><strong>Sponsor a Seedbox:</strong> Shell access to, and share ratio credit from, a seedbox that I manage on
+        <li><strong>Silver.</strong> Unlimited API calls to the BioTorrents.de database</li>
+        <li><strong>Gold.</strong> Monthly Skype calls to discuss wetlab and software ideas.
+          My expertise includes fungal biotechnology, nonprofit administration, and LEMP+ development</li>
+        <li><strong>Sponsor a Seedbox.</strong> Shell access to, and share ratio credit from, a seedbox that I manage on
           your behalf.
           Please understand that network services beyond the scope of seedbox administration should be negotiated
           separately</li>

sections/torrents/browse.php

@@ -266,7 +266,7 @@ View::show_header('Browse Torrents', 'browse');
 
               <select id=" container" name="container" class="ft_container fti_advanced">
                 <option value="">Prot Format</option>
-                <?php  foreach ($Containers as $Key => $Container) { ?>
+                <?php  foreach ($ContainersProt as $Key => $Container) { ?>
                 <option value="<?=display_str($Key);?>" <?Format::selected('container', $Key)?>><?=display_str($Key);?>
                 </option>
                 <?php  } ?>

sections/torrents/takeedit.php

@@ -336,9 +336,9 @@ if ($T['Archive'] === 'Autofill') {
 
 print_r('<pre>');
 var_dump($T['FileList']);
-var_dump($T['CategoryName'],);
-var_dump($T['FileTypes'],);
-var_dump($T['ArchiveTypes'],);
+var_dump($T['CategoryName'], );
+var_dump($T['FileTypes'], );
+var_dump($T['ArchiveTypes'], );
 
 //******************************************************************************//
 //--------------- Start database stuff -----------------------------------------//

static/styles/oppai/style.css

@@ -254,7 +254,7 @@ ul.thin li { margin:0px 0px; padding:0px; }
   padding: 4px 0px;
   width: 100%;
   text-align: center;
-  font-size: 8pt;
+  /* font-size: 8pt; */
 }
 
 #userinfo img {