diff --git a/admin/stats/tracker.php b/admin/stats/tracker.php index dab598150..c78b9a73c 100644 --- a/admin/stats/tracker.php +++ b/admin/stats/tracker.php @@ -76,18 +76,24 @@ foreach ($rowset as $cnt => $row) { } $clients = []; +$client_count = 0; $rowset = DB()->fetch_rowset('SELECT peer_id AS client FROM ' . TMP_TRACKER_TABLE); foreach ($rowset as $cnt => $row) { - $clients[] = get_user_torrent_client(substr($row['client'], 0, 3), true); + $clientString = substr($row['client'], 0, 3); + if (!isset($clients[$clientString])) { + $clients[$clientString] = 1; + } + else { + $clients[$clientString]++; + } + $client_count++; } -$client_count = count($clients); -$client_values = array_count_values($clients); - -foreach ($client_values as $value => $count) { +foreach ($clients as $value => $count) { $percentage = ($count / $client_count) * 100; - $clients_percentage[] ="$value ($count) => $percentage%"; + $clients_percentage[] = get_user_torrent_client($value) . " ($count) => $percentage%"; } + $clients = implode('
', $clients_percentage); function commify_callback($matches) diff --git a/library/includes/functions.php b/library/includes/functions.php index 358aea4f9..37bd848df 100644 --- a/library/includes/functions.php +++ b/library/includes/functions.php @@ -1179,9 +1179,8 @@ function bb_date($gmepoch, $format = false, $friendly_date = true) * @param string $peer_id * @return mixed|string */ -function get_user_torrent_client(string $peer_id, bool $nameOnly = false): mixed +function get_user_torrent_client(string $peer_id): mixed { - static $icons_extension = '.png'; static $clients = [ '-AG' => 'Ares', '-AZ' => 'Vuze', '-A~' => 'Ares', '-BC' => 'BitComet', '-BE' => 'BitTorrent SDK', '-BI' => 'BiglyBT', '-BL' => 'BitLord', '-BT' => 'BitTorrent', @@ -1231,13 +1230,6 @@ function get_user_torrent_client(string $peer_id, bool $nameOnly = false): mixed } } - if ($nameOnly) { - if (!empty($bestMatchLength)) { - return $bestMatch; - } - return $peer_id; - } - if (!empty($bestMatchLength)) { return '' . $bestMatch . ''; }