Remove torrent group voting and similar artists

These features only have any value if users actually use them, and
experience has shown that nowhere near enough users use them to make
them worthwhile.

classes/artists_similar.class.php

@@ -1,385 +0,0 @@
-<?
-class ARTIST {
-  var $ID = 0;
-  var $Name = 0;
-  var $NameLength = 0;
-  var $SimilarID = 0;
-  var $Displayed = false;
-  var $x = 0;
-  var $y = 0;
-  var $Similar = [];
-
-  function ARTIST($ID = '', $Name = '') {
-    $this->ID = $ID;
-    $this->NameLength = mb_strlen($Name, 'utf8');
-    $this->Name = display_str($Name);
-  }
-}
-
-class ARTISTS_SIMILAR extends ARTIST{
-  var $Artists = [];
-  var $TotalScore = 0;
-
-  var $xValues = array(WIDTH=>1);
-  var $yValues = array(HEIGHT=>1);
-
-  var $LargestDecimal = 0;
-  var $LowestDecimal = 1;
-
-
-
-  function dump_data() {
-    return serialize(array(time(), $this->Name, $this->x, $this->y, serialize($this->Artists), serialize($this->Similar)));
-  }
-
-  function load_data($Data) {
-    list($LastUpdated, $this->Name, $this->x, $this->y, $this->Artists, $this->Similar) = unserialize($Data);
-    $this->Artists = unserialize($this->Artists);
-    $this->Similar = unserialize($this->Similar);
-  }
-
-  function set_up() {
-    $QueryID = G::$DB->get_query_id();
-
-    $this->x = ceil(WIDTH / 2);
-    $this->y = ceil(HEIGHT / 2);
-
-    $this->xValues[$this->x] = $this->ID;
-    $this->yValues[$this->y] = $this->ID;
-
-
-    // Get artists that are directly similar to the artist
-    $ArtistIDs = [];
-    G::$DB->query("
-      SELECT
-        s2.ArtistID,
-        ag.Name,
-        ass.Score
-      FROM artists_similar AS s1
-        JOIN artists_similar AS s2 ON s1.SimilarID=s2.SimilarID AND s1.ArtistID!=s2.ArtistID
-        JOIN artists_similar_scores AS ass ON ass.SimilarID=s1.SimilarID
-        JOIN artists_group AS ag ON ag.ArtistID=s2.ArtistID
-      WHERE s1.ArtistID=".$this->ID."
-      ORDER BY ass.Score DESC
-      LIMIT 14");
-
-    if (!G::$DB->has_results()) {
-      return;
-    }
-
-    // Build into array. Each artist is its own object in $this->Artists
-    while (list($ArtistID, $Name, $Score) = G::$DB->next_record(MYSQLI_NUM, false)) {
-      if ($Score < 0) {
-        continue;
-      }
-      $this->Artists[$ArtistID] = new ARTIST($ArtistID, $Name);
-      $this->Similar[$ArtistID] = array('ID' => $ArtistID, 'Score' => $Score);
-      $this->TotalScore += $Score;
-      $ArtistIDs[] = $ArtistID;
-    }
-
-    // Get similarities between artists on the map
-    G::$DB->query("
-      SELECT
-        s1.ArtistID,
-        s2.ArtistID
-      FROM artists_similar AS s1
-        JOIN artists_similar AS s2 ON s1.SimilarID=s2.SimilarID AND s1.ArtistID!=s2.ArtistID
-        JOIN artists_similar_scores AS ass ON ass.SimilarID=s1.SimilarID
-        JOIN artists_group AS a ON a.ArtistID=s2.ArtistID
-      WHERE s1.ArtistID IN(".implode(',', $ArtistIDs).')
-        AND s2.ArtistID IN('.implode(',', $ArtistIDs).')');
-
-    // Build into array
-    while (list($Artist1ID, $Artist2ID) = G::$DB->next_record()) {
-      $this->Artists[$Artist1ID]->Similar[$Artist2ID] = array('ID'=>$Artist2ID);
-    }
-
-    // Calculate decimal point scores between artists
-    foreach ($this->Similar as $SimilarArtist) {
-      list($ArtistID, $Similar) = array_values($SimilarArtist);
-      $this->Similar[$ArtistID]['Decimal'] =  $this->similarity($Similar['Score'], $this->TotalScore);
-
-      if ($this->Similar[$ArtistID]['Decimal'] < $this->LowestDecimal) {
-        $this->LowestDecimal = $this->Similar[$ArtistID]['Decimal'];
-      }
-      if ($this->Similar[$ArtistID]['Decimal'] > $this->LargestDecimal) {
-        $this->LargestDecimal = $this->Similar[$ArtistID]['Decimal'];
-      }
-    }
-    reset($this->Artists);
-
-    G::$DB->set_query_id($QueryID);
-  }
-
-  function set_positions() {
-    $xValues = []; // Possible x values
-    $Root = ceil(WIDTH / 4); // Half-way into half of the image
-    $Offset = 4; // Distance from the root (a quarter of the way into the image) to the x value
-
-    // The number of artists placed in the top or the bottom
-    $NumTop = 0;
-    $NumBottom = 0;
-
-    // The number of artists placed in the left or the right
-    $NumLeft = 0;
-    $NumRight = 0;
-
-    $Multiplier = 0;
-
-    // Build up an impressive list of possible x values
-    // We later iterate through these, and pick out the ones we want
-
-    // These x values are all below WIDTH/2 (all on the left)
-    // The script later chooses which side to put them on
-
-    // We create more very low x values because they're more likely to be skipped
-    for ($i = 0; $i <= count($this->Artists) * 4; $i++) {
-      if ($Offset >= ((WIDTH / 4))) {
-        $Offset = $Offset % (WIDTH / 4);
-      }
-      $Plus = $Root + $Offset; // Point on the right of the root
-      $Minus = abs($Root - $Offset); // Point on the left of the root
-
-      $xValues[$Plus] = $Plus;
-
-      $xValues[$Minus] = $Minus;
-
-      // Throw in an extra x value closer to the edge, because they're more likely to be skipped
-
-      if ($Minus > 30) {
-      //  $xValues[$Minus - 30] = $Minus - 30;
-      }
-
-      $Offset = $Offset + rand(5, 20); // Increase offset, and go again
-    }
-
-    foreach ($this->Artists as $Artist) {
-      $ArtistID = $Artist->ID;
-      if ($Artist->Displayed == true) {
-        continue;
-      }
-      $this->Similar[$ArtistID]['Decimal'] = $this->Similar[$ArtistID]['Decimal'] * (1 / ($this->LargestDecimal)) - 0.1;
-      // Calculate the distance away from the center, based on similarity
-      $IdealDistance =  $this->calculate_distance($this->Similar[$ArtistID]['Decimal'], $this->x, $this->y);
-
-      $this->Similar[$ArtistID]['Distance'] = $IdealDistance;
-
-      // 1 = left, 2 = right
-      $Horizontal = 0;
-      $Vertical = 0;
-
-      // See if any similar artists have been placed yet. If so, place artist in that half
-      // (provided that there are enough in the other half to visually balance out)
-      reset($Artist->Similar);
-      foreach ($Artist->Similar as $SimilarArtist) {
-        list($Artist2ID) = array_values($SimilarArtist);
-        if ($this->Artists[$Artist2ID]) {
-          if ($this->Artists[$Artist2ID]->x > (WIDTH / 2) && ($NumRight-$NumLeft) < 1) {
-            $Horizontal = 2;
-          } elseif ($NumLeft - $NumRight < 1) {
-            $Horizontal = 1;
-          }
-          break;
-        }
-      }
-
-      shuffle($xValues);
-
-      while ($xValue = array_shift($xValues)) {
-        if (abs($this->x - $xValue) <= $IdealDistance) {
-          if (hypot(abs($this->x - $xValue), ($this->y - 50)) > $IdealDistance
-            || ceil(sqrt(pow($IdealDistance, 2) - pow($this->x - $xValue, 2))) > (HEIGHT / 2)) {
-            $xValue = $this->x - ceil(sqrt(pow($IdealDistance, 2) - pow($IdealDistance * 0.1 * rand(5,9), 2)));
-            //echo "Had to change x value for ".$Artist->Name." to ".$xValue."\n";
-          }
-          // Found a match (Is close enough to the center to satisfy $IdealDistance),
-          // Now it's time to choose which half to put it on
-          if (!$Horizontal) {
-            // No similar artists displayed
-            $Horizontal = ($NumLeft < $NumRight) ? 1 : 2;
-          }
-          if ($Horizontal == 2) {
-            $xValue = WIDTH - $xValue;
-            $NumRight++;
-          } else {
-            $NumLeft++;
-          }
-
-          $Artist->x = $xValue;
-          $this->xValues[$xValue] = $ArtistID;
-          unset($xValues[$xValue]);
-
-          break;
-        }
-      }
-      if (!$xValue) { // Uh-oh, we were unable to choose an x value.
-        $xValue = ceil(sqrt(pow($IdealDistance, 2) / 2));
-        $xValue = (WIDTH / 2) - $xValue;
-        $Artist->x = $xValue;
-        $this->xValues[$xValue] = $ArtistID;
-        unset($xValues[$xValue]);
-      }
-
-
-      // Pythagoras. $yValue is the vertical distance from the center to the y value
-      $yValue = sqrt(pow($IdealDistance, 2) - pow(abs($this->x - $Artist->x), 2));
-
-
-      // Now we pick if it should go on the top or bottom
-
-      if ($NumTop > $NumBottom) { // Send it to the bottom half
-        $yValue = (HEIGHT / 2) + $yValue;
-        $NumBottom++;
-      } else {
-        $yValue=(HEIGHT / 2) - $yValue;
-        $NumTop++;
-      }
-
-      $yValue = ceil($yValue);
-
-      // $yValue is now a proper y coordinate
-      // Now time to do some spacing out
-
-      if ($yValue < 10) {
-        $yValue += (10 + abs($yValue)) + rand(10,20);
-      }
-
-      if ($yValue > (HEIGHT - 10)) {
-        $yValue -= ((HEIGHT / 2) - rand(10,20));
-      }
-
-      $i = 1;
-      while ($Conflict = $this->scan_array_range($this->yValues, abs($yValue - 13), $yValue + 13)) {
-        if ($i > 10) {
-          break;
-        }
-        if (!$this->scan_array_range($this->yValues, abs($yValue - 5), $yValue - 20)) {
-          $yValue -= 20;
-        }
-
-        $yValue = $Conflict + rand(10, 20);
-        if ($yValue > HEIGHT - 10) {
-          $yValue -= ceil(HEIGHT / 2.5);
-        } elseif ($yValue < 10) {
-          $yValue += ceil(HEIGHT / 2.5);
-        }
-        $i++;
-      }
-
-      $Artist->y = $yValue;
-      $this->yValues[$yValue] = $ArtistID;
-    }
-    reset($this->Artists);
-    reset($this->xValues);
-    reset($this->yValues);
-
-  }
-
-  // Calculate the ideal distance from the center point ($Rootx, $Rooty) to the artist's point on the board
-  // Pythagoras as fun!
-  function calculate_distance($SimilarityCoefficient, $Rootx, $Rooty) {
-    $MaxWidth = WIDTH - $Rootx;
-    $MaxHeight = HEIGHT - $Rooty;
-    $x = $MaxWidth - ($SimilarityCoefficient * $MaxWidth * 0.01); // Possible x value
-    $y = $MaxHeight - ($SimilarityCoefficient * $MaxHeight); // Possible y value
-    $Hypot = hypot($Rootx - $x, $Rooty - $y);
-    return $MaxWidth - $Hypot;
-
-  }
-
-  function similarity($Score, $TotalArtistScore) {
-    return (pow(($Score / ($TotalArtistScore + 1)), (1 / 1)));
-  }
-
-  function scan_array_range($Array, $Start, $Finish) {
-    if ($Start < 0) {
-      die($Start);
-    }
-    for ($i = $Start; $i <= $Finish; $i++) {
-      if (isset($Array[$i])) {
-        return $i;
-      }
-    }
-    return false;
-  }
-
-  function write_artists() {
-?>
-    <div style="position: absolute; bottom: <?=($this->y - 10)?>px; left: <?=($this->x - $this->NameLength * 4)?>px; font-size: 13pt; white-space: nowrap;" class="similar_artist_header">
-      <?=($this->Name)?>
-    </div>
-<?
-    foreach ($this->Artists as $Artist) {
-      if ($Artist->ID == $this->ID) {
-        continue;
-      }
-      $xPosition = $Artist->x - $Artist->NameLength * 4;
-      if ($xPosition < 0) {
-        $xPosition = 3;
-        $Artist->x = $xPosition;
-
-      }
-      $Decimal = $this->Similar[$Artist->ID]['Decimal'];
-
-      if ($Decimal < 0.2) {
-        $FontSize = 8;
-      } elseif ($Decimal < 0.3) {
-        $FontSize = 9;
-      } elseif ($Decimal < 0.4) {
-        $FontSize = 10;
-      } else {
-        $FontSize = 12;
-      }
-?>
-    <div style="position: absolute; top: <?=($Artist->y - 5)?>px; left: <?=$xPosition?>px; font-size: <?=$FontSize?>pt; white-space: nowrap;">
-      <a href="artist.php?id=<?=($Artist->ID)?>" class="similar_artist"><?=($Artist->Name)?></a>
-    </div>
-<?
-    }
-    reset($this->Artists);
-  }
-
-  function background_image() {
-    global $Img;
-    reset($this->Similar);
-    foreach ($this->Similar as $SimilarArtist) {
-      list($ArtistID, $Val) = array_values($SimilarArtist);
-      $Artist = $this->Artists[$ArtistID];
-      $Decimal = $this->Similar[$ArtistID]['Decimal'];
-      $Width = ceil($Decimal * 4) + 1;
-
-      $Img->line($this->x, $this->y, $Artist->x, $Artist->y, $Img->color(199, 218, 255), $Width);
-
-      unset($Artist->Similar[$this->ID]);
-      reset($Artist->Similar);
-      foreach ($Artist->Similar as $SimilarArtist2) {
-        list($Artist2ID) = array_values($SimilarArtist2);
-        if ($this->Artists[$Artist2ID]) {
-          $Artist2 = $this->Artists[$Artist2ID];
-          $Img->line($Artist->x, $Artist->y, $Artist2->x, $Artist2->y, $Img->color(173, 201, 255));
-          unset($Artist2->Similar[$ArtistID]);
-        }
-      }
-      reset($this->xValues);
-    }
-    $Img->make_png(SERVER_ROOT.'/static/similar/'.$this->ID.'.png');
-  }
-
-  function dump() {
-    echo "Similarities:\n";
-    foreach ($this->Artists as $Artist) {
-      echo $Artist->ID;
-      echo ' - ';
-      echo $Artist->Name;
-      echo "\n";
-      echo 'x - ' . $Artist->x . "\n";
-      echo 'y - ' . $Artist->y . "\n";
-      print_r($this->Similar[$Artist->ID]);
-      //print_r($Artist->Similar);
-      echo "\n\n---\n\n";
-    }
-
-  }
-}
-?>

classes/cache.class.php

@@ -40,18 +40,17 @@ class CACHE extends Memcache {
   protected $InTransaction = false;
   public $Time = 0;
   private $Servers = [];
-  private $PersistentKeys = array(
+  private $PersistentKeys = [
     'ajax_requests_*',
     'query_lock_*',
     'stats_*',
     'top10tor_*',
-    'top10votes_*',
     'users_snatched_*',
 
     // Cache-based features
     'global_notification',
     'notifications_one_reads_*',
-  );
+  ];
   private $ClearedKeys = [];
 
   public $CanClear = false;

classes/permissions_form.php

@@ -15,7 +15,6 @@ $PermissionsArray = array(
   'site_advanced_search' => 'Advanced search access.',
   'site_top10' => 'Top 10 access.',
   'site_advanced_top10' => 'Advanced Top 10 access.',
-  'site_album_votes' => 'Voting for favorite torrents.',
   'site_torrents_notify' => 'Notifications access.',
   'site_collages_create' => 'Collage create access.',
   'site_collages_manage' => 'Collage manage access.',
@@ -138,7 +137,6 @@ function permissions_form() {
           display_perm('site_collages_personal','Can have a personal collage.');
           display_perm('site_collages_renamepersonal','Can rename own personal collages.');
           display_perm('site_advanced_top10','Can access advanced top 10.');
-          display_perm('site_album_votes', 'Can vote for favorite torrents.');
           display_perm('site_make_bookmarks','Can make bookmarks.');
           display_perm('site_edit_wiki','Can edit wiki pages.');
           display_perm('site_can_invite_always', 'Can invite users even when invites are closed.');

classes/top10.class.php

@@ -1,5 +0,0 @@
-<?
-
-class Top10 {
-
-}

classes/top10view.class.php

@@ -8,7 +8,6 @@ class Top10View {
       <a href="top10.php?type=torrents" class="brackets"><?=self::get_selected_link("Torrents", $Selected == "torrents")?></a>
       <a href="top10.php?type=users" class="brackets"><?=self::get_selected_link("Users", $Selected == "users")?></a>
       <a href="top10.php?type=tags" class="brackets"><?=self::get_selected_link("Tags", $Selected == "tags")?></a>
-      <a href="top10.php?type=votes" class="brackets"><?=self::get_selected_link("Favorites", $Selected == "votes")?></a>
       <a href="top10.php?type=donors" class="brackets"><?=self::get_selected_link("Donors", $Selected == "donors")?></a>
     </div>
 <?

classes/torrents.class.php

@@ -500,17 +500,6 @@ class Torrents {
           )
       WHERE ID = '$GroupID'");
 
-    // Fetch album vote score
-    G::$DB->query("
-      SELECT Score
-      FROM torrents_votes
-      WHERE GroupID = $GroupID");
-    if (G::$DB->has_results()) {
-      list($VoteScore) = G::$DB->next_record();
-    } else {
-      $VoteScore = 0;
-    }
-
     // Fetch album artists
     G::$DB->query("
       SELECT GROUP_CONCAT(ag.Name separator ' ')

classes/votes.class.php

@@ -1,314 +0,0 @@
-<?
-class Votes {
-  /**
-   * Confidence level for binomial scoring
-   */
-  //const Z_VAL = 1.645211440143815; // p-value .95
-  const Z_VAL = 1.281728756502709; // p-value .90
-
-  /**
-   * Generate voting links for torrent pages, etc.
-   * @param $GroupID
-   * @param $Vote The pre-existing vote, if it exists 'Up'|'Down'
-   */
-  public static function vote_link($GroupID, $Vote = '') {
-    if (!G::$LoggedUser['NoVoteLinks'] && check_perms('site_album_votes')) { ?>
-      <span class="votespan brackets" style="white-space: nowrap;">
-        Vote:
-        <a href="#" onclick="UpVoteGroup(<?=$GroupID?>, '<?=G::$LoggedUser['AuthKey']?>'); return false;" class="tooltip small_upvote vote_link_<?=$GroupID?><?=(!empty($Vote) ? ' hidden' : '')?>" style="font-weight: bolder;" title="Upvote">&and;</a>
-        <span class="tooltip voted_type small_upvoted voted_up_<?=$GroupID?><?=(($Vote == 'Down' || empty($Vote)) ? ' hidden' : '')?>" style="font-weight: bolder;" title="Upvoted">&and;</span>
-        <a href="#" onclick="DownVoteGroup(<?=$GroupID?>, '<?=G::$LoggedUser['AuthKey']?>'); return false;" class="tooltip small_downvote vote_link_<?=$GroupID?><?=(!empty($Vote) ? ' hidden' : '')?>" style="font-weight: bolder;" title="Downvote">&or;</a>
-        <span class="tooltip voted_type small_downvoted voted_down_<?=$GroupID?><?=(($Vote == 'Up' || empty($Vote)) ? ' hidden' : '')?>" style="font-weight: bolder;" title="Downvoted">&or;</span>
-        <a href="#" onclick="UnvoteGroup(<?=$GroupID?>, '<?=G::$LoggedUser['AuthKey']?>'); return false;" class="tooltip small_clearvote vote_clear_<?=$GroupID?><?=(empty($Vote) ? ' hidden' : '')?>" title="Clear your vote">x</a>
-      </span>
-<?    }
-  }
-
-  /**
-   * Returns an array with User Vote data: GroupID and vote type
-   * @param string|int $UserID
-   * @return array GroupID=>(GroupID, 'Up'|'Down')
-   */
-  public static function get_user_votes($UserID) {
-    if ((int)$UserID == 0) {
-      return [];
-    }
-
-    $UserVotes = G::$Cache->get_value("voted_albums_$UserID");
-    if ($UserVotes === false) {
-      $QueryID = G::$DB->get_query_id();
-      G::$DB->query("
-        SELECT GroupID, Type
-        FROM users_votes
-        WHERE UserID = $UserID");
-      $UserVotes = G::$DB->to_array('GroupID', MYSQLI_ASSOC, false);
-      G::$DB->set_query_id($QueryID);
-      G::$Cache->cache_value("voted_albums_$UserID", $UserVotes);
-    }
-    return $UserVotes;
-  }
-
-  /**
-   * Returns an array with torrent group vote data
-   * @param string|int $GroupID
-   * @return array (Upvotes, Total Votes)
-   */
-  public static function get_group_votes($GroupID) {
-    if (!is_number($GroupID)) {
-      return array('Ups' => 0, 'Total' => 0);
-    }
-    $GroupVotes = G::$Cache->get_value("votes_$GroupID");
-    if ($GroupVotes === false) {
-      $QueryID = G::$DB->get_query_id();
-      G::$DB->query("
-        SELECT Ups AS Ups, Total AS Total
-        FROM torrents_votes
-        WHERE GroupID = $GroupID");
-      if (!G::$DB->has_results()) {
-        $GroupVotes = array('Ups' => 0, 'Total' => 0);
-      } else {
-        $GroupVotes = G::$DB->next_record(MYSQLI_ASSOC, false);
-      }
-      G::$DB->set_query_id($QueryID);
-      G::$Cache->cache_value("votes_$GroupID", $GroupVotes, 259200); // 3 days
-    }
-    return $GroupVotes;
-  }
-
-  /**
-   * Computes the inverse normal CDF of a p-value
-   * @param float $GroupID
-   * @return float Inverse Normal CDF
-   */
-  private function inverse_ncdf($p) {
-  /***************************************************************************
-   *                                inverse_ncdf.php
-   *                            -------------------
-   *   begin                : Friday, January 16, 2004
-   *   copyright            : (C) 2004 Michael Nickerson
-   *   email                : nickersonm@yahoo.com
-   *
-   ***************************************************************************/
-
-    //Inverse ncdf approximation by Peter John Acklam, implementation adapted to
-    //PHP by Michael Nickerson, using Dr. Thomas Ziegler's C implementation as
-    //a guide.  http://home.online.no/~pjacklam/notes/invnorm/index.html
-    //I have not checked the accuracy of this implementation. Be aware that PHP
-    //will truncate the coeficcients to 14 digits.
-
-    //You have permission to use and distribute this function freely for
-    //whatever purpose you want, but please show common courtesy and give credit
-    //where credit is due.
-
-    //Input paramater is $p - probability - where 0 < p < 1.
-
-    //Coefficients in rational approximations
-    $a = array(1 => -3.969683028665376e+01, 2 => 2.209460984245205e+02,
-           3 => -2.759285104469687e+02, 4 => 1.383577518672690e+02,
-           5 => -3.066479806614716e+01, 6 => 2.506628277459239e+00);
-
-    $b = array(1 => -5.447609879822406e+01, 2 => 1.615858368580409e+02,
-           3 => -1.556989798598866e+02, 4 => 6.680131188771972e+01,
-           5 => -1.328068155288572e+01);
-
-    $c = array(1 => -7.784894002430293e-03, 2 => -3.223964580411365e-01,
-           3 => -2.400758277161838e+00, 4 => -2.549732539343734e+00,
-           5 => 4.374664141464968e+00,  6 => 2.938163982698783e+00);
-
-    $d = array(1 => 7.784695709041462e-03, 2 => 3.224671290700398e-01,
-           3 => 2.445134137142996e+00, 4 => 3.754408661907416e+00);
-
-    //Define break-points.
-    $p_low  = 0.02425;                   //Use lower region approx. below this
-    $p_high = 1 - $p_low;                //Use upper region approx. above this
-
-    //Define/list variables (doesn't really need a definition)
-    //$p (probability), $sigma (std. deviation), and $mu (mean) are user inputs
-    $q = null; $x = null; $y = null; $r = null;
-
-    //Rational approximation for lower region.
-    if (0 < $p && $p < $p_low) {
-      $q = sqrt(-2 * log($p));
-      $x = ((((($c[1] * $q + $c[2]) * $q + $c[3]) * $q + $c[4]) * $q + $c[5]) *
-           $q + $c[6]) / (((($d[1] * $q + $d[2]) * $q + $d[3]) * $q + $d[4]) *
-           $q + 1);
-    }
-
-    //Rational approximation for central region.
-    elseif ($p_low <= $p && $p <= $p_high) {
-      $q = $p - 0.5;
-      $r = $q * $q;
-      $x = ((((($a[1] * $r + $a[2]) * $r + $a[3]) * $r + $a[4]) * $r + $a[5]) *
-           $r + $a[6]) * $q / ((((($b[1] * $r + $b[2]) * $r + $b[3]) * $r +
-           $b[4]) * $r + $b[5]) * $r + 1);
-    }
-
-    //Rational approximation for upper region.
-    elseif ($p_high < $p && $p < 1) {
-      $q = sqrt(-2 * log(1 - $p));
-      $x = -((((($c[1] * $q + $c[2]) * $q + $c[3]) * $q + $c[4]) * $q +
-           $c[5]) * $q + $c[6]) / (((($d[1] * $q + $d[2]) * $q + $d[3]) *
-           $q + $d[4]) * $q + 1);
-    }
-
-    //If 0 < p < 1, return a null value
-    else {
-      $x = null;
-    }
-
-    return $x;
-    //END inverse ncdf implementation.
-  }
-
-  /**
-   * Implementation of the algorithm described at http://www.evanmiller.org/how-not-to-sort-by-average-rating.html
-   * @param int $Ups Number of upvotes
-   * @param int $Total Number of total votes
-   * @return float Ranking score
-   */
-  public static function binomial_score($Ups, $Total) {
-    if (($Total <= 0) || ($Ups < 0)) {
-      return 0;
-    }
-    $phat = $Ups / $Total;
-    $Numerator = ($phat + self::Z_VAL * self::Z_VAL / (2 * $Total) - self::Z_VAL * sqrt(($phat * (1 - $phat) + self::Z_VAL * self::Z_VAL / (4 * $Total)) / $Total));
-    $Denominator = (1 + self::Z_VAL * self::Z_VAL / $Total);
-    return ($Numerator / $Denominator);
-  }
-
-  /**
-   * Gets where this album ranks overall, for its year, and for its decade.  This is really just a wrapper.
-   * @param int $GroupID GroupID of the album
-   * @param int $Year Year it was released
-   * @return array ('overall'=><overall rank>, 'year'=><rank for its year>, 'decade'=><rank for its decade>)
-   */
-  public static function get_ranking($GroupID, $Year) {
-    $GroupID = (int)$GroupID;
-    $Year = (int)$Year;
-    if ($GroupID <= 0 || $Year <= 0) {
-      return false;
-    }
-
-    return array(
-        'overall' => Votes::get_rank_all($GroupID),
-        'year'    => Votes::get_rank_year($GroupID, $Year),
-        'decade'  => Votes::get_rank_decade($GroupID, $Year));
-  }
-
-  /**
-   * Gets where this album ranks overall.
-   * @param int $GroupID GroupID of the album
-   * @return int Rank
-   */
-  public static function get_rank_all($GroupID) {
-    $GroupID = (int)$GroupID;
-    if ($GroupID <= 0) {
-      return false;
-    }
-
-    $Rankings = G::$Cache->get_value('voting_ranks_overall');
-    if ($Rankings === false) {
-      $QueryID = G::$DB->get_query_id();
-      G::$DB->query('
-        SELECT GroupID, Score
-        FROM torrents_votes
-        ORDER BY Score DESC
-        LIMIT 100');
-      $Rankings = self::calc_ranks(G::$DB->to_pair(0, 1, false));
-      G::$DB->set_query_id($QueryID);
-      G::$Cache->cache_value('voting_ranks_overall', $Rankings, 259200); // 3 days
-    }
-
-    return ($Rankings[$GroupID] ?? false);
-  }
-
-  /**
-   * Gets where this album ranks in its year.
-   * @param int $GroupID GroupID of the album
-   * @param int $Year Year it was released
-   * @return int Rank for its year
-   */
-  public static function get_rank_year($GroupID, $Year) {
-    $GroupID = (int)$GroupID;
-    $Year = (int)$Year;
-    if ($GroupID <= 0 || $Year <= 0) {
-      return false;
-    }
-
-    $Rankings = G::$Cache->get_value("voting_ranks_year_$Year");
-    if ($Rankings === false) {
-      $QueryID = G::$DB->get_query_id();
-      G::$DB->query("
-        SELECT GroupID, Score
-        FROM torrents_votes  AS v
-          JOIN torrents_group AS g ON g.ID = v.GroupID
-        WHERE g.Year = $Year
-        ORDER BY Score DESC
-        LIMIT 100");
-      $Rankings = self::calc_ranks(G::$DB->to_pair(0, 1, false));
-      G::$DB->set_query_id($QueryID);
-      G::$Cache->cache_value("voting_ranks_year_$Year", $Rankings, 259200); // 3 days
-    }
-
-    return ($Rankings[$GroupID] ?? false);
-  }
-
-  /**
-   * Gets where this album ranks in its decade.
-   * @param int $GroupID GroupID of the album
-   * @param int $Year Year it was released
-   * @return int Rank for its year
-   */
-  public static function get_rank_decade($GroupID, $Year) {
-    $GroupID = (int)$GroupID;
-    $Year = (int)$Year;
-    if ($GroupID <= 0 || $Year <= 0) {
-      return false;
-    }
-
-    // First year of the decade
-    $Year = $Year - ($Year % 10);
-
-    $Rankings = G::$Cache->get_value("voting_ranks_decade_$Year");
-    if ($Rankings === false) {
-      $QueryID = G::$DB->get_query_id();
-      G::$DB->query("
-        SELECT GroupID, Score
-        FROM torrents_votes  AS v
-          JOIN torrents_group AS g ON g.ID = v.GroupID
-        WHERE g.Year BETWEEN $Year AND " . ($Year + 9) . "
-            AND g.CategoryID = 1
-        ORDER BY Score DESC
-        LIMIT 100");
-      $Rankings = self::calc_ranks(G::$DB->to_pair(0, 1, false));
-      G::$DB->set_query_id($QueryID);
-      G::$Cache->cache_value("voting_ranks_decade_$Year", $Rankings, 259200); // 3 days
-    }
-
-    return ($Rankings[$GroupID] ?? false);
-  }
-
-  /**
-   * Turn vote scores into vote ranks. This basically only sorts out tied ranks
-   *
-   * @param array $GroupScores array (<GroupID> => <Score>) ordered by Score
-   * @return array (<GroupID> => <Rank>)
-   */
-  public static function calc_ranks($GroupScores) {
-    $Rankings = [];
-    $PrevScore = $PrevRank = false;
-    $Rank = 1;
-    foreach ($GroupScores as $GroupID => $Score) {
-      if ($Score === $PrevScore) {
-        $Rankings[$GroupID] = $PrevRank;
-      } else {
-        $Rankings[$GroupID] = $Rank;
-        $PrevRank = $Rank;
-        $PrevScore = $Score;
-      }
-      $Rank++;
-    }
-    return $Rankings;
-  }
-}
-?>

gazelle.sql

@@ -53,28 +53,6 @@ CREATE TABLE `artists_group` (
   KEY `RevisionID` (`RevisionID`)
 ) ENGINE=InnoDB CHARSET=utf8;
 
-CREATE TABLE `artists_similar` (
-  `ArtistID` int(10) NOT NULL DEFAULT '0',
-  `SimilarID` int(12) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`ArtistID`,`SimilarID`),
-  KEY `ArtistID` (`ArtistID`),
-  KEY `SimilarID` (`SimilarID`)
-) ENGINE=InnoDB CHARSET=utf8;
-
-CREATE TABLE `artists_similar_scores` (
-  `SimilarID` int(12) NOT NULL AUTO_INCREMENT,
-  `Score` int(10) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`SimilarID`),
-  KEY `Score` (`Score`)
-) ENGINE=InnoDB CHARSET=utf8;
-
-CREATE TABLE `artists_similar_votes` (
-  `SimilarID` int(12) NOT NULL,
-  `UserID` int(10) NOT NULL,
-  `Way` enum('up','down') NOT NULL DEFAULT 'up',
-  PRIMARY KEY (`SimilarID`,`UserID`,`Way`)
-) ENGINE=InnoDB CHARSET=utf8;
-
 CREATE TABLE `artists_tags` (
   `TagID` int(10) NOT NULL DEFAULT '0',
   `ArtistID` int(10) NOT NULL DEFAULT '0',
@@ -1275,16 +1253,6 @@ CREATE TABLE `torrents_tags_votes` (
   PRIMARY KEY (`GroupID`,`TagID`,`UserID`,`Way`)
 ) ENGINE=InnoDB CHARSET=utf8;
 
-CREATE TABLE `torrents_votes` (
-  `GroupID` int(10) NOT NULL,
-  `Ups` int(10) unsigned NOT NULL DEFAULT '0',
-  `Total` int(10) unsigned NOT NULL DEFAULT '0',
-  `Score` float NOT NULL DEFAULT '0',
-  PRIMARY KEY (`GroupID`),
-  KEY `Score` (`Score`),
-  CONSTRAINT `torrents_votes_ibfk_1` FOREIGN KEY (`GroupID`) REFERENCES `torrents_group` (`ID`) ON DELETE CASCADE
-) ENGINE=InnoDB CHARSET=utf8;
-
 CREATE TABLE `user_questions` (
   `ID` int(10) NOT NULL AUTO_INCREMENT,
   `Question` mediumtext,
@@ -1691,20 +1659,6 @@ CREATE TABLE `users_torrent_history_temp` (
   PRIMARY KEY (`UserID`)
 ) ENGINE=InnoDB CHARSET=utf8;
 
-CREATE TABLE `users_votes` (
-  `UserID` int(10) unsigned NOT NULL,
-  `GroupID` int(10) NOT NULL,
-  `Type` enum('Up','Down') DEFAULT NULL,
-  `Time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`UserID`,`GroupID`),
-  KEY `GroupID` (`GroupID`),
-  KEY `Type` (`Type`),
-  KEY `Time` (`Time`),
-  KEY `Vote` (`Type`,`GroupID`,`UserID`),
-  CONSTRAINT `users_votes_ibfk_1` FOREIGN KEY (`GroupID`) REFERENCES `torrents_group` (`ID`) ON DELETE CASCADE,
-  CONSTRAINT `users_votes_ibfk_2` FOREIGN KEY (`UserID`) REFERENCES `users_main` (`ID`) ON DELETE CASCADE
-) ENGINE=InnoDB CHARSET=utf8;
-
 CREATE TABLE `users_warnings_forums` (
   `UserID` int(10) unsigned NOT NULL,
   `Comment` text,

sections/ajax/artist.php

@@ -42,8 +42,7 @@ if (!empty($_GET['revisionid'])) { // if they're viewing an old revision
   $RevisionID = false;
 }
 if ($Data) {
-//  list($K, list($Name, $Image, $Body, $NumSimilar, $SimilarArray, , , $VanityHouseArtist)) = each($Data);
-  list($K, list($Name, $Image, $Body, $NumSimilar, $SimilarArray, , )) = each($Data);
+  list($K, list($Name, $Image, $Body)) = each($Data);
 } else {
   if ($RevisionID) {
   /*
@@ -290,44 +289,6 @@ foreach ($GroupIDs as $GroupID) {
   );
 }
 
-$JsonSimilar = [];
-if (empty($SimilarArray)) {
-  $DB->query("
-    SELECT
-      s2.ArtistID,
-      a.Name,
-      ass.Score,
-      ass.SimilarID
-    FROM artists_similar AS s1
-      JOIN artists_similar AS s2 ON s1.SimilarID = s2.SimilarID AND s1.ArtistID != s2.ArtistID
-      JOIN artists_similar_scores AS ass ON ass.SimilarID = s1.SimilarID
-      JOIN artists_group AS a ON a.ArtistID = s2.ArtistID
-    WHERE s1.ArtistID = '$ArtistID'
-    ORDER BY ass.Score DESC
-    LIMIT 30
-  ");
-  $SimilarArray = $DB->to_array();
-  foreach ($SimilarArray as $Similar) {
-    $JsonSimilar[] = array(
-      'artistId' => (int)$Similar['ArtistID'],
-      'name' => $Similar['Name'],
-      'score' => (int)$Similar['Score'],
-      'similarId' => (int)$Similar['SimilarID']
-    );
-  }
-  $NumSimilar = count($SimilarArray);
-} else {
-  //If data already exists, use it
-  foreach ($SimilarArray as $Similar) {
-    $JsonSimilar[] = array(
-      'artistId' => (int)$Similar['ArtistID'],
-      'name' => $Similar['Name'],
-      'score' => (int)$Similar['Score'],
-      'similarId' => (int)$Similar['SimilarID']
-    );
-  }
-}
-
 $JsonRequests = [];
 foreach ($Requests as $RequestID => $Request) {
   $JsonRequests[] = array(
@@ -369,7 +330,7 @@ if ($RevisionID) {
   $Key = "artist_$ArtistID";
 }
 
-$Data = array(array($Name, $Image, $Body, $NumSimilar, $SimilarArray, [], [], $VanityHouseArtist));
+$Data = array(array($Name, $Image, $Body));
 
 $Cache->cache_value($Key, $Data, 3600);
 
@@ -382,7 +343,6 @@ json_die("success", array(
   'body' => Text::full_format($Body),
   'vanityHouse' => $VanityHouseArtist == 1,
   'tags' => array_values($Tags),
-  'similarArtists' => $JsonSimilar,
   'statistics' => array(
     'numGroups' => $NumGroups,
     'numTorrents' => $NumTorrents,

sections/ajax/similar_artists.php

@@ -1,42 +0,0 @@
-<?php
-
-if (empty($_GET['id']) || !is_number($_GET['id']) || empty($_GET['limit']) || !is_number($_GET['limit'])) {
-  print
-    json_encode(
-      array(
-        'status' => 'failure'
-      )
-    );
-  die();
-}
-
-$artist_id = $_GET["id"];
-$artist_limit = $_GET["limit"];
-
-$DB->query("
-    SELECT
-      s2.ArtistID,
-      ag.Name,
-      ass.Score
-    FROM artists_similar AS s1
-      JOIN artists_similar AS s2 ON s1.SimilarID = s2.SimilarID AND s1.ArtistID != s2.ArtistID
-      JOIN artists_similar_scores AS ass ON ass.SimilarID = s1.SimilarID
-      JOIN artists_group AS ag ON ag.ArtistID = s2.ArtistID
-    WHERE s1.ArtistID = $artist_id
-    ORDER BY ass.Score DESC
-    LIMIT $artist_limit");
-
-
-    while (list($ArtistID, $Name, $Score) = $DB->next_record(MYSQLI_NUM, false)) {
-      if ($Score < 0) {
-        continue;
-      }
-      $results[] = array(
-          'id' => (int)$ArtistID,
-          'name' => $Name,
-          'score' => (int)$Score);
-    }
-
-print json_encode($results);
-exit();
-?>

sections/ajax/takevote.php

@@ -1,214 +0,0 @@
-<?
-authorize();
-
-$GroupID = $_REQUEST['groupid'];
-if (!is_number($GroupID)) {
-  echo 'Invalid Group';
-  die();
-}
-
-// What groups has this guy voted?
-$UserVotes = Votes::get_user_votes($LoggedUser['ID']);
-
-// What are the votes for this group?
-$GroupVotes = Votes::get_group_votes($GroupID);
-
-$UserID = $LoggedUser['ID'];
-if ($_REQUEST['do'] == 'vote') {
-  if (isset($UserVotes[$GroupID]) || !check_perms('site_album_votes')) {
-    echo 'noaction';
-    die();
-  }
-  if ($_REQUEST['vote'] != 'up' && $_REQUEST['vote'] != 'down') {
-    echo 'badvote';
-    die();
-  }
-  $Type = ($_REQUEST['vote'] == 'up') ? 'Up' : 'Down';
-
-  // Update the two votes tables if needed
-  $DB->query("
-    INSERT IGNORE INTO users_votes (UserID, GroupID, Type)
-    VALUES ($UserID, $GroupID, '$Type')");
-  if ($DB->affected_rows() == 0) {
-    echo 'noaction';
-    die();
-  }
-
-  // Update the group's cache key
-  $GroupVotes['Total'] += 1;
-  if ($Type == 'Up') {
-    $GroupVotes['Ups'] += 1;
-  }
-  $Cache->cache_value("votes_$GroupID", $GroupVotes);
-
-  // If the group has no votes yet, we need an insert, otherwise an update
-  // so we can cut corners and use the magic of INSERT...ON DUPLICATE KEY UPDATE...
-  // to accomplish both in one query
-  $DB->query("
-    INSERT INTO torrents_votes
-      (GroupID, Total, Ups, Score)
-    VALUES
-      ($GroupID, 1, ".($Type == 'Up' ? 1 : 0).", 0)
-    ON DUPLICATE KEY UPDATE
-      Total = Total + 1,
-      Score = IFNULL(binomial_ci(Ups".($Type == 'Up' ? '+1' : '').", Total), 0)".
-        ($Type == 'Up' ? ', Ups = Ups + 1' : ''));
-
-  $UserVotes[$GroupID] = array('GroupID' => $GroupID, 'Type' => $Type);
-
-  // Update this guy's cache key
-  $Cache->cache_value('voted_albums_'.$LoggedUser['ID'], $UserVotes);
-
-  // Update the paired cache keys for "people who liked"
-  // First update this album's paired votes. If this keys is magically not set,
-  // our life just got a bit easier. We're only tracking paired votes on upvotes.
-  if ($Type == 'Up') {
-    $VotePairs = $Cache->get_value("vote_pairs_$GroupID", true);
-    if ($VotePairs !== false) {
-      foreach ($UserVotes as $Vote) {
-        if ($Vote['GroupID'] == $GroupID) {
-          continue;
-        }
-        // Go through each of his other votes, incrementing the
-        // corresponding keys in this groups vote_pairs array
-        if (isset($VotePairs[$Vote['GroupID']])) {
-          $VotePairs[$Vote['GroupID']]['Total'] += 1;
-          if ($Vote['Type'] == 'Up') {
-            $VotePairs[$Vote['GroupID']]['Ups'] += 1;
-          }
-        } else {
-          $VotePairs[$Vote['GroupID']] = array(
-                'GroupID' => $Vote['GroupID'],
-                'Total' => 1,
-                'Ups' => ($Type == 'Up') ? 1 : 0);
-        }
-      }
-    }
-    $Cache->cache_value("vote_pairs_$GroupID", $VotePairs, 21600);
-  }
-
-  // Now do the paired votes keys for all of this guy's other votes
-  foreach ($UserVotes as $VGID => $Vote) {
-    if ($Vote['Type'] != 'Up') {
-      // We're only track paired votes on upvotes
-      continue;
-    }
-    if ($VGID == $GroupID) {
-      continue;
-    }
-    // Again, if the cache key is not set, move along
-    $VotePairs = $Cache->get_value("vote_pairs_$VGID", true);
-    if ($VotePairs !== false) {
-      // Go through all of the other albums paired to this one, and update
-      // this group's entry in their vote_pairs keys
-      if (isset($VotePairs[$GroupID])) {
-        $VotePairs[$GroupID]['Total']++;
-        if ($Type == 'Up') {
-          $VotePairs[$GroupID]['Ups']++;
-        }
-      } else {
-        $VotePairs[$GroupID] = array(
-              'GroupID' => $GroupID,
-              'Total' => 1,
-              'Ups' => ($Type == 'Up') ? 1 : 0);
-      }
-      $Cache->cache_value("vote_pairs_$VGID", $VotePairs, 21600);
-    }
-  }
-
-  echo 'success';
-} elseif ($_REQUEST['do'] == 'unvote') {
-  if (!isset($UserVotes[$GroupID])) {
-    echo 'noaction';
-    die();
-  }
-  $Type = $UserVotes[$GroupID]['Type'];
-
-  $DB->query("
-    DELETE FROM users_votes
-    WHERE UserID = $UserID
-      AND GroupID = $GroupID");
-
-  // Update personal cache key
-  unset($UserVotes[$GroupID]);
-  $Cache->cache_value('voted_albums_'.$LoggedUser['ID'], $UserVotes);
-
-  // Update the group's cache key
-  $GroupVotes['Total'] -= 1;
-  if ($Type == 'Up') {
-    $GroupVotes['Ups'] -= 1;
-  }
-  $Cache->cache_value("votes_$GroupID", $GroupVotes);
-
-  $DB->query('
-    UPDATE torrents_votes
-    SET
-      Total = GREATEST(0, Total - 1),
-      Score = IFNULL(binomial_ci(GREATEST(0, Ups'.($Type == 'Up' ? '-1' : '').'), GREATEST(0, Total)), 0)'.
-      ($Type == 'Up' ? ', Ups = GREATEST(0, Ups - 1)' : '')."
-    WHERE GroupID=$GroupID");
-  // Update paired cache keys
-  // First update this album's paired votes. If this keys is magically not set,
-  // our life just got a bit easier. We're only tracking paired votes on upvotes.
-  if ($Type == 'Up') {
-    $VotePairs = $Cache->get_value("vote_pairs_$GroupID", true);
-    if ($VotePairs !== false) {
-      foreach ($UserVotes as $Vote) {
-        if (isset($VotePairs[$Vote['GroupID']])) {
-          if ($VotePairs[$Vote['GroupID']]['Total'] == 0) {
-            // Something is screwy
-            $Cache->delete_value("vote_pairs_$GroupID");
-            continue;
-          }
-          $VotePairs[$Vote['GroupID']]['Total'] -= 1;
-          if ($Vote['Type'] == 'Up') {
-            $VotePairs[$Vote['GroupID']]['Ups'] -= 1;
-          }
-        } else {
-          // Something is screwy, kill the key and move on
-          $Cache->delete_value("vote_pairs_$GroupID");
-          break;
-        }
-      }
-    }
-    $Cache->cache_value("vote_pairs_$GroupID", $VotePairs, 21600);
-  }
-
-  // Now do the paired votes keys for all of this guy's other votes
-  foreach ($UserVotes as $VGID => $Vote) {
-    if ($Vote['Type'] != 'Up') {
-      // We're only track paired votes on upvotes
-      continue;
-    }
-    if ($VGID == $GroupID) {
-      continue;
-    }
-    // Again, if the cache key is not set, move along
-    $VotePairs = $Cache->get_value("vote_pairs_$VGID", true);
-    if ($VotePairs !== false) {
-      if (isset($VotePairs[$GroupID])) {
-        if ($VotePairs[$GroupID]['Total'] == 0) {
-          // Something is screwy
-          $Cache->delete_value("vote_pairs_$VGID");
-          continue;
-        }
-        $VotePairs[$GroupID]['Total'] -= 1;
-        if ($Type == 'Up') {
-          $VotePairs[$GroupID]['Ups'] -= 1;
-        }
-        $Cache->cache_value("vote_pairs_$VGID", $VotePairs, 21600);
-      } else {
-        // Something is screwy, kill the key and move on
-        $Cache->delete_value("vote_pairs_$VGID");
-      }
-    }
-  }
-
-  // Let the script know what happened
-  if ($Type == 'Up') {
-    echo 'success-up';
-  } else {
-    echo 'success-down';
-  }
-}
-?>

sections/artist/add_similar.php

@@ -1,70 +0,0 @@
-<?
-authorize();
-
-$UserID = $LoggedUser['ID'];
-$Artist1ID = db_string($_POST['artistid']);
-$Artist2Name = db_string($_POST['artistname']);
-
-if (!is_number($Artist1ID)) {
-  error(0);
-}
-
-if (empty($Artist2Name)) {
-  error('Blank artist name.');
-}
-
-$DB->query("
-  SELECT ArtistID
-  FROM artists_group
-  WHERE Name LIKE '$Artist2Name'");
-list($Artist2ID) = $DB->next_record();
-
-if (!empty($Artist2ID)) { // artist was found in the database
-
-  // Let's see if there's already a similar artists field for these two
-  $DB->query("
-    SELECT s1.SimilarID
-    FROM artists_similar AS s1
-      JOIN artists_similar AS s2 ON s1.SimilarID = s2.SimilarID
-    WHERE s1.ArtistID = '$Artist1ID'
-      AND s2.ArtistID = '$Artist2ID'");
-  list($SimilarID) = $DB->next_record();
-
-  if ($SimilarID) { // The similar artists field already exists, just update the score
-    $DB->query("
-      UPDATE artists_similar_scores
-      SET Score = Score + 200
-      WHERE SimilarID = '$SimilarID'");
-  } else { // No, it doesn't exist - create it
-    $DB->query("
-      INSERT INTO artists_similar_scores (Score)
-      VALUES ('200')");
-    $SimilarID = $DB->inserted_id();
-    $DB->query("
-      INSERT INTO artists_similar (ArtistID, SimilarID)
-      VALUES ('$Artist1ID', '$SimilarID')");
-    $DB->query("
-      INSERT INTO artists_similar (ArtistID, SimilarID)
-      VALUES ('$Artist2ID', '$SimilarID')");
-  }
-
-  $DB->query("
-    SELECT SimilarID
-    FROM artists_similar_votes
-    WHERE SimilarID = '$SimilarID'
-      AND UserID = '$UserID'
-      AND Way = 'up'");
-  if (!$DB->has_results()) {
-    $DB->query("
-      INSERT INTO artists_similar_votes (SimilarID, UserID, way)
-      VALUES ('$SimilarID', '$UserID', 'up')");
-  }
-
-  $Cache->delete_value("artist_$Artist1ID"); // Delete artist cache
-  $Cache->delete_value("artist_$Artist2ID"); // Delete artist cache
-  $Cache->delete_value("similar_positions_$Artist1ID"); // Delete artist's similar map cache
-  $Cache->delete_value("similar_positions_$Artist2ID"); // Delete artist's similar map cache
-}
-
-header('Location: '.$_SERVER['HTTP_REFERER']);
-?>

sections/artist/artist.php

@@ -6,17 +6,11 @@ function compare($X, $Y) {
   return($Y['count'] - $X['count']);
 }
 
-// Similar Artist Map
-include(SERVER_ROOT.'/classes/artists_similar.class.php');
-
-$UserVotes = Votes::get_user_votes($LoggedUser['ID']);
-
 $ArtistID = $_GET['id'];
 if (!is_number($ArtistID)) {
   error(0);
 }
 
-
 if (!empty($_GET['revisionid'])) { // if they're viewing an old revision
   $RevisionID = $_GET['revisionid'];
   if (!is_number($RevisionID)) {
@@ -29,8 +23,7 @@ if (!empty($_GET['revisionid'])) { // if they're viewing an old revision
 }
 
 if ($Data) {
-  #list($K, list($Name, $Image, $Body, $NumSimilar, $SimilarArray, , , $VanityHouseArtist)) = each($Data);
-  list($K, list($Name, $Image, $Body, $NumSimilar, $SimilarArray)) = each($Data);
+  list($K, list($Name, $Image, $Body)) = each($Data);
 } else {
   if ($RevisionID) {
     $sql = "
@@ -262,10 +255,7 @@ foreach ($TorrentList as $Group) {
             <span class="add_bookmark float_right">
               <a style="float: right;" href="#" id="bookmarklink_torrent_<?=$GroupID?>" class="brackets" onclick="Bookmark('torrent', <?=$GroupID?>, 'Remove bookmark'); return false;">Bookmark</a>
             </span>
-<?  }
-    $VoteType = isset($UserVotes[$GroupID]['Type']) ? $UserVotes[$GroupID]['Type'] : '';
-    Votes::vote_link($GroupID, $VoteType);
-?>
+<?  } ?>
             <div class="tags"><?=$TorrentTags->format('torrents.php?taglist=', $Name)?></div>
           </div>
         </td>
@@ -411,7 +401,7 @@ $TorrentDisplayList = ob_get_clean();
 // Comments (must be loaded before View::show_header so that subscriptions and quote notifications are handled properly)
 list($NumComments, $Page, $Thread, $LastRead) = Comments::load('artist', $ArtistID);
 
-View::show_header($Name, 'browse,requests,bbcode,comments,voting,recommend,subscriptions');
+View::show_header($Name, 'browse,requests,bbcode,comments,recommend,subscriptions');
 ?>
 <div class="thin">
   <div class="header">
@@ -572,75 +562,6 @@ foreach ($ZIPOptions as $Option) {
         <li>Number of snatches: <?=number_format($NumSnatches)?></li>
       </ul>
     </div>
-<?
-
-
-if (empty($SimilarArray)) {
-  $DB->query("
-    SELECT
-      s2.ArtistID,
-      a.Name,
-      ass.Score,
-      ass.SimilarID
-    FROM artists_similar AS s1
-      JOIN artists_similar AS s2 ON s1.SimilarID = s2.SimilarID AND s1.ArtistID != s2.ArtistID
-      JOIN artists_similar_scores AS ass ON ass.SimilarID = s1.SimilarID
-      JOIN artists_group AS a ON a.ArtistID = s2.ArtistID
-    WHERE s1.ArtistID = '$ArtistID'
-    ORDER BY ass.Score DESC
-    LIMIT 30
-  ");
-  $SimilarArray = $DB->to_array();
-  $NumSimilar = count($SimilarArray);
-}
-?>
-    <div class="box box_artists">
-      <div class="head"><strong>Similar</strong></div>
-      <ul class="stats nobullet">
-<?  if ($NumSimilar == 0) { ?>
-        <li><span style="font-style: italic;">None found</span></li>
-<?
-  }
-  $First = true;
-  foreach ($SimilarArray as $SimilarArtist) {
-    list($Artist2ID, $Artist2Name, $Score, $SimilarID) = $SimilarArtist;
-    $Score = $Score / 100;
-    if ($First) {
-      $Max = $Score + 1;
-      $First = false;
-    }
-
-    $FontSize = (ceil(((($Score - 2) / $Max - 2) * 4))) + 8;
-
-?>
-        <li>
-          <span class="tooltip" title="<?=$Score?>"><a href="artist.php?id=<?=$Artist2ID?>" style="float: left; display: block;"><?=$Artist2Name?></a></span>
-          <div style="float: right; display: block; letter-spacing: -1px;">
-            <a href="artist.php?action=vote_similar&amp;artistid=<?=$ArtistID?>&amp;similarid=<?=$SimilarID?>&amp;way=up" class="tooltip brackets vote_artist_up" title="Vote up this similar artist. Use this when you feel that the two artists are quite similar.">&and;</a>
-            <a href="artist.php?action=vote_similar&amp;artistid=<?=$ArtistID?>&amp;similarid=<?=$SimilarID?>&amp;way=down" class="tooltip brackets vote_artist_down" title="Vote down this similar artist. Use this when you feel that the two artists are not all that similar.">&or;</a>
-<?    if (check_perms('site_delete_tag')) { ?>
-            <span class="remove remove_artist"><a href="artist.php?action=delete_similar&amp;similarid=<?=$SimilarID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" class="tooltip brackets" title="Remove this similar artist">X</a></span>
-<?    } ?>
-          </div>
-          <br style="clear: both;" />
-        </li>
-<?    } ?>
-      </ul>
-    </div>
-    <div class="box box_addartists box_addartists_similar">
-      <div class="head"><strong>Add similar</strong></div>
-      <ul class="nobullet">
-        <li>
-          <form class="add_form" name="similar_artists" action="artist.php" method="post">
-            <input type="hidden" name="action" value="add_similar" />
-            <input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
-            <input type="hidden" name="artistid" value="<?=$ArtistID?>" />
-            <input type="text" autocomplete="off" id="artistsimilar" name="artistname" size="20"<? Users::has_autocomplete_enabled('other'); ?> />
-            <input type="submit" value="+" />
-          </form>
-        </li>
-      </ul>
-    </div>
   </div>
   <div class="main_column">
     <div id="artist_information" class="box">
@@ -780,105 +701,6 @@ if ($NumRequests > 0) {
 <?
 }
 
-// Similar Artist Map
-
-if ($NumSimilar > 0) {
-  if ($SimilarData = $Cache->get_value("similar_positions_$ArtistID")) {
-    $Similar = new ARTISTS_SIMILAR($ArtistID, $Name);
-    $Similar->load_data($SimilarData);
-    if (!(current($Similar->Artists)->NameLength)) {
-      unset($Similar);
-    }
-  }
-  if (empty($Similar) || empty($Similar->Artists)) {
-    include(SERVER_ROOT.'/classes/image.class.php');
-    $Img = new IMAGE;
-    $Img->create(WIDTH, HEIGHT);
-    $Img->color(255, 255, 255, 127);
-
-    $Similar = new ARTISTS_SIMILAR($ArtistID, $Name);
-    $Similar->set_up();
-    $Similar->set_positions();
-    $Similar->background_image();
-
-    $SimilarData = $Similar->dump_data();
-
-    $Cache->cache_value("similar_positions_$ArtistID", $SimilarData, 3600 * 24);
-  }
-?>
-    <div id="similar_artist_map" class="box">
-      <div id="flipper_head" class="head">
-        <a href="#">&uarr;</a>&nbsp;
-        <strong id="flipper_title">Similar Map</strong>
-        <a id="flip_to" class="brackets" href="#" onclick="flipView(); return false;">Switch to cloud</a>
-      </div>
-      <div id="flip_view_1" style="display: block; width: <?=(WIDTH)?>px; height: <?=(HEIGHT)?>px; position: relative; background-image: url(static/similar/<?=($ArtistID)?>.png?t=<?=(time())?>);">
-<?
-  $Similar->write_artists();
-?>
-      </div>
-      <div id="flip_view_2" style="display: none; width: <?=WIDTH?>px; height: <?=HEIGHT?>px;">
-        <canvas width="<?=WIDTH?>px" height="<?=(HEIGHT - 20)?>px" id="similarArtistsCanvas"></canvas>
-        <div id="artistTags" style="display: none;">
-          <ul><li></li></ul>
-        </div>
-        <strong style="margin-left: 10px;"><a id="currentArtist" href="#null">Loading...</a></strong>
-      </div>
-    </div>
-
-<script type="text/javascript">//<![CDATA[
-var cloudLoaded = false;
-
-function flipView() {
-  var state = document.getElementById('flip_view_1').style.display == 'block';
-
-  if (state) {
-    document.getElementById('flip_view_1').style.display = 'none';
-    document.getElementById('flip_view_2').style.display = 'block';
-    document.getElementById('flipper_title').innerHTML = 'Similar Cloud';
-    document.getElementById('flip_to').innerHTML = 'Switch to map';
-
-    if (!cloudLoaded) {
-      require("static/functions/tagcanvas.js", function () {
-        require("static/functions/artist_cloud.js", function () {
-        });
-      });
-      cloudLoaded = true;
-    }
-  }
-  else {
-    document.getElementById('flip_view_1').style.display = 'block';
-    document.getElementById('flip_view_2').style.display = 'none';
-    document.getElementById('flipper_title').innerHTML = 'Similar Map';
-    document.getElementById('flip_to').innerHTML = 'Switch to cloud';
-  }
-}
-
-//TODO move this to global, perhaps it will be used elsewhere in the future
-//http://stackoverflow.com/questions/7293344/load-javascript-dynamically
-function require(file, callback) {
-  var script = document.getElementsByTagName('script')[0],
-  newjs = document.createElement('script');
-
-  // IE
-  newjs.onreadystatechange = function () {
-    if (newjs.readyState === 'loaded' || newjs.readyState === 'complete') {
-      newjs.onreadystatechange = null;
-      callback();
-    }
-  };
-  // others
-  newjs.onload = function () {
-    callback();
-  };
-  newjs.src = file;
-  script.parentNode.insertBefore(newjs, script);
-}
-//]]>
-</script>
-
-<? }
-
 // --- Comments ---
 $Pages = Format::get_pages($Page, $NumComments, TORRENT_COMMENTS_PER_PAGE, 9, '#comments');
 
@@ -919,7 +741,7 @@ if ($RevisionID) {
   $Key = "artist_$ArtistID";
 }
 
-$Data = array(array($Name, $Image, $Body, $NumSimilar, $SimilarArray, [], [], $VanityHouseArtist));
+$Data = array(array($Name, $Image, $Body));
 
 $Cache->cache_value($Key, $Data, 3600);
 ?>

sections/artist/delete_similar.php

@@ -1,32 +0,0 @@
-<?php
-authorize();
-$SimilarID = db_string($_GET['similarid']);
-
-if (!is_number($SimilarID) || !$SimilarID) {
-  error(404);
-}
-if (!check_perms('site_delete_tag')) {
-  error(403);
-}
-$DB->query("
-  SELECT ArtistID
-  FROM artists_similar
-  WHERE SimilarID = '$SimilarID'");
-$ArtistIDs = $DB->to_array();
-$DB->query("
-  DELETE FROM artists_similar
-  WHERE SimilarID = '$SimilarID'");
-$DB->query("
-  DELETE FROM artists_similar_scores
-  WHERE SimilarID = '$SimilarID'");
-$DB->query("
-  DELETE FROM artists_similar_votes
-  WHERE SimilarID = '$SimilarID'");
-
-foreach ($ArtistIDs as $ArtistID) {
-  list($ArtistID) = $ArtistID;
-  $Cache->delete_value("artist_$ArtistID"); // Delete artist cache
-  $Cache->delete_value("similar_positions_$ArtistID");
-}
-header('Location: '.$_SERVER['HTTP_REFERER']);
-?>

sections/artist/vote_similar.php

@@ -1,38 +0,0 @@
-<?
-$UserID = $LoggedUser['ID'];
-$SimilarID = db_string($_GET['similarid']);
-$ArtistID = db_string($_GET['artistid']);
-$Way = db_string($_GET['way']);
-
-if (!is_number($SimilarID) || !is_number($ArtistID)) {
-  error(404);
-}
-if (!in_array($Way, array('up', 'down'))) {
-  error(404);
-}
-
-$DB->query("
-  SELECT SimilarID
-  FROM artists_similar_votes
-  WHERE SimilarID='$SimilarID'
-    AND UserID='$UserID'
-    AND Way='$Way'");
-if (!$DB->has_results()) {
-  if ($Way == 'down') {
-    $Score = 'Score-100';
-  } elseif ($Way == 'up') {
-    $Score = 'Score+100';
-  } else { // Nothing is impossible!
-    $Score = 'Score';
-  }
-  $DB->query("
-    UPDATE artists_similar_scores
-    SET Score=$Score
-    WHERE SimilarID='$SimilarID'");
-  $DB->query("
-    INSERT INTO artists_similar_votes (SimilarID, UserID, Way)
-    VALUES ('$SimilarID', '$UserID', '$Way')");
-  $Cache->delete_value('artist_'.$ArtistID); // Delete artist cache
-}
-header('Location: '.$_SERVER['HTTP_REFERER']);
-?>

sections/collages/artist_collage.php

@@ -82,7 +82,7 @@ for ($i = 0; $i < $NumGroups / $CollageCovers; $i++) {
   $CollagePages[] = $CollagePage;
 }
 
-View::show_header($Name, 'browse,collage,bbcode,voting,recommend');
+View::show_header($Name, 'browse,collage,bbcode,recommend');
 
 ?>
 <div class="thin">

sections/collages/torrent_collage.php

@@ -18,7 +18,6 @@ $GroupIDs = $DB->collect('GroupID');
 $Contributors = $DB->to_pair('GroupID', 'UserID', false);
 if (count($GroupIDs) > 0) {
   $TorrentList = Torrents::get_groups($GroupIDs);
-  $UserVotes = Votes::get_user_votes($LoggedUser['ID']);
 } else {
   $TorrentList = [];
 }
@@ -89,7 +88,6 @@ foreach ($GroupIDs as $GroupID) {
     $DisplayName .= " [$GroupDLSiteID]";
   }
   $SnatchedGroupClass = ($GroupFlags['IsSnatched'] ? ' snatched_group' : '');
-  $UserVote = isset($UserVotes[$GroupID]) ? $UserVotes[$GroupID]['Type'] : '';
   // Start an output buffer, so we can store this output in $TorrentTable
   ob_start();
 
@@ -118,7 +116,6 @@ foreach ($GroupIDs as $GroupID) {
           </span>
 <?
     }
-    Votes::vote_link($GroupID, $UserVote);
 ?>
           <div class="tags"><?=$TorrentTags->format()?></div>
         </td>
@@ -216,7 +213,6 @@ foreach ($GroupIDs as $GroupID) {
             | <a href="reportsv2.php?action=report&amp;id=<?=$TorrentID?>" class="tooltip" title="Report">RP</a>
           </span>
           <strong><?=$DisplayName?></strong>
-<?    Votes::vote_link($GroupID, $UserVote); ?>
           <div class="tags"><?=$TorrentTags->format()?></div>
         </td>
         <td class="number_column nobr"><?=Format::get_size($Torrent['Size'])?></td>
@@ -283,7 +279,7 @@ for ($i = 0; $i < $NumGroups / $CollageCovers; $i++) {
   $CollagePages[] = $CollagePage;
 }
 
-View::show_header($Name, 'browse,collage,bbcode,voting,recommend,wall');
+View::show_header($Name, 'browse,collage,bbcode,recommend,wall');
 ?>
 <div class="thin">
   <div class="header">

sections/schedule/daily/delete_dead_torrents.php

@@ -64,22 +64,4 @@ if (count($LogEntries) > 0) {
     VALUES $Values");
   echo "\nDeleted $i torrents for inactivity\n";
 }
-
-$DB->query("
-  SELECT SimilarID
-  FROM artists_similar_scores
-  WHERE Score <= 0");
-$SimilarIDs = implode(',', $DB->collect('SimilarID'));
-
-if ($SimilarIDs) {
-  $DB->query("
-    DELETE FROM artists_similar
-    WHERE SimilarID IN($SimilarIDs)");
-  $DB->query("
-    DELETE FROM artists_similar_scores
-    WHERE SimilarID IN($SimilarIDs)");
-  $DB->query("
-    DELETE FROM artists_similar_votes
-    WHERE SimilarID IN($SimilarIDs)");
-}
 ?>

sections/top10/index.php

@@ -26,9 +26,6 @@ if (empty($_GET['type']) || $_GET['type'] == 'torrents') {
     case 'history':
       include(SERVER_ROOT.'/sections/top10/history.php');
       break;
-    case 'votes':
-      include(SERVER_ROOT.'/sections/top10/votes.php');
-      break;
     case 'donors':
       include(SERVER_ROOT.'/sections/top10/donors.php');
       break;

sections/top10/votes.php

@@ -1,354 +0,0 @@
-<?
-// We need these to do our rankification
-include(SERVER_ROOT.'/sections/torrents/ranking_funcs.php');
-
-
-$UserVotes = Votes::get_user_votes($LoggedUser['ID']);
-
-if (!empty($_GET['advanced']) && check_perms('site_advanced_top10')) {
-  $Details = 'all';
-  $Limit = 25;
-
-  if (!empty($_GET['tags'])) {
-    $TagsAny = isset($_GET['anyall']) && $_GET['anyall'] === 'any';
-    $Tags = explode(',', str_replace('.', '_', trim($_GET['tags'])));
-    foreach ($Tags as $Tag) {
-      $Tag = preg_replace('/[^a-z0-9_]/', '', $Tag);
-      if ($Tag != '') {
-        $TagWhere[] = "g.TagList REGEXP '[[:<:]]".db_string($Tag)."[[:>:]]'";
-      }
-    }
-    $Operator = $TagsAny ? ' OR ' : ' AND ';
-    $Where[] = '('.implode($Operator, $TagWhere).')';
-  }
-  $Year1 = (int)$_GET['year1'];
-  $Year2 = (int)$_GET['year2'];
-  if ($Year1 > 0 && $Year2 <= 0) {
-    $Where[] = "g.Year = $Year1";
-  } elseif ($Year1 > 0 && $Year2 > 0) {
-    $Where[] = "g.Year BETWEEN $Year1 AND $Year2";
-  } elseif ($Year2 > 0 && $Year1 <= 0) {
-    $Where[] = "g.Year <= $Year2";
-  }
-} else {
-  $Details = 'all';
-  // defaults to 10 (duh)
-  $Limit = isset($_GET['limit']) ? intval($_GET['limit']) : 25;
-  $Limit = in_array($Limit, array(25, 100, 250)) ? $Limit : 25;
-}
-$Filtered = !empty($Where);
-
-if (!empty($Where)) {
-  $Where = implode(' AND ', $Where);
-}
-$WhereSum = (empty($Where)) ? '' : md5($Where);
-
-// Unlike the other top 10s, this query just gets some raw stats
-// We'll need to do some fancy-pants stuff to translate it into
-// BPCI scores before getting the torrent data
-$Query = '
-  SELECT v.GroupID, v.Ups, v.Total, v.Score
-  FROM torrents_votes AS v';
-if (!empty($Where)) {
-  $Query .= "
-    JOIN torrents_group AS g ON g.ID = v.GroupID
-  WHERE $Where AND ";
-} else {
-  $Query .= '
-  WHERE ';
-}
-$Query .= "
-    Score > 0
-  ORDER BY Score DESC
-  LIMIT $Limit";
-
-$TopVotes = $Cache->get_value('top10votes_'.$Limit.$WhereSum);
-if ($TopVotes === false) {
-  if ($Cache->get_query_lock('top10votes')) {
-    $DB->query($Query);
-
-    $Results = $DB->to_array('GroupID', MYSQLI_ASSOC, false);
-    $Ranks = Votes::calc_ranks($DB->to_pair('GroupID', 'Score', false));
-
-    $Groups = Torrents::get_groups(array_keys($Results));
-
-    $TopVotes = [];
-    foreach ($Results as $GroupID => $Votes) {
-      $TopVotes[$GroupID] = $Groups[$GroupID];
-      $TopVotes[$GroupID]['Ups'] = $Votes['Ups'];
-      $TopVotes[$GroupID]['Total'] = $Votes['Total'];
-      $TopVotes[$GroupID]['Score'] = $Votes['Score'];
-      $TopVotes[$GroupID]['Rank'] = $Ranks[$GroupID];
-    }
-
-    $Cache->cache_value('top10votes_'.$Limit.$WhereSum, $TopVotes, 60 * 30);
-    $Cache->clear_query_lock('top10votes');
-  } else {
-    $TopVotes = false;
-  }
-}
-View::show_header("Top $Limit Voted Groups",'browse,voting');
-?>
-<div class="thin">
-  <div class="header">
-    <h2>Top <?=$Limit?> Voted Groups</h2>
-    <? Top10View::render_linkbox("votes"); ?>
-  </div>
-<?
-
-if (check_perms('site_advanced_top10')) { ?>
-  <form class="search_form" name="votes" action="" method="get">
-    <input type="hidden" name="advanced" value="1" />
-    <input type="hidden" name="type" value="votes" />
-    <table cellpadding="6" cellspacing="1" border="0" class="layout border" width="100%">
-      <tr id="tagfilter">
-        <td class="label">Tags (comma-separated):</td>
-        <td class="ft_taglist">
-          <input type="text" name="tags" size="75" value="<? if (!empty($_GET['tags'])) { echo display_str($_GET['tags']);} ?>" />&nbsp;
-          <input type="radio" id="rdoAll" name="anyall" value="all"<?=(!isset($TagsAny) ? ' checked="checked"' : '')?> /><label for="rdoAll"> All</label>&nbsp;&nbsp;
-          <input type="radio" id="rdoAny" name="anyall" value="any"<?=(isset($TagsAny) ? ' checked="checked"' : '')?> /><label for="rdoAny"> Any</label>
-        </td>
-      </tr>
-      <tr id="yearfilter">
-        <td class="label">Year:</td>
-        <td class="ft_year">
-          <input type="text" name="year1" size="4" value="<? if (!empty($_GET['year1'])) { echo display_str($_GET['year1']);} ?>" />
-          to
-          <input type="text" name="year2" size="4" value="<? if (!empty($_GET['year2'])) { echo display_str($_GET['year2']);} ?>" />
-        </td>
-      </tr>
-      <tr>
-        <td colspan="2" class="center">
-          <input type="submit" value="Filter torrents" />
-        </td>
-      </tr>
-    </table>
-  </form>
-<?
-}
-
-$Bookmarks = Bookmarks::all_bookmarks('torrent');
-?>
-  <h3>Top <?=$Limit?>
-<?
-if (empty($_GET['advanced'])) { ?>
-    <small class="top10_quantity_links">
-<?
-  switch ($Limit) {
-    case 100: ?>
-      - <a href="top10.php?type=votes" class="brackets">Top 25</a>
-      - <span class="brackets">Top 100</span>
-      - <a href="top10.php?type=votes&amp;limit=250" class="brackets">Top 250</a>
-<?      break;
-    case 250: ?>
-      - <a href="top10.php?type=votes" class="brackets">Top 25</a>
-      - <a href="top10.php?type=votes&amp;limit=100" class="brackets">Top 100</a>
-      - <span class="brackets">Top 250</span>
-<?      break;
-    default: ?>
-      - <span class="brackets">Top 25</span>
-      - <a href="top10.php?type=votes&amp;limit=100" class="brackets">Top 100</a>
-      - <a href="top10.php?type=votes&amp;limit=250" class="brackets">Top 250</a>
-<?  } ?>
-    </small>
-<?
-} ?>
-  </h3>
-<?
-
-$TorrentTable = '';
-foreach ($TopVotes as $GroupID => $Group) {
-  extract(Torrents::array_group($Group));
-  $UpVotes = $Group['Ups'];
-  $TotalVotes = $Group['Total'];
-  $Score = $Group['Score'];
-  $DownVotes = $TotalVotes - $UpVotes;
-
-  $IsBookmarked = in_array($GroupID, $Bookmarks);
-  $UserVote = isset($UserVotes[$GroupID]) ? $UserVotes[$GroupID]['Type'] : '';
-
-  $TorrentTags = new Tags($TagList);
-  $DisplayName = "$Group[Rank] - ";
-
-  $DisplayName .= Artists::display_artists($Artists);
-
-  $DisplayName .= '<a href="torrents.php?id='.$GroupID.'" dir="ltr"';
-  if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
-    $DisplayName .= ' onmouseover="getCover(event)" data-cover="'.ImageTools::process($WikiImage, true).'" onmouseleave="ungetCover(event)"';
-  }
-  $DisplayName .= '>'.$GroupName.'</a>';
-  if ($GroupYear > 0) {
-    $DisplayName = $DisplayName. " [$GroupYear]";
-  }
-  // Start an output buffer, so we can store this output in $TorrentTable
-  ob_start();
-
-  if (count($Torrents) > 1 || $GroupCategoryID == 1) {
-    // Grouped torrents
-    $GroupSnatched = false;
-    foreach ($Torrents as &$Torrent) {
-      if (($Torrent['IsSnatched'] = Torrents::has_snatched($Torrent['ID'])) && !$GroupSnatched) {
-        $GroupSnatched = true;
-      }
-    }
-    unset($Torrent);
-    $SnatchedGroupClass = $GroupSnatched ? ' snatched_group' : '';
-?>
-        <tr class="group<?=$SnatchedGroupClass?>" id="group_<?=$GroupID?>">
-          <td class="center">
-            <div id="showimg_<?=$GroupID?>" class="show_torrents">
-              <a class="tooltip show_torrents_link" onclick="toggle_group(<?=$GroupID?>, this, event);" title="Toggle this group (Hold &quot;Shift&quot; to toggle all groups)"></a>
-            </div>
-          </td>
-          <td class="center cats_col">
-            <div title="<?=Format::pretty_category($GroupCategoryID)?>" class="tooltip <?=Format::css_category($GroupCategoryID)?>"></div>
-          </td>
-          <td class="big_info">
-            <div class="group_info clear">
-
-              <strong><?=$DisplayName?></strong> <!--<?Votes::vote_link($GroupID, $UserVote);?>-->
-<?    if ($IsBookmarked) { ?>
-              <span class="remove_bookmark float_right">
-                <a href="#" class="bookmarklink_torrent_<?=$GroupID?> brackets" onclick="Unbookmark('torrent', <?=$GroupID?>, 'Bookmark'); return false;">Remove bookmark</a>
-              </span>
-<?    } else { ?>
-              <span class="add_bookmark float_right">
-                <a href="#" class="bookmarklink_torrent_<?=$GroupID?> brackets" onclick="Bookmark('torrent', <?=$GroupID?>, 'Remove bookmark'); return false;">Bookmark</a>
-              </span>
-<?    } ?>
-              <div class="tags"><?=$TorrentTags->format()?></div>
-
-            </div>
-          </td>
-          <td colspan="4" class="votes_info_td">
-            <span style="white-space: nowrap;">
-              <span class="favoritecount_small tooltip" title="<?=$UpVotes . ($UpVotes == 1 ? ' upvote' : ' upvotes')?>"><span id="upvotes"><?=number_format($UpVotes)?></span> <span class="vote_album_up">&and;</span></span>
-              &nbsp; &nbsp;
-              <span class="favoritecount_small tooltip" title="<?=$DownVotes . ($DownVotes == 1 ? ' downvote' : ' downvotes')?>"><span id="downvotes"><?=number_format($DownVotes)?></span> <span class="vote_album_down">&or;</span></span>
-              &nbsp;
-              <span style="float: right;"><span class="favoritecount_small" id="totalvotes"><?=number_format($TotalVotes)?></span> Total</span>
-            </span>
-            <br />
-            <span style="white-space: nowrap;">
-              <span class="tooltip_interactive" title="&lt;span style=&quot;font-weight: bold;&quot;&gt;Score: <?=number_format($Score * 100, 4)?>&lt;/span&gt;&lt;br /&gt;&lt;br /&gt;This is the lower bound of the binomial confidence interval &lt;a href=&quot;wiki.php?action=article&amp;id=1037&quot;&gt;described here&lt;/a&gt;, multiplied by 100." data-title-plain="Score: <?=number_format($Score * 100, 4)?>. This is the lower bound of the binomial confidence interval described in the Favorite Album Votes wiki article, multiplied by 100.">Score: <span class="favoritecount_small"><?=number_format($Score * 100, 1)?></span></span>
-              &nbsp; | &nbsp;
-              <span class="favoritecount_small"><?=number_format($UpVotes / $TotalVotes * 100, 1)?>%</span> positive
-            </span>
-          </td>
-        </tr>
-<?
-    foreach ($Torrents as $TorrentID => $Torrent) {
-      //Get report info, use the cache if available, if not, add to it.
-      $Reported = false;
-      $Reports = Torrents::get_reports($TorrentID);
-      if (count($Reports) > 0) {
-        $Reported = true;
-      }
-      $SnatchedTorrentClass = $Torrent['IsSnatched'] ? ' snatched_torrent' : '';
-?>
-    <tr class="group_torrent torrent_row groupid_<?=$GroupID?> <?=$SnatchedTorrentClass . $SnatchedGroupClass?> hidden">
-      <td colspan="3">
-        <span>
-          [ <a href="torrents.php?action=download&amp;id=<?=$TorrentID?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>" class="tooltip" title="Download">DL</a>
-<?      if (Torrents::can_use_token($Torrent)) { ?>
-          | <a href="torrents.php?action=download&amp;id=<?=$TorrentID ?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>&amp;usetoken=1" class="tooltip" title="Use a FL Token" onclick="return confirm('Are you sure you want to use a freeleech token here?');">FL</a>
-<?      } ?>
-          | <a href="reportsv2.php?action=report&amp;id=<?=$TorrentID?>" class="tooltip" title="Report">RP</a> ]
-        </span>
-        &nbsp;&nbsp;&raquo;&nbsp; <a href="torrents.php?id=<?=$GroupID?>&amp;torrentid=<?=$TorrentID?>"><?=Torrents::torrent_info($Torrent)?><? if ($Reported) { ?> / <strong class="torrent_label tl_reported">Reported</strong><? } ?></a>
-      </td>
-      <td class="number_column nobr"><?=Format::get_size($Torrent['Size'])?></td>
-      <td class="number_column"><?=number_format($Torrent['Snatched'])?></td>
-      <td class="number_column<?=($Torrent['Seeders'] == 0) ? ' r00' : '' ?>"><?=number_format($Torrent['Seeders'])?></td>
-      <td class="number_column"><?=number_format($Torrent['Leechers'])?></td>
-    </tr>
-<?
-    }
-  } else { //if (count($Torrents) > 1 || $GroupCategoryID == 1)
-    // Viewing a type that does not require grouping
-
-    list($TorrentID, $Torrent) = each($Torrents);
-    $Torrent['IsSnatched'] = Torrents::has_snatched($TorrentID);
-
-    $DisplayName = $Group['Rank'] .' - <a href="torrents.php?id='.$GroupID.'" dir="ltr"';
-    if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
-      $DisplayName .= ' onmouseover="getCover(event)" data-cover="'.ImageTools::process($WikiImage, true).'" onmouseleave="ungetCover(event)"';
-    }
-    $DisplayName .= '>'.$GroupName.'</a>';
-    if ($Torrent['IsSnatched']) {
-      $DisplayName .= ' ' . Format::torrent_label('Snatched!');
-    }
-    if ($Torrent['FreeTorrent'] == '1') {
-      $DisplayName .= ' ' . Format::torrent_label('Freeleech!');
-    } elseif ($Torrent['FreeTorrent'] == '2') {
-      $DisplayName .= ' ' . Format::torrent_label('Neutral leech!');
-    } elseif (Torrents::has_token($TorrentID)) {
-      $DisplayName .= ' ' . Format::torrent_label('Personal freeleech!');
-    }
-    $SnatchedTorrentClass = $Torrent['IsSnatched'] ? ' snatched_torrent' : '';
-?>
-    <tr class="torrent torrent_row<?=$SnatchedTorrentClass . $SnatchedGroupClass?>" id="group_<?=$GroupID?>">
-      <td></td>
-      <td class="center cats_col">
-        <div title="<?=Format::pretty_category($GroupCategoryID)?>" class="tooltip <?=Format::css_category($GroupCategoryID)?>">
-        </div>
-      </td>
-      <td class="big_info">
-        <div class="group_info clear">
-          <span>
-            [ <a href="torrents.php?action=download&amp;id=<?=$TorrentID?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>" class="tooltip" title="Download">DL</a>
-<?    if (Torrents::can_use_token($Torrent)) { ?>
-            | <a href="torrents.php?action=download&amp;id=<?=$TorrentID ?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>&amp;usetoken=1" class="tooltip" title="Use a FL Token" onclick="return confirm('Are you sure you want to use a freeleech token here?');">FL</a>
-<?    } ?>
-            | <a href="reportsv2.php?action=report&amp;id=<?=$TorrentID?>" class="tooltip" title="Report">RP</a>
-<?    if ($IsBookmarked) { ?>
-            | <a href="#" id="bookmarklink_torrent_<?=$GroupID?>" class="remove_bookmark" onclick="Unbookmark('torrent', <?=$GroupID?>, 'Bookmark'); return false;">Remove bookmark</a>
-<?    } else { ?>
-            | <a href="#" id="bookmarklink_torrent_<?=$GroupID?>" class="add_bookmark" onclick="Bookmark('torrent', <?=$GroupID?>, 'Remove bookmark'); return false;">Bookmark</a>
-<?    } ?>
-            ]
-          </span>
-          <strong><?=$DisplayName?></strong> <!--<?Votes::vote_link($GroupID, $UserVote);?>-->
-          <div class="tags"><?=$TorrentTags->format()?></div>
-        </div>
-      </td>
-      <td class="number_column nobr"><?=Format::get_size($Torrent['Size'])?></td>
-      <td class="number_column"><?=number_format($Torrent['Snatched'])?></td>
-      <td class="number_column<?=($Torrent['Seeders'] == 0) ? ' r00' : '' ?>"><?=number_format($Torrent['Seeders'])?></td>
-      <td class="number_column"><?=number_format($Torrent['Leechers'])?></td>
-    </tr>
-<?
-  } //if (count($Torrents) > 1 || $GroupCategoryID == 1)
-  $TorrentTable .= ob_get_clean();
-}
-?>
-<table class="torrent_table grouping cats box" id="discog_table">
-  <tr class="colhead_dark">
-    <td><!-- expand/collapse --></td>
-    <td class="cats_col"><!-- category --></td>
-    <td width="70%">Torrents</td>
-    <td>Size</td>
-    <td class="sign snatches"><svg width="15" height="15" fill="white" class="tooltip" alt="Snatches" title="Snatches" viewBox="3 0 88 98"><path d="M20 20 A43 43,0,1,0,77 23 L90 10 L55 10 L55 45 L68 32 A30.27 30.27,0,1,1,28 29"></path></svg></td>
-    <td class="sign seeders"><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 class="sign leechers"><svg width="11" height="15" fill="white" class="tooltip" alt="Leechers" title="Leechers"><polygon points="0,8 5.5,15 11,8 8,8 8,0 3,0 3,8"></polygon></svg></td>
-  </tr>
-<?
-if ($TopVotes === false) { ?>
-  <tr>
-    <td colspan="7" class="center">Server is busy processing another top list request. Please try again in a minute.</td>
-  </tr>
-<?
-} elseif (count($TopVotes) === 0) { ?>
-  <tr>
-    <td colspan="7" class="center">No torrents were found that meet your criteria.</td>
-  </tr>
-<?
-} else {
-  echo $TorrentTable;
-}
-?>
-</table>
-</div>
-<?
-View::show_footer();
-?>

sections/torrents/details.php

@@ -297,8 +297,6 @@ if ($Categories[$GroupCategoryID - 1] != 'Other') {
 <?
     }
   }
-include(SERVER_ROOT.'/sections/torrents/vote_ranks.php');
-include(SERVER_ROOT.'/sections/torrents/vote.php');
 ?>
     <div class="box box_tags">
       <div class="head">
@@ -777,8 +775,6 @@ if (count($PersonalCollages) > 0) {
     </table>
 <?
 }
-// Matched Votes
-include(SERVER_ROOT.'/sections/torrents/voter_picks.php');
 ?>
     <div class="box torrent_description">
       <div class="head"><a href="#">&uarr;</a>&nbsp;<strong><?=(!empty($ReleaseType) ? $ReleaseTypes[$ReleaseType].' info' : 'Info' )?></strong></div>

sections/torrents/editgroupid.php

@@ -85,7 +85,6 @@ if (empty($_POST['confirm'])) {
     WHERE GroupID = '$OldGroupID'");
   list($TorrentsInGroup) = $DB->next_record();
   if ($TorrentsInGroup == 0) {
-    // TODO: votes etc!
     $DB->query("
       UPDATE comments
       SET PageID = '$GroupID'

sections/torrents/merge.php

@@ -70,54 +70,6 @@ if (empty($_POST['confirm'])) {
 } else {
   authorize();
 
-  // Votes ninjutsu. This is so annoyingly complicated.
-  // 1. Get a list of everybody who voted on the old group and clear their cache keys
-  $DB->query("
-    SELECT UserID
-    FROM users_votes
-    WHERE GroupID = '$GroupID'");
-  while (list($UserID) = $DB->next_record()) {
-    $Cache->delete_value("voted_albums_$UserID");
-  }
-  // 2. Update the existing votes where possible, clear out the duplicates left by key
-  // conflicts, and update the torrents_votes table
-  $DB->query("
-    UPDATE IGNORE users_votes
-    SET GroupID = '$NewGroupID'
-    WHERE GroupID = '$GroupID'");
-  $DB->query("
-    DELETE FROM users_votes
-    WHERE GroupID = '$GroupID'");
-  $DB->query("
-    INSERT INTO torrents_votes (GroupID, Ups, Total, Score)
-      SELECT $NewGroupID, UpVotes, TotalVotes, VoteScore
-      FROM (
-        SELECT
-          IFNULL(SUM(IF(Type = 'Up', 1, 0)), 0) As UpVotes,
-          COUNT(1) AS TotalVotes,
-          binomial_ci(IFNULL(SUM(IF(Type = 'Up', 1, 0)), 0), COUNT(1)) AS VoteScore
-        FROM users_votes
-        WHERE GroupID = $NewGroupID
-        GROUP BY GroupID
-      ) AS a
-    ON DUPLICATE KEY UPDATE
-      Ups = a.UpVotes,
-      Total = a.TotalVotes,
-      Score = a.VoteScore;");
-  // 3. Clear the votes_pairs keys!
-  $DB->query("
-    SELECT v2.GroupID
-    FROM users_votes AS v1
-      INNER JOIN users_votes AS v2 USING (UserID)
-    WHERE (v1.Type = 'Up' OR v2.Type = 'Up')
-      AND (v1.GroupID IN($GroupID, $NewGroupID))
-      AND (v2.GroupID NOT IN($GroupID, $NewGroupID));");
-  while (list($CacheGroupID) = $DB->next_record()) {
-    $Cache->delete_value("vote_pairs_$CacheGroupID");
-  }
-  // 4. Clear the new groups vote keys
-  $Cache->delete_value("votes_$NewGroupID");
-
   $DB->query("
     UPDATE torrents
     SET GroupID = '$NewGroupID'

sections/torrents/ranking_funcs.php

@@ -1,93 +0,0 @@
-<?php
-function inverse_ncdf($p) {
-/***************************************************************************
- *                                inverse_ncdf.php
- *                            -------------------
- *   begin                : Friday, January 16, 2004
- *   copyright            : (C) 2004 Michael Nickerson
- *   email                : nickersonm@yahoo.com
- *
- ***************************************************************************/
-
-  //Inverse ncdf approximation by Peter John Acklam, implementation adapted to
-  //PHP by Michael Nickerson, using Dr. Thomas Ziegler's C implementation as
-  //a guide.  http://home.online.no/~pjacklam/notes/invnorm/index.html
-  //I have not checked the accuracy of this implementation.  Be aware that PHP
-  //will truncate the coeficcients to 14 digits.
-
-  //You have permission to use and distribute this function freely for
-  //whatever purpose you want, but please show common courtesy and give credit
-  //where credit is due.
-
-  //Input paramater is $p - probability - where 0 < p < 1.
-
-  //Coefficients in rational approximations
-  $a = array(1 => -3.969683028665376e+01, 2 => 2.209460984245205e+02,
-         3 => -2.759285104469687e+02, 4 => 1.383577518672690e+02,
-         5 => -3.066479806614716e+01, 6 => 2.506628277459239e+00);
-
-  $b = array(1 => -5.447609879822406e+01, 2 => 1.615858368580409e+02,
-         3 => -1.556989798598866e+02, 4 => 6.680131188771972e+01,
-         5 => -1.328068155288572e+01);
-
-  $c = array(1 => -7.784894002430293e-03, 2 => -3.223964580411365e-01,
-         3 => -2.400758277161838e+00, 4 => -2.549732539343734e+00,
-         5 => 4.374664141464968e+00,  6 => 2.938163982698783e+00);
-
-  $d = array(1 => 7.784695709041462e-03, 2 => 3.224671290700398e-01,
-         3 => 2.445134137142996e+00, 4 => 3.754408661907416e+00);
-
-  //Define break-points.
-  $p_low  = 0.02425;                   //Use lower region approx. below this
-  $p_high = 1 - $p_low;                 //Use upper region approx. above this
-
-  //Define/list variables (doesn't really need a definition)
-  //$p (probability), $sigma (std. deviation), and $mu (mean) are user inputs
-  $q = null; $x = null; $y = null; $r = null;
-
-  //Rational approximation for lower region.
-  if (0 < $p && $p < $p_low) {
-    $q = sqrt(-2 * log($p));
-    $x = ((((($c[1] * $q + $c[2]) * $q + $c[3]) * $q + $c[4]) * $q + $c[5]) *
-            $q + $c[6]) / (((($d[1] * $q + $d[2]) * $q + $d[3]) * $q + $d[4]) *
-          $q + 1);
-  }
-
-  //Rational approximation for central region.
-  elseif ($p_low <= $p && $p <= $p_high) {
-    $q = $p - 0.5;
-    $r = $q * $q;
-    $x = ((((($a[1] * $r + $a[2]) * $r + $a[3]) * $r + $a[4]) * $r + $a[5]) *
-            $r + $a[6]) * $q / ((((($b[1] * $r + $b[2]) * $r + $b[3]) * $r +
-          $b[4]) * $r + $b[5]) * $r + 1);
-  }
-
-  //Rational approximation for upper region.
-  elseif ($p_high < $p && $p < 1) {
-    $q = sqrt(-2 * log(1 - $p));
-    $x = -((((($c[1] * $q + $c[2]) * $q + $c[3]) * $q + $c[4]) * $q +
-            $c[5]) * $q + $c[6]) / (((($d[1] * $q + $d[2]) * $q + $d[3]) *
-          $q + $d[4]) * $q + 1);
-  }
-
-  //If 0 < p < 1, return a null value
-  else {
-    $x = null;
-  }
-
-  return $x;
-  //END inverse ncdf implementation.
-}
-
-// Confidence level for binomial scoring.  Just compute this once.
-define('Z_VAL', inverse_ncdf(1 - (1 - 0.95) / 2));
-
-// Implementation of the algorithm described at http://www.evanmiller.org/how-not-to-sort-by-average-rating.html
-function binomial_score($Ups, $Total) {
-  if (($Total <= 0) || ($Ups < 0)) {
-    return 0;
-  }
-  $phat = $Ups/$Total;
-  return ($phat + Z_VAL * Z_VAL / (2 * $Total) - Z_VAL * sqrt(($phat * (1 - $phat) + Z_VAL * Z_VAL / (4 * $Total)) / $Total)) / (1 + Z_VAL * Z_VAL / $Total);
-}
-?>

sections/torrents/takechangecategory.php

@@ -96,7 +96,6 @@ $DB->query("
   FROM torrents
   WHERE GroupID = '$OldGroupID'");
 if (!$DB->has_results()) {
-  // TODO: votes etc.
   $DB->query("
     UPDATE comments
     SET PageID = '$GroupID'

sections/torrents/user.php

@@ -3,7 +3,6 @@
 
 $Orders = array('Time', 'Name', 'Seeders', 'Leechers', 'Snatched', 'Size');
 $Ways = array('DESC' => 'Descending', 'ASC' => 'Ascending');
-$UserVotes = Votes::get_user_votes($LoggedUser['ID']);
 
 // The "order by x" links on columns headers
 function header_link($SortKey, $DefaultWay = 'DESC') {
@@ -328,7 +327,7 @@ $Results = Torrents::get_groups($GroupIDs);
 $Action = display_str($_GET['type']);
 $User = Users::user_info($UserID);
 
-View::show_header($User['Username']."'s $Action torrents",'voting,browse');
+View::show_header($User['Username']."'s $Action torrents", 'browse');
 
 $Pages = Format::get_pages($Page, $TorrentCount, TORRENTS_PER_PAGE);
 
@@ -545,7 +544,6 @@ foreach ($Categories as $CatKey => $CatName) {
             | <a href="reportsv2.php?action=report&amp;id=<?=$TorrentID?>" class="tooltip" title="Report">RP</a> ]
           </span>
           <? echo "$DisplayName\n"; ?>
-<?          Votes::vote_link($GroupID, isset($UserVotes[$GroupID]) ? $UserVotes[$GroupID]['Type'] : ''); ?>
           <div class="tags"><?=$TorrentTags->format('torrents.php?type='.$Action.'&amp;userid='.$UserID.'&amp;tags=')?></div>
         </div>
       </td>

sections/torrents/vote.php

@@ -1,36 +0,0 @@
-<?
-  $UserVotes = Votes::get_user_votes($LoggedUser['ID']);
-  $GroupVotes = Votes::get_group_votes($GroupID);
-
-  $TotalVotes = $GroupVotes['Total'];
-  $UpVotes  = $GroupVotes['Ups'];
-  $DownVotes  = $TotalVotes - $UpVotes;
-
-  $Voted = isset($UserVotes[$GroupID]) ? $UserVotes[$GroupID]['Type'] : false;
-  $Score = Votes::binomial_score($UpVotes, $TotalVotes);
-?>
-<div class="box" id="votes">
-  <div class="head"><strong>Group Votes</strong></div>
-  <div class="album_votes body">
-    <span class="favoritecount tooltip" title="<?=$UpVotes . ($UpVotes == 1 ? ' upvote' : ' upvotes')?>"><span id="upvotes"><?=number_format($UpVotes)?></span> <span class="vote_album_up">&and;</span></span>
-    &nbsp; &nbsp;
-    <span class="favoritecount tooltip" title="<?=$DownVotes . ($DownVotes == 1 ? ' downvote' : ' downvotes')?>"><span id="downvotes"><?=number_format($DownVotes)?></span> <span class="vote_album_down">&or;</span></span>
-    &nbsp; &nbsp;
-    <span class="favoritecount" id="totalvotes"><?=number_format($TotalVotes)?></span> Total
-    <br /><br />
-    <span class="tooltip_interactive" title="&lt;span style=&quot;font-weight: bold;&quot;&gt;Score: <?=number_format($Score * 100, 4)?>&lt;/span&gt;&lt;br /&gt;&lt;br /&gt;This is the lower bound of the binomial confidence interval &lt;a href=&quot;wiki.php?action=article&amp;id=1037&quot;&gt;described here&lt;/a&gt;, multiplied by 100." data-title-plain="Score: <?=number_format($Score * 100, 4)?>. This is the lower bound of the binomial confidence interval described in the Favorite Album Votes wiki article, multiplied by 100.">Score: <span class="favoritecount"><?=number_format($Score * 100, 1)?></span></span>
-    &nbsp; | &nbsp;
-    <span class="favoritecount"><?=number_format(($TotalVotes == 0) ? 0 : ($UpVotes / $TotalVotes) * 100, 1)?>%</span> positive
-    <br /><br />
-    <span id="upvoted"<?=(($Voted != 'Up') ? ' class="hidden"' : '')?>>You have upvoted.<br /><br /></span>
-    <span id="downvoted"<?=(($Voted != 'Down') ? ' class="hidden"' : '')?>>You have downvoted.<br /><br /></span>
-<?  if (check_perms('site_album_votes')) { ?>
-    <span<?=($Voted ? ' class="hidden"' : '')?> id="vote_message"><a href="#" class="brackets upvote" onclick="UpVoteGroup(<?=$GroupID?>, '<?=$LoggedUser['AuthKey']?>'); return false;">Upvote</a> - <a href="#" class="brackets downvote" onclick="DownVoteGroup(<?=$GroupID?>, '<?=$LoggedUser['AuthKey']?>'); return false;">Downvote</a></span>
-<?  } ?>
-    <span<?=($Voted ? '' : ' class="hidden"')?> id="unvote_message">
-      Changed your mind?
-      <br />
-      <a href="#" onclick="UnvoteGroup(<?=$GroupID?>, '<?=$LoggedUser['AuthKey']?>'); return false;" class="brackets">Clear your vote</a>
-    </span>
-  </div>
-</div>

sections/torrents/vote_ranks.php

@@ -1,39 +0,0 @@
-<?
-// Show the "This album is number x overall", etc. box for the "Music" category only
-if ($GroupCategoryID == 1) {
-  $Rankings = Votes::get_ranking($GroupID, $GroupYear);
-  $LIs = '';
-  // Display information for the return categories of get_ranking()
-  $GroupDecade = $GroupYear - ($GroupYear % 10);
-  $names = array('overall'=>'<a href="top10.php?type=votes">overall</a>',
-        'decade'=>check_perms('site_advanced_top10') ? 'for the <a href="top10.php?advanced=1&amp;type=votes&amp;year1='.$GroupDecade.'&amp;year2='.($GroupDecade+9).'">'.$GroupDecade.'s</a>' : 'for the '.$GroupDecade.'s',
-        'year'=>check_perms('site_advanced_top10') ? 'for <a href="top10.php?advanced=1&amp;type=votes&amp;year1='.$GroupYear.'&amp;year2=">'.$GroupYear.'</a>' : "for $GroupYear");
-
-  foreach ($names as $key => $text) {
-    if ($Rank = $Rankings[$key]) {
-      if ($Rank <= 10) {
-        $Class = 'vr_top_10';
-      } elseif ($Rank <= 25) {
-        $Class = 'vr_top_25';
-      } elseif ($Rank <= 50) {
-        $Class = 'vr_top_50';
-      }
-
-      $LIs .= "<li id=\"vote_rank_$key\" class=\"$Class\">No. $Rank $text</li>";
-    }
-  }
-
-  if ($LIs != '') {
-?>
-    <div class="box" id="votes_ranks">
-      <div class="head"><strong><?=SITE_NAME?> Favorites</strong></div>
-      <div class="vote_charts body">
-        <ul class="stats nobullet" id="vote_rankings">
-          <?=$LIs?>
-        </ul>
-      </div>
-    </div>
-<?
-  }
-}
-?>

sections/torrents/voter_picks.php

@@ -1,64 +0,0 @@
-<?
-//global $Cache, $DB;
-include(SERVER_ROOT.'/sections/torrents/ranking_funcs.php');
-
-$Top10 = $Cache->get_value('similar_albums_'.$GroupID);
-if ($Top10 === false || isset($Top10[$GroupID])) {
-
-  $VotePairs = $Cache->get_value('vote_pairs_'.$GroupID, true);
-  if ($VotePairs === false || isset($VotePairs[$GroupID])) {
-    $DB->query("
-      SELECT v.GroupID, SUM(IF(v.Type='Up',1,0)) AS Ups, COUNT(1) AS Total
-      FROM (  SELECT UserID
-          FROM users_votes
-          WHERE GroupID = '$GroupID'
-            AND Type='Up'
-        ) AS a
-        JOIN users_votes AS v USING (UserID)
-      WHERE v.GroupID != '$GroupID'
-      GROUP BY v.GroupID
-      HAVING Ups > 0");
-    $VotePairs = $DB->to_array('GroupID', MYSQLI_ASSOC, false);
-    $Cache->cache_value('vote_pairs_'.$GroupID, $VotePairs, 21600);
-  }
-
-  $GroupScores = [];
-  foreach ($VotePairs as $RatingGroup) {
-    // Cutting out the junk should speed the sort significantly
-    $Score = binomial_score($RatingGroup['Ups'], $RatingGroup['Total']);
-    if ($Score > 0.3) {
-      $GroupScores[$RatingGroup['GroupID']] = $Score;
-    }
-  }
-
-  arsort($GroupScores);
-  $Top10 = array_slice($GroupScores, 0, 10, true);
-  $Cache->cache_value('similar_albums_'.$GroupID, $Top10, 0.5 * 3600);
-}
-if (count($Top10) > 0) {
-?>
-    <table class="box vote_matches_table" id="vote_matches">
-      <tr class="colhead">
-        <td><a href="#">&uarr;</a>&nbsp;People who like this also liked... <a data-toggle-target=".votes_rows" class="brackets" style="float: right;">Toggle</a></td>
-      </tr>
-<?
-  $Top10Groups = array_keys($Top10);
-
-  $Groups = Torrents::get_groups($Top10Groups, true, true, false);
-  $i = 0;
-  foreach ($Top10Groups as $MatchGroupID) {
-    if (!isset($Groups[$MatchGroupID])) {
-      continue;
-    }
-    $MatchGroup = $Groups[$MatchGroupID];
-    $i++;
-    $Str = Artists::display_artists($MatchGroup['ExtendedArtists']).'<a href="torrents.php?id='.$MatchGroupID.'">'.$MatchGroup['Name'].'</a>';
-?>
-      <tr class="votes_rows hidden row">
-        <td><span class="like_ranks"><?=$i?>.</span> <?=$Str?></td>
-      </tr>
-<?  } ?>
-    </table>
-<?
-}
-?>

sections/user/edit.php

@@ -323,13 +323,6 @@ echo $Val->GenerateJS('userform');
           </select>
         </td>
       </tr>
-      <tr id="tor_voting_tr">
-        <td class="label tooltip" title="This option allows you to enable or disable &quot;up&quot; and &quot;down&quot; voting links on artist pages, collections, and snatched lists."><strong>Voting links</strong></td>
-        <td>
-          <input type="checkbox" name="novotelinks" id="novotelinks"<?=!empty($SiteOptions['NoVoteLinks']) ? ' checked="checked"' : ''?> />
-          <label for="novotelinks">Disable voting links</label>
-        </td>
-      </tr>
       <tr id="tor_hidequestionable_tr">
         <td class="label tooltip" title="Prevent torrents with these tags from showing up on the torrent search page"><strong>Content Filtering</strong></td>
         <td>

sections/user/take_edit.php

@@ -273,7 +273,6 @@ $Options['ListUnreadPMsFirst']  = (!empty($_POST['list_unread_pms_first']) ? 1 :
 $Options['ShowSnatched']        = (!empty($_POST['showsnatched']) ? 1 : 0);
 $Options['ShowMagnets']         = (!empty($_POST['showmagnets']) ? 1 : 0);
 $Options['DisableAutoSave']     = (!empty($_POST['disableautosave']) ? 1 : 0);
-$Options['NoVoteLinks']         = (!empty($_POST['novotelinks']) ? 1 : 0);
 $Options['CoverArt']            = (int)!empty($_POST['coverart']);
 $Options['ShowExtraCovers']     = (int)!empty($_POST['show_extra_covers']);
 $Options['HideLolicon']         = (int)!empty($_POST['hide_lolicon']);

static/functions/artist_cloud.js

@@ -1,104 +0,0 @@
-(function() {
-
-var LIMIT = 10;
-var artistId, artistName;
-var artistTags;
-$(document).ready(function() {
-  initArtistCloud();
-});
-function initArtistCloud() {
-  $("#currentArtist").text();
-
-  artistTags = $("#artistTags").find('ul');
-  artistName = $("#content").find("h2:first").text();
-  artistId = window.location.search.split("?id=")[1];
-  addArtistMain(artistName);
-  loadArtists();
-}
-
-
-function loadArtists() {
-  $.getJSON('ajax.php?action=similar_artists&id='+artistId+'&limit='+LIMIT, function(data) {
-    var first = true;
-    var ratio;
-    $.each(data, function(key, val) {
-      if (first) {
-        ratio = val['score'] / 300;
-        first = false;
-      }
-      var score = val['score'] / ratio;
-      score = score <= 150 ? 150 : score;
-      addArtist(val['id'], val['name'], score);
-    });
-
-  createCloud();
-  });
-
-}
-
-function addArtist(id, name, score) {
-  var item = $('<li><a style="color:#007DC6;" data-weight="' + score + '">' + name + '</a></li>');
-
-  $(item).click(function(e) {
-    e.preventDefault();
-    reinit(id, name);
-  });
-
-  artistTags.append(item);
-}
-
-function addArtistMain(name) {
-  var item = $('<li><a style="color: #007DC6;" data-weight="350">' + name + '</a></li>');
-
-  $("#currentArtist").attr('href', 'artist.php?id=' + artistId);
-  $("#currentArtist").text(artistName);
-
-
-  $(item).click(function(e) {
-    e.preventDefault();
-    reinit(artistId, name);
-  });
-
-  artistTags.append(item);
-}
-
-function reinit(id, name) {
-  artistId = id;
-  artistName = name;
-  artistTags.empty();
-  addArtistMain(artistName);
-  loadArtists();
-}
-
-function createCloud() {
-  if (!$('#similarArtistsCanvas').tagcanvas({
-
-    // textFont: 'Impact,"Arial Black",sans-serif',
-    wheelZoom: false,
-    freezeActive: true,
-    weightSize: 0.15,
-    interval: 20,
-    textFont: null,
-    textColour: null,
-    textHeight: 25,
-    outlineColour: '#f96',
-    outlineThickness: 4,
-    maxSpeed: 0.04,
-    minBrightness: 0.1,
-    depth: 0.92,
-    pulsateTo: 0.2,
-    pulsateTime: 0.75,
-    initial: [0.1,-0.1],
-    decel: 0.98,
-    reverse: true,
-    shadow: '#ccf',
-    shadowBlur: 3,
-    weight : true,
-    weightFrom: 'data-weight'
-  },'artistTags')) {
-    // something went wrong, hide the canvas container
-    $('#flip_view_2').hide();
-  }
-}
-
-})();

static/functions/torrent.js

@@ -188,71 +188,3 @@ function Vote(amount, requestid) {
     }
   );
 }
-
-var voteLock = false;
-function DownVoteGroup(groupid, authkey) {
-  if (voteLock) {
-    return;
-  }
-  voteLock = true;
-  ajax.get('ajax.php?action=votefavorite&do=vote&groupid=' + groupid + '&vote=down' + '&auth=' + authkey, function (response) {
-      if (response == 'noaction') {
-        //No increment
-      } else if (response == 'success') {
-        $('#downvotes').raw().innerHTML = (parseInt($('#downvotes').raw().innerHTML)) + 1;
-        $('#totalvotes').raw().innerHTML = (parseInt($('#totalvotes').raw().innerHTML)) + 1;
-      }
-    }
-  );
-  $('#vote_message').ghide();
-  $('#unvote_message').gshow();
-  $('#upvoted').ghide();
-  $('#downvoted').gshow();
-  voteLock = false;
-}
-
-function UpVoteGroup(groupid, authkey) {
-  if (voteLock) {
-    return;
-  }
-  voteLock = true;
-  ajax.get('ajax.php?action=votefavorite&do=vote&groupid=' + groupid + '&vote=up' + '&auth=' + authkey, function (response) {
-      if (response == 'noaction') {
-        //No increment
-      } else if (response == 'success') {
-        // Increment both the upvote count and the total votes count
-        $('#upvotes').raw().innerHTML = (parseInt($('#upvotes').raw().innerHTML)) + 1;
-        $('#totalvotes').raw().innerHTML = (parseInt($('#totalvotes').raw().innerHTML)) + 1;
-      }
-    }
-  );
-  $('#vote_message').ghide();
-  $('#unvote_message').gshow();
-  $('#upvoted').gshow();
-  $('#downvoted').ghide();
-  voteLock = false;
-}
-
-function UnvoteGroup(groupid, authkey) {
-  if (voteLock) {
-    return;
-  }
-  voteLock = true;
-  ajax.get('ajax.php?action=votefavorite&do=unvote&groupid=' + groupid + '&auth=' + authkey, function (response) {
-      if (response == 'noaction') {
-        //No increment
-      } else if (response == 'success-down') {
-        $('#totalvotes').raw().innerHTML = (parseInt($('#totalvotes').raw().innerHTML)) - 1;
-        $('#downvotes').raw().innerHTML = (parseInt($('#downvotes').raw().innerHTML)) - 1;
-      } else if (response == 'success-up') {
-        $('#totalvotes').raw().innerHTML = (parseInt($('#totalvotes').raw().innerHTML)) - 1;
-        $('#upvotes').raw().innerHTML = (parseInt($('#upvotes').raw().innerHTML)) - 1;
-      }
-    }
-  );
-  $('#vote_message').gshow();
-  $('#unvote_message').ghide();
-  $('#upvoted').ghide();
-  $('#downvoted').ghide();
-  voteLock = false;
-}

static/functions/voting.js

@@ -1,39 +0,0 @@
-var voteLock = false;
-function DownVoteGroup(groupid, authkey) {
-  if (voteLock) {
-    return;
-  }
-  voteLock = true;
-  ajax.get('ajax.php?action=votefavorite&do=vote&groupid=' + groupid + '&vote=down' + '&auth=' + authkey, function (response) { return });
-  $('.vote_link_' + groupid).ghide();
-  $('.vote_clear_' + groupid).gshow();
-  $('.voted_down_' + groupid).gshow();
-  $('.voted_up_' + groupid).ghide();
-  voteLock = false;
-}
-
-function UpVoteGroup(groupid, authkey) {
-  if (voteLock) {
-    return;
-  }
-  voteLock = true;
-  ajax.get('ajax.php?action=votefavorite&do=vote&groupid=' + groupid + '&vote=up' + '&auth=' + authkey, function (response) { return });
-  $('.vote_link_' + groupid).ghide();
-  $('.vote_clear_' + groupid).gshow();
-  $('.voted_down_' + groupid).ghide();
-  $('.voted_up_' + groupid).gshow();
-  voteLock = false;
-}
-
-function UnvoteGroup(groupid, authkey) {
-  if (voteLock) {
-    return;
-  }
-  voteLock = true;
-  ajax.get('ajax.php?action=votefavorite&do=unvote&groupid=' + groupid + '&auth=' + authkey, function (response) { return });
-  $('.vote_link_' + groupid).gshow();
-  $('.vote_clear_' + groupid).ghide();
-  $('.voted_down_' + groupid).ghide();
-  $('.voted_up_' + groupid).ghide();
-  voteLock = false;
-}