Miscellaneous changes to bring public repo in line with private

This consists mostly of commits I somehow skipped over and didn't patch
into the public repo

classes/config.template

@@ -1,6 +1,6 @@
 <?php
 if (version_compare(PHP_VERSION, '7.0.0', '<')) {
-  die("Gazelle requires PHP 7.0 or later to function properly");
+  die("Gazelle requires PHP 7.0.0 or later to function properly");
 }
 //date_default_timezone_set('EST');
 
@@ -79,8 +79,8 @@ define('DONOR_INVITES',     2);
 define('FEATURE_EMAIL_REENABLE',     true);
 define('FEATURE_SEND_EMAIL',         true);  //Attempt to send email from the site
 define('FEATURE_IRC',                true);  //Attempt to send messages to IRC
-define('FEATURE_ENFORCE_LOCATIONS',  true);  //Require users to verify login from unknown devices
-define('FEATURE_SET_ENC_KEY_PUBLIC', false); //Allow the site encryption key to be set without an account
+define('FEATURE_ENFORCE_LOCATIONS',  true);  //Require users to verify login from unknown locations
+define('FEATURE_SET_ENC_KEY_PUBLIC', false); //Allow the site encryption key to be set without an account (Should only be used for initial setup)
 
 // User class IDs needed for automatic promotions. Found in the 'permissions' table
 // Name of class  Class ID (NOT level)

classes/mysql.class.php

@@ -222,17 +222,32 @@ class DB_MYSQL {
     }
     $QueryStartTime = microtime(true);
     $this->connect();
