More stylesheets and words, blah blah blah

classes/rules.class.php

@@ -27,19 +27,19 @@ class Rules {
   public static function display_site_tag_rules($OnUpload = false) {
     ?>
     <ul>
-      <li><strong>Please use the "<strong class="important_text_alt">vanity.house</strong>" tag for sequences that you or your lab produced.</strong> This helps us promote the DIYbio community's original contributions.</li>
+      <li><strong>Please use the <strong class="important_text_alt">vanity.house</strong> tag for sequences that you or your lab produced.</strong> This helps us promote the DIYbio community's original contributions.</li>
 
-      <li>Tags should be comma-separated, and you should use a period (".") to separate words inside a tag &mdash; e.g., "<strong class="important_text_alt">gram.negative</strong>".</li>
+      <li>Tags should be comma-separated, and you should use a period to separate words inside a tag, e.g., <strong class="important_text_alt">gram.negative</strong>.</li>
 
-      <li>There is a list of official tags <?=($OnUpload ? 'to the left of the text box' : 'on <a href="upload.php">the torrent upload page</a>')?>. Please use these tags instead of "unofficial" tags (e.g., use the official "<strong class="important_text_alt">fungi</strong>" tag, instead of an unofficial "<strong class="important_text">mushrooms</strong>" tag).</strong></li>
+      <li>There is a list of official tags <?=($OnUpload ? 'to the left of the text box' : 'on <a href="upload.php">the torrent upload page</a>')?>. Please use these tags instead of "unofficial" tags, e.g., use the official <strong class="important_text_alt">fungi</strong> tag instead of an unofficial <strong class="important_text">mushrooms</strong> tag.</li>
 
-      <li>Avoid using multiple synonymous tags. Using both "<strong class="important_text">cyanobacteria</strong>" and "<strong class="important_text_alt">bacteria</strong>" is redundant and stupid &mdash; just use the official "<strong class="important_text_alt">bacteria</strong>" tag.</li>
+      <li>Avoid using multiple synonymous tags. Using both <strong class="important_text">cyanobacteria</strong> and <strong class="important_text_alt">bacteria</strong> is redundant and stupid &mdash; just use the official <strong class="important_text_alt">bacteria</strong>.</li>
 
-      <li>Do not add useless tags that are already covered by other metadata. If a torrent is in the DNA category, it should not be tagged <strong class="important_text">dna</strong>.</li>
+      <li>Don't add useless tags that are already covered by other metadata. If a torrent is in the DNA category, please don't tag it <strong class="important_text">dna</strong>.</li>
 
-      <li>Only tag information related to the group itself &mdash; <strong>not the individual release</strong>. Tags such as "<strong class="important_text">apollo.100</strong>", "<strong class="important_text">hiseq.2500</strong>", etc., are strictly forbidden. Remember that these tags will be used for other releases in the same group.</li>
+      <li>Only tag information related to the group itself &mdash; <strong>not the individual release</strong>. Tags such as <strong class="important_text">apollo.100</strong>, <strong class="important_text">hiseq.2500</strong>, etc., are strictly forbidden. Remember that these tags will be used for other releases in the same group.</li>
 
-      <li><strong>Certain tags are strongly encouraged for appropriate uploads:</strong> "<strong class="important_text_alt">archaea</strong>", "<strong class="important_text_alt">bacteria</strong>", "<strong class="important_text_alt">fungi</strong>", "<strong class="important_text_alt">animals</strong>", "<strong class="important_text_alt">plants</strong>", "<strong class="important_text_alt">plasmids</strong>". People search for these kinds of things specifically, so tagging them properly will get you more snatches.</li>
+      <li><strong>Certain tags are strongly encouraged for appropriate uploads:</strong> <strong class="important_text_alt">archaea</strong>, <strong class="important_text_alt">bacteria</strong>, <strong class="important_text_alt">fungi</strong>, <strong class="important_text_alt">animals</strong>, <strong class="important_text_alt">plants</strong>, <strong class="important_text_alt">plasmids</strong>. People search for these kinds of things specifically, so tagging them properly will get you more snatches.</li>
 
       <!--
       <li><strong>Certain tags are <strong class="important_text">required</strong> for appropriate uploads:</strong>"<strong class="important_text_alt">lolicon</strong>", "<strong class="important_text_alt">shotacon</strong>", "<strong class="important_text_alt">toddlercon</strong>". Failure to use these tags may result in punishment.</li>
@@ -56,9 +56,9 @@ class Rules {
       </li>
       -->
 
-      <li><strong>All uploads require a minimum of 5 tags.</strong> Do not add unrelated tags just to meet the 5 tag requirement. If you can't think of 5 tags for your content, study it again until you can.</li>
+      <li><strong>All uploads require a minimum of 5 tags.</strong> Please don't add unrelated tags just to meet the 5 tag requirement. If you can't think of 5 tags for your content, study it again until you can.</li>
 
-      <li><strong>You should be able to build up a list of tags using only the official tags <?=($OnUpload ? 'to the left of the text box' : 'on <a href="upload.php">the torrent upload page</a>')?>.</strong> If you are in any doubt about whether or not a tag is acceptable, do not add it.</li>
+      <li><strong>You should be able to build up a list of tags using only the official tags <?=($OnUpload ? 'to the left of the text box' : 'on <a href="upload.php">the torrent upload page</a>')?>.</strong> If you doubt whether or not a tag is acceptable, please omit it for now and send a staff PM to request a new official tag or an approved alias.</li>
     </ul>
 <?
   }
@@ -69,22 +69,17 @@ class Rules {
    */
   public static function display_forum_rules() {
     ?>
-    <ol>
-      <li>Many forums have their own set of rules. Make sure you read and take note of these rules before you attempt to post in one of these forums.</li>
-      <li>No commercial advertising or referral schemes. This includes any scheme in which the poster gets personal gain from users clicking a link. You will be immediately banned for this, no questions asked.</li>
-      <li>No asking for money for any reason whatsoever. We don't know or care about your friend who lost everything, or dying relative who wants to enjoy their last few moments alive by being given lots of money.</li>
-      <li>Do not inappropriately advertise your uploads. In special cases, it is acceptable to mention new uploads in an approved thread, but be sure to carefully read the thread's rules before posting. It is also acceptable to discuss releases you have uploaded when conversing about the title itself. Blatant attempts to advertise your uploads outside of the appropriate forums or threads may result in a warning or loss of privileges.</li>
-      <li>No posting requests in forums. There's a requests link at the top of the page for a reason.</li>
-      <li>Be sure you read all the sticky threads in a forum before you post.</li>
+        <ul>
+      <li>Let's treat the biology boards like how the Shroomery used to be: each thread a set of resourceful diverse wisdom worth using permalinks to. It's okay if the boards are slow, that's why there are only a few of them.</li>
+      <li>Please discuss site news in the corresponding Announcements thread instead of making a new General thread. Discussing science-related news in General is highly encouraged, but discussing political news is much less so. Thank you.</li>
+      <li>No advertising, referrals, affiliate links, cryptocurrency pumps, or calls to action that involve using a financial instrument. You're banned on the spot. The exceptions: cryptocurrencies that derive their value from work performed on distributed science computation networks, e.g., Curecoin, FoldingCoin, and Gridcoin.</li>
+      <li>Feel free to post announcements for your own projects, even and especially if they're commercial ones, in the General board. Limit all discussion of trading biomaterials, including bulk giveaways, to the Marketplace forum available to Power Users.</li>
+      <li>Please be modest when talking about your uploads. It's unnecessary to announce your uploads because Gazelle logs everything (at least one this is encrypted). If someone asks for help on his project and your upload fits the bill, go write a post!</li>
       <li>Use descriptive and specific subject lines. This helps others decide whether your particular words of "wisdom" relate to a topic they care about.</li>
-      <li>Don't post comments that don't add anything to the discussion. This generally includes any post without its own substance, such as "I agree" or "haha". These kinds of posts are annoying to people who are trying to actually find some information in a thread.</li>
-      <li>Refrain from quoting excessively. When quoting someone, use only the portion of the quote that is absolutely necessary.</li>
-      <li>Do not post any potentially malicious links without sufficient warning.</li>
-      <li>Don't waste other people's bandwidth by posting images with a large file size.</li>
-      <li>Only offer or request invites to other trackers in designated forums. If you can't find the invite forum, it's because you don't have access to it and should not post about it.</li>
-      <li>No language other than English (and Japanese, when relevant) is permitted in the forums.</li>
-      <li>Some things that <em>are</em> allowed include mature and graphic content, political and religious discussions, and insults. You are welcome to express whatever inflammatory opinions you want as long as you don't go overboard with it.</li>
-    </ol>
+      <li>Don't post comments that don't add anything to the discussion, such as "I agree" or "haha." Bottle the trained dopamine response to social media because comment reactions are an unlikely feature.</li>
+      <li>Please refrain from quoting excessively. When quoting someone, use only the necessary parts of the quote. Avoid quoting more than 3 levels deep.</li>
+      <li>Don't post potentially malicious links without sufficient warning, or post pictures > 2 MiB. Please only speak English as stated in the Upload rules.</li>
+    </ul>
 <?
   }
 
@@ -94,22 +89,13 @@ class Rules {
    */
   public static function display_irc_chat_rules() {
     ?>
-    <ol>
-      <li>Staff have the final decision. If a staff member says stop and you continue, expect repercussions.</li>
-      <li>Do not leave Caps Lock enabled all the time. It gets annoying, and you will likely get yourself kicked.</li>
-      <li>No opinions, especially related to race, religion, politics, etc are allowed. Failure to comply with a request to cease having an opinion WILL be considered a thoughtcrime and you WILL be reeducated.</li>
-      <li>Flooding is irritating and will warrant you a kick if it isn't funny enough or if an admin is cranky. This includes, but is not limited to, automatic "now playing" scripts, pasting large amounts of irrelevant text, and multiple consecutive lines with no relevance to the conversation at hand.</li>
-      <li>Impersonation of other members &mdash; particularly staff members &mdash; will not go unpunished. If you are uncertain of a user's identity, check their vhost</li>
-      <li>Spamming is <b>strictly</b> forbidden unless it's funny. This includes, but is not limited to, personal sites, online auctions, and cans of blended meat.</li>
-      <li>Obsessive annoyance &mdash; both to other users and staff &mdash; will not be tolerated.</li>
-      <li>Do not PM, DCC, or Query anyone you don't know or have never talked to without asking first; this applies specifically to staff.</li>
-      <li>No language other than English is permitted in the official IRC channels.</li>
-      <li>Bots are not permitted in official channels with the exception of <strong>#BioTorrents.de-announce</strong> and <strong>#BioTorrents.de-requests</strong>.</li>
-      <li>Any bots you have on IRC should authenticate with Udon using your own username and IRC key</li>
-      <li>Bots must identify themselves by setting the +B usermode on themselves.</li>
-      <li>Unofficial channels are <em>not</em> policed by staff. Any content or discussion that goes on in unofficial channels shoud be treated as part of an unrelated public irc network.</li>
-      <li><strong>Read the channel topic before asking questions.</strong></li>
-    </ol>
+      <li>BioTorrents.de's Slack channels are just are another quiet hangout you can stack your app with so you look cool at conferences.</li>
+      <li>Please use <code>#general</code> for the usual chit-chat, <code>#development</code> for questions about the Gazelle software, and <code>#disabled</code> to get help recovering your account.</li>
+      <li>Don't send mass alerts with <code>@channel</code>, <code>@everyone</code>, or <code>@here</code>. It's obnoxious and you should handle anything genuinely important on the boards.</li>
+      <li>Flooding is irritating and you'll get kicked for it. This includes "now playing" scripts, large amounts of irrelevant text such as lorem ipsum, and unfunny non sequiturs.</li>
+      <li>Impersonating other members &mdash; particularly staff members &mdash; will not go unpunished. Please remember that the Slack channels are publicly accessible.</li>
+      <li>Please use the threaded conversation in Slack and avoid replying to threads with new messages or crossposting replies to the main channel.</li>
+      <li>Announce and bot channels are in development, as standard IRC instead of Slack for obvious reasons. Any IRC bots you have must authenticate with your own username and IRC key, and set the <code>+B</code> usermode on themselves.</li>
 <?
   }
 }

design/publicfooter.php

@@ -3,6 +3,6 @@
   </table>
 </div>
 <div id="foot">
-  <span><a href="#"><?=SITE_NAME?></a> | <a href="https://git.oppaiti.me/Oppaitime/Gazelle">Project Gazelle</a></span></div>
+  <span><a href="/"><?=SITE_NAME?></a> | <a href="https://git.oppaiti.me/Oppaitime/Gazelle">Project Gazelle</a></span></div>
 </body>
 </html>

design/publicheader.php

@@ -1,6 +1,6 @@
-<?
+<?php
 global $LoggedUser;
-define('FOOTER_FILE',SERVER_ROOT.'/design/publicfooter.php');
+define('FOOTER_FILE', SERVER_ROOT.'/design/publicfooter.php');
 ?>
 <!DOCTYPE html>
 <html>
@@ -12,32 +12,35 @@ define('FOOTER_FILE',SERVER_ROOT.'/design/publicfooter.php');
   <link rel="shortcut icon" href="static/common/icon.png?v=<?=md5_file('static/common/icon.png');?>">
   <link rel="manifest" href="/manifest.php">
   <link href="<?=STATIC_SERVER ?>styles/public/style.css?v=<?=filemtime(SERVER_ROOT.'/static/styles/public/style.css')?>" rel="stylesheet" type="text/css">
-<?
+<?php
   $Scripts = ['jquery', 'global', 'ajax.class', 'cookie.class', 'storage.class', 'public', 'u2f'];
-  foreach($Scripts as $Script) {
-    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);
-    }
-?>
+  foreach ($Scripts as $Script) {
+      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]"?>"></script>
-<?
+<?php
   }
   $img = array_diff(scandir(SERVER_ROOT.'/misc/bg', 1), array('.', '..')); ?>
-  <meta name="bg_data" content="<?=$img[rand(0,count($img)-1)]?>">
+  <meta name="bg_data" content="<?=$img[rand(0, count($img)-1)]?>">
 </head>
 <body>
 <div id="head"><span>
 <a href="login.php">Log in</a>
-<? if (OPEN_REGISTRATION) { ?>
+<?php if (OPEN_REGISTRATION) { ?>
  | <a href="register.php">Register</a>
-<? } ?>
+<?php } ?>
 </span></div>
 <div id="content">
+
+    <!-- todo: Put index page stats here -->
+    <?php #include('/sections/login/stats.php'); ?>
+
   <table class="layout" id="maincontent">
     <tr>
       <td class="centered">
-        <a href="index.php"><div id="logo"></div></a>
-<?
+        <a href="/"><div id="logo"></div></a>
+<?php

sections/login/login.php

@@ -2,7 +2,7 @@
 View::show_header('Login');
 ?>
 
-<span id="no-cookies" class="hidden warning">You appear to have cookies disabled.<br /><br /></span>
+<p id="no-cookies" class="hidden warning">You appear to have cookies disabled.</p>
 
 <?php
 if (!$Banned) {
@@ -14,23 +14,21 @@ if (!$Banned) {
   if (isset($Err)) {
       ?>
 
-  <span class="warning"><?=$Err?><br /><br /></span>
+  <p class="warning"><?=$Err?></p>
 
   <?php
   } ?>
 
   <?php if ($Attempts > 0) { ?>
 
-  You have <span class="info"><?=(6 - $Attempts)?></span> attempts
-  remaining.<br /><br />
-  <strong>WARNING:</strong> You will be banned for 6 hours after your login attempts run out!<br /><br />
+  <div class="notice">
+    <p>You have <span class="info"><?=(6 - $Attempts)?></span> attempts remaining.</p>
+    <p><strong>You'll be banned for 6 hours after your login attempts run out!</strong></p>
+  </div>
 
   <?php } ?>
 
-  <table class="layout">
-
-    <!-- todo: Put index page stats here -->
-
+  <table class="layout" width="250px">
     <tr>
       <td colspan="2">
         <input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" name="username"
@@ -61,16 +59,14 @@ if (!$Banned) {
 <?php
 } else {
       ?>
-<span class="warning">You are banned from logging in for a few hours.</span>
+<p class="warning">You are banned from logging in for a few hours.</p>
 <?php
   }
 
 if ($Attempts > 0) {
     ?>
 
-<br /><br />
-Forgot your password? <a href="login.php?act=recover" class="tooltip" title="Recover your password"
-  style="text-decoration: underline;">Reset it here!</a>
+<p>Forgot your password? <a href="login.php?act=recover" class="tooltip" title="Recover your password">Reset it here!</a></p>
 
 <?php
 }

sections/login/recover_step1.php

@@ -1,33 +1,39 @@
-<?
-View::show_header('Recover Password','validate');
+<?php
+View::show_header('Recover Password', 'validate');
 echo $Validate->GenerateJS('recoverform');
 ?>
 <form class="auth_form" name="recovery" id="recoverform" method="post" action="" onsubmit="return formVal();">
-  <div style="width: 320px;">
-    <span class="titletext">Reset your password - Step 1</span><br /><br />
-<?
+  <div style="width: 250px;">
+    <p class="titletext"><strong>Reset Your Password</strong></p>
+<?php
 if (empty($Sent) || (!empty($Sent) && $Sent != 1)) {
-  if (!empty($Err)) {
-?>
-    <strong class="important_text"><?=$Err ?></strong><br /><br />
-<?  } ?>
-    An email will be sent to your email address with information on how to reset your password.<br /><br />
+    if (!empty($Err)) {
+        ?>
+    <strong class="important_text"><?=$Err ?></strong>
+<?php
+    } ?>
+    <p>An email will be sent to your email address with information on how to reset your password.</p>
     <table class="layout" cellpadding="2" cellspacing="1" border="0" align="center">
-      <tr valign="top">
-        <td align="right">Email address:&nbsp;</td>
-        <td align="left"><input type="email" name="email" id="email" class="inputtext" /></td>
+      <tr valign="center">
+        <!-- <td align="right"><strong>Email Address&nbsp;</strong></td> -->
+        <td align="left">
+        <input type="email" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" name="email"
+          id="email" class="inputtext" required="required" maxlength="50"
+          autofocus="autofocus" placeholder="Email" size="40"
+          autocomplete="email" />
+      </td>
       </tr>
       <tr>
         <td colspan="2" align="right"><input type="submit" name="reset" value="Reset!" class="submit" /></td>
       </tr>
     </table>
-<?
+<?php
 } else { ?>
-  An email has been sent to you; please follow the directions in that email to reset your password.
-<?
+  <p>An email has been sent to you. Please follow the directions to reset your password.</p>
+<?php
 } ?>
   </div>
 </form>
-<?
+<?php
 View::show_footer(['recover' => true]);
 ?>

sections/login/stats.php

@@ -0,0 +1,162 @@
+<!-- Stats -->
+<div class="box">
+      <div class="head colhead_dark"><strong>Stats</strong></div>
+      <ul class="stats nobullet">
+<?php if (USER_LIMIT > 0) { ?>
+        <li>Maximum users: <?=number_format(USER_LIMIT) ?></li>
+<?php
+}
+
+if (($UserCount = $Cache->get_value('stats_user_count')) === false) {
+    $DB->query("
+    SELECT COUNT(ID)
+    FROM users_main
+    WHERE Enabled = '1'");
+    list($UserCount) = $DB->next_record();
+    $Cache->cache_value('stats_user_count', $UserCount, 86400);
+}
+$UserCount = (int)$UserCount;
+?>
+        <li>Enabled users: <?=number_format($UserCount)?> <a href="stats.php?action=users" class="brackets">Details</a></li>
+<?php
+
+if (($UserStats = $Cache->get_value('stats_users')) === false) {
+    $DB->query("
+    SELECT COUNT(ID)
+    FROM users_main
+    WHERE Enabled = '1'
+      AND LastAccess > '".time_minus(3600 * 24)."'");
+    list($UserStats['Day']) = $DB->next_record();
+
+    $DB->query("
+    SELECT COUNT(ID)
+    FROM users_main
+    WHERE Enabled = '1'
+      AND LastAccess > '".time_minus(3600 * 24 * 7)."'");
+    list($UserStats['Week']) = $DB->next_record();
+
+    $DB->query("
+    SELECT COUNT(ID)
+    FROM users_main
+    WHERE Enabled = '1'
+      AND LastAccess > '".time_minus(3600 * 24 * 30)."'");
+    list($UserStats['Month']) = $DB->next_record();
+
+    $Cache->cache_value('stats_users', $UserStats, 0);
+}
+?>
+        <li>Users active today: <?=number_format($UserStats['Day'])?> (<?=number_format($UserStats['Day'] / $UserCount * 100, 2)?>%)</li>
+        <li>Users active this week: <?=number_format($UserStats['Week'])?> (<?=number_format($UserStats['Week'] / $UserCount * 100, 2)?>%)</li>
+        <li>Users active this month: <?=number_format($UserStats['Month'])?> (<?=number_format($UserStats['Month'] / $UserCount * 100, 2)?>%)</li>
+<?php
+
+if (($TorrentCount = $Cache->get_value('stats_torrent_count')) === false) {
+    $DB->query("
+    SELECT COUNT(ID)
+    FROM torrents");
+    list($TorrentCount) = $DB->next_record();
+    $Cache->cache_value('stats_torrent_count', $TorrentCount, 86400); // 1 day cache
+}
+
+if (($GroupCount = $Cache->get_value('stats_group_count')) === false) {
+    $DB->query("
+    SELECT COUNT(ID)
+    FROM torrents_group");
+    list($GroupCount) = $DB->next_record();
+    $Cache->cache_value('stats_group_count', $GroupCount, 86400); // 1 day cache
+}
+
+if (($TorrentSizeTotal = $Cache->get_value('stats_torrent_size_total')) === false) {
+    $DB->query("
+    SELECT SUM(Size)
+    FROM torrents");
+    list($TorrentSizeTotal) = $DB->next_record();
+    $Cache->cache_value('stats_torrent_size_total', $TorrentSizeTotal, 86400); // 1 day cache
+}
+?>
+        <li>Total Size of Torrents: <?=Format::get_size($TorrentSizeTotal)?> </li>
+<?php
+
+if (($ArtistCount = $Cache->get_value('stats_artist_count')) === false) {
+    $DB->query("
+    SELECT COUNT(ArtistID)
+    FROM artists_group");
+    list($ArtistCount) = $DB->next_record();
+    $Cache->cache_value('stats_artist_count', $ArtistCount, 86400); // 1 day cache
+}
+
+?>
+        <li>Torrents: <?=number_format($TorrentCount)?></li>
+        <li>Torrent Groups: <?=number_format($GroupCount)?></li>
+        <li>Artists: <?=number_format($ArtistCount)?></li>
+<?php
+// End Torrent Stats
+
+if (($RequestStats = $Cache->get_value('stats_requests')) === false) {
+    $DB->query("
+    SELECT COUNT(ID)
+    FROM requests");
+    list($RequestCount) = $DB->next_record();
+    $DB->query("
+    SELECT COUNT(ID)
+    FROM requests
+    WHERE FillerID > 0");
+    list($FilledCount) = $DB->next_record();
+    $Cache->cache_value('stats_requests', array($RequestCount, $FilledCount), 11280);
+} else {
+    list($RequestCount, $FilledCount) = $RequestStats;
+}
+
+// Do not divide by zero
+if ($RequestCount > 0) {
+    $RequestsFilledPercent = $FilledCount / $RequestCount * 100;
+} else {
+    $RequestsFilledPercent = 0;
+}
+
+?>
+        <li>Requests: <?=number_format($RequestCount)?> (<?=number_format($RequestsFilledPercent, 2)?>% filled)</li>
+<?php
+
+if ($SnatchStats = $Cache->get_value('stats_snatches')) {
+    ?>
+        <li>Snatches: <?=number_format($SnatchStats)?></li>
+<?php
+}
+
+if (($PeerStats = $Cache->get_value('stats_peers')) === false) {
+    // Cache lock!
+    $PeerStatsLocked = $Cache->get_value('stats_peers_lock');
+    if (!$PeerStatsLocked) {
+        $Cache->cache_value('stats_peers_lock', 1, 30);
+        $DB->query("
+      SELECT IF(remaining=0,'Seeding','Leeching') AS Type, COUNT(uid)
+      FROM xbt_files_users
+      WHERE active = 1
+      GROUP BY Type");
+        $PeerCount = $DB->to_array(0, MYSQLI_NUM, false);
+        $SeederCount = $PeerCount['Seeding'][1] ?: 0;
+        $LeecherCount = $PeerCount['Leeching'][1] ?: 0;
+        $Cache->cache_value('stats_peers', array($LeecherCount, $SeederCount), 604800); // 1 week cache
+        $Cache->delete_value('stats_peers_lock');
+    }
+} else {
+    $PeerStatsLocked = false;
+    list($LeecherCount, $SeederCount) = $PeerStats;
+}
+
+if (!$PeerStatsLocked) {
+    $Ratio = Format::get_ratio_html($SeederCount, $LeecherCount);
+    $PeerCount = number_format($SeederCount + $LeecherCount);
+    $SeederCount = number_format($SeederCount);
+    $LeecherCount = number_format($LeecherCount);
+} else {
+    $PeerCount = $SeederCount = $LeecherCount = $Ratio = 'Server busy';
+}
+?>
+        <li>Peers: <?=$PeerCount?></li>
+        <li>Seeders: <?=$SeederCount?></li>
+        <li>Leechers: <?=$LeecherCount?></li>
+        <li>Seeder/leecher ratio: <?=$Ratio?></li>
+      </ul>
+    </div>

sections/rules/collages.php

@@ -9,34 +9,28 @@ View::show_header('Collection Rules');
   <div class="box pad rule_summary" style="padding: 10px 10px 10px 20px;">
     <ul>
       <li>
-      Collection vandalism is taken very seriously, resulting in collection editing privileges being removed (at a minimum).
+      Collection vandalism is taken very seriously, resulting in loss of collection editing privileges at a minimum.
       </li>
       <li>
-      A well-defined group of people, for instance Counter Culture Labs members, may create a Group Picks Theme collection with one pick per person, after having gained permission for the collection from Staff.
+      A well-defined group of people, for instance Counter Culture Labs members, may create a Group Picks collection with one pick per person, after having gained permission for the collection from staff. Please avoid making Group Picks without an affirmative staff PM reply to your request.
       </li>
       <li>
-      There may only be one collection per Theme. Dupe collections will be deleted. The collection that is allowed to stay will be determined at staff discretion, with priority given to the most well maintained and oldest collection.
+      There may only be one collection per Theme. Duplicate collections will be deleted. The collection allowed to stay is the best maintained and oldest collection. In a word, the most established one.
       </li>
       <li>
-      Theme collections must be sensible, and reasonably broad. Those that do not fit this description will be deleted.
+      Theme collections must be sensible and reasonably broad. Those that don't fit this description will be deleted. Note the conceptual space this rule allows.
       </li>
       <li>
-      Collections are <strong>not</strong> an alternative to the tagging system. A collection such as "fungi torrents" wouldn't be allowed, because it is far more appropriate to just tag the torrents as fungi. Of course, a "fungi rRNA barcodes" collection would be looked upon differently.
+      Collections are <strong>not</strong> an alternative to the tagging system. A collection such as Fungi Torrents wouldn't be allowed because we have the <strong class="important_text_alt">fungi</strong> tag. Naturally a Fungi rRNA Barcodes collection is different.
       </li>
       <li>
-      Collections should not be used to create lists of an artist's works, as the artist pages already exist for this purpose.
+      Every collection must have at least 3 torrent groups in it except for Personal ones.
       </li>
       <li>
-      Every collection must have at least 3 torrent groups in it, except for collections of type "Personal" and "Staff Picks."
+      Please check to see that a similar collection doesn't already exist. If one does, please contribute to that.
       </li>
       <li>
-      Check to see that a similar collection does not already exist. If a similar collection does exist, please contribute to the existing collection.
-      </li>
-      <li>
-      Give your collection an appropriate title and a decent description explaining its purpose.
-      </li>
-      <li>
-      Attempt to add a cover image to every torrent in your collection.
+      If you must make a new collection, please give it an appropriate title and a decent description explaining its purpose, and attempt to add a cover image to every torrent in it.
       </li>
     </ul>
   </div>

sections/rules/ratio.php

@@ -8,7 +8,7 @@ View::show_header('Ratio Requirements');
   </div>
   <div class="box pad rule_summary">
     <br />
-    <strong>Ratio System Overview:</strong>
+    <strong>Ratio System Overview</strong>
     <br />
     <ul>
       <li>Your <strong>ratio</strong> is calculated by dividing the amount of data you&apos;ve uploaded by the amount of data you&apos;ve downloaded. You can view your ratio in the site header or in the &quot;stats&quot; section of your user profile.
@@ -21,7 +21,7 @@ View::show_header('Ratio Requirements');
     </ul>
     <br />
     <br />
-    <strong>Required Ratio Overview:</strong>
+    <strong>Required Ratio Overview</strong>
     <br />
     <ul>
       <li>Your required ratio represents the minimum ratio you must maintain to avoid ratio watch. You can view your required ratio in the site header after the word &quot;required&quot; or in the &quot;stats&quot; section of your user profile.
@@ -102,7 +102,7 @@ $GB = 1024*1024*1024;
     </div>
     <br />
     <br />
-    <strong>Required Ratio Calculation:</strong>
+    <strong>Required Ratio Calculation</strong>
     <br />
     <ul>
       <li>
@@ -137,7 +137,7 @@ $GB = 1024*1024*1024;
     </ul>
     <br />
     <br />
-    <strong>Required Ratio Details:</strong>
+    <strong>Required Ratio Details</strong>
     <br />
     <ul>
       <li>If you stop seeding for one week, your required ratio will become the maximum required ratio (0% seeded) for your amount downloaded bracket. Once you have resumed seeding for a 72 hour
@@ -152,7 +152,7 @@ $GB = 1024*1024*1024;
     </ul>
     <br>
     <br>
-    <strong>Required Ratio Example:</strong>
+    <strong>Required Ratio Example</strong>
     <br>
     <ul>
       <li>In this example, Alice has downloaded 65 GB. Alice falls into the 60&ndash;80 GiB amount downloaded bracket in the table above. Alice's maximum required ratio (0% seeded) is 0.40, and her minimum required ratio (100% seeded) is 0.10.
@@ -167,7 +167,7 @@ $GB = 1024*1024*1024;
     </ul>
     <br />
     <br />
-    <strong>Ratio Watch Overview:</strong>
+    <strong>Ratio Watch Overview</strong>
     <br />
     <ul>
       <li>Everyone gets to download their first 10 GiB before ratio watch eligibility begins.</li>
@@ -180,7 +180,7 @@ $GB = 1024*1024*1024;
     </ul>
     <br />
     <br />
-    <strong>Leaving Ratio Watch:</strong>
+    <strong>Leaving Ratio Watch</strong>
     <br />
     <ul>
       <li>To leave ratio watch, you must either raise your ratio by uploading more, or lower your required ratio by seeding more. Your ratio must be equal to or above your required ratio in

sections/rules/requests.php

@@ -15,10 +15,10 @@ View::show_header('Request Rules');
         <strong>Do not make requests for torrents that break the rules.</strong> It is your responsibility that the request follows the rules. Your request will be deleted, and you will not get your bounty back. Requests cannot be more specific than the upload (and trumping) rules.
       </li>
       <li>
-        <strong>Put format specifics in the request description.</strong> If you're requesting a particular format, assembly level, etc., put that information in the request description. Do not put it in the title of the request.
+        <strong>Put format specifics in the request description.</strong> If you're requesting a particular platform, file format, etc., put that information in the request description. Do not put it in the title of the request.
       </li>
       <li>
-        <strong>Only one sequence per request.</strong> No requests for multiple sequences or vague requirements. You may ask for any of several formats, but you cannot demand all of them. For example, you may ask for either a FASTA or GenBank, but not both formats.
+        <strong>Only one torrent per request.</strong> No requests for multiple data or vague requirements. You may ask for any of several formats, but you cannot demand all of them. For example, you may ask for either a FASTA or a GenBank, but not both formats.
       </li>
       <li>
         <strong>When uploading to fill a request, use the [Upload request] link on the request's page.</strong> This will autofill some of the metadata for the torrent, such as title and artist. This prevents some errors that may cause your upload to break the rules, have your request unfilled, have your bounty removed, and possibly cause you to receive a warning.

static/styles/public/style.css

@@ -37,6 +37,10 @@ a:hover {
   text-decoration: underline;
 }
 
+p {
+  margin: 1em 0;
+}
+
 input[type="text"], input[type="password"], input[type="email"] {
   color: black;
   background-color: white;
@@ -76,7 +80,7 @@ input[type="text"]:invalid, input[type="password"]:invalid {
 }
 
 #recoverform .layout td:first-child {
-  width: 140px;
+  width: 100%;
   text-align: right;
   padding-right: 5px;
 }
@@ -100,7 +104,7 @@ input[type="text"]:invalid, input[type="password"]:invalid {
 
 #foot > span, #head > span {
   line-height: 30px;
-  margin: 10px;
+  margin: 1em;
 }
 
 #foot > span, #head > span {
@@ -123,7 +127,7 @@ input[type="text"]:invalid, input[type="password"]:invalid {
   background-size: contain;
   display: flex;
   align-items: center;
-  padding: 0 10%;
+  padding: 0 25%;
 }
 
 #maincontent {
@@ -138,11 +142,11 @@ input[type="text"]:invalid, input[type="password"]:invalid {
   background-repeat: no-repeat;
   background-position: center;
   background-size: contain;
-  margin: 0 0 0 auto;
+  margin: 1em 0;
 }
 
 .centered {
-  text-align: center;
+  /* text-align: center; */
   vertical-align: middle;
 }
 
@@ -159,3 +163,7 @@ input[type="text"]:invalid, input[type="password"]:invalid {
   color: red;
   font-weight: bold;
 }
+
+.notice {
+  width: 250px;
+}