Switching to PTP's BP calulation methodology and adding BP Rates page

design/privateheader.php

@@ -300,7 +300,7 @@ if (check_perms('site_send_unlimited_invites')) {
 <?  }
 ?>
           <li id="bonus_points">
-            <a href="wiki.php?action=article&amp;name=bonuspoints"><?=BONUS_POINTS?></a>:
+            <a href="user.php?action=bprates"><?=BONUS_POINTS?></a>:
             <span class="stat">
               <a href="store.php"><?=number_format(G::$LoggedUser['BonusPoints'])?></a>
             </span>

sections/schedule/hourly/bonus_points.php

@@ -1,37 +1,64 @@
 <?
 //------------------------ Update Bonus Points -------------------------//
 
-$getUsers = $DB->query("
-  SELECT um.ID,
-         COUNT(DISTINCT x.fid) AS Torrents,
-         SUM(t.Size) AS Size,
-         SUM(xs.seedtime) AS Seedtime,
-         SUM(t.Seeders) AS Seeders
-  FROM users_main AS um
-  LEFT JOIN users_info AS i on um.ID = i.UserID
-  LEFT JOIN xbt_files_users AS x ON um.ID=x.uid
-  LEFT JOIN torrents AS t ON t.ID=x.fid
-  LEFT JOIN xbt_snatched AS xs ON x.uid=xs.uid AND x.fid=xs.fid
-  WHERE
-    um.Enabled = '1'
-    AND i.DisablePoints = '0'
-    AND x.active = 1
-    AND x.completed = 0
-    AND x.Remaining = 0
-  GROUP BY um.ID");
-if ($DB->has_results()) {
-  $QueryPart = '';
-  while (list($UserID, $NumTorr, $TSize, $TTime, $TSeeds) = $DB->next_record()) {
-    $Points = intval((0.5 + (0.55*($NumTorr * (sqrt(($TSize/$NumTorr)/1073741824) * pow(1.5,($TTime/$NumTorr)/(24*365))))) / (max(1, sqrt(($TSeeds/$NumTorr)+4)/3)))**0.95);
-    if ($Points > 100000) $Points = 0;
-    $QueryPart .= "WHEN $UserID THEN BonusPoints+$Points ";
-    $Cache->delete_value('user_info_heavy_'.$UserID);
-  }
-
-  $DB->query("
-    UPDATE users_main
-    SET BonusPoints = CASE ID "
-    .$QueryPart.
-    "ELSE BonusPoints END");
+function bytesToGiB($bytes) {
+	if ($bytes > 1048576) {
+		$GiB = $bytes / 1073741824;
+	} else {
+		$GiB = 0;
+	}
+	return $GiB;
 }
+
+function calculateBP() {
+	global $DB;
+	global $Cache;
+
+	$getUsers = $DB->query("SELECT DISTINCT(uid) AS uid FROM xbt_files_users");
+	if ($DB->has_results()) {
+		$users = array();
+		while ($result = $DB->next_record()) {
+			$users[] = $result['uid'];
+		}
+		foreach($users as $UserID) {
+			$DB->query("
+				SELECT t.Size,
+						t.Seeders,
+						(us.SeedTime/60/60/24) AS days
+				FROM xbt_files_users AS x
+				LEFT JOIN torrents AS t ON t.ID=x.fid
+				LEFT JOIN users_seedtime AS us ON x.fid=us.TorrentID AND x.uid=us.UserID
+				WHERE x.uid = $UserID AND x.active=1 AND x.remaining=0
+				GROUP BY x.fid, x.ip");
+
+			$totalBP = 0;
+			while ($torrent = $DB->next_record()) {
+				$points = bytesToGiB($torrent['Size']) * ( 0.25 + ( 0.6 * log(1+$torrent['days']) / pow($torrent['Seeders'],0.6) ) );
+				$totalBP = $totalBP + $points;
+			}
+
+			if ($totalBP > 0) {
+				$DB->query("SELECT BonusPoints, BPDems FROM users_main WHERE ID=$UserID");
+				list($BonusPoints, $BPDems) = $DB->next_record();
+				$OldBP = (float) $BonusPoints.'.'.$BPDems;
+				$NewBP = $OldBP + $totalBP;
+				$NewDems = $NewBP - floor($NewBP);
+				$NewBP = $NewBP - $NewDems;
+				$NewDems = (int) substr($NewDems, 2);
+
+				$DB->query("
+					UPDATE users_main
+					SET BonusPoints = $NewBP, BPDems = $NewDems
+					WHERE ID=$UserID");
+
+			}
+
+		    $Cache->delete_value('user_info_heavy_'.$UserID);
+		}
+
+	}
+}
+
+calculateBP();
+
 ?>

sections/user/bprates.php

@@ -0,0 +1,96 @@
+<?
+	function bytesToGiB($bytes) {
+		if ($bytes > 1048576) {
+			$GiB = $bytes / 1073741824;
+		} else {
+			$GiB = 0;
+		}
+		return $GiB;
+	}
+
+	$Username = $LoggedUser['Username'];
+	View::show_header($Username." &gt; Bonus Rates");
+
+	$activeTorrents = array();
+	$DB->query("
+		SELECT x.timespent,
+				t.GroupID,
+				t.Media,
+				t.Container,
+				t.Codec,
+				t.Resolution,
+				t.AudioFormat,
+				t.Size,
+				t.Seeders,
+				t.Recorded,
+				us.SeedTime,
+				(us.SeedTime/60/60) AS hours,
+				(us.SeedTime/60/60/24) AS days,
+				tg.Name AS Album,
+				ag.Name AS Artist
+		FROM xbt_files_users AS x
+		LEFT JOIN torrents AS t ON t.ID=x.fid
+		LEFT JOIN users_seedtime AS us ON x.fid=us.TorrentID AND x.uid=us.UserID
+		LEFT JOIN torrents_group AS tg ON t.GroupID=tg.ID
+		LEFT JOIN torrents_artists AS ta ON t.GroupID=ta.GroupID
+		LEFT JOIN artists_group AS ag ON ta.ArtistID=ag.ArtistID
+		WHERE x.uid = $UserID AND x.active=1 AND x.remaining=0
+		GROUP BY x.fid, x.ip");
+	while ($result = $DB->next_record()) {
+		$activeTorrents[] = $result;
+	}
+	$totals = [
+		'torrents' => 0,
+		'size' => 0,
+		'points' => 0,
+	];
+?>
+<div class="thin">
+	<div class="header">
+		<h2><?=Users::format_username($UserID, false, false, false)?> &gt; Bonus Rates</h2>
+	</div>
+	<div class="main_column" style="width: 100%; margin-top: 18px">
+		<table class="box torrent_table cats no_grouping" id="torrent_table">
+			<tr class="colhead">
+				<td>Torrent</td>
+				<td>Size</td>
+				<td><svg width="11" height="15" fill="white" class="tooltip" alt="Seeders" title="Seeders"><polygon points="0,7 5.5,0 11,7 8,7 8,15 3,15 3,7"></polygon></svg>
+	          </td>
+				<td>Seed Time</td>
+				<td>BP/hour</td>
+			</tr>
+<?php foreach ($activeTorrents as $torrent) { 
+	$points = bytesToGiB($torrent['Size']) * ( 0.25 + ( 0.6 * log(1+$torrent['days']) / pow($torrent['Seeders'],0.6) ) );
+	$totals['torrents']++;
+	$totals['size'] = $totals['size'] + $torrent['Size'];
+	$totals['points'] = $totals['points'] + $points;
+?>
+			<tr id="site_style_tr">
+				<td><?=$torrent['Artist'].' - '.$torrent['Album'].' - '.$torrent['Recorded'].' | '.$torrent['Codec'].' / '.$torrent['Media'].' / '.$torrent['Container'].' / '.$torrent['Resolution'].' / '.$torrent['AudioFormat']; ?></td>
+				<td><?=Format::get_size($torrent['Size'])?></td>
+				<td><?php echo $torrent['Seeders']; ?></td>
+				<td><?php echo round($torrent['days'], 2); ?> days</td>
+				<td><?=round($points, 4)?></td>
+			</tr>
+<?php } ?>
+		</table>
+		<br />
+		<table class="box torrent_table cats no_grouping" id="torrent_table">
+			<tr class="colhead">
+				<td>Total Torrents</td>
+				<td>Seeding Size</td>
+				<td>BP/hour</td>
+				<td>BP/day</td>
+				<td>BP/month</td>
+			</tr>
+			<tr>
+				<td><?=$totals['torrents']?></td>
+				<td><?=Format::get_size($totals['size'])?></td>
+				<td><?=round($totals['points'], 4)?></td>
+				<td><?=round($totals['points']*24, 4)?></td>
+				<td><?=round($totals['points']*24*30, 4)?></td>
+			</tr>
+		</table>
+	</div>
+</div>
+<? View::show_footer(); ?>