-    // In the event of a MySQL deadlock, we sleep allowing MySQL time to unlock, then attempt again for a maximum of 5 tries
-    for ($i = 1; $i < 6; $i++) {
+
+    if (DEBUG_MODE) {
       $this->QueryID = mysqli_query($this->LinkID, $Query);
-      if (!in_array(mysqli_errno($this->LinkID), array(1213, 1205))) {
-        break;
+
+      // in DEBUG_MODE, return the full trace on a SQL error (super useful for debugging).
+      // do not attempt to retry to query
+      if (!$this->QueryID) {
+        echo '<pre>' . mysqli_error($this->LinkID) . '<br><br>';
+        debug_print_backtrace();
+        echo '</pre>';
+        die();
       }
-      $Debug->analysis('Non-Fatal Deadlock:', $Query, 3600 * 24);
-      trigger_error("Database deadlock, attempt $i");
+    } else {
+      // In the event of a MySQL deadlock, we sleep allowing MySQL time to unlock, then attempt again for a maximum of 5 tries
+      for ($i = 1; $i < 6; $i++) {
+        $this->QueryID = mysqli_query($this->LinkID, $Query);
+        if (!in_array(mysqli_errno($this->LinkID), array(1213, 1205))) {
+          break;
+        }
+        $Debug->analysis('Non-Fatal Deadlock:', $Query, 3600 * 24);
+        trigger_error("Database deadlock, attempt $i");
 
-      sleep($i * rand(2, 5)); // Wait longer as attempts increase
+        sleep($i * rand(2, 5)); // Wait longer as attempts increase
+      }
     }
+
     $QueryEndTime = microtime(true);
     $this->Queries[] = array($Query, ($QueryEndTime - $QueryStartTime) * 1000, null);
     $this->Time += ($QueryEndTime - $QueryStartTime) * 1000;

classes/torrents.class.php

@@ -708,12 +708,12 @@ class Torrents {
       if ($Data['FreeLeechType'] == '3') {
         $QueryID = G::$DB->get_query_id();
         G::$DB->query("
-          SELECT GREATEST(NOW(), ExpiryTime)
+          SELECT UNIX_TIMESTAMP(ExpiryTime)
           FROM shop_freeleeches
           WHERE TorrentID = ".$Data['ID']);
         if (G::$DB->has_results()) {
           $ExpiryTime = G::$DB->next_record(MYSQLI_NUM, false)[0];
-          $Info[] = ($HTMLy ? Format::torrent_label('Freeleech!') : 'Freeleech!') . ($HTMLy ? " <strong>(" : " (") . str_replace(['week','day','hour','min','Just now','s',' '],['w','d','h','m','0m'],time_diff($ExpiryTime, 1, false)) . ($HTMLy ? ")</strong>" : ")");
+          $Info[] = ($HTMLy ? Format::torrent_label('Freeleech!') : 'Freeleech!') . ($HTMLy ? " <strong>(" : " (") . str_replace(['week','day','hour','min','Just now','s',' '],['w','d','h','m','0m'],time_diff(max($ExpiryTime, time()), 1, false)) . ($HTMLy ? ")</strong>" : ")");
         } else {
           $Info[] = $HTMLy ? Format::torrent_label('Freeleech!') : 'Freeleech!';
         }

classes/tracker.class.php

@@ -23,6 +23,11 @@ class Tracker {
     }
 
     $MaxAttempts = 3;
+    // don't wait around if we're debugging
+    if (DEBUG_MODE) {
+      $MaxAttempts = 1;
+    }
+
     $Err = false;
     if (self::send_request($Get, $MaxAttempts, $Err) === false) {
       send_irc("PRIVMSG #tracker :$MaxAttempts $Err $Get");
@@ -130,7 +135,11 @@ class Tracker {
       if ($Sleep) {
         sleep($Sleep);
       }
-      $Sleep = 6;
+
+      // spend some time retrying if we're not in DEBUG_MODE
+      if (!DEBUG_MODE) {
+        $Sleep = 6;
+      }
 
       // Send request
       $File = fsockopen(TRACKER_HOST, TRACKER_PORT, $ErrorNum, $ErrorString);

sections/artist/artist.php

@@ -301,6 +301,7 @@ foreach ($TorrentList as $Group) {
     }
   } else {
     list($TorrentID, $Torrent) = each($Torrents);
+    if (!$TorrentID) { continue; }
 
     $TorrentTags = new Tags($TagList, false);
 

sections/better/index.php

@@ -5,6 +5,9 @@ if (isset($_GET['method'])) {
     case 'screenshots':
       include(SERVER_ROOT.'/sections/better/screenshots.php');
       break;
+    case 'covers':
+      include(SERVER_ROOT.'/sections/better/covers.php');
+      break;
     case 'encode':
       include(SERVER_ROOT.'/sections/better/encode.php');
       break;

sections/reportsv2/takereport.php

@@ -132,6 +132,19 @@ $DB->query("
 
 $ReportID = $DB->inserted_id();
 
+$DB->query("
+  SELECT UserID
+  FROM torrents
+  WHERE ID = $TorrentID");
+list($UploaderID) = $DB->next_record();
+$DB->query("
+  SELECT Name, NameRJ, NameJP
+  FROM torrents_group
+  WHERE ID = $GroupID");
+list($GroupNameEng, $GroupNameRJ, $GroupNameJP) = $DB->next_record();
+$GroupName = $GroupNameEng ? $GroupNameEng : ($GroupNameRJ ? $GroupNameRJ : $GroupNameJP);
+
+Misc::send_pm($UploaderID, 0, "Torrent Reported: $GroupName", "Your torrent, \"[url=".site_url()."torrents.php?torrentid=$TorrentID]".$GroupName."[/url]\", was reported for the reason \"".$ReportType['title']."\".\n\nThe reporter also said: \"$Extra\"\n\nIf you think this report was in error, please contact staff. Failure to challenge some types of reports in a timely manner will be regarded as a lack of defense and may result in the torrent being deleted.");
 
 $Cache->delete_value("reports_torrent_$TorrentID");
 

sections/requests/take_unfill.php

@@ -18,7 +18,7 @@ $DB->query("
     u.Uploaded,
     u.BonusPoints,
     r.GroupID,
-    t.UserID,
+    t.UserID
   FROM requests AS r
     LEFT JOIN torrents AS t ON t.ID = TorrentID
     LEFT JOIN users_main AS u ON u.ID = FillerID

sections/tools/data/user_flow.php

@@ -5,44 +5,31 @@ if (!check_perms('site_view_flow')) {
 
 //Timeline generation
 if (!isset($_GET['page'])) {
-  if (!list($Labels, $InFlow, $OutFlow, $Max) = $Cache->get_value('users_timeline')) {
+  if (!list($Labels, $InFlow, $OutFlow) = $Cache->get_value('users_timeline')) {
     $DB->query("
-      SELECT DATE_FORMAT(JoinDate, '%b \'%y') AS Month, COUNT(UserID)
+      SELECT DATE_FORMAT(JoinDate, \"%b %y\") AS Month, COUNT(UserID)
       FROM users_info
       GROUP BY Month
       ORDER BY JoinDate DESC
-      LIMIT 1, 12");
+      LIMIT 1, 11");
     $TimelineIn = array_reverse($DB->to_array());
     $DB->query("
-      SELECT DATE_FORMAT(BanDate, '%b \'%y') AS Month, COUNT(UserID)
+      SELECT DATE_FORMAT(BanDate, \"%b %y\") AS Month, COUNT(UserID)
       FROM users_info
       WHERE BanDate > 0
       GROUP BY Month
       ORDER BY BanDate DESC
-      LIMIT 1, 12");
+      LIMIT 1, 11");
     $TimelineOut = array_reverse($DB->to_array());
+
+    $Labels = array();
     foreach ($TimelineIn as $Month) {
-      list($Label, $Amount) = $Month;
-      if ($Amount > $Max) {
-        $Max = $Amount;
-      }
-    }
-    foreach ($TimelineOut as $Month) {
-      list($Label, $Amount) = $Month;
-      if ($Amount > $Max) {
-        $Max = $Amount;
-      }
-    }
-    foreach ($TimelineIn as $Month) {
-      list($Label, $Amount) = $Month;
-      $Labels[] = $Label;
-      $InFlow[] = number_format(($Amount / $Max) * 100, 4);
+      list($Labels[], $InFlow[]) = $Month;
     }
     foreach ($TimelineOut as $Month) {
-      list($Label, $Amount) = $Month;
-      $OutFlow[] = number_format(($Amount / $Max) * 100, 4);
+      list(, $OutFlow[]) = $Month;
     }
-    $Cache->cache_value('users_timeline', array($Labels, $InFlow, $OutFlow, $Max), mktime(0, 0, 0, date('n') + 1, 2));
+    $Cache->cache_value('users_timeline', array($Labels, $InFlow, $OutFlow), mktime(0, 0, 0, date('n') + 1, 2));
   }
 }
 //End timeline generation
@@ -112,13 +99,32 @@ $RS = $DB->query("
 $DB->query('SELECT FOUND_ROWS()');
 list($Results) = $DB->next_record();
 
-View::show_header('User Flow');
+View::show_header('User Flow', 'chart');
 $DB->set_query_id($RS);
 ?>
 <div class="thin">
 <?  if (!isset($_GET['page'])) { ?>
-  <div class="box pad">
-    <img src="https://chart.googleapis.com/chart?cht=lc&amp;chs=820x160&amp;chco=000D99,99000D&amp;chg=0,-1,1,1&amp;chxt=y,x&amp;chxs=0,h&amp;chxl=1:|<?=implode('|', $Labels)?>&amp;chxr=0,0,<?=$Max?>&amp;chd=t:<?=implode(',', $InFlow)?>|<?=implode(',', $OutFlow)?>&amp;chls=2,4,0&amp;chdl=New+Registrations|Disabled+Users&amp;chf=bg,s,FFFFFF00" alt="User Flow vs. Time" />
+  <div class="box pad center">
+    <canvas class="chart" id="chart_user_timeline"></canvas>
+    <script>
+      new Chart($('#chart_user_timeline').raw().getContext('2d'), {
+        type: 'line',
+        data: {
+          labels: <? print '["'.implode('","',$Labels).'"]'; ?>,
+          datasets: [ {
+            label: "New Registrations",
+            backgroundColor: "rgba(0,0,255,0.2)",
+            borderColor: "rgba(0,0,255,0.8)",
+            data: <? print "[".implode(",",$InFlow)."]"; ?>
+          }, {
+            label: "Disabled Users",
+            backgroundColor: "rgba(255,0,0,0.2)",
+            borderColor: "rgba(255,0,0,0.8)",
+            data: <? print "[".implode(",",$OutFlow)."]"; ?>
+          }]
+        }
+      })
+    </script>
   </div>
 <?  } ?>
   <div class="linkbox">

sections/torrents/details.php

@@ -515,12 +515,12 @@ foreach ($TorrentList as $Torrent) {
   // Freleechizer
   if ($FreeLeechType == '3') {
     $DB->query("
-      SELECT GREATEST(NOW(), ExpiryTime)
+      SELECT UNIX_TIMESTAMP(ExpiryTime)
       FROM shop_freeleeches
       WHERE TorrentID = $TorrentID");
     if ($DB->has_results()) {
       $ExpiryTime = $DB->next_record(MYSQLI_NUM, false)[0];
-      $ExtraInfo .= " <strong>(" . str_replace(['week','day','hour','min','Just now','s',' '],['w','d','h','m','0m'],time_diff($ExpiryTime, 1, false)) . ")</strong>";
+      $ExtraInfo .= " <strong>(" . str_replace(['week','day','hour','min','Just now','s',' '],['w','d','h','m','0m'],time_diff(max($ExpiryTime, time()), 1, false)) . ")</strong>";
     }
   }
   if ($PersonalFL) { $ExtraInfo.=$AddExtra. Format::torrent_label('Personal Freeleech!'); $AddExtra=' / '; }
@@ -698,7 +698,7 @@ if (count($Collages) > 0) {
 ?>
     <table class="box collage_table" id="collages">
       <tr class="colhead">
-        <td width="85%"><a href="#">&uarr;</a>&nbsp;This album is in <?=number_format(count($Collages))?> collage<?=((count($Collages) > 1) ? 's' : '')?><?=$SeeAll?></td>
+        <td width="85%"><a href="#">&uarr;</a>&nbsp;This content is in <?=number_format(count($Collages))?> collection<?=((count($Collages) > 1) ? 's' : '')?><?=$SeeAll?></td>
         <td># torrents</td>
       </tr>
 <?  foreach ($Indices as $i) {
@@ -749,7 +749,7 @@ if (count($PersonalCollages) > 0) {
 ?>
     <table class="box collage_table" id="personal_collages">
       <tr class="colhead">
-        <td width="85%"><a href="#">&uarr;</a>&nbsp;This album is in <?=number_format(count($PersonalCollages))?> personal collage<?=((count($PersonalCollages) > 1) ? 's' : '')?><?=$SeeAll?></td>
+        <td width="85%"><a href="#">&uarr;</a>&nbsp;This content is in <?=number_format(count($PersonalCollages))?> personal collection<?=((count($PersonalCollages) > 1) ? 's' : '')?><?=$SeeAll?></td>
         <td># torrents</td>
       </tr>
 <?  foreach ($Indices as $i) {

static/styles/global.css

@@ -11,6 +11,10 @@
   font-size: 110%;
 }
 
+.thin {
+  box-sizing: border-box;
+}
+
 .flex_input_container {
   display: flex;
 }
@@ -55,7 +59,11 @@ h2 .group_cat {
   background-size: 16px 16px;
 }
 
-pre br {
+code {
+  white-space: pre;
+}
+
+pre > br, code > br {
   line-height: 0px;
   display: none;
 }