-
+
+
+
+
+
+
+
- Name)?>
-
-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;
- }
+
+ Name)?>
+
+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;
+ }
?>
-
- Name)?>
-
-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";
- }
-
- }
+
+ Name)?>
+
+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";
+ }
+
+ }
}
?>
diff --git a/classes/autoenable.class.php b/classes/autoenable.class.php
index 5af9bba90..5b2b772af 100644
--- a/classes/autoenable.class.php
+++ b/classes/autoenable.class.php
@@ -1,358 +1,357 @@
-This may be because a request is already pending for your username, or because a recent request was denied.You are encouraged to discuss this with staff by visiting %s on %s"; - - // The default request received message - const RECEIVED_MESSAGE = "Your request to re-enable your account has been received. You can expect a reply message in your email within 48 hours.
If you do not receive an email after 48 hours have passed, please visit us on IRC for assistance."; - - /** - * Handle a new enable request - * - * @param string $Username The user's username - * @param string $Email The user's email address - * @return string The output - */ - public static function new_request($Username, $Email) { - if (empty($Username)) { - header("Location: login.php"); - die(); - } - - // Get the user's ID - G::$DB->query(" - SELECT um.ID - FROM users_main AS um - JOIN users_info ui ON ui.UserID = um.ID - WHERE um.Username = '$Username' - AND um.Enabled = '2'"); - - if (G::$DB->has_results()) { - // Make sure the user can make another request - list($UserID) = G::$DB->next_record(); - G::$DB->query(" - SELECT 1 FROM users_enable_requests - WHERE UserID = '$UserID' - AND ( - ( - Timestamp > NOW() - INTERVAL 1 WEEK - AND HandledTimestamp IS NULL - ) - OR - ( - Timestamp > NOW() - INTERVAL 2 MONTH - AND - (Outcome = '".self::DENIED."' - OR Outcome = '".self::DISCARDED."') - ) - )"); - } - - $IP = $_SERVER['REMOTE_ADDR']; - - if (G::$DB->has_results() || !isset($UserID)) { - // User already has/had a pending activation request or username is invalid - $Output = sprintf(self::REJECTED_MESSAGE, BOT_DISABLED_CHAN, BOT_SERVER); - if (isset($UserID)) { - Tools::update_user_notes($UserID, sqltime() . " - Enable request rejected from $IP\n\n"); - } - } else { - // New disable activation request - $UserAgent = db_string($_SERVER['HTTP_USER_AGENT']); - - G::$DB->query(" - INSERT INTO users_enable_requests - (UserID, Email, IP, UserAgent, Timestamp) - VALUES ('$UserID', '$Email', '$IP', '$UserAgent', '".sqltime()."')"); - - // Cache the number of requests for the modbar - G::$Cache->increment_value(self::CACHE_KEY_NAME); - setcookie('username', '', time() - 60 * 60, '/', '', false); - $Output = self::RECEIVED_MESSAGE; - Tools::update_user_notes($UserID, sqltime() . " - Enable request " . G::$DB->inserted_id() . " received from $IP\n\n"); - } - - return $Output; - } - - /* - * Handle requests - * - * @param int|int[] $IDs An array of IDs, or a single ID - * @param int $Status The status to mark the requests as - * @param string $Comment The staff member comment - */ - public static function handle_requests($IDs, $Status, $Comment) { - if ($Status != self::APPROVED && $Status != self::DENIED && $Status != self::DISCARDED) { - error(404); - } - - $UserInfo = array(); - $IDs = (!is_array($IDs)) ? [$IDs] : $IDs; - - if (count($IDs) == 0) { - error(404); - } - - foreach ($IDs as $ID) { - if (!is_number($ID)) { - error(404); - } - } - - G::$DB->query("SELECT Email, ID, UserID - FROM users_enable_requests - WHERE ID IN (".implode(',', $IDs).") - AND Outcome IS NULL"); - $Results = G::$DB->to_array(false, MYSQLI_NUM); - - if ($Status != self::DISCARDED) { - // Prepare email - require(SERVER_ROOT . '/classes/templates.class.php'); - $TPL = NEW TEMPLATE; - if ($Status == self::APPROVED) { - $TPL->open(SERVER_ROOT . '/templates/enable_request_accepted.tpl'); - $TPL->set('SITE_URL', NONSSL_SITE_URL); - } else { - $TPL->open(SERVER_ROOT . '/templates/enable_request_denied.tpl'); - } - - $TPL->set('SITE_NAME', SITE_NAME); - - foreach ($Results as $Result) { - list($Email, $ID, $UserID) = $Result; - $UserInfo[] = array($ID, $UserID); - - if ($Status == self::APPROVED) { - // Generate token - $Token = db_string(Users::make_secret()); - G::$DB->query(" - UPDATE users_enable_requests - SET Token = '$Token' - WHERE ID = '$ID'"); - $TPL->set('TOKEN', $Token); - } - - // Send email - $Subject = "Your enable request for " . SITE_NAME . " has been "; - $Subject .= ($Status == self::APPROVED) ? 'approved' : 'denied'; - - Misc::send_email($Email, $Subject, $TPL->get(), 'noreply'); - } - } else { - foreach ($Results as $Result) { - list(, $ID, $UserID) = $Result; - $UserInfo[] = array($ID, $UserID); - } - } - - // User notes stuff - G::$DB->query(" - SELECT Username - FROM users_main - WHERE ID = '" . G::$LoggedUser['ID'] . "'"); - list($StaffUser) = G::$DB->next_record(); - - foreach ($UserInfo as $User) { - list($ID, $UserID) = $User; - $BaseComment = sqltime() . " - Enable request $ID " . strtolower(self::get_outcome_string($Status)) . ' by [user]'.$StaffUser.'[/user]'; - $BaseComment .= (!empty($Comment)) ? "\nReason: $Comment\n\n" : "\n\n"; - Tools::update_user_notes($UserID, $BaseComment); - } - - // Update database values and decrement cache - G::$DB->query(" - UPDATE users_enable_requests - SET HandledTimestamp = '".sqltime()."', - CheckedBy = '".G::$LoggedUser['ID']."', - Outcome = '$Status' - WHERE ID IN (".implode(',', $IDs).")"); - G::$Cache->decrement_value(self::CACHE_KEY_NAME, count($IDs)); - } - - /** - * Unresolve a discarded request - * - * @param int $ID The request ID - */ - public static function unresolve_request($ID) { - $ID = (int) $ID; - - if (empty($ID)) { - error(404); - } - - G::$DB->query(" - SELECT UserID - FROM users_enable_requests - WHERE Outcome = '" . self::DISCARDED . "' - AND ID = '$ID'"); - - if (!G::$DB->has_results()) { - error(404); - } else { - list($UserID) = G::$DB->next_record(); - } - - G::$DB->query(" - SELECT Username - FROM users_main - WHERE ID = '" . G::$LoggedUser['ID'] . "'"); - list($StaffUser) = G::$DB->next_record(); - - Tools::update_user_notes($UserID, sqltime() . " - Enable request $ID unresolved by [user]" . $StaffUser . '[/user]' . "\n\n"); - G::$DB->query(" - UPDATE users_enable_requests - SET Outcome = NULL, HandledTimestamp = NULL, CheckedBy = NULL - WHERE ID = '$ID'"); - G::$Cache->increment_value(self::CACHE_KEY_NAME); - } - - /** - * Get the corresponding outcome string for a numerical value - * - * @param int $Outcome The outcome integer - * @return string The formatted output string - */ - public static function get_outcome_string($Outcome) { - if ($Outcome == self::APPROVED) { - $String = "Approved"; - } else if ($Outcome == self::DENIED) { - $String = "Rejected"; - } else if ($Outcome == self::DISCARDED) { - $String = "Discarded"; - } else { - $String = "---"; - } - - return $String; - } - - /** - * Handle a user's request to enable an account - * - * @param string $Token The token - * @return string The error output, or an empty string - */ - public static function handle_token($Token) { - $Token = db_string($Token); - G::$DB->query(" - SELECT UserID, HandledTimestamp - FROM users_enable_requests - WHERE Token = '$Token'"); - - if (G::$DB->has_results()) { - list($UserID, $Timestamp) = G::$DB->next_record(); - G::$DB->query("UPDATE users_enable_requests SET Token = NULL WHERE Token = '$Token'"); - if ($Timestamp < time_minus(3600 * 48)) { - // Old request - Tools::update_user_notes($UserID, sqltime() . " - Tried to use an expired enable token from ".$_SERVER['REMOTE_ADDR']."\n\n"); - $Err = "Token has expired. Please visit ".BOT_DISABLED_CHAN." on ".BOT_SERVER." to discuss this with staff."; - } else { - // Good request, decrement cache value and enable account - G::$Cache->decrement_value(AutoEnable::CACHE_KEY_NAME); - G::$DB->query("UPDATE users_main SET Enabled = '1', can_leech = '1' WHERE ID = '$UserID'"); - G::$DB->query("UPDATE users_info SET BanReason = '0' WHERE UserID = '$UserID'"); - G::$DB->query("SELECT torrent_pass FROM users_main WHERE ID='{$UserID}'"); - list($TorrentPass) = G::$DB->next_record(); - Tracker::update_tracker('add_user', array('id' => $UserID, 'passkey' => $TorrentPass)); - $Err = "Your account has been enabled. You may now log in."; - } - } else { - $Err = "Invalid token."; - } - - return $Err; - } - - /** - * Build the search query, from the searchbox inputs - * - * @param int $UserID The user ID - * @param string $IP The IP - * @param string $SubmittedTimestamp The timestamp representing when the request was submitted - * @param int $HandledUserID The ID of the user that handled the request - * @param string $HandledTimestamp The timestamp representing when the request was handled - * @param int $OutcomeSearch The outcome of the request - * @param boolean $Checked Should checked requests be included? - * @return array The WHERE conditions for the query - */ - public static function build_search_query($Username, $IP, $SubmittedBetween, $SubmittedTimestamp1, $SubmittedTimestamp2, $HandledUsername, $HandledBetween, $HandledTimestamp1, $HandledTimestamp2, $OutcomeSearch, $Checked) { - $Where = array(); - - if (!empty($Username)) { - $Where[] = "um1.Username = '$Username'"; - } - - if (!empty($IP)) { - $Where[] = "uer.IP = '$IP'"; - } - - if (!empty($SubmittedTimestamp1)) { - switch($SubmittedBetween) { - case 'on': - $Where[] = "DATE(uer.Timestamp) = DATE('$SubmittedTimestamp1')"; - break; - case 'before': - $Where[] = "DATE(uer.Timestamp) < DATE('$SubmittedTimestamp1')"; - break; - case 'after': - $Where[] = "DATE(uer.Timestamp) > DATE('$SubmittedTimestamp1')"; - break; - case 'between': - if (!empty($SubmittedTimestamp2)) { - $Where[] = "DATE(uer.Timestamp) BETWEEN DATE('$SubmittedTimestamp1') AND DATE('$SubmittedTimestamp2')"; - } - break; - default: - break; - } - } - - if (!empty($HandledTimestamp1)) { - switch($HandledBetween) { - case 'on': - $Where[] = "DATE(uer.HandledTimestamp) = DATE('$HandledTimestamp1')"; - break; - case 'before': - $Where[] = "DATE(uer.HandledTimestamp) < DATE('$HandledTimestamp1')"; - break; - case 'after': - $Where[] = "DATE(uer.HandledTimestamp) > DATE('$HandledTimestamp1')"; - break; - case 'between': - if (!empty($HandledTimestamp2)) { - $Where[] = "DATE(uer.HandledTimestamp) BETWEEN DATE('$HandledTimestamp1') AND DATE('$HandledTimestamp2')"; - } - break; - default: - break; - } - } - - if (!empty($HandledUsername)) { - $Where[] = "um2.Username = '$HandledUsername'"; - } - - if (!empty($OutcomeSearch)) { - $Where[] = "uer.Outcome = '$OutcomeSearch'"; - } - - if ($Checked) { - // This is to skip the if statement in enable_requests.php - $Where[] = "(uer.Outcome IS NULL OR uer.Outcome IS NOT NULL)"; - } - - return $Where; - } + // Constants for database values + const APPROVED = 1; + const DENIED = 2; + const DISCARDED = 3; + + // Cache key to store the number of enable requests + const CACHE_KEY_NAME = 'num_enable_requests'; + + // The default request rejected message + const REJECTED_MESSAGE = "Your request to re-enable your account has been rejected.
This may be because a request is already pending for your username, or because a recent request was denied.
You are encouraged to discuss this with staff by visiting %s on %s"; + + // The default request received message + const RECEIVED_MESSAGE = "Your request to re-enable your account has been received. You can expect a reply message in your email within 48 hours.
If you do not receive an email after 48 hours have passed, please visit us on IRC for assistance."; + + /** + * Handle a new enable request + * + * @param string $Username The user's username + * @param string $Email The user's email address + * @return string The output + */ + public static function new_request($Username, $Email) { + if (empty($Username)) { + header("Location: login.php"); + die(); + } + + // Get the user's ID + G::$DB->query(" + SELECT um.ID + FROM users_main AS um + JOIN users_info ui ON ui.UserID = um.ID + WHERE um.Username = '$Username' + AND um.Enabled = '2'"); + + if (G::$DB->has_results()) { + // Make sure the user can make another request + list($UserID) = G::$DB->next_record(); + G::$DB->query(" + SELECT 1 FROM users_enable_requests + WHERE UserID = '$UserID' + AND ( + ( + Timestamp > NOW() - INTERVAL 1 WEEK + AND HandledTimestamp IS NULL + ) + OR + ( + Timestamp > NOW() - INTERVAL 2 MONTH + AND + (Outcome = '".self::DENIED."' + OR Outcome = '".self::DISCARDED."') + ) + )"); + } + + $IP = $_SERVER['REMOTE_ADDR']; + + if (G::$DB->has_results() || !isset($UserID)) { + // User already has/had a pending activation request or username is invalid + $Output = sprintf(self::REJECTED_MESSAGE, BOT_DISABLED_CHAN, BOT_SERVER); + if (isset($UserID)) { + Tools::update_user_notes($UserID, sqltime() . " - Enable request rejected from $IP\n\n"); + } + } else { + // New disable activation request + $UserAgent = db_string($_SERVER['HTTP_USER_AGENT']); + + G::$DB->query(" + INSERT INTO users_enable_requests + (UserID, Email, IP, UserAgent, Timestamp) + VALUES ('$UserID', '$Email', '$IP', '$UserAgent', '".sqltime()."')"); + + // Cache the number of requests for the modbar + G::$Cache->increment_value(self::CACHE_KEY_NAME); + setcookie('username', '', time() - 60 * 60, '/', '', false); + $Output = self::RECEIVED_MESSAGE; + Tools::update_user_notes($UserID, sqltime() . " - Enable request " . G::$DB->inserted_id() . " received from $IP\n\n"); + } + + return $Output; + } + + /* + * Handle requests + * + * @param int|int[] $IDs An array of IDs, or a single ID + * @param int $Status The status to mark the requests as + * @param string $Comment The staff member comment + */ + public static function handle_requests($IDs, $Status, $Comment) { + if ($Status != self::APPROVED && $Status != self::DENIED && $Status != self::DISCARDED) { + error(404); + } + + $UserInfo = []; + $IDs = (!is_array($IDs)) ? [$IDs] : $IDs; + + if (count($IDs) == 0) { + error(404); + } + + foreach ($IDs as $ID) { + if (!is_number($ID)) { + error(404); + } + } + + G::$DB->query("SELECT Email, ID, UserID + FROM users_enable_requests + WHERE ID IN (".implode(',', $IDs).") + AND Outcome IS NULL"); + $Results = G::$DB->to_array(false, MYSQLI_NUM); + + if ($Status != self::DISCARDED) { + // Prepare email + $context = []; + if ($Status == self::APPROVED) { + $template = 'enable_request_accepted.twig'; + $context['SITE_URL'] = SITE_URL; + } else { + $template = 'enable_request_denied.twig'; + } + + $context['SITE_NAME'] = SITE_NAME; + + foreach ($Results as $Result) { + list($Email, $ID, $UserID) = $Result; + $UserInfo[] = array($ID, $UserID); + + if ($Status == self::APPROVED) { + // Generate token + $Token = Users::make_secret(); + G::$DB->prepared_query(" + UPDATE users_enable_requests + SET Token = ? + WHERE ID = ?", $Token, $ID); + $context['TOKEN'] = $Token; + } + + // Send email + $Subject = "Your enable request for " . SITE_NAME . " has been "; + $Subject .= ($Status == self::APPROVED) ? 'approved' : 'denied'; + + Misc::send_email($Email, $Subject, G::$Twig->render("emails/".template, $context), 'noreply'); + } + } else { + foreach ($Results as $Result) { + list(, $ID, $UserID) = $Result; + $UserInfo[] = array($ID, $UserID); + } + } + + // User notes stuff + G::$DB->query(" + SELECT Username + FROM users_main + WHERE ID = '" . G::$LoggedUser['ID'] . "'"); + list($StaffUser) = G::$DB->next_record(); + + foreach ($UserInfo as $User) { + list($ID, $UserID) = $User; + $BaseComment = sqltime() . " - Enable request $ID " . strtolower(self::get_outcome_string($Status)) . ' by [user]'.$StaffUser.'[/user]'; + $BaseComment .= (!empty($Comment)) ? "\nReason: $Comment\n\n" : "\n\n"; + Tools::update_user_notes($UserID, $BaseComment); + } + + // Update database values and decrement cache + G::$DB->query(" + UPDATE users_enable_requests + SET HandledTimestamp = '".sqltime()."', + CheckedBy = '".G::$LoggedUser['ID']."', + Outcome = '$Status' + WHERE ID IN (".implode(',', $IDs).")"); + G::$Cache->decrement_value(self::CACHE_KEY_NAME, count($IDs)); + } + + /** + * Unresolve a discarded request + * + * @param int $ID The request ID + */ + public static function unresolve_request($ID) { + $ID = (int) $ID; + + if (empty($ID)) { + error(404); + } + + G::$DB->query(" + SELECT UserID + FROM users_enable_requests + WHERE Outcome = '" . self::DISCARDED . "' + AND ID = '$ID'"); + + if (!G::$DB->has_results()) { + error(404); + } else { + list($UserID) = G::$DB->next_record(); + } + + G::$DB->query(" + SELECT Username + FROM users_main + WHERE ID = '" . G::$LoggedUser['ID'] . "'"); + list($StaffUser) = G::$DB->next_record(); + + Tools::update_user_notes($UserID, sqltime() . " - Enable request $ID unresolved by [user]" . $StaffUser . '[/user]' . "\n\n"); + G::$DB->query(" + UPDATE users_enable_requests + SET Outcome = NULL, HandledTimestamp = NULL, CheckedBy = NULL + WHERE ID = '$ID'"); + G::$Cache->increment_value(self::CACHE_KEY_NAME); + } + + /** + * Get the corresponding outcome string for a numerical value + * + * @param int $Outcome The outcome integer + * @return string The formatted output string + */ + public static function get_outcome_string($Outcome) { + if ($Outcome == self::APPROVED) { + $String = "Approved"; + } else if ($Outcome == self::DENIED) { + $String = "Rejected"; + } else if ($Outcome == self::DISCARDED) { + $String = "Discarded"; + } else { + $String = "---"; + } + + return $String; + } + + /** + * Handle a user's request to enable an account + * + * @param string $Token The token + * @return string The error output, or an empty string + */ + public static function handle_token($Token) { + $Token = db_string($Token); + G::$DB->query(" + SELECT UserID, HandledTimestamp + FROM users_enable_requests + WHERE Token = '$Token'"); + + if (G::$DB->has_results()) { + list($UserID, $Timestamp) = G::$DB->next_record(); + G::$DB->query("UPDATE users_enable_requests SET Token = NULL WHERE Token = '$Token'"); + if ($Timestamp < time_minus(3600 * 48)) { + // Old request + Tools::update_user_notes($UserID, sqltime() . " - Tried to use an expired enable token from ".$_SERVER['REMOTE_ADDR']."\n\n"); + $Err = "Token has expired. Please visit ".BOT_DISABLED_CHAN." on ".BOT_SERVER." to discuss this with staff."; + } else { + // Good request, decrement cache value and enable account + G::$Cache->decrement_value(AutoEnable::CACHE_KEY_NAME); + G::$DB->query("UPDATE users_main SET Enabled = '1', can_leech = '1' WHERE ID = '$UserID'"); + G::$DB->query("UPDATE users_info SET BanReason = '0' WHERE UserID = '$UserID'"); + G::$DB->query("SELECT torrent_pass FROM users_main WHERE ID='{$UserID}'"); + list($TorrentPass) = G::$DB->next_record(); + Tracker::update_tracker('add_user', array('id' => $UserID, 'passkey' => $TorrentPass)); + $Err = "Your account has been enabled. You may now log in."; + } + } else { + $Err = "Invalid token."; + } + + return $Err; + } + + /** + * Build the search query, from the searchbox inputs + * + * @param int $UserID The user ID + * @param string $IP The IP + * @param string $SubmittedTimestamp The timestamp representing when the request was submitted + * @param int $HandledUserID The ID of the user that handled the request + * @param string $HandledTimestamp The timestamp representing when the request was handled + * @param int $OutcomeSearch The outcome of the request + * @param boolean $Checked Should checked requests be included? + * @return array The WHERE conditions for the query + */ + public static function build_search_query($Username, $IP, $SubmittedBetween, $SubmittedTimestamp1, $SubmittedTimestamp2, $HandledUsername, $HandledBetween, $HandledTimestamp1, $HandledTimestamp2, $OutcomeSearch, $Checked) { + $Where = []; + + if (!empty($Username)) { + $Where[] = "um1.Username = '$Username'"; + } + + if (!empty($IP)) { + $Where[] = "uer.IP = '$IP'"; + } + + if (!empty($SubmittedTimestamp1)) { + switch($SubmittedBetween) { + case 'on': + $Where[] = "DATE(uer.Timestamp) = DATE('$SubmittedTimestamp1')"; + break; + case 'before': + $Where[] = "DATE(uer.Timestamp) < DATE('$SubmittedTimestamp1')"; + break; + case 'after': + $Where[] = "DATE(uer.Timestamp) > DATE('$SubmittedTimestamp1')"; + break; + case 'between': + if (!empty($SubmittedTimestamp2)) { + $Where[] = "DATE(uer.Timestamp) BETWEEN DATE('$SubmittedTimestamp1') AND DATE('$SubmittedTimestamp2')"; + } + break; + default: + break; + } + } + + if (!empty($HandledTimestamp1)) { + switch($HandledBetween) { + case 'on': + $Where[] = "DATE(uer.HandledTimestamp) = DATE('$HandledTimestamp1')"; + break; + case 'before': + $Where[] = "DATE(uer.HandledTimestamp) < DATE('$HandledTimestamp1')"; + break; + case 'after': + $Where[] = "DATE(uer.HandledTimestamp) > DATE('$HandledTimestamp1')"; + break; + case 'between': + if (!empty($HandledTimestamp2)) { + $Where[] = "DATE(uer.HandledTimestamp) BETWEEN DATE('$HandledTimestamp1') AND DATE('$HandledTimestamp2')"; + } + break; + default: + break; + } + } + + if (!empty($HandledUsername)) { + $Where[] = "um2.Username = '$HandledUsername'"; + } + + if (!empty($OutcomeSearch)) { + $Where[] = "uer.Outcome = '$OutcomeSearch'"; + } + + if ($Checked) { + // This is to skip the if statement in enable_requests.php + $Where[] = "(uer.Outcome IS NULL OR uer.Outcome IS NOT NULL)"; + } + + return $Where; + } } diff --git a/classes/bencode.class.php b/classes/bencode.class.php index 295700964..4a6737b27 100644 --- a/classes/bencode.class.php +++ b/classes/bencode.class.php @@ -1,26 +1,26 @@ -Num = $Val; - } + public function __construct($Val) { + $this->Num = $Val; + } - public static function make($Val) { - return PHP_INT_SIZE === 4 ? new Int64($Val) : (int)$Val; - } + public static function make($Val) { + return PHP_INT_SIZE === 4 ? new Int64($Val) : (int)$Val; + } - public static function get($Val) { - return PHP_INT_SIZE === 4 ? $Val->Num : $Val; - } + public static function get($Val) { + return PHP_INT_SIZE === 4 ? $Val->Num : $Val; + } - public static function is_int($Val) { - return is_int($Val) || (is_object($Val) && get_class($Val) === 'Int64'); - } + public static function is_int($Val) { + return is_int($Val) || (is_object($Val) && get_class($Val) === 'Int64'); + } } /** @@ -28,69 +28,69 @@ public static function is_int($Val) { * note is that empty dictionaries are represented by boolean trues */ class Bencode { - private $DefaultKeys = array( // Get rid of everything except these keys to save some space - 'created by', 'creation date', 'encoding', 'info'); - private $Data; - public $Enc; + private $DefaultKeys = array( // Get rid of everything except these keys to save some space + 'created by', 'creation date', 'encoding', 'info'); + private $Data; + public $Enc; - /** - * Encode an arbitrary array (usually one that's just been decoded) - * - * @param array $Arg the thing to encode - * @param mixed $Keys string or array with keys in the input array to encode or true to encode everything - * @return bencoded string representing the content of the input array - */ - public function encode($Arg = false, $Keys = false) { - if ($Arg === false) { - $Data =& $this->Dec; - } else { - $Data =& $Arg; - } - if ($Keys === true) { - $this->Data = $Data; - } elseif ($Keys === false) { - $this->Data = array_intersect_key($Data, array_flip($this->DefaultKeys)); - } elseif (is_array($Keys)) { - $this->Data = array_intersect_key($Data, array_flip($Keys)); - } else { - $this->Data = isset($Data[$Keys]) ? $Data[$Keys] : false; - } - if (!$this->Data) { - return false; - } - $this->Enc = $this->_benc(); - return $this->Enc; - } + /** + * Encode an arbitrary array (usually one that's just been decoded) + * + * @param array $Arg the thing to encode + * @param mixed $Keys string or array with keys in the input array to encode or true to encode everything + * @return bencoded string representing the content of the input array + */ + public function encode($Arg = false, $Keys = false) { + if ($Arg === false) { + $Data =& $this->Dec; + } else { + $Data =& $Arg; + } + if ($Keys === true) { + $this->Data = $Data; + } elseif ($Keys === false) { + $this->Data = array_intersect_key($Data, array_flip($this->DefaultKeys)); + } elseif (is_array($Keys)) { + $this->Data = array_intersect_key($Data, array_flip($Keys)); + } else { + $this->Data = isset($Data[$Keys]) ? $Data[$Keys] : false; + } + if (!$this->Data) { + return false; + } + $this->Enc = $this->_benc(); + return $this->Enc; + } - /** - * Internal encoding function that does the actual job - * - * @return bencoded string - */ - private function _benc() { - if (!is_array($this->Data)) { - if (Int64::is_int($this->Data)) { // Integer - return 'i'.Int64::get($this->Data).'e'; - } - if ($this->Data === true) { // Empty dictionary - return 'de'; - } - return strlen($this->Data).':'.$this->Data; // String - } - if (empty($this->Data) || Int64::is_int(key($this->Data))) { - $IsDict = false; - } else { - $IsDict = true; - ksort($this->Data); // Dictionaries must be sorted - } - $Ret = $IsDict ? 'd' : 'l'; - foreach ($this->Data as $Key => $Value) { - if ($IsDict) { - $Ret .= strlen($Key).':'.$Key; - } - $this->Data = $Value; - $Ret .= $this->_benc(); - } - return $Ret.'e'; - } + /** + * Internal encoding function that does the actual job + * + * @return bencoded string + */ + private function _benc() { + if (!is_array($this->Data)) { + if (Int64::is_int($this->Data)) { // Integer + return 'i'.Int64::get($this->Data).'e'; + } + if ($this->Data === true) { // Empty dictionary + return 'de'; + } + return strlen($this->Data).':'.$this->Data; // String + } + if (empty($this->Data) || Int64::is_int(key($this->Data))) { + $IsDict = false; + } else { + $IsDict = true; + ksort($this->Data); // Dictionaries must be sorted + } + $Ret = $IsDict ? 'd' : 'l'; + foreach ($this->Data as $Key => $Value) { + if ($IsDict) { + $Ret .= strlen($Key).':'.$Key; + } + $this->Data = $Value; + $Ret .= $this->_benc(); + } + return $Ret.'e'; + } } diff --git a/classes/bencodedecode.class.php b/classes/bencodedecode.class.php index a1bc30464..693f04280 100644 --- a/classes/bencodedecode.class.php +++ b/classes/bencodedecode.class.php @@ -1,184 +1,184 @@ -Enc)) { - return false; - } - } else { - if ($IsPath === true) { - return $this->bdec_file($Arg); - } - $this->Data = $Arg; - } - return $this->decode(); - } + /** + * Decode prepararations + * + * @param string $Arg bencoded string or path to bencoded file to decode + * @param bool $IsPath needs to be true if $Arg is a path + * @return decoded data with a suitable structure + */ + function __construct($Arg = false, $IsPath = false) { + if ($Arg === false) { + if (empty($this->Enc)) { + return false; + } + } else { + if ($IsPath === true) { + return $this->bdec_file($Arg); + } + $this->Data = $Arg; + } + return $this->decode(); + } - /** - * Decodes a bencoded file - * - * @param $Path path to bencoded file to decode - * @return decoded data with a suitable structure - */ - public function bdec_file($Path = false) { - if (empty($Path)) { - return false; - } - if (!$this->Data = @file_get_contents($Path, FILE_BINARY)) { - return $this->error("Error: file '$Path' could not be opened.\n"); - } - return $this->decode(); - } + /** + * Decodes a bencoded file + * + * @param $Path path to bencoded file to decode + * @return decoded data with a suitable structure + */ + public function bdec_file($Path = false) { + if (empty($Path)) { + return false; + } + if (!$this->Data = @file_get_contents($Path, FILE_BINARY)) { + return $this->error("Error: file '$Path' could not be opened.\n"); + } + return $this->decode(); + } - /** - * Decodes a string with bencoded data - * - * @param mixed $Arg bencoded data or false to decode the content of $this->Data - * @return decoded data with a suitable structure - */ - public function decode($Arg = false) { - if ($Arg !== false) { - $this->Data = $Arg; - } elseif (!$this->Data) { - $this->Data = $this->Enc; - } - if (!$this->Data) { - return false; - } - $this->Length = strlen($this->Data); - $this->Pos = 0; - $this->Dec = $this->_bdec(); - if ($this->Pos < $this->Length) { - // Not really necessary, but if the torrent is invalid, it's better to warn than to silently truncate it - return $this->error(); - } - return $this->Dec; - } + /** + * Decodes a string with bencoded data + * + * @param mixed $Arg bencoded data or false to decode the content of $this->Data + * @return decoded data with a suitable structure + */ + public function decode($Arg = false) { + if ($Arg !== false) { + $this->Data = $Arg; + } elseif (!$this->Data) { + $this->Data = $this->Enc; + } + if (!$this->Data) { + return false; + } + $this->Length = strlen($this->Data); + $this->Pos = 0; + $this->Dec = $this->_bdec(); + if ($this->Pos < $this->Length) { + // Not really necessary, but if the torrent is invalid, it's better to warn than to silently truncate it + return $this->error(); + } + return $this->Dec; + } - /** - * Internal decoding function that does the actual job - * - * @return decoded data with a suitable structure - */ - private function _bdec() { - switch ($this->Data[$this->Pos]) { + /** + * Internal decoding function that does the actual job + * + * @return decoded data with a suitable structure + */ + private function _bdec() { + switch ($this->Data[$this->Pos]) { - case 'i': - $this->Pos++; - $Value = substr($this->Data, $this->Pos, strpos($this->Data, 'e', $this->Pos) - $this->Pos); - if (!ctype_digit($Value) && !($Value[0] == '-' && ctype_digit(substr($Value, 1)))) { - return $this->error(); - } - $this->Pos += strlen($Value) + 1; - return Int64::make($Value); + case 'i': + $this->Pos++; + $Value = substr($this->Data, $this->Pos, strpos($this->Data, 'e', $this->Pos) - $this->Pos); + if (!ctype_digit($Value) && !($Value[0] == '-' && ctype_digit(substr($Value, 1)))) { + return $this->error(); + } + $this->Pos += strlen($Value) + 1; + return Int64::make($Value); - case 'l': - $Value = array(); - $this->Pos++; - while ($this->Data[$this->Pos] != 'e') { - if ($this->Pos >= $this->Length) { - return $this->error(); - } - $Value[] = $this->_bdec(); - } - $this->Pos++; - return $Value; + case 'l': + $Value = []; + $this->Pos++; + while ($this->Data[$this->Pos] != 'e') { + if ($this->Pos >= $this->Length) { + return $this->error(); + } + $Value[] = $this->_bdec(); + } + $this->Pos++; + return $Value; - case 'd': - $Value = array(); - $this->Pos++; - while ($this->Data[$this->Pos] != 'e') { - $Length = substr($this->Data, $this->Pos, strpos($this->Data, ':', $this->Pos) - $this->Pos); - if (!ctype_digit($Length)) { - return $this->error(); - } - $this->Pos += strlen($Length) + $Length + 1; - $Key = substr($this->Data, $this->Pos - $Length, $Length); - if ($this->Pos >= $this->Length) { - return $this->error(); - } - $Value[$Key] = $this->_bdec(); - } - $this->Pos++; - // Use boolean true to keep track of empty dictionaries - return empty($Value) ? true : $Value; + case 'd': + $Value = []; + $this->Pos++; + while ($this->Data[$this->Pos] != 'e') { + $Length = substr($this->Data, $this->Pos, strpos($this->Data, ':', $this->Pos) - $this->Pos); + if (!ctype_digit($Length)) { + return $this->error(); + } + $this->Pos += strlen($Length) + $Length + 1; + $Key = substr($this->Data, $this->Pos - $Length, $Length); + if ($this->Pos >= $this->Length) { + return $this->error(); + } + $Value[$Key] = $this->_bdec(); + } + $this->Pos++; + // Use boolean true to keep track of empty dictionaries + return empty($Value) ? true : $Value; - default: - $Length = substr($this->Data, $this->Pos, strpos($this->Data, ':', $this->Pos) - $this->Pos); - if (!ctype_digit($Length)) { - return $this->error(); // Even if the string is likely to be decoded correctly without this check, it's malformed - } - $this->Pos += strlen($Length) + $Length + 1; - return substr($this->Data, $this->Pos - $Length, $Length); - } - } + default: + $Length = substr($this->Data, $this->Pos, strpos($this->Data, ':', $this->Pos) - $this->Pos); + if (!ctype_digit($Length)) { + return $this->error(); // Even if the string is likely to be decoded correctly without this check, it's malformed + } + $this->Pos += strlen($Length) + $Length + 1; + return substr($this->Data, $this->Pos - $Length, $Length); + } + } - /** - * Convert everything to the correct data types and optionally escape strings - * - * @param bool $Escape whether to escape the textual data - * @param mixed $Data decoded data or false to use the $Dec property - * @return decoded data with more useful data types - */ - public function dump($Escape = true, $Data = false) { - if ($Data === false) { - $Data = $this->Dec; - } - if (Int64::is_int($Data)) { - return Int64::get($Data); - } - if (is_bool($Data)) { - return array(); - } - if (is_array($Data)) { - $Output = array(); - foreach ($Data as $Key => $Val) { - $Output[$Key] = $this->dump($Escape, $Val); - } - return $Output; - } - return $Escape ? htmlentities($Data) : $Data; - } + /** + * Convert everything to the correct data types and optionally escape strings + * + * @param bool $Escape whether to escape the textual data + * @param mixed $Data decoded data or false to use the $Dec property + * @return decoded data with more useful data types + */ + public function dump($Escape = true, $Data = false) { + if ($Data === false) { + $Data = $this->Dec; + } + if (Int64::is_int($Data)) { + return Int64::get($Data); + } + if (is_bool($Data)) { + return []; + } + if (is_array($Data)) { + $Output = []; + foreach ($Data as $Key => $Val) { + $Output[$Key] = $this->dump($Escape, $Val); + } + return $Output; + } + return $Escape ? htmlentities($Data) : $Data; + } - /** - * Display an error and halt the operation unless the $ExitOnError property is false - * - * @param string $ErrMsg the error message to display - */ - private function error($ErrMsg = false) { - static $ErrorPos; - if ($this->Pos === $ErrorPos) { - // The recursive nature of the class requires this to avoid duplicate error messages - return false; - } - if ($ErrMsg === false) { - printf("Malformed string. Invalid character at pos 0x%X: %s\n", - $this->Pos, str_replace(array("\r","\n"), array('',' '), htmlentities(substr($this->Data, $this->Pos, self::SnipLength)))); - } else { - echo $ErrMsg; - } - if ($this->ExitOnError) { - exit(); - } - $ErrorPos = $this->Pos; - return false; - } + /** + * Display an error and halt the operation unless the $ExitOnError property is false + * + * @param string $ErrMsg the error message to display + */ + private function error($ErrMsg = false) { + static $ErrorPos; + if ($this->Pos === $ErrorPos) { + // The recursive nature of the class requires this to avoid duplicate error messages + return false; + } + if ($ErrMsg === false) { + printf("Malformed string. Invalid character at pos 0x%X: %s\n", + $this->Pos, str_replace(array("\r","\n"), array('',' '), htmlentities(substr($this->Data, $this->Pos, self::SnipLength)))); + } else { + echo $ErrMsg; + } + if ($this->ExitOnError) { + exit(); + } + $ErrorPos = $this->Pos; + return false; + } } diff --git a/classes/bencodetorrent.class.php b/classes/bencodetorrent.class.php index a6c79e729..441b4b133 100644 --- a/classes/bencodetorrent.class.php +++ b/classes/bencodetorrent.class.php @@ -1,146 +1,163 @@ -Dec)) { - return false; - } - $InfoDict =& $this->Dec['info']; - if (!isset($InfoDict['files'])) { - // Single-file torrent - $this->Size = (Int64::is_int($InfoDict['length']) - ? Int64::get($InfoDict['length']) - : $InfoDict['length']); - $Name = (isset($InfoDict['name.utf-8']) - ? $InfoDict['name.utf-8'] - : $InfoDict['name']); - $this->Files[] = array($this->Size, $Name); - } else { - if (isset($InfoDict['path.utf-8']['files'][0])) { - $this->PathKey = 'path.utf-8'; - } - foreach ($InfoDict['files'] as $File) { - $TmpPath = array(); - foreach ($File[$this->PathKey] as $SubPath) { - $TmpPath[] = $SubPath; - } - $CurSize = (Int64::is_int($File['length']) - ? Int64::get($File['length']) - : $File['length']); - $this->Files[] = array($CurSize, implode('/', $TmpPath)); - $this->Size += $CurSize; - } - uasort($this->Files, function($a, $b) { - return strnatcasecmp($a[1], $b[1]); - }); - } - return array($this->Size, $this->Files); - } + /** + * Create a list of the files in the torrent and their sizes as well as the total torrent size + * + * @return array with a list of files and file sizes + */ + public function file_list() { + if (empty($this->Dec)) { + return false; + } + $InfoDict =& $this->Dec['info']; + if (!isset($InfoDict['files'])) { + // Single-file torrent + $this->Size = (Int64::is_int($InfoDict['length']) + ? Int64::get($InfoDict['length']) + : $InfoDict['length']); + $Name = (isset($InfoDict['name.utf-8']) + ? $InfoDict['name.utf-8'] + : $InfoDict['name']); + $this->Files[] = array($this->Size, $Name); + } else { + if (isset($InfoDict['path.utf-8']['files'][0])) { + $this->PathKey = 'path.utf-8'; + } + foreach ($InfoDict['files'] as $File) { + $TmpPath = []; + foreach ($File[$this->PathKey] as $SubPath) { + $TmpPath[] = $SubPath; + } + $CurSize = (Int64::is_int($File['length']) + ? Int64::get($File['length']) + : $File['length']); + $this->Files[] = array($CurSize, implode('/', $TmpPath)); + $this->Size += $CurSize; + } + uasort($this->Files, function($a, $b) { + return strnatcasecmp($a[1], $b[1]); + }); + } + return array($this->Size, $this->Files); + } - /** - * Find out the name of the torrent - * - * @return string torrent name - */ - public function get_name() { - if (empty($this->Dec)) { - return false; - } - if (isset($this->Dec['info']['name.utf-8'])) { - return $this->Dec['info']['name.utf-8']; - } - return $this->Dec['info']['name']; - } + /** + * Find out the name of the torrent + * + * @return string torrent name + */ + public function get_name() { + if (empty($this->Dec)) { + return false; + } + if (isset($this->Dec['info']['name.utf-8'])) { + return $this->Dec['info']['name.utf-8']; + } + return $this->Dec['info']['name']; + } - /** - * Find out the total size of the torrent - * - * @return string torrent size - */ - public function get_size() { - if (empty($this->Files)) { - if (empty($this->Dec)) { - return false; - } - $FileList = $this->file_list(); - } - return $FileList[0]; - } + /** + * Find out the total size of the torrent + * + * @return string torrent size + */ + public function get_size() { + if (empty($this->Files)) { + if (empty($this->Dec)) { + return false; + } + $FileList = $this->file_list(); + } + return $FileList[0]; + } - /** - * Checks if the "private" flag is present in the torrent - * - * @return true if the "private" flag is set - */ - public function is_private() { - if (empty($this->Dec)) { - return false; - } - return isset($this->Dec['info']['private']) && Int64::get($this->Dec['info']['private']) == 1; - } - /** - * Add the "private" flag to the torrent - * - * @return true if a change was required - */ - public function make_private() { - if (empty($this->Dec)) { - return false; - } - if ($this->is_private()) { - return false; - } - $this->Dec['info']['private'] = Int64::make(1); - ksort($this->Dec['info']); - return true; - } + /** + * Checks if the "private" flag is present in the torrent + * + * @return true if the "private" flag is set + */ + public function is_private() { + if (empty($this->Dec)) { + return false; + } + return isset($this->Dec['info']['private']) && Int64::get($this->Dec['info']['private']) == 1; + } + /** + * Add the "private" flag to the torrent + * + * @return true if a change was required + */ + public function make_private() { + if (empty($this->Dec)) { + return false; + } + if ($this->is_private()) { + return false; + } + $this->Dec['info']['private'] = Int64::make(1); + ksort($this->Dec['info']); + return true; + } - /** - * Adds thet "source" flag to the torrent to allow for easier cross-seeding - * - * @return bool false if the source flag was already set to APL, else true - */ - function set_source() { - if (empty($this->Dec)) { - return false; - } + /** + * Adds thet "source" flag to the torrent to allow for easier cross-seeding + * + * @return bool false if the source flag was already set to OPS, else true + */ + function set_source() { + if (empty($this->Dec)) { + return false; + } - if (isset($this->Dec['info']['source']) && $this->Dec['info']['source'] === 'APL') { - return false; - } + if (isset($this->Dec['info']['source']) && ($this->Dec['info']['source'] === 'OPS')) { + return false; + } - $this->Dec['info']['source'] = 'APL'; - ksort($this->Dec['info']); - return true; - } + if (isset($this->Dec['info']['source']) && ($this->Dec['info']['source'] === 'APL')) { + return false; + } - /** - * Calculate the torrent's info hash - * - * @return info hash in hexadecimal form - */ - public function info_hash() { - if (empty($this->Dec) || !isset($this->Dec['info'])) { - return false; - } - return sha1($this->encode(false, 'info')); - } + // Grandfather APL torrents + if (isset($this->Dec['info']['source']) && isset($this->Dec['creation date']) && + ($this->Dec['creation date'] <= GRANDFATHER_OLD_SOURCE) && + ($this->Dec['info']['source'] === 'APL')) { + return false; + } - /** - * Add the announce URL to a torrent - */ - public static function add_announce_url($Data, $Url) { - return 'd8:announce'.strlen($Url).':'.$Url . substr($Data, 1); - } + // Grandfather torrents before source flag was enforced + if (isset($this->Dec['creation date']) && !isset($this->Dec['info']['source']) && + ($this->Dec['creation date'] <= GRANDFATHER_NO_SOURCE)) { + return false; + } + + $this->Dec['info']['source'] = 'OPS'; + ksort($this->Dec['info']); + return true; + } + + /** + * Calculate the torrent's info hash + * + * @return info hash in hexadecimal form + */ + public function info_hash() { + if (empty($this->Dec) || !isset($this->Dec['info'])) { + return false; + } + return sha1($this->encode(false, 'info')); + } + + /** + * Add the announce URL to a torrent + */ + public static function add_announce_url($Data, $Url) { + return 'd8:announce'.strlen($Url).':'.$Url . substr($Data, 1); + } } diff --git a/classes/bitcoinrpc.class.php b/classes/bitcoinrpc.class.php index 8951fe467..00b796e31 100644 --- a/classes/bitcoinrpc.class.php +++ b/classes/bitcoinrpc.class.php @@ -1,32 +1,32 @@ $Method, - 'params' => $Args, - 'id' => $MessageID) - ); + public static function __callStatic($Method, $Args) { + if (!defined('BITCOIN_RPC_URL')) { + return false; + } + $MessageID = mt_rand(); + $Params = json_encode(array( + 'method' => $Method, + 'params' => $Args, + 'id' => $MessageID) + ); - $Request = array( - 'http' => array( - 'method' => 'POST', - 'header' => 'Content-type: application/json', - 'content' => $Params - ) - ); + $Request = array( + 'http' => array( + 'method' => 'POST', + 'header' => 'Content-type: application/json', + 'content' => $Params + ) + ); - if (!$Response = file_get_contents(BITCOIN_RPC_URL, false, stream_context_create($Request))) { - return false; - } - $Response = json_decode($Response); - if ($Response->id != $MessageID || !empty($Response->error) || empty($Response->result)) { - return false; - } - return $Response->result; - } + if (!$Response = file_get_contents(BITCOIN_RPC_URL, false, stream_context_create($Request))) { + return false; + } + $Response = json_decode($Response); + if ($Response->id != $MessageID || !empty($Response->error) || empty($Response->result)) { + return false; + } + return $Response->result; + } } diff --git a/classes/bookmarks.class.php b/classes/bookmarks.class.php index 6a8c99fb4..e6c331b64 100644 --- a/classes/bookmarks.class.php +++ b/classes/bookmarks.class.php @@ -1,98 +1,98 @@ get_value($CacheKey)) === false) { - list ($Table, $Col) = self::bookmark_schema($Type); - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - SELECT $Col - FROM $Table - WHERE UserID = '$UserID'"); - $Bookmarks = G::$DB->collect($Col); - G::$DB->set_query_id($QueryID); - G::$Cache->cache_value($CacheKey, $Bookmarks, 0); - } - return $Bookmarks; - } + /** + * Fetch all bookmarks of a certain type for a user. + * If UserID is false than defaults to G::$LoggedUser['ID'] + * + * @param string $Type + * type of bookmarks to fetch + * @param int $UserID + * userid whose bookmarks to get + * @return array the bookmarks + */ + public static function all_bookmarks($Type, $UserID = false) { + if ($UserID === false) { + $UserID = G::$LoggedUser['ID']; + } + $CacheKey = 'bookmarks_' . $Type . '_' . $UserID; + if (($Bookmarks = G::$Cache->get_value($CacheKey)) === false) { + list ($Table, $Col) = self::bookmark_schema($Type); + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + SELECT $Col + FROM $Table + WHERE UserID = '$UserID'"); + $Bookmarks = G::$DB->collect($Col); + G::$DB->set_query_id($QueryID); + G::$Cache->cache_value($CacheKey, $Bookmarks, 0); + } + return $Bookmarks; + } } diff --git a/classes/cache.class.php b/classes/cache.class.php index c77515949..f98def72a 100644 --- a/classes/cache.class.php +++ b/classes/cache.class.php @@ -1,4 +1,4 @@ -Servers = $Servers; - $ServerList = array(); - foreach ($this->getServerList() as $Server) { - $ServerList["{$Server['host']}:{$Server['port']}"] = true; - } - foreach ($this->Servers as $Server) { - $ServerCheck = isset($ServerList["{$Server['host']}:{$Server['port']}"]); - if ($Server['port'] == 0) { - $ServerCheck = $ServerCheck || isset($ServerList["{$Server['host']}:11211"]); - } - if (!$ServerCheck) { - $Weight = (isset($Server['weight'])) ? $Server['weight'] : 0; - $this->addServer($Server['host'], $Server['port'], $Weight); - } - } - } - - //---------- Caching functions ----------// - - // Allows us to set an expiration on otherwise permanently cached values - // Useful for disabled users, locked threads, basically reducing ram usage - public function expire_value($Key, $Duration = 2592000) { - $StartTime = microtime(true); - $this->set($Key, $this->get($Key), $Duration); - $this->Time += (microtime(true) - $StartTime) * 1000; - } - - // Wrapper for Memcache::set, with the zlib option removed and default duration of 30 days - public function cache_value($Key, $Value, $Duration = 2592000) { - $StartTime = microtime(true); - if (empty($Key)) { - trigger_error("Cache insert failed for empty key"); - } - if (!$this->set($Key, $Value, $Duration)) { - trigger_error("Cache insert failed for key $Key:" . $this->getResultMessage()); - } - if ($this->InternalCache && array_key_exists($Key, $this->CacheHits)) { - $this->CacheHits[$Key] = $Value; - } - $this->Time += (microtime(true) - $StartTime) * 1000; - } - - // Wrapper for Memcache::add, with the zlib option removed and default duration of 30 days - public function add_value($Key, $Value, $Duration = 2592000) { - $StartTime = microtime(true); - $Added = $this->add($Key, $Value, $Duration); - $this->Time += (microtime(true) - $StartTime) * 1000; - return $Added; - } - - public function replace_value($Key, $Value, $Duration = 2592000) { - $StartTime = microtime(true); - $this->replace($Key, $Value, $Duration); - if ($this->InternalCache && array_key_exists($Key, $this->CacheHits)) { - $this->CacheHits[$Key] = $Value; - } - $this->Time += (microtime(true) - $StartTime) * 1000; - } - - public function get_value($Key, $NoCache = false) { - if (!$this->InternalCache) { - $NoCache = true; - } - $StartTime = microtime(true); - if (empty($Key)) { - trigger_error('Cache retrieval failed for empty key'); - } - - if (!empty($_GET['clearcache']) && $this->CanClear && !isset($this->ClearedKeys[$Key]) && !Misc::in_array_partial($Key, $this->PersistentKeys)) { - if ($_GET['clearcache'] === '1') { - // Because check_perms() isn't true until LoggedUser is pulled from the cache, we have to remove the entries loaded before the LoggedUser data - // Because of this, not user cache data will require a secondary pageload following the clearcache to update - if (count($this->CacheHits) > 0) { - foreach (array_keys($this->CacheHits) as $HitKey) { - if (!isset($this->ClearedKeys[$HitKey]) && !Misc::in_array_partial($HitKey, $this->PersistentKeys)) { - $this->delete($HitKey); - unset($this->CacheHits[$HitKey]); - $this->ClearedKeys[$HitKey] = true; - } - } - } - $this->delete($Key); - $this->Time += (microtime(true) - $StartTime) * 1000; - return false; - } elseif ($_GET['clearcache'] == $Key) { - $this->delete($Key); - $this->Time += (microtime(true) - $StartTime) * 1000; - return false; - } elseif (substr($_GET['clearcache'], -1) === '*') { - $Prefix = substr($_GET['clearcache'], 0, -1); - if ($Prefix === '' || $Prefix === substr($Key, 0, strlen($Prefix))) { - $this->delete($Key); - $this->Time += (microtime(true) - $StartTime) * 1000; - return false; - } - } - $this->ClearedKeys[$Key] = true; - } - - // For cases like the forums, if a key is already loaded, grab the existing pointer - if (isset($this->CacheHits[$Key]) && !$NoCache) { - $this->Time += (microtime(true) - $StartTime) * 1000; - return $this->CacheHits[$Key]; - } - - $Return = $this->get($Key); - if ($Return !== false) { - $this->CacheHits[$Key] = $NoCache ? null : $Return; - } - $this->Time += (microtime(true) - $StartTime) * 1000; - return $Return; - } - - // Wrapper for Memcache::delete. For a reason, see above. - public function delete_value($Key) { - $StartTime = microtime(true); - if (empty($Key)) { - trigger_error('Cache deletion failed for empty key'); - } - $this->delete($Key); - unset($this->CacheHits[$Key]); - $this->Time += (microtime(true) - $StartTime) * 1000; - } - - public function increment_value($Key, $Value = 1) { - $StartTime = microtime(true); - $NewVal = $this->increment($Key, $Value); - if (isset($this->CacheHits[$Key])) { - $this->CacheHits[$Key] = $NewVal; - } - $this->Time += (microtime(true) - $StartTime) * 1000; - } - - public function decrement_value($Key, $Value = 1) { - $StartTime = microtime(true); - $NewVal = $this->decrement($Key, $Value); - if (isset($this->CacheHits[$Key])) { - $this->CacheHits[$Key] = $NewVal; - } - $this->Time += (microtime(true) - $StartTime) * 1000; - } - - //---------- memcachedb functions ----------// - - public function begin_transaction($Key) { - $Value = $this->get($Key); - if (!is_array($Value)) { - $this->InTransaction = false; - $this->MemcacheDBKey = array(); - $this->MemcacheDBKey = ''; - return false; - } - $this->MemcacheDBArray = $Value; - $this->MemcacheDBKey = $Key; - $this->InTransaction = true; - return true; - } - - public function cancel_transaction() { - $this->InTransaction = false; - $this->MemcacheDBKey = array(); - $this->MemcacheDBKey = ''; - } - - public function commit_transaction($Time = 2592000) { - if (!$this->InTransaction) { - return false; - } - $this->cache_value($this->MemcacheDBKey, $this->MemcacheDBArray, $Time); - $this->InTransaction = false; - } - - // Updates multiple rows in an array - public function update_transaction($Rows, $Values) { - if (!$this->InTransaction) { - return false; - } - $Array = $this->MemcacheDBArray; - if (is_array($Rows)) { - $i = 0; - $Keys = $Rows[0]; - $Property = $Rows[1]; - foreach ($Keys as $Row) { - $Array[$Row][$Property] = $Values[$i]; - $i++; - } - } else { - $Array[$Rows] = $Values; - } - $this->MemcacheDBArray = $Array; - } - - // Updates multiple values in a single row in an array - // $Values must be an associative array with key:value pairs like in the array we're updating - public function update_row($Row, $Values) { - if (!$this->InTransaction) { - return false; - } - if ($Row === false) { - $UpdateArray = $this->MemcacheDBArray; - } else { - $UpdateArray = $this->MemcacheDBArray[$Row]; - } - foreach ($Values as $Key => $Value) { - if (!array_key_exists($Key, $UpdateArray)) { - trigger_error('Bad transaction key ('.$Key.') for cache '.$this->MemcacheDBKey); - } - if ($Value === '+1') { - if (!is_number($UpdateArray[$Key])) { - trigger_error('Tried to increment non-number ('.$Key.') for cache '.$this->MemcacheDBKey); - } - ++$UpdateArray[$Key]; // Increment value - } elseif ($Value === '-1') { - if (!is_number($UpdateArray[$Key])) { - trigger_error('Tried to decrement non-number ('.$Key.') for cache '.$this->MemcacheDBKey); - } - --$UpdateArray[$Key]; // Decrement value - } else { - $UpdateArray[$Key] = $Value; // Otherwise, just alter value - } - } - if ($Row === false) { - $this->MemcacheDBArray = $UpdateArray; - } else { - $this->MemcacheDBArray[$Row] = $UpdateArray; - } - } - - // Increments multiple values in a single row in an array - // $Values must be an associative array with key:value pairs like in the array we're updating - public function increment_row($Row, $Values) { - if (!$this->InTransaction) { - return false; - } - if ($Row === false) { - $UpdateArray = $this->MemcacheDBArray; - } else { - $UpdateArray = $this->MemcacheDBArray[$Row]; - } - foreach ($Values as $Key => $Value) { - if (!array_key_exists($Key, $UpdateArray)) { - trigger_error("Bad transaction key ($Key) for cache ".$this->MemcacheDBKey); - } - if (!is_number($Value)) { - trigger_error("Tried to increment with non-number ($Key) for cache ".$this->MemcacheDBKey); - } - $UpdateArray[$Key] += $Value; // Increment value - } - if ($Row === false) { - $this->MemcacheDBArray = $UpdateArray; - } else { - $this->MemcacheDBArray[$Row] = $UpdateArray; - } - } - - // Insert a value at the beginning of the array - public function insert_front($Key, $Value) { - if (!$this->InTransaction) { - return false; - } - if ($Key === '') { - array_unshift($this->MemcacheDBArray, $Value); - } else { - $this->MemcacheDBArray = array($Key=>$Value) + $this->MemcacheDBArray; - } - } - - // Insert a value at the end of the array - public function insert_back($Key, $Value) { - if (!$this->InTransaction) { - return false; - } - if ($Key === '') { - array_push($this->MemcacheDBArray, $Value); - } else { - $this->MemcacheDBArray = $this->MemcacheDBArray + array($Key=>$Value); - } - - } - - public function insert($Key, $Value) { - if (!$this->InTransaction) { - return false; - } - if ($Key === '') { - $this->MemcacheDBArray[] = $Value; - } else { - $this->MemcacheDBArray[$Key] = $Value; - } - } - - public function delete_row($Row) { - if (!$this->InTransaction) { - return false; - } - if (!isset($this->MemcacheDBArray[$Row])) { - trigger_error("Tried to delete non-existent row ($Row) for cache ".$this->MemcacheDBKey); - } - unset($this->MemcacheDBArray[$Row]); - } - - public function update($Key, $Rows, $Values, $Time = 2592000) { - if (!$this->InTransaction) { - $this->begin_transaction($Key); - $this->update_transaction($Rows, $Values); - $this->commit_transaction($Time); - } else { - $this->update_transaction($Rows, $Values); - } - } - - /** - * Tries to set a lock. Expiry time is one hour to avoid indefinite locks - * - * @param string $LockName name on the lock - * @return true if lock was acquired - */ - public function get_query_lock($LockName) { - return $this->add_value('query_lock_'.$LockName, 1, 3600); - } - - /** - * Remove lock - * - * @param string $LockName name on the lock - */ - public function clear_query_lock($LockName) { - $this->delete_value('query_lock_'.$LockName); - } - - /** - * Get cache server status - * - * @return array (host => bool status, ...) - */ - public function server_status() { - /*$Status = array(); - foreach ($this->Servers as $Server) { - $Status["$Server[host]:$Server[port]"] = $this->getServerStatus($Server['host'], $Server['port']); - }*/ - return $this->getStats(); - } + /** + * Torrent Group cache version + */ + const GROUP_VERSION = 5; + + public $CacheHits = []; + public $MemcacheDBArray = []; + public $MemcacheDBKey = ''; + protected $InTransaction = false; + public $Time = 0; + private $Servers = []; + private $PersistentKeys = array( + 'ajax_requests_*', + 'query_lock_*', + 'stats_*', + 'top10tor_*', + 'top10votes_*', + 'users_snatched_*', + + // Cache-based features + 'global_notification', + 'notifications_one_reads_*', + ); + private $ClearedKeys = []; + + public $CanClear = false; + public $InternalCache = true; + + /** + * CACHE constructor. Takes a array of $Servers with a host, port, and optionally a weight. + * We then add each of the servers in the array to our memcached pool assuming we haven't + * already connected to it before (cross-checking against the pool's server list). If you want + * to connect to a socket, you need to use port 0, though internally in the pool it'll have + * port 11211, so if using a server with port 0, we also need to check for port 11211 in + * the $ServerList as Memcached really doesn't like the same server being added hundreds of time + * with the same weight. + * + * @see Memcached::getServerList() + * + * @param $Servers + * @param string $PersistantID + */ + function __construct($Servers, $PersistantID = 'apl') { + parent::__construct($PersistantID); + $this->Servers = $Servers; + $ServerList = []; + foreach ($this->getServerList() as $Server) { + $ServerList["{$Server['host']}:{$Server['port']}"] = true; + } + foreach ($this->Servers as $Server) { + $ServerCheck = isset($ServerList["{$Server['host']}:{$Server['port']}"]); + if ($Server['port'] == 0) { + $ServerCheck = $ServerCheck || isset($ServerList["{$Server['host']}:11211"]); + } + if (!$ServerCheck) { + $Weight = (isset($Server['weight'])) ? $Server['weight'] : 0; + $this->addServer($Server['host'], $Server['port'], $Weight); + } + } + } + + //---------- Caching functions ----------// + + // Allows us to set an expiration on otherwise permanently cached values + // Useful for disabled users, locked threads, basically reducing ram usage + public function expire_value($Key, $Duration = 2592000) { + $StartTime = microtime(true); + $this->set($Key, $this->get($Key), $Duration); + $this->Time += (microtime(true) - $StartTime) * 1000; + } + + // Wrapper for Memcache::set, with the zlib option removed and default duration of 30 days + public function cache_value($Key, $Value, $Duration = 2592000) { + $StartTime = microtime(true); + if (empty($Key)) { + trigger_error("Cache insert failed for empty key"); + } + if (!$this->set($Key, $Value, $Duration)) { + trigger_error("Cache insert failed for key $Key:" . $this->getResultMessage()); + } + if ($this->InternalCache && array_key_exists($Key, $this->CacheHits)) { + $this->CacheHits[$Key] = $Value; + } + $this->Time += (microtime(true) - $StartTime) * 1000; + } + + // Wrapper for Memcache::add, with the zlib option removed and default duration of 30 days + public function add_value($Key, $Value, $Duration = 2592000) { + $StartTime = microtime(true); + $Added = $this->add($Key, $Value, $Duration); + $this->Time += (microtime(true) - $StartTime) * 1000; + return $Added; + } + + public function replace_value($Key, $Value, $Duration = 2592000) { + $StartTime = microtime(true); + $this->replace($Key, $Value, $Duration); + if ($this->InternalCache && array_key_exists($Key, $this->CacheHits)) { + $this->CacheHits[$Key] = $Value; + } + $this->Time += (microtime(true) - $StartTime) * 1000; + } + + public function get_value($Key, $NoCache = false) { + if (!$this->InternalCache) { + $NoCache = true; + } + $StartTime = microtime(true); + if (empty($Key)) { + trigger_error('Cache retrieval failed for empty key'); + } + + if (!empty($_GET['clearcache']) && $this->CanClear && !isset($this->ClearedKeys[$Key]) && !Misc::in_array_partial($Key, $this->PersistentKeys)) { + if ($_GET['clearcache'] === '1') { + // Because check_perms() isn't true until LoggedUser is pulled from the cache, we have to remove the entries loaded before the LoggedUser data + // Because of this, not user cache data will require a secondary pageload following the clearcache to update + if (count($this->CacheHits) > 0) { + foreach (array_keys($this->CacheHits) as $HitKey) { + if (!isset($this->ClearedKeys[$HitKey]) && !Misc::in_array_partial($HitKey, $this->PersistentKeys)) { + $this->delete($HitKey); + unset($this->CacheHits[$HitKey]); + $this->ClearedKeys[$HitKey] = true; + } + } + } + $this->delete($Key); + $this->Time += (microtime(true) - $StartTime) * 1000; + return false; + } elseif ($_GET['clearcache'] == $Key) { + $this->delete($Key); + $this->Time += (microtime(true) - $StartTime) * 1000; + return false; + } elseif (substr($_GET['clearcache'], -1) === '*') { + $Prefix = substr($_GET['clearcache'], 0, -1); + if ($Prefix === '' || $Prefix === substr($Key, 0, strlen($Prefix))) { + $this->delete($Key); + $this->Time += (microtime(true) - $StartTime) * 1000; + return false; + } + } + $this->ClearedKeys[$Key] = true; + } + + // For cases like the forums, if a key is already loaded, grab the existing pointer + if (isset($this->CacheHits[$Key]) && !$NoCache) { + $this->Time += (microtime(true) - $StartTime) * 1000; + return $this->CacheHits[$Key]; + } + + $Return = $this->get($Key); + if ($Return !== false) { + $this->CacheHits[$Key] = $NoCache ? null : $Return; + } + $this->Time += (microtime(true) - $StartTime) * 1000; + return $Return; + } + + // Wrapper for Memcache::delete. For a reason, see above. + public function delete_value($Key) { + $StartTime = microtime(true); + if (empty($Key)) { + trigger_error('Cache deletion failed for empty key'); + } + $this->delete($Key); + unset($this->CacheHits[$Key]); + $this->Time += (microtime(true) - $StartTime) * 1000; + } + + public function increment_value($Key, $Value = 1) { + $StartTime = microtime(true); + $NewVal = $this->increment($Key, $Value); + if (isset($this->CacheHits[$Key])) { + $this->CacheHits[$Key] = $NewVal; + } + $this->Time += (microtime(true) - $StartTime) * 1000; + } + + public function decrement_value($Key, $Value = 1) { + $StartTime = microtime(true); + $NewVal = $this->decrement($Key, $Value); + if (isset($this->CacheHits[$Key])) { + $this->CacheHits[$Key] = $NewVal; + } + $this->Time += (microtime(true) - $StartTime) * 1000; + } + + //---------- memcachedb functions ----------// + + public function begin_transaction($Key) { + $Value = $this->get($Key); + if (!is_array($Value)) { + $this->InTransaction = false; + $this->MemcacheDBKey = []; + $this->MemcacheDBKey = ''; + return false; + } + $this->MemcacheDBArray = $Value; + $this->MemcacheDBKey = $Key; + $this->InTransaction = true; + return true; + } + + public function cancel_transaction() { + $this->InTransaction = false; + $this->MemcacheDBKey = []; + $this->MemcacheDBKey = ''; + } + + public function commit_transaction($Time = 2592000) { + if (!$this->InTransaction) { + return false; + } + $this->cache_value($this->MemcacheDBKey, $this->MemcacheDBArray, $Time); + $this->InTransaction = false; + } + + // Updates multiple rows in an array + public function update_transaction($Rows, $Values) { + if (!$this->InTransaction) { + return false; + } + $Array = $this->MemcacheDBArray; + if (is_array($Rows)) { + $i = 0; + $Keys = $Rows[0]; + $Property = $Rows[1]; + foreach ($Keys as $Row) { + $Array[$Row][$Property] = $Values[$i]; + $i++; + } + } else { + $Array[$Rows] = $Values; + } + $this->MemcacheDBArray = $Array; + } + + // Updates multiple values in a single row in an array + // $Values must be an associative array with key:value pairs like in the array we're updating + public function update_row($Row, $Values) { + if (!$this->InTransaction) { + return false; + } + if ($Row === false) { + $UpdateArray = $this->MemcacheDBArray; + } else { + $UpdateArray = $this->MemcacheDBArray[$Row]; + } + foreach ($Values as $Key => $Value) { + if (!array_key_exists($Key, $UpdateArray)) { + trigger_error('Bad transaction key ('.$Key.') for cache '.$this->MemcacheDBKey); + } + if ($Value === '+1') { + if (!is_number($UpdateArray[$Key])) { + trigger_error('Tried to increment non-number ('.$Key.') for cache '.$this->MemcacheDBKey); + } + ++$UpdateArray[$Key]; // Increment value + } elseif ($Value === '-1') { + if (!is_number($UpdateArray[$Key])) { + trigger_error('Tried to decrement non-number ('.$Key.') for cache '.$this->MemcacheDBKey); + } + --$UpdateArray[$Key]; // Decrement value + } else { + $UpdateArray[$Key] = $Value; // Otherwise, just alter value + } + } + if ($Row === false) { + $this->MemcacheDBArray = $UpdateArray; + } else { + $this->MemcacheDBArray[$Row] = $UpdateArray; + } + } + + // Increments multiple values in a single row in an array + // $Values must be an associative array with key:value pairs like in the array we're updating + public function increment_row($Row, $Values) { + if (!$this->InTransaction) { + return false; + } + if ($Row === false) { + $UpdateArray = $this->MemcacheDBArray; + } else { + $UpdateArray = $this->MemcacheDBArray[$Row]; + } + foreach ($Values as $Key => $Value) { + if (!array_key_exists($Key, $UpdateArray)) { + trigger_error("Bad transaction key ($Key) for cache ".$this->MemcacheDBKey); + } + if (!is_number($Value)) { + trigger_error("Tried to increment with non-number ($Key) for cache ".$this->MemcacheDBKey); + } + $UpdateArray[$Key] += $Value; // Increment value + } + if ($Row === false) { + $this->MemcacheDBArray = $UpdateArray; + } else { + $this->MemcacheDBArray[$Row] = $UpdateArray; + } + } + + // Insert a value at the beginning of the array + public function insert_front($Key, $Value) { + if (!$this->InTransaction) { + return false; + } + if ($Key === '') { + array_unshift($this->MemcacheDBArray, $Value); + } else { + $this->MemcacheDBArray = array($Key=>$Value) + $this->MemcacheDBArray; + } + } + + // Insert a value at the end of the array + public function insert_back($Key, $Value) { + if (!$this->InTransaction) { + return false; + } + if ($Key === '') { + array_push($this->MemcacheDBArray, $Value); + } else { + $this->MemcacheDBArray = $this->MemcacheDBArray + array($Key=>$Value); + } + + } + + public function insert($Key, $Value) { + if (!$this->InTransaction) { + return false; + } + if ($Key === '') { + $this->MemcacheDBArray[] = $Value; + } else { + $this->MemcacheDBArray[$Key] = $Value; + } + } + + public function delete_row($Row) { + if (!$this->InTransaction) { + return false; + } + if (!isset($this->MemcacheDBArray[$Row])) { + trigger_error("Tried to delete non-existent row ($Row) for cache ".$this->MemcacheDBKey); + } + unset($this->MemcacheDBArray[$Row]); + } + + public function update($Key, $Rows, $Values, $Time = 2592000) { + if (!$this->InTransaction) { + $this->begin_transaction($Key); + $this->update_transaction($Rows, $Values); + $this->commit_transaction($Time); + } else { + $this->update_transaction($Rows, $Values); + } + } + + /** + * Tries to set a lock. Expiry time is one hour to avoid indefinite locks + * + * @param string $LockName name on the lock + * @return true if lock was acquired + */ + public function get_query_lock($LockName) { + return $this->add_value('query_lock_'.$LockName, 1, 3600); + } + + /** + * Remove lock + * + * @param string $LockName name on the lock + */ + public function clear_query_lock($LockName) { + $this->delete_value('query_lock_'.$LockName); + } + + /** + * Get cache server status + * + * @return array (host => bool status, ...) + */ + public function server_status() { + /*$Status = []; + foreach ($this->Servers as $Server) { + $Status["$Server[host]:$Server[port]"] = $this->getServerStatus($Server['host'], $Server['port']); + }*/ + return $this->getStats(); + } } diff --git a/classes/calendar.class.php b/classes/calendar.class.php index 853f812ad..70d8b27a5 100644 --- a/classes/calendar.class.php +++ b/classes/calendar.class.php @@ -1,138 +1,138 @@ - "IRC Meeting", "IRC Brainstorm", "Poll Deadline", "Feature Release", "Blog Post", "Announcement", "Featured Album", "Product Release", "Staff Picks", "Forum Brainstorm", "Forum Discussion", "Promotion", "Absence", "Task"); - public static $Importances = array(1 => "Critical", "Important", "Average", "Meh"); - public static $Colors = array( - "Critical" => "red", - "Important" => "yellow", - "Average" => "green", - "Meh" => "blue"); + public static $Categories = array(1 => "IRC Meeting", "IRC Brainstorm", "Poll Deadline", "Feature Release", "Blog Post", "Announcement", "Featured Album", "Product Release", "Staff Picks", "Forum Brainstorm", "Forum Discussion", "Promotion", "Absence", "Task"); + public static $Importances = array(1 => "Critical", "Important", "Average", "Meh"); + public static $Colors = array( + "Critical" => "red", + "Important" => "yellow", + "Average" => "green", + "Meh" => "blue"); - public static $Teams = array( - 0 => "Everyone", - 1 => "Staff" + public static $Teams = array( + 0 => "Everyone", + 1 => "Staff" - ); + ); - public static function can_view() { - return check_perms('users_mod'); - } + public static function can_view() { + return check_perms('users_mod'); + } - private static function get_teams_query() { - $Teams = array(0); - $IsMod = check_perms("users_mod"); - if ($IsMod) { - $Teams[] = 1; - } + private static function get_teams_query() { + $Teams = array(0); + $IsMod = check_perms("users_mod"); + if ($IsMod) { + $Teams[] = 1; + } - return "Team IN (" . implode(",", $Teams) . ") "; - } + return "Team IN (" . implode(",", $Teams) . ") "; + } - public static function get_events($Month, $Year) { - if (empty($Month) || empty($Year)) { - $Date = getdate(); - $Month = $Date['mon']; - $Year = $Date['year']; - } - $Month = (int)$Month; - $Year = (int)$Year; + public static function get_events($Month, $Year) { + if (empty($Month) || empty($Year)) { + $Date = getdate(); + $Month = $Date['mon']; + $Year = $Date['year']; + } + $Month = (int)$Month; + $Year = (int)$Year; - $TeamsSQL = self::get_teams_query(); + $TeamsSQL = self::get_teams_query(); - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - SELECT - ID, Team, Title, Category, Importance, DAY(StartDate) AS StartDay, DAY(EndDate) AS EndDay - FROM calendar - WHERE - MONTH(StartDate) = '$Month' - AND - YEAR(StartDate) = '$Year' - AND - $TeamsSQL"); - $Events = G::$DB->to_array(); - G::$DB->set_query_id($QueryID); - return $Events; - } + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + SELECT + ID, Team, Title, Category, Importance, DAY(StartDate) AS StartDay, DAY(EndDate) AS EndDay + FROM calendar + WHERE + MONTH(StartDate) = '$Month' + AND + YEAR(StartDate) = '$Year' + AND + $TeamsSQL"); + $Events = G::$DB->to_array(); + G::$DB->set_query_id($QueryID); + return $Events; + } - public static function get_event($ID) { - $ID = (int)$ID; - if (empty($ID)) { - error("Invalid ID"); - } - $TeamsSQL = self::get_teams_query(); - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - SELECT - ID, Team, Title, Body, Category, Importance, AddedBy, StartDate, EndDate - FROM calendar - WHERE - ID = '$ID' - AND - $TeamsSQL"); - $Event = G::$DB->next_record(MYSQLI_ASSOC); - G::$DB->set_query_id($QueryID); - return $Event; - } + public static function get_event($ID) { + $ID = (int)$ID; + if (empty($ID)) { + error("Invalid ID"); + } + $TeamsSQL = self::get_teams_query(); + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + SELECT + ID, Team, Title, Body, Category, Importance, AddedBy, StartDate, EndDate + FROM calendar + WHERE + ID = '$ID' + AND + $TeamsSQL"); + $Event = G::$DB->next_record(MYSQLI_ASSOC); + G::$DB->set_query_id($QueryID); + return $Event; + } - public static function create_event($Title, $Body, $Category, $Importance, $Team, $UserID, $StartDate, $EndDate = null) { - if (empty($Title) || empty($Body) || !is_number($Category) || !is_number($Importance) || !is_number($Team) || empty($StartDate)) { - error("Error adding event"); - } - $Title = db_string($Title); - $Body = db_string($Body); - $Category = (int)$Category; - $Importance = (int)$Importance; - $UserID = (int)$UserID; - $Team = (int)$Team; - $StartDate = db_string($StartDate); - $EndDate = db_string($EndDate); + public static function create_event($Title, $Body, $Category, $Importance, $Team, $UserID, $StartDate, $EndDate = null) { + if (empty($Title) || empty($Body) || !is_number($Category) || !is_number($Importance) || !is_number($Team) || empty($StartDate)) { + error("Error adding event"); + } + $Title = db_string($Title); + $Body = db_string($Body); + $Category = (int)$Category; + $Importance = (int)$Importance; + $UserID = (int)$UserID; + $Team = (int)$Team; + $StartDate = db_string($StartDate); + $EndDate = db_string($EndDate); - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - INSERT INTO calendar - (Title, Body, Category, Importance, Team, StartDate, EndDate, AddedBy) - VALUES - ('$Title', '$Body', '$Category', '$Importance', '$Team', '$StartDate', '$EndDate', '$UserID')"); - G::$DB->set_query_id($QueryID); - send_irc("PRIVMSG " . ADMIN_CHAN . " :!mod New calendar event created! Event: $Title; Starts: $StartDate; Ends: $EndDate."); - } + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + INSERT INTO calendar + (Title, Body, Category, Importance, Team, StartDate, EndDate, AddedBy) + VALUES + ('$Title', '$Body', '$Category', '$Importance', '$Team', '$StartDate', '$EndDate', '$UserID')"); + G::$DB->set_query_id($QueryID); + send_irc("PRIVMSG " . MOD_CHAN . " :!mod New calendar event created! Event: $Title; Starts: $StartDate; Ends: $EndDate."); + } - public static function update_event($ID, $Title, $Body, $Category, $Importance, $Team, $StartDate, $EndDate = null) { - if (!is_number($ID) || empty($Title) || empty($Body) || !is_number($Category) || !is_number($Importance) || !is_number($Team) || empty($StartDate)) { - error("Error updating event"); - } - $ID = (int)$ID; - $Title = db_string($Title); - $Body = db_string($Body); - $Category = (int)$Category; - $Importance = (int)$Importance; - $Team = (int)$Team; - $StartDate = db_string($StartDate); - $EndDate = db_string($EndDate); - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - UPDATE calendar - SET - Title = '$Title', - Body = '$Body', - Category = '$Category', - Importance = '$Importance', - Team = '$Team', - StartDate = '$StartDate', - EndDate = '$EndDate' - WHERE - ID = '$ID'"); - G::$DB->set_query_id($QueryID); - } + public static function update_event($ID, $Title, $Body, $Category, $Importance, $Team, $StartDate, $EndDate = null) { + if (!is_number($ID) || empty($Title) || empty($Body) || !is_number($Category) || !is_number($Importance) || !is_number($Team) || empty($StartDate)) { + error("Error updating event"); + } + $ID = (int)$ID; + $Title = db_string($Title); + $Body = db_string($Body); + $Category = (int)$Category; + $Importance = (int)$Importance; + $Team = (int)$Team; + $StartDate = db_string($StartDate); + $EndDate = db_string($EndDate); + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + UPDATE calendar + SET + Title = '$Title', + Body = '$Body', + Category = '$Category', + Importance = '$Importance', + Team = '$Team', + StartDate = '$StartDate', + EndDate = '$EndDate' + WHERE + ID = '$ID'"); + G::$DB->set_query_id($QueryID); + } - public static function remove_event($ID) { - $ID = (int)$ID; - if (!empty($ID)) { - $QueryID = G::$DB->get_query_id(); - G::$DB->query("DELETE FROM calendar WHERE ID = '$ID'"); - G::$DB->set_query_id($QueryID); - } - } + public static function remove_event($ID) { + $ID = (int)$ID; + if (!empty($ID)) { + $QueryID = G::$DB->get_query_id(); + G::$DB->query("DELETE FROM calendar WHERE ID = '$ID'"); + G::$DB->set_query_id($QueryID); + } + } } diff --git a/classes/calendarview.class.php b/classes/calendarview.class.php index ecce5a4b8..2fba1d1d0 100644 --- a/classes/calendarview.class.php +++ b/classes/calendarview.class.php @@ -1,120 +1,120 @@ - -
- < - - > -
- - - + < + + > + + + += $Day)) { - $Results[] = $Event; - } - } - return $Results; - } + private static function get_events_on($Day, $Events) { + // Linear search, Lol. + $Results = []; + foreach ($Events as $Event) { + if ($Event['StartDay'] == $Day || ($Event['StartDay'] <= $Day && $Event['EndDay'] >= $Day)) { + $Results[] = $Event; + } + } + return $Results; + } - private static function render_events_day($Day, $Events) { - $Events = self::get_events_on($Day, $Events); - foreach ($Events as $Event) { - $Color = Calendar::$Colors[Calendar::$Importances[$Event['Importance']]]; - $Category = Calendar::$Categories[$Event['Category']]; - $Tooltip = $Event['Title'] . " - " . Calendar::$Categories[$Event['Category']] . " - " . Calendar::$Importances[$Event['Importance']]; + private static function render_events_day($Day, $Events) { + $Events = self::get_events_on($Day, $Events); + foreach ($Events as $Event) { + $Color = Calendar::$Colors[Calendar::$Importances[$Event['Importance']]]; + $Category = Calendar::$Categories[$Event['Category']]; + $Tooltip = $Event['Title'] . " - " . Calendar::$Categories[$Event['Category']] . " - " . Calendar::$Importances[$Event['Importance']]; ?> - - + -| - - | - -||||||||||||
| + + | + +||
| - + | + - |
-
-
-
-
-
-
- |
-
-
| - + - |
|
-
-
- Report
-= $UserInfo['Class']) {
+
+
|
+
| View Performance Statistics: | -
| View Includes: | -
| View Classes: | -
| View Extensions: | -
| View Extensions: | +
| View Flags: | -
| View Constants: | -
| View Constants: | +
| View Ocelot requests: | -
| View Ocelot requests: | +
| View | -
| View | +
| View Errors: | -
| View | -
| View | -
| View | -
| - Donor System (add points) - | -|
| Value: | -- - - | -
| Reason: | -- |
| - - | -|
| + Donor System (add points) + | +|
| Value: | ++ + + | +
| Reason: | ++ |
| + + | +|
| - Donor System (modify values) - | -||
| Active points: | -- | |
| Total points: | -- | |
| Reason: | -- | |
| - - | -||
-
-
+ Donor Statistics
- -
-
-
- - Total donor points: - - -
- - Current donor rank: - -
- - Leaderboard position: - -
- - Last donated: - -
- - Rank expires: - - -
- - This user hasn't donated. - - -
Donor Statistics
+ -
+
+
- + Total donor points: + + +
- + Current donor rank: + +
- + Leaderboard position: + +
- + Last donated: + +
- + Rank expires: + + +
- + This user hasn't donated. + + +
-
-
+
-
- Hide
-
-
-
-
-
+
+ Hide
+
+
+
+
+
+
-
-
+= MAX_RANK ? MAX_RANK : $Rank;
+ $Overflow = $Rank - $CurrentRank;
+ $Display = $CurrentRank;
+ if ($Display == 5 || $Display == 6) {
+ $Display--;
+ }
+ if ($ShowOverflow && $Overflow) {
+ $Display .= " (+$Overflow)";
+ }
+ if ($Rank >= 6) {
+ $Display .= ' [Gold]';
+ } elseif ($Rank >= 4) {
+ $Display .= ' [Silver]';
+ } elseif ($Rank >= 3) {
+ $Display .= ' [Bronze]';
+ } elseif ($Rank >= 2) {
+ $Display .= ' [Copper]';
+ } elseif ($Rank >= 1) {
+ $Display .= ' [Red]';
+ }
+ }
+ echo $Display;
+ }
}
diff --git a/classes/feed.class.php b/classes/feed.class.php
index a3b8de56d..268c79f38 100644
--- a/classes/feed.class.php
+++ b/classes/feed.class.php
@@ -1,75 +1,75 @@
-\n","
- Donation History View
-
-
-
-
-
-
+
+ | - Source - | -- Date - | -- Amount (EUR) - | -- Added Points - | -- Total Points - | -- Email - | -- Reason - | -
| - () - | -- - | -- - | -- - | -- - | -- - | -- - | -
| + Source + | ++ Date + | ++ Amount (EUR) + | ++ Added Points + | ++ Total Points + | ++ Email + | ++ Reason + | +
| + () + | ++ + | ++ + | ++ + | ++ + | ++ + | ++ + | +
\nNote: The complete list of characters that are disallowed are shown below:
\n\t\t$AllBlockedChars"; + global $Err; + $Err = "One or more of the files or folders in the torrent has a name that contains the forbidden character '$Character'. Please rename the files as necessary and recreate the torrent.
\nNote: The complete list of characters that are disallowed are shown below:
\n\t\t$AllBlockedChars"; } diff --git a/classes/fonts/README.TXT b/classes/fonts/README.TXT index b977770c8..b0743ce50 100644 --- a/classes/fonts/README.TXT +++ b/classes/fonts/README.TXT @@ -9,15 +9,15 @@ IMPORTANT - READ CAREFULLY: This Microsoft End-User License Agreement ("EULA") i SOFTWARE PRODUCT LICENSE The SOFTWARE PRODUCT is protected by copyright laws and international copyright treaties, as well as other intellectual property laws and treaties. The SOFTWARE PRODUCT is licensed, not sold. 1. GRANT OF LICENSE. This EULA grants you the following rights: -· Installation and Use. You may install and use an unlimited number of copies of the SOFTWARE PRODUCT. -· Reproduction and Distribution. You may reproduce and distribute an unlimited number of copies of the SOFTWARE PRODUCT; provided that each copy shall be a true and complete copy, including all copyright and trademark notices, and shall be accompanied by a copy of this EULA. Copies of the SOFTWARE PRODUCT may not be distributed for profit either on a standalone basis or included as part of your own product. -2. DESCRIPTION OF OTHER RIGHTS AND LIMITATIONS. -· Limitations on Reverse Engineering, Decompilation, and Disassembly. You may not reverse engineer, decompile, or disassemble the SOFTWARE PRODUCT, except and only to the extent that such activity is expressly permitted by applicable law notwithstanding this limitation. +· Installation and Use. You may install and use an unlimited number of copies of the SOFTWARE PRODUCT. +· Reproduction and Distribution. You may reproduce and distribute an unlimited number of copies of the SOFTWARE PRODUCT; provided that each copy shall be a true and complete copy, including all copyright and trademark notices, and shall be accompanied by a copy of this EULA. Copies of the SOFTWARE PRODUCT may not be distributed for profit either on a standalone basis or included as part of your own product. +2. DESCRIPTION OF OTHER RIGHTS AND LIMITATIONS. +· Limitations on Reverse Engineering, Decompilation, and Disassembly. You may not reverse engineer, decompile, or disassemble the SOFTWARE PRODUCT, except and only to the extent that such activity is expressly permitted by applicable law notwithstanding this limitation. · Restrictions on Alteration. You may not rename, edit or create any derivative works from the SOFTWARE PRODUCT, other than subsetting when embedding them in documents. -· Software Transfer. You may permanently transfer all of your rights under this EULA, provided the recipient agrees to the terms of this EULA. -· Termination. Without prejudice to any other rights, Microsoft may terminate this EULA if you fail to comply with the terms and conditions of this EULA. In such event, you must destroy all copies of the SOFTWARE PRODUCT and all of its component parts. +· Software Transfer. You may permanently transfer all of your rights under this EULA, provided the recipient agrees to the terms of this EULA. +· Termination. Without prejudice to any other rights, Microsoft may terminate this EULA if you fail to comply with the terms and conditions of this EULA. In such event, you must destroy all copies of the SOFTWARE PRODUCT and all of its component parts. 3. COPYRIGHT. All title and copyrights in and to the SOFTWARE PRODUCT (including but not limited to any images, text, and "applets" incorporated into the SOFTWARE PRODUCT), the accompanying printed materials, and any copies of the SOFTWARE PRODUCT are owned by Microsoft or its suppliers. The SOFTWARE PRODUCT is protected by copyright laws and international treaty provisions. Therefore, you must treat the SOFTWARE PRODUCT like any other copyrighted material. -4. U.S. GOVERNMENT RESTRICTED RIGHTS. The SOFTWARE PRODUCT and documentation are provided with RESTRICTED RIGHTS. Use, duplication, or disclosure by the Government is subject to restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in Technical Data and Computer Software clause at DFARS 252.227-7013 or subparagraphs (c)(1) and (2) of the Commercial Computer Software-Restricted Rights at 48 CFR 52.227-19, as applicable. Manufacturer is Microsoft Corporation/One Microsoft Way/Redmond, WA 98052-6399. +4. U.S. GOVERNMENT RESTRICTED RIGHTS. The SOFTWARE PRODUCT and documentation are provided with RESTRICTED RIGHTS. Use, duplication, or disclosure by the Government is subject to restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in Technical Data and Computer Software clause at DFARS 252.227-7013 or subparagraphs (c)(1) and (2) of the Commercial Computer Software-Restricted Rights at 48 CFR 52.227-19, as applicable. Manufacturer is Microsoft Corporation/One Microsoft Way/Redmond, WA 98052-6399. LIMITED WARRANTY NO WARRANTIES. Microsoft expressly disclaims any warranty for the SOFTWARE PRODUCT. The SOFTWARE PRODUCT and any related documentation is provided "as is" without warranty of any kind, either express or implied, including, without limitation, the implied warranties or merchantability, fitness for a particular purpose, or noninfringement. The entire risk arising out of use or performance of the SOFTWARE PRODUCT remains with you. NO LIABILITY FOR CONSEQUENTIAL DAMAGES. In no event shall Microsoft or its suppliers be liable for any damages whatsoever (including, without limitation, damages for loss of business profits, business interruption, loss of business information, or any other pecuniary loss) arising out of the use of or inability to use this Microsoft product, even if Microsoft has been advised of the possibility of such damages. Because some states/jurisdictions do not allow the exclusion or limitation of liability for consequential or incidental damages, the above limitation may not apply to you. diff --git a/classes/format.class.php b/classes/format.class.php index d31e57c81..826c0c90b 100644 --- a/classes/format.class.php +++ b/classes/format.class.php @@ -1,568 +1,568 @@ - 'tl_notice', - 'snatched' => 'tl_snatched', - - 'freeleech' => 'tl_free', - 'neutral leech' => 'tl_free tl_neutral', - 'personal freeleech'=> 'tl_free tl_personal', - - 'reported' => 'tl_reported', - 'bad tags' => 'tl_reported tl_bad_tags', - 'bad folders' => 'tl_reported tl_bad_folders', - 'bad file names'=> 'tl_reported tl_bad_file_names', - 'missing lineage'=> 'tl_reported tl_missing_lineage', - 'cassette approved' => 'tl_approved tl_cassete', - 'lossy master approved' => 'tl_approved tl_lossy_master', - 'lossy web approved' => 'tl_approved tl_lossy_web' - ); - - /** - * Shorten a string - * - * @param string $Str string to cut - * @param int $Length cut at length - * @param bool $Hard force cut at length instead of at closest word - * @param bool $ShowDots Show dots at the end - * @return string formatted string - */ - public static function cut_string($Str, $Length, $Hard = false, $ShowDots = true) { - if (mb_strlen($Str, 'UTF-8') > $Length) { - if ($Hard == 0) { - // Not hard, cut at closest word - $CutDesc = mb_substr($Str, 0, $Length, 'UTF-8'); - $DescArr = explode(' ', $CutDesc); - if (count($DescArr) > 1) { - array_pop($DescArr); - $CutDesc = implode(' ', $DescArr); - } - if ($ShowDots) { - //TODO: should we replace the three dots with an ellipsis character? - $CutDesc .= '...'; - } - } else { - $CutDesc = mb_substr($Str, 0, $Length, 'UTF-8'); - if ($ShowDots) { - $CutDesc .= '...'; - } - } - return $CutDesc; - } else { - return $Str; - } - } - - - /** - * Gets the CSS class corresponding to a ratio - * - * @param $Ratio ratio to get the css class for - * @return string the CSS class corresponding to the ratio range - */ - public static function get_ratio_color($Ratio) { - if ($Ratio < 0.1) { return 'r00'; } - if ($Ratio < 0.2) { return 'r01'; } - if ($Ratio < 0.3) { return 'r02'; } - if ($Ratio < 0.4) { return 'r03'; } - if ($Ratio < 0.5) { return 'r04'; } - if ($Ratio < 0.6) { return 'r05'; } - if ($Ratio < 0.7) { return 'r06'; } - if ($Ratio < 0.8) { return 'r07'; } - if ($Ratio < 0.9) { return 'r08'; } - if ($Ratio < 1) { return 'r09'; } - if ($Ratio < 2) { return 'r10'; } - if ($Ratio < 5) { return 'r20'; } - return 'r50'; - } - - - /** - * Calculates and formats a ratio. - * - * @param int $Dividend AKA numerator - * @param int $Divisor - * @param boolean $Color if true, ratio will be coloured. - * @return string formatted ratio HTML - */ - public static function get_ratio_html($Dividend, $Divisor, $Color = true) { - $Ratio = self::get_ratio($Dividend, $Divisor); - - if ($Ratio === false) { - return '--'; - } - if ($Ratio === '∞') { - return '∞'; - } - if ($Color) { - $Ratio = sprintf('%s', - self::get_ratio_color($Ratio), - self::get_ratio($Dividend, $Divisor, 5), - $Ratio - ); - } - - return $Ratio; - } - - /** - * Returns ratio - * @param int $Dividend - * @param int $Divisor - * @param int $Decimal floor to n decimals (e.g. subtract .005 to floor to 2 decimals) - * @return boolean|string - */ - public static function get_ratio($Dividend, $Divisor, $Decimal = 2) { - if ($Divisor == 0 && $Dividend == 0) { - return false; - } - if ($Divisor == 0) { - return '∞'; - } - return number_format(max($Dividend / $Divisor - (0.5 / pow(10, $Decimal)), 0), $Decimal); - } - - /** - * Gets the query string of the current page, minus the parameters in $Exclude - * - * @param array $Exclude Query string parameters to leave out, or blank to include all parameters. - * @param bool $Escape Whether to return a string prepared for HTML output - * @param bool $Sort Whether to sort the parameters by key - * @return An optionally HTML sanatized query string - */ - public static function get_url($Exclude = false, $Escape = true, $Sort = false) { - if ($Exclude !== false) { - $Separator = $Escape ? '&' : '&'; - $QueryItems = NULL; - parse_str($_SERVER['QUERY_STRING'], $QueryItems); - foreach ($Exclude as $Key) { - unset($QueryItems[$Key]); - } - if ($Sort) { - ksort($QueryItems); - } - return http_build_query($QueryItems, '', $Separator); - } else { - return $Escape ? display_str($_SERVER['QUERY_STRING']) : $_SERVER['QUERY_STRING']; - } - } - - - /** - * Finds what page we're on and gives it to us, as well as the LIMIT clause for SQL - * Takes in $_GET['page'] as an additional input - * - * @param int $PerPage Results to show per page - * @param int $DefaultResult Optional, which result's page we want if no page is specified - * If this parameter is not specified, we will default to page 1 - * - * @return array(int, string) What page we are on, and what to use in the LIMIT section of a query - * e.g. "SELECT [...] LIMIT $Limit;" - */ - public static function page_limit($PerPage, $DefaultResult = 1) { - if (!isset($_GET['page'])) { - $Page = ceil($DefaultResult / $PerPage); - if ($Page == 0) { - $Page = 1; - } - $Limit = $PerPage; - } else { - if (!is_number($_GET['page'])) { - error(0); - } - $Page = $_GET['page']; - if ($Page <= 0) { - $Page = 1; - } - $Limit = $PerPage * $Page - $PerPage . ", $PerPage"; - } - return array($Page, $Limit); - } - - // A9 magic. Some other poor soul can write the phpdoc. - // For data stored in memcached catalogues (giant arrays), e.g. forum threads - public static function catalogue_limit($Page, $PerPage, $CatalogueSize = 500) { - $CatalogueID = floor(($PerPage * $Page - $PerPage) / $CatalogueSize); - $CatalogueLimit = ($CatalogueID * $CatalogueSize).", $CatalogueSize"; - return array($CatalogueID, $CatalogueLimit); - } - - public static function catalogue_select($Catalogue, $Page, $PerPage, $CatalogueSize = 500) { - return array_slice($Catalogue, (($PerPage * $Page - $PerPage) % $CatalogueSize), $PerPage, true); - } - - - /* Get pages - * Returns a page list, given certain information about the pages. - * - * @param int $StartPage: The current record the page you're on starts with. - * e.g. if you're on page 2 of a forum thread with 25 posts per page, $StartPage is 25. - * If you're on page 1, $StartPage is 0. - * FIXME: I don't think this is right and you want to pass in a number 1 - max page - * @param int $TotalRecords: The total number of records in the result set. - * e.g. if you're on a forum thread with 152 posts, $TotalRecords is 152. - * @param int $ItemsPerPage: Self-explanatory. The number of records shown on each page - * e.g. if there are 25 posts per forum page, $ItemsPerPage is 25. - * @param int $ShowPages: The number of page links that are shown. - * e.g. If there are 20 pages that exist, but $ShowPages is only 11, only 11 links will be shown. - * @param string $Anchor A URL fragment to attach to the links. - * e.g. '#comment12' - * @return A sanitized HTML page listing. - */ - public static function get_pages($StartPage, $TotalRecords, $ItemsPerPage, $ShowPages = 11, $Anchor = '') { - global $Document, $Method; - $Location = "$Document.php"; - $StartPage = ceil($StartPage); - $TotalPages = 0; - if ($TotalRecords > 0) { - $StartPage = min($StartPage, ceil($TotalRecords / $ItemsPerPage)); - - $ShowPages--; - $TotalPages = ceil($TotalRecords / $ItemsPerPage); - - if ($TotalPages > $ShowPages) { - $StartPosition = $StartPage - round($ShowPages / 2); - - if ($StartPosition <= 0) { - $StartPosition = 1; - } else { - if ($StartPosition >= ($TotalPages - $ShowPages)) { - $StartPosition = $TotalPages - $ShowPages; - } - } - - $StopPage = $ShowPages + $StartPosition; - - } else { - $StopPage = $TotalPages; - $StartPosition = 1; - } - - $StartPosition = max($StartPosition, 1); - - $QueryString = self::get_url(array('page', 'post')); - if ($QueryString != '') { - $QueryString = "&$QueryString"; - } - - $Pages = ''; - - if ($StartPage > 1) { - $Pages .= "<< First "; - $Pages .= "< Prev | '; - } - //End change - - for ($i = $StartPosition; $i <= $StopPage; $i++) { - if ($i != $StartPage) { - $Pages .= ""; - } - $Pages .= ''; - if ($i * $ItemsPerPage > $TotalRecords) { - $Pages .= ((($i - 1) * $ItemsPerPage) + 1)."-$TotalRecords"; - } else { - $Pages .= ((($i - 1) * $ItemsPerPage) + 1).'-'.($i * $ItemsPerPage); - } - - $Pages .= ''; - if ($i != $StartPage) { - $Pages .= ''; - } - if ($i < $StopPage) { - $Pages .= ' | '; - } - } - - if ($StartPage && $StartPage < $TotalPages) { - $Pages .= " | Next > '; - $Pages .= " Last >>"; - } - } - if ($TotalPages > 1) { - return $Pages; - } - } - - - /** - * Format a size in bytes as a human readable string in KiB/MiB/... - * Note: KiB, MiB, etc. are the IEC units, which are in base 2. - * KB, MB are the SI units, which are in base 10. - * - * @param int $Size - * @param int $Levels Number of decimal places. Defaults to 2, unless the size >= 1TB, in which case it defaults to 4. - * @return string formatted number. - */ - public static function get_size($Size, $Levels = 2) { - $Units = array(' B', ' KB', ' MB', ' GB', ' TB', ' PB', ' EB', ' ZB', ' YB'); - $Size = (double)$Size; - for ($Steps = 0; abs($Size) >= 1024; $Size /= 1024, $Steps++) { - } - if (func_num_args() == 1 && $Steps >= 4) { - $Levels++; - } - return number_format($Size, $Levels) . $Units[$Steps]; - } - - - /** - * Format a number as a multiple of its highest power of 1000 (e.g. 10035 -> '10.04k') - * - * @param int $Number - * @return string formatted number. - */ - public static function human_format($Number) { - $Steps = 0; - while ($Number >= 1000) { - $Steps++; - $Number = $Number / 1000; - } - switch ($Steps) { - case 0: return round($Number); break; - case 1: return round($Number, 2).'k'; break; - case 2: return round($Number, 2).'M'; break; - case 3: return round($Number, 2).'G'; break; - case 4: return round($Number, 2).'T'; break; - case 5: return round($Number, 2).'P'; break; - default: - return round($Number, 2).'E + '.$Steps * 3; - } - } - - - /** - * Given a formatted string of a size, get the number of bytes it represents. - * - * @param string $Size formatted size string, e.g. 123.45k - * @return Number of bytes it represents, e.g. (123.45 * 1024) - */ - public static function get_bytes($Size) { - list($Value, $Unit) = sscanf($Size, "%f%s"); - $Unit = ltrim($Unit); - if (empty($Unit)) { - return $Value ? round($Value) : 0; - } - switch (strtolower($Unit[0])) { - case 'k': return round($Value * 1024); - case 'm': return round($Value * 1048576); - case 'g': return round($Value * 1073741824); - case 't': return round($Value * 1099511627776); - default: return 0; - } - } - - - /** - * Reverse the effects of display_str - un-sanitize HTML. - * Use sparingly. - * - * @param string $Str the string to unsanitize - * @return unsanitized string - */ - // Use sparingly - public static function undisplay_str($Str) { - return mb_convert_encoding($Str, 'UTF-8', 'HTML-ENTITIES'); - } - - - /** - * Echo data sent in a GET form field, useful for text areas. - * - * @param string $Index the name of the form field - * @param boolean $Return if set to true, value is returned instead of echoed. - * @return Sanitized value of field index if $Return == true - */ - public static function form($Index, $Return = false) { - if (!empty($_GET[$Index])) { - if ($Return) { - return display_str($_GET[$Index]); - } else { - echo display_str($_GET[$Index]); - } - } - } - - - /** - * Convenience function to echo out selected="selected" and checked="checked" so you don't have to. - * - * @param string $Name the name of the option in the select (or field in $Array) - * @param mixed $Value the value that the option must be for the option to be marked as selected or checked - * @param string $Attribute The value returned/echoed is $Attribute="$Attribute" with a leading space - * @param array $Array The array the option is in, defaults to GET. - * @return void - */ - public static function selected($Name, $Value, $Attribute = 'selected', $Array = array()) { - if (empty($Array)) { - $Array = $_GET; - } - if (isset($Array[$Name]) && $Array[$Name] !== '') { - if ($Array[$Name] == $Value) { - echo " $Attribute=\"$Attribute\""; - } - } - } - - /** - * Return a CSS class name if certain conditions are met. Mainly useful to mark links as 'active' - * - * @param mixed $Target The variable to compare all values against - * @param mixed $Tests The condition values. Type and dimension determines test type - * Scalar: $Tests must be equal to $Target for a match - * Vector: All elements in $Tests must correspond to equal values in $Target - * 2-dimensional array: At least one array must be identical to $Target - * @param string $ClassName CSS class name to return - * @param bool $AddAttribute Whether to include the "class" attribute in the output - * @param string $UserIDKey Key in _REQUEST for a user ID parameter, which if given will be compared to G::$LoggedUser[ID] - * - * @return string class name on match, otherwise an empty string - */ - public static function add_class($Target, $Tests, $ClassName, $AddAttribute, $UserIDKey = false) { - if ($UserIDKey && isset($_REQUEST[$UserIDKey]) && G::$LoggedUser['ID'] != $_REQUEST[$UserIDKey]) { - return ''; - } - $Pass = true; - if (!is_array($Tests)) { - // Scalars are nice and easy - $Pass = $Tests === $Target; - } elseif (!is_array($Tests[0])) { - // Test all values in vectors - foreach ($Tests as $Type => $Part) { - if (!isset($Target[$Type]) || $Target[$Type] !== $Part) { - $Pass = false; - break; - } - } - } else { - // Loop to the end of the array or until we find a matching test - foreach ($Tests as $Test) { - $Pass = true; - // If $Pass remains true after this test, it's a match - foreach ($Test as $Type => $Part) { - if (!isset($Target[$Type]) || $Target[$Type] !== $Part) { - $Pass = false; - break; - } - } - if ($Pass) { - break; - } - } - } - if (!$Pass) { - return ''; - } - if ($AddAttribute) { - return " class=\"$ClassName\""; - } - return " $ClassName"; - } - - - /** - * Detect the encoding of a string and transform it to UTF-8. - * - * @param string $Str - * @return UTF-8 encoded version of $Str - */ - public static function make_utf8($Str) { - if ($Str != '') { - if (self::is_utf8($Str)) { - $Encoding = 'UTF-8'; - } - if (empty($Encoding)) { - $Encoding = mb_detect_encoding($Str, 'UTF-8, ISO-8859-1'); - } - if (empty($Encoding)) { - $Encoding = 'ISO-8859-1'; - } - if ($Encoding == 'UTF-8') { - return $Str; - } else { - return @mb_convert_encoding($Str, 'UTF-8', $Encoding); - } - } - } - - /** - * Magical function. - * - * @param string $Str function to detect encoding on. - * @return true if the string is in UTF-8. - */ - public static function is_utf8($Str) { - return preg_match('%^(?: - [\x09\x0A\x0D\x20-\x7E] // ASCII - | [\xC2-\xDF][\x80-\xBF] // non-overlong 2-byte - | \xE0[\xA0-\xBF][\x80-\xBF] // excluding overlongs - | [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2} // straight 3-byte - | \xED[\x80-\x9F][\x80-\xBF] // excluding surrogates - | \xF0[\x90-\xBF][\x80-\xBF]{2} // planes 1-3 - | [\xF1-\xF3][\x80-\xBF]{3} // planes 4-15 - | \xF4[\x80-\x8F][\x80-\xBF]{2} // plane 16 - )*$%xs', $Str - ); - } - - /** - * Modified accessor for the $TorrentLabels array - * - * Converts $Text to lowercase and strips non-word characters - * - * @param string $Text Search string - * @return string CSS class(es) - */ - public static function find_torrent_label_class($Text) { - $Index = mb_eregi_replace('(?:[^\w\d\s]+)', '', strtolower($Text)); - if (isset(self::$TorrentLabels[$Index])) { - return self::$TorrentLabels[$Index]; - } else { - return self::$TorrentLabels['default']; - } - } - - /** - * Creates a strong element that notes the torrent's state. - * E.g.: snatched/freeleech/neutral leech/reported - * - * The CSS class is inferred using find_torrent_label_class($Text) - * - * @param string $Text Display text - * @param string $Class Custom CSS class - * @return string element - */ - public static function torrent_label($Text, $Class = '') { - if (empty($Class)) { - $Class = self::find_torrent_label_class($Text); - } - return sprintf('%2$s', - display_str($Class), display_str($Text)); - } - - /** - * Formats a CSS class name from a Category ID - * @global array $Categories - * @param int|string $CategoryID This number will be subtracted by one - * @return string - */ - public static function css_category($CategoryID = 1) { - global $Categories; - return 'cats_' . strtolower(str_replace(array('-', ' '), '', - $Categories[$CategoryID - 1])); - } + /** + * Torrent Labels + * Map a common display string to a CSS class + * Indexes are lower case + * Note the "tl_" prefix for "torrent label" + * + * There are five basic types: + * * tl_free (leech status) + * * tl_snatched + * * tl_reported + * * tl_approved + * * tl_notice (default) + * + * @var array Strings + */ + private static $TorrentLabels = array( + 'default' => 'tl_notice', + 'snatched' => 'tl_snatched', + + 'freeleech' => 'tl_free', + 'neutral leech' => 'tl_free tl_neutral', + 'personal freeleech'=> 'tl_free tl_personal', + + 'reported' => 'tl_reported', + 'bad tags' => 'tl_reported tl_bad_tags', + 'bad folders' => 'tl_reported tl_bad_folders', + 'bad file names'=> 'tl_reported tl_bad_file_names', + 'missing lineage'=> 'tl_reported tl_missing_lineage', + 'cassette approved' => 'tl_approved tl_cassete', + 'lossy master approved' => 'tl_approved tl_lossy_master', + 'lossy web approved' => 'tl_approved tl_lossy_web' + ); + + /** + * Shorten a string + * + * @param string $Str string to cut + * @param int $Length cut at length + * @param bool $Hard force cut at length instead of at closest word + * @param bool $ShowDots Show dots at the end + * @return string formatted string + */ + public static function cut_string($Str, $Length, $Hard = false, $ShowDots = true) { + if (mb_strlen($Str, 'UTF-8') > $Length) { + if ($Hard == 0) { + // Not hard, cut at closest word + $CutDesc = mb_substr($Str, 0, $Length, 'UTF-8'); + $DescArr = explode(' ', $CutDesc); + if (count($DescArr) > 1) { + array_pop($DescArr); + $CutDesc = implode(' ', $DescArr); + } + if ($ShowDots) { + //TODO: should we replace the three dots with an ellipsis character? + $CutDesc .= '...'; + } + } else { + $CutDesc = mb_substr($Str, 0, $Length, 'UTF-8'); + if ($ShowDots) { + $CutDesc .= '...'; + } + } + return $CutDesc; + } else { + return $Str; + } + } + + + /** + * Gets the CSS class corresponding to a ratio + * + * @param $Ratio ratio to get the css class for + * @return string the CSS class corresponding to the ratio range + */ + public static function get_ratio_color($Ratio) { + if ($Ratio < 0.1) { return 'r00'; } + if ($Ratio < 0.2) { return 'r01'; } + if ($Ratio < 0.3) { return 'r02'; } + if ($Ratio < 0.4) { return 'r03'; } + if ($Ratio < 0.5) { return 'r04'; } + if ($Ratio < 0.6) { return 'r05'; } + if ($Ratio < 0.7) { return 'r06'; } + if ($Ratio < 0.8) { return 'r07'; } + if ($Ratio < 0.9) { return 'r08'; } + if ($Ratio < 1) { return 'r09'; } + if ($Ratio < 2) { return 'r10'; } + if ($Ratio < 5) { return 'r20'; } + return 'r50'; + } + + + /** + * Calculates and formats a ratio. + * + * @param int $Dividend AKA numerator + * @param int $Divisor + * @param boolean $Color if true, ratio will be coloured. + * @return string formatted ratio HTML + */ + public static function get_ratio_html($Dividend, $Divisor, $Color = true) { + $Ratio = self::get_ratio($Dividend, $Divisor); + + if ($Ratio === false) { + return '--'; + } + if ($Ratio === '∞') { + return '∞'; + } + if ($Color) { + $Ratio = sprintf('%s', + self::get_ratio_color($Ratio), + self::get_ratio($Dividend, $Divisor, 5), + $Ratio + ); + } + + return $Ratio; + } + + /** + * Returns ratio + * @param int $Dividend + * @param int $Divisor + * @param int $Decimal floor to n decimals (e.g. subtract .005 to floor to 2 decimals) + * @return boolean|string + */ + public static function get_ratio($Dividend, $Divisor, $Decimal = 2) { + if ($Divisor == 0 && $Dividend == 0) { + return false; + } + if ($Divisor == 0) { + return '∞'; + } + return number_format(max($Dividend / $Divisor - (0.5 / pow(10, $Decimal)), 0), $Decimal); + } + + /** + * Gets the query string of the current page, minus the parameters in $Exclude + * + * @param array $Exclude Query string parameters to leave out, or blank to include all parameters. + * @param bool $Escape Whether to return a string prepared for HTML output + * @param bool $Sort Whether to sort the parameters by key + * @return An optionally HTML sanatized query string + */ + public static function get_url($Exclude = false, $Escape = true, $Sort = false) { + if ($Exclude !== false) { + $Separator = $Escape ? '&' : '&'; + $QueryItems = NULL; + parse_str($_SERVER['QUERY_STRING'], $QueryItems); + foreach ($Exclude as $Key) { + unset($QueryItems[$Key]); + } + if ($Sort) { + ksort($QueryItems); + } + return http_build_query($QueryItems, '', $Separator); + } else { + return $Escape ? display_str($_SERVER['QUERY_STRING']) : $_SERVER['QUERY_STRING']; + } + } + + + /** + * Finds what page we're on and gives it to us, as well as the LIMIT clause for SQL + * Takes in $_GET['page'] as an additional input + * + * @param int $PerPage Results to show per page + * @param int $DefaultResult Optional, which result's page we want if no page is specified + * If this parameter is not specified, we will default to page 1 + * + * @return array(int, string) What page we are on, and what to use in the LIMIT section of a query + * e.g. "SELECT [...] LIMIT $Limit;" + */ + public static function page_limit($PerPage, $DefaultResult = 1) { + if (!isset($_GET['page'])) { + $Page = ceil($DefaultResult / $PerPage); + if ($Page == 0) { + $Page = 1; + } + $Limit = $PerPage; + } else { + if (!is_number($_GET['page'])) { + error(0); + } + $Page = $_GET['page']; + if ($Page <= 0) { + $Page = 1; + } + $Limit = $PerPage * $Page - $PerPage . ", $PerPage"; + } + return array($Page, $Limit); + } + + // A9 magic. Some other poor soul can write the phpdoc. + // For data stored in memcached catalogues (giant arrays), e.g. forum threads + public static function catalogue_limit($Page, $PerPage, $CatalogueSize = 500) { + $CatalogueID = floor(($PerPage * $Page - $PerPage) / $CatalogueSize); + $CatalogueLimit = ($CatalogueID * $CatalogueSize).", $CatalogueSize"; + return array($CatalogueID, $CatalogueLimit); + } + + public static function catalogue_select($Catalogue, $Page, $PerPage, $CatalogueSize = 500) { + return array_slice($Catalogue, (($PerPage * $Page - $PerPage) % $CatalogueSize), $PerPage, true); + } + + + /* Get pages + * Returns a page list, given certain information about the pages. + * + * @param int $StartPage: The current record the page you're on starts with. + * e.g. if you're on page 2 of a forum thread with 25 posts per page, $StartPage is 25. + * If you're on page 1, $StartPage is 0. + * FIXME: I don't think this is right and you want to pass in a number 1 - max page + * @param int $TotalRecords: The total number of records in the result set. + * e.g. if you're on a forum thread with 152 posts, $TotalRecords is 152. + * @param int $ItemsPerPage: Self-explanatory. The number of records shown on each page + * e.g. if there are 25 posts per forum page, $ItemsPerPage is 25. + * @param int $ShowPages: The number of page links that are shown. + * e.g. If there are 20 pages that exist, but $ShowPages is only 11, only 11 links will be shown. + * @param string $Anchor A URL fragment to attach to the links. + * e.g. '#comment12' + * @return A sanitized HTML page listing. + */ + public static function get_pages($StartPage, $TotalRecords, $ItemsPerPage, $ShowPages = 11, $Anchor = '') { + global $Document, $Method; + $Location = "$Document.php"; + $StartPage = ceil($StartPage); + $TotalPages = 0; + if ($TotalRecords > 0) { + $StartPage = min($StartPage, ceil($TotalRecords / $ItemsPerPage)); + + $ShowPages--; + $TotalPages = ceil($TotalRecords / $ItemsPerPage); + + if ($TotalPages > $ShowPages) { + $StartPosition = $StartPage - round($ShowPages / 2); + + if ($StartPosition <= 0) { + $StartPosition = 1; + } else { + if ($StartPosition >= ($TotalPages - $ShowPages)) { + $StartPosition = $TotalPages - $ShowPages; + } + } + + $StopPage = $ShowPages + $StartPosition; + + } else { + $StopPage = $TotalPages; + $StartPosition = 1; + } + + $StartPosition = max($StartPosition, 1); + + $QueryString = self::get_url(array('page', 'post')); + if ($QueryString != '') { + $QueryString = "&$QueryString"; + } + + $Pages = ''; + + if ($StartPage > 1) { + $Pages .= "<< First "; + $Pages .= "< Prev | '; + } + //End change + + for ($i = $StartPosition; $i <= $StopPage; $i++) { + if ($i != $StartPage) { + $Pages .= ""; + } + $Pages .= ''; + if ($i * $ItemsPerPage > $TotalRecords) { + $Pages .= ((($i - 1) * $ItemsPerPage) + 1)."-$TotalRecords"; + } else { + $Pages .= ((($i - 1) * $ItemsPerPage) + 1).'-'.($i * $ItemsPerPage); + } + + $Pages .= ''; + if ($i != $StartPage) { + $Pages .= ''; + } + if ($i < $StopPage) { + $Pages .= ' | '; + } + } + + if ($StartPage && $StartPage < $TotalPages) { + $Pages .= " | Next > '; + $Pages .= " Last >>"; + } + } + if ($TotalPages > 1) { + return $Pages; + } + } + + + /** + * Format a size in bytes as a human readable string in KiB/MiB/... + * Note: KiB, MiB, etc. are the IEC units, which are in base 2. + * KB, MB are the SI units, which are in base 10. + * + * @param int $Size + * @param int $Levels Number of decimal places. Defaults to 2, unless the size >= 1TB, in which case it defaults to 4. + * @return string formatted number. + */ + public static function get_size($Size, $Levels = 2) { + $Units = array(' B', ' KB', ' MB', ' GB', ' TB', ' PB', ' EB', ' ZB', ' YB'); + $Size = (double)$Size; + for ($Steps = 0; abs($Size) >= 1024; $Size /= 1024, $Steps++) { + } + if (func_num_args() == 1 && $Steps >= 4) { + $Levels++; + } + return number_format($Size, $Levels) . $Units[$Steps]; + } + + + /** + * Format a number as a multiple of its highest power of 1000 (e.g. 10035 -> '10.04k') + * + * @param int $Number + * @return string formatted number. + */ + public static function human_format($Number) { + $Steps = 0; + while ($Number >= 1000) { + $Steps++; + $Number = $Number / 1000; + } + switch ($Steps) { + case 0: return round($Number); break; + case 1: return round($Number, 2).'k'; break; + case 2: return round($Number, 2).'M'; break; + case 3: return round($Number, 2).'G'; break; + case 4: return round($Number, 2).'T'; break; + case 5: return round($Number, 2).'P'; break; + default: + return round($Number, 2).'E + '.$Steps * 3; + } + } + + + /** + * Given a formatted string of a size, get the number of bytes it represents. + * + * @param string $Size formatted size string, e.g. 123.45k + * @return Number of bytes it represents, e.g. (123.45 * 1024) + */ + public static function get_bytes($Size) { + list($Value, $Unit) = sscanf($Size, "%f%s"); + $Unit = ltrim($Unit); + if (empty($Unit)) { + return $Value ? round($Value) : 0; + } + switch (strtolower($Unit[0])) { + case 'k': return round($Value * 1024); + case 'm': return round($Value * 1048576); + case 'g': return round($Value * 1073741824); + case 't': return round($Value * 1099511627776); + default: return 0; + } + } + + + /** + * Reverse the effects of display_str - un-sanitize HTML. + * Use sparingly. + * + * @param string $Str the string to unsanitize + * @return unsanitized string + */ + // Use sparingly + public static function undisplay_str($Str) { + return mb_convert_encoding($Str, 'UTF-8', 'HTML-ENTITIES'); + } + + + /** + * Echo data sent in a GET form field, useful for text areas. + * + * @param string $Index the name of the form field + * @param boolean $Return if set to true, value is returned instead of echoed. + * @return Sanitized value of field index if $Return == true + */ + public static function form($Index, $Return = false) { + if (!empty($_GET[$Index])) { + if ($Return) { + return display_str($_GET[$Index]); + } else { + echo display_str($_GET[$Index]); + } + } + } + + + /** + * Convenience function to echo out selected="selected" and checked="checked" so you don't have to. + * + * @param string $Name the name of the option in the select (or field in $Array) + * @param mixed $Value the value that the option must be for the option to be marked as selected or checked + * @param string $Attribute The value returned/echoed is $Attribute="$Attribute" with a leading space + * @param array $Array The array the option is in, defaults to GET. + * @return void + */ + public static function selected($Name, $Value, $Attribute = 'selected', $Array = []) { + if (empty($Array)) { + $Array = $_GET; + } + if (isset($Array[$Name]) && $Array[$Name] !== '') { + if ($Array[$Name] == $Value) { + echo " $Attribute=\"$Attribute\""; + } + } + } + + /** + * Return a CSS class name if certain conditions are met. Mainly useful to mark links as 'active' + * + * @param mixed $Target The variable to compare all values against + * @param mixed $Tests The condition values. Type and dimension determines test type + * Scalar: $Tests must be equal to $Target for a match + * Vector: All elements in $Tests must correspond to equal values in $Target + * 2-dimensional array: At least one array must be identical to $Target + * @param string $ClassName CSS class name to return + * @param bool $AddAttribute Whether to include the "class" attribute in the output + * @param string $UserIDKey Key in _REQUEST for a user ID parameter, which if given will be compared to G::$LoggedUser[ID] + * + * @return string class name on match, otherwise an empty string + */ + public static function add_class($Target, $Tests, $ClassName, $AddAttribute, $UserIDKey = false) { + if ($UserIDKey && isset($_REQUEST[$UserIDKey]) && G::$LoggedUser['ID'] != $_REQUEST[$UserIDKey]) { + return ''; + } + $Pass = true; + if (!is_array($Tests)) { + // Scalars are nice and easy + $Pass = $Tests === $Target; + } elseif (!is_array($Tests[0])) { + // Test all values in vectors + foreach ($Tests as $Type => $Part) { + if (!isset($Target[$Type]) || $Target[$Type] !== $Part) { + $Pass = false; + break; + } + } + } else { + // Loop to the end of the array or until we find a matching test + foreach ($Tests as $Test) { + $Pass = true; + // If $Pass remains true after this test, it's a match + foreach ($Test as $Type => $Part) { + if (!isset($Target[$Type]) || $Target[$Type] !== $Part) { + $Pass = false; + break; + } + } + if ($Pass) { + break; + } + } + } + if (!$Pass) { + return ''; + } + if ($AddAttribute) { + return " class=\"$ClassName\""; + } + return " $ClassName"; + } + + + /** + * Detect the encoding of a string and transform it to UTF-8. + * + * @param string $Str + * @return UTF-8 encoded version of $Str + */ + public static function make_utf8($Str) { + if ($Str != '') { + if (self::is_utf8($Str)) { + $Encoding = 'UTF-8'; + } + if (empty($Encoding)) { + $Encoding = mb_detect_encoding($Str, 'UTF-8, ISO-8859-1'); + } + if (empty($Encoding)) { + $Encoding = 'ISO-8859-1'; + } + if ($Encoding == 'UTF-8') { + return $Str; + } else { + return @mb_convert_encoding($Str, 'UTF-8', $Encoding); + } + } + } + + /** + * Magical function. + * + * @param string $Str function to detect encoding on. + * @return true if the string is in UTF-8. + */ + public static function is_utf8($Str) { + return preg_match('%^(?: + [\x09\x0A\x0D\x20-\x7E] // ASCII + | [\xC2-\xDF][\x80-\xBF] // non-overlong 2-byte + | \xE0[\xA0-\xBF][\x80-\xBF] // excluding overlongs + | [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2} // straight 3-byte + | \xED[\x80-\x9F][\x80-\xBF] // excluding surrogates + | \xF0[\x90-\xBF][\x80-\xBF]{2} // planes 1-3 + | [\xF1-\xF3][\x80-\xBF]{3} // planes 4-15 + | \xF4[\x80-\x8F][\x80-\xBF]{2} // plane 16 + )*$%xs', $Str + ); + } + + /** + * Modified accessor for the $TorrentLabels array + * + * Converts $Text to lowercase and strips non-word characters + * + * @param string $Text Search string + * @return string CSS class(es) + */ + public static function find_torrent_label_class($Text) { + $Index = mb_eregi_replace('(?:[^\w\d\s]+)', '', strtolower($Text)); + if (isset(self::$TorrentLabels[$Index])) { + return self::$TorrentLabels[$Index]; + } else { + return self::$TorrentLabels['default']; + } + } + + /** + * Creates a strong element that notes the torrent's state. + * E.g.: snatched/freeleech/neutral leech/reported + * + * The CSS class is inferred using find_torrent_label_class($Text) + * + * @param string $Text Display text + * @param string $Class Custom CSS class + * @return string element + */ + public static function torrent_label($Text, $Class = '') { + if (empty($Class)) { + $Class = self::find_torrent_label_class($Text); + } + return sprintf('%2$s', + display_str($Class), display_str($Text)); + } + + /** + * Formats a CSS class name from a Category ID + * @global array $Categories + * @param int|string $CategoryID This number will be subtracted by one + * @return string + */ + public static function css_category($CategoryID = 1) { + global $Categories; + return 'cats_' . strtolower(str_replace(array('-', ' '), '', + $Categories[$CategoryID - 1])); + } } diff --git a/classes/forums.class.php b/classes/forums.class.php index 7b36ebe7c..427070aa6 100644 --- a/classes/forums.class.php +++ b/classes/forums.class.php @@ -1,319 +1,357 @@ -get_value('thread_' . $ThreadID . '_info')) || !isset($ThreadInfo['Ranking'])) { - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - SELECT - t.Title, - t.ForumID, - t.IsLocked, - t.IsSticky, - COUNT(fp.id) AS Posts, - t.LastPostAuthorID, - ISNULL(p.TopicID) AS NoPoll, - t.StickyPostID, - t.AuthorID as OP, - t.Ranking, - MAX(fp.AddedTime) as LastPostTime - FROM forums_topics AS t - JOIN forums_posts AS fp ON fp.TopicID = t.ID - LEFT JOIN forums_polls AS p ON p.TopicID = t.ID - WHERE t.ID = '$ThreadID' - GROUP BY fp.TopicID"); - if (!G::$DB->has_results()) { - G::$DB->set_query_id($QueryID); - return null; - } - $ThreadInfo = G::$DB->next_record(MYSQLI_ASSOC, false); - if ($ThreadInfo['StickyPostID']) { - $ThreadInfo['Posts']--; - G::$DB->query( - "SELECT - p.ID, - p.AuthorID, - p.AddedTime, - p.Body, - p.EditedUserID, - p.EditedTime, - ed.Username - FROM forums_posts AS p - LEFT JOIN users_main AS ed ON ed.ID = p.EditedUserID - WHERE p.TopicID = '$ThreadID' - AND p.ID = '" . $ThreadInfo['StickyPostID'] . "'"); - list ($ThreadInfo['StickyPost']) = G::$DB->to_array(false, MYSQLI_ASSOC); - } - G::$DB->set_query_id($QueryID); - if (!$SelectiveCache || !$ThreadInfo['IsLocked'] || $ThreadInfo['IsSticky']) { - G::$Cache->cache_value('thread_' . $ThreadID . '_info', $ThreadInfo, 0); - } - } - if ($Return) { - return $ThreadInfo; - } - } + /** + * Get information on a thread. + * + * @param int $ThreadID + * the thread ID. + * @param boolean $Return + * indicates whether thread info should be returned. + * @param Boolean $SelectiveCache + * cache thread info/ + * @return array holding thread information. + */ + public static function get_thread_info($ThreadID, $Return = true, $SelectiveCache = false) { + if ((!$ThreadInfo = G::$Cache->get_value('thread_' . $ThreadID . '_info')) || !isset($ThreadInfo['Ranking'])) { + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + SELECT + t.Title, + t.ForumID, + t.IsLocked, + t.IsSticky, + COUNT(fp.id) AS Posts, + t.LastPostAuthorID, + ISNULL(p.TopicID) AS NoPoll, + t.StickyPostID, + t.AuthorID as OP, + t.Ranking, + MAX(fp.AddedTime) as LastPostTime + FROM forums_topics AS t + JOIN forums_posts AS fp ON fp.TopicID = t.ID + LEFT JOIN forums_polls AS p ON p.TopicID = t.ID + WHERE t.ID = '$ThreadID' + GROUP BY fp.TopicID"); + if (!G::$DB->has_results()) { + G::$DB->set_query_id($QueryID); + return null; + } + $ThreadInfo = G::$DB->next_record(MYSQLI_ASSOC, false); + if ($ThreadInfo['StickyPostID']) { + $ThreadInfo['Posts']--; + G::$DB->query( + "SELECT + p.ID, + p.AuthorID, + p.AddedTime, + p.Body, + p.EditedUserID, + p.EditedTime, + ed.Username + FROM forums_posts AS p + LEFT JOIN users_main AS ed ON ed.ID = p.EditedUserID + WHERE p.TopicID = '$ThreadID' + AND p.ID = '" . $ThreadInfo['StickyPostID'] . "'"); + list ($ThreadInfo['StickyPost']) = G::$DB->to_array(false, MYSQLI_ASSOC); + } + G::$DB->set_query_id($QueryID); + if (!$SelectiveCache || !$ThreadInfo['IsLocked'] || $ThreadInfo['IsSticky']) { + G::$Cache->cache_value('thread_' . $ThreadID . '_info', $ThreadInfo, 0); + } + } + if ($Return) { + return $ThreadInfo; + } + } - /** - * Checks whether user has permissions on a forum. - * - * @param int $ForumID - * the forum ID. - * @param string $Perm - * the permissision to check, defaults to 'Read' - * @return boolean true if user has permission - */ - public static function check_forumperm($ForumID, $Perm = 'Read') { - $Forums = self::get_forums(); - if (isset(G::$LoggedUser['CustomForums'][$ForumID]) && G::$LoggedUser['CustomForums'][$ForumID] == 1) { - return true; - } - if ($ForumID == DONOR_FORUM && Donations::has_donor_forum(G::$LoggedUser['ID'])) { - return true; - } - if ($Forums[$ForumID]['MinClass' . $Perm] > G::$LoggedUser['Class'] && (!isset(G::$LoggedUser['CustomForums'][$ForumID]) || G::$LoggedUser['CustomForums'][$ForumID] == 0)) { - return false; - } - if (isset(G::$LoggedUser['CustomForums'][$ForumID]) && G::$LoggedUser['CustomForums'][$ForumID] == 0) { - return false; - } - return true; - } + /** + * Checks whether user has permissions on a forum. + * + * @param int $ForumID + * the forum ID. + * @param string $Perm + * the permissision to check, defaults to 'Read' + * @return boolean true if user has permission + */ + public static function check_forumperm($ForumID, $Perm = 'Read') { + $Forums = self::get_forums(); + if (isset(G::$LoggedUser['CustomForums'][$ForumID]) && G::$LoggedUser['CustomForums'][$ForumID] == 1) { + return true; + } + if ($ForumID == DONOR_FORUM && Donations::has_donor_forum(G::$LoggedUser['ID'])) { + return true; + } + if ($Forums[$ForumID]['MinClass' . $Perm] > G::$LoggedUser['Class'] && (!isset(G::$LoggedUser['CustomForums'][$ForumID]) || G::$LoggedUser['CustomForums'][$ForumID] == 0)) { + return false; + } + if (isset(G::$LoggedUser['CustomForums'][$ForumID]) && G::$LoggedUser['CustomForums'][$ForumID] == 0) { + return false; + } + return true; + } - /** - * Gets basic info on a forum. - * - * @param int $ForumID - * the forum ID. - */ - public static function get_forum_info($ForumID) { - $Forum = G::$Cache->get_value("ForumInfo_$ForumID"); - if (!$Forum) { - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - SELECT - Name, - MinClassRead, - MinClassWrite, - MinClassCreate, - COUNT(forums_topics.ID) AS Topics - FROM forums - LEFT JOIN forums_topics ON forums_topics.ForumID = forums.ID - WHERE forums.ID = '$ForumID' - GROUP BY ForumID"); - if (!G::$DB->has_results()) { - return false; - } - // Makes an array, with $Forum['Name'], etc. - $Forum = G::$DB->next_record(MYSQLI_ASSOC); + /** + * Gets basic info on a forum. + * + * @param int $ForumID + * the forum ID. + */ + public static function get_forum_info($ForumID) { + $Forum = G::$Cache->get_value("ForumInfo_$ForumID"); + if (!$Forum) { + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + SELECT + Name, + MinClassRead, + MinClassWrite, + MinClassCreate, + COUNT(forums_topics.ID) AS Topics + FROM forums + LEFT JOIN forums_topics ON forums_topics.ForumID = forums.ID + WHERE forums.ID = '$ForumID' + GROUP BY ForumID"); + if (!G::$DB->has_results()) { + return false; + } + // Makes an array, with $Forum['Name'], etc. + $Forum = G::$DB->next_record(MYSQLI_ASSOC); - G::$DB->set_query_id($QueryID); + G::$DB->set_query_id($QueryID); - G::$Cache->cache_value("ForumInfo_$ForumID", $Forum, 86400); - } - return $Forum; - } + G::$Cache->cache_value("ForumInfo_$ForumID", $Forum, 86400); + } + return $Forum; + } - /** - * Get the forum categories - * @return array ForumCategoryID => Name - */ - public static function get_forum_categories() { - $ForumCats = G::$Cache->get_value('forums_categories'); - if ($ForumCats === false) { - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - SELECT ID, Name - FROM forums_categories - ORDER BY Sort, Name"); - $ForumCats = array(); - while (list ($ID, $Name) = G::$DB->next_record()) { - $ForumCats[$ID] = $Name; - } - G::$DB->set_query_id($QueryID); - G::$Cache->cache_value('forums_categories', $ForumCats, 0); - } - return $ForumCats; - } + /** + * Get the forum categories + * @return array ForumCategoryID => Name + */ + public static function get_forum_categories() { + $ForumCats = G::$Cache->get_value('forums_categories'); + if ($ForumCats === false) { + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + SELECT ID, Name + FROM forums_categories + ORDER BY Sort, Name"); + $ForumCats = []; + while (list ($ID, $Name) = G::$DB->next_record()) { + $ForumCats[$ID] = $Name; + } + G::$DB->set_query_id($QueryID); + G::$Cache->cache_value('forums_categories', $ForumCats, 0); + } + return $ForumCats; + } - /** - * Get the forums - * @return array ForumID => (various information about the forum) - */ - public static function get_forums() { - if (!$Forums = G::$Cache->get_value('forums_list')) { - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - SELECT - f.ID, - f.CategoryID, - f.Name, - f.Description, - f.MinClassRead AS MinClassRead, - f.MinClassWrite AS MinClassWrite, - f.MinClassCreate AS MinClassCreate, - f.NumTopics, - f.NumPosts, - f.LastPostID, - f.LastPostAuthorID, - f.LastPostTopicID, - f.LastPostTime, - 0 AS SpecificRules, - t.Title, - t.IsLocked AS Locked, - t.IsSticky AS Sticky - FROM forums AS f - JOIN forums_categories AS fc ON fc.ID = f.CategoryID - LEFT JOIN forums_topics AS t ON t.ID = f.LastPostTopicID - GROUP BY f.ID - ORDER BY fc.Sort, fc.Name, f.CategoryID, f.Sort, f.Name"); - $Forums = G::$DB->to_array('ID', MYSQLI_ASSOC, false); + /** + * Get the forums + * @return array ForumID => (various information about the forum) + */ + public static function get_forums() { + if (!$Forums = G::$Cache->get_value('forums_list')) { + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + SELECT + f.ID, + f.CategoryID, + f.Name, + f.Description, + f.MinClassRead AS MinClassRead, + f.MinClassWrite AS MinClassWrite, + f.MinClassCreate AS MinClassCreate, + f.NumTopics, + f.NumPosts, + f.LastPostID, + f.LastPostAuthorID, + f.LastPostTopicID, + f.LastPostTime, + 0 AS SpecificRules, + t.Title, + t.IsLocked AS Locked, + t.IsSticky AS Sticky + FROM forums AS f + JOIN forums_categories AS fc ON fc.ID = f.CategoryID + LEFT JOIN forums_topics AS t ON t.ID = f.LastPostTopicID + GROUP BY f.ID + ORDER BY fc.Sort, fc.Name, f.CategoryID, f.Sort, f.Name"); + $Forums = G::$DB->to_array('ID', MYSQLI_ASSOC, false); - G::$DB->query(" - SELECT ForumID, ThreadID - FROM forums_specific_rules"); - $SpecificRules = array(); - while (list($ForumID, $ThreadID) = G::$DB->next_record(MYSQLI_NUM, false)) { - $SpecificRules[$ForumID][] = $ThreadID; - } - G::$DB->set_query_id($QueryID); - foreach ($Forums as $ForumID => &$Forum) { - if (isset($SpecificRules[$ForumID])) { - $Forum['SpecificRules'] = $SpecificRules[$ForumID]; - } else { - $Forum['SpecificRules'] = array(); - } - } - G::$Cache->cache_value('forums_list', $Forums, 0); - } - return $Forums; - } + G::$DB->query(" + SELECT ForumID, ThreadID + FROM forums_specific_rules"); + $SpecificRules = []; + while (list($ForumID, $ThreadID) = G::$DB->next_record(MYSQLI_NUM, false)) { + $SpecificRules[$ForumID][] = $ThreadID; + } + G::$DB->set_query_id($QueryID); + foreach ($Forums as $ForumID => &$Forum) { + if (isset($SpecificRules[$ForumID])) { + $Forum['SpecificRules'] = $SpecificRules[$ForumID]; + } else { + $Forum['SpecificRules'] = []; + } + } + G::$Cache->cache_value('forums_list', $Forums, 0); + } + return $Forums; + } - /** - * Get all forums that the current user has special access to ("Extra forums" in the profile) - * @return array Array of ForumIDs - */ - public static function get_permitted_forums() { - return isset(G::$LoggedUser['CustomForums']) ? array_keys(G::$LoggedUser['CustomForums'], 1) : array(); - } + /** + * Get all forums that the current user has special access to ("Extra forums" in the profile) + * @return array Array of ForumIDs + */ + public static function get_permitted_forums() { + return isset(G::$LoggedUser['CustomForums']) ? array_keys(G::$LoggedUser['CustomForums'], 1) : []; + } - /** - * Get all forums that the current user does not have access to ("Restricted forums" in the profile) - * @return array Array of ForumIDs - */ - public static function get_restricted_forums() { - return isset(G::$LoggedUser['CustomForums']) ? array_keys(G::$LoggedUser['CustomForums'], 0) : array(); - } + /** + * Get all forums that the current user does not have access to ("Restricted forums" in the profile) + * @return array Array of ForumIDs + */ + public static function get_restricted_forums() { + return isset(G::$LoggedUser['CustomForums']) ? array_keys(G::$LoggedUser['CustomForums'], 0) : []; + } - /** - * Get the last read posts for the current user - * @param array $Forums Array of forums as returned by self::get_forums() - * @return array TopicID => array(TopicID, PostID, Page) where PostID is the ID of the last read post and Page is the page on which that post is - */ - public static function get_last_read($Forums) { - if (isset(G::$LoggedUser['PostsPerPage'])) { - $PerPage = G::$LoggedUser['PostsPerPage']; - } else { - $PerPage = POSTS_PER_PAGE; - } - $TopicIDs = array(); - foreach ($Forums as $Forum) { - if (!empty($Forum['LastPostTopicID'])) { - $TopicIDs[] = $Forum['LastPostTopicID']; - } - } - if (!empty($TopicIDs)) { - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - SELECT - l.TopicID, - l.PostID, - CEIL( - ( - SELECT - COUNT(p.ID) - FROM forums_posts AS p - WHERE p.TopicID = l.TopicID - AND p.ID <= l.PostID - ) / $PerPage - ) AS Page - FROM forums_last_read_topics AS l - WHERE l.TopicID IN(" . implode(',', $TopicIDs) . ") AND - l.UserID = '" . G::$LoggedUser['ID'] . "'"); - $LastRead = G::$DB->to_array('TopicID', MYSQLI_ASSOC); - G::$DB->set_query_id($QueryID); - } else { - $LastRead = array(); - } - return $LastRead; - } + /** + * Get the last read posts for the current user + * @param array $Forums Array of forums as returned by self::get_forums() + * @return array TopicID => array(TopicID, PostID, Page) where PostID is the ID of the last read post and Page is the page on which that post is + */ + public static function get_last_read($Forums) { + if (isset(G::$LoggedUser['PostsPerPage'])) { + $PerPage = G::$LoggedUser['PostsPerPage']; + } else { + $PerPage = POSTS_PER_PAGE; + } + $TopicIDs = []; + foreach ($Forums as $Forum) { + if (!empty($Forum['LastPostTopicID'])) { + $TopicIDs[] = $Forum['LastPostTopicID']; + } + } + if (!empty($TopicIDs)) { + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + SELECT + l.TopicID, + l.PostID, + CEIL( + ( + SELECT + COUNT(p.ID) + FROM forums_posts AS p + WHERE p.TopicID = l.TopicID + AND p.ID <= l.PostID + ) / $PerPage + ) AS Page + FROM forums_last_read_topics AS l + WHERE l.TopicID IN(" . implode(',', $TopicIDs) . ") AND + l.UserID = '" . G::$LoggedUser['ID'] . "'"); + $LastRead = G::$DB->to_array('TopicID', MYSQLI_ASSOC); + G::$DB->set_query_id($QueryID); + } else { + $LastRead = []; + } + return $LastRead; + } - /** - * Add a note to a topic. - * @param int $TopicID - * @param string $Note - * @param int|null $UserID - * @return boolean - */ - public static function add_topic_note($TopicID, $Note, $UserID = null) { - if ($UserID === null) { - $UserID = G::$LoggedUser['ID']; - } - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - INSERT INTO forums_topic_notes - (TopicID, AuthorID, AddedTime, Body) - VALUES - ($TopicID, $UserID, '" . sqltime() . "', '" . db_string($Note) . "')"); - G::$DB->set_query_id($QueryID); - return (bool)G::$DB->affected_rows(); - } + /** + * Add a note to a topic. + * @param int $TopicID + * @param string $Note + * @param int|null $UserID + * @return boolean + */ + public static function add_topic_note($TopicID, $Note, $UserID = null) { + if ($UserID === null) { + $UserID = G::$LoggedUser['ID']; + } + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + INSERT INTO forums_topic_notes + (TopicID, AuthorID, AddedTime, Body) + VALUES + ($TopicID, $UserID, '" . sqltime() . "', '" . db_string($Note) . "')"); + G::$DB->set_query_id($QueryID); + return (bool)G::$DB->affected_rows(); + } - /** - * Determine if a thread is unread - * @param bool $Locked - * @param bool $Sticky - * @param int $LastPostID - * @param array $LastRead An array as returned by self::get_last_read - * @param int $LastTopicID TopicID of the thread where the most recent post was made - * @param string $LastTime Datetime of the last post - * @return bool - */ - public static function is_unread($Locked, $Sticky, $LastPostID, $LastRead, $LastTopicID, $LastTime) { - return (!$Locked || $Sticky) && $LastPostID != 0 && ((empty($LastRead[$LastTopicID]) || $LastRead[$LastTopicID]['PostID'] < $LastPostID) && strtotime($LastTime) > G::$LoggedUser['CatchupTime']); - } + /** + * Determine if a thread is unread + * @param bool $Locked + * @param bool $Sticky + * @param int $LastPostID + * @param array $LastRead An array as returned by self::get_last_read + * @param int $LastTopicID TopicID of the thread where the most recent post was made + * @param string $LastTime Datetime of the last post + * @return bool + */ + public static function is_unread($Locked, $Sticky, $LastPostID, $LastRead, $LastTopicID, $LastTime) { + return (!$Locked || $Sticky) && $LastPostID != 0 && ((empty($LastRead[$LastTopicID]) || $LastRead[$LastTopicID]['PostID'] < $LastPostID) && strtotime($LastTime) > G::$LoggedUser['CatchupTime']); + } - /** - * Create the part of WHERE in the sql queries used to filter forums for a - * specific user (MinClassRead, restricted and permitted forums). - * @return string - */ - public static function user_forums_sql() { - // I couldn't come up with a good name, please rename this if you can. -- Y - $RestrictedForums = self::get_restricted_forums(); - $PermittedForums = self::get_permitted_forums(); - if (Donations::has_donor_forum(G::$LoggedUser['ID']) && !in_array(DONOR_FORUM, $PermittedForums)) { - $PermittedForums[] = DONOR_FORUM; - } - $SQL = "((f.MinClassRead <= '" . G::$LoggedUser['Class'] . "'"; - if (count($RestrictedForums)) { - $SQL .= " AND f.ID NOT IN ('" . implode("', '", $RestrictedForums) . "')"; - } - $SQL .= ')'; - if (count($PermittedForums)) { - $SQL .= " OR f.ID IN ('" . implode("', '", $PermittedForums) . "')"; - } - $SQL .= ')'; - return $SQL; - } + /** + * Create the part of WHERE in the sql queries used to filter forums for a + * specific user (MinClassRead, restricted and permitted forums). + * @return string + */ + public static function user_forums_sql() { + // I couldn't come up with a good name, please rename this if you can. -- Y + $RestrictedForums = self::get_restricted_forums(); + $PermittedForums = self::get_permitted_forums(); + if (Donations::has_donor_forum(G::$LoggedUser['ID']) && !in_array(DONOR_FORUM, $PermittedForums)) { + $PermittedForums[] = DONOR_FORUM; + } + $SQL = "((f.MinClassRead <= '" . G::$LoggedUser['Class'] . "'"; + if (count($RestrictedForums)) { + $SQL .= " AND f.ID NOT IN ('" . implode("', '", $RestrictedForums) . "')"; + } + $SQL .= ')'; + if (count($PermittedForums)) { + $SQL .= " OR f.ID IN ('" . implode("', '", $PermittedForums) . "')"; + } + $SQL .= ')'; + return $SQL; + } + + public static function get_transitions() { + $items = G::$Cache->get_value('forum_transitions'); + if (!$items) { + $queryId = G::$DB->get_query_id(); + G::$DB->prepared_query(' + SELECT forums_transitions_id AS id, source, destination, label, permission_levels + FROM forums_transitions'); + $items = G::$DB->to_array('id', MYSQLI_ASSOC); + G::$Cache->cache_value('forum_transitions', $items); + G::$DB->set_query_id($queryId); + } + + if (check_perms('site_moderate_forums')) { + return $items; + } + + return array_filter($items, function ($item) { + $perms = array_fill_keys(explode(',', $item['permission_levels']), 1); + if (count(array_intersect_key($perms, Users::user_info(G::$LoggedUser['ID'])['ExtraClasses'])) > 0) { + return true; + } + return false; + }); + } + + public static function get_thread_transitions($forum) { + $transitions = self::get_transitions(); + + $filtered = []; + foreach ($transitions as $transition) { + if ($transition['source'] == $forum) { + $filtered[] = $transition; + } + } + + return $filtered; + } } diff --git a/classes/g.class.php b/classes/g.class.php index 210c6b3ef..9ec418d31 100644 --- a/classes/g.class.php +++ b/classes/g.class.php @@ -1,18 +1,26 @@ -_getBase32LookupTable(); - - // Valid secret lengths are 80 to 640 bits - if ($secretLength < 16 || $secretLength > 128) { - throw new Exception('Bad secret length'); - } - $secret = ''; - $rnd = false; - if (function_exists('random_bytes')) { - $rnd = random_bytes($secretLength); - } elseif (function_exists('mcrypt_create_iv')) { - $rnd = mcrypt_create_iv($secretLength, MCRYPT_DEV_URANDOM); - } elseif (function_exists('openssl_random_pseudo_bytes')) { - $rnd = openssl_random_pseudo_bytes($secretLength, $cryptoStrong); - if (!$cryptoStrong) { - $rnd = false; - } - } - if ($rnd !== false) { - for ($i = 0; $i < $secretLength; ++$i) { - $secret .= $validChars[ord($rnd[$i]) & 31]; - } - } else { - throw new Exception('No source of secure random'); - } - - return $secret; - } - - /** - * Calculate the code, with given secret and point in time. - * - * @param string $secret - * @param int|null $timeSlice - * - * @return string - */ - public function getCode($secret, $timeSlice = null) - { - if ($timeSlice === null) { - $timeSlice = floor(time() / 30); - } - - $secretkey = $this->_base32Decode($secret); - - // Pack time into binary string - $time = chr(0) . chr(0) . chr(0) . chr(0) . pack('N*', $timeSlice); - // Hash it with users secret key - $hm = hash_hmac('SHA1', $time, $secretkey, true); - // Use last nipple of result as index/offset - $offset = ord(substr($hm, -1)) & 0x0F; - // grab 4 bytes of the result - $hashpart = substr($hm, $offset, 4); - - // Unpak binary value - $value = unpack('N', $hashpart); - $value = $value[1]; - // Only 32 bits - $value = $value & 0x7FFFFFFF; - - $modulo = pow(10, $this->_codeLength); - - return str_pad($value % $modulo, $this->_codeLength, '0', STR_PAD_LEFT); - } - - /** - * Get QR-Code URL for image, from google charts. - * - * @param string $name - * @param string $secret - * @param string $title - * @param array $params - * - * @return string - */ - public function getQRCodeGoogleUrl($name, $secret, $title = null, $params = array()) - { - $width = !empty($params['width']) && (int)$params['width'] > 0 ? (int)$params['width'] : 200; - $height = !empty($params['height']) && (int)$params['height'] > 0 ? (int)$params['height'] : 200; - $level = !empty($params['level']) && array_search($params['level'], array('L', 'M', 'Q', 'H')) !== false ? $params['level'] : 'M'; - - $urlencoded = urlencode('otpauth://totp/' . $name . '?secret=' . $secret . ''); - if (isset($title)) { - $urlencoded .= urlencode('&issuer=' . urlencode($title)); - } - - return 'https://chart.googleapis.com/chart?chs=' . $width . 'x' . $height . '&chld=' . $level . '|0&cht=qr&chl=' . $urlencoded . ''; - } - - /** - * Check if the code is correct. This will accept codes starting from $discrepancy*30sec ago to $discrepancy*30sec from now. - * - * @param string $secret - * @param string $code - * @param int $discrepancy This is the allowed time drift in 30 second units (8 means 4 minutes before or after) - * @param int|null $currentTimeSlice time slice if we want use other that time() - * - * @return bool - */ - public function verifyCode($secret, $code, $discrepancy = 1, $currentTimeSlice = null) - { - if ($currentTimeSlice === null) { - $currentTimeSlice = floor(time() / 30); - } - - if (strlen($code) != 6) { - return false; - } - - for ($i = -$discrepancy; $i <= $discrepancy; ++$i) { - $calculatedCode = $this->getCode($secret, $currentTimeSlice + $i); - if ($this->timingSafeEquals($calculatedCode, $code)) { - return true; - } - } - - return false; - } - - /** - * Set the code length, should be >=6. - * - * @param int $length - * - * @return PHPGangsta_GoogleAuthenticator - */ - public function setCodeLength($length) - { - $this->_codeLength = $length; - - return $this; - } - - /** - * Helper class to decode base32. - * - * @param $secret - * - * @return bool|string - */ - protected function _base32Decode($secret) - { - if (empty($secret)) { - return ''; - } - - $base32chars = $this->_getBase32LookupTable(); - $base32charsFlipped = array_flip($base32chars); - - $paddingCharCount = substr_count($secret, $base32chars[32]); - $allowedValues = array(6, 4, 3, 1, 0); - if (!in_array($paddingCharCount, $allowedValues)) { - return false; - } - for ($i = 0; $i < 4; ++$i) { - if ($paddingCharCount == $allowedValues[$i] && - substr($secret, -($allowedValues[$i])) != str_repeat($base32chars[32], $allowedValues[$i]) - ) { - return false; - } - } - $secret = str_replace('=', '', $secret); - $secret = str_split($secret); - $binaryString = ''; - for ($i = 0; $i < count($secret); $i = $i + 8) { - $x = ''; - if (!in_array($secret[$i], $base32chars)) { - return false; - } - for ($j = 0; $j < 8; ++$j) { - $x .= str_pad(base_convert(@$base32charsFlipped[@$secret[$i + $j]], 10, 2), 5, '0', STR_PAD_LEFT); - } - $eightBits = str_split($x, 8); - for ($z = 0; $z < count($eightBits); ++$z) { - $binaryString .= (($y = chr(base_convert($eightBits[$z], 2, 10))) || ord($y) == 48) ? $y : ''; - } - } - - return $binaryString; - } - - /** - * Get array with all 32 characters for decoding from/encoding to base32. - * - * @return array - */ - protected function _getBase32LookupTable() - { - return array( - 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', // 7 - 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', // 15 - 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', // 23 - 'Y', 'Z', '2', '3', '4', '5', '6', '7', // 31 - '=', // padding char - ); - } - - /** - * A timing safe equals comparison - * more info here: http://blog.ircmaxell.com/2014/11/its-all-about-time.html. - * - * @param string $safeString The internal (safe) value to be checked - * @param string $userString The user submitted (unsafe) value - * - * @return bool True if the two strings are identical - */ - private function timingSafeEquals($safeString, $userString) - { - if (function_exists('hash_equals')) { - return hash_equals($safeString, $userString); - } - $safeLen = strlen($safeString); - $userLen = strlen($userString); - - if ($userLen != $safeLen) { - return false; - } - - $result = 0; - - for ($i = 0; $i < $userLen; ++$i) { - $result |= (ord($safeString[$i]) ^ ord($userString[$i])); - } - - // They are only identical strings if $result is exactly 0... - return $result === 0; - } + protected $_codeLength = 6; + + /** + * Create new secret. + * 16 characters, randomly chosen from the allowed base32 characters. + * + * @param int $secretLength + * + * @return string + */ + public function createSecret($secretLength = 16) + { + $validChars = $this->_getBase32LookupTable(); + + // Valid secret lengths are 80 to 640 bits + if ($secretLength < 16 || $secretLength > 128) { + throw new Exception('Bad secret length'); + } + $secret = ''; + $rnd = false; + if (function_exists('random_bytes')) { + $rnd = random_bytes($secretLength); + } elseif (function_exists('mcrypt_create_iv')) { + $rnd = mcrypt_create_iv($secretLength, MCRYPT_DEV_URANDOM); + } elseif (function_exists('openssl_random_pseudo_bytes')) { + $rnd = openssl_random_pseudo_bytes($secretLength, $cryptoStrong); + if (!$cryptoStrong) { + $rnd = false; + } + } + if ($rnd !== false) { + for ($i = 0; $i < $secretLength; ++$i) { + $secret .= $validChars[ord($rnd[$i]) & 31]; + } + } else { + throw new Exception('No source of secure random'); + } + + return $secret; + } + + /** + * Calculate the code, with given secret and point in time. + * + * @param string $secret + * @param int|null $timeSlice + * + * @return string + */ + public function getCode($secret, $timeSlice = null) + { + if ($timeSlice === null) { + $timeSlice = floor(time() / 30); + } + + $secretkey = $this->_base32Decode($secret); + + // Pack time into binary string + $time = chr(0) . chr(0) . chr(0) . chr(0) . pack('N*', $timeSlice); + // Hash it with users secret key + $hm = hash_hmac('SHA1', $time, $secretkey, true); + // Use last nipple of result as index/offset + $offset = ord(substr($hm, -1)) & 0x0F; + // grab 4 bytes of the result + $hashpart = substr($hm, $offset, 4); + + // Unpak binary value + $value = unpack('N', $hashpart); + $value = $value[1]; + // Only 32 bits + $value = $value & 0x7FFFFFFF; + + $modulo = pow(10, $this->_codeLength); + + return str_pad($value % $modulo, $this->_codeLength, '0', STR_PAD_LEFT); + } + + /** + * Get QR-Code URL for image, from google charts. + * + * @param string $name + * @param string $secret + * @param string $title + * @param array $params + * + * @return string + */ + public function getQRCodeGoogleUrl($name, $secret, $title = null, $params = []) + { + $width = !empty($params['width']) && (int)$params['width'] > 0 ? (int)$params['width'] : 200; + $height = !empty($params['height']) && (int)$params['height'] > 0 ? (int)$params['height'] : 200; + $level = !empty($params['level']) && array_search($params['level'], array('L', 'M', 'Q', 'H')) !== false ? $params['level'] : 'M'; + + $urlencoded = urlencode('otpauth://totp/' . $name . '?secret=' . $secret . ''); + if (isset($title)) { + $urlencoded .= urlencode('&issuer=' . urlencode($title)); + } + + return 'https://chart.googleapis.com/chart?chs=' . $width . 'x' . $height . '&chld=' . $level . '|0&cht=qr&chl=' . $urlencoded . ''; + } + + /** + * Check if the code is correct. This will accept codes starting from $discrepancy*30sec ago to $discrepancy*30sec from now. + * + * @param string $secret + * @param string $code + * @param int $discrepancy This is the allowed time drift in 30 second units (8 means 4 minutes before or after) + * @param int|null $currentTimeSlice time slice if we want use other that time() + * + * @return bool + */ + public function verifyCode($secret, $code, $discrepancy = 1, $currentTimeSlice = null) + { + if ($currentTimeSlice === null) { + $currentTimeSlice = floor(time() / 30); + } + + if (strlen($code) != 6) { + return false; + } + + for ($i = -$discrepancy; $i <= $discrepancy; ++$i) { + $calculatedCode = $this->getCode($secret, $currentTimeSlice + $i); + if ($this->timingSafeEquals($calculatedCode, $code)) { + return true; + } + } + + return false; + } + + /** + * Set the code length, should be >=6. + * + * @param int $length + * + * @return PHPGangsta_GoogleAuthenticator + */ + public function setCodeLength($length) + { + $this->_codeLength = $length; + + return $this; + } + + /** + * Helper class to decode base32. + * + * @param $secret + * + * @return bool|string + */ + protected function _base32Decode($secret) + { + if (empty($secret)) { + return ''; + } + + $base32chars = $this->_getBase32LookupTable(); + $base32charsFlipped = array_flip($base32chars); + + $paddingCharCount = substr_count($secret, $base32chars[32]); + $allowedValues = array(6, 4, 3, 1, 0); + if (!in_array($paddingCharCount, $allowedValues)) { + return false; + } + for ($i = 0; $i < 4; ++$i) { + if ($paddingCharCount == $allowedValues[$i] && + substr($secret, -($allowedValues[$i])) != str_repeat($base32chars[32], $allowedValues[$i]) + ) { + return false; + } + } + $secret = str_replace('=', '', $secret); + $secret = str_split($secret); + $binaryString = ''; + for ($i = 0; $i < count($secret); $i = $i + 8) { + $x = ''; + if (!in_array($secret[$i], $base32chars)) { + return false; + } + for ($j = 0; $j < 8; ++$j) { + $x .= str_pad(base_convert(@$base32charsFlipped[@$secret[$i + $j]], 10, 2), 5, '0', STR_PAD_LEFT); + } + $eightBits = str_split($x, 8); + for ($z = 0; $z < count($eightBits); ++$z) { + $binaryString .= (($y = chr(base_convert($eightBits[$z], 2, 10))) || ord($y) == 48) ? $y : ''; + } + } + + return $binaryString; + } + + /** + * Get array with all 32 characters for decoding from/encoding to base32. + * + * @return array + */ + protected function _getBase32LookupTable() + { + return array( + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', // 7 + 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', // 15 + 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', // 23 + 'Y', 'Z', '2', '3', '4', '5', '6', '7', // 31 + '=', // padding char + ); + } + + /** + * A timing safe equals comparison + * more info here: http://blog.ircmaxell.com/2014/11/its-all-about-time.html. + * + * @param string $safeString The internal (safe) value to be checked + * @param string $userString The user submitted (unsafe) value + * + * @return bool True if the two strings are identical + */ + private function timingSafeEquals($safeString, $userString) + { + if (function_exists('hash_equals')) { + return hash_equals($safeString, $userString); + } + $safeLen = strlen($safeString); + $userLen = strlen($userString); + + if ($userLen != $safeLen) { + return false; + } + + $result = 0; + + for ($i = 0; $i < $userLen; ++$i) { + $result |= (ord($safeString[$i]) ^ ord($userString[$i])); + } + + // They are only identical strings if $result is exactly 0... + return $result === 0; + } } diff --git a/classes/image.class.php b/classes/image.class.php index 874fe45c4..53280cbf4 100644 --- a/classes/image.class.php +++ b/classes/image.class.php @@ -1,57 +1,57 @@ -Image = imagecreate($Width, $Height); - $this->Font = SERVER_ROOT.'/classes/fonts/VERDANA.TTF'; - if (function_exists('imageantialias')) { - imageantialias($this->Image, true); - } - } - - function color($Red, $Green, $Blue, $Alpha = 0) { - return imagecolorallocatealpha($this->Image, $Red, $Green, $Blue, $Alpha); - } - - function line($x1, $y1, $x2, $y2, $Color, $Thickness = 1) { - if ($Thickness == 1) { - return imageline($this->Image, $x1, $y1, $x2, $y2, $Color); - } - $t = $Thickness / 2 - 0.5; - if ($x1 == $x2 || $y1 == $y2) { - return imagefilledrectangle($this->Image, round(min($x1, $x2) - $t), round(min($y1, $y2) - $t), round(max($x1, $x2) + $t), round(max($y1, $y2) + $t), $color); - } - $k = ($y2 - $y1) / ($x2 - $x1); //y = kx + q - $a = $t / sqrt(1 + pow($k, 2)); - $Points = array( - round($x1 - (1 + $k) * $a), round($y1 + (1 - $k) * $a), - round($x1 - (1 - $k) * $a), round($y1 - (1 + $k) * $a), - round($x2 + (1 + $k) * $a), round($y2 - (1 - $k) * $a), - round($x2 + (1 - $k) * $a), round($y2 + (1 + $k) * $a), - ); - imagefilledpolygon($this->Image, $Points, 4, $Color); - return imagepolygon($this->Image, $Points, 4, $Color); - } - - function ellipse($x, $y, $Width, $Height, $Color) { - return imageEllipse($this->Image, $x, $y, $Width, $Height, $Color); - } - - function text($x, $y, $Color, $Text) { - return imagettftext ($this->Image, $this->FontSize, $this->TextAngle, $x, $y, $Color, $this->Font, $Text); - } - - function make_png($FileName = null) { - return imagepng($this->Image, $FileName); - } + var $Image = false; + var $FontSize = 10; + var $Font = ''; + var $TextAngle = 0; + + function create($Width, $Height) { + $this->Image = imagecreate($Width, $Height); + $this->Font = SERVER_ROOT.'/classes/fonts/VERDANA.TTF'; + if (function_exists('imageantialias')) { + imageantialias($this->Image, true); + } + } + + function color($Red, $Green, $Blue, $Alpha = 0) { + return imagecolorallocatealpha($this->Image, $Red, $Green, $Blue, $Alpha); + } + + function line($x1, $y1, $x2, $y2, $Color, $Thickness = 1) { + if ($Thickness == 1) { + return imageline($this->Image, $x1, $y1, $x2, $y2, $Color); + } + $t = $Thickness / 2 - 0.5; + if ($x1 == $x2 || $y1 == $y2) { + return imagefilledrectangle($this->Image, round(min($x1, $x2) - $t), round(min($y1, $y2) - $t), round(max($x1, $x2) + $t), round(max($y1, $y2) + $t), $color); + } + $k = ($y2 - $y1) / ($x2 - $x1); //y = kx + q + $a = $t / sqrt(1 + pow($k, 2)); + $Points = array( + round($x1 - (1 + $k) * $a), round($y1 + (1 - $k) * $a), + round($x1 - (1 - $k) * $a), round($y1 - (1 + $k) * $a), + round($x2 + (1 + $k) * $a), round($y2 - (1 - $k) * $a), + round($x2 + (1 - $k) * $a), round($y2 + (1 + $k) * $a), + ); + imagefilledpolygon($this->Image, $Points, 4, $Color); + return imagepolygon($this->Image, $Points, 4, $Color); + } + + function ellipse($x, $y, $Width, $Height, $Color) { + return imageEllipse($this->Image, $x, $y, $Width, $Height, $Color); + } + + function text($x, $y, $Color, $Text) { + return imagettftext ($this->Image, $this->FontSize, $this->TextAngle, $x, $y, $Color, $this->Font, $Text); + } + + function make_png($FileName = null) { + return imagepng($this->Image, $FileName); + } } diff --git a/classes/imagetools.class.php b/classes/imagetools.class.php index 0b4e82086..b96c10037 100644 --- a/classes/imagetools.class.php +++ b/classes/imagetools.class.php @@ -5,243 +5,243 @@ * Thumbnail aide, mostly */ class ImageTools { - /** - * Store processed links to avoid repetition - * @var array 'URL' => 'Parsed URL' - */ - private static $Storage = array(); - - /** - * We use true as an extra property to make the domain an array key - * @var array $Hosts Array of image hosts - */ - private static $Hosts = array( - 'whatimg.com' => true, - 'imgur.com' => true - ); - - /** - * Blacklisted sites - * @var array $Blacklist Array of blacklisted hosts - */ - private static $Blacklist = array( - 'tinypic.com' - ); - - /** - * Array of image hosts that provide thumbnailing - * @var array $Thumbs - */ - private static $Thumbs = array( - 'i.imgur.com' => true, - 'whatimg.com' => true - ); - - /** - * Array of extensions - * @var array $Extensions - */ - private static $Extensions = array( - 'jpg' => true, - 'jpeg' => true, - 'png' => true, - 'gif' => true - ); - - /** - * Array of user IDs whose avatars have been checked for size - * @var array $CheckedAvatars - */ - private static $CheckedAvatars = array(); - private static $CheckedAvatars2 = array(); - - /** - * Array of user IDs whose donor icons have been checked for size - * @var array $CheckedDonorIcons - */ - private static $CheckedDonorIcons = array(); - - /** - * Checks from our list of valid hosts - * @param string $Host Domain/host to check - * @return boolean - */ - public static function valid_host($Host) { - return !empty(self::$Hosts[$Host]) && self::$Hosts[$Host] === true; - } - - /** - * Checks if a link's host is (not) good, otherwise displays an error. - * @param string $Url Link to an image - * @return boolean - */ - public static function blacklisted($Url, $ShowError = true) { - foreach (self::$Blacklist as &$Value) { - $Blacklisted = stripos($Url, $Value); - if ($Blacklisted !== false) { - $ParsedUrl = parse_url($Url); - if ($ShowError) { - error($ParsedUrl['host'] . ' is not an allowed image host. Please use a different host.'); - } - return true; - } - } - return false; - } - - /** - * Checks to see if a link has a thumbnail - * @param string $Url Link to an image - * @return string|false Matched host or false - */ - private static function thumbnailable($Url) { - $ParsedUrl = parse_url($Url); - return !empty(self::$Thumbs[$ParsedUrl['host']]); - } - - /** - * Checks an extension - * @param string $Ext Extension to check - * @return boolean - */ - private static function valid_extension($Ext) { -// return @self::$Extensions[$Ext] === true; - return !empty(self::$Extensions[$Ext]) && (self::$Extensions[$Ext] === true); - } - - /** - * Stores a link with a (thumbnail) link - * @param type $Link - * @param type $Processed - */ - private static function store($Link, $Processed) { - self::$Storage[$Link] = $Processed; - } - - /** - * Retrieves an entry from our storage - * @param type $Link - * @return boolean|string Returns false if no match - */ - private static function get_stored($Link) { - if (isset(self::$Storage[$Link])) { - return self::$Storage[$Link]; - } - return false; - } - - /** - * Checks if URL points to a whatimg thumbnail. - */ - private static function has_whatimg_thumb($Url) { - return (strpos($Url, '_thumb') !== false); - } - - /** - * Cleans up imgur URL if it already has a modifier attached to the end of it. - */ - private static function clean_imgur_url($Url) { - $Extension = pathinfo($Url, PATHINFO_EXTENSION); - $Full = preg_replace('/\.[^.]*$/', '', $Url); - $Base = substr($Full, 0, strrpos($Full, '/')); - $Path = substr($Full, strrpos($Full, '/') + 1); - if (strlen($Path) == 6) { - $Last = $Path[strlen($Path) - 1]; - if ($Last == 'm' || $Last == 'l' || $Last == 's' || $Last == 'h' || $Last == 'b') { - $Path = substr($Path, 0, -1); - } - } - return "$Base/$Path.$Extension"; - } - - /** - * Replaces the extension. - */ - private static function replace_extension($String, $Extension) { - return preg_replace('/\.[^.]*$/', $Extension, $String); - } - - /** - * Create image proxy URL - * @param string $Url image URL - * @param bool/string $CheckSize - accepts one of false, "avatar", "avatar2", or "donoricon" - * @param bool/string/number $UserID - user ID for avatars and donor icons - * @return image proxy URL - */ - public static function proxy_url($Url, $CheckSize, $UserID, &$ExtraInfo) { - global $SSL; - - if ($UserID) { - $ExtraInfo = "&userid=$UserID"; - if ($CheckSize === 'avatar' && !isset(self::$CheckedAvatars[$UserID])) { - $ExtraInfo .= "&type=$CheckSize"; - self::$CheckedAvatars[$UserID] = true; - } elseif ($CheckSize === 'avatar2' && !isset(self::$CheckedAvatars2[$UserID])) { - $ExtraInfo .= "&type=$CheckSize"; - self::$CheckedAvatars2[$UserID] = true; - } elseif ($CheckSize === 'donoricon' && !isset(self::$CheckedDonorIcons[$UserID])) { - $ExtraInfo .= "&type=$CheckSize"; - self::$CheckedDonorIcons[$UserID] = true; - } - } - - return ($SSL ? 'https' : 'http') . '://' . SITE_URL . "/image.php?c=1&i=" . urlencode($Url); - } - - /** - * Determine the image URL. This takes care of the image proxy and thumbnailing. - * @param string $Url - * @param bool $Thumb - * @param bool/string $CheckSize - accepts one of false, "avatar", "avatar2", or "donoricon" - * @param bool/string/number $UserID - user ID for avatars and donor icons - * @return string - */ - public static function process($Url, $Thumb = false, $CheckSize = false, $UserID = false) { - if (empty($Url)) { - return ''; - } - - if ($Found = self::get_stored($Url . ($Thumb ? '_thumb' : ''))) { - return $Found; - } - - $ProcessedUrl = $Url; - if ($Thumb) { - $Extension = pathinfo($Url, PATHINFO_EXTENSION); - if (self::thumbnailable($Url) && self::valid_extension($Extension)) { - if (strpos($Url, 'whatimg') !== false && !self::has_whatimg_thumb($Url)) { - $ProcessedUrl = self::replace_extension($Url, '_thumb.' . $Extension); - } elseif (strpos($Url, 'imgur') !== false) { - $ProcessedUrl = self::replace_extension(self::clean_imgur_url($Url), 'm.' . $Extension); - } - } - } - - $ExtraInfo = ''; - if (check_perms('site_proxy_images')) { - $ProcessedUrl = self::proxy_url($ProcessedUrl, $CheckSize, $UserID, $ExtraInfo); - } - self::store($Url . ($Thumb ? '_thumb' : ''), $ProcessedUrl); - return $ProcessedUrl . $ExtraInfo; - } - - /** - * Cover art thumbnail in browse, on artist pages etc. - * @global array $CategoryIcons - * @param string $Url - * @param int $CategoryID - */ - public static function cover_thumb($Url, $CategoryID) { - global $CategoryIcons; - if ($Url) { - $Src = self::process($Url, true); - $Lightbox = self::process($Url); - } else { - $Src = STATIC_SERVER . 'common/noartwork/' . $CategoryIcons[$CategoryID - 1]; - $Lightbox = $Src; - } + /** + * Store processed links to avoid repetition + * @var array 'URL' => 'Parsed URL' + */ + private static $Storage = []; + + /** + * We use true as an extra property to make the domain an array key + * @var array $Hosts Array of image hosts + */ + private static $Hosts = array( + 'whatimg.com' => true, + 'imgur.com' => true + ); + + /** + * Blacklisted sites + * @var array $Blacklist Array of blacklisted hosts + */ + private static $Blacklist = array( + 'tinypic.com' + ); + + /** + * Array of image hosts that provide thumbnailing + * @var array $Thumbs + */ + private static $Thumbs = array( + 'i.imgur.com' => true, + 'whatimg.com' => true + ); + + /** + * Array of extensions + * @var array $Extensions + */ + private static $Extensions = array( + 'jpg' => true, + 'jpeg' => true, + 'png' => true, + 'gif' => true + ); + + /** + * Array of user IDs whose avatars have been checked for size + * @var array $CheckedAvatars + */ + private static $CheckedAvatars = []; + private static $CheckedAvatars2 = []; + + /** + * Array of user IDs whose donor icons have been checked for size + * @var array $CheckedDonorIcons + */ + private static $CheckedDonorIcons = []; + + /** + * Checks from our list of valid hosts + * @param string $Host Domain/host to check + * @return boolean + */ + public static function valid_host($Host) { + return !empty(self::$Hosts[$Host]) && self::$Hosts[$Host] === true; + } + + /** + * Checks if a link's host is (not) good, otherwise displays an error. + * @param string $Url Link to an image + * @return boolean + */ + public static function blacklisted($Url, $ShowError = true) { + foreach (self::$Blacklist as &$Value) { + $Blacklisted = stripos($Url, $Value); + if ($Blacklisted !== false) { + $ParsedUrl = parse_url($Url); + if ($ShowError) { + error($ParsedUrl['host'] . ' is not an allowed image host. Please use a different host.'); + } + return true; + } + } + return false; + } + + /** + * Checks to see if a link has a thumbnail + * @param string $Url Link to an image + * @return string|false Matched host or false + */ + private static function thumbnailable($Url) { + $ParsedUrl = parse_url($Url); + return !empty(self::$Thumbs[$ParsedUrl['host']]); + } + + /** + * Checks an extension + * @param string $Ext Extension to check + * @return boolean + */ + private static function valid_extension($Ext) { +// return @self::$Extensions[$Ext] === true; + return !empty(self::$Extensions[$Ext]) && (self::$Extensions[$Ext] === true); + } + + /** + * Stores a link with a (thumbnail) link + * @param type $Link + * @param type $Processed + */ + private static function store($Link, $Processed) { + self::$Storage[$Link] = $Processed; + } + + /** + * Retrieves an entry from our storage + * @param type $Link + * @return boolean|string Returns false if no match + */ + private static function get_stored($Link) { + if (isset(self::$Storage[$Link])) { + return self::$Storage[$Link]; + } + return false; + } + + /** + * Checks if URL points to a whatimg thumbnail. + */ + private static function has_whatimg_thumb($Url) { + return (strpos($Url, '_thumb') !== false); + } + + /** + * Cleans up imgur URL if it already has a modifier attached to the end of it. + */ + private static function clean_imgur_url($Url) { + $Extension = pathinfo($Url, PATHINFO_EXTENSION); + $Full = preg_replace('/\.[^.]*$/', '', $Url); + $Base = substr($Full, 0, strrpos($Full, '/')); + $Path = substr($Full, strrpos($Full, '/') + 1); + if (strlen($Path) == 6) { + $Last = $Path[strlen($Path) - 1]; + if ($Last == 'm' || $Last == 'l' || $Last == 's' || $Last == 'h' || $Last == 'b') { + $Path = substr($Path, 0, -1); + } + } + return "$Base/$Path.$Extension"; + } + + /** + * Replaces the extension. + */ + private static function replace_extension($String, $Extension) { + return preg_replace('/\.[^.]*$/', $Extension, $String); + } + + /** + * Create image proxy URL + * @param string $Url image URL + * @param bool/string $CheckSize - accepts one of false, "avatar", "avatar2", or "donoricon" + * @param bool/string/number $UserID - user ID for avatars and donor icons + * @return image proxy URL + */ + public static function proxy_url($Url, $CheckSize, $UserID, &$ExtraInfo) { + global $SSL; + + if ($UserID) { + $ExtraInfo = "&userid=$UserID"; + if ($CheckSize === 'avatar' && !isset(self::$CheckedAvatars[$UserID])) { + $ExtraInfo .= "&type=$CheckSize"; + self::$CheckedAvatars[$UserID] = true; + } elseif ($CheckSize === 'avatar2' && !isset(self::$CheckedAvatars2[$UserID])) { + $ExtraInfo .= "&type=$CheckSize"; + self::$CheckedAvatars2[$UserID] = true; + } elseif ($CheckSize === 'donoricon' && !isset(self::$CheckedDonorIcons[$UserID])) { + $ExtraInfo .= "&type=$CheckSize"; + self::$CheckedDonorIcons[$UserID] = true; + } + } + + return ($SSL ? 'https' : 'http') . '://' . SITE_URL . "/image.php?c=1&i=" . urlencode($Url); + } + + /** + * Determine the image URL. This takes care of the image proxy and thumbnailing. + * @param string $Url + * @param bool $Thumb + * @param bool/string $CheckSize - accepts one of false, "avatar", "avatar2", or "donoricon" + * @param bool/string/number $UserID - user ID for avatars and donor icons + * @return string + */ + public static function process($Url, $Thumb = false, $CheckSize = false, $UserID = false) { + if (empty($Url)) { + return ''; + } + + if ($Found = self::get_stored($Url . ($Thumb ? '_thumb' : ''))) { + return $Found; + } + + $ProcessedUrl = $Url; + if ($Thumb) { + $Extension = pathinfo($Url, PATHINFO_EXTENSION); + if (self::thumbnailable($Url) && self::valid_extension($Extension)) { + if (strpos($Url, 'whatimg') !== false && !self::has_whatimg_thumb($Url)) { + $ProcessedUrl = self::replace_extension($Url, '_thumb.' . $Extension); + } elseif (strpos($Url, 'imgur') !== false) { + $ProcessedUrl = self::replace_extension(self::clean_imgur_url($Url), 'm.' . $Extension); + } + } + } + + $ExtraInfo = ''; + if (check_perms('site_proxy_images')) { + $ProcessedUrl = self::proxy_url($ProcessedUrl, $CheckSize, $UserID, $ExtraInfo); + } + self::store($Url . ($Thumb ? '_thumb' : ''), $ProcessedUrl); + return $ProcessedUrl . $ExtraInfo; + } + + /** + * Cover art thumbnail in browse, on artist pages etc. + * @global array $CategoryIcons + * @param string $Url + * @param int $CategoryID + */ + public static function cover_thumb($Url, $CategoryID) { + global $CategoryIcons; + if ($Url) { + $Src = self::process($Url, true); + $Lightbox = self::process($Url); + } else { + $Src = STATIC_SERVER . 'common/noartwork/' . $CategoryIcons[$CategoryID - 1]; + $Lightbox = $Src; + } ?> -
-query("
- SELECT TreePosition, TreeID, TreeLevel
- FROM invite_tree
- WHERE UserID = $UserID");
- if (!G::$DB->has_results()) {
- return;
- }
- list($TreePosition, $TreeID, $TreeLevel) = G::$DB->next_record(MYSQLI_NUM, false);
-
- G::$DB->query("
- SELECT TreePosition
- FROM invite_tree
- WHERE TreeID = $TreeID
- AND TreeLevel = $TreeLevel
- AND TreePosition > $TreePosition
- ORDER BY TreePosition ASC
- LIMIT 1");
- if (G::$DB->has_results()) {
- list($MaxPosition) = G::$DB->next_record(MYSQLI_NUM, false);
- } else {
- $MaxPosition = false;
- }
- $TreeQuery = G::$DB->query("
- SELECT
- it.UserID,
- Enabled,
- PermissionID,
- Donor,
- Uploaded,
- Downloaded,
- Paranoia,
- TreePosition,
- TreeLevel
- FROM invite_tree AS it
- JOIN users_main AS um ON um.ID = it.UserID
- JOIN users_info AS ui ON ui.UserID = it.UserID
- WHERE TreeID = $TreeID
- AND TreePosition > $TreePosition".
- ($MaxPosition ? " AND TreePosition < $MaxPosition" : '')."
- AND TreeLevel > $TreeLevel
- ORDER BY TreePosition");
-
- $PreviousTreeLevel = $TreeLevel;
-
- // Stats for the summary
- $MaxTreeLevel = $TreeLevel; // The deepest level (this changes)
- $OriginalTreeLevel = $TreeLevel; // The level of the user we're viewing
- $BaseTreeLevel = $TreeLevel + 1; // The level of users invited by our user
- $Count = 0;
- $Branches = 0;
- $DisabledCount = 0;
- $DonorCount = 0;
- $ParanoidCount = 0;
- $TotalUpload = 0;
- $TotalDownload = 0;
- $TopLevelUpload = 0;
- $TopLevelDownload = 0;
-
- $ClassSummary = array();
- global $Classes;
- foreach ($Classes as $ClassID => $Val) {
- $ClassSummary[$ClassID] = 0;
- }
-
- // We store this in an output buffer, so we can show the summary at the top without having to loop through twice
- ob_start();
- while (list($ID, $Enabled, $Class, $Donor, $Uploaded, $Downloaded, $Paranoia, $TreePosition, $TreeLevel) = G::$DB->next_record(MYSQLI_NUM, false)) {
-
- // Do stats
- $Count++;
-
- if ($TreeLevel > $MaxTreeLevel) {
- $MaxTreeLevel = $TreeLevel;
- }
-
- if ($TreeLevel == $BaseTreeLevel) {
- $Branches++;
- $TopLevelUpload += $Uploaded;
- $TopLevelDownload += $Downloaded;
- }
-
- $ClassSummary[$Class]++;
- if ($Enabled == 2) {
- $DisabledCount++;
- }
- if ($Donor) {
- $DonorCount++;
- }
-
- // Manage tree depth
- if ($TreeLevel > $PreviousTreeLevel) {
- for ($i = 0; $i < $TreeLevel - $PreviousTreeLevel; $i++) {
- echo "\n\n\n";
- } else {
- echo "\t \n\t\n";
- }
- $UserClass = $Classes[$Class]['Level'];
+
+ +
+set_query_id($QueryID);
+ }
}
?>
diff --git a/classes/irc.class.php b/classes/irc.class.php
index a36f6a962..629169726 100644
--- a/classes/irc.class.php
+++ b/classes/irc.class.php
@@ -1,183 +1,183 @@
-send_to($Bot->get_channel(), 'The database is currently unavailable; try again later.');
- }
+ function halt($Msg) {
+ global $Bot;
+ $Bot->send_to($Bot->get_channel(), 'The database is currently unavailable; try again later.');
+ }
}
abstract class IRC_BOT {
- abstract protected function connect_events();
- abstract protected function channel_events();
- abstract protected function query_events();
- abstract protected function irc_events();
- abstract protected function listener_events();
-
- protected $Debug = false;
- protected $Socket = false;
- protected $Data = false;
- protected $Whois = false;
- protected $Identified = array();
- protected $Channels = array();
- protected $Messages = array();
- protected $LastChan = false;
- protected $ListenSocket = false;
- protected $Listened = false;
- protected $Connecting = false;
- protected $State = 1; // Drone is live
- public $Restart = 0; // Die by default
-
- public function __construct() {
- if (isset($_SERVER['HOME']) && is_dir($_SERVER['HOME']) && getcwd() != $_SERVER['HOME']) {
- chdir($_SERVER['HOME']);
- }
- ob_end_clean();
- restore_error_handler(); //Avoid PHP error logging
- set_time_limit(0);
- }
-
- public function connect() {
- $this->connect_irc();
- $this->connect_listener();
- $this->post_connect();
- }
-
- private function connect_irc($Reconnect = false) {
- $this->Connecting = true;
- //Open a socket to the IRC server
- if (defined('BOT_PORT_SSL')) {
- $IrcAddress = 'tls://' . BOT_SERVER . ':' . BOT_PORT_SSL;
- } else {
- $IrcAddress = 'tcp://' . BOT_SERVER . ':' . BOT_PORT;
- }
- while (!$this->Socket = stream_socket_client($IrcAddress, $ErrNr, $ErrStr)) {
- sleep(15);
- }
- stream_set_blocking($this->Socket, 0);
- $this->Connecting = false;
- if ($Reconnect) {
- $this->post_connect();
- }
- }
-
- private function connect_listener() {
- //create a socket to listen on
- $ListenAddress = 'tcp://' . SOCKET_LISTEN_ADDRESS . ':' . SOCKET_LISTEN_PORT;
- if (!$this->ListenSocket = stream_socket_server($ListenAddress, $ErrNr, $ErrStr)) {
- die("Cannot create listen socket: $ErrStr");
- }
- stream_set_blocking($this->ListenSocket, false);
- }
-
- private function post_connect() {
- fwrite($this->Socket, "NICK ".BOT_NICK."Init\n");
- fwrite($this->Socket, "USER ".BOT_NICK." * * :IRC Bot\n");
- $this->listen();
- }
-
- public function disconnect() {
- fclose($this->ListenSocket);
- $this->State = 0; //Drones dead
- }
-
- public function get_channel() {
- preg_match('/.+ PRIVMSG ([^:]+) :.+/', $this->Data, $Channel);
- if (preg_match('/#.+/', $Channel[1])) {
- return $Channel[1];
- } else {
- return false;
- }
- }
-
- public function get_nick() {
- preg_match('/:([^!:]+)!.+@[^\s]+ PRIVMSG [^:]+ :.+/', $this->Data, $Nick);
- return $Nick[1];
- }
-
- protected function get_message() {
- preg_match('/:.+ PRIVMSG [^:]+ :(.+)/', $this->Data, $Msg);
- return trim($Msg[1]);
- }
-
- protected function get_irc_host() {
- preg_match('/:[^!:]+!.+@([^\s]+) PRIVMSG [^:]+ :.+/', $this->Data, $Host);
- return trim($Host[1]);
- }
-
- protected function get_word($Select = 1) {
- preg_match('/:.+ PRIVMSG [^:]+ :(.+)/', $this->Data, $Word);
- $Word = split(' ', $Word[1]);
- return trim($Word[$Select]);
- }
-
- protected function get_action() {
- preg_match('/:.+ PRIVMSG [^:]+ :!(\S+)/', $this->Data, $Action);
- return strtoupper($Action[1]);
- }
-
- protected function send_raw($Text) {
- if (!feof($this->Socket)) {
- fwrite($this->Socket, "$Text\n");
- } elseif (!$this->Connecting) {
- $this->Connecting = true;
- sleep(120);
- $this->connect_irc(true);
- }
- }
-
- public function send_to($Channel, $Text) {
- // split the message up into <= 460 character strings and send each individually
- // this is used to prevent messages from getting truncated
- $Text = wordwrap($Text, 460, "\n", true);
- $TextArray = explode("\n", $Text);
- foreach ($TextArray as $Text) {
- $this->send_raw("PRIVMSG $Channel :$Text");
- }
- }
-
- protected function whois($Nick) {
- $this->Whois = $Nick;
- $this->send_raw("WHOIS $Nick");
- }
-
- /*
- This function uses blacklisted_ip, which is no longer in RC2.
- You can probably find it in old RC1 code kicking aronud if you need it.
- protected function ip_check($IP, $Gline = false, $Channel = BOT_REPORT_CHAN) {
- if (blacklisted_ip($IP)) {
- $this->send_to($Channel, 'TOR IP Detected: '.$IP);
- if ($Gline) {
- $this->send_raw('GLINE *@'.$IP.' 90d :DNSBL Proxy');
- }
- }
- if (Tools::site_ban_ip($IP)) {
- $this->send_to($Channel, 'Site IP Ban Detected: '.$IP);
- if ($Gline) {
- $this->send_raw('GLINE *@'.$IP.' 90d :IP Ban');
- }
- }
- }*/
-
- protected function listen() {
- G::$Cache->InternalCache = false;
- stream_set_timeout($this->Socket, 10000000000);
- while ($this->State == 1) {
- $NullSock = null;
- $Sockets = array($this->Socket, $this->ListenSocket);
- if (stream_select($Sockets, $NullSock, $NullSock, null) === false) {
- die();
- }
- foreach ($Sockets as $Socket) {
- if ($Socket === $this->Socket) {
- $this->irc_events();
- } else {
- $this->Listened = stream_socket_accept($Socket);
- $this->listener_events();
- }
- }
- G::$DB->LinkID = false;
- G::$DB->Queries = array();
- }
- }
+ abstract protected function connect_events();
+ abstract protected function channel_events();
+ abstract protected function query_events();
+ abstract protected function irc_events();
+ abstract protected function listener_events();
+
+ protected $Debug = false;
+ protected $Socket = false;
+ protected $Data = false;
+ protected $Whois = false;
+ protected $Identified = [];
+ protected $Channels = [];
+ protected $Messages = [];
+ protected $LastChan = false;
+ protected $ListenSocket = false;
+ protected $Listened = false;
+ protected $Connecting = false;
+ protected $State = 1; // Drone is live
+ public $Restart = 0; // Die by default
+
+ public function __construct() {
+ if (isset($_SERVER['HOME']) && is_dir($_SERVER['HOME']) && getcwd() != $_SERVER['HOME']) {
+ chdir($_SERVER['HOME']);
+ }
+ ob_end_clean();
+ restore_error_handler(); //Avoid PHP error logging
+ set_time_limit(0);
+ }
+
+ public function connect() {
+ $this->connect_irc();
+ $this->connect_listener();
+ $this->post_connect();
+ }
+
+ private function connect_irc($Reconnect = false) {
+ $this->Connecting = true;
+ //Open a socket to the IRC server
+ if (defined('BOT_PORT_SSL')) {
+ $IrcAddress = 'tls://' . BOT_SERVER . ':' . BOT_PORT_SSL;
+ } else {
+ $IrcAddress = 'tcp://' . BOT_SERVER . ':' . BOT_PORT;
+ }
+ while (!$this->Socket = stream_socket_client($IrcAddress, $ErrNr, $ErrStr)) {
+ sleep(15);
+ }
+ stream_set_blocking($this->Socket, 0);
+ $this->Connecting = false;
+ if ($Reconnect) {
+ $this->post_connect();
+ }
+ }
+
+ private function connect_listener() {
+ //create a socket to listen on
+ $ListenAddress = 'tcp://' . SOCKET_LISTEN_ADDRESS . ':' . SOCKET_LISTEN_PORT;
+ if (!$this->ListenSocket = stream_socket_server($ListenAddress, $ErrNr, $ErrStr)) {
+ die("Cannot create listen socket: $ErrStr");
+ }
+ stream_set_blocking($this->ListenSocket, false);
+ }
+
+ private function post_connect() {
+ fwrite($this->Socket, "NICK ".BOT_NICK."Init\n");
+ fwrite($this->Socket, "USER ".BOT_NICK." * * :IRC Bot\n");
+ $this->listen();
+ }
+
+ public function disconnect() {
+ fclose($this->ListenSocket);
+ $this->State = 0; //Drones dead
+ }
+
+ public function get_channel() {
+ preg_match('/.+ PRIVMSG ([^:]+) :.+/', $this->Data, $Channel);
+ if (preg_match('/#.+/', $Channel[1])) {
+ return $Channel[1];
+ } else {
+ return false;
+ }
+ }
+
+ public function get_nick() {
+ preg_match('/:([^!:]+)!.+@[^\s]+ PRIVMSG [^:]+ :.+/', $this->Data, $Nick);
+ return $Nick[1];
+ }
+
+ protected function get_message() {
+ preg_match('/:.+ PRIVMSG [^:]+ :(.+)/', $this->Data, $Msg);
+ return trim($Msg[1]);
+ }
+
+ protected function get_irc_host() {
+ preg_match('/:[^!:]+!.+@([^\s]+) PRIVMSG [^:]+ :.+/', $this->Data, $Host);
+ return trim($Host[1]);
+ }
+
+ protected function get_word($Select = 1) {
+ preg_match('/:.+ PRIVMSG [^:]+ :(.+)/', $this->Data, $Word);
+ $Word = split(' ', $Word[1]);
+ return trim($Word[$Select]);
+ }
+
+ protected function get_action() {
+ preg_match('/:.+ PRIVMSG [^:]+ :!(\S+)/', $this->Data, $Action);
+ return strtoupper($Action[1]);
+ }
+
+ protected function send_raw($Text) {
+ if (!feof($this->Socket)) {
+ fwrite($this->Socket, "$Text\n");
+ } elseif (!$this->Connecting) {
+ $this->Connecting = true;
+ sleep(120);
+ $this->connect_irc(true);
+ }
+ }
+
+ public function send_to($Channel, $Text) {
+ // split the message up into <= 460 character strings and send each individually
+ // this is used to prevent messages from getting truncated
+ $Text = wordwrap($Text, 460, "\n", true);
+ $TextArray = explode("\n", $Text);
+ foreach ($TextArray as $Text) {
+ $this->send_raw("PRIVMSG $Channel :$Text");
+ }
+ }
+
+ protected function whois($Nick) {
+ $this->Whois = $Nick;
+ $this->send_raw("WHOIS $Nick");
+ }
+
+ /*
+ This function uses blacklisted_ip, which is no longer in RC2.
+ You can probably find it in old RC1 code kicking aronud if you need it.
+ protected function ip_check($IP, $Gline = false, $Channel = BOT_REPORT_CHAN) {
+ if (blacklisted_ip($IP)) {
+ $this->send_to($Channel, 'TOR IP Detected: '.$IP);
+ if ($Gline) {
+ $this->send_raw('GLINE *@'.$IP.' 90d :DNSBL Proxy');
+ }
+ }
+ if (Tools::site_ban_ip($IP)) {
+ $this->send_to($Channel, 'Site IP Ban Detected: '.$IP);
+ if ($Gline) {
+ $this->send_raw('GLINE *@'.$IP.' 90d :IP Ban');
+ }
+ }
+ }*/
+
+ protected function listen() {
+ G::$Cache->InternalCache = false;
+ stream_set_timeout($this->Socket, 10000000000);
+ while ($this->State == 1) {
+ $NullSock = null;
+ $Sockets = array($this->Socket, $this->ListenSocket);
+ if (stream_select($Sockets, $NullSock, $NullSock, null) === false) {
+ die();
+ }
+ foreach ($Sockets as $Socket) {
+ if ($Socket === $this->Socket) {
+ $this->irc_events();
+ } else {
+ $this->Listened = stream_socket_accept($Socket);
+ $this->listener_events();
+ }
+ }
+ G::$DB->LinkID = false;
+ G::$DB->Queries = [];
+ }
+ }
}
?>
diff --git a/classes/irc.class.php.save b/classes/irc.class.php.save
index b040c0f70..712ff691c 100644
--- a/classes/irc.class.php.save
+++ b/classes/irc.class.php.save
@@ -1,184 +1,184 @@
send_to($
+ function halt($Msg) {
+ global $Bot;
+ $Bot->send_to($
Bot->get_channel(), 'The database is currently unavailable; try again later.');
- }
+ }
}
abstract class IRC_BOT {
- abstract protected function connect_events();
- abstract protected function channel_events();
- abstract protected function query_events();
- abstract protected function irc_events();
- abstract protected function listener_events();
-
- protected $Debug = false;
- protected $Socket = false;
- protected $Data = false;
- protected $Whois = false;
- protected $Identified = array();
- protected $Channels = array();
- protected $Messages = array();
- protected $LastChan = false;
- protected $ListenSocket = false;
- protected $Listened = false;
- protected $Connecting = false;
- protected $State = 1; // Drone is live
- public $Restart = 0; // Die by default
-
- public function __construct() {
- if (isset($_SERVER['HOME']) && is_dir($_SERVER['HOME']) && getcwd() != $_SERVER['HOME']) {
- chdir($_SERVER['HOME']);
- }
- ob_end_clean();
- restore_error_handler(); //Avoid PHP error logging
- set_time_limit(0);
- }
-
- public function connect() {
- $this->connect_irc();
- $this->connect_listener();
- $this->post_connect();
- }
-
- private function connect_irc($Reconnect = false) {
- $this->Connecting = true;
- //Open a socket to the IRC server
- if (defined('BOT_PORT_SSL')) {
- $IrcAddress = 'tls://' . BOT_SERVER . ':' . BOT_PORT_SSL;
- } else {
- $IrcAddress = 'tcp://' . BOT_SERVER . ':' . BOT_PORT;
- }
- while (!$this->Socket = stream_socket_client($IrcAddress, $ErrNr, $ErrStr)) {
- sleep(15);
- }
- stream_set_blocking($this->Socket, 0);
- $this->Connecting = false;
- if ($Reconnect) {
- $this->post_connect();
- }
- }
-
- private function connect_listener() {
- //create a socket to listen on
- $ListenAddress = 'tcp://' . SOCKET_LISTEN_ADDRESS . ':' . SOCKET_LISTEN_PORT;
- if (!$this->ListenSocket = stream_socket_server($ListenAddress, $ErrNr, $ErrStr)) {
- die("Cannot create listen socket: $ErrStr");
- }
- stream_set_blocking($this->ListenSocket, false);
- }
-
- private function post_connect() {
- fwrite($this->Socket, "NICK ".BOT_NICK."Init\n");
- fwrite($this->Socket, "USER ".BOT_NICK." * * :IRC Bot\n");
- $this->listen();
- }
-
- public function disconnect() {
- fclose($this->ListenSocket);
- $this->State = 0; //Drones dead
- }
-
- public function get_channel() {
- preg_match('/.+ PRIVMSG ([^:]+) :.+/', $this->Data, $Channel);
- if (preg_match('/#.+/', $Channel[1])) {
- return $Channel[1];
- } else {
- return false;
- }
- }
-
- public function get_nick() {
- preg_match('/:([^!:]+)!.+@[^\s]+ PRIVMSG [^:]+ :.+/', $this->Data, $Nick);
- return $Nick[1];
- }
-
- protected function get_message() {
- preg_match('/:.+ PRIVMSG [^:]+ :(.+)/', $this->Data, $Msg);
- return trim($Msg[1]);
- }
-
- protected function get_irc_host() {
- preg_match('/:[^!:]+!.+@([^\s]+) PRIVMSG [^:]+ :.+/', $this->Data, $Host);
- return trim($Host[1]);
- }
-
- protected function get_word($Select = 1) {
- preg_match('/:.+ PRIVMSG [^:]+ :(.+)/', $this->Data, $Word);
- $Word = split(' ', $Word[1]);
- return trim($Word[$Select]);
- }
-
- protected function get_action() {
- preg_match('/:.+ PRIVMSG [^:]+ :!(\S+)/', $this->Data, $Action);
- return strtoupper($Action[1]);
- }
-
- protected function send_raw($Text) {
- if (!feof($this->Socket)) {
- fwrite($this->Socket, "$Text\n");
- } elseif (!$this->Connecting) {
- $this->Connecting = true;
- sleep(120);
- $this->connect_irc(true);
- }
- }
-
- public function send_to($Channel, $Text) {
- // split the message up into <= 460 character strings and send each individually
- // this is used to prevent messages from getting truncated
- $Text = wordwrap($Text, 460, "\n", true);
- $TextArray = explode("\n", $Text);
- foreach ($TextArray as $Text) {
- $this->send_raw("PRIVMSG $Channel :$Text");
- }
- }
-
- protected function whois($Nick) {
- $this->Whois = $Nick;
- $this->send_raw("WHOIS $Nick");
- }
-
- /*
- This function uses blacklisted_ip, which is no longer in RC2.
- You can probably find it in old RC1 code kicking aronud if you need it.
- protected function ip_check($IP, $Gline = false, $Channel = BOT_REPORT_CHAN) {
- if (blacklisted_ip($IP)) {
- $this->send_to($Channel, 'TOR IP Detected: '.$IP);
- if ($Gline) {
- $this->send_raw('GLINE *@'.$IP.' 90d :DNSBL Proxy');
- }
- }
- if (Tools::site_ban_ip($IP)) {
- $this->send_to($Channel, 'Site IP Ban Detected: '.$IP);
- if ($Gline) {
- $this->send_raw('GLINE *@'.$IP.' 90d :IP Ban');
- }
- }
- }*/
-
- protected function listen() {
- G::$Cache->InternalCache = false;
- stream_set_timeout($this->Socket, 10000000000);
- while ($this->State == 1) {
- $NullSock = null;
- $Sockets = array($this->Socket, $this->ListenSocket);
- if (stream_select($Sockets, $NullSock, $NullSock, null) === false) {
- die();
- }
- foreach ($Sockets as $Socket) {
- if ($Socket === $this->Socket) {
- $this->irc_events();
- } else {
- $this->Listened = stream_socket_accept($Socket);
- $this->listener_events();
- }
- }
- G::$DB->LinkID = false;
- G::$DB->Queries = array();
- }
- }
+ abstract protected function connect_events();
+ abstract protected function channel_events();
+ abstract protected function query_events();
+ abstract protected function irc_events();
+ abstract protected function listener_events();
+
+ protected $Debug = false;
+ protected $Socket = false;
+ protected $Data = false;
+ protected $Whois = false;
+ protected $Identified = [];
+ protected $Channels = [];
+ protected $Messages = [];
+ protected $LastChan = false;
+ protected $ListenSocket = false;
+ protected $Listened = false;
+ protected $Connecting = false;
+ protected $State = 1; // Drone is live
+ public $Restart = 0; // Die by default
+
+ public function __construct() {
+ if (isset($_SERVER['HOME']) && is_dir($_SERVER['HOME']) && getcwd() != $_SERVER['HOME']) {
+ chdir($_SERVER['HOME']);
+ }
+ ob_end_clean();
+ restore_error_handler(); //Avoid PHP error logging
+ set_time_limit(0);
+ }
+
+ public function connect() {
+ $this->connect_irc();
+ $this->connect_listener();
+ $this->post_connect();
+ }
+
+ private function connect_irc($Reconnect = false) {
+ $this->Connecting = true;
+ //Open a socket to the IRC server
+ if (defined('BOT_PORT_SSL')) {
+ $IrcAddress = 'tls://' . BOT_SERVER . ':' . BOT_PORT_SSL;
+ } else {
+ $IrcAddress = 'tcp://' . BOT_SERVER . ':' . BOT_PORT;
+ }
+ while (!$this->Socket = stream_socket_client($IrcAddress, $ErrNr, $ErrStr)) {
+ sleep(15);
+ }
+ stream_set_blocking($this->Socket, 0);
+ $this->Connecting = false;
+ if ($Reconnect) {
+ $this->post_connect();
+ }
+ }
+
+ private function connect_listener() {
+ //create a socket to listen on
+ $ListenAddress = 'tcp://' . SOCKET_LISTEN_ADDRESS . ':' . SOCKET_LISTEN_PORT;
+ if (!$this->ListenSocket = stream_socket_server($ListenAddress, $ErrNr, $ErrStr)) {
+ die("Cannot create listen socket: $ErrStr");
+ }
+ stream_set_blocking($this->ListenSocket, false);
+ }
+
+ private function post_connect() {
+ fwrite($this->Socket, "NICK ".BOT_NICK."Init\n");
+ fwrite($this->Socket, "USER ".BOT_NICK." * * :IRC Bot\n");
+ $this->listen();
+ }
+
+ public function disconnect() {
+ fclose($this->ListenSocket);
+ $this->State = 0; //Drones dead
+ }
+
+ public function get_channel() {
+ preg_match('/.+ PRIVMSG ([^:]+) :.+/', $this->Data, $Channel);
+ if (preg_match('/#.+/', $Channel[1])) {
+ return $Channel[1];
+ } else {
+ return false;
+ }
+ }
+
+ public function get_nick() {
+ preg_match('/:([^!:]+)!.+@[^\s]+ PRIVMSG [^:]+ :.+/', $this->Data, $Nick);
+ return $Nick[1];
+ }
+
+ protected function get_message() {
+ preg_match('/:.+ PRIVMSG [^:]+ :(.+)/', $this->Data, $Msg);
+ return trim($Msg[1]);
+ }
+
+ protected function get_irc_host() {
+ preg_match('/:[^!:]+!.+@([^\s]+) PRIVMSG [^:]+ :.+/', $this->Data, $Host);
+ return trim($Host[1]);
+ }
+
+ protected function get_word($Select = 1) {
+ preg_match('/:.+ PRIVMSG [^:]+ :(.+)/', $this->Data, $Word);
+ $Word = split(' ', $Word[1]);
+ return trim($Word[$Select]);
+ }
+
+ protected function get_action() {
+ preg_match('/:.+ PRIVMSG [^:]+ :!(\S+)/', $this->Data, $Action);
+ return strtoupper($Action[1]);
+ }
+
+ protected function send_raw($Text) {
+ if (!feof($this->Socket)) {
+ fwrite($this->Socket, "$Text\n");
+ } elseif (!$this->Connecting) {
+ $this->Connecting = true;
+ sleep(120);
+ $this->connect_irc(true);
+ }
+ }
+
+ public function send_to($Channel, $Text) {
+ // split the message up into <= 460 character strings and send each individually
+ // this is used to prevent messages from getting truncated
+ $Text = wordwrap($Text, 460, "\n", true);
+ $TextArray = explode("\n", $Text);
+ foreach ($TextArray as $Text) {
+ $this->send_raw("PRIVMSG $Channel :$Text");
+ }
+ }
+
+ protected function whois($Nick) {
+ $this->Whois = $Nick;
+ $this->send_raw("WHOIS $Nick");
+ }
+
+ /*
+ This function uses blacklisted_ip, which is no longer in RC2.
+ You can probably find it in old RC1 code kicking aronud if you need it.
+ protected function ip_check($IP, $Gline = false, $Channel = BOT_REPORT_CHAN) {
+ if (blacklisted_ip($IP)) {
+ $this->send_to($Channel, 'TOR IP Detected: '.$IP);
+ if ($Gline) {
+ $this->send_raw('GLINE *@'.$IP.' 90d :DNSBL Proxy');
+ }
+ }
+ if (Tools::site_ban_ip($IP)) {
+ $this->send_to($Channel, 'Site IP Ban Detected: '.$IP);
+ if ($Gline) {
+ $this->send_raw('GLINE *@'.$IP.' 90d :IP Ban');
+ }
+ }
+ }*/
+
+ protected function listen() {
+ G::$Cache->InternalCache = false;
+ stream_set_timeout($this->Socket, 10000000000);
+ while ($this->State == 1) {
+ $NullSock = null;
+ $Sockets = array($this->Socket, $this->ListenSocket);
+ if (stream_select($Sockets, $NullSock, $NullSock, null) === false) {
+ die();
+ }
+ foreach ($Sockets as $Socket) {
+ if ($Socket === $this->Socket) {
+ $this->irc_events();
+ } else {
+ $this->Listened = stream_socket_accept($Socket);
+ $this->listener_events();
+ }
+ }
+ G::$DB->LinkID = false;
+ G::$DB->Queries = [];
+ }
+ }
}
?>
diff --git a/classes/lastfm.class.php b/classes/lastfm.class.php
index 459a10c1a..68958d679 100644
--- a/classes/lastfm.class.php
+++ b/classes/lastfm.class.php
@@ -1,202 +1,202 @@
-get_value("lastfm_username_$UserID");
- if ($Username === false) {
- $QueryID = G::$DB->get_query_id();
- G::$DB->query("
- SELECT Username
- FROM lastfm_users
- WHERE ID = $UserID");
- list($Username) = G::$DB->next_record();
- G::$DB->set_query_id($QueryID);
- G::$Cache->cache_value("lastfm_username_$UserID", $Username, 0);
- }
- return $Username;
- }
+ public static function get_lastfm_username($UserID) {
+ $Username = G::$Cache->get_value("lastfm_username_$UserID");
+ if ($Username === false) {
+ $QueryID = G::$DB->get_query_id();
+ G::$DB->query("
+ SELECT Username
+ FROM lastfm_users
+ WHERE ID = $UserID");
+ list($Username) = G::$DB->next_record();
+ G::$DB->set_query_id($QueryID);
+ G::$Cache->cache_value("lastfm_username_$UserID", $Username, 0);
+ }
+ return $Username;
+ }
- public static function get_artist_events($ArtistID, $Artist, $Limit = 15) {
- $ArtistEvents = G::$Cache->get_value("artist_events_$ArtistID");
- if (empty($ArtistEvents)) {
- $ArtistEvents = self::lastfm_request("artist.getEvents", array("artist" => $Artist, "limit" => $Limit));
- G::$Cache->cache_value("artist_events_$ArtistID", $ArtistEvents, 432000);
- }
- return $ArtistEvents;
- }
+ public static function get_artist_events($ArtistID, $Artist, $Limit = 15) {
+ $ArtistEvents = G::$Cache->get_value("artist_events_$ArtistID");
+ if (empty($ArtistEvents)) {
+ $ArtistEvents = self::lastfm_request("artist.getEvents", array("artist" => $Artist, "limit" => $Limit));
+ G::$Cache->cache_value("artist_events_$ArtistID", $ArtistEvents, 432000);
+ }
+ return $ArtistEvents;
+ }
- public static function get_user_info($Username) {
- $Response = G::$Cache->get_value("lastfm_user_info_$Username");
- if (empty($Response)) {
- $Response = self::lastfm_request("user.getInfo", array("user" => $Username));
- G::$Cache->cache_value("lastfm_user_info_$Username", $Response, 86400);
- }
- return $Response;
- }
+ public static function get_user_info($Username) {
+ $Response = G::$Cache->get_value("lastfm_user_info_$Username");
+ if (empty($Response)) {
+ $Response = self::lastfm_request("user.getInfo", array("user" => $Username));
+ G::$Cache->cache_value("lastfm_user_info_$Username", $Response, 86400);
+ }
+ return $Response;
+ }
- public static function compare_user_with($Username1, $Limit = 15) {
- $QueryID = G::$DB->get_query_id();
- G::$DB->query("
- SELECT username
- FROM lastfm_users
- WHERE ID = '" . G::$LoggedUser['ID'] . "'");
- if (G::$DB->has_results()) {
- list($Username2) = G::$DB->next_record();
- //Make sure the usernames are in the correct order to avoid dupe cache keys.
- if (strcasecmp($Username1, $Username2)) {
- $Temp = $Username1;
- $Username1 = $Username2;
- $Username2 = $Temp;
- }
- $Response = G::$Cache->get_value("lastfm_compare_$Username1" . "_$Username2");
- if (empty($Response)) {
- $Response = self::lastfm_request("tasteometer.compare", array("type1" => "user", "type2" => "user", "value1" => $Username1, "value2" => $Username2, "limit" => $Limit));
- $Response = json_encode($Response);
- G::$Cache->cache_value("lastfm_compare_$Username1" . "_$Username2", $Response, 86400);
- }
- } else {
- $Response = null;
- }
- G::$DB->set_query_id($QueryID);
- return $Response;
- }
+ public static function compare_user_with($Username1, $Limit = 15) {
+ $QueryID = G::$DB->get_query_id();
+ G::$DB->query("
+ SELECT username
+ FROM lastfm_users
+ WHERE ID = '" . G::$LoggedUser['ID'] . "'");
+ if (G::$DB->has_results()) {
+ list($Username2) = G::$DB->next_record();
+ //Make sure the usernames are in the correct order to avoid dupe cache keys.
+ if (strcasecmp($Username1, $Username2)) {
+ $Temp = $Username1;
+ $Username1 = $Username2;
+ $Username2 = $Temp;
+ }
+ $Response = G::$Cache->get_value("lastfm_compare_$Username1" . "_$Username2");
+ if (empty($Response)) {
+ $Response = self::lastfm_request("tasteometer.compare", array("type1" => "user", "type2" => "user", "value1" => $Username1, "value2" => $Username2, "limit" => $Limit));
+ $Response = json_encode($Response);
+ G::$Cache->cache_value("lastfm_compare_$Username1" . "_$Username2", $Response, 86400);
+ }
+ } else {
+ $Response = null;
+ }
+ G::$DB->set_query_id($QueryID);
+ return $Response;
+ }
- public static function get_last_played_track($Username) {
- $Response = G::$Cache->get_value("lastfm_last_played_track_$Username");
- if (empty($Response)) {
- $Response = self::lastfm_request("user.getRecentTracks", array("user" => $Username, "limit" => 1));
- // Take the single last played track out of the response.
- $Response = $Response['recenttracks']['track'];
- $Response = json_encode($Response);
- G::$Cache->cache_value("lastfm_last_played_track_$Username", $Response, 7200);
- }
- return $Response;
- }
+ public static function get_last_played_track($Username) {
+ $Response = G::$Cache->get_value("lastfm_last_played_track_$Username");
+ if (empty($Response)) {
+ $Response = self::lastfm_request("user.getRecentTracks", array("user" => $Username, "limit" => 1));
+ // Take the single last played track out of the response.
+ $Response = $Response['recenttracks']['track'];
+ $Response = json_encode($Response);
+ G::$Cache->cache_value("lastfm_last_played_track_$Username", $Response, 7200);
+ }
+ return $Response;
+ }
- public static function get_top_artists($Username, $Limit = 15) {
- $Response = G::$Cache->get_value("lastfm_top_artists_$Username");
- if (empty($Response)) {
- sleep(1);
- $Response = self::lastfm_request("user.getTopArtists", array("user" => $Username, "limit" => $Limit));
- $Response = json_encode($Response);
- G::$Cache->cache_value("lastfm_top_artists_$Username", $Response, 86400);
- }
- return $Response;
- }
+ public static function get_top_artists($Username, $Limit = 15) {
+ $Response = G::$Cache->get_value("lastfm_top_artists_$Username");
+ if (empty($Response)) {
+ sleep(1);
+ $Response = self::lastfm_request("user.getTopArtists", array("user" => $Username, "limit" => $Limit));
+ $Response = json_encode($Response);
+ G::$Cache->cache_value("lastfm_top_artists_$Username", $Response, 86400);
+ }
+ return $Response;
+ }
- public static function get_top_albums($Username, $Limit = 15) {
- $Response = G::$Cache->get_value("lastfm_top_albums_$Username");
- if (empty($Response)) {
- sleep(2);
- $Response = self::lastfm_request("user.getTopAlbums", array("user" => $Username, "limit" => $Limit));
- $Response = json_encode($Response);
- G::$Cache->cache_value("lastfm_top_albums_$Username", $Response, 86400);
- }
- return $Response;
- }
+ public static function get_top_albums($Username, $Limit = 15) {
+ $Response = G::$Cache->get_value("lastfm_top_albums_$Username");
+ if (empty($Response)) {
+ sleep(2);
+ $Response = self::lastfm_request("user.getTopAlbums", array("user" => $Username, "limit" => $Limit));
+ $Response = json_encode($Response);
+ G::$Cache->cache_value("lastfm_top_albums_$Username", $Response, 86400);
+ }
+ return $Response;
+ }
- public static function get_top_tracks($Username, $Limit = 15) {
- $Response = G::$Cache->get_value("lastfm_top_tracks_$Username");
- if (empty($Response)) {
- sleep(3);
- $Response = self::lastfm_request("user.getTopTracks", array("user" => $Username, "limit" => $Limit));
- $Response = json_encode($Response);
- G::$Cache->cache_value("lastfm_top_tracks_$Username", $Response, 86400);
- }
- return $Response;
- }
+ public static function get_top_tracks($Username, $Limit = 15) {
+ $Response = G::$Cache->get_value("lastfm_top_tracks_$Username");
+ if (empty($Response)) {
+ sleep(3);
+ $Response = self::lastfm_request("user.getTopTracks", array("user" => $Username, "limit" => $Limit));
+ $Response = json_encode($Response);
+ G::$Cache->cache_value("lastfm_top_tracks_$Username", $Response, 86400);
+ }
+ return $Response;
+ }
- public static function get_user_artist_chart($Username, $From = '', $To = '') {
- $Response = G::$Cache->get_value("lastfm_artist_chart_$Username");
- if (empty($Response)) {
- $Response = self::lastfm_request("user.getWeeklyArtistChart", array("user" => $Username));
- $Response = json_encode($Response);
- G::$Cache->cache_value("lastfm_artist_chart_$Username", $Response, 86400);
- }
- return $Response;
- }
+ public static function get_user_artist_chart($Username, $From = '', $To = '') {
+ $Response = G::$Cache->get_value("lastfm_artist_chart_$Username");
+ if (empty($Response)) {
+ $Response = self::lastfm_request("user.getWeeklyArtistChart", array("user" => $Username));
+ $Response = json_encode($Response);
+ G::$Cache->cache_value("lastfm_artist_chart_$Username", $Response, 86400);
+ }
+ return $Response;
+ }
- public static function get_weekly_artists($Limit = 100) {
- $Response = G::$Cache->get_value("lastfm_top_artists_$Limit");
- if (empty($Response)) {
- $Response = self::lastfm_request("chart.getTopArtists", array("limit" => $Limit));
- $Response = json_encode($Response);
- G::$Cache->cache_value("lastfm_top_artists_$Limit", $Response, 86400);
- }
- return $Response;
- }
+ public static function get_weekly_artists($Limit = 100) {
+ $Response = G::$Cache->get_value("lastfm_top_artists_$Limit");
+ if (empty($Response)) {
+ $Response = self::lastfm_request("chart.getTopArtists", array("limit" => $Limit));
+ $Response = json_encode($Response);
+ G::$Cache->cache_value("lastfm_top_artists_$Limit", $Response, 86400);
+ }
+ return $Response;
+ }
- public static function get_hyped_artists($Limit = 100) {
- $Response = G::$Cache->get_value("lastfm_hyped_artists_$Limit");
- if (empty($Response)) {
- $Response = self::lastfm_request("chart.getHypedArtists", array("limit" => $Limit));
- $Response = json_encode($Response);
- G::$Cache->cache_value("lastfm_hyped_artists_$Limit", $Response, 86400);
- }
- return $Response;
- }
+ public static function get_hyped_artists($Limit = 100) {
+ $Response = G::$Cache->get_value("lastfm_hyped_artists_$Limit");
+ if (empty($Response)) {
+ $Response = self::lastfm_request("chart.getHypedArtists", array("limit" => $Limit));
+ $Response = json_encode($Response);
+ G::$Cache->cache_value("lastfm_hyped_artists_$Limit", $Response, 86400);
+ }
+ return $Response;
+ }
- public static function clear_cache($Username, $UserID) {
- $Response = G::$Cache->get_value("lastfm_clear_cache_$UserID");
- if (empty($Response)) {
- // Prevent clearing the cache on the same uid page for the next 10 minutes.
- G::$Cache->cache_value("lastfm_clear_cache_$UserID", 1, 600);
- G::$Cache->delete_value("lastfm_user_info_$Username");
- G::$Cache->delete_value("lastfm_last_played_track_$Username");
- G::$Cache->delete_value("lastfm_top_artists_$Username");
- G::$Cache->delete_value("lastfm_top_albums_$Username");
- G::$Cache->delete_value("lastfm_top_tracks_$Username");
- $QueryID = G::$DB->get_query_id();
- G::$DB->query("
- SELECT username
- FROM lastfm_users
- WHERE ID = " . G::$LoggedUser['ID']);
- if (G::$DB->has_results()) {
- list($Username2) = G::$DB->next_record();
- //Make sure the usernames are in the correct order to avoid dupe cache keys.
- if (strcasecmp($Username, $Username2)) {
- $Temp = $Username;
- $Username = $Username2;
- $Username2 = $Temp;
- }
- G::$Cache->delete_value("lastfm_compare_{$Username}_$Username2");
- }
- G::$DB->set_query_id($QueryID);
- }
- }
+ public static function clear_cache($Username, $UserID) {
+ $Response = G::$Cache->get_value("lastfm_clear_cache_$UserID");
+ if (empty($Response)) {
+ // Prevent clearing the cache on the same uid page for the next 10 minutes.
+ G::$Cache->cache_value("lastfm_clear_cache_$UserID", 1, 600);
+ G::$Cache->delete_value("lastfm_user_info_$Username");
+ G::$Cache->delete_value("lastfm_last_played_track_$Username");
+ G::$Cache->delete_value("lastfm_top_artists_$Username");
+ G::$Cache->delete_value("lastfm_top_albums_$Username");
+ G::$Cache->delete_value("lastfm_top_tracks_$Username");
+ $QueryID = G::$DB->get_query_id();
+ G::$DB->query("
+ SELECT username
+ FROM lastfm_users
+ WHERE ID = " . G::$LoggedUser['ID']);
+ if (G::$DB->has_results()) {
+ list($Username2) = G::$DB->next_record();
+ //Make sure the usernames are in the correct order to avoid dupe cache keys.
+ if (strcasecmp($Username, $Username2)) {
+ $Temp = $Username;
+ $Username = $Username2;
+ $Username2 = $Temp;
+ }
+ G::$Cache->delete_value("lastfm_compare_{$Username}_$Username2");
+ }
+ G::$DB->set_query_id($QueryID);
+ }
+ }
- private static function lastfm_request($Method, $Args) {
- if (!defined('LASTFM_API_KEY')) {
- return false;
- }
- $RecentFailsKey = 'lastfm_api_fails';
- $RecentFails = (int)G::$Cache->get_value($RecentFailsKey);
- if ($RecentFails > 5) {
- // Take a break if last.fm's API is down/nonfunctional
- return false;
- }
- $Url = LASTFM_API_URL . $Method;
- if (is_array($Args)) {
- foreach ($Args as $Key => $Value) {
- $Url .= "&$Key=" . urlencode($Value);
- }
- $Url .= "&format=json&api_key=" . LASTFM_API_KEY;
+ private static function lastfm_request($Method, $Args) {
+ if (!defined('LASTFM_API_KEY')) {
+ return false;
+ }
+ $RecentFailsKey = 'lastfm_api_fails';
+ $RecentFails = (int)G::$Cache->get_value($RecentFailsKey);
+ if ($RecentFails > 5) {
+ // Take a break if last.fm's API is down/nonfunctional
+ return false;
+ }
+ $Url = LASTFM_API_URL . $Method;
+ if (is_array($Args)) {
+ foreach ($Args as $Key => $Value) {
+ $Url .= "&$Key=" . urlencode($Value);
+ }
+ $Url .= "&format=json&api_key=" . LASTFM_API_KEY;
- $Curl = curl_init();
- curl_setopt($Curl, CURLOPT_HEADER, 0);
- curl_setopt($Curl, CURLOPT_TIMEOUT, 3);
- curl_setopt($Curl, CURLOPT_RETURNTRANSFER, 1);
- curl_setopt($Curl, CURLOPT_URL, $Url);
- $Return = curl_exec($Curl);
- $Errno = curl_errno($Curl);
- curl_close($Curl);
- if ($Errno) {
- G::$Cache->cache_value($RecentFailsKey, $RecentFails + 1, 1800);
- return false;
- }
- return json_decode($Return, true);
- }
- }
+ $Curl = curl_init();
+ curl_setopt($Curl, CURLOPT_HEADER, 0);
+ curl_setopt($Curl, CURLOPT_TIMEOUT, 3);
+ curl_setopt($Curl, CURLOPT_RETURNTRANSFER, 1);
+ curl_setopt($Curl, CURLOPT_URL, $Url);
+ $Return = curl_exec($Curl);
+ $Errno = curl_errno($Curl);
+ curl_close($Curl);
+ if ($Errno) {
+ G::$Cache->cache_value($RecentFailsKey, $RecentFails + 1, 1800);
+ return false;
+ }
+ return json_decode($Return, true);
+ }
+ }
}
diff --git a/classes/lastfmview.class.php b/classes/lastfmview.class.php
index 9531c1e14..35627d645 100644
--- a/classes/lastfmview.class.php
+++ b/classes/lastfmview.class.php
@@ -1,38 +1,38 @@
-
- - \n\t
- \n"; - } - } elseif ($TreeLevel < $PreviousTreeLevel) { - for ($i = 0; $i < $PreviousTreeLevel - $TreeLevel; $i++) { - echo "\t \n
+query("
+ SELECT TreePosition, TreeID, TreeLevel
+ FROM invite_tree
+ WHERE UserID = $UserID");
+ if (!G::$DB->has_results()) {
+ return;
+ }
+ list($TreePosition, $TreeID, $TreeLevel) = G::$DB->next_record(MYSQLI_NUM, false);
+
+ G::$DB->query("
+ SELECT TreePosition
+ FROM invite_tree
+ WHERE TreeID = $TreeID
+ AND TreeLevel = $TreeLevel
+ AND TreePosition > $TreePosition
+ ORDER BY TreePosition ASC
+ LIMIT 1");
+ if (G::$DB->has_results()) {
+ list($MaxPosition) = G::$DB->next_record(MYSQLI_NUM, false);
+ } else {
+ $MaxPosition = false;
+ }
+ $TreeQuery = G::$DB->query("
+ SELECT
+ it.UserID,
+ um.Enabled,
+ um.PermissionID,
+ ui.Donor,
+ uls.Uploaded,
+ uls.Downloaded,
+ um.Paranoia,
+ it.TreePosition,
+ it.TreeLevel
+ FROM invite_tree AS it
+ INNER JOIN users_main AS um ON (um.ID = it.UserID)
+ INNER JOIN users_leech_stats AS uls ON (uls.UserID = it.UserID)
+ INNER JOIN users_info AS ui ON (ui.UserID = it.UserID)
+ WHERE TreeID = $TreeID
+ AND TreePosition > $TreePosition".
+ ($MaxPosition ? " AND TreePosition < $MaxPosition" : '')."
+ AND TreeLevel > $TreeLevel
+ ORDER BY TreePosition");
+
+ $PreviousTreeLevel = $TreeLevel;
+
+ // Stats for the summary
+ $MaxTreeLevel = $TreeLevel; // The deepest level (this changes)
+ $OriginalTreeLevel = $TreeLevel; // The level of the user we're viewing
+ $BaseTreeLevel = $TreeLevel + 1; // The level of users invited by our user
+ $Count = 0;
+ $Branches = 0;
+ $DisabledCount = 0;
+ $DonorCount = 0;
+ $ParanoidCount = 0;
+ $TotalUpload = 0;
+ $TotalDownload = 0;
+ $TopLevelUpload = 0;
+ $TopLevelDownload = 0;
+
+ $ClassSummary = [];
+ global $Classes;
+ foreach ($Classes as $ClassID => $Val) {
+ $ClassSummary[$ClassID] = 0;
+ }
+
+ // We store this in an output buffer, so we can show the summary at the top without having to loop through twice
+ ob_start();
+ while (list($ID, $Enabled, $Class, $Donor, $Uploaded, $Downloaded, $Paranoia, $TreePosition, $TreeLevel) = G::$DB->next_record(MYSQLI_NUM, false)) {
+
+ // Do stats
+ $Count++;
+
+ if ($TreeLevel > $MaxTreeLevel) {
+ $MaxTreeLevel = $TreeLevel;
+ }
+
+ if ($TreeLevel == $BaseTreeLevel) {
+ $Branches++;
+ $TopLevelUpload += $Uploaded;
+ $TopLevelDownload += $Downloaded;
+ }
+
+ $ClassSummary[$Class]++;
+ if ($Enabled == 2) {
+ $DisabledCount++;
+ }
+ if ($Donor) {
+ $DonorCount++;
+ }
+
+ // Manage tree depth
+ if ($TreeLevel > $PreviousTreeLevel) {
+ for ($i = 0; $i < $TreeLevel - $PreviousTreeLevel; $i++) {
+ echo "\n\n\n";
+ } else {
+ echo "\t \n\t\n";
+ }
+ $UserClass = $Classes[$Class]['Level'];
?>
-
-
+
- Uploaded:
- Downloaded:
- Ratio:
-
+ Downloaded:
+ Ratio:
+
- Hidden
-
-set_query_id($TreeQuery);
- }
+set_query_id($TreeQuery);
+ }
- $Tree = ob_get_clean();
- for ($i = 0; $i < $PreviousTreeLevel - $OriginalTreeLevel; $i++) {
- $Tree .= "\t \n\n";
- }
+ $Tree = ob_get_clean();
+ for ($i = 0; $i < $PreviousTreeLevel - $OriginalTreeLevel; $i++) {
+ $Tree .= "\t\n\n";
+ }
- if ($Count) {
+ if ($Count) {
?>
-
- -
-set_query_id($QueryID);
- }
+ - \n\t
- \n"; + } + } elseif ($TreeLevel < $PreviousTreeLevel) { + for ($i = 0; $i < $PreviousTreeLevel - $TreeLevel; $i++) { + echo "\t \n
- This tree has entries, branches, and a depth of . - It has - $ClassCount) { - if ($ClassCount == 0) { - continue; - } - $LastClass = Users::make_class_string($ClassID); - if ($ClassCount > 1) { - if ($LastClass == 'Torrent Celebrity') { - $LastClass = 'Torrent Celebrities'; - } else { - $LastClass.='s'; - } - } - $LastClass = "$ClassCount $LastClass (" . number_format(($ClassCount / $Count) * 100) . '%)'; - - $ClassStrings[] = $LastClass; - } - if (count($ClassStrings) > 1) { - array_pop($ClassStrings); - echo implode(', ', $ClassStrings); - echo ' and '.$LastClass; - } else { - echo $LastClass; - } - echo '. '; - echo $DisabledCount; - echo ($DisabledCount == 1) ? ' user is' : ' users are'; - echo ' disabled ('; - if ($DisabledCount == 0) { - echo '0%)'; - } else { - echo number_format(($DisabledCount / $Count) * 100) . '%)'; - } - echo ', and '; - echo $DonorCount; - echo ($DonorCount == 1) ? ' user has' : ' users have'; - echo ' donated ('; - if ($DonorCount == 0) { - echo '0%)'; - } else { - echo number_format(($DonorCount / $Count) * 100) . '%)'; - } - echo '.
'; - - echo ''; - echo 'The total amount uploaded by the entire tree was '.Format::get_size($TotalUpload); - echo '; the total amount downloaded was '.Format::get_size($TotalDownload); - echo '; and the total ratio is '.Format::get_ratio_html($TotalUpload, $TotalDownload).'. '; - echo '
'; - - echo ''; - echo 'The total amount uploaded by direct invitees (the top level) was '.Format::get_size($TopLevelUpload); - echo '; the total amount downloaded was '.Format::get_size($TopLevelDownload); - echo '; and the total ratio is '.Format::get_ratio_html($TopLevelUpload, $TopLevelDownload).'. '; - - echo "These numbers include the stats of paranoid users and will be factored into the invitation giving script.\n\t\t
\n"; - - if ($ParanoidCount) { - echo ''; - echo $ParanoidCount; - echo ($ParanoidCount == 1) ? ' user (' : ' users ('; - echo number_format(($ParanoidCount / $Count) * 100); - echo '%) '; - echo ($ParanoidCount == 1) ? ' is' : ' are'; - echo ' too paranoid to have their stats shown here, and '; - echo ($ParanoidCount == 1) ? ' was' : ' were'; - echo ' not factored into the stats for the total tree.'; - echo '
'; - } - } ++ This tree has entries, branches, and a depth of . + It has + $ClassCount) { + if ($ClassCount == 0) { + continue; + } + $LastClass = Users::make_class_string($ClassID); + if ($ClassCount > 1) { + if ($LastClass == 'Torrent Celebrity') { + $LastClass = 'Torrent Celebrities'; + } else { + $LastClass.='s'; + } + } + $LastClass = "$ClassCount $LastClass (" . number_format(($ClassCount / $Count) * 100) . '%)'; + + $ClassStrings[] = $LastClass; + } + if (count($ClassStrings) > 1) { + array_pop($ClassStrings); + echo implode(', ', $ClassStrings); + echo ' and '.$LastClass; + } else { + echo $LastClass; + } + echo '. '; + echo $DisabledCount; + echo ($DisabledCount == 1) ? ' user is' : ' users are'; + echo ' disabled ('; + if ($DisabledCount == 0) { + echo '0%)'; + } else { + echo number_format(($DisabledCount / $Count) * 100) . '%)'; + } + echo ', and '; + echo $DonorCount; + echo ($DonorCount == 1) ? ' user has' : ' users have'; + echo ' donated ('; + if ($DonorCount == 0) { + echo '0%)'; + } else { + echo number_format(($DonorCount / $Count) * 100) . '%)'; + } + echo '.
'; + + echo ''; + echo 'The total amount uploaded by the entire tree was '.Format::get_size($TotalUpload); + echo '; the total amount downloaded was '.Format::get_size($TotalDownload); + echo '; and the total ratio is '.Format::get_ratio_html($TotalUpload, $TotalDownload).'. '; + echo '
'; + + echo ''; + echo 'The total amount uploaded by direct invitees (the top level) was '.Format::get_size($TopLevelUpload); + echo '; the total amount downloaded was '.Format::get_size($TopLevelDownload); + echo '; and the total ratio is '.Format::get_ratio_html($TopLevelUpload, $TopLevelDownload).'. '; + + echo "These numbers include the stats of paranoid users and will be factored into the invitation giving script.\n\t\t
\n"; + + if ($ParanoidCount) { + echo ''; + echo $ParanoidCount; + echo ($ParanoidCount == 1) ? ' user (' : ' users ('; + echo number_format(($ParanoidCount / $Count) * 100); + echo '%) '; + echo ($ParanoidCount == 1) ? ' is' : ' are'; + echo ' too paranoid to have their stats shown here, and '; + echo ($ParanoidCount == 1) ? ' was' : ' were'; + echo ' not factored into the stats for the total tree.'; + echo '
'; + } + } ?> -- -
+ +
-
+set_table($Table);
- }
+ public function __construct($Table = 'bookmarks_torrents') {
+ $this->set_table($Table);
+ }
- /**
- * Runs a SQL query and clears the Cache key
- *
- * G::$Cache->delete_value didn't always work, but setting the key to null, did. (?)
- *
- * @param string $sql
- */
- protected function query_and_clear_cache($sql) {
- $QueryID = G::$DB->get_query_id();
- if (is_string($sql) && G::$DB->query($sql)) {
- G::$Cache->delete_value('bookmarks_group_ids_' . G::$LoggedUser['ID']);
- }
- G::$DB->set_query_id($QueryID);
- }
+ /**
+ * Runs a SQL query and clears the Cache key
+ *
+ * G::$Cache->delete_value didn't always work, but setting the key to null, did. (?)
+ *
+ * @param string $sql
+ */
+ protected function query_and_clear_cache($sql) {
+ $QueryID = G::$DB->get_query_id();
+ if (is_string($sql) && G::$DB->query($sql)) {
+ G::$Cache->delete_value('bookmarks_group_ids_' . G::$LoggedUser['ID']);
+ }
+ G::$DB->set_query_id($QueryID);
+ }
- /**
- * Uses (checkboxes) $_POST['remove'] to delete entries.
- *
- * Uses an IN() to match multiple items in one query.
- */
- public function mass_remove() {
- $SQL = array();
- foreach ($_POST['remove'] as $GroupID => $K) {
- if (is_number($GroupID)) {
- $SQL[] = sprintf('%d', $GroupID);
- }
- }
+ /**
+ * Uses (checkboxes) $_POST['remove'] to delete entries.
+ *
+ * Uses an IN() to match multiple items in one query.
+ */
+ public function mass_remove() {
+ $SQL = [];
+ foreach ($_POST['remove'] as $GroupID => $K) {
+ if (is_number($GroupID)) {
+ $SQL[] = sprintf('%d', $GroupID);
+ }
+ }
- if (!empty($SQL)) {
- $SQL = sprintf('
- DELETE FROM %s
- WHERE UserID = %d
- AND GroupID IN (%s)',
- $this->Table,
- G::$LoggedUser['ID'],
- implode(', ', $SQL)
- );
- $this->query_and_clear_cache($SQL);
- }
- }
+ if (!empty($SQL)) {
+ $SQL = sprintf('
+ DELETE FROM %s
+ WHERE UserID = %d
+ AND GroupID IN (%s)',
+ $this->Table,
+ G::$LoggedUser['ID'],
+ implode(', ', $SQL)
+ );
+ $this->query_and_clear_cache($SQL);
+ }
+ }
- /**
- * Uses $_POST['sort'] values to update the DB.
- */
- public function mass_update() {
- $SQL = array();
- foreach ($_POST['sort'] as $GroupID => $Sort) {
- if (is_number($Sort) && is_number($GroupID)) {
- $SQL[] = sprintf('(%d, %d, %d)', $GroupID, $Sort, G::$LoggedUser['ID']);
- }
- }
+ /**
+ * Uses $_POST['sort'] values to update the DB.
+ */
+ public function mass_update() {
+ $SQL = [];
+ foreach ($_POST['sort'] as $GroupID => $Sort) {
+ if (is_number($Sort) && is_number($GroupID)) {
+ $SQL[] = sprintf('(%d, %d, %d)', $GroupID, $Sort, G::$LoggedUser['ID']);
+ }
+ }
- if (!empty($SQL)) {
- $SQL = sprintf('
- INSERT INTO %s
- (GroupID, Sort, UserID)
- VALUES
- %s
- ON DUPLICATE KEY UPDATE
- Sort = VALUES (Sort)',
- $this->Table,
- implode(', ', $SQL));
- $this->query_and_clear_cache($SQL);
- }
- }
+ if (!empty($SQL)) {
+ $SQL = sprintf('
+ INSERT INTO %s
+ (GroupID, Sort, UserID)
+ VALUES
+ %s
+ ON DUPLICATE KEY UPDATE
+ Sort = VALUES (Sort)',
+ $this->Table,
+ implode(', ', $SQL));
+ $this->query_and_clear_cache($SQL);
+ }
+ }
}
diff --git a/classes/mass_user_torrents_editor.class.php b/classes/mass_user_torrents_editor.class.php
index 58c9e185c..5b77e7b07 100644
--- a/classes/mass_user_torrents_editor.class.php
+++ b/classes/mass_user_torrents_editor.class.php
@@ -14,48 +14,48 @@
* It could also be used for other types like collages.
*/
abstract class MASS_USER_TORRENTS_EDITOR {
- /**
- * The affected DB table
- * @var string $Table
- */
- protected $Table;
+ /**
+ * The affected DB table
+ * @var string $Table
+ */
+ protected $Table;
- /**
- * Set the Table
- * @param string $Table
- */
- final public function set_table($Table) {
- $this->Table = db_string($Table);
- }
+ /**
+ * Set the Table
+ * @param string $Table
+ */
+ final public function set_table($Table) {
+ $this->Table = db_string($Table);
+ }
- /**
- * Get the Table
- * @return string $Table
- */
- final public function get_table() {
- return $this->Table;
- }
+ /**
+ * Get the Table
+ * @return string $Table
+ */
+ final public function get_table() {
+ return $this->Table;
+ }
- /**
- * The extending class must provide a method to send a query and clear the cache
- */
- abstract protected function query_and_clear_cache($sql);
+ /**
+ * The extending class must provide a method to send a query and clear the cache
+ */
+ abstract protected function query_and_clear_cache($sql);
- /**
- * A method to insert many rows into a single table
- * Not required in subsequent classes
- */
- public function mass_add() {}
+ /**
+ * A method to insert many rows into a single table
+ * Not required in subsequent classes
+ */
+ public function mass_add() {}
- /**
- * A method to remove many rows from a table
- * The extending class must have a mass_remove method
- */
- abstract public function mass_remove();
+ /**
+ * A method to remove many rows from a table
+ * The extending class must have a mass_remove method
+ */
+ abstract public function mass_remove();
- /**
- * A method to update many rows in a table
- * The extending class must have a mass_update method
- */
- abstract public function mass_update();
-}
\ No newline at end of file
+ /**
+ * A method to update many rows in a table
+ * The extending class must have a mass_update method
+ */
+ abstract public function mass_update();
+}
diff --git a/classes/mass_user_torrents_table_view.class.php b/classes/mass_user_torrents_table_view.class.php
index 08ee3168f..f0451acd8 100644
--- a/classes/mass_user_torrents_table_view.class.php
+++ b/classes/mass_user_torrents_table_view.class.php
@@ -11,262 +11,262 @@
* It can be used for Bookmarks, Collages, or anywhere where torrents are managed.
*/
class MASS_USER_TORRENTS_TABLE_VIEW {
- /**
- * Used to set text the page heading (h2 tag)
- * @var string $Heading
- */
- private $Heading = 'Manage Torrents';
-
- /**
- * Sets the value of the input name="type"
- * Later to be used as $_POST['type'] in a form processor
- * @var string $EditType
- */
- private $EditType;
-
- /**
- * Flag for empty $TorrentList
- * @var bool $HasTorrentList
- */
- private $HasTorrents;
-
- /**
- * Internal reference to the TorrentList
- * @var array $TorrentList
- */
- private $TorrentList;
-
- /**
- * Ref. to $CollageDataList
- * @var array $CollageDataList
- */
- private $CollageDataList;
-
- /**
- * Counter for number of groups
- * @var in $NumGroups
- */
- private $NumGroups = 0;
-
- /**
- * When creating a new instance of this class, TorrentList and
- * CollageDataList must be passed. Additionally, a heading can be added.
- *
- * @param array $TorrentList
- * @param array $CollageDataList
- * @param string $EditType
- * @param string $Heading
- */
- public function __construct (array &$TorrentList, array &$CollageDataList, $EditType, $Heading = null) {
- $this->set_heading($Heading);
- $this->set_edit_type($EditType);
-
- $this->TorrentList = $TorrentList;
- $this->CollageDataList = $CollageDataList;
-
- $this->HasTorrents = !empty($TorrentList);
- if (!$this->HasTorrents) {
- $this->no_torrents();
- }
- }
-
- private function no_torrents () {
+ /**
+ * Used to set text the page heading (h2 tag)
+ * @var string $Heading
+ */
+ private $Heading = 'Manage Torrents';
+
+ /**
+ * Sets the value of the input name="type"
+ * Later to be used as $_POST['type'] in a form processor
+ * @var string $EditType
+ */
+ private $EditType;
+
+ /**
+ * Flag for empty $TorrentList
+ * @var bool $HasTorrentList
+ */
+ private $HasTorrents;
+
+ /**
+ * Internal reference to the TorrentList
+ * @var array $TorrentList
+ */
+ private $TorrentList;
+
+ /**
+ * Ref. to $CollageDataList
+ * @var array $CollageDataList
+ */
+ private $CollageDataList;
+
+ /**
+ * Counter for number of groups
+ * @var in $NumGroups
+ */
+ private $NumGroups = 0;
+
+ /**
+ * When creating a new instance of this class, TorrentList and
+ * CollageDataList must be passed. Additionally, a heading can be added.
+ *
+ * @param array $TorrentList
+ * @param array $CollageDataList
+ * @param string $EditType
+ * @param string $Heading
+ */
+ public function __construct (array &$TorrentList, array &$CollageDataList, $EditType, $Heading = null) {
+ $this->set_heading($Heading);
+ $this->set_edit_type($EditType);
+
+ $this->TorrentList = $TorrentList;
+ $this->CollageDataList = $CollageDataList;
+
+ $this->HasTorrents = !empty($TorrentList);
+ if (!$this->HasTorrents) {
+ $this->no_torrents();
+ }
+ }
+
+ private function no_torrents () {
?>
- Last.fm
- -
-
- - Username: - -
-
- Show more info
-get_value("lastfm_clear_cache_$UserID");
- if (empty($Response)) {
+ +- + Reload stats + + +Last.fm+
-
+
- + Username: + +
- + Show more info +get_value("lastfm_clear_cache_$UserID"); + if (empty($Response)) { ?> - - Reload stats - - - -
> ++
+
>
-
-
-
+
-
- No torrents found.
-
-
- Add some torrents and come back later.
-
+
header();
- $this->body();
- $this->footer();
- }
-
- /**
- * Renders a comptele page/table header: div#thin, h2, scripts, notes,
- * form, table, etc.
- */
- public function header () {
- if ($this->HasTorrents) {
+ }
+
+ /**
+ * Renders a complete page and table
+ */
+ public function render_all () {
+ $this->header();
+ $this->body();
+ $this->footer();
+ }
+
+ /**
+ * Renders a comptele page/table header: div#thin, h2, scripts, notes,
+ * form, table, etc.
+ */
+ public function header () {
+ if ($this->HasTorrents) {
?>
+
+ No torrents found.
+
+
+ Add some torrents and come back later.
+
-
-
-
-
+
HasTorrents)
- foreach ($this->TorrentList as $GroupID => $Group) {
- $Artists = array();
- extract($Group);
- extract($this->CollageDataList[$GroupID]);
-
- $this->NumGroups++;
-
- if (!is_array($ExtendedArtists)) {
- $ExtendedArtists = array();
- }
- if (!is_array($Artists)) {
- $Artists = array();
- }
- $DisplayName = self::display_name($ExtendedArtists, $Artists, $VanityHouse);
- $TorrentLink = ''.$Name.'';
- $Year = $Year > 0 ? $Year : '';
- $DateAdded = date($Time);
-
- $this->row($Sort, $GroupID, $Year, $DisplayName, $TorrentLink, $DateAdded);
- }
- }
-
- /**
- * Outputs a single row
- *
- * @param string|int $Sort
- * @param string|int $GroupID
- * @param string|int $GroupYear
- * @param string $DisplayName
- * @param string $TorrentLink
- */
- public function row ($Sort, $GroupID, $GroupYear, $DisplayName, $TorrentLink, $DateAdded) {
- $CSS = $this->NumGroups % 2 === 0 ? 'rowa' : 'rowb';
+ }
+ }
+
+ /**
+ * Formats data for use in row
+ *
+ */
+ public function body () {
+ if ($this->HasTorrents)
+ foreach ($this->TorrentList as $GroupID => $Group) {
+ $Artists = [];
+ extract($Group);
+ extract($this->CollageDataList[$GroupID]);
+
+ $this->NumGroups++;
+
+ if (!is_array($ExtendedArtists)) {
+ $ExtendedArtists = [];
+ }
+ if (!is_array($Artists)) {
+ $Artists = [];
+ }
+ $DisplayName = self::display_name($ExtendedArtists, $Artists, $VanityHouse);
+ $TorrentLink = ''.$Name.'';
+ $Year = $Year > 0 ? $Year : '';
+ $DateAdded = date($Time);
+
+ $this->row($Sort, $GroupID, $Year, $DisplayName, $TorrentLink, $DateAdded);
+ }
+ }
+
+ /**
+ * Outputs a single row
+ *
+ * @param string|int $Sort
+ * @param string|int $GroupID
+ * @param string|int $GroupYear
+ * @param string $DisplayName
+ * @param string $TorrentLink
+ */
+ public function row ($Sort, $GroupID, $GroupYear, $DisplayName, $TorrentLink, $DateAdded) {
+ $CSS = $this->NumGroups % 2 === 0 ? 'rowa' : 'rowb';
?>
-
-
-
- Heading)?>
-| Sorting |
-
|
-
+
+
+
+
+
-
-
-
+
+
+
+
EditType = $EditType;
- }
-
- /**
- * Set's the current page's heading
- * @param string $Heading
- */
- public function set_heading ($Heading) {
- $this->Heading = $Heading;
- }
+ }
+
+
+ /**
+ * @param string $EditType
+ */
+ public function set_edit_type ($EditType) {
+ $this->EditType = $EditType;
+ }
+
+ /**
+ * Set's the current page's heading
+ * @param string $Heading
+ */
+ public function set_heading ($Heading) {
+ $this->Heading = $Heading;
+ }
}
diff --git a/classes/misc.class.php b/classes/misc.class.php
index a5252b077..5a9ec41c6 100644
--- a/classes/misc.class.php
+++ b/classes/misc.class.php
@@ -1,516 +1,516 @@
-'."\r\n";
- $Headers .= 'Reply-To: '.$From.'@'.MAIL_HOST."\r\n";
- $Headers .= 'Message-Id: <'.Users::make_secret().'@'.MAIL_HOST.">\r\n";
- $Headers .= 'X-Priority: 3'."\r\n";
- mail($To, $Subject, $Body, $Headers, "-f $From@".MAIL_HOST);
- }
-
-
- /**
- * Sanitize a string to be allowed as a filename.
- *
- * @param string $EscapeStr the string to escape
- * @return the string with all banned characters removed.
- */
- public static function file_string($EscapeStr) {
- return str_replace(array('"', '*', '/', ':', '<', '>', '?', '\\', '|'), '', $EscapeStr);
- }
-
-
- /**
- * Sends a PM from $FromId to $ToId.
- *
- * @param string $ToID ID of user to send PM to. If $ToID is an array and $ConvID is empty, a message will be sent to multiple users.
- * @param string $FromID ID of user to send PM from, 0 to send from system
- * @param string $Subject
- * @param string $Body
- * @param int $ConvID The conversation the message goes in. Leave blank to start a new conversation.
- * @return
- */
- public static function send_pm($ToID, $FromID, $Subject, $Body, $ConvID = '') {
- global $Time;
- $UnescapedSubject = $Subject;
- $UnescapedBody = $Body;
- $Subject = db_string($Subject);
- $Body = db_string($Body);
- if ($ToID == 0 || $ToID == $FromID) {
- // Don't allow users to send messages to the system or themselves
- return;
- }
-
- $QueryID = G::$DB->get_query_id();
-
- if ($ConvID == '') {
- // Create a new conversation.
- G::$DB->query("
- INSERT INTO pm_conversations (Subject)
- VALUES ('$Subject')");
- $ConvID = G::$DB->inserted_id();
- G::$DB->query("
- INSERT INTO pm_conversations_users
- (UserID, ConvID, InInbox, InSentbox, SentDate, ReceivedDate, UnRead)
- VALUES
- ('$ToID', '$ConvID', '1','0','".sqltime()."', '".sqltime()."', '1')");
- if ($FromID != 0) {
- G::$DB->query("
- INSERT INTO pm_conversations_users
- (UserID, ConvID, InInbox, InSentbox, SentDate, ReceivedDate, UnRead)
- VALUES
- ('$FromID', '$ConvID', '0','1','".sqltime()."', '".sqltime()."', '0')");
- }
- $ToID = array($ToID);
- } else {
- // Update the pre-existing conversations.
- G::$DB->query("
- UPDATE pm_conversations_users
- SET
- InInbox = '1',
- UnRead = '1',
- ReceivedDate = '".sqltime()."'
- WHERE UserID IN (".implode(',', $ToID).")
- AND ConvID = '$ConvID'");
-
- G::$DB->query("
- UPDATE pm_conversations_users
- SET
- InSentbox = '1',
- SentDate = '".sqltime()."'
- WHERE UserID = '$FromID'
- AND ConvID = '$ConvID'");
- }
-
- // Now that we have a $ConvID for sure, send the message.
- G::$DB->query("
- INSERT INTO pm_messages
- (SenderID, ConvID, SentDate, Body)
- VALUES
- ('$FromID', '$ConvID', '".sqltime()."', '$Body')");
-
- // Update the cached new message count.
- foreach ($ToID as $ID) {
- G::$DB->query("
- SELECT COUNT(ConvID)
- FROM pm_conversations_users
- WHERE UnRead = '1'
- AND UserID = '$ID'
- AND InInbox = '1'");
- list($UnRead) = G::$DB->next_record();
- G::$Cache->cache_value("inbox_new_$ID", $UnRead);
- }
-
- G::$DB->query("
- SELECT Username
- FROM users_main
- WHERE ID = '$FromID'");
- list($SenderName) = G::$DB->next_record();
- foreach ($ToID as $ID) {
- G::$DB->query("
- SELECT COUNT(ConvID)
- FROM pm_conversations_users
- WHERE UnRead = '1'
- AND UserID = '$ID'
- AND InInbox = '1'");
- list($UnRead) = G::$DB->next_record();
- G::$Cache->cache_value("inbox_new_$ID", $UnRead);
-
- NotificationsManager::send_push($ID, "Message from $SenderName, Subject: $UnescapedSubject", $UnescapedBody, site_url() . 'inbox.php', NotificationsManager::INBOX);
- }
-
- G::$DB->set_query_id($QueryID);
-
- return $ConvID;
- }
-
- /**
- * Create thread function.
- *
- * @param int $ForumID
- * @param int $AuthorID ID of the user creating the post.
- * @param string $Title
- * @param string $PostBody
- * @return -1 on error, -2 on user not existing, thread id on success.
- */
- public static function create_thread($ForumID, $AuthorID, $Title, $PostBody) {
- global $Time;
- if (!$ForumID || !$AuthorID || !is_number($AuthorID) || !$Title || !$PostBody) {
- return -1;
- }
-
- $QueryID = G::$DB->get_query_id();
-
- G::$DB->prepared_query('
- SELECT Username
- FROM users_main
- WHERE ID = ?', $AuthorID);
- if (!G::$DB->has_results()) {
- G::$DB->set_query_id($QueryID);
- return -2;
- }
- list($AuthorName) = G::$DB->next_record();
-
- $ThreadInfo = array();
- $ThreadInfo['IsLocked'] = 0;
- $ThreadInfo['IsSticky'] = 0;
-
- G::$DB->prepared_query('
- INSERT INTO forums_topics
- (Title, AuthorID, ForumID, LastPostID, LastPostTime, LastPostAuthorID, CreatedTime)
- VALUES
- (?, ?, ?, ?, ?, ?, ?)',
- $Title, $AuthorID, $ForumID, -1, sqltime(), $AuthorID, sqltime());
- $TopicID = G::$DB->inserted_id();
- $Posts = 1;
-
- G::$DB->prepared_query('
- INSERT INTO forums_posts
- (TopicID, AuthorID, AddedTime, Body)
- VALUES
- (?, ?, ?, ?)', $TopicID, $AuthorID, sqltime(), $PostBody);
- $PostID = G::$DB->inserted_id();
-
- G::$DB->prepared_query('
- UPDATE forums
- SET
- NumPosts = NumPosts + 1,
- NumTopics = NumTopics + 1,
- LastPostID = ?,
- LastPostAuthorID = ?,
- LastPostTopicID = ?,
- LastPostTime = ?
- WHERE ID = ?', $PostID, $AuthorID, $TopicID, sqltime(), $ForumID);
-
- G::$DB->prepared_query('
- UPDATE forums_topics
- SET
- NumPosts = NumPosts + 1,
- LastPostID = ?,
- LastPostAuthorID = ?,
- LastPostTime = ?
- WHERE ID = ?', $PostID, $AuthorID, sqltime(), $TopicID);
-
- // Bump this topic to head of the cache
- list($Forum,,, $Stickies) = G::$Cache->get_value("forums_$ForumID");
- if (!empty($Forum)) {
- if (count($Forum) == TOPICS_PER_PAGE && $Stickies < TOPICS_PER_PAGE) {
- array_pop($Forum);
- }
- G::$DB->prepared_query('
- SELECT IsLocked, IsSticky, NumPosts
- FROM forums_topics
- WHERE ID = ?', $TopicID);
- list($IsLocked, $IsSticky, $NumPosts) = G::$DB->next_record();
- $Part1 = array_slice($Forum, 0, $Stickies, true); //Stickys
- $Part2 = array(
- $TopicID => array(
- 'ID' => $TopicID,
- 'Title' => $Title,
- 'AuthorID' => $AuthorID,
- 'IsLocked' => $IsLocked,
- 'IsSticky' => $IsSticky,
- 'NumPosts' => $NumPosts,
- 'LastPostID' => $PostID,
- 'LastPostTime' => sqltime(),
- 'LastPostAuthorID' => $AuthorID,
- )
- ); //Bumped thread
- $Part3 = array_slice($Forum, $Stickies, TOPICS_PER_PAGE, true); //Rest of page
- if ($Stickies > 0) {
- $Part1 = array_slice($Forum, 0, $Stickies, true); //Stickies
- $Part3 = array_slice($Forum, $Stickies, TOPICS_PER_PAGE - $Stickies - 1, true); //Rest of page
- } else {
- $Part1 = array();
- $Part3 = $Forum;
- }
- if (is_null($Part1)) {
- $Part1 = array();
- }
- if (is_null($Part3)) {
- $Part3 = array();
- }
- $Forum = $Part1 + $Part2 + $Part3;
- G::$Cache->cache_value("forums_$ForumID", array($Forum, '', 0, $Stickies), 0);
- }
-
- //Update the forum root
- G::$Cache->begin_transaction('forums_list');
- $UpdateArray = array(
- 'NumPosts' => '+1',
- 'NumTopics' => '+1',
- 'LastPostID' => $PostID,
- 'LastPostAuthorID' => $AuthorID,
- 'LastPostTopicID' => $TopicID,
- 'LastPostTime' => sqltime(),
- 'Title' => $Title,
- 'IsLocked' => $ThreadInfo['IsLocked'],
- 'IsSticky' => $ThreadInfo['IsSticky']
- );
-
- $UpdateArray['NumTopics'] = '+1';
-
- G::$Cache->update_row($ForumID, $UpdateArray);
- G::$Cache->commit_transaction(0);
-
- $CatalogueID = floor((POSTS_PER_PAGE * ceil($Posts / POSTS_PER_PAGE) - POSTS_PER_PAGE) / THREAD_CATALOGUE);
- G::$Cache->begin_transaction('thread_'.$TopicID.'_catalogue_'.$CatalogueID);
- $Post = array(
- 'ID' => $PostID,
- 'AuthorID' => G::$LoggedUser['ID'],
- 'AddedTime' => sqltime(),
- 'Body' => $PostBody,
- 'EditedUserID' => 0,
- 'EditedTime' => '0000-00-00 00:00:00',
- 'Username' => ''
- );
- G::$Cache->insert('', $Post);
- G::$Cache->commit_transaction(0);
-
- G::$Cache->begin_transaction('thread_'.$TopicID.'_info');
- G::$Cache->update_row(false, array('Posts' => '+1', 'LastPostAuthorID' => $AuthorID));
- G::$Cache->commit_transaction(0);
-
- G::$DB->set_query_id($QueryID);
-
- return $TopicID;
- }
-
- /**
- * Variant of in_array() with trailing wildcard support
- *
- * @param string $Needle, array $Haystack
- * @return boolean true if (substring of) $Needle exists in $Haystack
- */
- public static function in_array_partial($Needle, $Haystack) {
- static $Searches = array();
- if (array_key_exists($Needle, $Searches)) {
- return $Searches[$Needle];
- }
- foreach ($Haystack as $String) {
- if (substr($String, -1) == '*') {
- if (!strncmp($Needle, $String, strlen($String) - 1)) {
- $Searches[$Needle] = true;
- return true;
- }
- } elseif (!strcmp($Needle, $String)) {
- $Searches[$Needle] = true;
- return true;
- }
- }
- $Searches[$Needle] = false;
- return false;
- }
-
- /**
- * Used to check if keys in $_POST and $_GET are all set, and throws an error if not.
- * This reduces 'if' statement redundancy for a lot of variables
- *
- * @param array $Request Either $_POST or $_GET, or whatever other array you want to check.
- * @param array $Keys The keys to ensure are set.
- * @param boolean $AllowEmpty If set to true, a key that is in the request but blank will not throw an error.
- * @param int $Error The error code to throw if one of the keys isn't in the array.
- */
- public static function assert_isset_request($Request, $Keys = null, $AllowEmpty = false, $Error = 0) {
- if (isset($Keys)) {
- foreach ($Keys as $K) {
- if (!isset($Request[$K]) || ($AllowEmpty == false && $Request[$K] == '')) {
- error($Error);
- break;
- }
- }
- } else {
- foreach ($Request as $R) {
- if (!isset($R) || ($AllowEmpty == false && $R == '')) {
- error($Error);
- break;
- }
- }
- }
- }
-
-
- /**
- * Given an array of tags, return an array of their IDs.
- *
- * @param array $TagNames
- * @return array IDs
- */
- public static function get_tags($TagNames) {
- $TagIDs = array();
- foreach ($TagNames as $Index => $TagName) {
- $Tag = G::$Cache->get_value("tag_id_$TagName");
- if (is_array($Tag)) {
- unset($TagNames[$Index]);
- $TagIDs[$Tag['ID']] = $Tag['Name'];
- }
- }
- if (count($TagNames) > 0) {
- $QueryID = G::$DB->get_query_id();
- G::$DB->query("
- SELECT ID, Name
- FROM tags
- WHERE Name IN ('".implode("', '", $TagNames)."')");
- $SQLTagIDs = G::$DB->to_array();
- G::$DB->set_query_id($QueryID);
- foreach ($SQLTagIDs as $Tag) {
- $TagIDs[$Tag['ID']] = $Tag['Name'];
- G::$Cache->cache_value('tag_id_'.$Tag['Name'], $Tag, 0);
- }
- }
-
- return($TagIDs);
- }
-
-
- /**
- * Gets the alias of the tag; if there is no alias, silently returns the original tag.
- *
- * @param string $BadTag the tag we want to alias
- * @return string The aliased tag.
- */
- public static function get_alias_tag($BadTag) {
- $QueryID = G::$DB->get_query_id();
- G::$DB->query("
- SELECT AliasTag
- FROM tag_aliases
- WHERE BadTag = '$BadTag'
- LIMIT 1");
- if (G::$DB->has_results()) {
- list($AliasTag) = G::$DB->next_record();
- } else {
- $AliasTag = $BadTag;
- }
- G::$DB->set_query_id($QueryID);
- return $AliasTag;
- }
-
-
- /*
- * Write a message to the system log.
- *
- * @param string $Message the message to write.
- */
- public static function write_log($Message) {
- global $Time;
- $QueryID = G::$DB->get_query_id();
- G::$DB->query("
- INSERT INTO log (Message, Time)
- VALUES ('" . db_string($Message) . "', '" . sqltime() . "')");
- G::$DB->set_query_id($QueryID);
- }
-
-
- /**
- * Get a tag ready for database input and display.
- *
- * @param string $Str
- * @return string sanitized version of $Str
- */
- public static function sanitize_tag($Str) {
- $Str = strtolower($Str);
- $Str = preg_replace('/[^a-z0-9.]/', '', $Str);
- $Str = preg_replace('/(^[.,]*)|([.,]*$)/', '', $Str);
- $Str = htmlspecialchars($Str);
- $Str = db_string(trim($Str));
- return $Str;
- }
-
- /**
- * HTML escape an entire array for output.
- * @param array $Array, what we want to escape
- * @param boolean|array $Escape
- * if true, all keys escaped
- * if false, no escaping.
- * If array, it's a list of array keys not to escape.
- * @param boolean $Reverse reverses $Escape such that then it's an array of keys to escape
- * @return array mutated version of $Array with values escaped.
- */
- public static function display_array($Array, $Escape = array(), $Reverse = false) {
- foreach ($Array as $Key => $Val) {
- if ((!is_array($Escape) && $Escape == true) || (!$Reverse && !in_array($Key, $Escape)) || ($Reverse && in_array($Key, $Escape))) {
- $Array[$Key] = display_str($Val);
- }
- }
- return $Array;
- }
-
- /**
- * Searches for a key/value pair in an array.
- *
- * @return array of results
- */
- public static function search_array($Array, $Key, $Value) {
- $Results = array();
- if (is_array($Array))
- {
- if (isset($Array[$Key]) && $Array[$Key] == $Value) {
- $Results[] = $Array;
- }
-
- foreach ($Array as $subarray) {
- $Results = array_merge($Results, self::search_array($subarray, $Key, $Value));
- }
- }
- return $Results;
- }
-
- /**
- * Search for $Needle in the string $Haystack which is a list of values separated by $Separator.
- * @param string $Haystack
- * @param string $Needle
- * @param string $Separator
- * @param boolean $Strict
- * @return boolean
- */
- public static function search_joined_string($Haystack, $Needle, $Separator = '|', $Strict = true) {
- return (array_search($Needle, explode($Separator, $Haystack), $Strict) !== false);
- }
-
- /**
- * Check for a ":" in the beginning of a torrent meta data string
- * to see if it's stored in the old base64-encoded format
- *
- * @param string $Torrent the torrent data
- * @return true if the torrent is stored in binary format
- */
- public static function is_new_torrent(&$Data) {
- return strpos(substr($Data, 0, 10), ':') !== false;
- }
-
- public static function display_recommend($ID, $Type, $Hide = true) {
- if ($Hide) {
- $Hide = ' style="display: none;"';
- }
- ?>
- class="center">
-
-
-'."\r\n";
+ $Headers .= 'Reply-To: '.$From.'@'.MAIL_HOST."\r\n";
+ $Headers .= 'Message-Id: <'.Users::make_secret().'@'.MAIL_HOST.">\r\n";
+ $Headers .= 'X-Priority: 3'."\r\n";
+ mail($To, $Subject, $Body, $Headers, "-f $From@".MAIL_HOST);
+ }
+
+
+ /**
+ * Sanitize a string to be allowed as a filename.
+ *
+ * @param string $EscapeStr the string to escape
+ * @return the string with all banned characters removed.
+ */
+ public static function file_string($EscapeStr) {
+ return str_replace(array('"', '*', '/', ':', '<', '>', '?', '\\', '|'), '', $EscapeStr);
+ }
+
+
+ /**
+ * Sends a PM from $FromId to $ToId.
+ *
+ * @param string $ToID ID of user to send PM to. If $ToID is an array and $ConvID is empty, a message will be sent to multiple users.
+ * @param string $FromID ID of user to send PM from, 0 to send from system
+ * @param string $Subject
+ * @param string $Body
+ * @param int $ConvID The conversation the message goes in. Leave blank to start a new conversation.
+ * @return
+ */
+ public static function send_pm($ToID, $FromID, $Subject, $Body, $ConvID = '') {
+ global $Time;
+ $UnescapedSubject = $Subject;
+ $UnescapedBody = $Body;
+ $Subject = db_string($Subject);
+ $Body = db_string($Body);
+ if ($ToID == 0 || $ToID == $FromID) {
+ // Don't allow users to send messages to the system or themselves
+ return;
+ }
+
+ $QueryID = G::$DB->get_query_id();
+
+ if ($ConvID == '') {
+ // Create a new conversation.
+ G::$DB->query("
+ INSERT INTO pm_conversations (Subject)
+ VALUES ('$Subject')");
+ $ConvID = G::$DB->inserted_id();
+ G::$DB->query("
+ INSERT INTO pm_conversations_users
+ (UserID, ConvID, InInbox, InSentbox, SentDate, ReceivedDate, UnRead)
+ VALUES
+ ('$ToID', '$ConvID', '1','0','".sqltime()."', '".sqltime()."', '1')");
+ if ($FromID != 0) {
+ G::$DB->query("
+ INSERT INTO pm_conversations_users
+ (UserID, ConvID, InInbox, InSentbox, SentDate, ReceivedDate, UnRead)
+ VALUES
+ ('$FromID', '$ConvID', '0','1','".sqltime()."', '".sqltime()."', '0')");
+ }
+ $ToID = array($ToID);
+ } else {
+ // Update the pre-existing conversations.
+ G::$DB->query("
+ UPDATE pm_conversations_users
+ SET
+ InInbox = '1',
+ UnRead = '1',
+ ReceivedDate = '".sqltime()."'
+ WHERE UserID IN (".implode(',', $ToID).")
+ AND ConvID = '$ConvID'");
+
+ G::$DB->query("
+ UPDATE pm_conversations_users
+ SET
+ InSentbox = '1',
+ SentDate = '".sqltime()."'
+ WHERE UserID = '$FromID'
+ AND ConvID = '$ConvID'");
+ }
+
+ // Now that we have a $ConvID for sure, send the message.
+ G::$DB->query("
+ INSERT INTO pm_messages
+ (SenderID, ConvID, SentDate, Body)
+ VALUES
+ ('$FromID', '$ConvID', '".sqltime()."', '$Body')");
+
+ // Update the cached new message count.
+ foreach ($ToID as $ID) {
+ G::$DB->query("
+ SELECT COUNT(ConvID)
+ FROM pm_conversations_users
+ WHERE UnRead = '1'
+ AND UserID = '$ID'
+ AND InInbox = '1'");
+ list($UnRead) = G::$DB->next_record();
+ G::$Cache->cache_value("inbox_new_$ID", $UnRead);
+ }
+
+ G::$DB->query("
+ SELECT Username
+ FROM users_main
+ WHERE ID = '$FromID'");
+ list($SenderName) = G::$DB->next_record();
+ foreach ($ToID as $ID) {
+ G::$DB->query("
+ SELECT COUNT(ConvID)
+ FROM pm_conversations_users
+ WHERE UnRead = '1'
+ AND UserID = '$ID'
+ AND InInbox = '1'");
+ list($UnRead) = G::$DB->next_record();
+ G::$Cache->cache_value("inbox_new_$ID", $UnRead);
+
+ NotificationsManager::send_push($ID, "Message from $SenderName, Subject: $UnescapedSubject", $UnescapedBody, site_url() . 'inbox.php', NotificationsManager::INBOX);
+ }
+
+ G::$DB->set_query_id($QueryID);
+
+ return $ConvID;
+ }
+
+ /**
+ * Create thread function.
+ *
+ * @param int $ForumID
+ * @param int $AuthorID ID of the user creating the post.
+ * @param string $Title
+ * @param string $PostBody
+ * @return -1 on error, -2 on user not existing, thread id on success.
+ */
+ public static function create_thread($ForumID, $AuthorID, $Title, $PostBody) {
+ global $Time;
+ if (!$ForumID || !$AuthorID || !is_number($AuthorID) || !$Title || !$PostBody) {
+ return -1;
+ }
+
+ $QueryID = G::$DB->get_query_id();
+
+ G::$DB->prepared_query('
+ SELECT Username
+ FROM users_main
+ WHERE ID = ?', $AuthorID);
+ if (!G::$DB->has_results()) {
+ G::$DB->set_query_id($QueryID);
+ return -2;
+ }
+ list($AuthorName) = G::$DB->next_record();
+
+ $ThreadInfo = [];
+ $ThreadInfo['IsLocked'] = 0;
+ $ThreadInfo['IsSticky'] = 0;
+
+ G::$DB->prepared_query('
+ INSERT INTO forums_topics
+ (Title, AuthorID, ForumID, LastPostID, LastPostTime, LastPostAuthorID, CreatedTime)
+ VALUES
+ (?, ?, ?, ?, ?, ?, ?)',
+ $Title, $AuthorID, $ForumID, -1, sqltime(), $AuthorID, sqltime());
+ $TopicID = G::$DB->inserted_id();
+ $Posts = 1;
+
+ G::$DB->prepared_query('
+ INSERT INTO forums_posts
+ (TopicID, AuthorID, AddedTime, Body)
+ VALUES
+ (?, ?, ?, ?)', $TopicID, $AuthorID, sqltime(), $PostBody);
+ $PostID = G::$DB->inserted_id();
+
+ G::$DB->prepared_query('
+ UPDATE forums
+ SET
+ NumPosts = NumPosts + 1,
+ NumTopics = NumTopics + 1,
+ LastPostID = ?,
+ LastPostAuthorID = ?,
+ LastPostTopicID = ?,
+ LastPostTime = ?
+ WHERE ID = ?', $PostID, $AuthorID, $TopicID, sqltime(), $ForumID);
+
+ G::$DB->prepared_query('
+ UPDATE forums_topics
+ SET
+ NumPosts = NumPosts + 1,
+ LastPostID = ?,
+ LastPostAuthorID = ?,
+ LastPostTime = ?
+ WHERE ID = ?', $PostID, $AuthorID, sqltime(), $TopicID);
+
+ // Bump this topic to head of the cache
+ list($Forum,,, $Stickies) = G::$Cache->get_value("forums_$ForumID");
+ if (!empty($Forum)) {
+ if (count($Forum) == TOPICS_PER_PAGE && $Stickies < TOPICS_PER_PAGE) {
+ array_pop($Forum);
+ }
+ G::$DB->prepared_query('
+ SELECT IsLocked, IsSticky, NumPosts
+ FROM forums_topics
+ WHERE ID = ?', $TopicID);
+ list($IsLocked, $IsSticky, $NumPosts) = G::$DB->next_record();
+ $Part1 = array_slice($Forum, 0, $Stickies, true); //Stickys
+ $Part2 = array(
+ $TopicID => array(
+ 'ID' => $TopicID,
+ 'Title' => $Title,
+ 'AuthorID' => $AuthorID,
+ 'IsLocked' => $IsLocked,
+ 'IsSticky' => $IsSticky,
+ 'NumPosts' => $NumPosts,
+ 'LastPostID' => $PostID,
+ 'LastPostTime' => sqltime(),
+ 'LastPostAuthorID' => $AuthorID,
+ )
+ ); //Bumped thread
+ $Part3 = array_slice($Forum, $Stickies, TOPICS_PER_PAGE, true); //Rest of page
+ if ($Stickies > 0) {
+ $Part1 = array_slice($Forum, 0, $Stickies, true); //Stickies
+ $Part3 = array_slice($Forum, $Stickies, TOPICS_PER_PAGE - $Stickies - 1, true); //Rest of page
+ } else {
+ $Part1 = [];
+ $Part3 = $Forum;
+ }
+ if (is_null($Part1)) {
+ $Part1 = [];
+ }
+ if (is_null($Part3)) {
+ $Part3 = [];
+ }
+ $Forum = $Part1 + $Part2 + $Part3;
+ G::$Cache->cache_value("forums_$ForumID", array($Forum, '', 0, $Stickies), 0);
+ }
+
+ //Update the forum root
+ G::$Cache->begin_transaction('forums_list');
+ $UpdateArray = array(
+ 'NumPosts' => '+1',
+ 'NumTopics' => '+1',
+ 'LastPostID' => $PostID,
+ 'LastPostAuthorID' => $AuthorID,
+ 'LastPostTopicID' => $TopicID,
+ 'LastPostTime' => sqltime(),
+ 'Title' => $Title,
+ 'IsLocked' => $ThreadInfo['IsLocked'],
+ 'IsSticky' => $ThreadInfo['IsSticky']
+ );
+
+ $UpdateArray['NumTopics'] = '+1';
+
+ G::$Cache->update_row($ForumID, $UpdateArray);
+ G::$Cache->commit_transaction(0);
+
+ $CatalogueID = floor((POSTS_PER_PAGE * ceil($Posts / POSTS_PER_PAGE) - POSTS_PER_PAGE) / THREAD_CATALOGUE);
+ G::$Cache->begin_transaction('thread_'.$TopicID.'_catalogue_'.$CatalogueID);
+ $Post = array(
+ 'ID' => $PostID,
+ 'AuthorID' => G::$LoggedUser['ID'],
+ 'AddedTime' => sqltime(),
+ 'Body' => $PostBody,
+ 'EditedUserID' => 0,
+ 'EditedTime' => '0000-00-00 00:00:00',
+ 'Username' => ''
+ );
+ G::$Cache->insert('', $Post);
+ G::$Cache->commit_transaction(0);
+
+ G::$Cache->begin_transaction('thread_'.$TopicID.'_info');
+ G::$Cache->update_row(false, array('Posts' => '+1', 'LastPostAuthorID' => $AuthorID));
+ G::$Cache->commit_transaction(0);
+
+ G::$DB->set_query_id($QueryID);
+
+ return $TopicID;
+ }
+
+ /**
+ * Variant of in_array with trailing wildcard support
+ *
+ * @param string $Needle, array $Haystack
+ * @return boolean true if (substring of) $Needle exists in $Haystack
+ */
+ public static function in_array_partial($Needle, $Haystack) {
+ static $Searches = [];
+ if (array_key_exists($Needle, $Searches)) {
+ return $Searches[$Needle];
+ }
+ foreach ($Haystack as $String) {
+ if (substr($String, -1) == '*') {
+ if (!strncmp($Needle, $String, strlen($String) - 1)) {
+ $Searches[$Needle] = true;
+ return true;
+ }
+ } elseif (!strcmp($Needle, $String)) {
+ $Searches[$Needle] = true;
+ return true;
+ }
+ }
+ $Searches[$Needle] = false;
+ return false;
+ }
+
+ /**
+ * Used to check if keys in $_POST and $_GET are all set, and throws an error if not.
+ * This reduces 'if' statement redundancy for a lot of variables
+ *
+ * @param array $Request Either $_POST or $_GET, or whatever other array you want to check.
+ * @param array $Keys The keys to ensure are set.
+ * @param boolean $AllowEmpty If set to true, a key that is in the request but blank will not throw an error.
+ * @param int $Error The error code to throw if one of the keys isn't in the array.
+ */
+ public static function assert_isset_request($Request, $Keys = null, $AllowEmpty = false, $Error = 0) {
+ if (isset($Keys)) {
+ foreach ($Keys as $K) {
+ if (!isset($Request[$K]) || ($AllowEmpty == false && $Request[$K] == '')) {
+ error($Error);
+ break;
+ }
+ }
+ } else {
+ foreach ($Request as $R) {
+ if (!isset($R) || ($AllowEmpty == false && $R == '')) {
+ error($Error);
+ break;
+ }
+ }
+ }
+ }
+
+
+ /**
+ * Given an array of tags, return an array of their IDs.
+ *
+ * @param array $TagNames
+ * @return array IDs
+ */
+ public static function get_tags($TagNames) {
+ $TagIDs = [];
+ foreach ($TagNames as $Index => $TagName) {
+ $Tag = G::$Cache->get_value("tag_id_$TagName");
+ if (is_array($Tag)) {
+ unset($TagNames[$Index]);
+ $TagIDs[$Tag['ID']] = $Tag['Name'];
+ }
+ }
+ if (count($TagNames) > 0) {
+ $QueryID = G::$DB->get_query_id();
+ G::$DB->query("
+ SELECT ID, Name
+ FROM tags
+ WHERE Name IN ('".implode("', '", $TagNames)."')");
+ $SQLTagIDs = G::$DB->to_array;
+ G::$DB->set_query_id($QueryID);
+ foreach ($SQLTagIDs as $Tag) {
+ $TagIDs[$Tag['ID']] = $Tag['Name'];
+ G::$Cache->cache_value('tag_id_'.$Tag['Name'], $Tag, 0);
+ }
+ }
+
+ return($TagIDs);
+ }
+
+
+ /**
+ * Gets the alias of the tag; if there is no alias, silently returns the original tag.
+ *
+ * @param string $BadTag the tag we want to alias
+ * @return string The aliased tag.
+ */
+ public static function get_alias_tag($BadTag) {
+ $QueryID = G::$DB->get_query_id();
+ G::$DB->query("
+ SELECT AliasTag
+ FROM tag_aliases
+ WHERE BadTag = '$BadTag'
+ LIMIT 1");
+ if (G::$DB->has_results()) {
+ list($AliasTag) = G::$DB->next_record();
+ } else {
+ $AliasTag = $BadTag;
+ }
+ G::$DB->set_query_id($QueryID);
+ return $AliasTag;
+ }
+
+
+ /*
+ * Write a message to the system log.
+ *
+ * @param string $Message the message to write.
+ */
+ public static function write_log($Message) {
+ global $Time;
+ $QueryID = G::$DB->get_query_id();
+ G::$DB->query("
+ INSERT INTO log (Message, Time)
+ VALUES ('" . db_string($Message) . "', '" . sqltime() . "')");
+ G::$DB->set_query_id($QueryID);
+ }
+
+
+ /**
+ * Get a tag ready for database input and display.
+ *
+ * @param string $Str
+ * @return string sanitized version of $Str
+ */
+ public static function sanitize_tag($Str) {
+ $Str = strtolower($Str);
+ $Str = preg_replace('/[^a-z0-9.]/', '', $Str);
+ $Str = preg_replace('/(^[.,]*)|([.,]*$)/', '', $Str);
+ $Str = htmlspecialchars($Str);
+ $Str = db_string(trim($Str));
+ return $Str;
+ }
+
+ /**
+ * HTML escape an entire array for output.
+ * @param array $Array, what we want to escape
+ * @param boolean|array $Escape
+ * if true, all keys escaped
+ * if false, no escaping.
+ * If array, it's a list of array keys not to escape.
+ * @param boolean $Reverse reverses $Escape such that then it's an array of keys to escape
+ * @return array mutated version of $Array with values escaped.
+ */
+ public static function display_array($Array, $Escape = [], $Reverse = false) {
+ foreach ($Array as $Key => $Val) {
+ if ((!is_array($Escape) && $Escape == true) || (!$Reverse && !in_array($Key, $Escape)) || ($Reverse && in_array($Key, $Escape))) {
+ $Array[$Key] = display_str($Val);
+ }
+ }
+ return $Array;
+ }
+
+ /**
+ * Searches for a key/value pair in an array.
+ *
+ * @return array of results
+ */
+ public static function search_array($Array, $Key, $Value) {
+ $Results = [];
+ if (is_array($Array))
+ {
+ if (isset($Array[$Key]) && $Array[$Key] == $Value) {
+ $Results[] = $Array;
+ }
+
+ foreach ($Array as $subarray) {
+ $Results = array_merge($Results, self::search_array($subarray, $Key, $Value));
+ }
+ }
+ return $Results;
+ }
+
+ /**
+ * Search for $Needle in the string $Haystack which is a list of values separated by $Separator.
+ * @param string $Haystack
+ * @param string $Needle
+ * @param string $Separator
+ * @param boolean $Strict
+ * @return boolean
+ */
+ public static function search_joined_string($Haystack, $Needle, $Separator = '|', $Strict = true) {
+ return (array_search($Needle, explode($Separator, $Haystack), $Strict) !== false);
+ }
+
+ /**
+ * Check for a ":" in the beginning of a torrent meta data string
+ * to see if it's stored in the old base64-encoded format
+ *
+ * @param string $Torrent the torrent data
+ * @return true if the torrent is stored in binary format
+ */
+ public static function is_new_torrent(&$Data) {
+ return strpos(substr($Data, 0, 10), ':') !== false;
+ }
+
+ public static function display_recommend($ID, $Type, $Hide = true) {
+ if ($Hide) {
+ $Hide = ' style="display: none;"';
+ }
+ ?>
+
- Recommend to:
-
-
-
-
- class="center">
+
+
+
diff --git a/classes/mysql.class.php b/classes/mysql.class.php
index 5bb1a6d20..aee9395b2 100644
--- a/classes/mysql.class.php
+++ b/classes/mysql.class.php
@@ -1,4 +1,4 @@
-query("
- SELECT *
- FROM table...");
+ SELECT *
+ FROM table...");
- Is functionally equivalent to using mysqli_query("SELECT * FROM table...")
- Stores the result set in $this->QueryID
- Returns the result set, so you can save it for later (see set_query_id())
+ Is functionally equivalent to using mysqli_query("SELECT * FROM table...")
+ Stores the result set in $this->QueryID
+ Returns the result set, so you can save it for later (see set_query_id())
-----
* Getting data from a query
$array = $DB->next_record();
- Is functionally equivalent to using mysqli_fetch_array($ResultSet)
- You do not need to specify a result set - it uses $this-QueryID
+ Is functionally equivalent to using mysqli_fetch_array($ResultSet)
+ You do not need to specify a result set - it uses $this-QueryID
-----
* Escaping a string
db_string($str);
- Is a wrapper for $DB->escape_str(), which is a wrapper for
- mysqli_real_escape_string(). The db_string() function exists so that you
- don't have to keep calling $DB->escape_str().
+ Is a wrapper for $DB->escape_str(), which is a wrapper for
+ mysqli_real_escape_string(). The db_string() function exists so that you
+ don't have to keep calling $DB->escape_str().
- USE THIS FUNCTION EVERY TIME YOU USE AN UNVALIDATED USER-SUPPLIED VALUE IN
- A DATABASE QUERY!
+ USE THIS FUNCTION EVERY TIME YOU USE AN UNVALIDATED USER-SUPPLIED VALUE IN
+ A DATABASE QUERY!
//--------- Advanced usage ---------------------------------------------------------
@@ -57,555 +57,555 @@
* This is how you loop over the result set:
while (list($All, $Columns, $That, $You, $Select) = $DB->next_record()) {
- echo "Do stuff with $All of the ".$Columns.$That.$You.$Select;
+ echo "Do stuff with $All of the ".$Columns.$That.$You.$Select;
}
-----
* There are also a couple more mysqli functions that have been wrapped. They are:
record_count()
- Wrapper to mysqli_num_rows()
+ Wrapper to mysqli_num_rows()
affected_rows()
- Wrapper to mysqli_affected_rows()
+ Wrapper to mysqli_affected_rows()
inserted_id()
- Wrapper to mysqli_insert_id()
+ Wrapper to mysqli_insert_id()
close
- Wrapper to mysqli_close()
+ Wrapper to mysqli_close()
-----
* And, of course, a few handy custom functions.
to_array($Key = false)
- Transforms an entire result set into an array (useful in situations where you
- can't order the rows properly in the query).
+ Transforms an entire result set into an array (useful in situations where you
+ can't order the rows properly in the query).
- If $Key is set, the function uses $Key as the index (good for looking up a
- field). Otherwise, it uses an iterator.
+ If $Key is set, the function uses $Key as the index (good for looking up a
+ field). Otherwise, it uses an iterator.
- For an example of this function in action, check out forum.php.
+ For an example of this function in action, check out forum.php.
collect($Key)
- Loops over the result set, creating an array from one of the fields ($Key).
- For an example, see forum.php.
+ Loops over the result set, creating an array from one of the fields ($Key).
+ For an example, see forum.php.
set_query_id($ResultSet)
- This class can only hold one result set at a time. Using set_query_id allows
- you to set the result set that the class is using to the result set in
- $ResultSet. This result set should have been obtained earlier by using
- $DB->query().
+ This class can only hold one result set at a time. Using set_query_id allows
+ you to set the result set that the class is using to the result set in
+ $ResultSet. This result set should have been obtained earlier by using
+ $DB->query().
- Example:
+ Example:
- $FoodRS = $DB->query("
- SELECT *
- FROM food");
- $DB->query("
- SELECT *
- FROM drink");
- $Drinks = $DB->next_record();
- $DB->set_query_id($FoodRS);
- $Food = $DB->next_record();
+ $FoodRS = $DB->query("
+ SELECT *
+ FROM food");
+ $DB->query("
+ SELECT *
+ FROM drink");
+ $Drinks = $DB->next_record();
+ $DB->set_query_id($FoodRS);
+ $Food = $DB->next_record();
- Of course, this example is contrived, but you get the point.
+ Of course, this example is contrived, but you get the point.
-------------------------------------------------------------------------------------
*///---------------------------------------------------------------------------------
if (!extension_loaded('mysqli')) {
- die('Mysqli Extension not loaded.');
+ die('Mysqli Extension not loaded.');
}
function enum_boolean($bool) {
- return $bool == true ? '1' : '0';
+ return $bool == true ? '1' : '0';
}
//Handles escaping
function db_string($String, $DisableWildcards = false) {
- global $DB;
- //Escape
- $String = $DB->escape_str($String);
- //Remove user input wildcards
- if ($DisableWildcards) {
- $String = str_replace(array('%','_'), array('\%','\_'), $String);
- }
- return $String;
+ global $DB;
+ //Escape
+ $String = $DB->escape_str($String);
+ //Remove user input wildcards
+ if ($DisableWildcards) {
+ $String = str_replace(array('%','_'), array('\%','\_'), $String);
+ }
+ return $String;
}
-function db_array($Array, $DontEscape = array(), $Quote = false) {
- foreach ($Array as $Key => $Val) {
- if (!in_array($Key, $DontEscape)) {
- if ($Quote) {
- $Array[$Key] = '\''.db_string(trim($Val)).'\'';
- } else {
- $Array[$Key] = db_string(trim($Val));
- }
- }
- }
- return $Array;
+function db_array($Array, $DontEscape = [], $Quote = false) {
+ foreach ($Array as $Key => $Val) {
+ if (!in_array($Key, $DontEscape)) {
+ if ($Quote) {
+ $Array[$Key] = '\''.db_string(trim($Val)).'\'';
+ } else {
+ $Array[$Key] = db_string(trim($Val));
+ }
+ }
+ }
+ return $Array;
}
//TODO: revisit access levels once Drone is replaced by ZeRobot
class DB_MYSQL {
- /** @var mysqli|bool */
- public $LinkID = false;
- /** @var mysqli_result|bool */
- protected $QueryID = false;
- protected $Record = array();
- protected $Row;
- protected $Errno = 0;
- protected $Error = '';
-
- protected $PreparedQuery = null;
- protected $Statement = null;
-
- public $Queries = array();
- public $Time = 0.0;
-
- protected $Database = '';
- protected $Server = '';
- protected $User = '';
- protected $Pass = '';
- protected $Port = 0;
- protected $Socket = '';
-
- function __construct($Database = SQLDB, $User = SQLLOGIN, $Pass = SQLPASS, $Server = SQLHOST, $Port = SQLPORT, $Socket = SQLSOCK) {
- $this->Database = $Database;
- $this->Server = $Server;
- $this->User = $User;
- $this->Pass = $Pass;
- $this->Port = $Port;
- $this->Socket = $Socket;
- }
-
- function halt($Msg) {
- global $Debug, $argv;
- $DBError = 'MySQL: '.strval($Msg).' SQL error: '.strval($this->Errno).' ('.strval($this->Error).')';
- if ($this->Errno == 1194) {
- send_irc('PRIVMSG '.ADMIN_CHAN.' :'.$this->Error);
- }
- /*if ($this->Errno == 1194) {
- preg_match("Table '(\S+)' is marked as crashed and should be repaired", $this->Error, $Matches);
- } */
- $Debug->analysis('!dev DB Error', $DBError, 3600 * 24);
- if (DEBUG_MODE || check_perms('site_debug') || isset($argv[1])) {
- echo '
+ Recommend to:
+
+
+
+
+ '.display_str($DBError).''; - if (DEBUG_MODE || check_perms('site_debug')) { - print_r($this->Queries); - } - die(); - } else { - error('-1'); - } - } - - function connect() { - if (!$this->LinkID) { - $this->LinkID = mysqli_connect($this->Server, $this->User, $this->Pass, $this->Database, $this->Port, $this->Socket); // defined in config.php - if (!$this->LinkID) { - $this->Errno = mysqli_connect_errno(); - $this->Error = mysqli_connect_error(); - $this->halt('Connection failed (host:'.$this->Server.':'.$this->Port.')'); - } - } - } - - private function setup_query() { - /* - * If there was a previous query, we store the warnings. We cannot do - * this immediately after mysqli_query because mysqli_insert_id will - * break otherwise due to mysqli_get_warnings sending a SHOW WARNINGS; - * query. When sending a query, however, we're sure that we won't call - * mysqli_insert_id (or any similar function, for that matter) later on, - * so we can safely get the warnings without breaking things. - * Note that this means that we have to call $this->warnings manually - * for the last query! - */ - if ($this->QueryID) { - $this->warnings(); - } - - $this->connect(); - } - - /** - * Runs a raw query assuming pre-sanitized input. However, attempting to self sanitize (such - * as via db_string) is still not as safe for using prepared statements so for queries - * involving user input, you really should not use this function (instead opting for - * prepare_query) {@See DB_MYSQL::prepare_query} - * - * When running a batch of queries using the same statement - * with a variety of inputs, it's more performant to reuse the statement - * with {@see DB_MYSQL::prepare} and {@see DB_MYSQL::execute} - * - * @return mysqli_result|bool Returns a mysqli_result object - * for successful SELECT queries, - * or TRUE for other successful DML queries - * or FALSE on failure. - * - * @param $Query - * @param int $AutoHandle - * @return mysqli_result|bool - */ - function query($Query, $AutoHandle=1) { - $this->setup_query(); - $LinkID = &$this->LinkID; - - $Closure = function() use ($LinkID, $Query) { - return mysqli_query($this->LinkID, $Query); - }; - - return $this->attempt_query($Query, $Closure, $AutoHandle); - } - - /** - * Prepares an SQL statement for execution with data. - * - * Normally, you'll most likely just want to be using - * DB_MYSQL::prepared_query to call both DB_MYSQL::prepare - * and DB_MYSQL::execute for one-off queries, you can use - * this separately in the case where you plan to be running - * this query repeatedly while just changing the bound - * parameters (such as if doing a bulk update or the like). - * - * @return mysqli_stmt|bool Returns a statement object - * or FALSE if an error occurred. - */ - function prepare($Query) { - $this->setup_query(); - $this->PreparedQuery = $Query; - $this->Statement = $this->LinkID->prepare($Query); - if ($this->Statement === false) { - $this->halt('Invalid Query: ' . mysqli_error($this->LinkID)); - } - return $this->Statement; - } - - /** - * Bind variables to our last prepared query and execute it. - * - * Variables that are passed into the function will have their - * type automatically set for how to bind it to the query (either - * integer (i), double (d), or string (s)). - * - * @param array $Parameters,... variables for the query - * @return mysqli_result|bool Returns a mysqli_result object - * for successful SELECT queries, - * or TRUE for other successful DML queries - * or FALSE on failure. - */ - function execute(...$Parameters) { - /** @var mysqli_stmt $Statement */ - $Statement = &$this->Statement; - - if (count($Parameters) > 0) { - $Binders = ""; - foreach ($Parameters as $Parameter) { - if (is_integer($Parameter)) { - $Binders .= "i"; - } - elseif (is_double($Parameter)) { - $Binders .= "d"; - } - else { - $Binders .= "s"; - } - } - $Statement->bind_param($Binders, ...$Parameters); - } - - $Closure = function() use ($Statement) { - $Statement->execute(); - return $Statement->get_result(); - }; - - $Query = "Prepared Statement: {$this->PreparedQuery}\n"; - foreach ($Parameters as $key => $value) { - $Query .= "$key => $value\n"; - } - - - return $this->attempt_query($Query, $Closure); - } - - /** - * Prepare and execute a prepared query returning the result set. - * - * Utility function that wraps DB_MYSQL::prepare and DB_MYSQL::execute - * as most times, the query is going to be one-off and this will save - * on keystrokes. If you do plan to be executing a prepared query - * multiple times with different bound parameters, you'll want to call - * the two functions separately instead of this function. - * - * @param $Query - * @param array ...$Parameters - * @return bool|mysqli_result - */ - function prepared_query($Query, ...$Parameters) { - $this->prepare($Query); - return $this->execute(...$Parameters); - } - - function prepared_query_array($Query, array $args) { - $this->prepare($Query); - $param = []; - $bind = ''; - $n = count($args); - for ($i = 0; $i < $n; ++$i) { - if (is_integer($args[$i])) { - $bind .= 'i'; - } - elseif (is_double($args[$i])) { - $bind .= 'd'; - } - else { - $bind .= 's'; - } - $param[] = &$args[$i]; - } - $refbind = &$bind; - array_unshift($param, $refbind); - $stmt = &$this->Statement; - call_user_func_array([$this->Statement, "bind_param"], $param); - - return $this->attempt_query( - $Query, - function() use ($stmt) { - $stmt->execute(); - return $stmt->get_result(); - } - ); - } - - private function attempt_query($Query, Callable $Closure, $AutoHandle=1) { - global $Debug; - $QueryStartTime = microtime(true); - // In the event of a MySQL deadlock, we sleep allowing MySQL time to unlock, then attempt again for a maximum of 5 tries - for ($i = 1; $i < 6; $i++) { - $this->QueryID = $Closure(); - if (!in_array(mysqli_errno($this->LinkID), array(1213, 1205))) { - break; - } - $Debug->analysis('Non-Fatal Deadlock:', $Query, 3600 * 24); - trigger_error("Database deadlock, attempt $i"); - - sleep($i * rand(2, 5)); // Wait longer as attempts increase - } - $QueryEndTime = microtime(true); - // Kills admin pages, and prevents Debug->analysis when the whole set exceeds 1 MB - if (($Len = strlen($Query))>16384) { - $Query = substr($Query, 0, 16384).'... '.($Len-16384).' bytes trimmed'; - } - $this->Queries[] = array($Query, ($QueryEndTime - $QueryStartTime) * 1000, null); - $this->Time += ($QueryEndTime - $QueryStartTime) * 1000; - - // Update/Insert/etc statements for prepared queries don't return a QueryID, - // but mysqli_errno is also going to be 0 for no error - $this->Errno = mysqli_errno($this->LinkID); - if (!$this->QueryID && $this->Errno !== 0) { - $this->Error = mysqli_error($this->LinkID); - - if ($AutoHandle) { - $this->halt("Invalid Query: $Query"); - } else { - return $this->Errno; - } - } - - $this->Row = 0; - if ($AutoHandle) { - return $this->QueryID; - } - } - - function query_unb($Query) { - $this->connect(); - mysqli_real_query($this->LinkID, $Query); - } - - function inserted_id() { - if ($this->LinkID) { - return mysqli_insert_id($this->LinkID); - } - } - - function next_record($Type = MYSQLI_BOTH, $Escape = true, $Reverse = false) { - // $Escape can be true, false, or an array of keys to not escape - // If $Reverse is true, then $Escape is an array of keys to escape - if ($this->LinkID) { - $this->Record = mysqli_fetch_array($this->QueryID, $Type); - $this->Row++; - if (!is_array($this->Record)) { - $this->QueryID = false; - } elseif ($Escape !== false) { - $this->Record = Misc::display_array($this->Record, $Escape, $Reverse); - } - return $this->Record; - } - return null; - } - - /** - * Fetches next record from the result set of the previously executed query. - * - * Utility around next_record where we just return the array as MYSQLI_BOTH - * and require the user to explicitly define which columns to define (as opposed - * to all columns always being escaped, which is a bad sort of lazy). Things that - * need to be escaped are strings that users input (with any characters) and - * are not displayed inside a textarea or input field. - * - * @param mixed $Escape Boolean true/false for escaping entire/none of query - * or can be an array of array keys for what columns to escape - * @return array next result set if exists - */ - function fetch_record(...$Escape) { - if (count($Escape) === 1 && $Escape[0] === true) { - $Escape = true; - } - elseif (count($Escape) === 0) { - $Escape = false; - } - return $this->next_record(MYSQLI_BOTH, $Escape, true); - } - - function close() { - if ($this->LinkID) { - if (!mysqli_close($this->LinkID)) { - $this->halt('Cannot close connection or connection did not open.'); - } - $this->LinkID = false; - } - } - - /* - * returns an integer with the number of rows found - * returns a string if the number of rows found exceeds MAXINT - */ - function record_count() { - if ($this->QueryID) { - return mysqli_num_rows($this->QueryID); - } - } - - /* - * returns true if the query exists and there were records found - * returns false if the query does not exist or if there were 0 records returned - */ - function has_results() { - return ($this->QueryID && $this->record_count() !== 0); - } - - function affected_rows() { - if ($this->LinkID) { - return $this->LinkID->affected_rows; - } - } - - function info() { - return mysqli_get_host_info($this->LinkID); - } - - // You should use db_string() instead. - function escape_str($Str) { - $this->connect(); - if (is_array($Str)) { - trigger_error('Attempted to escape array.'); - return ''; - } - return mysqli_real_escape_string($this->LinkID, $Str); - } - - // Creates an array from a result set - // If $Key is set, use the $Key column in the result set as the array key - // Otherwise, use an integer - function to_array($Key = false, $Type = MYSQLI_BOTH, $Escape = true) { - $Return = array(); - while ($Row = mysqli_fetch_array($this->QueryID, $Type)) { - if ($Escape !== false) { - $Row = Misc::display_array($Row, $Escape); - } - if ($Key !== false) { - $Return[$Row[$Key]] = $Row; - } else { - $Return[] = $Row; - } - } - mysqli_data_seek($this->QueryID, 0); - return $Return; - } - - // Loops through the result set, collecting the $ValField column into an array with $KeyField as keys - function to_pair($KeyField, $ValField, $Escape = true) { - $Return = array(); - while ($Row = mysqli_fetch_array($this->QueryID)) { - if ($Escape) { - $Key = display_str($Row[$KeyField]); - $Val = display_str($Row[$ValField]); - } else { - $Key = $Row[$KeyField]; - $Val = $Row[$ValField]; - } - $Return[$Key] = $Val; - } - mysqli_data_seek($this->QueryID, 0); - return $Return; - } - - // Loops through the result set, collecting the $Key column into an array - function collect($Key, $Escape = true) { - $Return = array(); - while ($Row = mysqli_fetch_array($this->QueryID)) { - $Return[] = $Escape ? display_str($Row[$Key]) : $Row[$Key]; - } - mysqli_data_seek($this->QueryID, 0); - return $Return; - } - - function set_query_id(&$ResultSet) { - $this->QueryID = $ResultSet; - $this->Row = 0; - } - - function get_query_id() { - return $this->QueryID; - } - - function beginning() { - mysqli_data_seek($this->QueryID, 0); - $this->Row = 0; - } - - /** - * This function determines whether the last query caused warning messages - * and stores them in $this->Queries. - */ - function warnings() { - $Warnings = array(); - if ($this->LinkID !== false && mysqli_warning_count($this->LinkID)) { - $e = mysqli_get_warnings($this->LinkID); - do { - if ($e->errno == 1592) { - // 1592: Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. - continue; - } - $Warnings[] = 'Code ' . $e->errno . ': ' . display_str($e->message); - } while ($e->next()); - } - $this->Queries[count($this->Queries) - 1][2] = $Warnings; - } - - function begin_transaction() { - mysqli_begin_transaction($this->LinkID); - } - - function commit() { - mysqli_commit($this->LinkID); - } - - function rollback() { - mysqli_rollback($this->LinkID); - } + /** @var mysqli|bool */ + public $LinkID = false; + /** @var mysqli_result|bool */ + protected $QueryID = false; + protected $Record = []; + protected $Row; + protected $Errno = 0; + protected $Error = ''; + + protected $PreparedQuery = null; + protected $Statement = null; + + public $Queries = []; + public $Time = 0.0; + + protected $Database = ''; + protected $Server = ''; + protected $User = ''; + protected $Pass = ''; + protected $Port = 0; + protected $Socket = ''; + + function __construct($Database = SQLDB, $User = SQLLOGIN, $Pass = SQLPASS, $Server = SQLHOST, $Port = SQLPORT, $Socket = SQLSOCK) { + $this->Database = $Database; + $this->Server = $Server; + $this->User = $User; + $this->Pass = $Pass; + $this->Port = $Port; + $this->Socket = $Socket; + } + + function halt($Msg) { + global $Debug, $argv; + $DBError = 'MySQL: '.strval($Msg).' SQL error: '.strval($this->Errno).' ('.strval($this->Error).')'; + if ($this->Errno == 1194) { + send_irc('PRIVMSG '.ADMIN_CHAN.' :'.$this->Error); + } + /*if ($this->Errno == 1194) { + preg_match("Table '(\S+)' is marked as crashed and should be repaired", $this->Error, $Matches); + } */ + $Debug->analysis('!dev DB Error', $DBError, 3600 * 24); + if (DEBUG_MODE || check_perms('site_debug') || isset($argv[1])) { + echo '
'.display_str($DBError).''; + if (DEBUG_MODE || check_perms('site_debug')) { + print_r($this->Queries); + } + die(); + } else { + error('-1'); + } + } + + function connect() { + if (!$this->LinkID) { + $this->LinkID = mysqli_connect($this->Server, $this->User, $this->Pass, $this->Database, $this->Port, $this->Socket); // defined in config.php + if (!$this->LinkID) { + $this->Errno = mysqli_connect_errno(); + $this->Error = mysqli_connect_error(); + $this->halt('Connection failed (host:'.$this->Server.':'.$this->Port.')'); + } + } + } + + private function setup_query() { + /* + * If there was a previous query, we store the warnings. We cannot do + * this immediately after mysqli_query because mysqli_insert_id will + * break otherwise due to mysqli_get_warnings sending a SHOW WARNINGS; + * query. When sending a query, however, we're sure that we won't call + * mysqli_insert_id (or any similar function, for that matter) later on, + * so we can safely get the warnings without breaking things. + * Note that this means that we have to call $this->warnings manually + * for the last query! + */ + if ($this->QueryID) { + $this->warnings(); + } + + $this->connect(); + } + + /** + * Runs a raw query assuming pre-sanitized input. However, attempting to self sanitize (such + * as via db_string) is still not as safe for using prepared statements so for queries + * involving user input, you really should not use this function (instead opting for + * prepared_query) {@See DB_MYSQL::prepared_query} + * + * When running a batch of queries using the same statement + * with a variety of inputs, it's more performant to reuse the statement + * with {@see DB_MYSQL::prepare} and {@see DB_MYSQL::execute} + * + * @return mysqli_result|bool Returns a mysqli_result object + * for successful SELECT queries, + * or TRUE for other successful DML queries + * or FALSE on failure. + * + * @param $Query + * @param int $AutoHandle + * @return mysqli_result|bool + */ + function query($Query, $AutoHandle=1) { + $this->setup_query(); + $LinkID = &$this->LinkID; + + $Closure = function() use ($LinkID, $Query) { + return mysqli_query($this->LinkID, $Query); + }; + + return $this->attempt_query($Query, $Closure, $AutoHandle); + } + + /** + * Prepares an SQL statement for execution with data. + * + * Normally, you'll most likely just want to be using + * DB_MYSQL::prepared_query to call both DB_MYSQL::prepare + * and DB_MYSQL::execute for one-off queries, you can use + * this separately in the case where you plan to be running + * this query repeatedly while just changing the bound + * parameters (such as if doing a bulk update or the like). + * + * @return mysqli_stmt|bool Returns a statement object + * or FALSE if an error occurred. + */ + function prepare($Query) { + $this->setup_query(); + $this->PreparedQuery = $Query; + $this->Statement = $this->LinkID->prepare($Query); + if ($this->Statement === false) { + $this->halt("Invalid Query: [$Query] " . mysqli_error($this->LinkID)); + } + return $this->Statement; + } + + /** + * Bind variables to our last prepared query and execute it. + * + * Variables that are passed into the function will have their + * type automatically set for how to bind it to the query (either + * integer (i), double (d), or string (s)). + * + * @param array $Parameters,... variables for the query + * @return mysqli_result|bool Returns a mysqli_result object + * for successful SELECT queries, + * or TRUE for other successful DML queries + * or FALSE on failure. + */ + function execute(...$Parameters) { + /** @var mysqli_stmt $Statement */ + $Statement = &$this->Statement; + + if (count($Parameters) > 0) { + $Binders = ""; + foreach ($Parameters as $Parameter) { + if (is_integer($Parameter)) { + $Binders .= "i"; + } + elseif (is_double($Parameter)) { + $Binders .= "d"; + } + else { + $Binders .= "s"; + } + } + $Statement->bind_param($Binders, ...$Parameters); + } + + $Closure = function() use ($Statement) { + $Statement->execute(); + return $Statement->get_result(); + }; + + $Query = "$this->PreparedQuery\n"; + foreach ($Parameters as $key => $value) { + $Query .= "$key => $value\n"; + } + + + return $this->attempt_query($Query, $Closure); + } + + /** + * Prepare and execute a prepared query returning the result set. + * + * Utility function that wraps DB_MYSQL::prepare and DB_MYSQL::execute + * as most times, the query is going to be one-off and this will save + * on keystrokes. If you do plan to be executing a prepared query + * multiple times with different bound parameters, you'll want to call + * the two functions separately instead of this function. + * + * @param $Query + * @param array ...$Parameters + * @return bool|mysqli_result + */ + function prepared_query($Query, ...$Parameters) { + $this->prepare($Query); + return $this->execute(...$Parameters); + } + + function prepared_query_array($Query, array $args) { + $this->prepare($Query); + $param = []; + $bind = ''; + $n = count($args); + for ($i = 0; $i < $n; ++$i) { + if (is_integer($args[$i])) { + $bind .= 'i'; + } + elseif (is_double($args[$i])) { + $bind .= 'd'; + } + else { + $bind .= 's'; + } + $param[] = &$args[$i]; + } + $refbind = &$bind; + array_unshift($param, $refbind); + $stmt = &$this->Statement; + call_user_func_array([$this->Statement, "bind_param"], $param); + + return $this->attempt_query( + $Query, + function() use ($stmt) { + $stmt->execute(); + return $stmt->get_result(); + } + ); + } + + private function attempt_query($Query, Callable $Closure, $AutoHandle=1) { + global $Debug; + $QueryStartTime = microtime(true); + // In the event of a MySQL deadlock, we sleep allowing MySQL time to unlock, then attempt again for a maximum of 5 tries + for ($i = 1; $i < 6; $i++) { + $this->QueryID = $Closure(); + if (!in_array(mysqli_errno($this->LinkID), array(1213, 1205))) { + break; + } + $Debug->analysis('Non-Fatal Deadlock:', $Query, 3600 * 24); + trigger_error("Database deadlock, attempt $i"); + + sleep($i * rand(2, 5)); // Wait longer as attempts increase + } + $QueryEndTime = microtime(true); + // Kills admin pages, and prevents Debug->analysis when the whole set exceeds 1 MB + if (($Len = strlen($Query))>16384) { + $Query = substr($Query, 0, 16384).'... '.($Len-16384).' bytes trimmed'; + } + $this->Queries[] = array($Query, ($QueryEndTime - $QueryStartTime) * 1000, null); + $this->Time += ($QueryEndTime - $QueryStartTime) * 1000; + + // Update/Insert/etc statements for prepared queries don't return a QueryID, + // but mysqli_errno is also going to be 0 for no error + $this->Errno = mysqli_errno($this->LinkID); + if (!$this->QueryID && $this->Errno !== 0) { + $this->Error = mysqli_error($this->LinkID); + + if ($AutoHandle) { + $this->halt("Invalid Query: $Query"); + } else { + return $this->Errno; + } + } + + $this->Row = 0; + if ($AutoHandle) { + return $this->QueryID; + } + } + + function query_unb($Query) { + $this->connect(); + mysqli_real_query($this->LinkID, $Query); + } + + function inserted_id() { + if ($this->LinkID) { + return mysqli_insert_id($this->LinkID); + } + } + + function next_record($Type = MYSQLI_BOTH, $Escape = true, $Reverse = false) { + // $Escape can be true, false, or an array of keys to not escape + // If $Reverse is true, then $Escape is an array of keys to escape + if ($this->LinkID) { + $this->Record = mysqli_fetch_array($this->QueryID, $Type); + $this->Row++; + if (!is_array($this->Record)) { + $this->QueryID = false; + } elseif ($Escape !== false) { + $this->Record = Misc::display_array($this->Record, $Escape, $Reverse); + } + return $this->Record; + } + return null; + } + + /** + * Fetches next record from the result set of the previously executed query. + * + * Utility around next_record where we just return the array as MYSQLI_BOTH + * and require the user to explicitly define which columns to define (as opposed + * to all columns always being escaped, which is a bad sort of lazy). Things that + * need to be escaped are strings that users input (with any characters) and + * are not displayed inside a textarea or input field. + * + * @param mixed $Escape Boolean true/false for escaping entire/none of query + * or can be an array of array keys for what columns to escape + * @return array next result set if exists + */ + function fetch_record(...$Escape) { + if (count($Escape) === 1 && $Escape[0] === true) { + $Escape = true; + } + elseif (count($Escape) === 0) { + $Escape = false; + } + return $this->next_record(MYSQLI_BOTH, $Escape, true); + } + + function close() { + if ($this->LinkID) { + if (!mysqli_close($this->LinkID)) { + $this->halt('Cannot close connection or connection did not open.'); + } + $this->LinkID = false; + } + } + + /* + * returns an integer with the number of rows found + * returns a string if the number of rows found exceeds MAXINT + */ + function record_count() { + if ($this->QueryID) { + return mysqli_num_rows($this->QueryID); + } + } + + /* + * returns true if the query exists and there were records found + * returns false if the query does not exist or if there were 0 records returned + */ + function has_results() { + return ($this->QueryID && $this->record_count() !== 0); + } + + function affected_rows() { + if ($this->LinkID) { + return $this->LinkID->affected_rows; + } + } + + function info() { + return mysqli_get_host_info($this->LinkID); + } + + // You should use db_string() instead. + function escape_str($Str) { + $this->connect(); + if (is_array($Str)) { + trigger_error('Attempted to escape array.'); + return ''; + } + return mysqli_real_escape_string($this->LinkID, $Str); + } + + // Creates an array from a result set + // If $Key is set, use the $Key column in the result set as the array key + // Otherwise, use an integer + function to_array($Key = false, $Type = MYSQLI_BOTH, $Escape = true) { + $Return = []; + while ($Row = mysqli_fetch_array($this->QueryID, $Type)) { + if ($Escape !== false) { + $Row = Misc::display_array($Row, $Escape); + } + if ($Key !== false) { + $Return[$Row[$Key]] = $Row; + } else { + $Return[] = $Row; + } + } + mysqli_data_seek($this->QueryID, 0); + return $Return; + } + + // Loops through the result set, collecting the $ValField column into an array with $KeyField as keys + function to_pair($KeyField, $ValField, $Escape = true) { + $Return = []; + while ($Row = mysqli_fetch_array($this->QueryID)) { + if ($Escape) { + $Key = display_str($Row[$KeyField]); + $Val = display_str($Row[$ValField]); + } else { + $Key = $Row[$KeyField]; + $Val = $Row[$ValField]; + } + $Return[$Key] = $Val; + } + mysqli_data_seek($this->QueryID, 0); + return $Return; + } + + // Loops through the result set, collecting the $Key column into an array + function collect($Key, $Escape = true) { + $Return = []; + while ($Row = mysqli_fetch_array($this->QueryID)) { + $Return[] = $Escape ? display_str($Row[$Key]) : $Row[$Key]; + } + mysqli_data_seek($this->QueryID, 0); + return $Return; + } + + function set_query_id(&$ResultSet) { + $this->QueryID = $ResultSet; + $this->Row = 0; + } + + function get_query_id() { + return $this->QueryID; + } + + function beginning() { + mysqli_data_seek($this->QueryID, 0); + $this->Row = 0; + } + + /** + * This function determines whether the last query caused warning messages + * and stores them in $this->Queries. + */ + function warnings() { + $Warnings = []; + if ($this->LinkID !== false && mysqli_warning_count($this->LinkID)) { + $e = mysqli_get_warnings($this->LinkID); + do { + if ($e->errno == 1592) { + // 1592: Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. + continue; + } + $Warnings[] = 'Code ' . $e->errno . ': ' . display_str($e->message); + } while ($e->next()); + } + $this->Queries[count($this->Queries) - 1][2] = $Warnings; + } + + function begin_transaction() { + mysqli_begin_transaction($this->LinkID); + } + + function commit() { + mysqli_commit($this->LinkID); + } + + function rollback() { + mysqli_rollback($this->LinkID); + } } diff --git a/classes/notificationsmanager.class.php b/classes/notificationsmanager.class.php index afb0efdaa..2e1d4bdc6 100644 --- a/classes/notificationsmanager.class.php +++ b/classes/notificationsmanager.class.php @@ -1,800 +1,800 @@ - self::IMPORTANT, - 'critical' => self::CRITICAL, - 'warning' => self::WARNING, - 'info' => self::INFO); - - // Types. These names must correspond to column names in users_notifications_settings - const NEWS = 'News'; - const BLOG = 'Blog'; - const STAFFBLOG = 'StaffBlog'; - const STAFFPM = 'StaffPM'; - const INBOX = 'Inbox'; - const QUOTES = 'Quotes'; - const SUBSCRIPTIONS = 'Subscriptions'; - const TORRENTS = 'Torrents'; - const COLLAGES = 'Collages'; - const SITEALERTS = 'SiteAlerts'; - const FORUMALERTS = 'ForumAlerts'; - const REQUESTALERTS = 'RequestAlerts'; - const COLLAGEALERTS = 'CollageAlerts'; - const TORRENTALERTS = 'TorrentAlerts'; - const GLOBALNOTICE = 'Global'; - - public static $Types = array( - 'News', - 'Blog', - 'StaffPM', - 'Inbox', - 'Quotes', - 'Subscriptions', - 'Torrents', - 'Collages', - 'SiteAlerts', - 'ForumAlerts', - 'RequestAlerts', - 'CollageAlerts', - 'TorrentAlerts'); - - private $UserID; - private $Notifications; - private $Settings; - private $Skipped; - - function __construct($UserID, $Skip = array(), $Load = true, $AutoSkip = true) { - $this->UserID = $UserID; - $this->Notifications = array(); - $this->Settings = self::get_settings($UserID); - $this->Skipped = $Skip; - if ($AutoSkip) { - foreach ($this->Settings as $Key => $Value) { - // Skip disabled and traditional settings - if ($Value == self::OPT_DISABLED || $this->is_traditional($Key)) { - $this->Skipped[$Key] = true; - } - } - } - if ($Load) { - $this->load_global_notification(); - if (!isset($this->Skipped[self::NEWS])) { - $this->load_news(); - } - if (!isset($this->Skipped[self::BLOG])) { - $this->load_blog(); - } - // if (!isset($this->Skipped[self::STAFFBLOG])) { - // $this->load_staff_blog(); - // } - if (!isset($this->Skipped[self::STAFFPM])) { - $this->load_staff_pms(); - } - if (!isset($this->Skipped[self::INBOX])) { - $this->load_inbox(); - } - if (!isset($this->Skipped[self::TORRENTS])) { - $this->load_torrent_notifications(); - } - if (!isset($this->Skipped[self::COLLAGES])) { - $this->load_collage_subscriptions(); - } - if (!isset($this->Skipped[self::QUOTES])) { - $this->load_quote_notifications(); - } - if (!isset($this->Skipped[self::SUBSCRIPTIONS])) { - $this->load_subscriptions(); - } - // $this->load_one_reads(); // The code that sets these notices is commented out. - } - } - - public function get_notifications() { - return $this->Notifications; - } - - public function clear_notifications_array() { - unset($this->Notifications); - $this->Notifications = array(); - } - - private function create_notification($Type, $ID, $Message, $URL, $Importance) { - $this->Notifications[$Type] = array( - 'id' => (int)$ID, - 'message' => $Message, - 'url' => $URL, - 'importance' => $Importance); - } - - public static function notify_user($UserID, $Type, $Message, $URL, $Importance = self::INFO) { - self::notify_users(array($UserID), $Type, $Message, $URL, $Importance); - } - - public static function notify_users($UserIDs, $Type, $Message, $URL, $Importance = self::INFO) { - /** - if (!isset($Importance)) { - $Importance = self::INFO; - } - $Type = db_string($Type); - if (!empty($UserIDs)) { - $UserIDs = implode(',', $UserIDs); - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - SELECT UserID - FROM users_notifications_settings - WHERE $Type != 0 - AND UserID IN ($UserIDs)"); - $UserIDs = array(); - while (list($ID) = G::$DB->next_record()) { - $UserIDs[] = $ID; - } - G::$DB->set_query_id($QueryID); - foreach ($UserIDs as $UserID) { - $OneReads = G::$Cache->get_value("notifications_one_reads_$UserID"); - if (!$OneReads) { - $OneReads = array(); - } - array_unshift($OneReads, $this->create_notification($OneReads, "oneread_" . uniqid(), null, $Message, $URL, $Importance)); - $OneReads = array_filter($OneReads); - G::$Cache->cache_value("notifications_one_reads_$UserID", $OneReads, 0); - } - } - **/ - } - - public static function get_notification_enabled_users($Type, $UserID) { - $Type = db_string($Type); - $UserWhere = ''; - if (isset($UserID)) { - $UserID = (int)$UserID; - $UserWhere = " AND UserID = '$UserID'"; - } - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - SELECT UserID - FROM users_notifications_settings - WHERE $Type != 0 - $UserWhere"); - $IDs = array(); - while (list($ID) = G::$DB->next_record()) { - $IDs[] = $ID; - } - G::$DB->set_query_id($QueryID); - return $IDs; - } - - public function load_one_reads() { - $OneReads = G::$Cache->get_value('notifications_one_reads_' . G::$LoggedUser['ID']); - if (is_array($OneReads)) { - $this->Notifications = $this->Notifications + $OneReads; - } - } - - public static function clear_one_read($ID) { - $OneReads = G::$Cache->get_value('notifications_one_reads_' . G::$LoggedUser['ID']); - if ($OneReads) { - unset($OneReads[$ID]); - if (count($OneReads) > 0) { - G::$Cache->cache_value('notifications_one_reads_' . G::$LoggedUser['ID'], $OneReads, 0); - } else { - G::$Cache->delete_value('notifications_one_reads_' . G::$LoggedUser['ID']); - } - } - - } - - public function load_global_notification() { - $GlobalNotification = G::$Cache->get_value('global_notification'); - if ($GlobalNotification) { - $Read = G::$Cache->get_value('user_read_global_' . G::$LoggedUser['ID']); - if (!$Read) { - $this->create_notification(self::GLOBALNOTICE, 0, $GlobalNotification['Message'], $GlobalNotification['URL'], $GlobalNotification['Importance']); - } - } - } - - public static function get_global_notification() { - return G::$Cache->get_value('global_notification'); - } - - public static function set_global_notification($Message, $URL, $Importance, $Expiration) { - if (empty($Message) || empty($Expiration)) { - error('Error setting notification'); - } - G::$Cache->cache_value('global_notification', array("Message" => $Message, "URL" => $URL, "Importance" => $Importance, "Expiration" => $Expiration), $Expiration); - } - - public static function delete_global_notification() { - G::$Cache->delete_value('global_notification'); - } - - public static function clear_global_notification() { - $GlobalNotification = G::$Cache->get_value('global_notification'); - if ($GlobalNotification) { - // This is some trickery - // since we can't know which users have the read cache key set - // we set the expiration time of their cache key to that of the length of the notification - // this gaurantees that their cache key will expire after the notification expires - G::$Cache->cache_value('user_read_global_' . G::$LoggedUser['ID'], true, $GlobalNotification['Expiration']); - } - } - - public function load_news() { - $MyNews = G::$LoggedUser['LastReadNews']; - $CurrentNews = G::$Cache->get_value('news_latest_id'); - $Title = G::$Cache->get_value('news_latest_title'); - if ($CurrentNews === false || $Title === false) { - $QueryID = G::$DB->get_query_id(); - G::$DB->query(' - SELECT ID, Title - FROM news - ORDER BY Time DESC - LIMIT 1'); - if (G::$DB->has_results()) { - list($CurrentNews, $Title) = G::$DB->next_record(); - } else { - $CurrentNews = -1; - } - G::$DB->set_query_id($QueryID); - G::$Cache->cache_value('news_latest_id', $CurrentNews, 0); - G::$Cache->cache_value('news_latest_title', $Title, 0); - } - if ($MyNews < $CurrentNews) { - $this->create_notification(self::NEWS, $CurrentNews, "Announcement: $Title", "index.php#news$CurrentNews", self::IMPORTANT); - } - } - - public function load_blog() { - $MyBlog = G::$LoggedUser['LastReadBlog']; - $CurrentBlog = G::$Cache->get_value('blog_latest_id'); - $Title = G::$Cache->get_value('blog_latest_title'); - if ($CurrentBlog === false) { - $QueryID = G::$DB->get_query_id(); - G::$DB->query(' - SELECT ID, Title - FROM blog - WHERE Important = 1 - ORDER BY Time DESC - LIMIT 1'); - if (G::$DB->has_results()) { - list($CurrentBlog, $Title) = G::$DB->next_record(); - } else { - $CurrentBlog = -1; - } - G::$DB->set_query_id($QueryID); - G::$Cache->cache_value('blog_latest_id', $CurrentBlog, 0); - G::$Cache->cache_value('blog_latest_title', $Title, 0); - } - if ($MyBlog < $CurrentBlog) { - $this->create_notification(self::BLOG, $CurrentBlog, "Blog: $Title", "blog.php#blog$CurrentBlog", self::IMPORTANT); - } - } - - public function load_staff_blog() { - if (check_perms('users_mod')) { - global $SBlogReadTime, $LatestSBlogTime; - if (!$SBlogReadTime && ($SBlogReadTime = G::$Cache->get_value('staff_blog_read_' . G::$LoggedUser['ID'])) === false) { - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - SELECT Time - FROM staff_blog_visits - WHERE UserID = " . G::$LoggedUser['ID']); - if (list($SBlogReadTime) = G::$DB->next_record()) { - $SBlogReadTime = strtotime($SBlogReadTime); - } else { - $SBlogReadTime = 0; - } - G::$DB->set_query_id($QueryID); - G::$Cache->cache_value('staff_blog_read_' . G::$LoggedUser['ID'], $SBlogReadTime, 1209600); - } - if (!$LatestSBlogTime && ($LatestSBlogTime = G::$Cache->get_value('staff_blog_latest_time')) === false) { - $QueryID = G::$DB->get_query_id(); - G::$DB->query(' - SELECT MAX(Time) - FROM staff_blog'); - if (list($LatestSBlogTime) = G::$DB->next_record()) { - $LatestSBlogTime = strtotime($LatestSBlogTime); - } else { - $LatestSBlogTime = 0; - } - G::$DB->set_query_id($QueryID); - G::$Cache->cache_value('staff_blog_latest_time', $LatestSBlogTime, 1209600); - } - if ($SBlogReadTime < $LatestSBlogTime) { - $this->create_notification(self::STAFFBLOG, 0, 'New Staff Blog Post!', 'staffblog.php', self::IMPORTANT); - } - } - } - - public function load_staff_pms() { - $NewStaffPMs = G::$Cache->get_value('staff_pm_new_' . G::$LoggedUser['ID']); - if ($NewStaffPMs === false) { - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - SELECT COUNT(ID) - FROM staff_pm_conversations - WHERE UserID = '" . G::$LoggedUser['ID'] . "' - AND Unread = '1'"); - list($NewStaffPMs) = G::$DB->next_record(); - G::$DB->set_query_id($QueryID); - G::$Cache->cache_value('staff_pm_new_' . G::$LoggedUser['ID'], $NewStaffPMs, 0); - } - - if ($NewStaffPMs > 0) { - $Title = 'You have ' . ($NewStaffPMs == 1 ? 'a' : $NewStaffPMs) . ' new Staff PM' . ($NewStaffPMs > 1 ? 's' : ''); - $this->create_notification(self::STAFFPM, 0, $Title, 'staffpm.php', self::INFO); - } - } - - public function load_inbox() { - $NewMessages = G::$Cache->get_value('inbox_new_' . G::$LoggedUser['ID']); - if ($NewMessages === false) { - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - SELECT COUNT(UnRead) - FROM pm_conversations_users - WHERE UserID = '" . G::$LoggedUser['ID'] . "' - AND UnRead = '1' - AND InInbox = '1'"); - list($NewMessages) = G::$DB->next_record(); - G::$DB->set_query_id($QueryID); - G::$Cache->cache_value('inbox_new_' . G::$LoggedUser['ID'], $NewMessages, 0); - } - - if ($NewMessages > 0) { - $Title = 'You have ' . ($NewMessages == 1 ? 'a' : $NewMessages) . ' new message' . ($NewMessages > 1 ? 's' : ''); - $this->create_notification(self::INBOX, 0, $Title, Inbox::get_inbox_link(), self::INFO); - } - } - - public function load_torrent_notifications() { - if (check_perms('site_torrents_notify')) { - $NewNotifications = G::$Cache->get_value('notifications_new_' . G::$LoggedUser['ID']); - if ($NewNotifications === false) { - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - SELECT COUNT(UserID) - FROM users_notify_torrents - WHERE UserID = ' " . G::$LoggedUser['ID'] . "' - AND UnRead = '1'"); - list($NewNotifications) = G::$DB->next_record(); - G::$DB->set_query_id($QueryID); - G::$Cache->cache_value('notifications_new_' . G::$LoggedUser['ID'], $NewNotifications, 0); - } - } - if ($NewNotifications > 0) { - $Title = 'You have ' . ($NewNotifications == 1 ? 'a' : $NewNotifications) . ' new torrent notification' . ($NewNotifications > 1 ? 's' : ''); - $this->create_notification(self::TORRENTS, 0, $Title, 'torrents.php?action=notify', self::INFO); - } - } - - public function load_collage_subscriptions() { - if (check_perms('site_collages_subscribe')) { - $NewCollages = G::$Cache->get_value('collage_subs_user_new_' . G::$LoggedUser['ID']); - if ($NewCollages === false) { - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - SELECT COUNT(DISTINCT s.CollageID) - FROM users_collage_subs AS s - JOIN collages AS c ON s.CollageID = c.ID - JOIN collages_torrents AS ct ON ct.CollageID = c.ID - WHERE s.UserID = " . G::$LoggedUser['ID'] . " - AND ct.AddedOn > s.LastVisit - AND c.Deleted = '0'"); - list($NewCollages) = G::$DB->next_record(); - G::$DB->set_query_id($QueryID); - G::$Cache->cache_value('collage_subs_user_new_' . G::$LoggedUser['ID'], $NewCollages, 0); - } - if ($NewCollages > 0) { - $Title = 'You have ' . ($NewCollages == 1 ? 'a' : $NewCollages) . ' new collage update' . ($NewCollages > 1 ? 's' : ''); - $this->create_notification(self::COLLAGES, 0, $Title, 'userhistory.php?action=subscribed_collages', self::INFO); - } - } - } - - public function load_quote_notifications() { - if (isset(G::$LoggedUser['NotifyOnQuote']) && G::$LoggedUser['NotifyOnQuote']) { - $QuoteNotificationsCount = Subscriptions::has_new_quote_notifications(); - if ($QuoteNotificationsCount > 0) { - $Title = 'New quote' . ($QuoteNotificationsCount > 1 ? 's' : ''); - $this->create_notification(self::QUOTES, 0, $Title, 'userhistory.php?action=quote_notifications', self::INFO); - } - } - } - - public function load_subscriptions() { - $SubscriptionsCount = Subscriptions::has_new_subscriptions(); - if ($SubscriptionsCount > 0) { - $Title = 'New subscription' . ($SubscriptionsCount > 1 ? 's' : ''); - $this->create_notification(self::SUBSCRIPTIONS, 0, $Title, 'userhistory.php?action=subscriptions', self::INFO); - } - } - - public static function clear_news($News = null) { - $QueryID = G::$DB->get_query_id(); - if (!$News) { - if (!$News = G::$Cache->get_value('news')) { - G::$DB->query(' - SELECT - ID, - Title, - Body, - Time - FROM news - ORDER BY Time DESC - LIMIT 1'); - $News = G::$DB->to_array(false, MYSQLI_NUM, false); - G::$Cache->cache_value('news_latest_id', $News[0][0], 0); - } - } - - if (G::$LoggedUser['LastReadNews'] != $News[0][0]) { - G::$Cache->begin_transaction('user_info_heavy_' . G::$LoggedUser['ID']); - G::$Cache->update_row(false, array('LastReadNews' => $News[0][0])); - G::$Cache->commit_transaction(0); - G::$DB->query(" - UPDATE users_info - SET LastReadNews = '".$News[0][0]."' - WHERE UserID = " . G::$LoggedUser['ID']); - G::$LoggedUser['LastReadNews'] = $News[0][0]; - } - G::$DB->set_query_id($QueryID); - } - - public static function clear_blog($Blog = null) { - $QueryID = G::$DB->get_query_id(); - if (!$Blog) { - if (!$Blog = G::$Cache->get_value('blog')) { - G::$DB->query(" - SELECT - b.ID, - um.Username, - b.UserID, - b.Title, - b.Body, - b.Time, - b.ThreadID - FROM blog AS b - LEFT JOIN users_main AS um ON b.UserID = um.ID - ORDER BY Time DESC - LIMIT 1"); - $Blog = G::$DB->to_array(); - } - } - if (G::$LoggedUser['LastReadBlog'] < $Blog[0][0]) { - G::$Cache->begin_transaction('user_info_heavy_' . G::$LoggedUser['ID']); - G::$Cache->update_row(false, array('LastReadBlog' => $Blog[0][0])); - G::$Cache->commit_transaction(0); - G::$DB->query(" - UPDATE users_info - SET LastReadBlog = '". $Blog[0][0]."' - WHERE UserID = " . G::$LoggedUser['ID']); - G::$LoggedUser['LastReadBlog'] = $Blog[0][0]; - } - G::$DB->set_query_id($QueryID); - } - - public static function clear_staff_pms() { - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - SELECT ID - FROM staff_pm_conversations - WHERE Unread = true - AND UserID = " . G::$LoggedUser['ID']); - $IDs = array(); - while (list($ID) = G::$DB->next_record()) { - $IDs[] = $ID; - } - $IDs = implode(',', $IDs); - if (!empty($IDs)) { - G::$DB->query(" - UPDATE staff_pm_conversations - SET Unread = false - WHERE ID IN ($IDs)"); - } - G::$Cache->delete_value('staff_pm_new_' . G::$LoggedUser['ID']); - G::$DB->set_query_id($QueryID); - } - - public static function clear_inbox() { - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - SELECT ConvID - FROM pm_conversations_users - WHERE Unread = '1' - AND UserID = " . G::$LoggedUser['ID']); - $IDs = array(); - while (list($ID) = G::$DB->next_record()) { - $IDs[] = $ID; - } - $IDs = implode(',', $IDs); - if (!empty($IDs)) { - G::$DB->query(" - UPDATE pm_conversations_users - SET Unread = '0' - WHERE ConvID IN ($IDs) - AND UserID = " . G::$LoggedUser['ID']); - } - G::$Cache->delete_value('inbox_new_' . G::$LoggedUser['ID']); - G::$DB->set_query_id($QueryID); - } - - public static function clear_torrents() { - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - SELECT TorrentID - FROM users_notify_torrents - WHERE UserID = ' " . G::$LoggedUser['ID'] . "' - AND UnRead = '1'"); - $IDs = array(); - while (list($ID) = G::$DB->next_record()) { - $IDs[] = $ID; - } - $IDs = implode(',', $IDs); - if (!empty($IDs)) { - G::$DB->query(" - UPDATE users_notify_torrents - SET Unread = '0' - WHERE TorrentID IN ($IDs) - AND UserID = " . G::$LoggedUser['ID']); - } - G::$Cache->delete_value('notifications_new_' . G::$LoggedUser['ID']); - G::$DB->set_query_id($QueryID); - } - - public static function clear_collages() { - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - UPDATE users_collage_subs - SET LastVisit = NOW() - WHERE UserID = " . G::$LoggedUser['ID']); - G::$Cache->delete_value('collage_subs_user_new_' . G::$LoggedUser['ID']); - G::$DB->set_query_id($QueryID); - } - - public static function clear_quotes() { - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - UPDATE users_notify_quoted - SET UnRead = '0' - WHERE UserID = " . G::$LoggedUser['ID']); - G::$Cache->delete_value('notify_quoted_' . G::$LoggedUser['ID']); - G::$DB->set_query_id($QueryID); - } - - public static function clear_subscriptions() { - $QueryID = G::$DB->get_query_id(); - if (($UserSubscriptions = G::$Cache->get_value('subscriptions_user_' . G::$LoggedUser['ID'])) === false) { - G::$DB->query(" - SELECT TopicID - FROM users_subscriptions - WHERE UserID = " . G::$LoggedUser['ID']); - if ($UserSubscriptions = G::$DB->collect(0)) { - G::$Cache->cache_value('subscriptions_user_' . G::$LoggedUser['ID'], $UserSubscriptions, 0); - } - } - if (!empty($UserSubscriptions)) { - G::$DB->query(" - INSERT INTO forums_last_read_topics (UserID, TopicID, PostID) - SELECT '" . G::$LoggedUser['ID'] . "', ID, LastPostID - FROM forums_topics - WHERE ID IN (".implode(',', $UserSubscriptions).') - ON DUPLICATE KEY UPDATE - PostID = LastPostID'); - } - G::$Cache->delete_value('subscriptions_user_new_' . G::$LoggedUser['ID']); - G::$DB->set_query_id($QueryID); - } + // Option types + const OPT_DISABLED = 0; + const OPT_POPUP = 1; + const OPT_TRADITIONAL = 2; + const OPT_PUSH = 3; + const OPT_POPUP_PUSH = 4; + const OPT_TRADITIONAL_PUSH = 5; + + // Importances + const IMPORTANT = 'information'; + const CRITICAL = 'error'; + const WARNING = 'warning'; + const INFO = 'confirmation'; + + public static $Importances = array( + 'important' => self::IMPORTANT, + 'critical' => self::CRITICAL, + 'warning' => self::WARNING, + 'info' => self::INFO); + + // Types. These names must correspond to column names in users_notifications_settings + const NEWS = 'News'; + const BLOG = 'Blog'; + const STAFFBLOG = 'StaffBlog'; + const STAFFPM = 'StaffPM'; + const INBOX = 'Inbox'; + const QUOTES = 'Quotes'; + const SUBSCRIPTIONS = 'Subscriptions'; + const TORRENTS = 'Torrents'; + const COLLAGES = 'Collages'; + const SITEALERTS = 'SiteAlerts'; + const FORUMALERTS = 'ForumAlerts'; + const REQUESTALERTS = 'RequestAlerts'; + const COLLAGEALERTS = 'CollageAlerts'; + const TORRENTALERTS = 'TorrentAlerts'; + const GLOBALNOTICE = 'Global'; + + public static $Types = array( + 'News', + 'Blog', + 'StaffPM', + 'Inbox', + 'Quotes', + 'Subscriptions', + 'Torrents', + 'Collages', + 'SiteAlerts', + 'ForumAlerts', + 'RequestAlerts', + 'CollageAlerts', + 'TorrentAlerts'); + + private $UserID; + private $Notifications; + private $Settings; + private $Skipped; + + function __construct($UserID, $Skip = array(), $Load = true, $AutoSkip = true) { + $this->UserID = $UserID; + $this->Notifications = array(); + $this->Settings = self::get_settings($UserID); + $this->Skipped = $Skip; + if ($AutoSkip) { + foreach ($this->Settings as $Key => $Value) { + // Skip disabled and traditional settings + if ($Value == self::OPT_DISABLED || $this->is_traditional($Key)) { + $this->Skipped[$Key] = true; + } + } + } + if ($Load) { + $this->load_global_notification(); + if (!isset($this->Skipped[self::NEWS])) { + $this->load_news(); + } + if (!isset($this->Skipped[self::BLOG])) { + $this->load_blog(); + } + // if (!isset($this->Skipped[self::STAFFBLOG])) { + // $this->load_staff_blog(); + // } + if (!isset($this->Skipped[self::STAFFPM])) { + $this->load_staff_pms(); + } + if (!isset($this->Skipped[self::INBOX])) { + $this->load_inbox(); + } + if (!isset($this->Skipped[self::TORRENTS])) { + $this->load_torrent_notifications(); + } + if (!isset($this->Skipped[self::COLLAGES])) { + $this->load_collage_subscriptions(); + } + if (!isset($this->Skipped[self::QUOTES])) { + $this->load_quote_notifications(); + } + if (!isset($this->Skipped[self::SUBSCRIPTIONS])) { + $this->load_subscriptions(); + } + // $this->load_one_reads(); // The code that sets these notices is commented out. + } + } + + public function get_notifications() { + return $this->Notifications; + } + + public function clear_notifications_array() { + unset($this->Notifications); + $this->Notifications = array(); + } + + private function create_notification($Type, $ID, $Message, $URL, $Importance) { + $this->Notifications[$Type] = array( + 'id' => (int)$ID, + 'message' => $Message, + 'url' => $URL, + 'importance' => $Importance); + } + + public static function notify_user($UserID, $Type, $Message, $URL, $Importance = self::INFO) { + self::notify_users(array($UserID), $Type, $Message, $URL, $Importance); + } + + public static function notify_users($UserIDs, $Type, $Message, $URL, $Importance = self::INFO) { + /** + if (!isset($Importance)) { + $Importance = self::INFO; + } + $Type = db_string($Type); + if (!empty($UserIDs)) { + $UserIDs = implode(',', $UserIDs); + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + SELECT UserID + FROM users_notifications_settings + WHERE $Type != 0 + AND UserID IN ($UserIDs)"); + $UserIDs = array(); + while (list($ID) = G::$DB->next_record()) { + $UserIDs[] = $ID; + } + G::$DB->set_query_id($QueryID); + foreach ($UserIDs as $UserID) { + $OneReads = G::$Cache->get_value("notifications_one_reads_$UserID"); + if (!$OneReads) { + $OneReads = array(); + } + array_unshift($OneReads, $this->create_notification($OneReads, "oneread_" . uniqid(), null, $Message, $URL, $Importance)); + $OneReads = array_filter($OneReads); + G::$Cache->cache_value("notifications_one_reads_$UserID", $OneReads, 0); + } + } + **/ + } + + public static function get_notification_enabled_users($Type, $UserID) { + $Type = db_string($Type); + $UserWhere = ''; + if (isset($UserID)) { + $UserID = (int)$UserID; + $UserWhere = " AND UserID = '$UserID'"; + } + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + SELECT UserID + FROM users_notifications_settings + WHERE $Type != 0 + $UserWhere"); + $IDs = array(); + while (list($ID) = G::$DB->next_record()) { + $IDs[] = $ID; + } + G::$DB->set_query_id($QueryID); + return $IDs; + } + + public function load_one_reads() { + $OneReads = G::$Cache->get_value('notifications_one_reads_' . G::$LoggedUser['ID']); + if (is_array($OneReads)) { + $this->Notifications = $this->Notifications + $OneReads; + } + } + + public static function clear_one_read($ID) { + $OneReads = G::$Cache->get_value('notifications_one_reads_' . G::$LoggedUser['ID']); + if ($OneReads) { + unset($OneReads[$ID]); + if (count($OneReads) > 0) { + G::$Cache->cache_value('notifications_one_reads_' . G::$LoggedUser['ID'], $OneReads, 0); + } else { + G::$Cache->delete_value('notifications_one_reads_' . G::$LoggedUser['ID']); + } + } + + } + + public function load_global_notification() { + $GlobalNotification = G::$Cache->get_value('global_notification'); + if ($GlobalNotification) { + $Read = G::$Cache->get_value('user_read_global_' . G::$LoggedUser['ID']); + if (!$Read) { + $this->create_notification(self::GLOBALNOTICE, 0, $GlobalNotification['Message'], $GlobalNotification['URL'], $GlobalNotification['Importance']); + } + } + } + + public static function get_global_notification() { + return G::$Cache->get_value('global_notification'); + } + + public static function set_global_notification($Message, $URL, $Importance, $Expiration) { + if (empty($Message) || empty($Expiration)) { + error('Error setting notification'); + } + G::$Cache->cache_value('global_notification', array("Message" => $Message, "URL" => $URL, "Importance" => $Importance, "Expiration" => $Expiration), $Expiration); + } + + public static function delete_global_notification() { + G::$Cache->delete_value('global_notification'); + } + + public static function clear_global_notification() { + $GlobalNotification = G::$Cache->get_value('global_notification'); + if ($GlobalNotification) { + // This is some trickery + // since we can't know which users have the read cache key set + // we set the expiration time of their cache key to that of the length of the notification + // this gaurantees that their cache key will expire after the notification expires + G::$Cache->cache_value('user_read_global_' . G::$LoggedUser['ID'], true, $GlobalNotification['Expiration']); + } + } + + public function load_news() { + $MyNews = G::$LoggedUser['LastReadNews']; + $CurrentNews = G::$Cache->get_value('news_latest_id'); + $Title = G::$Cache->get_value('news_latest_title'); + if ($CurrentNews === false || $Title === false) { + $QueryID = G::$DB->get_query_id(); + G::$DB->query(' + SELECT ID, Title + FROM news + ORDER BY Time DESC + LIMIT 1'); + if (G::$DB->has_results()) { + list($CurrentNews, $Title) = G::$DB->next_record(); + } else { + $CurrentNews = -1; + } + G::$DB->set_query_id($QueryID); + G::$Cache->cache_value('news_latest_id', $CurrentNews, 0); + G::$Cache->cache_value('news_latest_title', $Title, 0); + } + if ($MyNews < $CurrentNews) { + $this->create_notification(self::NEWS, $CurrentNews, "Announcement: $Title", "index.php#news$CurrentNews", self::IMPORTANT); + } + } + + public function load_blog() { + $MyBlog = G::$LoggedUser['LastReadBlog']; + $CurrentBlog = G::$Cache->get_value('blog_latest_id'); + $Title = G::$Cache->get_value('blog_latest_title'); + if ($CurrentBlog === false) { + $QueryID = G::$DB->get_query_id(); + G::$DB->query(' + SELECT ID, Title + FROM blog + WHERE Important = 1 + ORDER BY Time DESC + LIMIT 1'); + if (G::$DB->has_results()) { + list($CurrentBlog, $Title) = G::$DB->next_record(); + } else { + $CurrentBlog = -1; + } + G::$DB->set_query_id($QueryID); + G::$Cache->cache_value('blog_latest_id', $CurrentBlog, 0); + G::$Cache->cache_value('blog_latest_title', $Title, 0); + } + if ($MyBlog < $CurrentBlog) { + $this->create_notification(self::BLOG, $CurrentBlog, "Blog: $Title", "blog.php#blog$CurrentBlog", self::IMPORTANT); + } + } + + public function load_staff_blog() { + if (check_perms('users_mod')) { + global $SBlogReadTime, $LatestSBlogTime; + if (!$SBlogReadTime && ($SBlogReadTime = G::$Cache->get_value('staff_blog_read_' . G::$LoggedUser['ID'])) === false) { + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + SELECT Time + FROM staff_blog_visits + WHERE UserID = " . G::$LoggedUser['ID']); + if (list($SBlogReadTime) = G::$DB->next_record()) { + $SBlogReadTime = strtotime($SBlogReadTime); + } else { + $SBlogReadTime = 0; + } + G::$DB->set_query_id($QueryID); + G::$Cache->cache_value('staff_blog_read_' . G::$LoggedUser['ID'], $SBlogReadTime, 1209600); + } + if (!$LatestSBlogTime && ($LatestSBlogTime = G::$Cache->get_value('staff_blog_latest_time')) === false) { + $QueryID = G::$DB->get_query_id(); + G::$DB->query(' + SELECT MAX(Time) + FROM staff_blog'); + if (list($LatestSBlogTime) = G::$DB->next_record()) { + $LatestSBlogTime = strtotime($LatestSBlogTime); + } else { + $LatestSBlogTime = 0; + } + G::$DB->set_query_id($QueryID); + G::$Cache->cache_value('staff_blog_latest_time', $LatestSBlogTime, 1209600); + } + if ($SBlogReadTime < $LatestSBlogTime) { + $this->create_notification(self::STAFFBLOG, 0, 'New Staff Blog Post!', 'staffblog.php', self::IMPORTANT); + } + } + } + + public function load_staff_pms() { + $NewStaffPMs = G::$Cache->get_value('staff_pm_new_' . G::$LoggedUser['ID']); + if ($NewStaffPMs === false) { + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + SELECT COUNT(ID) + FROM staff_pm_conversations + WHERE UserID = '" . G::$LoggedUser['ID'] . "' + AND Unread = '1'"); + list($NewStaffPMs) = G::$DB->next_record(); + G::$DB->set_query_id($QueryID); + G::$Cache->cache_value('staff_pm_new_' . G::$LoggedUser['ID'], $NewStaffPMs, 0); + } + + if ($NewStaffPMs > 0) { + $Title = 'You have ' . ($NewStaffPMs == 1 ? 'a' : $NewStaffPMs) . ' new Staff PM' . ($NewStaffPMs > 1 ? 's' : ''); + $this->create_notification(self::STAFFPM, 0, $Title, 'staffpm.php', self::INFO); + } + } + + public function load_inbox() { + $NewMessages = G::$Cache->get_value('inbox_new_' . G::$LoggedUser['ID']); + if ($NewMessages === false) { + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + SELECT COUNT(UnRead) + FROM pm_conversations_users + WHERE UserID = '" . G::$LoggedUser['ID'] . "' + AND UnRead = '1' + AND InInbox = '1'"); + list($NewMessages) = G::$DB->next_record(); + G::$DB->set_query_id($QueryID); + G::$Cache->cache_value('inbox_new_' . G::$LoggedUser['ID'], $NewMessages, 0); + } + + if ($NewMessages > 0) { + $Title = 'You have ' . ($NewMessages == 1 ? 'a' : $NewMessages) . ' new message' . ($NewMessages > 1 ? 's' : ''); + $this->create_notification(self::INBOX, 0, $Title, Inbox::get_inbox_link(), self::INFO); + } + } + + public function load_torrent_notifications() { + if (check_perms('site_torrents_notify')) { + $NewNotifications = G::$Cache->get_value('notifications_new_' . G::$LoggedUser['ID']); + if ($NewNotifications === false) { + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + SELECT COUNT(UserID) + FROM users_notify_torrents + WHERE UserID = ' " . G::$LoggedUser['ID'] . "' + AND UnRead = '1'"); + list($NewNotifications) = G::$DB->next_record(); + G::$DB->set_query_id($QueryID); + G::$Cache->cache_value('notifications_new_' . G::$LoggedUser['ID'], $NewNotifications, 0); + } + } + if ($NewNotifications > 0) { + $Title = 'You have ' . ($NewNotifications == 1 ? 'a' : $NewNotifications) . ' new torrent notification' . ($NewNotifications > 1 ? 's' : ''); + $this->create_notification(self::TORRENTS, 0, $Title, 'torrents.php?action=notify', self::INFO); + } + } + + public function load_collage_subscriptions() { + if (check_perms('site_collages_subscribe')) { + $NewCollages = G::$Cache->get_value('collage_subs_user_new_' . G::$LoggedUser['ID']); + if ($NewCollages === false) { + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + SELECT COUNT(DISTINCT s.CollageID) + FROM users_collage_subs AS s + JOIN collages AS c ON s.CollageID = c.ID + JOIN collages_torrents AS ct ON ct.CollageID = c.ID + WHERE s.UserID = " . G::$LoggedUser['ID'] . " + AND ct.AddedOn > s.LastVisit + AND c.Deleted = '0'"); + list($NewCollages) = G::$DB->next_record(); + G::$DB->set_query_id($QueryID); + G::$Cache->cache_value('collage_subs_user_new_' . G::$LoggedUser['ID'], $NewCollages, 0); + } + if ($NewCollages > 0) { + $Title = 'You have ' . ($NewCollages == 1 ? 'a' : $NewCollages) . ' new collage update' . ($NewCollages > 1 ? 's' : ''); + $this->create_notification(self::COLLAGES, 0, $Title, 'userhistory.php?action=subscribed_collages', self::INFO); + } + } + } + + public function load_quote_notifications() { + if (isset(G::$LoggedUser['NotifyOnQuote']) && G::$LoggedUser['NotifyOnQuote']) { + $QuoteNotificationsCount = Subscriptions::has_new_quote_notifications(); + if ($QuoteNotificationsCount > 0) { + $Title = 'New quote' . ($QuoteNotificationsCount > 1 ? 's' : ''); + $this->create_notification(self::QUOTES, 0, $Title, 'userhistory.php?action=quote_notifications', self::INFO); + } + } + } + + public function load_subscriptions() { + $SubscriptionsCount = Subscriptions::has_new_subscriptions(); + if ($SubscriptionsCount > 0) { + $Title = 'New subscription' . ($SubscriptionsCount > 1 ? 's' : ''); + $this->create_notification(self::SUBSCRIPTIONS, 0, $Title, 'userhistory.php?action=subscriptions', self::INFO); + } + } + + public static function clear_news($News = null) { + $QueryID = G::$DB->get_query_id(); + if (!$News) { + if (!$News = G::$Cache->get_value('news')) { + G::$DB->query(' + SELECT + ID, + Title, + Body, + Time + FROM news + ORDER BY Time DESC + LIMIT 1'); + $News = G::$DB->to_array(false, MYSQLI_NUM, false); + G::$Cache->cache_value('news_latest_id', $News[0][0], 0); + } + } + + if (G::$LoggedUser['LastReadNews'] != $News[0][0]) { + G::$Cache->begin_transaction('user_info_heavy_' . G::$LoggedUser['ID']); + G::$Cache->update_row(false, array('LastReadNews' => $News[0][0])); + G::$Cache->commit_transaction(0); + G::$DB->query(" + UPDATE users_info + SET LastReadNews = '".$News[0][0]."' + WHERE UserID = " . G::$LoggedUser['ID']); + G::$LoggedUser['LastReadNews'] = $News[0][0]; + } + G::$DB->set_query_id($QueryID); + } + + public static function clear_blog($Blog = null) { + $QueryID = G::$DB->get_query_id(); + if (!$Blog) { + if (!$Blog = G::$Cache->get_value('blog')) { + G::$DB->query(" + SELECT + b.ID, + um.Username, + b.UserID, + b.Title, + b.Body, + b.Time, + b.ThreadID + FROM blog AS b + LEFT JOIN users_main AS um ON b.UserID = um.ID + ORDER BY Time DESC + LIMIT 1"); + $Blog = G::$DB->to_array(); + } + } + if (G::$LoggedUser['LastReadBlog'] < $Blog[0][0]) { + G::$Cache->begin_transaction('user_info_heavy_' . G::$LoggedUser['ID']); + G::$Cache->update_row(false, array('LastReadBlog' => $Blog[0][0])); + G::$Cache->commit_transaction(0); + G::$DB->query(" + UPDATE users_info + SET LastReadBlog = '". $Blog[0][0]."' + WHERE UserID = " . G::$LoggedUser['ID']); + G::$LoggedUser['LastReadBlog'] = $Blog[0][0]; + } + G::$DB->set_query_id($QueryID); + } + + public static function clear_staff_pms() { + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + SELECT ID + FROM staff_pm_conversations + WHERE Unread = true + AND UserID = " . G::$LoggedUser['ID']); + $IDs = array(); + while (list($ID) = G::$DB->next_record()) { + $IDs[] = $ID; + } + $IDs = implode(',', $IDs); + if (!empty($IDs)) { + G::$DB->query(" + UPDATE staff_pm_conversations + SET Unread = false + WHERE ID IN ($IDs)"); + } + G::$Cache->delete_value('staff_pm_new_' . G::$LoggedUser['ID']); + G::$DB->set_query_id($QueryID); + } + + public static function clear_inbox() { + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + SELECT ConvID + FROM pm_conversations_users + WHERE Unread = '1' + AND UserID = " . G::$LoggedUser['ID']); + $IDs = array(); + while (list($ID) = G::$DB->next_record()) { + $IDs[] = $ID; + } + $IDs = implode(',', $IDs); + if (!empty($IDs)) { + G::$DB->query(" + UPDATE pm_conversations_users + SET Unread = '0' + WHERE ConvID IN ($IDs) + AND UserID = " . G::$LoggedUser['ID']); + } + G::$Cache->delete_value('inbox_new_' . G::$LoggedUser['ID']); + G::$DB->set_query_id($QueryID); + } + + public static function clear_torrents() { + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + SELECT TorrentID + FROM users_notify_torrents + WHERE UserID = ' " . G::$LoggedUser['ID'] . "' + AND UnRead = '1'"); + $IDs = array(); + while (list($ID) = G::$DB->next_record()) { + $IDs[] = $ID; + } + $IDs = implode(',', $IDs); + if (!empty($IDs)) { + G::$DB->query(" + UPDATE users_notify_torrents + SET Unread = '0' + WHERE TorrentID IN ($IDs) + AND UserID = " . G::$LoggedUser['ID']); + } + G::$Cache->delete_value('notifications_new_' . G::$LoggedUser['ID']); + G::$DB->set_query_id($QueryID); + } + + public static function clear_collages() { + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + UPDATE users_collage_subs + SET LastVisit = NOW() + WHERE UserID = " . G::$LoggedUser['ID']); + G::$Cache->delete_value('collage_subs_user_new_' . G::$LoggedUser['ID']); + G::$DB->set_query_id($QueryID); + } + + public static function clear_quotes() { + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + UPDATE users_notify_quoted + SET UnRead = '0' + WHERE UserID = " . G::$LoggedUser['ID']); + G::$Cache->delete_value('notify_quoted_' . G::$LoggedUser['ID']); + G::$DB->set_query_id($QueryID); + } + + public static function clear_subscriptions() { + $QueryID = G::$DB->get_query_id(); + if (($UserSubscriptions = G::$Cache->get_value('subscriptions_user_' . G::$LoggedUser['ID'])) === false) { + G::$DB->query(" + SELECT TopicID + FROM users_subscriptions + WHERE UserID = " . G::$LoggedUser['ID']); + if ($UserSubscriptions = G::$DB->collect(0)) { + G::$Cache->cache_value('subscriptions_user_' . G::$LoggedUser['ID'], $UserSubscriptions, 0); + } + } + if (!empty($UserSubscriptions)) { + G::$DB->query(" + INSERT INTO forums_last_read_topics (UserID, TopicID, PostID) + SELECT '" . G::$LoggedUser['ID'] . "', ID, LastPostID + FROM forums_topics + WHERE ID IN (".implode(',', $UserSubscriptions).') + ON DUPLICATE KEY UPDATE + PostID = LastPostID'); + } + G::$Cache->delete_value('subscriptions_user_new_' . G::$LoggedUser['ID']); + G::$DB->set_query_id($QueryID); + } /* - // TODO: Figure out what these functions are supposed to do and fix them - public static function send_notification($UserID, $ID, $Type, $Message, $URL, $Importance = 'alert', $AutoExpire = false) { - $Notifications = G::$Cache->get_value("user_cache_notifications_$UserID"); - if (empty($Notifications)) { - $Notifications = array(); - } - array_unshift($Notifications, $this->create_notification($Type, $ID, $Message, $URL, $Importance, $AutoExpire)); - G::$Cache->cache_value("user_cache_notifications_$UserID", $Notifications, 0); - } - - public static function clear_notification($UserID, $Index) { - $Notifications = G::$Cache->get_value("user_cache_notifications_$UserID"); - if (count($Notifications)) { - unset($Notifications[$Index]); - $Notifications = array_values($Notifications); - G::$Cache->cache_value("user_cache_notifications_$UserID", $Notifications, 0); - } - } + // TODO: Figure out what these functions are supposed to do and fix them + public static function send_notification($UserID, $ID, $Type, $Message, $URL, $Importance = 'alert', $AutoExpire = false) { + $Notifications = G::$Cache->get_value("user_cache_notifications_$UserID"); + if (empty($Notifications)) { + $Notifications = array(); + } + array_unshift($Notifications, $this->create_notification($Type, $ID, $Message, $URL, $Importance, $AutoExpire)); + G::$Cache->cache_value("user_cache_notifications_$UserID", $Notifications, 0); + } + + public static function clear_notification($UserID, $Index) { + $Notifications = G::$Cache->get_value("user_cache_notifications_$UserID"); + if (count($Notifications)) { + unset($Notifications[$Index]); + $Notifications = array_values($Notifications); + G::$Cache->cache_value("user_cache_notifications_$UserID", $Notifications, 0); + } + } */ - public static function get_settings($UserID) { - $Results = G::$Cache->get_value("users_notifications_settings_$UserID"); - if (!$Results) { - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - SELECT * - FROM users_notifications_settings AS n - LEFT JOIN users_push_notifications AS p - ON p.UserID = n.UserID - WHERE n.UserID = '$UserID'"); - $Results = G::$DB->next_record(MYSQLI_ASSOC, false); - G::$DB->set_query_id($QueryID); - G::$Cache->cache_value("users_notifications_settings_$UserID", $Results, 0); - } - return $Results; - } - - public static function save_settings($UserID, $Settings=null) { - if (!is_array($Settings)) { - // A little cheat technique, gets all keys in the $_POST array starting with 'notifications_' - $Settings = array_intersect_key($_POST, array_flip(preg_grep('/^notifications_/', array_keys($_POST)))); - } - $Update = array(); - foreach (self::$Types as $Type) { - $Popup = array_key_exists("notifications_{$Type}_popup", $Settings); - $Traditional = array_key_exists("notifications_{$Type}_traditional", $Settings); - $Push = array_key_exists("notifications_{$Type}_push", $Settings); - $Result = self::OPT_DISABLED; - if ($Popup) { - $Result = $Push ? self::OPT_POPUP_PUSH : self::OPT_POPUP; - } elseif ($Traditional) { - $Result = $Push ? self::OPT_TRADITIONAL_PUSH : self::OPT_TRADITIONAL; - } elseif ($Push) { - $Result = self::OPT_PUSH; - } - $Update[] = "$Type = $Result"; - } - $Update = implode(',', $Update); - - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - UPDATE users_notifications_settings - SET $Update - WHERE UserID = '$UserID'"); - - $PushService = (int) $_POST['pushservice']; - $PushOptionsArray = array("PushKey" => $_POST['pushkey']); - if ($PushService === 6) { //pushbullet - $PushOptionsArray['PushDevice'] = $_POST['pushdevice']; - } - $PushOptions = db_string(serialize($PushOptionsArray)); - - if ($PushService != 0) { - G::$DB->query(" - INSERT INTO users_push_notifications - (UserID, PushService, PushOptions) - VALUES - ('$UserID', '$PushService', '$PushOptions') - ON DUPLICATE KEY UPDATE - PushService = '$PushService', - PushOptions = '$PushOptions'"); - } else { - G::$DB->query("UPDATE users_push_notifications SET PushService = 0 WHERE UserID = '$UserID'"); - } - - G::$DB->set_query_id($QueryID); - G::$Cache->delete_value("users_notifications_settings_$UserID"); - } - - public function is_traditional($Type) { - return $this->Settings[$Type] == self::OPT_TRADITIONAL || $this->Settings[$Type] == self::OPT_TRADITIONAL_PUSH; - } - - public function is_skipped($Type) { - return isset($this->Skipped[$Type]); - } - - public function use_noty() { - return in_array(self::OPT_POPUP, $this->Settings) || in_array(self::OPT_POPUP_PUSH, $this->Settings); - } - - /** - * Send a push notification to a user - * - * @param array $UserIDs integer or array of integers of UserIDs to push - * @param string $Title the title to be displayed in the push - * @param string $Body the body of the push - * @param string $URL url for the push notification to contain - * @param string $Type what sort of push is it? PM, Rippy, News, etc - */ - public static function send_push($UserIDs, $Title, $Body, $URL = '', $Type = self::GLOBALNOTICE) { - if (!is_array($UserIDs)) { - $UserIDs = array($UserIDs); - } - foreach($UserIDs as $UserID) { - $UserID = (int) $UserID; - $QueryID = G::$DB->get_query_id(); - $SQL = " - SELECT - p.PushService, p.PushOptions - FROM users_notifications_settings AS n - JOIN users_push_notifications AS p ON n.UserID = p.UserID - WHERE n.UserID = '$UserID' - AND p.PushService != 0"; - if ($Type != self::GLOBALNOTICE) { - $SQL .= " AND n.$Type IN (" . self::OPT_PUSH . "," . self::OPT_POPUP_PUSH . "," . self::OPT_TRADITIONAL_PUSH . ")"; - } - G::$DB->query($SQL); - - if (G::$DB->has_results()) { - list($PushService, $PushOptions) = G::$DB->next_record(MYSQLI_NUM, false); - $PushOptions = unserialize($PushOptions); - switch ($PushService) { - case '1': - $Service = "NMA"; - break; - case '2': - $Service = "Prowl"; - break; - // Case 3 is missing because notifo is dead. - case '4': - $Service = "Toasty"; - break; - case '5': - $Service = "Pushover"; - break; - case '6': - $Service = "PushBullet"; - break; - default: - break; - } - if (!empty($Service) && !empty($PushOptions['PushKey'])) { - $Options = array("service" => strtolower($Service), - "user" => array("key" => $PushOptions['PushKey']), - "message" => array("title" => $Title, "body" => $Body, "url" => $URL)); - - if ($Service === 'PushBullet') { - $Options["user"]["device"] = $PushOptions['PushDevice']; - - } - - $JSON = json_encode($Options); - G::$DB->query(" - INSERT INTO push_notifications_usage - (PushService, TimesUsed) - VALUES - ('$Service', 1) - ON DUPLICATE KEY UPDATE - TimesUsed = TimesUsed + 1"); - - $PushServerSocket = fsockopen("127.0.0.1", 6789); - fwrite($PushServerSocket, $JSON); - fclose($PushServerSocket); - } - } - G::$DB->set_query_id($QueryID); - } - } - - /** - * Gets users who have push notifications enabled - * - */ - public static function get_push_enabled_users() { - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - SELECT UserID - FROM users_push_notifications - WHERE PushService != 0 - AND UserID != '" . G::$LoggedUser['ID']. "'"); - $PushUsers = G::$DB->collect("UserID"); - G::$DB->set_query_id($QueryID); - return $PushUsers; - } + public static function get_settings($UserID) { + $Results = G::$Cache->get_value("users_notifications_settings_$UserID"); + if (!$Results) { + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + SELECT * + FROM users_notifications_settings AS n + LEFT JOIN users_push_notifications AS p + ON p.UserID = n.UserID + WHERE n.UserID = '$UserID'"); + $Results = G::$DB->next_record(MYSQLI_ASSOC, false); + G::$DB->set_query_id($QueryID); + G::$Cache->cache_value("users_notifications_settings_$UserID", $Results, 0); + } + return $Results; + } + + public static function save_settings($UserID, $Settings=null) { + if (!is_array($Settings)) { + // A little cheat technique, gets all keys in the $_POST array starting with 'notifications_' + $Settings = array_intersect_key($_POST, array_flip(preg_grep('/^notifications_/', array_keys($_POST)))); + } + $Update = array(); + foreach (self::$Types as $Type) { + $Popup = array_key_exists("notifications_{$Type}_popup", $Settings); + $Traditional = array_key_exists("notifications_{$Type}_traditional", $Settings); + $Push = array_key_exists("notifications_{$Type}_push", $Settings); + $Result = self::OPT_DISABLED; + if ($Popup) { + $Result = $Push ? self::OPT_POPUP_PUSH : self::OPT_POPUP; + } elseif ($Traditional) { + $Result = $Push ? self::OPT_TRADITIONAL_PUSH : self::OPT_TRADITIONAL; + } elseif ($Push) { + $Result = self::OPT_PUSH; + } + $Update[] = "$Type = $Result"; + } + $Update = implode(',', $Update); + + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + UPDATE users_notifications_settings + SET $Update + WHERE UserID = '$UserID'"); + + $PushService = (int) $_POST['pushservice']; + $PushOptionsArray = array("PushKey" => $_POST['pushkey']); + if ($PushService === 6) { //pushbullet + $PushOptionsArray['PushDevice'] = $_POST['pushdevice']; + } + $PushOptions = db_string(serialize($PushOptionsArray)); + + if ($PushService != 0) { + G::$DB->query(" + INSERT INTO users_push_notifications + (UserID, PushService, PushOptions) + VALUES + ('$UserID', '$PushService', '$PushOptions') + ON DUPLICATE KEY UPDATE + PushService = '$PushService', + PushOptions = '$PushOptions'"); + } else { + G::$DB->query("UPDATE users_push_notifications SET PushService = 0 WHERE UserID = '$UserID'"); + } + + G::$DB->set_query_id($QueryID); + G::$Cache->delete_value("users_notifications_settings_$UserID"); + } + + public function is_traditional($Type) { + return $this->Settings[$Type] == self::OPT_TRADITIONAL || $this->Settings[$Type] == self::OPT_TRADITIONAL_PUSH; + } + + public function is_skipped($Type) { + return isset($this->Skipped[$Type]); + } + + public function use_noty() { + return in_array(self::OPT_POPUP, $this->Settings) || in_array(self::OPT_POPUP_PUSH, $this->Settings); + } + + /** + * Send a push notification to a user + * + * @param array $UserIDs integer or array of integers of UserIDs to push + * @param string $Title the title to be displayed in the push + * @param string $Body the body of the push + * @param string $URL url for the push notification to contain + * @param string $Type what sort of push is it? PM, Rippy, News, etc + */ + public static function send_push($UserIDs, $Title, $Body, $URL = '', $Type = self::GLOBALNOTICE) { + if (!is_array($UserIDs)) { + $UserIDs = array($UserIDs); + } + foreach($UserIDs as $UserID) { + $UserID = (int) $UserID; + $QueryID = G::$DB->get_query_id(); + $SQL = " + SELECT + p.PushService, p.PushOptions + FROM users_notifications_settings AS n + JOIN users_push_notifications AS p ON n.UserID = p.UserID + WHERE n.UserID = '$UserID' + AND p.PushService != 0"; + if ($Type != self::GLOBALNOTICE) { + $SQL .= " AND n.$Type IN (" . self::OPT_PUSH . "," . self::OPT_POPUP_PUSH . "," . self::OPT_TRADITIONAL_PUSH . ")"; + } + G::$DB->query($SQL); + + if (G::$DB->has_results()) { + list($PushService, $PushOptions) = G::$DB->next_record(MYSQLI_NUM, false); + $PushOptions = unserialize($PushOptions); + switch ($PushService) { + case '1': + $Service = "NMA"; + break; + case '2': + $Service = "Prowl"; + break; + // Case 3 is missing because notifo is dead. + case '4': + $Service = "Toasty"; + break; + case '5': + $Service = "Pushover"; + break; + case '6': + $Service = "PushBullet"; + break; + default: + break; + } + if (!empty($Service) && !empty($PushOptions['PushKey'])) { + $Options = array("service" => strtolower($Service), + "user" => array("key" => $PushOptions['PushKey']), + "message" => array("title" => $Title, "body" => $Body, "url" => $URL)); + + if ($Service === 'PushBullet') { + $Options["user"]["device"] = $PushOptions['PushDevice']; + + } + + $JSON = json_encode($Options); + G::$DB->query(" + INSERT INTO push_notifications_usage + (PushService, TimesUsed) + VALUES + ('$Service', 1) + ON DUPLICATE KEY UPDATE + TimesUsed = TimesUsed + 1"); + + $PushServerSocket = fsockopen("127.0.0.1", 6789); + fwrite($PushServerSocket, $JSON); + fclose($PushServerSocket); + } + } + G::$DB->set_query_id($QueryID); + } + } + + /** + * Gets users who have push notifications enabled + * + */ + public static function get_push_enabled_users() { + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + SELECT UserID + FROM users_push_notifications + WHERE PushService != 0 + AND UserID != '" . G::$LoggedUser['ID']. "'"); + $PushUsers = G::$DB->collect("UserID"); + G::$DB->set_query_id($QueryID); + return $PushUsers; + } } diff --git a/classes/notificationsmanagerview.class.php b/classes/notificationsmanagerview.class.php index 9317af438..c6e5bce88 100644 --- a/classes/notificationsmanagerview.class.php +++ b/classes/notificationsmanagerview.class.php @@ -1,156 +1,158 @@ - - -?v=" type="text/javascript"> + -
| Revision | -Date | -User | -Summary | -
| Revision | +Date | +User | +Summary | +
| - #$RevisionID" ?> - | -- - | -- - | -- - | -
- \n";
- foreach($golden_rules as $gr) {
- $r_link = "gr${gr['n']}";
- echo "
- " .
- "${gr['n']}." .
- '' . - '' . - "' . - $gr['short'] . - '' . - '' . - $gr['long'] . - '' . - ' \n";
- }
- echo "
- \n";
+ foreach($golden_rules as $gr) {
+ $r_link = "gr${gr['n']}";
+ echo "
- " .
+ "${gr['n']}." .
+ '' . + '' . + "' . + $gr['short'] . + '' . + '' . + $gr['long'] . + '' . + ' \n";
+ }
+ echo "
-
-
- Tags should be comma-separated, and you should use a period (".") to separate words inside a tag — e.g. "hip.hop". + /** + * Displays the site's rules for tags. + * + * @param boolean $OnUpload - whether it's being displayed on a torrent upload form + */ + public static function display_site_tag_rules($OnUpload = false) { + ?> +
- Tags should be comma-separated, and you should use a period (".") to separate words inside a tag — e.g. "hip.hop". -
- There is a list of official tags the torrent upload page')?>. Please use these tags instead of "unofficial" tags (e.g. use the official "drum.and.bass" tag, instead of an unofficial "dnb" tag). Please note that the "2000s" tag refers to music produced between 2000 and 2009. +
- There is a list of official tags the torrent upload page')?>. Please use these tags instead of "unofficial" tags (e.g. use the official "drum.and.bass" tag, instead of an unofficial "dnb" tag). Please note that the "2000s" tag refers to music produced between 2000 and 2009. -
- Avoid abbreviations if at all possible. So instead of tagging an album as "alt", tag it as "alternative". Make sure that you use correct spelling. +
- Avoid abbreviations if at all possible. So instead of tagging an album as "alt", tag it as "alternative". Make sure that you use correct spelling. -
- Avoid using multiple synonymous tags. Using both "prog.rock" and "progressive.rock" is redundant and annoying — just use the official "progressive.rock" tag. +
- Avoid using multiple synonymous tags. Using both "prog.rock" and "progressive.rock" is redundant and annoying — just use the official "progressive.rock" tag. -
- Do not add "useless" tags, such as "seen.live", "awesome", "rap" (is encompassed by "hip.hop"), etc. If an album is live, you can tag it as "live". +
- Do not add "useless" tags, such as "seen.live", "awesome", "rap" (is encompassed by "hip.hop"), etc. If an album is live, you can tag it as "live". -
- Only tag information on the album itself — not the individual release. Tags such as "v0", "eac", "vinyl", "from.what", etc. are strictly forbidden. Remember that these tags will be used for other versions of the same album. +
- Only tag information on the album itself — not the individual release. Tags such as "v0", "eac", "vinyl", "from.what", etc. are strictly forbidden. Remember that these tags will be used for other versions of the same album. -
- You should be able to build up a list of tags using only the official tags the torrent upload page')?>. If you are in any doubt about whether or not a tag is acceptable, do not add it. -
-
+
-
-
- - Many forums (Serious Discussions, Chat, etc.) have their own set of rules. Make sure you read and take note of these rules before you attempt to post in one of these forums. - -
- - Don't use all capital letters, excessive !!! (exclamation marks) or ??? (question marks). It seems like you're shouting! - -
- - No lame referral schemes. This includes any website or any other similar scheme in which the poster gets personal gain from users clicking a link. - -
- - No asking for money for any reason whatsoever. Although we care about your friend who lost everything, or a dying relative who wants to enjoy their last few moments alive by being given lots of money, is not the place for it. - -
- - Do not inappropriately advertise your uploads. In special cases, it is acceptable to mention new uploads in an approved thread (e.g. Post your first upload here so people snatch it), but be sure to carefully read the thread's rules before posting. It is also acceptable to discuss releases you have uploaded when conversing about the music itself. Blatant attempts to advertise your uploads outside of the appropriate forums or threads may result in a warning or the loss of forum privileges. - -
- - No posting music requests in forums. There's a request link at the top of the page; please use that instead. - -
- - No flaming; be pleasant and polite. Don't use offensive language, and don't be confrontational for the sake of confrontation. - -
- - Don't point out or attack other members' share ratios. A higher ratio does not make you better than someone else. - -
- - Try not to ask stupid questions. A stupid question is one that you could have found the answer to yourself with a little research, or one that you're asking in the wrong place. If you do the basic research suggested (i.e., read the rules/wiki) or search the forums and don't find the answer to your question, then go ahead and ask. Staff and First Line Support (FLS) are not here to hand-feed you the answers you could have found on your own with a little bit of effort. - -
- - Be sure you read all the sticky threads in a forum before you post. - -
- - Use descriptive and specific subject lines. This helps others decide whether your particular words of wisdom relate to a topic they care about. - -
-
- Try not to post comments that don't add anything to the discussion. When you're just cruising through a thread in a leisurely manner, it's not too annoying to read through a lot of "hear, hear"'s and "I agree"'s. But if you're actually trying to find information, it's a pain in the neck. So save those one-word responses for threads that have degenerated to the point where none but true aficionados are following them any more.
-
- Or short: NO spamming -
-
- - - Refrain from quoting excessively. When quoting someone, use only the portion of the quote that is absolutely necessary. This includes quoting pictures! - -
- - No posting of requests for serials or cracks. No links to warez or crack sites in the forums. - -
- - No political or religious discussions. These types of discussions lead to arguments and flaming users, something that will not be tolerated. The only exception to this rule is the Serious Discussions forum, which exists solely for the purpose of intellectual discussion and civilized debate. - -
- - Don't waste other people's bandwidth by posting images of a large file size. - -
- - Be patient with newcomers. Once you have become an expert, it is easy to forget that you started out as a newbie too. Try to help them out if you can. - -
- - No requesting invites to any sites anywhere on the site or IRC. Invites may be offered in the Invitations forum (which is restricted to Elite and above), and nowhere else. - -
- - There are some language threads (e.g. French, Greek) in the Chat forum. Apart from these, no language other than English is permitted in the forums. If we can't understand it, we can't moderate it. Some FLS members speak other languages. You may send them a PM if you have a specific question and you do not feel comfortable in expressing yourself in English. - -
- - Be cautious when posting mature content on the forums. All mature imagery must abide by the rules found here. Gratuitously sexual or violent content which falls outside of the allowable categories will result in a warning or worse. - -
- - Mature content in posts must be properly tagged. The correct format is as follows: [mature=description] ...content... [/mature], where "description" is a mandatory description of the post contents. Misleading or inadequate descriptions will be penalized. - -
- - Threads created for the exclusive purpose of posting mature imagery will be trashed. Mature content (including graphic album art) should be contextually relevant to the thread and/or forum you're posting in. If you are in doubt as to whether a post is appropriate, send a Staff PM to the Forum Moderators and wait for a reply before proceeding. - -
-
+
- + Many forums (Serious Discussions, Chat, etc.) have their own set of rules. Make sure you read and take note of these rules before you attempt to post in one of these forums. + +
- + Don't use all capital letters, excessive !!! (exclamation marks) or ??? (question marks). It seems like you're shouting! + +
- + No lame referral schemes. This includes any website or any other similar scheme in which the poster gets personal gain from users clicking a link. + +
- + No asking for money for any reason whatsoever. Although we care about your friend who lost everything, or a dying relative who wants to enjoy their last few moments alive by being given lots of money, is not the place for it. + +
- + Do not inappropriately advertise your uploads. In special cases, it is acceptable to mention new uploads in an approved thread (e.g. Post your first upload here so people snatch it), but be sure to carefully read the thread's rules before posting. It is also acceptable to discuss releases you have uploaded when conversing about the music itself. Blatant attempts to advertise your uploads outside of the appropriate forums or threads may result in a warning or the loss of forum privileges. + +
- + No posting music requests in forums. There's a request link at the top of the page; please use that instead. + +
- + No flaming; be pleasant and polite. Don't use offensive language, and don't be confrontational for the sake of confrontation. + +
- + Don't point out or attack other members' share ratios. A higher ratio does not make you better than someone else. + +
- + Try not to ask stupid questions. A stupid question is one that you could have found the answer to yourself with a little research, or one that you're asking in the wrong place. If you do the basic research suggested (i.e., read the rules/wiki) or search the forums and don't find the answer to your question, then go ahead and ask. Staff and First Line Support (FLS) are not here to hand-feed you the answers you could have found on your own with a little bit of effort. + +
- + Be sure you read all the sticky threads in a forum before you post. + +
- + Use descriptive and specific subject lines. This helps others decide whether your particular words of wisdom relate to a topic they care about. + +
-
+ Try not to post comments that don't add anything to the discussion. When you're just cruising through a thread in a leisurely manner, it's not too annoying to read through a lot of "hear, hear"'s and "I agree"'s. But if you're actually trying to find information, it's a pain in the neck. So save those one-word responses for threads that have degenerated to the point where none but true aficionados are following them any more.
+
+ Or short: NO spamming +
+
+ - + Refrain from quoting excessively. When quoting someone, use only the portion of the quote that is absolutely necessary. This includes quoting pictures! + +
- + No posting of requests for serials or cracks. No links to warez or crack sites in the forums. + +
- + No political or religious discussions. These types of discussions lead to arguments and flaming users, something that will not be tolerated. The only exception to this rule is the Serious Discussions forum, which exists solely for the purpose of intellectual discussion and civilized debate. + +
- + Don't waste other people's bandwidth by posting images of a large file size. + +
- + Be patient with newcomers. Once you have become an expert, it is easy to forget that you started out as a newbie too. Try to help them out if you can. + +
- + No requesting invites to any sites anywhere on the site or IRC. Invites may be offered in the Invitations forum (which is restricted to Elite and above), and nowhere else. + +
- + There are some language threads (e.g. French, Greek) in the Chat forum. Apart from these, no language other than English is permitted in the forums. If we can't understand it, we can't moderate it. Some FLS members speak other languages. You may send them a PM if you have a specific question and you do not feel comfortable in expressing yourself in English. + +
- + Be cautious when posting mature content on the forums. All mature imagery must abide by the rules found here. Gratuitously sexual or violent content which falls outside of the allowable categories will result in a warning or worse. + +
- + Mature content in posts must be properly tagged. The correct format is as follows: [mature=description] ...content... [/mature], where "description" is a mandatory description of the post contents. Misleading or inadequate descriptions will be penalized. + +
- + Threads created for the exclusive purpose of posting mature imagery will be trashed. Mature content (including graphic album art) should be contextually relevant to the thread and/or forum you're posting in. If you are in doubt as to whether a post is appropriate, send a Staff PM to the Forum Moderators and wait for a reply before proceeding. + +
-
-
- Staff have the final decision. If a staff member says stop and you continue, expect at least to be banned from the IRC network. -
- Be respectful to IRC Operators and Administrators. These people are site staff who volunteer their time for little compensation. They are there for the benefit of all and to aid in conflict resolution; do not waste their time. -
- Do not link shock sites or anything NSFW (not safe for work) without a warning. If in doubt, ask a staff member in about it. -
- Excessive swearing will get you kicked; keep swearing to a minimum. -
- Do not leave Caps Lock enabled all the time. It gets annoying, and you will likely get yourself kicked. -
- No arguing. You can't win an argument over the Internet, so you are just wasting your time trying. -
- No prejudice, especially related to race, religion, politics, sexual preference, ethnic background, etc. It is highly suggested to avoid these subjects entirely. -
- Flooding is irritating and will warrant you a kick. This includes, but is not limited to, automatic "now playing" scripts, pasting large amounts of text, and multiple consecutive lines with no relevance to the conversation at hand. -
- Impersonation of other members — particularly staff members — will not go unpunished. If you are uncertain of a user's identity, check their vhost. -
- Spamming is strictly forbidden. This includes, but is not limited to, personal sites, online auctions, and torrent uploads. -
- Obsessive annoyance — both to other users and staff — will not be tolerated. -
- Do not PM, DCC, or Query anyone you don't know or have never talked to without asking first; this applies specifically to staff. -
- No language other than English is permitted in the IRC channels. If we cannot understand it, we cannot moderate it. -
- The offering, selling, trading, and giving away of invites to this or any other site on our IRC network is strictly forbidden. + /** + * Displays the site's rules for conversing on its IRC network + * + */ + public static function display_irc_chat_rules() { + ?> +
- Staff have the final decision. If a staff member says stop and you continue, expect at least to be banned from the IRC network. +
- Be respectful to IRC Operators and Administrators. These people are site staff who volunteer their time for little compensation. They are there for the benefit of all and to aid in conflict resolution; do not waste their time. +
- Do not link shock sites or anything NSFW (not safe for work) without a warning. If in doubt, ask a staff member in about it. +
- Excessive swearing will get you kicked; keep swearing to a minimum. +
- Do not leave Caps Lock enabled all the time. It gets annoying, and you will likely get yourself kicked. +
- No arguing. You can't win an argument over the Internet, so you are just wasting your time trying. +
- No prejudice, especially related to race, religion, politics, sexual preference, ethnic background, etc. It is highly suggested to avoid these subjects entirely. +
- Flooding is irritating and will warrant you a kick. This includes, but is not limited to, automatic "now playing" scripts, pasting large amounts of text, and multiple consecutive lines with no relevance to the conversation at hand. +
- Impersonation of other members — particularly staff members — will not go unpunished. If you are uncertain of a user's identity, check their vhost. +
- Spamming is strictly forbidden. This includes, but is not limited to, personal sites, online auctions, and torrent uploads. +
- Obsessive annoyance — both to other users and staff — will not be tolerated. +
- Do not PM, DCC, or Query anyone you don't know or have never talked to without asking first; this applies specifically to staff. +
- No language other than English is permitted in the IRC channels. If we cannot understand it, we cannot moderate it. +
- The offering, selling, trading, and giving away of invites to this or any other site on our IRC network is strictly forbidden.
- The creation of non-official channels on the IRC network is prohibited. Please send a Staff PM if you want to add a channel to our network. -
- Read the channel topic before asking questions. -
-
+
- Create new event
-
-
+ Create new event
+
+
-
-
+
+
+$Tag" . ", ";
- }
- echo rtrim($FormattedTags, ', ');
- }
+ private static function render_tags($Tags) {
+ $Tags = explode(',', $Tags);
+ natcasesort($Tags);
+ $FormattedTags = '';
+ foreach ($Tags as $Tag) {
+ $FormattedTags .= "$Tag" . ", ";
+ }
+ echo rtrim($FormattedTags, ', ');
+ }
- public static function render_months($Months) { ?>
-
+
+
+
+
-
+
- Calendar
-
+
-
+
-
+
- Search
-
-
+
+
-
-
-
-
+
+
+
+
+get_value('site_option_' . $Name);
if ($Value === false) {
- G::$DB->query("SELECT Value FROM site_options WHERE Name = '" . db_string($Name) . "'");
-
- if (G::$DB->has_results()) {
- list($Value) = G::$DB->next_record();
- G::$Cache->cache_value('site_option_' . $Name, $Value);
+ G::$DB->prepared_query('SELECT Value FROM site_options WHERE Name = ?', $Name);
+ list($Value) = G::$DB->next_record();
+ if (isset($Value)) {
+ G::$Cache->cache_value('site_option_' . $Name, $Value, 3600);
}
}
-
- return ($Value === false ? $DefaultValue : $Value);
+ return (is_null($Value) ? $DefaultValue : $Value);
}
-}
\ No newline at end of file
+}
diff --git a/classes/sphinxql.class.php b/classes/sphinxql.class.php
index 783b3eed4..d80ff4b5b 100644
--- a/classes/sphinxql.class.php
+++ b/classes/sphinxql.class.php
@@ -1,149 +1,149 @@
-Server = $Server;
- $this->Port = $Port;
- $this->Socket = $Socket;
- $this->Ident = self::get_ident($Server, $Port, $Socket);
- }
+ /**
+ * Initialize Sphinxql object
+ *
+ * @param string $Server server address or hostname
+ * @param int $Port listening port
+ * @param string $Socket Unix socket address, overrides $Server:$Port
+ */
+ public function __construct($Server, $Port, $Socket) {
+ $this->Server = $Server;
+ $this->Port = $Port;
+ $this->Socket = $Socket;
+ $this->Ident = self::get_ident($Server, $Port, $Socket);
+ }
- /**
- * Create server ident based on connection information
- *
- * @param string $Server server address or hostname
- * @param int $Port listening port
- * @param string $Socket Unix socket address, overrides $Server:$Port
- * @return string identification string
- */
- private static function get_ident($Server, $Port, $Socket) {
- if ($Socket) {
- return $Socket;
- } else {
- return "$Server:$Port";
- }
- }
+ /**
+ * Create server ident based on connection information
+ *
+ * @param string $Server server address or hostname
+ * @param int $Port listening port
+ * @param string $Socket Unix socket address, overrides $Server:$Port
+ * @return string identification string
+ */
+ private static function get_ident($Server, $Port, $Socket) {
+ if ($Socket) {
+ return $Socket;
+ } else {
+ return "$Server:$Port";
+ }
+ }
- /**
- * Create Sphinxql object or return existing one
- *
- * @param string $Server server address or hostname
- * @param int $Port listening port
- * @param string $Socket Unix socket address, overrides $Server:$Port
- * @return Sphinxql object
- */
- public static function init_connection($Server, $Port, $Socket) {
- $Ident = self::get_ident($Server, $Port, $Socket);
- if (!isset(self::$Connections[$Ident])) {
- self::$Connections[$Ident] = new Sphinxql($Server, $Port, $Socket);
- }
- return self::$Connections[$Ident];
- }
+ /**
+ * Create Sphinxql object or return existing one
+ *
+ * @param string $Server server address or hostname
+ * @param int $Port listening port
+ * @param string $Socket Unix socket address, overrides $Server:$Port
+ * @return Sphinxql object
+ */
+ public static function init_connection($Server, $Port, $Socket) {
+ $Ident = self::get_ident($Server, $Port, $Socket);
+ if (!isset(self::$Connections[$Ident])) {
+ self::$Connections[$Ident] = new Sphinxql($Server, $Port, $Socket);
+ }
+ return self::$Connections[$Ident];
+ }
- /**
- * Connect the Sphinxql object to the Sphinx server
- */
- public function sph_connect() {
- if ($this->Connected || $this->connect_errno) {
- return;
- }
- global $Debug;
- $Debug->set_flag("Connecting to Sphinx server $this->Ident");
- for ($Attempt = 0; $Attempt < 3; $Attempt++) {
- parent::__construct($this->Server, '', '', '', $this->Port, $this->Socket);
- if (!$this->connect_errno) {
- $this->Connected = true;
- break;
- }
- sleep(1);
- }
- if ($this->connect_errno) {
- $Errno = $this->connect_errno;
- $Error = $this->connect_error;
- $this->error("Connection failed. (".strval($Errno).": ".strval($Error).")");
- $Debug->set_flag("Could not connect to Sphinx server $this->Ident. (".strval($Errno).": ".strval($Error).")");
- } else {
- $Debug->set_flag("Connected to Sphinx server $this->Ident");
- }
- }
+ /**
+ * Connect the Sphinxql object to the Sphinx server
+ */
+ public function sph_connect() {
+ if ($this->Connected || $this->connect_errno) {
+ return;
+ }
+ global $Debug;
+ $Debug->set_flag("Connecting to Sphinx server $this->Ident");
+ for ($Attempt = 0; $Attempt < 3; $Attempt++) {
+ parent::__construct($this->Server, '', '', '', $this->Port, $this->Socket);
+ if (!$this->connect_errno) {
+ $this->Connected = true;
+ break;
+ }
+ sleep(1);
+ }
+ if ($this->connect_errno) {
+ $Errno = $this->connect_errno;
+ $Error = $this->connect_error;
+ $this->error("Connection failed. (".strval($Errno).": ".strval($Error).")");
+ $Debug->set_flag("Could not connect to Sphinx server $this->Ident. (".strval($Errno).": ".strval($Error).")");
+ } else {
+ $Debug->set_flag("Connected to Sphinx server $this->Ident");
+ }
+ }
- /**
- * Print a message to privileged users and optionally halt page processing
- *
- * @param string $Msg message to display
- * @param bool $Halt halt page processing. Default is to continue processing the page
- * @return Sphinxql object
- */
- public function error($Msg, $Halt = false) {
- global $Debug;
- $ErrorMsg = 'SphinxQL ('.$this->Ident.'): '.strval($Msg);
- $Debug->analysis('SphinxQL Error', $ErrorMsg, 3600*24);
- if ($Halt === true && (DEBUG_MODE || check_perms('site_debug'))) {
- echo ''.display_str($ErrorMsg).''; - die(); - } elseif ($Halt === true) { - error('-1'); - } - } + /** + * Print a message to privileged users and optionally halt page processing + * + * @param string $Msg message to display + * @param bool $Halt halt page processing. Default is to continue processing the page + * @return Sphinxql object + */ + public function error($Msg, $Halt = false) { + global $Debug; + $ErrorMsg = 'SphinxQL ('.$this->Ident.'): '.strval($Msg); + $Debug->analysis('SphinxQL Error', $ErrorMsg, 3600*24); + if ($Halt === true && (DEBUG_MODE || check_perms('site_debug'))) { + echo '
'.display_str($ErrorMsg).''; + die(); + } elseif ($Halt === true) { + error('-1'); + } + } - /** - * Escape special characters before sending them to the Sphinx server. - * Two escapes needed because the first one is eaten up by the mysql driver. - * Lowercase ASCII characters because some Sphinx operators are all caps words. - * - * @param string $String string to escape - * @return string escaped string - */ - public static function sph_escape_string($String) { - return strtr(strtolower($String), array( - '('=>'\\\\(', - ')'=>'\\\\)', - '|'=>'\\\\|', - '-'=>'\\\\-', - '@'=>'\\\\@', - '~'=>'\\\\~', - '&'=>'\\\\&', - '\''=>'\\\'', - '<'=>'\\\\<', - '!'=>'\\\\!', - '"'=>'\\\\"', - '/'=>'\\\\/', - '*'=>'\\\\*', - '$'=>'\\\\$', - '^'=>'\\\\^', - '\\'=>'\\\\\\\\') - ); - } + /** + * Escape special characters before sending them to the Sphinx server. + * Two escapes needed because the first one is eaten up by the mysql driver. + * Lowercase ASCII characters because some Sphinx operators are all caps words. + * + * @param string $String string to escape + * @return string escaped string + */ + public static function sph_escape_string($String) { + return strtr(strtolower($String), array( + '('=>'\\\\(', + ')'=>'\\\\)', + '|'=>'\\\\|', + '-'=>'\\\\-', + '@'=>'\\\\@', + '~'=>'\\\\~', + '&'=>'\\\\&', + '\''=>'\\\'', + '<'=>'\\\\<', + '!'=>'\\\\!', + '"'=>'\\\\"', + '/'=>'\\\\/', + '*'=>'\\\\*', + '$'=>'\\\\$', + '^'=>'\\\\^', + '\\'=>'\\\\\\\\') + ); + } - /** - * Register sent queries globally for later retrieval by debug functions - * - * @param string $QueryString query text - * @param param $QueryProcessTime time building and processing the query - */ - public static function register_query($QueryString, $QueryProcessTime) { - self::$Queries[] = array($QueryString, $QueryProcessTime); - self::$Time += $QueryProcessTime; - } + /** + * Register sent queries globally for later retrieval by debug functions + * + * @param string $QueryString query text + * @param param $QueryProcessTime time building and processing the query + */ + public static function register_query($QueryString, $QueryProcessTime) { + self::$Queries[] = array($QueryString, $QueryProcessTime); + self::$Time += $QueryProcessTime; + } } diff --git a/classes/sphinxqlquery.class.php b/classes/sphinxqlquery.class.php index b03f8e911..979fc451c 100644 --- a/classes/sphinxqlquery.class.php +++ b/classes/sphinxqlquery.class.php @@ -1,388 +1,388 @@ -Sphinxql = Sphinxql::init_connection($Server, $Port, $Socket); - $this->reset(); - } + /** + * Initialize Sphinxql object + * + * @param string $Server server address or hostname + * @param int $Port listening port + * @param string $Socket Unix socket address, overrides $Server:$Port + */ + public function __construct($Server = SPHINXQL_HOST, $Port = SPHINXQL_PORT, $Socket = SPHINXQL_SOCK) { + $this->Sphinxql = Sphinxql::init_connection($Server, $Port, $Socket); + $this->reset(); + } - /** - * Specify what data the Sphinx query is supposed to return - * - * @param string $Fields Attributes and expressions - * @return current SphinxqlQuery object - */ - public function select($Fields) { - $this->Select = $Fields; - return $this; - } + /** + * Specify what data the Sphinx query is supposed to return + * + * @param string $Fields Attributes and expressions + * @return current SphinxqlQuery object + */ + public function select($Fields) { + $this->Select = $Fields; + return $this; + } - /** - * Specify the indexes to use in the search - * - * @param string $Indexes comma separated list of indexes - * @return current SphinxqlQuery object - */ - public function from($Indexes) { - $this->Indexes = $Indexes; - return $this; - } + /** + * Specify the indexes to use in the search + * + * @param string $Indexes comma separated list of indexes + * @return current SphinxqlQuery object + */ + public function from($Indexes) { + $this->Indexes = $Indexes; + return $this; + } - /** - * Add attribute filter. Calling multiple filter functions results in boolean AND between each condition. - * - * @param string $Attribute attribute which the filter will apply to - * @param mixed $Values scalar or array of numerical values. Array uses boolean OR in query condition - * @param bool $Exclude whether to exclude or include matching documents. Default mode is to include matches - * @return current SphinxqlQuery object - */ - public function where($Attribute, $Values, $Exclude = false) { - if (empty($Attribute) || !isset($Values)) { - $this->error("Attribute name and filter value are required."); - return $this; - } - $Filters = array(); - if (is_array($Values)) { - foreach ($Values as $Value) { - if (!is_number($Value)) { - $this->error("Filters only support numeric values."); - return $this; - } - } - if ($Exclude) { - $Filters[] = "$Attribute NOT IN (".implode(",", $Values).")"; - } else { - $Filters[] = "$Attribute IN (".implode(",", $Values).")"; - } - } else { - if (!is_number($Values)) { - $this->error("Filters only support numeric values."); - return $this; - } - if ($Exclude) { - $Filters[] = "$Attribute != $Values"; - } else { - $Filters[] = "$Attribute = $Values"; - } - } - $this->Filters[] = implode(" AND ", $Filters); - return $this; - } + /** + * Add attribute filter. Calling multiple filter functions results in boolean AND between each condition. + * + * @param string $Attribute attribute which the filter will apply to + * @param mixed $Values scalar or array of numerical values. Array uses boolean OR in query condition + * @param bool $Exclude whether to exclude or include matching documents. Default mode is to include matches + * @return current SphinxqlQuery object + */ + public function where($Attribute, $Values, $Exclude = false) { + if (empty($Attribute) || !isset($Values)) { + $this->error("Attribute name and filter value are required."); + return $this; + } + $Filters = []; + if (is_array($Values)) { + foreach ($Values as $Value) { + if (!is_number($Value)) { + $this->error("Filters only support numeric values."); + return $this; + } + } + if ($Exclude) { + $Filters[] = "$Attribute NOT IN (".implode(",", $Values).")"; + } else { + $Filters[] = "$Attribute IN (".implode(",", $Values).")"; + } + } else { + if (!is_number($Values)) { + $this->error("Filters only support numeric values."); + return $this; + } + if ($Exclude) { + $Filters[] = "$Attribute != $Values"; + } else { + $Filters[] = "$Attribute = $Values"; + } + } + $this->Filters[] = implode(" AND ", $Filters); + return $this; + } - /** - * Add attribute less-than filter. Calling multiple filter functions results in boolean AND between each condition. - * - * @param string $Attribute attribute which the filter will apply to - * @param array $Value upper limit for matches - * @param bool $Inclusive whether to use <= or < - * @return current SphinxqlQuery object - */ - public function where_lt($Attribute, $Value, $Inclusive = false) { - if (empty($Attribute) || !isset($Value) || !is_number($Value)) { - $this->error("Attribute name is required and only numeric filters are supported."); - return $this; - } - $this->Filters[] = $Inclusive ? "$Attribute <= $Value" : "$Attribute < $Value"; - return $this; - } + /** + * Add attribute less-than filter. Calling multiple filter functions results in boolean AND between each condition. + * + * @param string $Attribute attribute which the filter will apply to + * @param array $Value upper limit for matches + * @param bool $Inclusive whether to use <= or < + * @return current SphinxqlQuery object + */ + public function where_lt($Attribute, $Value, $Inclusive = false) { + if (empty($Attribute) || !isset($Value) || !is_number($Value)) { + $this->error("Attribute name is required and only numeric filters are supported."); + return $this; + } + $this->Filters[] = $Inclusive ? "$Attribute <= $Value" : "$Attribute < $Value"; + return $this; + } - /** - * Add attribute greater-than filter. Calling multiple filter functions results in boolean AND between each condition. - * - * @param string $Attribute attribute which the filter will apply to - * @param array $Value lower limit for matches - * @param bool $Inclusive whether to use >= or > - * @return current SphinxqlQuery object - */ - public function where_gt($Attribute, $Value, $Inclusive = false) { - if (empty($Attribute) || !isset($Value) || !is_number($Value)) { - $this->error("Attribute name is required and only numeric filters are supported."); - return $this; - } - $this->Filters[] = $Inclusive ? "$Attribute >= $Value" : "$Attribute > $Value"; - return $this; - } + /** + * Add attribute greater-than filter. Calling multiple filter functions results in boolean AND between each condition. + * + * @param string $Attribute attribute which the filter will apply to + * @param array $Value lower limit for matches + * @param bool $Inclusive whether to use >= or > + * @return current SphinxqlQuery object + */ + public function where_gt($Attribute, $Value, $Inclusive = false) { + if (empty($Attribute) || !isset($Value) || !is_number($Value)) { + $this->error("Attribute name is required and only numeric filters are supported."); + return $this; + } + $this->Filters[] = $Inclusive ? "$Attribute >= $Value" : "$Attribute > $Value"; + return $this; + } - /** - * Add attribute range filter. Calling multiple filter functions results in boolean AND between each condition. - * - * @param string $Attribute attribute which the filter will apply to - * @param array $Values pair of numerical values that defines the filter range - * @return current SphinxqlQuery object - */ - public function where_between($Attribute, $Values) { - if (empty($Attribute) || empty($Values) || count($Values) != 2 || !is_number($Values[0]) || !is_number($Values[1])) { - $this->error("Filter range requires array of two numerical boundaries as values."); - return $this; - } - $this->Filters[] = "$Attribute BETWEEN $Values[0] AND $Values[1]"; - return $this; - } + /** + * Add attribute range filter. Calling multiple filter functions results in boolean AND between each condition. + * + * @param string $Attribute attribute which the filter will apply to + * @param array $Values pair of numerical values that defines the filter range + * @return current SphinxqlQuery object + */ + public function where_between($Attribute, $Values) { + if (empty($Attribute) || empty($Values) || count($Values) != 2 || !is_number($Values[0]) || !is_number($Values[1])) { + $this->error("Filter range requires array of two numerical boundaries as values."); + return $this; + } + $this->Filters[] = "$Attribute BETWEEN $Values[0] AND $Values[1]"; + return $this; + } - /** - * Add fulltext query expression. Calling multiple filter functions results in boolean AND between each condition. - * Query expression is escaped automatically - * - * @param string $Expr query expression - * @param string $Field field to match $Expr against. Default is *, which means all available fields - * @return current SphinxqlQuery object - */ - public function where_match($Expr, $Field = '*', $Escape = true) { - if (empty($Expr)) { - return $this; - } - if ($Field !== false) { - $Field = "@$Field "; - } - if ($Escape === true) { - $this->Expressions[] = "$Field".Sphinxql::sph_escape_string($Expr); - } else { - $this->Expressions[] = $Field.$Expr; - } - return $this; - } + /** + * Add fulltext query expression. Calling multiple filter functions results in boolean AND between each condition. + * Query expression is escaped automatically + * + * @param string $Expr query expression + * @param string $Field field to match $Expr against. Default is *, which means all available fields + * @return current SphinxqlQuery object + */ + public function where_match($Expr, $Field = '*', $Escape = true) { + if (empty($Expr)) { + return $this; + } + if ($Field !== false) { + $Field = "@$Field "; + } + if ($Escape === true) { + $this->Expressions[] = "$Field".Sphinxql::sph_escape_string($Expr); + } else { + $this->Expressions[] = $Field.$Expr; + } + return $this; + } - /** - * Specify the order of the matches. Calling this function multiple times sets secondary priorities - * - * @param string $Attribute attribute to use for sorting. - * Passing an empty attribute value will clear the current sort settings - * @param string $Mode sort method to apply to the selected attribute - * @return current SphinxqlQuery object - */ - public function order_by($Attribute = false, $Mode = false) { - if (empty($Attribute)) { - $this->SortBy = array(); - } else { - $this->SortBy[] = "$Attribute $Mode"; - } - return $this; - } + /** + * Specify the order of the matches. Calling this function multiple times sets secondary priorities + * + * @param string $Attribute attribute to use for sorting. + * Passing an empty attribute value will clear the current sort settings + * @param string $Mode sort method to apply to the selected attribute + * @return current SphinxqlQuery object + */ + public function order_by($Attribute = false, $Mode = false) { + if (empty($Attribute)) { + $this->SortBy = []; + } else { + $this->SortBy[] = "$Attribute $Mode"; + } + return $this; + } - /** - * Specify how the results are grouped - * - * @param string $Attribute group matches with the same $Attribute value. - * Passing an empty attribute value will clear the current group settings - * @return current SphinxqlQuery object - */ - public function group_by($Attribute = false) { - if (empty($Attribute)) { - $this->GroupBy = ''; - } else { - $this->GroupBy = $Attribute; - } - return $this; - } + /** + * Specify how the results are grouped + * + * @param string $Attribute group matches with the same $Attribute value. + * Passing an empty attribute value will clear the current group settings + * @return current SphinxqlQuery object + */ + public function group_by($Attribute = false) { + if (empty($Attribute)) { + $this->GroupBy = ''; + } else { + $this->GroupBy = $Attribute; + } + return $this; + } - /** - * Specify the order of the results within groups - * - * @param string $Attribute attribute to use for sorting. - * Passing an empty attribute will clear the current group sort settings - * @param string $Mode sort method to apply to the selected attribute - * @return current SphinxqlQuery object - */ - public function order_group_by($Attribute = false, $Mode = false) { - if (empty($Attribute)) { - $this->SortGroupBy = ''; - } else { - $this->SortGroupBy = "$Attribute $Mode"; - } - return $this; - } + /** + * Specify the order of the results within groups + * + * @param string $Attribute attribute to use for sorting. + * Passing an empty attribute will clear the current group sort settings + * @param string $Mode sort method to apply to the selected attribute + * @return current SphinxqlQuery object + */ + public function order_group_by($Attribute = false, $Mode = false) { + if (empty($Attribute)) { + $this->SortGroupBy = ''; + } else { + $this->SortGroupBy = "$Attribute $Mode"; + } + return $this; + } - /** - * Specify the offset and amount of matches to return - * - * @param int $Offset number of matches to discard - * @param int $Limit number of matches to return - * @param int $MaxMatches number of results to store in the Sphinx server's memory. Must be >= ($Offset+$Limit) - * @return current SphinxqlQuery object - */ - public function limit($Offset, $Limit, $MaxMatches = SPHINX_MAX_MATCHES) { - $this->Limits = "$Offset, $Limit"; - $this->set('max_matches', $MaxMatches); - return $this; - } + /** + * Specify the offset and amount of matches to return + * + * @param int $Offset number of matches to discard + * @param int $Limit number of matches to return + * @param int $MaxMatches number of results to store in the Sphinx server's memory. Must be >= ($Offset+$Limit) + * @return current SphinxqlQuery object + */ + public function limit($Offset, $Limit, $MaxMatches = SPHINX_MAX_MATCHES) { + $this->Limits = "$Offset, $Limit"; + $this->set('max_matches', $MaxMatches); + return $this; + } - /** - * Tweak the settings to use for the query. Sanity checking shouldn't be needed as Sphinx already does it - * - * @param string $Name setting name - * @param mixed $Value value - * @return current SphinxqlQuery object - */ - public function set($Name, $Value) { - $this->Options[$Name] = $Value; - return $this; - } + /** + * Tweak the settings to use for the query. Sanity checking shouldn't be needed as Sphinx already does it + * + * @param string $Name setting name + * @param mixed $Value value + * @return current SphinxqlQuery object + */ + public function set($Name, $Value) { + $this->Options[$Name] = $Value; + return $this; + } - /** - * Combine the query options into a valid Sphinx query segment - * - * @return string of options - */ - private function build_options() { - $Options = array(); - foreach ($this->Options as $Option => $Value) { - $Options[] = "$Option = $Value"; - } - return implode(', ', $Options); - } + /** + * Combine the query options into a valid Sphinx query segment + * + * @return string of options + */ + private function build_options() { + $Options = []; + foreach ($this->Options as $Option => $Value) { + $Options[] = "$Option = $Value"; + } + return implode(', ', $Options); + } - /** - * Combine the query conditions into a valid Sphinx query segment - */ - private function build_query() { - if (!$this->Indexes) { - $this->error('Index name is required.'); - return false; - } - $this->QueryString = "SELECT $this->Select\nFROM $this->Indexes"; - if (!empty($this->Expressions)) { - $this->Filters['expr'] = "MATCH('".implode(' ', $this->Expressions)."')"; - } - if (!empty($this->Filters)) { - $this->QueryString .= "\nWHERE ".implode("\n\tAND ", $this->Filters); - unset($this->Filters['expr']); - } - if (!empty($this->GroupBy)) { - $this->QueryString .= "\nGROUP BY $this->GroupBy"; - } - if (!empty($this->SortGroupBy)) { - $this->QueryString .= "\nWITHIN GROUP ORDER BY $this->SortGroupBy"; - } - if (!empty($this->SortBy)) { - $this->QueryString .= "\nORDER BY ".implode(", ", $this->SortBy); - } - if (!empty($this->Limits)) { - $this->QueryString .= "\nLIMIT $this->Limits"; - } - if (!empty($this->Options)) { - $Options = $this->build_options(); - $this->QueryString .= "\nOPTION $Options"; - } - } + /** + * Combine the query conditions into a valid Sphinx query segment + */ + private function build_query() { + if (!$this->Indexes) { + $this->error('Index name is required.'); + return false; + } + $this->QueryString = "SELECT $this->Select\nFROM $this->Indexes"; + if (!empty($this->Expressions)) { + $this->Filters['expr'] = "MATCH('".implode(' ', $this->Expressions)."')"; + } + if (!empty($this->Filters)) { + $this->QueryString .= "\nWHERE ".implode("\n\tAND ", $this->Filters); + unset($this->Filters['expr']); + } + if (!empty($this->GroupBy)) { + $this->QueryString .= "\nGROUP BY $this->GroupBy"; + } + if (!empty($this->SortGroupBy)) { + $this->QueryString .= "\nWITHIN GROUP ORDER BY $this->SortGroupBy"; + } + if (!empty($this->SortBy)) { + $this->QueryString .= "\nORDER BY ".implode(", ", $this->SortBy); + } + if (!empty($this->Limits)) { + $this->QueryString .= "\nLIMIT $this->Limits"; + } + if (!empty($this->Options)) { + $Options = $this->build_options(); + $this->QueryString .= "\nOPTION $Options"; + } + } - /** - * Construct and send the query. Register the query in the global Sphinxql object - * - * @param bool GetMeta whether to fetch meta data for the executed query. Default is yes - * @return SphinxqlResult object - */ - public function query($GetMeta = true) { - $QueryStartTime = microtime(true); - $this->build_query(); - if (count($this->Errors) > 0) { - $ErrorMsg = implode("\n", $this->Errors); - $this->Sphinxql->error("Query builder found errors:\n$ErrorMsg"); - return new SphinxqlResult(null, null, 1, $ErrorMsg); - } - $QueryString = $this->QueryString; - $Result = $this->send_query($GetMeta); - $QueryProcessTime = (microtime(true) - $QueryStartTime)*1000; - Sphinxql::register_query($QueryString, $QueryProcessTime); - return $Result; - } + /** + * Construct and send the query. Register the query in the global Sphinxql object + * + * @param bool GetMeta whether to fetch meta data for the executed query. Default is yes + * @return SphinxqlResult object + */ + public function query($GetMeta = true) { + $QueryStartTime = microtime(true); + $this->build_query(); + if (count($this->Errors) > 0) { + $ErrorMsg = implode("\n", $this->Errors); + $this->Sphinxql->error("Query builder found errors:\n$ErrorMsg"); + return new SphinxqlResult(null, null, 1, $ErrorMsg); + } + $QueryString = $this->QueryString; + $Result = $this->send_query($GetMeta); + $QueryProcessTime = (microtime(true) - $QueryStartTime)*1000; + Sphinxql::register_query($QueryString, $QueryProcessTime); + return $Result; + } - /** - * Run a manually constructed query - * - * @param string Query query expression - * @param bool GetMeta whether to fetch meta data for the executed query. Default is yes - * @return SphinxqlResult object - */ - public function raw_query($Query, $GetMeta = true) { - $this->QueryString = $Query; - return $this->send_query($GetMeta); - } + /** + * Run a manually constructed query + * + * @param string Query query expression + * @param bool GetMeta whether to fetch meta data for the executed query. Default is yes + * @return SphinxqlResult object + */ + public function raw_query($Query, $GetMeta = true) { + $this->QueryString = $Query; + return $this->send_query($GetMeta); + } - /** - * Run a pre-processed query. Only used internally - * - * @param bool GetMeta whether to fetch meta data for the executed query - * @return SphinxqlResult object - */ - private function send_query($GetMeta) { - if (!$this->QueryString) { - return false; - } - $this->Sphinxql->sph_connect(); - $Result = $this->Sphinxql->query($this->QueryString); - if ($Result === false) { - $Errno = $this->Sphinxql->errno; - $Error = $this->Sphinxql->error; - $this->Sphinxql->error("Query returned error $Errno ($Error).\n$this->QueryString"); - $Meta = null; - } else { - $Errno = 0; - $Error = ''; - $Meta = $GetMeta ? $this->get_meta() : null; - } - return new SphinxqlResult($Result, $Meta, $Errno, $Error); - } + /** + * Run a pre-processed query. Only used internally + * + * @param bool GetMeta whether to fetch meta data for the executed query + * @return SphinxqlResult object + */ + private function send_query($GetMeta) { + if (!$this->QueryString) { + return false; + } + $this->Sphinxql->sph_connect(); + $Result = $this->Sphinxql->query($this->QueryString); + if ($Result === false) { + $Errno = $this->Sphinxql->errno; + $Error = $this->Sphinxql->error; + $this->Sphinxql->error("Query returned error $Errno ($Error).\n$this->QueryString"); + $Meta = null; + } else { + $Errno = 0; + $Error = ''; + $Meta = $GetMeta ? $this->get_meta() : null; + } + return new SphinxqlResult($Result, $Meta, $Errno, $Error); + } - /** - * Reset all query options and conditions - */ - public function reset() { - $this->Errors = array(); - $this->Expressions = array(); - $this->Filters = array(); - $this->GroupBy = ''; - $this->Indexes = ''; - $this->Limits = array(); - $this->Options = array('ranker' => 'none'); - $this->QueryString = ''; - $this->Select = '*'; - $this->SortBy = array(); - $this->SortGroupBy = ''; - } + /** + * Reset all query options and conditions + */ + public function reset() { + $this->Errors = []; + $this->Expressions = []; + $this->Filters = []; + $this->GroupBy = ''; + $this->Indexes = ''; + $this->Limits = []; + $this->Options = array('ranker' => 'none'); + $this->QueryString = ''; + $this->Select = '*'; + $this->SortBy = []; + $this->SortGroupBy = ''; + } - /** - * Fetch and store meta data for the last executed query - * - * @return meta data - */ - private function get_meta() { - return $this->raw_query("SHOW META", false)->to_pair(0, 1); - } + /** + * Fetch and store meta data for the last executed query + * + * @return meta data + */ + private function get_meta() { + return $this->raw_query("SHOW META", false)->to_pair(0, 1); + } - /** - * Copy attribute filters from another SphinxqlQuery object - * - * @param SphinxqlQuery $SphQLSource object to copy the filters from - * @return current SphinxqlQuery object - */ - public function copy_attributes_from($SphQLSource) { - $this->Filters = $SphQLSource->Filters; - } + /** + * Copy attribute filters from another SphinxqlQuery object + * + * @param SphinxqlQuery $SphQLSource object to copy the filters from + * @return current SphinxqlQuery object + */ + public function copy_attributes_from($SphQLSource) { + $this->Filters = $SphQLSource->Filters; + } - /** - * Store error messages - */ - private function error($Msg) { - $this->Errors[] = $Msg; - } + /** + * Store error messages + */ + private function error($Msg) { + $this->Errors[] = $Msg; + } } diff --git a/classes/sphinxqlresult.class.php b/classes/sphinxqlresult.class.php index 9fd431855..d50c48fc8 100644 --- a/classes/sphinxqlresult.class.php +++ b/classes/sphinxqlresult.class.php @@ -1,143 +1,143 @@ -Result = $Result; - $this->Meta = $Meta; - $this->Errno = $Errno; - $this->Error = $Error; - } + /** + * Create Sphinxql result object + * + * @param mysqli_result $Result query results + * @param array $Meta meta data for the query + * @param int $Errno error code returned by the query upon failure + * @param string $Error error message returned by the query upon failure + */ + public function __construct($Result, $Meta, $Errno, $Error) { + $this->Result = $Result; + $this->Meta = $Meta; + $this->Errno = $Errno; + $this->Error = $Error; + } - /** - * Redirect to the Mysqli result object if a nonexistent method is called - * - * @param string $Name method name - * @param array $Arguments arguments used in the function call - * @return whatever the parent function returns - */ - public function __call($Name, $Arguments) { - return call_user_func_array(array($this->Result, $Name), $Arguments); - } + /** + * Redirect to the Mysqli result object if a nonexistent method is called + * + * @param string $Name method name + * @param array $Arguments arguments used in the function call + * @return whatever the parent function returns + */ + public function __call($Name, $Arguments) { + return call_user_func_array(array($this->Result, $Name), $Arguments); + } - /** - * Did the query find anything? - * - * @return bool results were found - */ - public function has_results() { - return $this->get_meta('total') > 0; - } + /** + * Did the query find anything? + * + * @return bool results were found + */ + public function has_results() { + return $this->get_meta('total') > 0; + } - /** - * Collect and return the specified key of all results as a list - * - * @param string $Key key containing the desired data - * @return array with the $Key value of all results - */ - public function collect($Key) { - $Return = array(); - while ($Row = $this->fetch_array()) { - $Return[] = $Row[$Key]; - } - $this->data_seek(0); - return $Return; - } + /** + * Collect and return the specified key of all results as a list + * + * @param string $Key key containing the desired data + * @return array with the $Key value of all results + */ + public function collect($Key) { + $Return = []; + while ($Row = $this->fetch_array()) { + $Return[] = $Row[$Key]; + } + $this->data_seek(0); + return $Return; + } - /** - * Collect and return all available data for the matches optionally indexed by a specified key - * - * @param string $Key key to use as indexing value - * @param string $ResultType method to use when fetching data from the mysqli_result object. Default is MYSQLI_ASSOC - * @return array with all available data for the matches - */ - public function to_array($Key, $ResultType = MYSQLI_ASSOC) { - $Return = array(); - while ($Row = $this->fetch_array($ResultType)) { - if ($Key !== false) { - $Return[$Row[$Key]] = $Row; - } else { - $Return[] = $Row; - } - } - $this->data_seek(0); - return $Return; - } + /** + * Collect and return all available data for the matches optionally indexed by a specified key + * + * @param string $Key key to use as indexing value + * @param string $ResultType method to use when fetching data from the mysqli_result object. Default is MYSQLI_ASSOC + * @return array with all available data for the matches + */ + public function to_array($Key, $ResultType = MYSQLI_ASSOC) { + $Return = []; + while ($Row = $this->fetch_array($ResultType)) { + if ($Key !== false) { + $Return[$Row[$Key]] = $Row; + } else { + $Return[] = $Row; + } + } + $this->data_seek(0); + return $Return; + } - /** - * Collect pairs of keys for all matches - * - * @param string $Key1 key to use as indexing value - * @param string $Key2 key to use as value - * @return array with $Key1 => $Key2 pairs for matches - */ - public function to_pair($Key1, $Key2) { - $Return = array(); - while ($Row = $this->fetch_array()) { - $Return[$Row[$Key1]] = $Row[$Key2]; - } - $this->data_seek(0); - return $Return; - } + /** + * Collect pairs of keys for all matches + * + * @param string $Key1 key to use as indexing value + * @param string $Key2 key to use as value + * @return array with $Key1 => $Key2 pairs for matches + */ + public function to_pair($Key1, $Key2) { + $Return = []; + while ($Row = $this->fetch_array()) { + $Return[$Row[$Key1]] = $Row[$Key2]; + } + $this->data_seek(0); + return $Return; + } - /** - * Return specified portions of the current Sphinxql result object's meta data - * - * @param mixed $Keys scalar or array with keys to return. Default is false, which returns all meta data - * @return array with meta data - */ - public function get_meta($Keys = false) { - if ($Keys !== false) { - if (is_array($Keys)) { - $Return = array(); - foreach ($Keys as $Key) { - if (!isset($this->Meta[$Key])) { - continue; - } - $Return[$Key] = $this->Meta[$Key]; - } - return $Return; - } else { - return isset($this->Meta[$Keys]) ? $this->Meta[$Keys] : false; - } - } else { - return $this->Meta; - } - } + /** + * Return specified portions of the current Sphinxql result object's meta data + * + * @param mixed $Keys scalar or array with keys to return. Default is false, which returns all meta data + * @return array with meta data + */ + public function get_meta($Keys = false) { + if ($Keys !== false) { + if (is_array($Keys)) { + $Return = []; + foreach ($Keys as $Key) { + if (!isset($this->Meta[$Key])) { + continue; + } + $Return[$Key] = $this->Meta[$Key]; + } + return $Return; + } else { + return isset($this->Meta[$Keys]) ? $this->Meta[$Keys] : false; + } + } else { + return $this->Meta; + } + } - /** - * Return specified portions of the current Mysqli result object's information - * - * @param mixed $Keys scalar or array with keys to return. Default is false, which returns all available information - * @return array with result information - */ - public function get_result_info($Keys = false) { - if ($Keys !== false) { - if (is_array($Keys)) { - $Return = array(); - foreach ($Keys as $Key) { - if (!isset($this->Result->$Key)) { - continue; - } - $Return[$Key] = $this->Result->$Key; - } - return $Return; - } else { - return isset($this->Result->$Keys) ? $this->Result->$Keys : false; - } - } else { - return $this->Result; - } - } + /** + * Return specified portions of the current Mysqli result object's information + * + * @param mixed $Keys scalar or array with keys to return. Default is false, which returns all available information + * @return array with result information + */ + public function get_result_info($Keys = false) { + if ($Keys !== false) { + if (is_array($Keys)) { + $Return = []; + foreach ($Keys as $Key) { + if (!isset($this->Result->$Key)) { + continue; + } + $Return[$Key] = $this->Result->$Key; + } + return $Return; + } else { + return isset($this->Result->$Keys) ? $this->Result->$Keys : false; + } + } else { + return $this->Result; + } + } } diff --git a/classes/subscriptions.class.php b/classes/subscriptions.class.php index 21daf3ede..a4024f6bb 100644 --- a/classes/subscriptions.class.php +++ b/classes/subscriptions.class.php @@ -1,402 +1,402 @@ -get_query_id(); - /* - * Explanation of the parameters PageID and Page: Page contains where - * this quote comes from and can be forums, artist, collages, requests - * or torrents. The PageID contains the additional value that is - * necessary for the users_notify_quoted table. The PageIDs for the - * different Page are: forums: TopicID artist: ArtistID collages: - * CollageID requests: RequestID torrents: GroupID - */ - $Matches = array(); - preg_match_all('/\[quote(?:=(.*)(?:\|.*)?)?]|\[\/quote]/iU', $Body, $Matches, PREG_SET_ORDER); + /** + * Parse a post/comment body for quotes and notify all quoted users that have quote notifications enabled. + * @param string $Body + * @param int $PostID + * @param string $Page + * @param int $PageID + */ + public static function quote_notify($Body, $PostID, $Page, $PageID) { + $QueryID = G::$DB->get_query_id(); + /* + * Explanation of the parameters PageID and Page: Page contains where + * this quote comes from and can be forums, artist, collages, requests + * or torrents. The PageID contains the additional value that is + * necessary for the users_notify_quoted table. The PageIDs for the + * different Page are: forums: TopicID artist: ArtistID collages: + * CollageID requests: RequestID torrents: GroupID + */ + $Matches = []; + preg_match_all('/\[quote(?:=(.*)(?:\|.*)?)?]|\[\/quote]/iU', $Body, $Matches, PREG_SET_ORDER); - if (count($Matches)) { - $Usernames = array(); - $Level = 0; - foreach ($Matches as $M) { - if ($M[0] != '[/quote]') { - if ($Level == 0 && isset($M[1]) && strlen($M[1]) > 0 && preg_match(USERNAME_REGEX, $M[1])) { - $Usernames[] = preg_replace('/(^[.,]*)|([.,]*$)/', '', $M[1]); // wut? - } - ++$Level; - } else { - --$Level; - } - } - } - // remove any dupes in the array (the fast way) - $Usernames = array_flip(array_flip($Usernames)); + if (count($Matches)) { + $Usernames = []; + $Level = 0; + foreach ($Matches as $M) { + if ($M[0] != '[/quote]') { + if ($Level == 0 && isset($M[1]) && strlen($M[1]) > 0 && preg_match(USERNAME_REGEX, $M[1])) { + $Usernames[] = preg_replace('/(^[.,]*)|([.,]*$)/', '', $M[1]); // wut? + } + ++$Level; + } else { + --$Level; + } + } + } + // remove any dupes in the array (the fast way) + $Usernames = array_flip(array_flip($Usernames)); - G::$DB->query(" - SELECT m.ID - FROM users_main AS m - LEFT JOIN users_info AS i ON i.UserID = m.ID - WHERE m.Username IN ('" . implode("', '", $Usernames) . "') - AND i.NotifyOnQuote = '1' - AND i.UserID != " . G::$LoggedUser['ID']); + G::$DB->query(" + SELECT m.ID + FROM users_main AS m + LEFT JOIN users_info AS i ON i.UserID = m.ID + WHERE m.Username IN ('" . implode("', '", $Usernames) . "') + AND i.NotifyOnQuote = '1' + AND i.UserID != " . G::$LoggedUser['ID']); - $Results = G::$DB->to_array(); - foreach ($Results as $Result) { - $UserID = db_string($Result['ID']); - $QuoterID = db_string(G::$LoggedUser['ID']); - $Page = db_string($Page); - $PageID = db_string($PageID); - $PostID = db_string($PostID); + $Results = G::$DB->to_array(); + foreach ($Results as $Result) { + $UserID = db_string($Result['ID']); + $QuoterID = db_string(G::$LoggedUser['ID']); + $Page = db_string($Page); + $PageID = db_string($PageID); + $PostID = db_string($PostID); - G::$DB->query(" - INSERT IGNORE INTO users_notify_quoted - (UserID, QuoterID, Page, PageID, PostID, Date) - VALUES - ('$UserID', '$QuoterID', '$Page', '$PageID', '$PostID', '" . sqltime() . "')"); - G::$Cache->delete_value("notify_quoted_$UserID"); - if ($Page == 'forums') { - $URL = site_url() . "forums.php?action=viewthread&postid=$PostID"; - } else { - $URL = site_url() . "comments.php?action=jump&postid=$PostID"; - } - NotificationsManager::send_push($UserID, 'New Quote!', 'Quoted by ' . G::$LoggedUser['Username'] . " $URL", $URL, NotificationsManager::QUOTES); - } - G::$DB->set_query_id($QueryID); - } + G::$DB->query(" + INSERT IGNORE INTO users_notify_quoted + (UserID, QuoterID, Page, PageID, PostID, Date) + VALUES + ('$UserID', '$QuoterID', '$Page', '$PageID', '$PostID', '" . sqltime() . "')"); + G::$Cache->delete_value("notify_quoted_$UserID"); + if ($Page == 'forums') { + $URL = site_url() . "forums.php?action=viewthread&postid=$PostID"; + } else { + $URL = site_url() . "comments.php?action=jump&postid=$PostID"; + } + NotificationsManager::send_push($UserID, 'New Quote!', 'Quoted by ' . G::$LoggedUser['Username'] . " $URL", $URL, NotificationsManager::QUOTES); + } + G::$DB->set_query_id($QueryID); + } - /** - * (Un)subscribe from a forum thread. - * If UserID == 0, G::$LoggedUser[ID] is used - * @param int $TopicID - * @param int $UserID - */ - public static function subscribe($TopicID, $UserID = 0) { - if ($UserID == 0) { - $UserID = G::$LoggedUser['ID']; - } - $QueryID = G::$DB->get_query_id(); - $UserSubscriptions = self::get_subscriptions(); - $Key = self::has_subscribed($TopicID); - if ($Key !== false) { - G::$DB->query(' - DELETE FROM users_subscriptions - WHERE UserID = ' . db_string($UserID) . ' - AND TopicID = ' . db_string($TopicID)); - unset($UserSubscriptions[$Key]); - } else { - G::$DB->query(" - INSERT IGNORE INTO users_subscriptions (UserID, TopicID) - VALUES ($UserID, " . db_string($TopicID) . ")"); - array_push($UserSubscriptions, $TopicID); - } - G::$Cache->replace_value("subscriptions_user_$UserID", $UserSubscriptions, 0); - G::$Cache->delete_value("subscriptions_user_new_$UserID"); - G::$DB->set_query_id($QueryID); - } + /** + * (Un)subscribe from a forum thread. + * If UserID == 0, G::$LoggedUser[ID] is used + * @param int $TopicID + * @param int $UserID + */ + public static function subscribe($TopicID, $UserID = 0) { + if ($UserID == 0) { + $UserID = G::$LoggedUser['ID']; + } + $QueryID = G::$DB->get_query_id(); + $UserSubscriptions = self::get_subscriptions(); + $Key = self::has_subscribed($TopicID); + if ($Key !== false) { + G::$DB->query(' + DELETE FROM users_subscriptions + WHERE UserID = ' . db_string($UserID) . ' + AND TopicID = ' . db_string($TopicID)); + unset($UserSubscriptions[$Key]); + } else { + G::$DB->query(" + INSERT IGNORE INTO users_subscriptions (UserID, TopicID) + VALUES ($UserID, " . db_string($TopicID) . ")"); + array_push($UserSubscriptions, $TopicID); + } + G::$Cache->replace_value("subscriptions_user_$UserID", $UserSubscriptions, 0); + G::$Cache->delete_value("subscriptions_user_new_$UserID"); + G::$DB->set_query_id($QueryID); + } - /** - * (Un)subscribe from comments. - * If UserID == 0, G::$LoggedUser[ID] is used - * @param string $Page 'artist', 'collages', 'requests' or 'torrents' - * @param int $PageID ArtistID, CollageID, RequestID or GroupID - * @param int $UserID - */ - public static function subscribe_comments($Page, $PageID, $UserID = 0) { - if ($UserID == 0) { - $UserID = G::$LoggedUser['ID']; - } - $QueryID = G::$DB->get_query_id(); - $UserCommentSubscriptions = self::get_comment_subscriptions(); - $Key = self::has_subscribed_comments($Page, $PageID); - if ($Key !== false) { - G::$DB->query(" - DELETE FROM users_subscriptions_comments - WHERE UserID = " . db_string($UserID) . " - AND Page = '" . db_string($Page) . "' - AND PageID = " . db_string($PageID)); - unset($UserCommentSubscriptions[$Key]); - } else { - G::$DB->query(" - INSERT IGNORE INTO users_subscriptions_comments - (UserID, Page, PageID) - VALUES - ($UserID, '" . db_string($Page) . "', " . db_string($PageID) . ")"); - array_push($UserCommentSubscriptions, array($Page, $PageID)); - } - G::$Cache->replace_value("subscriptions_comments_user_$UserID", $UserCommentSubscriptions, 0); - G::$Cache->delete_value("subscriptions_comments_user_new_$UserID"); - G::$DB->set_query_id($QueryID); - } + /** + * (Un)subscribe from comments. + * If UserID == 0, G::$LoggedUser[ID] is used + * @param string $Page 'artist', 'collages', 'requests' or 'torrents' + * @param int $PageID ArtistID, CollageID, RequestID or GroupID + * @param int $UserID + */ + public static function subscribe_comments($Page, $PageID, $UserID = 0) { + if ($UserID == 0) { + $UserID = G::$LoggedUser['ID']; + } + $QueryID = G::$DB->get_query_id(); + $UserCommentSubscriptions = self::get_comment_subscriptions(); + $Key = self::has_subscribed_comments($Page, $PageID); + if ($Key !== false) { + G::$DB->query(" + DELETE FROM users_subscriptions_comments + WHERE UserID = " . db_string($UserID) . " + AND Page = '" . db_string($Page) . "' + AND PageID = " . db_string($PageID)); + unset($UserCommentSubscriptions[$Key]); + } else { + G::$DB->query(" + INSERT IGNORE INTO users_subscriptions_comments + (UserID, Page, PageID) + VALUES + ($UserID, '" . db_string($Page) . "', " . db_string($PageID) . ")"); + array_push($UserCommentSubscriptions, array($Page, $PageID)); + } + G::$Cache->replace_value("subscriptions_comments_user_$UserID", $UserCommentSubscriptions, 0); + G::$Cache->delete_value("subscriptions_comments_user_new_$UserID"); + G::$DB->set_query_id($QueryID); + } - /** - * Read $UserID's subscriptions. If the cache key isn't set, it gets filled. - * If UserID == 0, G::$LoggedUser[ID] is used - * @param int $UserID - * @return array Array of TopicIDs - */ - public static function get_subscriptions($UserID = 0) { - if ($UserID == 0) { - $UserID = G::$LoggedUser['ID']; - } - $QueryID = G::$DB->get_query_id(); - $UserSubscriptions = G::$Cache->get_value("subscriptions_user_$UserID"); - if ($UserSubscriptions === false) { - G::$DB->query(' - SELECT TopicID - FROM users_subscriptions - WHERE UserID = ' . db_string($UserID)); - $UserSubscriptions = G::$DB->collect(0); - G::$Cache->cache_value("subscriptions_user_$UserID", $UserSubscriptions, 0); - } - G::$DB->set_query_id($QueryID); - return $UserSubscriptions; - } + /** + * Read $UserID's subscriptions. If the cache key isn't set, it gets filled. + * If UserID == 0, G::$LoggedUser[ID] is used + * @param int $UserID + * @return array Array of TopicIDs + */ + public static function get_subscriptions($UserID = 0) { + if ($UserID == 0) { + $UserID = G::$LoggedUser['ID']; + } + $QueryID = G::$DB->get_query_id(); + $UserSubscriptions = G::$Cache->get_value("subscriptions_user_$UserID"); + if ($UserSubscriptions === false) { + G::$DB->query(' + SELECT TopicID + FROM users_subscriptions + WHERE UserID = ' . db_string($UserID)); + $UserSubscriptions = G::$DB->collect(0); + G::$Cache->cache_value("subscriptions_user_$UserID", $UserSubscriptions, 0); + } + G::$DB->set_query_id($QueryID); + return $UserSubscriptions; + } - /** - * Same as self::get_subscriptions, but for comment subscriptions - * @param int $UserID - * @return array Array of ($Page, $PageID) - */ - public static function get_comment_subscriptions($UserID = 0) { - if ($UserID == 0) { - $UserID = G::$LoggedUser['ID']; - } - $QueryID = G::$DB->get_query_id(); - $UserCommentSubscriptions = G::$Cache->get_value("subscriptions_comments_user_$UserID"); - if ($UserCommentSubscriptions === false) { - G::$DB->query(' - SELECT Page, PageID - FROM users_subscriptions_comments - WHERE UserID = ' . db_string($UserID)); - $UserCommentSubscriptions = G::$DB->to_array(false, MYSQLI_NUM); - G::$Cache->cache_value("subscriptions_comments_user_$UserID", $UserCommentSubscriptions, 0); - } - G::$DB->set_query_id($QueryID); - return $UserCommentSubscriptions; - } + /** + * Same as self::get_subscriptions, but for comment subscriptions + * @param int $UserID + * @return array Array of ($Page, $PageID) + */ + public static function get_comment_subscriptions($UserID = 0) { + if ($UserID == 0) { + $UserID = G::$LoggedUser['ID']; + } + $QueryID = G::$DB->get_query_id(); + $UserCommentSubscriptions = G::$Cache->get_value("subscriptions_comments_user_$UserID"); + if ($UserCommentSubscriptions === false) { + G::$DB->query(' + SELECT Page, PageID + FROM users_subscriptions_comments + WHERE UserID = ' . db_string($UserID)); + $UserCommentSubscriptions = G::$DB->to_array(false, MYSQLI_NUM); + G::$Cache->cache_value("subscriptions_comments_user_$UserID", $UserCommentSubscriptions, 0); + } + G::$DB->set_query_id($QueryID); + return $UserCommentSubscriptions; + } - /** - * Returns whether or not the current user has new subscriptions. This handles both forum and comment subscriptions. - * @return int Number of unread subscribed threads/comments - */ - public static function has_new_subscriptions() { - $QueryID = G::$DB->get_query_id(); + /** + * Returns whether or not the current user has new subscriptions. This handles both forum and comment subscriptions. + * @return int Number of unread subscribed threads/comments + */ + public static function has_new_subscriptions() { + $QueryID = G::$DB->get_query_id(); - $NewSubscriptions = G::$Cache->get_value('subscriptions_user_new_' . G::$LoggedUser['ID']); - if ($NewSubscriptions === false) { - // forum subscriptions - G::$DB->query(" - SELECT COUNT(1) - FROM users_subscriptions AS s - LEFT JOIN forums_last_read_topics AS l ON l.UserID = s.UserID AND l.TopicID = s.TopicID - JOIN forums_topics AS t ON t.ID = s.TopicID - JOIN forums AS f ON f.ID = t.ForumID - WHERE " . Forums::user_forums_sql() . " - AND IF(t.IsLocked = '1' AND t.IsSticky = '0'" . ", t.LastPostID, IF(l.PostID IS NULL, 0, l.PostID)) < t.LastPostID - AND s.UserID = " . G::$LoggedUser['ID']); - list($NewForumSubscriptions) = G::$DB->next_record(); + $NewSubscriptions = G::$Cache->get_value('subscriptions_user_new_' . G::$LoggedUser['ID']); + if ($NewSubscriptions === false) { + // forum subscriptions + G::$DB->query(" + SELECT COUNT(1) + FROM users_subscriptions AS s + LEFT JOIN forums_last_read_topics AS l ON l.UserID = s.UserID AND l.TopicID = s.TopicID + JOIN forums_topics AS t ON t.ID = s.TopicID + JOIN forums AS f ON f.ID = t.ForumID + WHERE " . Forums::user_forums_sql() . " + AND IF(t.IsLocked = '1' AND t.IsSticky = '0'" . ", t.LastPostID, IF(l.PostID IS NULL, 0, l.PostID)) < t.LastPostID + AND s.UserID = " . G::$LoggedUser['ID']); + list($NewForumSubscriptions) = G::$DB->next_record(); - // comment subscriptions - G::$DB->query(" - SELECT COUNT(1) - FROM users_subscriptions_comments AS s - LEFT JOIN users_comments_last_read AS lr ON lr.UserID = s.UserID AND lr.Page = s.Page AND lr.PageID = s.PageID - LEFT JOIN comments AS c ON c.ID = (SELECT MAX(ID) FROM comments WHERE Page = s.Page AND PageID = s.PageID) - LEFT JOIN collages AS co ON s.Page = 'collages' AND co.ID = s.PageID - WHERE s.UserID = " . G::$LoggedUser['ID'] . " - AND (s.Page != 'collages' OR co.Deleted = '0') - AND IF(lr.PostID IS NULL, 0, lr.PostID) < c.ID"); - list($NewCommentSubscriptions) = G::$DB->next_record(); + // comment subscriptions + G::$DB->query(" + SELECT COUNT(1) + FROM users_subscriptions_comments AS s + LEFT JOIN users_comments_last_read AS lr ON lr.UserID = s.UserID AND lr.Page = s.Page AND lr.PageID = s.PageID + LEFT JOIN comments AS c ON c.ID = (SELECT MAX(ID) FROM comments WHERE Page = s.Page AND PageID = s.PageID) + LEFT JOIN collages AS co ON s.Page = 'collages' AND co.ID = s.PageID + WHERE s.UserID = " . G::$LoggedUser['ID'] . " + AND (s.Page != 'collages' OR co.Deleted = '0') + AND IF(lr.PostID IS NULL, 0, lr.PostID) < c.ID"); + list($NewCommentSubscriptions) = G::$DB->next_record(); - $NewSubscriptions = $NewForumSubscriptions + $NewCommentSubscriptions; - G::$Cache->cache_value('subscriptions_user_new_' . G::$LoggedUser['ID'], $NewSubscriptions, 0); - } - G::$DB->set_query_id($QueryID); - return (int)$NewSubscriptions; - } + $NewSubscriptions = $NewForumSubscriptions + $NewCommentSubscriptions; + G::$Cache->cache_value('subscriptions_user_new_' . G::$LoggedUser['ID'], $NewSubscriptions, 0); + } + G::$DB->set_query_id($QueryID); + return (int)$NewSubscriptions; + } - /** - * Returns whether or not the current user has new quote notifications. - * @return int Number of unread quote notifications - */ - public static function has_new_quote_notifications() { - $QuoteNotificationsCount = G::$Cache->get_value('notify_quoted_' . G::$LoggedUser['ID']); - if ($QuoteNotificationsCount === false) { - $sql = " - SELECT COUNT(1) - FROM users_notify_quoted AS q - LEFT JOIN forums_topics AS t ON t.ID = q.PageID - LEFT JOIN forums AS f ON f.ID = t.ForumID - LEFT JOIN collages AS c ON q.Page = 'collages' AND c.ID = q.PageID - WHERE q.UserID = " . G::$LoggedUser['ID'] . " - AND q.UnRead - AND (q.Page != 'forums' OR " . Forums::user_forums_sql() . ") - AND (q.Page != 'collages' OR c.Deleted = '0')"; - $QueryID = G::$DB->get_query_id(); - G::$DB->query($sql); - list($QuoteNotificationsCount) = G::$DB->next_record(); - G::$DB->set_query_id($QueryID); - G::$Cache->cache_value('notify_quoted_' . G::$LoggedUser['ID'], $QuoteNotificationsCount, 0); - } - return (int)$QuoteNotificationsCount; - } + /** + * Returns whether or not the current user has new quote notifications. + * @return int Number of unread quote notifications + */ + public static function has_new_quote_notifications() { + $QuoteNotificationsCount = G::$Cache->get_value('notify_quoted_' . G::$LoggedUser['ID']); + if ($QuoteNotificationsCount === false) { + $sql = " + SELECT COUNT(1) + FROM users_notify_quoted AS q + LEFT JOIN forums_topics AS t ON t.ID = q.PageID + LEFT JOIN forums AS f ON f.ID = t.ForumID + LEFT JOIN collages AS c ON q.Page = 'collages' AND c.ID = q.PageID + WHERE q.UserID = " . G::$LoggedUser['ID'] . " + AND q.UnRead + AND (q.Page != 'forums' OR " . Forums::user_forums_sql() . ") + AND (q.Page != 'collages' OR c.Deleted = '0')"; + $QueryID = G::$DB->get_query_id(); + G::$DB->query($sql); + list($QuoteNotificationsCount) = G::$DB->next_record(); + G::$DB->set_query_id($QueryID); + G::$Cache->cache_value('notify_quoted_' . G::$LoggedUser['ID'], $QuoteNotificationsCount, 0); + } + return (int)$QuoteNotificationsCount; + } - /** - * Returns the key which holds this $TopicID in the subscription array. - * Use type-aware comparison operators with this! (ie. if (self::has_subscribed($TopicID) !== false) { ... }) - * @param int $TopicID - * @return bool|int - */ - public static function has_subscribed($TopicID) { - $UserSubscriptions = self::get_subscriptions(); - return array_search($TopicID, $UserSubscriptions); - } + /** + * Returns the key which holds this $TopicID in the subscription array. + * Use type-aware comparison operators with this! (ie. if (self::has_subscribed($TopicID) !== false) { ... }) + * @param int $TopicID + * @return bool|int + */ + public static function has_subscribed($TopicID) { + $UserSubscriptions = self::get_subscriptions(); + return array_search($TopicID, $UserSubscriptions); + } - /** - * Same as has_subscribed, but for comment subscriptions. - * @param string $Page 'artist', 'collages', 'requests' or 'torrents' - * @param int $PageID - * @return bool|int - */ - public static function has_subscribed_comments($Page, $PageID) { - $UserCommentSubscriptions = self::get_comment_subscriptions(); - return array_search(array($Page, $PageID), $UserCommentSubscriptions); - } + /** + * Same as has_subscribed, but for comment subscriptions. + * @param string $Page 'artist', 'collages', 'requests' or 'torrents' + * @param int $PageID + * @return bool|int + */ + public static function has_subscribed_comments($Page, $PageID) { + $UserCommentSubscriptions = self::get_comment_subscriptions(); + return array_search(array($Page, $PageID), $UserCommentSubscriptions); + } - /** - * Clear the subscription cache for all subscribers of a forum thread or artist/collage/request/torrent comments. - * @param string $Page 'forums', 'artist', 'collages', 'requests' or 'torrents' - * @param type $PageID TopicID, ArtistID, CollageID, RequestID or GroupID, respectively - */ - public static function flush_subscriptions($Page, $PageID) { - $QueryID = G::$DB->get_query_id(); - if ($Page == 'forums') { - G::$DB->query(" - SELECT UserID - FROM users_subscriptions - WHERE TopicID = '$PageID'"); - } else { - G::$DB->query(" - SELECT UserID - FROM users_subscriptions_comments - WHERE Page = '$Page' - AND PageID = '$PageID'"); - } - $Subscribers = G::$DB->collect('UserID'); - foreach ($Subscribers as $Subscriber) { - G::$Cache->delete_value("subscriptions_user_new_$Subscriber"); - } - G::$DB->set_query_id($QueryID); - } + /** + * Clear the subscription cache for all subscribers of a forum thread or artist/collage/request/torrent comments. + * @param string $Page 'forums', 'artist', 'collages', 'requests' or 'torrents' + * @param type $PageID TopicID, ArtistID, CollageID, RequestID or GroupID, respectively + */ + public static function flush_subscriptions($Page, $PageID) { + $QueryID = G::$DB->get_query_id(); + if ($Page == 'forums') { + G::$DB->query(" + SELECT UserID + FROM users_subscriptions + WHERE TopicID = '$PageID'"); + } else { + G::$DB->query(" + SELECT UserID + FROM users_subscriptions_comments + WHERE Page = '$Page' + AND PageID = '$PageID'"); + } + $Subscribers = G::$DB->collect('UserID'); + foreach ($Subscribers as $Subscriber) { + G::$Cache->delete_value("subscriptions_user_new_$Subscriber"); + } + G::$DB->set_query_id($QueryID); + } - /** - * Move all $Page subscriptions from $OldPageID to $NewPageID (for example when merging torrent groups). - * Passing $NewPageID = null will delete the subscriptions. - * @param string $Page 'forums', 'artist', 'collages', 'requests' or 'torrents' - * @param int $OldPageID TopicID, ArtistID, CollageID, RequestID or GroupID, respectively - * @param int|null $NewPageID As $OldPageID, or null to delete the subscriptions - */ - public static function move_subscriptions($Page, $OldPageID, $NewPageID) { - self::flush_subscriptions($Page, $OldPageID); - $QueryID = G::$DB->get_query_id(); - if ($Page == 'forums') { - if ($NewPageID !== null) { - G::$DB->query(" - UPDATE IGNORE users_subscriptions - SET TopicID = '$NewPageID' - WHERE TopicID = '$OldPageID'"); - // explanation see below - G::$DB->query(" - UPDATE IGNORE forums_last_read_topics - SET TopicID = $NewPageID - WHERE TopicID = $OldPageID"); - G::$DB->query(" - SELECT UserID, MIN(PostID) - FROM forums_last_read_topics - WHERE TopicID IN ($OldPageID, $NewPageID) - GROUP BY UserID - HAVING COUNT(1) = 2"); - $Results = G::$DB->to_array(false, MYSQLI_NUM); - foreach ($Results as $Result) { - G::$DB->query(" - UPDATE forums_last_read_topics - SET PostID = $Result[1] - WHERE TopicID = $NewPageID - AND UserID = $Result[0]"); - } - } - G::$DB->query(" - DELETE FROM users_subscriptions - WHERE TopicID = '$OldPageID'"); - G::$DB->query(" - DELETE FROM forums_last_read_topics - WHERE TopicID = $OldPageID"); - } else { - if ($NewPageID !== null) { - G::$DB->query(" - UPDATE IGNORE users_subscriptions_comments - SET PageID = '$NewPageID' - WHERE Page = '$Page' - AND PageID = '$OldPageID'"); - // last read handling - // 1) update all rows that have no key collisions (i.e. users that haven't previously read both pages or if there are only comments on one page) - G::$DB->query(" - UPDATE IGNORE users_comments_last_read - SET PageID = '$NewPageID' - WHERE Page = '$Page' - AND PageID = $OldPageID"); - // 2) get all last read records with key collisions (i.e. there are records for one user for both PageIDs) - G::$DB->query(" - SELECT UserID, MIN(PostID) - FROM users_comments_last_read - WHERE Page = '$Page' - AND PageID IN ($OldPageID, $NewPageID) - GROUP BY UserID - HAVING COUNT(1) = 2"); - $Results = G::$DB->to_array(false, MYSQLI_NUM); - // 3) update rows for those people found in 2) to the earlier post - foreach ($Results as $Result) { - G::$DB->query(" - UPDATE users_comments_last_read - SET PostID = $Result[1] - WHERE Page = '$Page' - AND PageID = $NewPageID - AND UserID = $Result[0]"); - } - } - G::$DB->query(" - DELETE FROM users_subscriptions_comments - WHERE Page = '$Page' - AND PageID = '$OldPageID'"); - G::$DB->query(" - DELETE FROM users_comments_last_read - WHERE Page = '$Page' - AND PageID = '$OldPageID'"); - } - G::$DB->set_query_id($QueryID); - } + /** + * Move all $Page subscriptions from $OldPageID to $NewPageID (for example when merging torrent groups). + * Passing $NewPageID = null will delete the subscriptions. + * @param string $Page 'forums', 'artist', 'collages', 'requests' or 'torrents' + * @param int $OldPageID TopicID, ArtistID, CollageID, RequestID or GroupID, respectively + * @param int|null $NewPageID As $OldPageID, or null to delete the subscriptions + */ + public static function move_subscriptions($Page, $OldPageID, $NewPageID) { + self::flush_subscriptions($Page, $OldPageID); + $QueryID = G::$DB->get_query_id(); + if ($Page == 'forums') { + if ($NewPageID !== null) { + G::$DB->query(" + UPDATE IGNORE users_subscriptions + SET TopicID = '$NewPageID' + WHERE TopicID = '$OldPageID'"); + // explanation see below + G::$DB->query(" + UPDATE IGNORE forums_last_read_topics + SET TopicID = $NewPageID + WHERE TopicID = $OldPageID"); + G::$DB->query(" + SELECT UserID, MIN(PostID) + FROM forums_last_read_topics + WHERE TopicID IN ($OldPageID, $NewPageID) + GROUP BY UserID + HAVING COUNT(1) = 2"); + $Results = G::$DB->to_array(false, MYSQLI_NUM); + foreach ($Results as $Result) { + G::$DB->query(" + UPDATE forums_last_read_topics + SET PostID = $Result[1] + WHERE TopicID = $NewPageID + AND UserID = $Result[0]"); + } + } + G::$DB->query(" + DELETE FROM users_subscriptions + WHERE TopicID = '$OldPageID'"); + G::$DB->query(" + DELETE FROM forums_last_read_topics + WHERE TopicID = $OldPageID"); + } else { + if ($NewPageID !== null) { + G::$DB->query(" + UPDATE IGNORE users_subscriptions_comments + SET PageID = '$NewPageID' + WHERE Page = '$Page' + AND PageID = '$OldPageID'"); + // last read handling + // 1) update all rows that have no key collisions (i.e. users that haven't previously read both pages or if there are only comments on one page) + G::$DB->query(" + UPDATE IGNORE users_comments_last_read + SET PageID = '$NewPageID' + WHERE Page = '$Page' + AND PageID = $OldPageID"); + // 2) get all last read records with key collisions (i.e. there are records for one user for both PageIDs) + G::$DB->query(" + SELECT UserID, MIN(PostID) + FROM users_comments_last_read + WHERE Page = '$Page' + AND PageID IN ($OldPageID, $NewPageID) + GROUP BY UserID + HAVING COUNT(1) = 2"); + $Results = G::$DB->to_array(false, MYSQLI_NUM); + // 3) update rows for those people found in 2) to the earlier post + foreach ($Results as $Result) { + G::$DB->query(" + UPDATE users_comments_last_read + SET PostID = $Result[1] + WHERE Page = '$Page' + AND PageID = $NewPageID + AND UserID = $Result[0]"); + } + } + G::$DB->query(" + DELETE FROM users_subscriptions_comments + WHERE Page = '$Page' + AND PageID = '$OldPageID'"); + G::$DB->query(" + DELETE FROM users_comments_last_read + WHERE Page = '$Page' + AND PageID = '$OldPageID'"); + } + G::$DB->set_query_id($QueryID); + } - /** - * Clear the quote notification cache for all subscribers of a forum thread or artist/collage/request/torrent comments. - * @param string $Page 'forums', 'artist', 'collages', 'requests' or 'torrents' - * @param int $PageID TopicID, ArtistID, CollageID, RequestID or GroupID, respectively - */ - public static function flush_quote_notifications($Page, $PageID) { - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - SELECT UserID - FROM users_notify_quoted - WHERE Page = '$Page' - AND PageID = $PageID"); - $Subscribers = G::$DB->collect('UserID'); - foreach ($Subscribers as $Subscriber) { - G::$Cache->delete_value("notify_quoted_$Subscriber"); - } - G::$DB->set_query_id($QueryID); - } + /** + * Clear the quote notification cache for all subscribers of a forum thread or artist/collage/request/torrent comments. + * @param string $Page 'forums', 'artist', 'collages', 'requests' or 'torrents' + * @param int $PageID TopicID, ArtistID, CollageID, RequestID or GroupID, respectively + */ + public static function flush_quote_notifications($Page, $PageID) { + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + SELECT UserID + FROM users_notify_quoted + WHERE Page = '$Page' + AND PageID = $PageID"); + $Subscribers = G::$DB->collect('UserID'); + foreach ($Subscribers as $Subscriber) { + G::$Cache->delete_value("notify_quoted_$Subscriber"); + } + G::$DB->set_query_id($QueryID); + } } diff --git a/classes/tags.class.php b/classes/tags.class.php index efa8b89b5..14d47c5c4 100644 --- a/classes/tags.class.php +++ b/classes/tags.class.php @@ -16,7 +16,7 @@ * Tags::format_top(); * ?> * e.g.: - * pop (2) + * pop (2) * rock (2) * hip.hop (1) * indie (1) @@ -25,255 +25,255 @@ * overall total amount of tags to provide a Top Tags list. Merging is optional. */ class Tags { - /** - * Collects all tags processed by the Tags Class - * @static - * @var array $All Class Tags - */ - private static $All = array(); + /** + * Collects all tags processed by the Tags Class + * @static + * @var array $All Class Tags + */ + private static $All = []; - /** - * All tags in the current instance - * @var array $Tags Instance Tags - */ - private $Tags = null; + /** + * All tags in the current instance + * @var array $Tags Instance Tags + */ + private $Tags = null; - /** - * @var array $TagLink Tag link list - */ - private $TagLink = array(); + /** + * @var array $TagLink Tag link list + */ + private $TagLink = []; - /** - * @var string $Primary The primary tag - */ - private $Primary = ''; + /** + * @var string $Primary The primary tag + */ + private $Primary = ''; - /** - * Filter tags array to remove empty spaces. - * - * @param string $TagList A string of tags separated by a space - * @param boolean $Merge Merge the tag list with the Class' tags - * E.g., compilations and soundtracks are skipped, so false - */ - public function __construct($TagList, $Merge = true) { - if ($TagList) { - $this->Tags = array_filter(explode(' ', str_replace('_', '.', $TagList))); + /** + * Filter tags array to remove empty spaces. + * + * @param string $TagList A string of tags separated by a space + * @param boolean $Merge Merge the tag list with the Class' tags + * E.g., compilations and soundtracks are skipped, so false + */ + public function __construct($TagList, $Merge = true) { + if ($TagList) { + $this->Tags = array_filter(explode(' ', str_replace('_', '.', $TagList))); - if ($Merge) { - self::$All = array_merge(self::$All, $this->Tags); - } + if ($Merge) { + self::$All = array_merge(self::$All, $this->Tags); + } - $this->Primary = $this->Tags[0]; - } else { - $this->Tags = array(); - } - } + $this->Primary = $this->Tags[0]; + } else { + $this->Tags = []; + } + } - /** - * @return string Primary Tag - */ - public function get_primary() { - return $this->Primary; - } + /** + * @return string Primary Tag + */ + public function get_primary() { + return $this->Primary; + } - /** - * Set the primary tag - * @param string $Primary - */ - public function set_primary($Primary) { - $this->Primary = (string)$Primary; - } + /** + * Set the primary tag + * @param string $Primary + */ + public function set_primary($Primary) { + $this->Primary = (string)$Primary; + } - /** - * Formats primary tag as a title - * @return string Title - */ - public function title() { - return ucwords(str_replace('.', ' ', $this->Primary)); - } + /** + * Formats primary tag as a title + * @return string Title + */ + public function title() { + return ucwords(str_replace('.', ' ', $this->Primary)); + } - /** - * Formats primary tag as a CSS class - * @return string CSS Class Name - */ - public function css_name() { - return 'tags_' . str_replace('.', '_', $this->Primary); - } + /** + * Formats primary tag as a CSS class + * @return string CSS Class Name + */ + public function css_name() { + return 'tags_' . str_replace('.', '_', $this->Primary); + } - /** - * @return array Tags - */ - public function get_tags() { - return $this->Tags; - } + /** + * @return array Tags + */ + public function get_tags() { + return $this->Tags; + } - /** - * @return array All tags - */ - public static function all() { - return self::$All; - } + /** + * @return array All tags + */ + public static function all() { + return self::$All; + } - /** - * Counts and sorts All tags - * @return array All tags sorted - */ - public static function sorted() { - $Sorted = array_count_values(self::$All); - arsort($Sorted); - return $Sorted; - } + /** + * Counts and sorts All tags + * @return array All tags sorted + */ + public static function sorted() { + $Sorted = array_count_values(self::$All); + arsort($Sorted); + return $Sorted; + } - /** - * Formats tags - * @param string $Link Link to a taglist page - * @param string $ArtistName Restrict tag search by this artist - * @return string List of tag links - */ - public function format($Link = 'torrents.php?taglist=', $ArtistName = '') { - if (!empty($ArtistName)) { - $ArtistName = "&artistname=" . urlencode($ArtistName) . "&action=advanced&searchsubmit=1"; - } - foreach ($this->Tags as $Tag) { - if (empty($this->TagLink[$Tag])) { - $this->TagLink[$Tag] = '' . $Tag . ''; - } - } - return implode(', ', $this->TagLink); - } + /** + * Formats tags + * @param string $Link Link to a taglist page + * @param string $ArtistName Restrict tag search by this artist + * @return string List of tag links + */ + public function format($Link = 'torrents.php?taglist=', $ArtistName = '') { + if (!empty($ArtistName)) { + $ArtistName = "&artistname=" . urlencode($ArtistName) . "&action=advanced&searchsubmit=1"; + } + foreach ($this->Tags as $Tag) { + if (empty($this->TagLink[$Tag])) { + $this->TagLink[$Tag] = '' . $Tag . ''; + } + } + return implode(', ', $this->TagLink); + } - /** - * Format a list of top tags - * @param int $Max Max number of items to get - * @param string $Link Page query where more items of this tag type can be found - * @param string $ArtistName Optional artist - */ - public static function format_top($Max = 5, $Link = 'torrents.php?taglist=', $ArtistName = '') { - if (empty(self::$All)) { ?> -
!['.$Block['Val'].']('.STATIC_SERVER.'blank.gif)
';
- break;
- case 'plain':
- $Str .= $Block['Val'];
- break;
- case 'pre':
- $Str .= ''.$Block['Val'].''; - break; - case 'code': - $Str .= '
'.$Block['Val'].'';
- break;
- case 'list':
- $Str .= "<$Block[ListType] class=\"postlist\">";
- foreach ($Block['Val'] as $Line) {
- $Str .= ''.self::to_html($Block['Val'], $Rules).'
';
- }
- break;
- case 'color':
- case 'colour':
- $ValidAttribs = array('aqua', 'black', 'blue', 'fuchsia', 'green', 'grey', 'lime', 'maroon', 'navy', 'olive', 'purple', 'red', 'silver', 'teal', 'white', 'yellow');
- if (!in_array($Block['Attr'], $ValidAttribs) && !preg_match('/^#[0-9a-f]{6}$/', $Block['Attr'])) {
- $Str .= '[color='.$Block['Attr'].']'.self::to_html($Block['Val'], $Rules).'[/color]';
- } else {
- $Str .= ''.self::to_html($Block['Val'], $Rules).'';
- }
- break;
- case 'headline':
- $text = self::to_html($Block['Val'], $Rules);
- $raw = self::raw_text($Block['Val']);
- if (!in_array($Block['Attr'], self::$HeadlineLevels)) {
- $Str .= sprintf('%1$s%2$s%1$s', str_repeat('=', $Block['Attr'] + 1), $text);
- } else {
- $id = '_' . crc32($raw . self::$HeadlineID);
- if (self::$InQuotes === 0) {
- self::$Headlines[] = array($Block['Attr'], $raw, $id);
- }
-
- $Str .= sprintf(''; - } - if (!empty($Block['Attr'])) { - $Exploded = explode('|', self::to_html($Block['Attr'], $Rules)); - if (isset($Exploded[1]) && (is_numeric($Exploded[1]) || (in_array($Exploded[1][0], array('a', 't', 'c', 'r')) && is_numeric(substr($Exploded[1], 1))))) { - // the part after | is either a number or starts with a, t, c or r, followed by a number (forum post, artist comment, torrent comment, collage comment or request comment, respectively) - $PostID = trim($Exploded[1]); - $Str .= ''.$Exploded[0].' wrote: '; - } - else { - $Str .= ''.$Exploded[0].' wrote: '; - } - } - $Str .= ''.self::to_html($Block['Val'], $Rules).''; - if (self::$InQuotes == self::$NestsBeforeHide) { //Close quote the deeply nested quote [hide]. - $Str .= '
'; // Ensure new line after quote train hiding - } - self::$NoImg--; - self::$InQuotes--; - break; - case 'box': - $Str .= '
'.self::to_html($Block['Val'], $Rules).'
';
- break;
- case 'hide':
- $Str .= ''.(($Block['Attr']) ? $Block['Attr'] : 'Hidden text').': Show';
- $Str .= ''.self::to_html($Block['Val'], $Rules).''; - break; - case 'mature': - if (G::$LoggedUser['EnableMatureContent']) { - if (!empty($Block['Attr'])) { - $Str .= 'Mature content: ' . $Block['Attr'] . '
Show'; - $Str .= '
'.self::to_html($Block['Val'], $Rules).''; - } - else { - $Str .= 'Use of the [mature] tag requires a description. The correct format is as follows: [mature=description] ...content... [/mature], where "description" is a mandatory description of the post. Misleading descriptions will be penalized. For further information on our mature content policies, please refer to this wiki.'; - } - } - else { - $Str .= 'Mature content has been blocked. You can choose to view mature content by editing your settings.'; - } - break; - case 'img': - if (self::$NoImg > 0 && self::valid_url($Block['Val'])) { - $Str .= ''.$Block['Val'].' (image)'; - break; - } - if (!self::valid_url($Block['Val'], '\.(jpe?g|gif|png|bmp|tiff)')) { - $Str .= '[img]'.$Block['Val'].'[/img]'; - } else { - $LocalURL = self::local_url($Block['Val']); - if ($LocalURL) { - $Str .= '
', $Str); - $Str = str_replace(array('
- ', '
- ', '
', '', $Str); - $Str = str_replace('
', '', $Str); - //return $Str; - return str_replace(array("
", "
"), "\n", $Str); - } + /** + * Array of valid tags; tag => max number of attributes + * @var array $ValidTags + */ + private static $ValidTags = array('b'=>0, 'u'=>0, 'i'=>0, 's'=>0, '*'=>1, '#'=>1, '**'=>1, '##'=>1, '***'=>1, '###'=>1, 'artist'=>0, 'user'=>0, 'n'=>0, 'inlineurl'=>0, 'inlinesize'=>1, 'headline'=>1, 'align'=>1, 'color'=>1, 'colour'=>1, 'size'=>1, 'url'=>1, 'img'=>1, 'quote'=>1, 'pre'=>1, 'code'=>1, 'tex'=>0, 'hide'=>1, 'spoiler' => 1, 'plain'=>0, 'important'=>0, 'torrent'=>0, 'rule'=>0, 'mature'=>1, 'box'=>0 + ); + + /** + * Array of smilies; code => image file in STATIC_SERVER/common/smileys + * @var array $Smileys + */ + private static $Smileys = array( + ':angry:' => 'angry.gif', + ':-D' => 'biggrin.gif', + ':D' => 'biggrin.gif', + ':|' => 'blank.gif', + ':-|' => 'blank.gif', + ':blush:' => 'blush.gif', + ':cool:' => 'cool.gif', + ':'(' => 'crying.gif', + ':crying:' => 'crying.gif', + '>.>' => 'eyesright.gif', + ':frown:' => 'frown.gif', + '<3' => 'heart.gif', + ':unsure:' => 'hmm.gif', + //':\\' => 'hmm.gif', + ':whatlove:' => 'ilu.gif', + ':lol:' => 'laughing.gif', + ':loveflac:' => 'loveflac.gif', + ':flaclove:' => 'loveflac.gif', + ':ninja:' => 'ninja.gif', + ':no:' => 'no.gif', + ':nod:' => 'nod.gif', + ':ohno:' => 'ohnoes.gif', + ':ohnoes:' => 'ohnoes.gif', + ':omg:' => 'omg.gif', + ':o' => 'ohshit.gif', + ':O' => 'ohshit.gif', + ':paddle:' => 'paddle.gif', + ':(' => 'sad.gif', + ':-(' => 'sad.gif', + ':shifty:' => 'shifty.gif', + ':sick:' => 'sick.gif', + ':)' => 'smile.gif', + ':-)' => 'smile.gif', + ':sorry:' => 'sorry.gif', + ':thanks:' => 'thanks.gif', + ':P' => 'tongue.gif', + ':p' => 'tongue.gif', + ':-P' => 'tongue.gif', + ':-p' => 'tongue.gif', + ':wave:' => 'wave.gif', + ';-)' => 'wink.gif', + ':wink:' => 'wink.gif', + ':creepy:' => 'creepy.gif', + ':worried:' => 'worried.gif', + ':wtf:' => 'wtf.gif', + ':wub:' => 'wub.gif', + ); + + /** + * Processed version of the $Smileys array, see {@link smileys} + * @var array $ProcessedSmileys + */ + private static $ProcessedSmileys = []; + + /** + * Whether or not to turn images into URLs (used inside [quote] tags). + * This is an integer reflecting the number of levels we're doing that + * transition, i.e. images will only be displayed as images if $NoImg <= 0. + * By setting this variable to a negative number you can delay the + * transition to a deeper level of quotes. + * @var int $NoImg + */ + private static $NoImg = 0; + + /** + * Internal counter for the level of recursion in to_html + * @var int $Levels + */ + private static $Levels = 0; + + /** + * The maximum amount of nesting allowed (exclusive) + * In reality n-1 nests are shown. + * @var int $MaximumNests + */ + private static $MaximumNests = 10; + + /** + * Used to detect and disable parsing (e.g. TOC) within quotes + * @var int $InQuotes + */ + private static $InQuotes = 0; + + /** + * Used to [hide] quote trains starting with the specified depth (inclusive) + * @var int $NestsBeforeHide + * + * This defaulted to 5 but was raised to 10 to effectively "disable" it until + * an optimal number of nested [quote] tags is chosen. The variable $MaximumNests + * effectively overrides this variable, if $MaximumNests is less than the value + * of $NestsBeforeHide. + */ + private static $NestsBeforeHide = 10; + + /** + * Array of headlines for Table Of Contents (TOC) + * @var array $HeadLines + */ + private static $Headlines; + + /** + * Counter for making headline URLs unique + * @var int $HeadLines + */ + private static $HeadlineID = 0; + + /** + * Depth + * @var array $HeadlineLevels + */ + private static $HeadlineLevels = array('1', '2', '3', '4'); + + /** + * TOC enabler + * @var bool $TOC + */ + public static $TOC = false; + + /** + * Output BBCode as XHTML + * @param string $Str BBCode text + * @param bool $OutputTOC Ouput TOC near (above) text + * @param int $Min See {@link parse_toc} + * @return string + */ + public static function full_format($Str, $OutputTOC = true, $Min = 3, $Rules = false) { + global $Debug; + $Debug->set_flag('BBCode start'); + $Str = display_str($Str); + self::$Headlines = []; + + //Inline links + $URLPrefix = '(\[url\]|\[url\=|\[img\=|\[img\])'; + $Str = preg_replace('/'.$URLPrefix.'\s+/i', '$1', $Str); + $Str = preg_replace('/(?set_flag('BBCode end'); + return $HTML; + } + + public static function strip_bbcode($Str) { + $Str = display_str($Str); + + //Inline links + $Str = preg_replace('/(? $i) { + $Array[$ArrayPos] = substr($Str, $i, $TagPos - $i); + ++$ArrayPos; + $i = $TagPos; + } + + // 2) See if it's a [[wiki-link]] or an ordinary tag, and get the tag name + if (!empty($Tag[4][0])) { // Wiki-link + $WikiLink = true; + $TagName = substr($Tag[4][0], 2, -2); + $Attrib = ''; + } else { // 3) If it's not a wiki link: + $WikiLink = false; + $TagName = strtolower(substr($Tag[2][0], 1)); + + //3a) check it against the self::$ValidTags array to see if it's actually a tag and not [bullshit] + if (!isset(self::$ValidTags[$TagName])) { + $Array[$ArrayPos] = substr($Str, $i, ($TagPos - $i) + strlen($Tag[0][0])); + $i = $TagPos + strlen($Tag[0][0]); + ++$ArrayPos; + continue; + } + + $MaxAttribs = self::$ValidTags[$TagName]; + + // 3b) Get the attribute, if it exists [name=attribute] + if (!empty($Tag[3][0])) { + $Attrib = substr($Tag[3][0], 1); + } else { + $Attrib = ''; + } + } + + // 4) Move the pointer past the end of the tag + $i = $TagPos + strlen($Tag[0][0]); + + // 5) Find out where the tag closes (beginning of [/tag]) + + // Unfortunately, BBCode doesn't have nice standards like XHTML + // [*], [img=...], and http:// follow different formats + // Thus, we have to handle these before we handle the majority of tags + + //5a) Different for different types of tag. Some tags don't close, others are weird like [*] + if ($TagName == 'img' && !empty($Tag[3][0])) { //[img=...] + $Block = ''; // Nothing inside this tag + // Don't need to touch $i + } elseif ($TagName == 'inlineurl') { // We did a big replace early on to turn http:// into [inlineurl]http:// + + // Let's say the block can stop at a newline or a space + $CloseTag = strcspn($Str, " \n\r", $i); + if ($CloseTag === false) { // block finishes with URL + $CloseTag = $Len; + } + if (preg_match('/[!,.?:]+$/',substr($Str, $i, $CloseTag), $Match)) { + $CloseTag -= strlen($Match[0]); + } + $URL = substr($Str, $i, $CloseTag); + if (substr($URL, -1) == ')' && substr_count($URL, '(') < substr_count($URL, ')')) { + $CloseTag--; + $URL = substr($URL, 0, -1); + } + $Block = $URL; // Get the URL + + // strcspn returns the number of characters after the offset $i, not after the beginning of the string + // Therefore, we use += instead of the = everywhere else + $i += $CloseTag; // 5d) Move the pointer past the end of the [/close] tag. + } elseif ($WikiLink == true || $TagName == 'n') { + // Don't need to do anything - empty tag with no closing + } elseif ($TagName[0] === '*' || $TagName[0] === '#') { + // We're in a list. Find where it ends + $NewLine = $i; + do { // Look for \n[*] + $NewLine = strpos($Str, "\n", $NewLine + 1); + } while ($NewLine !== false && substr($Str, $NewLine + 1, 1 + strlen($TagName)) == "[$TagName"); + + $CloseTag = $NewLine; + if ($CloseTag === false) { // block finishes with list + $CloseTag = $Len; + } + $Block = substr($Str, $i, $CloseTag - $i); // Get the list + $i = $CloseTag; // 5d) Move the pointer past the end of the [/close] tag. + } else { + //5b) If it's a normal tag, it may have versions of itself nested inside + $CloseTag = $i - 1; + $InTagPos = $i - 1; + $NumInOpens = 0; + $NumInCloses = -1; + + $InOpenRegex = '/\[('.$TagName.')'; + if ($MaxAttribs > 0) { + $InOpenRegex .= "(=[^\n'\"\[\]]+)?"; + } + $InOpenRegex .= '\]/i'; + + + // Every time we find an internal open tag of the same type, search for the next close tag + // (as the first close tag won't do - it's been opened again) + do { + $CloseTag = strpos($StrLC, "[/$TagName]", $CloseTag + 1); + if ($CloseTag === false) { + $CloseTag = $Len; + break; + } else { + $NumInCloses++; // Majority of cases + } + + // Is there another open tag inside this one? + $OpenTag = preg_match($InOpenRegex, $Str, $InTag, PREG_OFFSET_CAPTURE, $InTagPos + 1); + if (!$OpenTag || $InTag[0][1] > $CloseTag) { + break; + } else { + $InTagPos = $InTag[0][1]; + $NumInOpens++; + } + + } while ($NumInOpens > $NumInCloses); + + + // Find the internal block inside the tag + $Block = substr($Str, $i, $CloseTag - $i); // 5c) Get the contents between [open] and [/close] and call it the block. + + $i = $CloseTag + strlen($TagName) + 3; // 5d) Move the pointer past the end of the [/close] tag. + + } + + // 6) Depending on what type of tag we're dealing with, create an array with the attribute and block. + switch ($TagName) { + case 'inlineurl': + $Array[$ArrayPos] = array('Type'=>'inlineurl', 'Attr'=>$Block, 'Val'=>''); + break; + case 'url': + $Array[$ArrayPos] = array('Type'=>'img', 'Attr'=>$Attrib, 'Val'=>$Block); + if (empty($Attrib)) { // [url]http://...[/url] - always set URL to attribute + $Array[$ArrayPos] = array('Type'=>'url', 'Attr'=>$Block, 'Val'=>''); + } else { + $Array[$ArrayPos] = array('Type'=>'url', 'Attr'=>$Attrib, 'Val'=>self::parse($Block)); + } + break; + case 'quote': + $Array[$ArrayPos] = array('Type'=>'quote', 'Attr'=>self::parse($Attrib), 'Val'=>self::parse($Block)); + break; + case 'box': + $Array[$ArrayPos] = ['Type'=>'box', 'Val'=>self::parse($Block)]; + break; + case 'img': + case 'image': + if (empty($Block)) { + $Block = $Attrib; + } + $Array[$ArrayPos] = array('Type'=>'img', 'Val'=>$Block); + break; + case 'aud': + case 'mp3': + case 'audio': + if (empty($Block)) { + $Block = $Attrib; + } + $Array[$ArrayPos] = array('Type'=>'aud', 'Val'=>$Block); + break; + case 'user': + $Array[$ArrayPos] = array('Type'=>'user', 'Val'=>$Block); + break; + case 'artist': + $Array[$ArrayPos] = array('Type'=>'artist', 'Val'=>$Block); + break; + case 'torrent': + $Array[$ArrayPos] = array('Type'=>'torrent', 'Val'=>$Block); + break; + case 'tex': + $Array[$ArrayPos] = array('Type'=>'tex', 'Val'=>$Block); + break; + case 'rule': + $Array[$ArrayPos] = array('Type'=>'rule', 'Val'=>$Block); + break; + case 'pre': + case 'code': + case 'plain': + $Block = strtr($Block, array('[inlineurl]' => '')); + + $Callback = function ($matches) { + $n = $matches[2]; + $text = ''; + if ($n < 5 && $n > 0) { + $e = str_repeat('=', $matches[2] + 1); + $text = $e . $matches[3] . $e; + } + return $text; + }; + $Block = preg_replace_callback('/\[(headline)\=(\d)\](.*?)\[\/\1\]/i', $Callback, $Block); + + $Block = preg_replace('/\[inlinesize\=3\](.*?)\[\/inlinesize\]/i', '====$1====', $Block); + $Block = preg_replace('/\[inlinesize\=5\](.*?)\[\/inlinesize\]/i', '===$1===', $Block); + $Block = preg_replace('/\[inlinesize\=7\](.*?)\[\/inlinesize\]/i', '==$1==', $Block); + + + $Array[$ArrayPos] = array('Type'=>$TagName, 'Val'=>$Block); + break; + case 'spoiler': + case 'hide': + $Array[$ArrayPos] = array('Type'=>'hide', 'Attr'=>$Attrib, 'Val'=>self::parse($Block)); + break; + case 'mature': + $Array[$ArrayPos] = array('Type'=>'mature', 'Attr'=>$Attrib, 'Val'=>self::parse($Block)); + break; + case '#': + case '*': + case '##': + case '**': + case '###': + case '***': + $CurrentId = 1; + $Array[$ArrayPos] = array('Type'=>'list'); + $Array[$ArrayPos]['Val'] = explode("[$TagName]", $Block); + $Array[$ArrayPos]['ListType'] = $TagName[0] === '*' ? 'ul' : 'ol'; + $Array[$ArrayPos]['Tag'] = $TagName; + $ChildPrefix = $ListPrefix === '' ? $ListId : $ListPrefix; + if ($Attrib !== '') { + $ChildPrefix = $Attrib; + } + foreach ($Array[$ArrayPos]['Val'] as $Key=>$Val) { + $Id = $ChildPrefix.'.'.($CurrentId++); + $Array[$ArrayPos]['Val'][$Key] = self::parse(trim($Val), $Id); + $Array[$ArrayPos]['Val'][$Key]['Id'] = $Id; + } + $ListId++; + break; + case 'n': + $ArrayPos--; + break; // n serves only to disrupt bbcode (backwards compatibility - use [pre]) + default: + if ($WikiLink == true) { + $Array[$ArrayPos] = array('Type'=>'wiki','Val'=>$TagName); + } else { + + // Basic tags, like [b] or [size=5] + + $Array[$ArrayPos] = array('Type'=>$TagName, 'Val'=>self::parse($Block)); + if (!empty($Attrib) && $MaxAttribs > 0) { + $Array[$ArrayPos]['Attr'] = strtolower($Attrib); + } + } + } + + $ArrayPos++; // 7) Increment array pointer, start again (past the end of the [/close] tag) + } + return $Array; + } + + /** + * Generates a navigation list for TOC + * @param int $Min Minimum number of headlines required for a TOC list + */ + public static function parse_toc ($Min = 3, $RulesTOC = false) { + if (count(self::$Headlines) > $Min) { + $tag = $RulesTOC ? 'ul' : 'ol'; + if ($RulesTOC) { + $list = "<$tag>"; + } else { + $list = "<$tag class=\"navigation_list\">"; + } + $i = 0; + $level = 0; + $off = 0; + + foreach (self::$Headlines as $t) { + $n = (int)$t[0]; + if ($i === 0 && $n > 1) { + $off = $n - $level; + } + self::headline_level($n, $level, $list, $i, $off, $tag); + $list .= sprintf('
';
+ break;
+ case 'plain':
+ $Str .= $Block['Val'];
+ break;
+ case 'pre':
+ $Str .= ''.$Block['Val'].''; + break; + case 'code': + $Str .= '
'.$Block['Val'].'';
+ break;
+ case 'list':
+ $Str .= "<$Block[ListType] class=\"postlist\">";
+ foreach ($Block['Val'] as $Line) {
+ $Str .= ''.self::to_html($Block['Val'], $Rules).'
';
+ }
+ break;
+ case 'color':
+ case 'colour':
+ $ValidAttribs = array('aqua', 'black', 'blue', 'fuchsia', 'green', 'grey', 'lime', 'maroon', 'navy', 'olive', 'purple', 'red', 'silver', 'teal', 'white', 'yellow');
+ if (!in_array($Block['Attr'], $ValidAttribs) && !preg_match('/^#[0-9a-f]{6}$/', $Block['Attr'])) {
+ $Str .= '[color='.$Block['Attr'].']'.self::to_html($Block['Val'], $Rules).'[/color]';
+ } else {
+ $Str .= ''.self::to_html($Block['Val'], $Rules).'';
+ }
+ break;
+ case 'headline':
+ $text = self::to_html($Block['Val'], $Rules);
+ $raw = self::raw_text($Block['Val']);
+ if (!in_array($Block['Attr'], self::$HeadlineLevels)) {
+ $Str .= sprintf('%1$s%2$s%1$s', str_repeat('=', $Block['Attr'] + 1), $text);
+ } else {
+ $id = '_' . crc32($raw . self::$HeadlineID);
+ if (self::$InQuotes === 0) {
+ self::$Headlines[] = array($Block['Attr'], $raw, $id);
+ }
+
+ $Str .= sprintf(''; + } + if (!empty($Block['Attr'])) { + $Exploded = explode('|', self::to_html($Block['Attr'], $Rules)); + if (isset($Exploded[1]) && (is_numeric($Exploded[1]) || (in_array($Exploded[1][0], array('a', 't', 'c', 'r')) && is_numeric(substr($Exploded[1], 1))))) { + // the part after | is either a number or starts with a, t, c or r, followed by a number (forum post, artist comment, torrent comment, collage comment or request comment, respectively) + $PostID = trim($Exploded[1]); + $Str .= ''.$Exploded[0].' wrote: '; + } + else { + $Str .= ''.$Exploded[0].' wrote: '; + } + } + $Str .= ''.self::to_html($Block['Val'], $Rules).''; + if (self::$InQuotes == self::$NestsBeforeHide) { //Close quote the deeply nested quote [hide]. + $Str .= '
'; // Ensure new line after quote train hiding + } + self::$NoImg--; + self::$InQuotes--; + break; + case 'box': + $Str .= '
'.self::to_html($Block['Val'], $Rules).'
';
+ break;
+ case 'hide':
+ $Str .= ''.(($Block['Attr']) ? $Block['Attr'] : 'Hidden text').': Show';
+ $Str .= ''.self::to_html($Block['Val'], $Rules).''; + break; + case 'mature': + if (G::$LoggedUser['EnableMatureContent']) { + if (!empty($Block['Attr'])) { + $Str .= 'Mature content: ' . $Block['Attr'] . '
Show'; + $Str .= '
'.self::to_html($Block['Val'], $Rules).''; + } + else { + $Str .= 'Use of the [mature] tag requires a description. The correct format is as follows: [mature=description] ...content... [/mature], where "description" is a mandatory description of the post. Misleading descriptions will be penalized. For further information on our mature content policies, please refer to this wiki.'; + } + } + else { + $Str .= 'Mature content has been blocked. You can choose to view mature content by editing your settings.'; + } + break; + case 'img': + if (self::$NoImg > 0 && self::valid_url($Block['Val'])) { + $Str .= ''.$Block['Val'].' (image)'; + break; + } + if (!self::valid_url($Block['Val'], '\.(jpe?g|gif|png|bmp|tiff)')) { + $Str .= '[img]'.$Block['Val'].'[/img]'; + } else { + $LocalURL = self::local_url($Block['Val']); + if ($LocalURL) { + $Str .= '
', $Str); + $Str = str_replace(array('
- ', '
- ', '
', '', $Str); + $Str = str_replace('
', '', $Str); + //return $Str; + return str_replace(array("
", "
"), "\n", $Str); + } } + /* +define("SITE_URL", 'https://orpheus.network'); -// Uncomment this part to test the class via command line: -function display_str($Str) { - return $Str; -} -function check_perms($Perm) { - return true; -} -$Str = "hello -[pre]http://anonym.to/?http://whatshirts.portmerch.com/ -====hi==== -===hi=== -==hi==[/pre] -====hi==== -hi"; -echo Text::full_format($Str); -echo "\n" +$Str = "
Album Information
\r\nInterstellar Rift Original Soundtrack<\/strong><\/span><\/span><\/div>
\r\n
\r\n
-
diff --git a/design/privateheader.php b/design/privateheader.php
index da46ef600..85b0fe813 100644
--- a/design/privateheader.php
+++ b/design/privateheader.php
@@ -1,4 +1,4 @@
-
- \r\nInterstellar Rift Original Soundtrack<\/strong><\/span><\/span><\/div>
\r\n
\r\n
- Catalog Number:<\/strong>\tN\/A<\/li>
- Release Date:<\/strong>\tMay 29, 2017<\/li>
- Publish Format:<\/strong>\tCommercial<\/li>
- Release Price:<\/strong>\t13.00 AUD<\/li>
- Media Format:<\/strong>\tDigital<\/li>
- Classification:<\/strong>\tOriginal Soundtrack<\/li>
- Published by:<\/strong>\tBoss Battle Records (distributed by Bandcamp)<\/li>
- Composed by:<\/strong>\tCurtis Schweitzer<\/li>
- Arranged by:<\/strong><\/li><\/ul>
\n\r
\n+ +Tracklist
\r\n01\tInterstellar Rift\t\t2:38
\r\n02\tShipmaking\t\t\t4:16
\r\n03\tGalaxy Dawn\t\t\t2:55
\r\n04\tInterloper\t\t\t2:32
\r\n05\tShipbreaking\t\t\t2:06
\r\n06\tHorizon Wake\t\t\t4:24
\r\n07\tSky Harvest\t\t\t3:50
\r\n08\tTwilight Discord\t\t2:42
\r\n09\tLanguid Constellations\t\t2:45
\r\n10\tHurles Co.\t\t\t2:43
\r\n11\tGalactic Trade Federation\t2:46
\r\n12\tSentinel Security Systems\t4:08
\r\n13\tDrifters\t\t\t3:18<\/pre><\/div>
\r\n
\r\n+ - +$String"; - } else { - return $String; - } - } + private static function get_selected_link($String, $Selected) { + if ($Selected) { + return "$String"; + } else { + return $String; + } + } - public static function render_artist_tile($Artist, $Category) { - if (self::is_valid_artist($Artist)) { - switch ($Category) { - case 'weekly': - case 'hyped': - self::render_tile("artist.php?artistname=", $Artist['name'], $Artist['image'][3]['#text']); - break; - default: - break; - } - } - } + public static function render_artist_tile($Artist, $Category) { + if (self::is_valid_artist($Artist)) { + switch ($Category) { + case 'weekly': + case 'hyped': + self::render_tile("artist.php?artistname=", $Artist['name'], $Artist['image'][3]['#text']); + break; + default: + break; + } + } + } - private static function render_tile($Url, $Name, $Image) { - if (!empty($Image)) { - $Name = display_str($Name); + private static function render_tile($Url, $Name, $Image) { + if (!empty($Image)) { + $Name = display_str($Name); ?> -Notes
*/ class TEXTAREA_PREVIEW extends TEXTAREA_PREVIEW_SUPER { - /** - * @var int Unique ID - */ - private $id; - - /** - * Flag for preview output - * @var bool $preview - */ - private $preview = false; - - /** - * String table - * @var string Buffer - */ - private $buffer = null; - - /** - * This method creates a textarea - * - * @param string $Name name attribute - * @param string $ID id attribute - * @param string $Value default text attribute - * @param string $Cols cols attribute - * @param string $Rows rows attribute - * @param bool $Preview add the preview divs near the textarea - * @param bool $Buttons add the edit/preview buttons near the textarea - * @param bool $Buffer doesn't output the textarea, use getBuffer() - * @param array $ExtraAttributes array of attribute="value" - * @param bool $Required is this a required textarea - * - * If false for $Preview, $Buttons, or $Buffer, use the appropriate - * methods to add the those elements manually. Alternatively, use getID - * to create your own. - * - * It's important to have the right IDs as they make the JS function properly. - */ - public function __construct($Name, $ID = '', $Value = '', $Cols = 50, $Rows = 10, - $Preview = true, $Buttons = true, $Buffer = false, - array $ExtraAttributes = array(), $Required = false - ) { - $this->id = parent::$Textareas; - parent::$Textareas += 1; - array_push(parent::$_ID, $ID); - - if (empty($ID)) { - $ID = 'quickpost_' . $this->id; - } - - if (!empty($ExtraAttributes)) { - $Attributes = ' ' . implode(' ', $ExtraAttributes); - } else { - $Attributes = ''; - } - - if ($Preview === true) { - $this->preview(); - } - - $this->buffer = View::parse('generic/textarea/textarea.phtml', array( - 'ID' => $ID, - 'NID' => $this->id, - 'Name' => &$Name, - 'Value' => &$Value, - 'Cols' => &$Cols, - 'Rows' => &$Rows, - 'Attributes' => &$Attributes, - 'Required' => ($Required === true) ? 'required' : '' - ), $Buffer); - - if ($Buttons === true) { - $this->buttons(); - } - } - - /** - * Outputs the divs required for previewing the AJAX content - * Will only output once - */ - public function preview() { - if (!$this->preview) { - View::parse('generic/textarea/preview.phtml', array('ID' => $this->id)); - } - $this->preview = true; - } - - /** - * Outputs the preview and edit buttons - * Can be called many times to place buttons in different areas - */ - public function buttons() { - View::parse('generic/textarea/buttons.phtml', array('ID' => $this->id)); - } - - /** - * Returns the textarea's numeric ID. - */ - public function getID() { - return $this->id; - } - - /** - * Returns textarea string when buffer is enabled in the constructor - * @return string - */ - public function getBuffer() { - return $this->buffer; - } + /** + * @var int Unique ID + */ + private $id; + + /** + * Flag for preview output + * @var bool $preview + */ + private $preview = false; + + /** + * String table + * @var string Buffer + */ + private $buffer = null; + + /** + * This method creates a textarea + * + * @param string $Name name attribute + * @param string $ID id attribute + * @param string $Value default text attribute + * @param string $Cols cols attribute + * @param string $Rows rows attribute + * @param bool $Preview add the preview divs near the textarea + * @param bool $Buttons add the edit/preview buttons near the textarea + * @param bool $Buffer doesn't output the textarea, use getBuffer() + * @param array $ExtraAttributes array of attribute="value" + * @param bool $Required is this a required textarea + * + * If false for $Preview, $Buttons, or $Buffer, use the appropriate + * methods to add the those elements manually. Alternatively, use getID + * to create your own. + * + * It's important to have the right IDs as they make the JS function properly. + */ + public function __construct($Name, $ID = '', $Value = '', $Cols = 50, $Rows = 10, + $Preview = true, $Buttons = true, $Buffer = false, + array $ExtraAttributes = [], $Required = false + ) { + $this->id = parent::$Textareas; + parent::$Textareas += 1; + array_push(parent::$_ID, $ID); + + if (empty($ID)) { + $ID = 'quickpost_' . $this->id; + } + + if (!empty($ExtraAttributes)) { + $Attributes = ' ' . implode(' ', $ExtraAttributes); + } else { + $Attributes = ''; + } + + if ($Preview === true) { + $this->preview(); + } + + $this->buffer = View::parse('generic/textarea/textarea.phtml', array( + 'ID' => $ID, + 'NID' => $this->id, + 'Name' => &$Name, + 'Value' => &$Value, + 'Cols' => &$Cols, + 'Rows' => &$Rows, + 'Attributes' => &$Attributes, + 'Required' => ($Required === true) ? 'required' : '' + ), $Buffer); + + if ($Buttons === true) { + $this->buttons(); + } + } + + /** + * Outputs the divs required for previewing the AJAX content + * Will only output once + */ + public function preview() { + if (!$this->preview) { + View::parse('generic/textarea/preview.phtml', array('ID' => $this->id)); + } + $this->preview = true; + } + + /** + * Outputs the preview and edit buttons + * Can be called many times to place buttons in different areas + */ + public function buttons() { + View::parse('generic/textarea/buttons.phtml', array('ID' => $this->id)); + } + + /** + * Returns the textarea's numeric ID. + */ + public function getID() { + return $this->id; + } + + /** + * Returns textarea string when buffer is enabled in the constructor + * @return string + */ + public function getBuffer() { + return $this->buffer; + } } diff --git a/classes/thread.class.php b/classes/thread.class.php index a2fc2075b..e1454f933 100644 --- a/classes/thread.class.php +++ b/classes/thread.class.php @@ -6,150 +6,150 @@ */ class Thread { - private $id; // the ID of the row in the thread table - private $type; // the type of thread - private $created; // date created - private $story; // the array of notes in the conversation + private $id; // the ID of the row in the thread table + private $type; // the type of thread + private $created; // date created + private $story; // the array of notes in the conversation - /** - * persistent Thread constructor - * @param string $type Thread Type (corresponds to db thread_type.Name) - */ - public function __construct($type = null) { - if (!isset($type)) { - return; - } - $this->type = $type; - G::$DB->prepared_query(" - INSERT INTO thread (ThreadTypeID) VALUES ( - (SELECT ID FROM thread_type where Name = ?) - ) - ", $type); - $this->id = G::$DB->inserted_id(); - $this->story = []; - } + /** + * persistent Thread constructor + * @param string $type Thread Type (corresponds to db thread_type.Name) + */ + public function __construct($type = null) { + if (!isset($type)) { + return; + } + $this->type = $type; + G::$DB->prepared_query(" + INSERT INTO thread (ThreadTypeID) VALUES ( + (SELECT ID FROM thread_type where Name = ?) + ) + ", $type); + $this->id = G::$DB->inserted_id(); + $this->story = []; + } - /** - * @return int The id of a Thread - */ - public function id() { - return $this->id; - } + /** + * @return int The id of a Thread + */ + public function id() { + return $this->id; + } - /** - * Get the array of notes of the thread. A note is a hash with the following items: - * id - the id in thread_note table - * user_id - the id of the author in the users_main table - * user_name - the name of the member (normally we don't need anything else from there). - * visibility - this note is 'public' or just visibible to 'staff' - * created - when was this note created - * body - the note text itself - * @return array The list of notes in a thread ordered by most recent first. - */ - public function get_story() { - return $this->story; - } + /** + * Get the array of notes of the thread. A note is a hash with the following items: + * id - the id in thread_note table + * user_id - the id of the author in the users_main table + * user_name - the name of the member (normally we don't need anything else from there). + * visibility - this note is 'public' or just visibible to 'staff' + * created - when was this note created + * body - the note text itself + * @return array The list of notes in a thread ordered by most recent first. + */ + public function get_story() { + return $this->story; + } - /** - * Persist a note to the db. - * @param int $user_id The note author - * @param string $body The note text - * @param int $visibility 'public' or 'staff' - */ - public function save_note($user_id, $body, $visibility) { - G::$DB->prepared_query( - 'INSERT INTO thread_note (ThreadID, UserID, Body, Visibility) VALUES (?, ?, ?, ?)', - $this->id, $user_id, $body, $visibility - ); - return $this->refresh(); - } + /** + * Persist a note to the db. + * @param int $user_id The note author + * @param string $body The note text + * @param int $visibility 'public' or 'staff' + */ + public function save_note($user_id, $body, $visibility) { + G::$DB->prepared_query( + 'INSERT INTO thread_note (ThreadID, UserID, Body, Visibility) VALUES (?, ?, ?, ?)', + $this->id, $user_id, $body, $visibility + ); + return $this->refresh(); + } - /** - * Persist a change to the note - * @param int $id The id to identify a note - * @param string $body The note text - * @param int $visibility 'public' or 'staff' - */ - public function update_note($id, $body, $visibility) { - G::$DB->prepared_query( - 'UPDATE thread_note SET Body = ?, Visibility = ? WHERE ID = ?', - $body, $visibility, $id - ); - return $this->refresh(); - } + /** + * Persist a change to the note + * @param int $id The id to identify a note + * @param string $body The note text + * @param int $visibility 'public' or 'staff' + */ + public function update_note($id, $body, $visibility) { + G::$DB->prepared_query( + 'UPDATE thread_note SET Body = ?, Visibility = ? WHERE ID = ?', + $body, $visibility, $id + ); + return $this->refresh(); + } - /** - * Delete a note. - * @param int $note_id The id to identify a note - */ - public function delete_note($note_id) { - G::$DB->prepared_query( - 'DELETE FROM thread_note WHERE ThreadID = ? AND ID = ?', - $this->id(), - $note_id - ); - return $this->refresh(); - } + /** + * Delete a note. + * @param int $note_id The id to identify a note + */ + public function delete_note($note_id) { + G::$DB->prepared_query( + 'DELETE FROM thread_note WHERE ThreadID = ? AND ID = ?', + $this->id(), + $note_id + ); + return $this->refresh(); + } - /** - * Refresh the story cache when a note is added, changed, deleted. - */ - private function refresh() { - $key = "thread_story_" . $this->id; - G::$DB->prepared_query(' - SELECT ID, UserID, Visibility, Created, Body - FROM thread_note - WHERE ThreadID = ? - ORDER BY created; - ', $this->id); - $this->story = []; - if (G::$DB->has_results()) { - $user_cache = []; - while (($row = G::$DB->next_record())) { - if (!in_array($row['UserID'], $user_cache)) { - $user = Users::user_info($row['UserID']); - $user_cache[$row['UserID']] = $user['Username']; - } - $this->story[] = [ - 'id' => $row['ID'], - 'user_id' => $row['UserID'], - 'user_name' => $user_cache[$row['UserID']], - 'visibility' => $row['Visibility'], - 'created' => $row['Created'], - 'body' => $row['Body'] - ]; - } - } - G::$Cache->cache_value($key, $this->story, 3600); - return $this; - } + /** + * Refresh the story cache when a note is added, changed, deleted. + */ + private function refresh() { + $key = "thread_story_" . $this->id; + G::$DB->prepared_query(' + SELECT ID, UserID, Visibility, Created, Body + FROM thread_note + WHERE ThreadID = ? + ORDER BY created; + ', $this->id); + $this->story = []; + if (G::$DB->has_results()) { + $user_cache = []; + while (($row = G::$DB->next_record())) { + if (!in_array($row['UserID'], $user_cache)) { + $user = Users::user_info($row['UserID']); + $user_cache[$row['UserID']] = $user['Username']; + } + $this->story[] = [ + 'id' => $row['ID'], + 'user_id' => $row['UserID'], + 'user_name' => $user_cache[$row['UserID']], + 'visibility' => $row['Visibility'], + 'created' => $row['Created'], + 'body' => $row['Body'] + ]; + } + } + G::$Cache->cache_value($key, $this->story, 3600); + return $this; + } - // FACTORY METHODS + // FACTORY METHODS - /** - * Instantiate a new instance of a Thread from an id - * @param $id int The id of a Thread - * @return a Thread object - */ - static public function factory($id) { - $thread = new self(); - $key = "thread_$id"; - $data = G::$Cache->get_value($key); - if ($data === false) { - G::$DB->prepared_query(" - SELECT tt.Name as ThreadType, t.Created - FROM thread t - INNER JOIN thread_type tt ON (tt.ID = t.ThreadTypeID) - WHERE t.ID = ? - ", $id); - if (G::$DB->has_results()) { - $data = G::$DB->next_record(); - G::$Cache->cache_value($key, $data, 86400); - } - } - $thread->id = $id; - $thread->type = $data['ThreadType']; - $thread->created = $data['Created']; - return $thread->refresh(); /* load the story */ - } + /** + * Instantiate a new instance of a Thread from an id + * @param $id int The id of a Thread + * @return a Thread object + */ + static public function factory($id) { + $thread = new self(); + $key = "thread_$id"; + $data = G::$Cache->get_value($key); + if ($data === false) { + G::$DB->prepared_query(" + SELECT tt.Name as ThreadType, t.Created + FROM thread t + INNER JOIN thread_type tt ON (tt.ID = t.ThreadTypeID) + WHERE t.ID = ? + ", $id); + if (G::$DB->has_results()) { + $data = G::$DB->next_record(); + G::$Cache->cache_value($key, $data, 86400); + } + } + $thread->id = $id; + $thread->type = $data['ThreadType']; + $thread->created = $data['Created']; + return $thread->refresh(); /* load the story */ + } } diff --git a/classes/time.class.php b/classes/time.class.php index 74d7e468e..871cce437 100644 --- a/classes/time.class.php +++ b/classes/time.class.php @@ -3,7 +3,7 @@ use Gazelle\Util\Time; function time_ago($TimeStamp) { - return Time::timeAgo($TimeStamp); + return Time::timeAgo($TimeStamp); } /* @@ -11,7 +11,7 @@ function time_ago($TimeStamp) { * difference in text (e.g. "16 hours and 28 minutes", "1 day, 18 hours"). */ function time_diff($TimeStamp, $Levels = 2, $Span = true, $Lowercase = false, $StartTime = false) { - return Time::timeDiff($TimeStamp, $Levels, $Span, $Lowercase, $StartTime); + return Time::timeDiff($TimeStamp, $Levels, $Span, $Lowercase, $StartTime); } /** @@ -24,35 +24,35 @@ function time_diff($TimeStamp, $Levels = 2, $Span = true, $Lowercase = false, $S * @return string */ function convert_hours($Hours,$Levels=2,$Span=true) { - return Time::convertHours($Hours, $Levels, $Span); + return Time::convertHours($Hours, $Levels, $Span); } /* SQL utility functions */ function time_plus($Offset) { - return Time::timePlus($Offset); + return Time::timePlus($Offset); } function time_minus($Offset, $Fuzzy = false) { - return Time::timeMinus($Offset, $Fuzzy); + return Time::timeMinus($Offset, $Fuzzy); } function sqltime($timestamp = false) { - return Time::sqlTime($timestamp); + return Time::sqlTime($timestamp); } function validDate($DateString) { - return Time::validDate($DateString); + return Time::validDate($DateString); } function is_valid_date($Date) { - return Time::isValidDate($Date); + return Time::isValidDate($Date); } function is_valid_time($Time) { - return Time::isValidTime($Time); + return Time::isValidTime($Time); } function is_valid_datetime($DateTime, $Format = 'Y-m-d H:i') { - return Time::isValidDateTime($DateTime, $Format); + return Time::isValidDateTime($DateTime, $Format); } diff --git a/classes/tools.class.php b/classes/tools.class.php index 8505ba763..4abaebdd5 100644 --- a/classes/tools.class.php +++ b/classes/tools.class.php @@ -1,324 +1,324 @@ -get_value('ip_bans_'.$A); - if (!is_array($IPBans)) { - $SQL = sprintf(" - SELECT ID, FromIP, ToIP - FROM ip_bans - WHERE FromIP BETWEEN %d << 24 AND (%d << 24) - 1", $A, $A + 1); - $QueryID = G::$DB->get_query_id(); - G::$DB->query($SQL); - $IPBans = G::$DB->to_array(0, MYSQLI_NUM); - G::$DB->set_query_id($QueryID); - G::$Cache->cache_value('ip_bans_'.$A, $IPBans, 0); - } - foreach ($IPBans as $Index => $IPBan) { - list ($ID, $FromIP, $ToIP) = $IPBan; - if ($IPNum >= $FromIP && $IPNum <= $ToIP) { - return true; - } - } + /** + * Returns true if given IP is banned. + * + * @param string $IP + */ + public static function site_ban_ip($IP) { + global $Debug; + $A = substr($IP, 0, strcspn($IP, '.')); + $IPNum = Tools::ip_to_unsigned($IP); + $IPBans = G::$Cache->get_value('ip_bans_'.$A); + if (!is_array($IPBans)) { + $SQL = sprintf(" + SELECT ID, FromIP, ToIP + FROM ip_bans + WHERE FromIP BETWEEN %d << 24 AND (%d << 24) - 1", $A, $A + 1); + $QueryID = G::$DB->get_query_id(); + G::$DB->query($SQL); + $IPBans = G::$DB->to_array(0, MYSQLI_NUM); + G::$DB->set_query_id($QueryID); + G::$Cache->cache_value('ip_bans_'.$A, $IPBans, 0); + } + foreach ($IPBans as $Index => $IPBan) { + list ($ID, $FromIP, $ToIP) = $IPBan; + if ($IPNum >= $FromIP && $IPNum <= $ToIP) { + return true; + } + } - return false; - } + return false; + } - /** - * Returns the unsigned form of an IP address. - * - * @param string $IP The IP address x.x.x.x - * @return string the long it represents. - */ - public static function ip_to_unsigned($IP) { - return sprintf('%u', ip2long($IP)); - } + /** + * Returns the unsigned form of an IP address. + * + * @param string $IP The IP address x.x.x.x + * @return string the long it represents. + */ + public static function ip_to_unsigned($IP) { + return sprintf('%u', ip2long($IP)); + } - /** - * Geolocate an IP address using the database - * - * @param $IP the ip to fetch the country for - * @return the country of origin - */ - public static function geoip($IP) { - static $IPs = array(); - if (isset($IPs[$IP])) { - return $IPs[$IP]; - } - if (is_number($IP)) { - $Long = $IP; - } else { - $Long = Tools::ip_to_unsigned($IP); - } - if (!$Long || $Long == 2130706433) { // No need to check cc for 127.0.0.1 - return false; - } - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - SELECT EndIP, Code - FROM geoip_country - WHERE $Long >= StartIP - ORDER BY StartIP DESC - LIMIT 1"); - if ((!list($EndIP, $Country) = G::$DB->next_record()) || $EndIP < $Long) { - $Country = '?'; - } - G::$DB->set_query_id($QueryID); - $IPs[$IP] = $Country; - return $Country; - } + /** + * Geolocate an IP address using the database + * + * @param $IP the ip to fetch the country for + * @return the country of origin + */ + public static function geoip($IP) { + static $IPs = []; + if (isset($IPs[$IP])) { + return $IPs[$IP]; + } + if (is_number($IP)) { + $Long = $IP; + } else { + $Long = Tools::ip_to_unsigned($IP); + } + if (!$Long || $Long == 2130706433) { // No need to check cc for 127.0.0.1 + return false; + } + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + SELECT EndIP, Code + FROM geoip_country + WHERE $Long >= StartIP + ORDER BY StartIP DESC + LIMIT 1"); + if ((!list($EndIP, $Country) = G::$DB->next_record()) || $EndIP < $Long) { + $Country = '?'; + } + G::$DB->set_query_id($QueryID); + $IPs[$IP] = $Country; + return $Country; + } - /** - * Gets the hostname for an IP address - * - * @param $IP the IP to get the hostname for - * @return hostname fetched - */ - public static function get_host_by_ip($IP) { - $testar = explode('.', $IP); - if (count($testar) != 4) { - return $IP; - } - for ($i = 0; $i < 4; ++$i) { - if (!is_numeric($testar[$i])) { - return $IP; - } - } + /** + * Gets the hostname for an IP address + * + * @param $IP the IP to get the hostname for + * @return hostname fetched + */ + public static function get_host_by_ip($IP) { + $testar = explode('.', $IP); + if (count($testar) != 4) { + return $IP; + } + for ($i = 0; $i < 4; ++$i) { + if (!is_numeric($testar[$i])) { + return $IP; + } + } - $host = `host -W 1 $IP`; - return ($host ? end(explode(' ', $host)) : $IP); - } + $host = `host -W 1 $IP`; + return ($host ? end(explode(' ', $host)) : $IP); + } - /** - * Gets an hostname using AJAX - * - * @param $IP the IP to fetch - * @return a span with JavaScript code - */ - public static function get_host_by_ajax($IP) { - static $IPs = array(); - $Class = strtr($IP, '.', '-'); - $HTML = 'Resolving host...'; - if (!isset($IPs[$IP])) { - $HTML .= ''; - } - $HTML .= ''; - $IPs[$IP] = 1; - return $HTML; - } + /** + * Gets an hostname using AJAX + * + * @param $IP the IP to fetch + * @return a span with JavaScript code + */ + public static function get_host_by_ajax($IP) { + static $IPs = []; + $Class = strtr($IP, '.', '-'); + $HTML = 'Resolving host...'; + if (!isset($IPs[$IP])) { + $HTML .= ''; + } + $HTML .= ''; + $IPs[$IP] = 1; + return $HTML; + } - /** - * Looks up the full host of an IP address, by system call. - * Used as the server-side counterpart to get_host_by_ajax. - * - * @param string $IP The IP address to look up. - * @return string the host. - */ - public static function lookup_ip($IP) { - //TODO: use the G::$Cache - $Output = explode(' ',shell_exec('host -W 1 '.escapeshellarg($IP))); - if (count($Output) == 1 && empty($Output[0])) { - //No output at all implies the command failed - return ''; - } + /** + * Looks up the full host of an IP address, by system call. + * Used as the server-side counterpart to get_host_by_ajax. + * + * @param string $IP The IP address to look up. + * @return string the host. + */ + public static function lookup_ip($IP) { + //TODO: use the G::$Cache + $Output = explode(' ',shell_exec('host -W 1 '.escapeshellarg($IP))); + if (count($Output) == 1 && empty($Output[0])) { + //No output at all implies the command failed + return ''; + } - if (count($Output) != 5) { - return false; - } else { - return trim($Output[4]); - } - } + if (count($Output) != 5) { + return false; + } else { + return trim($Output[4]); + } + } - /** - * Format an IP address with links to IP history. - * - * @param string IP - * @return string The HTML - */ - public static function display_ip($IP) { - $Line = display_str($IP).' ('.Tools::get_country_code_by_ajax($IP).') '; - $Line .= 'S'; + /** + * Format an IP address with links to IP history. + * + * @param string IP + * @return string The HTML + */ + public static function display_ip($IP) { + $Line = display_str($IP).' ('.Tools::get_country_code_by_ajax($IP).') '; + $Line .= 'S'; - return $Line; - } + return $Line; + } - public static function get_country_code_by_ajax($IP) { - static $IPs = array(); - $Class = strtr($IP, '.', '-'); - $HTML = 'Resolving CC...'; - if (!isset($IPs[$IP])) { - $HTML .= ''; - } - $HTML .= ''; - $IPs[$IP] = 1; - return $HTML; - } + public static function get_country_code_by_ajax($IP) { + static $IPs = []; + $Class = strtr($IP, '.', '-'); + $HTML = 'Resolving CC...'; + if (!isset($IPs[$IP])) { + $HTML .= ''; + } + $HTML .= ''; + $IPs[$IP] = 1; + return $HTML; + } - /** - * Disable an array of users. - * - * @param array $UserIDs (You can also send it one ID as an int, because fuck types) - * @param BanReason 0 - Unknown, 1 - Manual, 2 - Ratio, 3 - Inactive, 4 - Unused. - */ - public static function disable_users($UserIDs, $AdminComment, $BanReason = 1) { - $QueryID = G::$DB->get_query_id(); - if (!is_array($UserIDs)) { - $UserIDs = array($UserIDs); - } - G::$DB->query(" - UPDATE users_info AS i - JOIN users_main AS m ON m.ID = i.UserID - SET m.Enabled = '2', - m.can_leech = '0', - i.AdminComment = CONCAT('".sqltime()." - ".($AdminComment ? $AdminComment : 'Disabled by system')."\n\n', i.AdminComment), - i.BanDate = '".sqltime()."', - i.BanReason = '$BanReason', - i.RatioWatchDownload = ".($BanReason == 2 ? 'm.Downloaded' : "'0'")." - WHERE m.ID IN(".implode(',', $UserIDs).') '); - G::$Cache->decrement('stats_user_count', G::$DB->affected_rows()); - foreach ($UserIDs as $UserID) { - G::$Cache->delete_value("enabled_$UserID"); - G::$Cache->delete_value("user_info_$UserID"); - G::$Cache->delete_value("user_info_heavy_$UserID"); - G::$Cache->delete_value("user_stats_$UserID"); + /** + * Disable an array of users. + * + * @param array $UserIDs (You can also send it one ID as an int, because fuck types) + * @param BanReason 0 - Unknown, 1 - Manual, 2 - Ratio, 3 - Inactive, 4 - Unused. + */ + public static function disable_users($UserIDs, $AdminComment, $BanReason = 1) { + $QueryID = G::$DB->get_query_id(); + if (!is_array($UserIDs)) { + $UserIDs = array($UserIDs); + } + G::$DB->query(" + UPDATE users_info AS i + JOIN users_main AS m ON m.ID = i.UserID + SET m.Enabled = '2', + m.can_leech = '0', + i.AdminComment = CONCAT('".sqltime()." - ".($AdminComment ? $AdminComment : 'Disabled by system')."\n\n', i.AdminComment), + i.BanDate = '".sqltime()."', + i.BanReason = '$BanReason', + i.RatioWatchDownload = ".($BanReason == 2 ? 'm.Downloaded' : "'0'")." + WHERE m.ID IN(".implode(',', $UserIDs).') '); + G::$Cache->decrement('stats_user_count', G::$DB->affected_rows()); + foreach ($UserIDs as $UserID) { + G::$Cache->delete_value("enabled_$UserID"); + G::$Cache->delete_value("user_info_$UserID"); + G::$Cache->delete_value("user_info_heavy_$UserID"); + G::$Cache->delete_value("user_stats_$UserID"); - G::$DB->query(" - SELECT SessionID - FROM users_sessions - WHERE UserID = '$UserID' - AND Active = 1"); - while (list($SessionID) = G::$DB->next_record()) { - G::$Cache->delete_value("session_$UserID"."_$SessionID"); - } - G::$Cache->delete_value("users_sessions_$UserID"); + G::$DB->query(" + SELECT SessionID + FROM users_sessions + WHERE UserID = '$UserID' + AND Active = 1"); + while (list($SessionID) = G::$DB->next_record()) { + G::$Cache->delete_value("session_$UserID"."_$SessionID"); + } + G::$Cache->delete_value("users_sessions_$UserID"); - G::$DB->query(" - DELETE FROM users_sessions - WHERE UserID = '$UserID'"); + G::$DB->query(" + DELETE FROM users_sessions + WHERE UserID = '$UserID'"); - } + } - // Remove the users from the tracker. - G::$DB->query(' - SELECT torrent_pass - FROM users_main - WHERE ID in ('.implode(', ', $UserIDs).')'); - $PassKeys = G::$DB->collect('torrent_pass'); - $Concat = ''; - foreach ($PassKeys as $PassKey) { - if (strlen($Concat) > 3950) { // Ocelot's read buffer is 4 KiB and anything exceeding it is truncated - Tracker::update_tracker('remove_users', array('passkeys' => $Concat)); - $Concat = $PassKey; - } else { - $Concat .= $PassKey; - } - } - Tracker::update_tracker('remove_users', array('passkeys' => $Concat)); - G::$DB->set_query_id($QueryID); - } + // Remove the users from the tracker. + G::$DB->query(' + SELECT torrent_pass + FROM users_main + WHERE ID in ('.implode(', ', $UserIDs).')'); + $PassKeys = G::$DB->collect('torrent_pass'); + $Concat = ''; + foreach ($PassKeys as $PassKey) { + if (strlen($Concat) > 3950) { // Ocelot's read buffer is 4 KiB and anything exceeding it is truncated + Tracker::update_tracker('remove_users', array('passkeys' => $Concat)); + $Concat = $PassKey; + } else { + $Concat .= $PassKey; + } + } + Tracker::update_tracker('remove_users', array('passkeys' => $Concat)); + G::$DB->set_query_id($QueryID); + } - /** - * Warn a user. - * - * @param int $UserID - * @param int $Duration length of warning in seconds - * @param string $reason - */ - public static function warn_user($UserID, $Duration, $Reason) { - global $Time; + /** + * Warn a user. + * + * @param int $UserID + * @param int $Duration length of warning in seconds + * @param string $reason + */ + public static function warn_user($UserID, $Duration, $Reason) { + global $Time; - $QueryID = G::$DB->get_query_id(); - G::$DB->query(" - SELECT Warned - FROM users_info - WHERE UserID = $UserID - AND Warned != '0000-00-00 00:00:00'"); - if (G::$DB->has_results()) { - //User was already warned, appending new warning to old. - list($OldDate) = G::$DB->next_record(); - $NewExpDate = date('Y-m-d H:i:s', strtotime($OldDate) + $Duration); + $QueryID = G::$DB->get_query_id(); + G::$DB->query(" + SELECT Warned + FROM users_info + WHERE UserID = $UserID + AND Warned != '0000-00-00 00:00:00'"); + if (G::$DB->has_results()) { + //User was already warned, appending new warning to old. + list($OldDate) = G::$DB->next_record(); + $NewExpDate = date('Y-m-d H:i:s', strtotime($OldDate) + $Duration); - Misc::send_pm($UserID, 0, - 'You have received multiple warnings.', - "When you received your latest warning (set to expire on ".date('Y-m-d', (time() + $Duration)).'), you already had a different warning (set to expire on '.date('Y-m-d', strtotime($OldDate)).").\n\n Due to this collision, your warning status will now expire at $NewExpDate."); + Misc::send_pm($UserID, 0, + 'You have received multiple warnings.', + "When you received your latest warning (set to expire on ".date('Y-m-d', (time() + $Duration)).'), you already had a different warning (set to expire on '.date('Y-m-d', strtotime($OldDate)).").\n\n Due to this collision, your warning status will now expire at $NewExpDate."); - $AdminComment = date('Y-m-d')." - Warning (Clash) extended to expire at $NewExpDate by " . G::$LoggedUser['Username'] . "\nReason: $Reason\n\n"; + $AdminComment = date('Y-m-d')." - Warning (Clash) extended to expire at $NewExpDate by " . G::$LoggedUser['Username'] . "\nReason: $Reason\n\n"; - G::$DB->query(' - UPDATE users_info - SET - Warned = \''.db_string($NewExpDate).'\', - WarnedTimes = WarnedTimes + 1, - AdminComment = CONCAT(\''.db_string($AdminComment).'\', AdminComment) - WHERE UserID = \''.db_string($UserID).'\''); - } else { - //Not changing, user was not already warned - $WarnTime = time_plus($Duration); + G::$DB->query(' + UPDATE users_info + SET + Warned = \''.db_string($NewExpDate).'\', + WarnedTimes = WarnedTimes + 1, + AdminComment = CONCAT(\''.db_string($AdminComment).'\', AdminComment) + WHERE UserID = \''.db_string($UserID).'\''); + } else { + //Not changing, user was not already warned + $WarnTime = time_plus($Duration); - G::$Cache->begin_transaction("user_info_$UserID"); - G::$Cache->update_row(false, array('Warned' => $WarnTime)); - G::$Cache->commit_transaction(0); + G::$Cache->begin_transaction("user_info_$UserID"); + G::$Cache->update_row(false, array('Warned' => $WarnTime)); + G::$Cache->commit_transaction(0); - $AdminComment = date('Y-m-d')." - Warned until $WarnTime by " . G::$LoggedUser['Username'] . "\nReason: $Reason\n\n"; + $AdminComment = date('Y-m-d')." - Warned until $WarnTime by " . G::$LoggedUser['Username'] . "\nReason: $Reason\n\n"; - G::$DB->query(' - UPDATE users_info - SET - Warned = \''.db_string($WarnTime).'\', - WarnedTimes = WarnedTimes + 1, - AdminComment = CONCAT(\''.db_string($AdminComment).'\', AdminComment) - WHERE UserID = \''.db_string($UserID).'\''); - } - G::$DB->set_query_id($QueryID); - } + G::$DB->query(' + UPDATE users_info + SET + Warned = \''.db_string($WarnTime).'\', + WarnedTimes = WarnedTimes + 1, + AdminComment = CONCAT(\''.db_string($AdminComment).'\', AdminComment) + WHERE UserID = \''.db_string($UserID).'\''); + } + G::$DB->set_query_id($QueryID); + } - /** - * Update the notes of a user - * @param unknown $UserID ID of user - * @param unknown $AdminComment Comment to update with - */ - public static function update_user_notes($UserID, $AdminComment) { - $QueryID = G::$DB->get_query_id(); - G::$DB->query(' - UPDATE users_info - SET AdminComment = CONCAT(\''.db_string($AdminComment).'\', AdminComment) - WHERE UserID = \''.db_string($UserID).'\''); - G::$DB->set_query_id($QueryID); - } + /** + * Update the notes of a user + * @param unknown $UserID ID of user + * @param unknown $AdminComment Comment to update with + */ + public static function update_user_notes($UserID, $AdminComment) { + $QueryID = G::$DB->get_query_id(); + G::$DB->query(' + UPDATE users_info + SET AdminComment = CONCAT(\''.db_string($AdminComment).'\', AdminComment) + WHERE UserID = \''.db_string($UserID).'\''); + G::$DB->set_query_id($QueryID); + } - /** - * Check if an IP address is part of a given CIDR range. - * @param string $CheckIP the IP address to be looked up - * @param string $Subnet the CIDR subnet to be checked against - */ - public static function check_cidr_range($CheckIP, $Subnet) { - $IP = ip2long($CheckIP); - $CIDR = split('/', $Subnet); - $SubnetIP = ip2long($CIDR[0]); - $SubnetMaskBits = 32 - $CIDR[1]; + /** + * Check if an IP address is part of a given CIDR range. + * @param string $CheckIP the IP address to be looked up + * @param string $Subnet the CIDR subnet to be checked against + */ + public static function check_cidr_range($CheckIP, $Subnet) { + $IP = ip2long($CheckIP); + $CIDR = split('/', $Subnet); + $SubnetIP = ip2long($CIDR[0]); + $SubnetMaskBits = 32 - $CIDR[1]; - return (($IP>>$SubnetMaskBits) == ($SubnetIP>>$SubnetMaskBits)); - } + return (($IP>>$SubnetMaskBits) == ($SubnetIP>>$SubnetMaskBits)); + } } ?> diff --git a/classes/top10.class.php b/classes/top10.class.php index 7533761bb..145a2b224 100644 --- a/classes/top10.class.php +++ b/classes/top10.class.php @@ -1,4 +1,4 @@ - - - + + + + + + + +
\r\nComposed by Curtis Schweitzer
\r\nMastered by Aaron Edwards
\r\nSoundtrack curated by The Otherworld Agency<\/pre><\/div>"; +//echo $Str; +echo Text::parse_html($Str); +echo "\n"; */ diff --git a/classes/textarea_preview.class.php b/classes/textarea_preview.class.php index 8ab50e3d8..826f34a04 100644 --- a/classes/textarea_preview.class.php +++ b/classes/textarea_preview.class.php @@ -4,71 +4,71 @@ * generate the required JavaScript that enables the previews to work. */ class TEXTAREA_PREVIEW_SUPER { - /** - * @static - * @var int $Textareas Total number of textareas created - */ - protected static $Textareas = 0; - - /** - * @static - * @var array $_ID Array of textarea IDs - */ - protected static $_ID = array(); - - /** - * @static - * @var bool For use in JavaScript method - */ - private static $Executed = false; - - /** - * This method should only run once with $all as true and should be placed - * in the header or footer. - * - * If $all is true, it includes TextareaPreview and jQuery - * - * jQuery is required for this to work, include it in the headers. - * - * @static - * @param bool $all Output all required scripts, otherwise just do iterator() - * @example - * @return void - */ - public static function JavaScript ($all = true) { - if (self::$Textareas === 0) { - return; - } - if (self::$Executed === false && $all) { - View::parse('generic/textarea/script.phtml'); - } - - self::$Executed = true; - self::iterator(); - } - - /** - * This iterator generates JavaScript to initialize each JavaScript - * TextareaPreview object. - * - * It will generate a numeric or custom ID related to the textarea. - * @static - * @return void - */ - private static function iterator() { - $script = array(); - for ($i = 0; $i < self::$Textareas; $i++) { - if (isset(self::$_ID[$i]) && is_string(self::$_ID[$i])) { - $a = sprintf('%d, "%s"', $i, self::$_ID[$i]); - } else { - $a = $i; - } - $script[] = sprintf('[%s]', $a); - } - if (!empty($script)) { - View::parse('generic/textarea/script_factory.phtml', array('script' => join(', ', $script))); - } - } + /** + * @static + * @var int $Textareas Total number of textareas created + */ + protected static $Textareas = 0; + + /** + * @static + * @var array $_ID Array of textarea IDs + */ + protected static $_ID = []; + + /** + * @static + * @var bool For use in JavaScript method + */ + private static $Executed = false; + + /** + * This method should only run once with $all as true and should be placed + * in the header or footer. + * + * If $all is true, it includes TextareaPreview and jQuery + * + * jQuery is required for this to work, include it in the headers. + * + * @static + * @param bool $all Output all required scripts, otherwise just do iterator() + * @example + * @return void + */ + public static function JavaScript ($all = true) { + if (self::$Textareas === 0) { + return; + } + if (self::$Executed === false && $all) { + View::parse('generic/textarea/script.phtml'); + } + + self::$Executed = true; + self::iterator(); + } + + /** + * This iterator generates JavaScript to initialize each JavaScript + * TextareaPreview object. + * + * It will generate a numeric or custom ID related to the textarea. + * @static + * @return void + */ + private static function iterator() { + $script = []; + for ($i = 0; $i < self::$Textareas; $i++) { + if (isset(self::$_ID[$i]) && is_string(self::$_ID[$i])) { + $a = sprintf('%d, "%s"', $i, self::$_ID[$i]); + } else { + $a = $i; + } + $script[] = sprintf('[%s]', $a); + } + if (!empty($script)) { + View::parse('generic/textarea/script_factory.phtml', array('script' => join(', ', $script))); + } + } } /** @@ -87,7 +87,7 @@ private static function iterator() { * // no buttons or wrap preview divs. * // Buttons and preview divs are generated manually * $text = new TEXTAREA_PREVIEW('body_text', 'body_text', 'default text', - * 50, 20, false, false, array('disabled="disabled"', 'class="text"')); + * 50, 20, false, false, array('disabled="disabled"', 'class="text"')); * * $text->buttons(); // output buttons * @@ -100,123 +100,123 @@ private static function iterator() { * * // some template *- **- *
+ *- * - *- * - * - *+ *
*+ * + *+ * + * + *- - -
- + +- -
- - href=""> -
- + href=""> + +Str = $Val; - $this->dec(); - } else { - $this->Val = $Val; - } - } - - // Decode an element based on the type. The type is really just an indicator. - function decode($Type, $Key) { - if (is_number($Type)) { // Element is a string - // Get length of string - $StrLen = $Type; - while ($this->Str[$this->Pos + 1] != ':') { - $this->Pos++; - $StrLen.=$this->Str[$this->Pos]; - } - $this->Val[$Key] = substr($this->Str, $this->Pos + 2, $StrLen); - - $this->Pos += $StrLen; - $this->Pos += 2; - - } elseif ($Type == 'i') { // Element is an int - $this->Pos++; - - // Find end of integer (first occurance of 'e' after position) - $End = strpos($this->Str, 'e', $this->Pos); - - // Get the integer, and - IMPORTANT - cast it as an int, so we know later that it's an int and not a string - $this->Val[$Key] = (int)substr($this->Str, $this->Pos, $End-$this->Pos); - $this->Pos = $End + 1; - - } elseif ($Type == 'l') { // Element is a list - $this->Val[$Key] = new BENCODE_LIST(substr($this->Str, $this->Pos)); - $this->Pos += $this->Val[$Key]->Pos; - - } elseif ($Type == 'd') { // Element is a dictionary - $this->Val[$Key] = new BENCODE_DICT(substr($this->Str, $this->Pos)); - $this->Pos += $this->Val[$Key]->Pos; - // Sort by key to respect spec - if (!empty($this->Val[$Key]->Val)) { - ksort($this->Val[$Key]->Val); - } - - } else { - die('Invalid torrent file'); - } - } - - function encode($Val) { - if (is_int($Val)) { // Integer - return 'i'.$Val.'e'; - } elseif (is_string($Val)) { - return strlen($Val).':'.$Val; - } elseif (is_object($Val)) { - return $Val->enc(); - } else { - return 'fail'; - } - } + var $Val; // Decoded array + var $Pos = 1; // Pointer that indicates our position in the string + var $Str = ''; // Torrent string + + function __construct($Val, $IsParsed = false) { + if (!$IsParsed) { + $this->Str = $Val; + $this->dec(); + } else { + $this->Val = $Val; + } + } + + // Decode an element based on the type. The type is really just an indicator. + function decode($Type, $Key) { + if (is_number($Type)) { // Element is a string + // Get length of string + $StrLen = $Type; + while ($this->Str[$this->Pos + 1] != ':') { + $this->Pos++; + $StrLen.=$this->Str[$this->Pos]; + } + $this->Val[$Key] = substr($this->Str, $this->Pos + 2, $StrLen); + + $this->Pos += $StrLen; + $this->Pos += 2; + + } elseif ($Type == 'i') { // Element is an int + $this->Pos++; + + // Find end of integer (first occurance of 'e' after position) + $End = strpos($this->Str, 'e', $this->Pos); + + // Get the integer, and - IMPORTANT - cast it as an int, so we know later that it's an int and not a string + $this->Val[$Key] = (int)substr($this->Str, $this->Pos, $End-$this->Pos); + $this->Pos = $End + 1; + + } elseif ($Type == 'l') { // Element is a list + $this->Val[$Key] = new BENCODE_LIST(substr($this->Str, $this->Pos)); + $this->Pos += $this->Val[$Key]->Pos; + + } elseif ($Type == 'd') { // Element is a dictionary + $this->Val[$Key] = new BENCODE_DICT(substr($this->Str, $this->Pos)); + $this->Pos += $this->Val[$Key]->Pos; + // Sort by key to respect spec + if (!empty($this->Val[$Key]->Val)) { + ksort($this->Val[$Key]->Val); + } + + } else { + die('Invalid torrent file'); + } + } + + function encode($Val) { + if (is_int($Val)) { // Integer + return 'i'.$Val.'e'; + } elseif (is_string($Val)) { + return strlen($Val).':'.$Val; + } elseif (is_object($Val)) { + return $Val->enc(); + } else { + return 'fail'; + } + } } class BENCODE_LIST extends BENCODE2 { - function enc() { - if (empty($this->Val)) { - return 'le'; - } - $Str = 'l'; - reset($this->Val); - foreach ($this->Val as $Value) { - $Str.=$this->encode($Value); - } - return $Str.'e'; - } - - // Decode a list - function dec() { - $Key = 0; // Array index - $Length = strlen($this->Str); - while ($this->Pos < $Length) { - $Type = $this->Str[$this->Pos]; - // $Type now indicates what type of element we're dealing with - // It's either an integer (string), 'i' (an integer), 'l' (a list), 'd' (a dictionary), or 'e' (end of dictionary/list) - - if ($Type == 'e') { // End of list - $this->Pos += 1; - unset($this->Str); // Since we're finished parsing the string, we don't need to store it anymore. Benchmarked - this makes the parser run way faster. - return; - } - - // Decode the bencoded element. - // This function changes $this->Pos and $this->Val, so you don't have to. - $this->decode($Type, $Key); - ++$Key; - } - return true; - } + function enc() { + if (empty($this->Val)) { + return 'le'; + } + $Str = 'l'; + reset($this->Val); + foreach ($this->Val as $Value) { + $Str.=$this->encode($Value); + } + return $Str.'e'; + } + + // Decode a list + function dec() { + $Key = 0; // Array index + $Length = strlen($this->Str); + while ($this->Pos < $Length) { + $Type = $this->Str[$this->Pos]; + // $Type now indicates what type of element we're dealing with + // It's either an integer (string), 'i' (an integer), 'l' (a list), 'd' (a dictionary), or 'e' (end of dictionary/list) + + if ($Type == 'e') { // End of list + $this->Pos += 1; + unset($this->Str); // Since we're finished parsing the string, we don't need to store it anymore. Benchmarked - this makes the parser run way faster. + return; + } + + // Decode the bencoded element. + // This function changes $this->Pos and $this->Val, so you don't have to. + $this->decode($Type, $Key); + ++$Key; + } + return true; + } } class BENCODE_DICT extends BENCODE2 { - function enc() { - if (empty($this->Val)) { - return 'de'; - } - $Str = 'd'; - reset($this->Val); - foreach ($this->Val as $Key => $Value) { - $Str.=strlen($Key).':'.$Key.$this->encode($Value); - } - return $Str.'e'; - } - - // Decode a dictionary - function dec() { - $Length = strlen($this->Str); - while ($this->Pos<$Length) { - - if ($this->Str[$this->Pos] == 'e') { // End of dictionary - $this->Pos += 1; - unset($this->Str); // Since we're finished parsing the string, we don't need to store it anymore. Benchmarked - this makes the parser run way faster. - return; - } - - // Get the dictionary key - // Length of the key, in bytes - $KeyLen = $this->Str[$this->Pos]; - - // Allow for multi-digit lengths - while ($this->Str[$this->Pos + 1] != ':' && $this->Pos + 1 < $Length) { - $this->Pos++; - $KeyLen.=$this->Str[$this->Pos]; - } - // $this->Pos is now on the last letter of the key length - // Adding 2 brings it past that character and the ':' to the beginning of the string - $this->Pos += 2; - - // Get the name of the key - $Key = substr($this->Str, $this->Pos, $KeyLen); - - // Move the position past the key to the beginning of the element - $this->Pos += $KeyLen; - $Type = $this->Str[$this->Pos]; - // $Type now indicates what type of element we're dealing with - // It's either an integer (string), 'i' (an integer), 'l' (a list), 'd' (a dictionary), or 'e' (end of dictionary/list) - - // Decode the bencoded element. - // This function changes $this->Pos and $this->Val, so you don't have to. - $this->decode($Type, $Key); - - - } - return true; - } + function enc() { + if (empty($this->Val)) { + return 'de'; + } + $Str = 'd'; + reset($this->Val); + foreach ($this->Val as $Key => $Value) { + $Str.=strlen($Key).':'.$Key.$this->encode($Value); + } + return $Str.'e'; + } + + // Decode a dictionary + function dec() { + $Length = strlen($this->Str); + while ($this->Pos<$Length) { + + if ($this->Str[$this->Pos] == 'e') { // End of dictionary + $this->Pos += 1; + unset($this->Str); // Since we're finished parsing the string, we don't need to store it anymore. Benchmarked - this makes the parser run way faster. + return; + } + + // Get the dictionary key + // Length of the key, in bytes + $KeyLen = $this->Str[$this->Pos]; + + // Allow for multi-digit lengths + while ($this->Str[$this->Pos + 1] != ':' && $this->Pos + 1 < $Length) { + $this->Pos++; + $KeyLen.=$this->Str[$this->Pos]; + } + // $this->Pos is now on the last letter of the key length + // Adding 2 brings it past that character and the ':' to the beginning of the string + $this->Pos += 2; + + // Get the name of the key + $Key = substr($this->Str, $this->Pos, $KeyLen); + + // Move the position past the key to the beginning of the element + $this->Pos += $KeyLen; + $Type = $this->Str[$this->Pos]; + // $Type now indicates what type of element we're dealing with + // It's either an integer (string), 'i' (an integer), 'l' (a list), 'd' (a dictionary), or 'e' (end of dictionary/list) + + // Decode the bencoded element. + // This function changes $this->Pos and $this->Val, so you don't have to. + $this->decode($Type, $Key); + + + } + return true; + } } class TORRENT extends BENCODE_DICT { - function dump() { - // Convenience function used for testing and figuring out how we store the data - print_r($this->Val); - } - - function dump_data() { - // Function which serializes $this->Val for storage - return base64_encode(serialize($this->Val)); - } - - /* - To use this, please remove the announce-list unset in make_private and be sure to still set_announce_url for backwards compatibility - function set_multi_announce() { - $Trackers = func_get_args(); - $AnnounceList = new BENCODE_LIST(array(),true); - foreach ($Trackers as $Tracker) { - $SubList = new BENCODE_LIST(array($Tracker),true); - unset($SubList->Str); - $AnnounceList->Val[] = $SubList; - } - $this->Val['announce-list'] = $AnnounceList; - } - */ - - function set_announce_url($Announce) { - $this->Val['announce'] = $Announce; - ksort($this->Val); - } - - // Returns an array of: - // * the files in the torrent - // * the total size of files described therein - function file_list() { - $FileList = array(); - if (!isset($this->Val['info']->Val['files'])) { // Single file mode - $TotalSize = $this->Val['info']->Val['length']; - $FileList[] = array($TotalSize, $this->get_name()); - } else { // Multiple file mode - $FileNames = array(); - $FileSizes = array(); - $TotalSize = 0; - $Files = $this->Val['info']->Val['files']->Val; - if (isset($Files[0]->Val['path.utf-8'])) { - $PathKey = 'path.utf-8'; - } else { - $PathKey = 'path'; - } - foreach ($Files as $File) { - $FileSize = $File->Val['length']; - $TotalSize += $FileSize; - - $FileName = ltrim(implode('/', $File->Val[$PathKey]->Val), '/'); - $FileSizes[] = $FileSize; - $FileNames[] = $FileName; - } - natcasesort($FileNames); - foreach ($FileNames as $Index => $FileName) { - $FileList[] = array($FileSizes[$Index], $FileName); - } - } - return array($TotalSize, $FileList); - } - - function get_name() { - if (isset($this->Val['info']->Val['name.utf-8'])) { - return $this->Val['info']->Val['name.utf-8']; - } else { - return $this->Val['info']->Val['name']; - } - } - - function make_private() { - //----- The following properties do not affect the infohash: - - // anounce-list is an unofficial extension to the protocol - // that allows for multiple trackers per torrent - unset($this->Val['announce-list']); - - // Bitcomet & Azureus cache peers in here - unset($this->Val['nodes']); - - // Azureus stores the dht_backup_enable flag here - unset($this->Val['azureus_properties']); - - // Remove web-seeds - unset($this->Val['url-list']); - - // Remove libtorrent resume info - unset($this->Val['libtorrent_resume']); - - //----- End properties that do not affect the infohash - if ($this->Val['info']->Val['private']) { - return true; // Torrent is private - } else { - // Torrent is not private! - // add private tracker flag and sort info dictionary - $this->Val['info']->Val['private'] = 1; - ksort($this->Val['info']->Val); - return false; - } - } + function dump() { + // Convenience function used for testing and figuring out how we store the data + print_r($this->Val); + } + + function dump_data() { + // Function which serializes $this->Val for storage + return base64_encode(serialize($this->Val)); + } + + /* + To use this, please remove the announce-list unset in make_private and be sure to still set_announce_url for backwards compatibility + function set_multi_announce() { + $Trackers = func_get_args(); + $AnnounceList = new BENCODE_LIST([],true); + foreach ($Trackers as $Tracker) { + $SubList = new BENCODE_LIST(array($Tracker),true); + unset($SubList->Str); + $AnnounceList->Val[] = $SubList; + } + $this->Val['announce-list'] = $AnnounceList; + } + */ + + function set_announce_url($Announce) { + $this->Val['announce'] = $Announce; + ksort($this->Val); + } + + // Returns an array of: + // * the files in the torrent + // * the total size of files described therein + function file_list() { + $FileList = []; + if (!isset($this->Val['info']->Val['files'])) { // Single file mode + $TotalSize = $this->Val['info']->Val['length']; + $FileList[] = array($TotalSize, $this->get_name()); + } else { // Multiple file mode + $FileNames = []; + $FileSizes = []; + $TotalSize = 0; + $Files = $this->Val['info']->Val['files']->Val; + if (isset($Files[0]->Val['path.utf-8'])) { + $PathKey = 'path.utf-8'; + } else { + $PathKey = 'path'; + } + foreach ($Files as $File) { + $FileSize = $File->Val['length']; + $TotalSize += $FileSize; + + $FileName = ltrim(implode('/', $File->Val[$PathKey]->Val), '/'); + $FileSizes[] = $FileSize; + $FileNames[] = $FileName; + } + natcasesort($FileNames); + foreach ($FileNames as $Index => $FileName) { + $FileList[] = array($FileSizes[$Index], $FileName); + } + } + return array($TotalSize, $FileList); + } + + function get_name() { + if (isset($this->Val['info']->Val['name.utf-8'])) { + return $this->Val['info']->Val['name.utf-8']; + } else { + return $this->Val['info']->Val['name']; + } + } + + function make_private() { + //----- The following properties do not affect the infohash: + + // anounce-list is an unofficial extension to the protocol + // that allows for multiple trackers per torrent + unset($this->Val['announce-list']); + + // Bitcomet & Azureus cache peers in here + unset($this->Val['nodes']); + + // Azureus stores the dht_backup_enable flag here + unset($this->Val['azureus_properties']); + + // Remove web-seeds + unset($this->Val['url-list']); + + // Remove libtorrent resume info + unset($this->Val['libtorrent_resume']); + + //----- End properties that do not affect the infohash + if ($this->Val['info']->Val['private']) { + return true; // Torrent is private + } else { + // Torrent is not private! + // add private tracker flag and sort info dictionary + $this->Val['info']->Val['private'] = 1; + ksort($this->Val['info']->Val); + return false; + } + } } ?> diff --git a/classes/torrent_32bit.class.php b/classes/torrent_32bit.class.php index 2af39f472..4f4457fc0 100644 --- a/classes/torrent_32bit.class.php +++ b/classes/torrent_32bit.class.php @@ -1,4 +1,4 @@ -Str = $Val; - $this->dec(); - } else { - $this->Val = $Val; - } - } - - // Decode an element based on the type - function decode($Type, $Key) { - if (ctype_digit($Type)) { // Element is a string - // Get length of string - $StrLen = $Type; - while ($this->Str[$this->Pos + 1] != ':') { - $this->Pos++; - $StrLen.=$this->Str[$this->Pos]; - } - $this->Val[$Key] = substr($this->Str, $this->Pos + 2, $StrLen); - - $this->Pos += $StrLen; - $this->Pos += 2; - - } elseif ($Type == 'i') { // Element is an int - $this->Pos++; - - // Find end of integer (first occurance of 'e' after position) - $End = strpos($this->Str, 'e', $this->Pos); - - // Get the integer, and mark it as an int (on our version 64 bit box, we cast it to an int) - $this->Val[$Key] = '[*INT*]'.substr($this->Str, $this->Pos, $End-$this->Pos); - $this->Pos = $End + 1; - - } elseif ($Type == 'l') { // Element is a list - $this->Val[$Key] = new BENCODE_LIST(substr($this->Str, $this->Pos)); - $this->Pos += $this->Val[$Key]->Pos; - - } elseif ($Type == 'd') { // Element is a dictionary - $this->Val[$Key] = new BENCODE_DICT(substr($this->Str, $this->Pos)); - $this->Pos += $this->Val[$Key]->Pos; - // Sort by key to respect spec - ksort($this->Val[$Key]->Val); - - } else { - die('Invalid torrent file'); - } - } - - function encode($Val) { - if (is_string($Val)) { - if (substr($Val, 0, 7) == '[*INT*]') { - return 'i'.substr($Val,7).'e'; - } else { - return strlen($Val).':'.$Val; - } - } elseif (is_object($Val)) { - return $Val->enc(); - } else { - return 'fail'; - } - } + var $Val; // Decoded array + var $Pos = 1; // Pointer that indicates our position in the string + var $Str = ''; // Torrent string + + function __construct($Val, $IsParsed = false) { + if (!$IsParsed) { + $this->Str = $Val; + $this->dec(); + } else { + $this->Val = $Val; + } + } + + // Decode an element based on the type + function decode($Type, $Key) { + if (ctype_digit($Type)) { // Element is a string + // Get length of string + $StrLen = $Type; + while ($this->Str[$this->Pos + 1] != ':') { + $this->Pos++; + $StrLen.=$this->Str[$this->Pos]; + } + $this->Val[$Key] = substr($this->Str, $this->Pos + 2, $StrLen); + + $this->Pos += $StrLen; + $this->Pos += 2; + + } elseif ($Type == 'i') { // Element is an int + $this->Pos++; + + // Find end of integer (first occurance of 'e' after position) + $End = strpos($this->Str, 'e', $this->Pos); + + // Get the integer, and mark it as an int (on our version 64 bit box, we cast it to an int) + $this->Val[$Key] = '[*INT*]'.substr($this->Str, $this->Pos, $End-$this->Pos); + $this->Pos = $End + 1; + + } elseif ($Type == 'l') { // Element is a list + $this->Val[$Key] = new BENCODE_LIST(substr($this->Str, $this->Pos)); + $this->Pos += $this->Val[$Key]->Pos; + + } elseif ($Type == 'd') { // Element is a dictionary + $this->Val[$Key] = new BENCODE_DICT(substr($this->Str, $this->Pos)); + $this->Pos += $this->Val[$Key]->Pos; + // Sort by key to respect spec + ksort($this->Val[$Key]->Val); + + } else { + die('Invalid torrent file'); + } + } + + function encode($Val) { + if (is_string($Val)) { + if (substr($Val, 0, 7) == '[*INT*]') { + return 'i'.substr($Val,7).'e'; + } else { + return strlen($Val).':'.$Val; + } + } elseif (is_object($Val)) { + return $Val->enc(); + } else { + return 'fail'; + } + } } class BENCODE_LIST extends BENCODE2 { - function enc() { - $Str = 'l'; - reset($this->Val); - while (list($Key, $Value) = each($this->Val)) { - $Str.=$this->encode($Value); - } - return $Str.'e'; - } - - // Decode a list - function dec() { - $Key = 0; // Array index - $Length = strlen($this->Str); - while ($this->Pos<$Length) { - $Type = $this->Str[$this->Pos]; - // $Type now indicates what type of element we're dealing with - // It's either an integer (string), 'i' (an integer), 'l' (a list), 'd' (a dictionary), or 'e' (end of dictionary/list) - - if ($Type == 'e') { // End of list - $this->Pos += 1; - unset($this->Str); // Since we're finished parsing the string, we don't need to store it anymore. Benchmarked - this makes the parser run way faster. - return; - } - - // Decode the bencoded element. - // This function changes $this->Pos and $this->Val, so you don't have to. - $this->decode($Type, $Key); - ++ $Key; - } - return true; - } + function enc() { + $Str = 'l'; + reset($this->Val); + while (list($Key, $Value) = each($this->Val)) { + $Str.=$this->encode($Value); + } + return $Str.'e'; + } + + // Decode a list + function dec() { + $Key = 0; // Array index + $Length = strlen($this->Str); + while ($this->Pos<$Length) { + $Type = $this->Str[$this->Pos]; + // $Type now indicates what type of element we're dealing with + // It's either an integer (string), 'i' (an integer), 'l' (a list), 'd' (a dictionary), or 'e' (end of dictionary/list) + + if ($Type == 'e') { // End of list + $this->Pos += 1; + unset($this->Str); // Since we're finished parsing the string, we don't need to store it anymore. Benchmarked - this makes the parser run way faster. + return; + } + + // Decode the bencoded element. + // This function changes $this->Pos and $this->Val, so you don't have to. + $this->decode($Type, $Key); + ++ $Key; + } + return true; + } } class BENCODE_DICT extends BENCODE2 { - function enc() { - $Str = 'd'; - reset($this->Val); - while (list($Key, $Value) = each($this->Val)) { - $Str.=strlen($Key).':'.$Key.$this->encode($Value); - } - return $Str.'e'; - } - - // Decode a dictionary - function dec() { - $Length = strlen($this->Str); - while ($this->Pos < $Length) { - - if ($this->Str[$this->Pos] == 'e') { // End of dictionary - $this->Pos += 1; - unset($this->Str); // Since we're finished parsing the string, we don't need to store it anymore. Benchmarked - this makes the parser run way faster. - return; - } - - // Get the dictionary key - // Length of the key, in bytes - $KeyLen = $this->Str[$this->Pos]; - - // Allow for multi-digit lengths - while ($this->Str[$this->Pos + 1] != ':' && $this->Pos + 1 < $Length) { - $this->Pos++; - $KeyLen.=$this->Str[$this->Pos]; - } - // $this->Pos is now on the last letter of the key length - // Adding 2 brings it past that character and the ':' to the beginning of the string - $this->Pos+=2; - - // Get the name of the key - $Key = substr($this->Str, $this->Pos, $KeyLen); - - // Move the position past the key to the beginning of the element - $this->Pos += $KeyLen; - $Type = $this->Str[$this->Pos]; - // $Type now indicates what type of element we're dealing with - // It's either an integer (string), 'i' (an integer), 'l' (a list), 'd' (a dictionary), or 'e' (end of dictionary/list) - - // Decode the bencoded element. - // This function changes $this->Pos and $this->Val, so you don't have to. - $this->decode($Type, $Key); - - - } - return true; - } + function enc() { + $Str = 'd'; + reset($this->Val); + while (list($Key, $Value) = each($this->Val)) { + $Str.=strlen($Key).':'.$Key.$this->encode($Value); + } + return $Str.'e'; + } + + // Decode a dictionary + function dec() { + $Length = strlen($this->Str); + while ($this->Pos < $Length) { + + if ($this->Str[$this->Pos] == 'e') { // End of dictionary + $this->Pos += 1; + unset($this->Str); // Since we're finished parsing the string, we don't need to store it anymore. Benchmarked - this makes the parser run way faster. + return; + } + + // Get the dictionary key + // Length of the key, in bytes + $KeyLen = $this->Str[$this->Pos]; + + // Allow for multi-digit lengths + while ($this->Str[$this->Pos + 1] != ':' && $this->Pos + 1 < $Length) { + $this->Pos++; + $KeyLen.=$this->Str[$this->Pos]; + } + // $this->Pos is now on the last letter of the key length + // Adding 2 brings it past that character and the ':' to the beginning of the string + $this->Pos+=2; + + // Get the name of the key + $Key = substr($this->Str, $this->Pos, $KeyLen); + + // Move the position past the key to the beginning of the element + $this->Pos += $KeyLen; + $Type = $this->Str[$this->Pos]; + // $Type now indicates what type of element we're dealing with + // It's either an integer (string), 'i' (an integer), 'l' (a list), 'd' (a dictionary), or 'e' (end of dictionary/list) + + // Decode the bencoded element. + // This function changes $this->Pos and $this->Val, so you don't have to. + $this->decode($Type, $Key); + + + } + return true; + } } class TORRENT extends BENCODE_DICT { - function dump() { - // Convenience function used for testing and figuring out how we store the data - print_r($this->Val); - } - - function dump_data() { - // Function which serializes $this->Val for storage - return base64_encode(serialize($this->Val)); - } - - function set_announce_url($Announce) { - $this->Val['announce'] = $Announce; - ksort($this->Val); - } - - // Returns an array of: - // * the files in the torrent - // * the total size of files described therein - function file_list() { - $FileList = array(); - if (!isset($this->Val['info']->Val['files'])) { // Single file mode - $TotalSize = substr($this->Val['info']->Val['length'],7); - $FileList[] = array($TotalSize, $this->get_name()); - } else { // Multiple file mode - $FileNames = array(); - $FileSizes = array(); - $TotalSize = 0; - $Files = $this->Val['info']->Val['files']->Val; - if (isset($Files[0]->Val['path.utf-8'])) { - $PathKey = 'path.utf-8'; - } else { - $PathKey = 'path'; - } - foreach ($Files as $File) { - $FileSize = substr($File->Val['length'], 7); - $TotalSize += $FileSize; - - $FileName = ltrim(implode('/', $File->Val[$PathKey]->Val), '/'); - $FileSizes[] = $FileSize; - $FileNames[] = $FileName; - } - natcasesort($FileNames); - foreach ($FileNames as $Index => $FileName) { - $FileList[] = array($FileSizes[$Index], $FileName); - } - } - return array($TotalSize, $FileList); - } - - function get_name() { - if (isset($this->Val['info']->Val['name.utf-8'])) { - return $this->Val['info']->Val['name.utf-8']; - } else { - return $this->Val['info']->Val['name']; - } - } - - function make_private() { - //----- The following properties do not affect the infohash: - - // anounce-list is an unofficial extension to the protocol - // that allows for multiple trackers per torrent - unset($this->Val['announce-list']); - - // Bitcomet & Azureus cache peers in here - unset($this->Val['nodes']); - - // Azureus stores the dht_backup_enable flag here - unset($this->Val['azureus_properties']); - - // Remove web-seeds - unset($this->Val['url-list']); - - // Remove libtorrent resume info - unset($this->Val['libtorrent_resume']); - - //----- End properties that do not affect the infohash - - if (!empty($this->Val['info']->Val['private']) && $this->Val['info']->Val['private'] == '[*INT*]1') { - return true; - } else { - // Torrent is not private! - // add private tracker flag and sort info dictionary - $this->Val['info']->Val['private'] = '[*INT*]1'; - ksort($this->Val['info']->Val); - return false; - } - } + function dump() { + // Convenience function used for testing and figuring out how we store the data + print_r($this->Val); + } + + function dump_data() { + // Function which serializes $this->Val for storage + return base64_encode(serialize($this->Val)); + } + + function set_announce_url($Announce) { + $this->Val['announce'] = $Announce; + ksort($this->Val); + } + + // Returns an array of: + // * the files in the torrent + // * the total size of files described therein + function file_list() { + $FileList = []; + if (!isset($this->Val['info']->Val['files'])) { // Single file mode + $TotalSize = substr($this->Val['info']->Val['length'],7); + $FileList[] = array($TotalSize, $this->get_name()); + } else { // Multiple file mode + $FileNames = []; + $FileSizes = []; + $TotalSize = 0; + $Files = $this->Val['info']->Val['files']->Val; + if (isset($Files[0]->Val['path.utf-8'])) { + $PathKey = 'path.utf-8'; + } else { + $PathKey = 'path'; + } + foreach ($Files as $File) { + $FileSize = substr($File->Val['length'], 7); + $TotalSize += $FileSize; + + $FileName = ltrim(implode('/', $File->Val[$PathKey]->Val), '/'); + $FileSizes[] = $FileSize; + $FileNames[] = $FileName; + } + natcasesort($FileNames); + foreach ($FileNames as $Index => $FileName) { + $FileList[] = array($FileSizes[$Index], $FileName); + } + } + return array($TotalSize, $FileList); + } + + function get_name() { + if (isset($this->Val['info']->Val['name.utf-8'])) { + return $this->Val['info']->Val['name.utf-8']; + } else { + return $this->Val['info']->Val['name']; + } + } + + function make_private() { + //----- The following properties do not affect the infohash: + + // anounce-list is an unofficial extension to the protocol + // that allows for multiple trackers per torrent + unset($this->Val['announce-list']); + + // Bitcomet & Azureus cache peers in here + unset($this->Val['nodes']); + + // Azureus stores the dht_backup_enable flag here + unset($this->Val['azureus_properties']); + + // Remove web-seeds + unset($this->Val['url-list']); + + // Remove libtorrent resume info + unset($this->Val['libtorrent_resume']); + + //----- End properties that do not affect the infohash + + if (!empty($this->Val['info']->Val['private']) && $this->Val['info']->Val['private'] == '[*INT*]1') { + return true; + } else { + // Torrent is not private! + // add private tracker flag and sort info dictionary + $this->Val['info']->Val['private'] = '[*INT*]1'; + ksort($this->Val['info']->Val); + return false; + } + } } ?> diff --git a/classes/torrent_form.class.php b/classes/torrent_form.class.php index 4cc8a046a..f610663df 100644 --- a/classes/torrent_form.class.php +++ b/classes/torrent_form.class.php @@ -4,769 +4,770 @@ ************ Torrent form class *************** upload.php and torrents.php **** ******************************************************************************** ** This class is used to create both the upload form, and the 'edit torrent' ** - ** form. It is broken down into several functions - head(), foot(), ** - ** music_form() [music], audiobook_form() [Audiobooks and comedy], and ** - ** simple_form() [everything else]. ** - ** ** + ** form. It is broken down into several functions - head(), foot(), ** + ** music_form() [music], audiobook_form() [Audiobooks and comedy], and ** + ** simple_form() [everything else]. ** + ** ** ** When it is called from the edit page, the forms are shortened quite a bit. ** - ** ** + ** ** ********************************************************************************/ use OrpheusNET\Logchecker\Logchecker; class TORRENT_FORM { - var $UploadForm = ''; - var $Categories = array(); - var $Formats = array(); - var $Bitrates = array(); - var $Media = array(); - var $NewTorrent = false; - var $Torrent = array(); - var $Error = false; - var $TorrentID = false; - var $Disabled = ''; - var $DisabledFlag = false; - - const TORRENT_INPUT_ACCEPT = ['application/x-bittorrent', '.torrent']; - const JSON_INPUT_ACCEPT = ['application/json', '.json']; - - function __construct($Torrent = false, $Error = false, $NewTorrent = true) { - - $this->NewTorrent = $NewTorrent; - $this->Torrent = $Torrent; - $this->Error = $Error; - - global $UploadForm, $Categories, $Formats, $Bitrates, $Media, $TorrentID; - - $this->UploadForm = $UploadForm; - $this->Categories = $Categories; - $this->Formats = $Formats; - $this->Bitrates = $Bitrates; - $this->Media = $Media; - $this->TorrentID = $TorrentID; - - if ($this->Torrent && $this->Torrent['GroupID']) { - $this->Disabled = ' disabled="disabled"'; - $this->DisabledFlag = true; - } - } - - function head() { - $AnnounceURL = (G::$LoggedUser['HttpsTracker']) ? ANNOUNCE_HTTPS_URL : ANNOUNCE_HTTP_URL; + var $UploadForm = ''; + var $Categories = []; + var $Formats = []; + var $Bitrates = []; + var $Media = []; + var $NewTorrent = false; + var $Torrent = []; + var $Error = false; + var $TorrentID = false; + var $Disabled = ''; + var $DisabledFlag = false; + + const TORRENT_INPUT_ACCEPT = ['application/x-bittorrent', '.torrent']; + const JSON_INPUT_ACCEPT = ['application/json', '.json']; + + function __construct($Torrent = false, $Error = false, $NewTorrent = true) { + + $this->NewTorrent = $NewTorrent; + $this->Torrent = $Torrent; + $this->Error = $Error; + + global $UploadForm, $Categories, $Formats, $Bitrates, $Media, $TorrentID; + + $this->UploadForm = $UploadForm; + $this->Categories = $Categories; + $this->Formats = $Formats; + $this->Bitrates = $Bitrates; + $this->Media = $Media; + $this->TorrentID = $TorrentID; + + if ($this->Torrent && $this->Torrent['GroupID']) { + $this->Disabled = ' disabled="disabled"'; + $this->DisabledFlag = true; + } + } + + function head() { + $AnnounceURL = (G::$LoggedUser['HttpsTracker']) ? ANNOUNCE_HTTPS_URL : ANNOUNCE_HTTP_URL; ?>-NewTorrent) { ?> -- - -- Your personal announce URL is:
-Error) { - echo "\t".'
- -'.$this->Error."
\n"; - } +NewTorrent) { ?> ++ Your personal announce URL is:
+Error) { + echo "\t".'
+ +'.$this->Error."
\n"; + } ?> -- ++ + ++perf_table(); $Debug->flag_table(); $Debug->error_table(); @@ -48,19 +51,19 @@ $Debug->vars_table(); $Debug->ocelot_table(); ?> -- - + - Release Date:<\/strong>\tMay 29, 2017<\/li>
-
-
-
-
-
+ -
-
-
-
-
-
-
-
-
-
+
+
+
+
+
- - Torrents: - - -
- - Artist: - - -
- - Requests: - - -
- - Forums: - - +
- + Torrents: + + +
- + Artist: + + +
- + Requests: + + +
- + Forums: + + -
- - Log: - - -
- - Users: - - -
- + Log: + + +
- + Users: + + + +
+
+
+
-
+
+
+
+get_value('staff_blog_read_'.G::$LoggedUser['ID'])) === false) {
- G::$DB->query("
- SELECT Time
- FROM staff_blog_visits
- WHERE UserID = ".G::$LoggedUser['ID']);
- if (list($SBlogReadTime) = G::$DB->next_record()) {
- $SBlogReadTime = strtotime($SBlogReadTime);
- } else {
- $SBlogReadTime = 0;
- }
- G::$Cache->cache_value('staff_blog_read_'.G::$LoggedUser['ID'], $SBlogReadTime, 1209600);
- }
- if (!$LatestSBlogTime && ($LatestSBlogTime = G::$Cache->get_value('staff_blog_latest_time')) === false) {
- G::$DB->query("
- SELECT MAX(Time)
- FROM staff_blog");
- list($LatestSBlogTime) = G::$DB->next_record();
- if ($LatestSBlogTime) {
- $LatestSBlogTime = strtotime($LatestSBlogTime);
- } else {
- $LatestSBlogTime = 0;
- }
- G::$Cache->cache_value('staff_blog_latest_time', $LatestSBlogTime, 1209600);
- }
- if ($SBlogReadTime < $LatestSBlogTime) {
- $Alerts[] = 'New staff blog post!';
- }
+ global $SBlogReadTime, $LatestSBlogTime;
+ if (!$SBlogReadTime && ($SBlogReadTime = G::$Cache->get_value('staff_blog_read_'.G::$LoggedUser['ID'])) === false) {
+ G::$DB->query("
+ SELECT Time
+ FROM staff_blog_visits
+ WHERE UserID = ".G::$LoggedUser['ID']);
+ if (list($SBlogReadTime) = G::$DB->next_record()) {
+ $SBlogReadTime = strtotime($SBlogReadTime);
+ } else {
+ $SBlogReadTime = 0;
+ }
+ G::$Cache->cache_value('staff_blog_read_'.G::$LoggedUser['ID'], $SBlogReadTime, 1209600);
+ }
+ if (!$LatestSBlogTime && ($LatestSBlogTime = G::$Cache->get_value('staff_blog_latest_time')) === false) {
+ G::$DB->query("
+ SELECT MAX(Time)
+ FROM staff_blog");
+ list($LatestSBlogTime) = G::$DB->next_record();
+ if ($LatestSBlogTime) {
+ $LatestSBlogTime = strtotime($LatestSBlogTime);
+ } else {
+ $LatestSBlogTime = 0;
+ }
+ G::$Cache->cache_value('staff_blog_latest_time', $LatestSBlogTime, 1209600);
+ }
+ if ($SBlogReadTime < $LatestSBlogTime) {
+ $Alerts[] = 'New staff blog post!';
+ }
}
// Inbox
if ($NotificationsManager->is_traditional(NotificationsManager::INBOX)) {
- $NotificationsManager->load_inbox();
- $NewMessages = $NotificationsManager->get_notifications();
- if (isset($NewMessages[NotificationsManager::INBOX])) {
- $Alerts[] = NotificationsManagerView::format_traditional($NewMessages[NotificationsManager::INBOX]);
- }
- $NotificationsManager->clear_notifications_array();
+ $NotificationsManager->load_inbox();
+ $NewMessages = $NotificationsManager->get_notifications();
+ if (isset($NewMessages[NotificationsManager::INBOX])) {
+ $Alerts[] = NotificationsManagerView::format_traditional($NewMessages[NotificationsManager::INBOX]);
+ }
+ $NotificationsManager->clear_notifications_array();
}
if (G::$LoggedUser['RatioWatch']) {
- $Alerts[] = 'Ratio Watch: You have '.time_diff(G::$LoggedUser['RatioWatchEnds'], 3).' to get your ratio over your required ratio or your leeching abilities will be disabled.';
+ $Alerts[] = 'Ratio Watch: You have '.time_diff(G::$LoggedUser['RatioWatchEnds'], 3).' to get your ratio over your required ratio or your leeching abilities will be disabled.';
} elseif (G::$LoggedUser['CanLeech'] != 1) {
- $Alerts[] = 'Ratio Watch: Your downloading privileges are disabled until you meet your required ratio.';
+ $Alerts[] = 'Ratio Watch: Your downloading privileges are disabled until you meet your required ratio.';
}
// Torrents
if ($NotificationsManager->is_traditional(NotificationsManager::TORRENTS)) {
- $NotificationsManager->load_torrent_notifications();
- $NewTorrents = $NotificationsManager->get_notifications();
- if (isset($NewTorrents[NotificationsManager::TORRENTS])) {
- $Alerts[] = NotificationsManagerView::format_traditional($NewTorrents[NotificationsManager::TORRENTS]);
- }
- $NotificationsManager->clear_notifications_array();
+ $NotificationsManager->load_torrent_notifications();
+ $NewTorrents = $NotificationsManager->get_notifications();
+ if (isset($NewTorrents[NotificationsManager::TORRENTS])) {
+ $Alerts[] = NotificationsManagerView::format_traditional($NewTorrents[NotificationsManager::TORRENTS]);
+ }
+ $NotificationsManager->clear_notifications_array();
}
if (check_perms('users_mod')) {
- $ModBar[] = 'Toolbox';
+ $ModBar[] = 'Toolbox';
}
if (check_perms('users_mod') || G::$LoggedUser['PermissionID'] == FORUM_MOD) {
- $NumStaffPMs = G::$Cache->get_value('num_staff_pms_'.G::$LoggedUser['ID']);
- if ($NumStaffPMs === false) {
- if (check_perms('users_mod')) {
+ $NumStaffPMs = G::$Cache->get_value('num_staff_pms_'.G::$LoggedUser['ID']);
+ if ($NumStaffPMs === false) {
+ if (check_perms('users_mod')) {
- $LevelCap = 1000;
+ $LevelCap = 1000;
- G::$DB->query("
- SELECT COUNT(ID)
- FROM staff_pm_conversations
- WHERE Status = 'Unanswered'
- AND (AssignedToUser = ".G::$LoggedUser['ID']."
- OR (LEAST('$LevelCap', Level) <= '".G::$LoggedUser['EffectiveClass']."'
- AND Level <= ".G::$LoggedUser['Class']."))");
- }
- if (G::$LoggedUser['PermissionID'] == FORUM_MOD) {
- G::$DB->query("
- SELECT COUNT(ID)
- FROM staff_pm_conversations
- WHERE Status='Unanswered'
- AND (AssignedToUser = ".G::$LoggedUser['ID']."
- OR Level = '". $Classes[FORUM_MOD]['Level'] . "')");
- }
- list($NumStaffPMs) = G::$DB->next_record();
- G::$Cache->cache_value('num_staff_pms_'.G::$LoggedUser['ID'], $NumStaffPMs , 1000);
- }
+ G::$DB->query("
+ SELECT COUNT(ID)
+ FROM staff_pm_conversations
+ WHERE Status = 'Unanswered'
+ AND (AssignedToUser = ".G::$LoggedUser['ID']."
+ OR (LEAST('$LevelCap', Level) <= '".G::$LoggedUser['EffectiveClass']."'
+ AND Level <= ".G::$LoggedUser['Class']."))");
+ }
+ if (G::$LoggedUser['PermissionID'] == FORUM_MOD) {
+ G::$DB->query("
+ SELECT COUNT(ID)
+ FROM staff_pm_conversations
+ WHERE Status='Unanswered'
+ AND (AssignedToUser = ".G::$LoggedUser['ID']."
+ OR Level = '". $Classes[FORUM_MOD]['Level'] . "')");
+ }
+ list($NumStaffPMs) = G::$DB->next_record();
+ G::$Cache->cache_value('num_staff_pms_'.G::$LoggedUser['ID'], $NumStaffPMs , 1000);
+ }
- if ($NumStaffPMs > 0) {
- $ModBar[] = ''.$NumStaffPMs.' Staff PMs';
- }
+ if ($NumStaffPMs > 0) {
+ $ModBar[] = ''.$NumStaffPMs.' Staff PMs';
+ }
}
if (check_perms('admin_reports')) {
// Torrent reports code
- $NumTorrentReports = G::$Cache->get_value('num_torrent_reportsv2');
- if ($NumTorrentReports === false) {
- G::$DB->query("
- SELECT COUNT(ID)
- FROM reportsv2
- WHERE Status = 'New'");
- list($NumTorrentReports) = G::$DB->next_record();
- G::$Cache->cache_value('num_torrent_reportsv2', $NumTorrentReports, 0);
- }
+ $NumTorrentReports = G::$Cache->get_value('num_torrent_reportsv2');
+ if ($NumTorrentReports === false) {
+ G::$DB->query("
+ SELECT COUNT(ID)
+ FROM reportsv2
+ WHERE Status = 'New'");
+ list($NumTorrentReports) = G::$DB->next_record();
+ G::$Cache->cache_value('num_torrent_reportsv2', $NumTorrentReports, 0);
+ }
- $ModBar[] = ''.$NumTorrentReports.(($NumTorrentReports == 1) ? ' Report' : ' Reports').'';
+ $ModBar[] = ''.$NumTorrentReports.(($NumTorrentReports == 1) ? ' Report' : ' Reports').'';
// Other reports code
- $NumOtherReports = G::$Cache->get_value('num_other_reports');
- if ($NumOtherReports === false) {
- G::$DB->query("
- SELECT COUNT(ID)
- FROM reports
- WHERE Status = 'New'");
- list($NumOtherReports) = G::$DB->next_record();
- G::$Cache->cache_value('num_other_reports', $NumOtherReports, 0);
- }
+ $NumOtherReports = G::$Cache->get_value('num_other_reports');
+ if ($NumOtherReports === false) {
+ G::$DB->query("
+ SELECT COUNT(ID)
+ FROM reports
+ WHERE Status = 'New'");
+ list($NumOtherReports) = G::$DB->next_record();
+ G::$Cache->cache_value('num_other_reports', $NumOtherReports, 0);
+ }
- if ($NumOtherReports > 0) {
- $ModBar[] = ''.$NumOtherReports.(($NumTorrentReports == 1) ? ' Other report' : ' Other reports').'';
- }
+ if ($NumOtherReports > 0) {
+ $ModBar[] = ''.$NumOtherReports.(($NumTorrentReports == 1) ? ' Other report' : ' Other reports').'';
+ }
} elseif (check_perms('site_moderate_forums')) {
- $NumForumReports = G::$Cache->get_value('num_forum_reports');
- if ($NumForumReports === false) {
- G::$DB->query("
- SELECT COUNT(ID)
- FROM reports
- WHERE Status = 'New'
- AND Type IN('artist_comment', 'collages_comment', 'post', 'requests_comment', 'thread', 'torrents_comment')");
- list($NumForumReports) = G::$DB->next_record();
- G::$Cache->cache_value('num_forum_reports', $NumForumReports, 0);
- }
+ $NumForumReports = G::$Cache->get_value('num_forum_reports');
+ if ($NumForumReports === false) {
+ G::$DB->query("
+ SELECT COUNT(ID)
+ FROM reports
+ WHERE Status = 'New'
+ AND Type IN('artist_comment', 'collages_comment', 'post', 'requests_comment', 'thread', 'torrents_comment')");
+ list($NumForumReports) = G::$DB->next_record();
+ G::$Cache->cache_value('num_forum_reports', $NumForumReports, 0);
+ }
- if ($NumForumReports > 0) {
- $ModBar[] = ''.$NumForumReports.(($NumForumReports == 1) ? ' Forum report' : ' Forum reports').'';
- }
+ if ($NumForumReports > 0) {
+ $ModBar[] = ''.$NumForumReports.(($NumForumReports == 1) ? ' Forum report' : ' Forum reports').'';
+ }
}
if (check_perms('admin_manage_applicants')) {
- $NumNewApplicants = Applicant::new_applicant_count();
- if ($NumNewApplicants > 0) {
- $ModBar[] = sprintf(
- '%d new Applicant%s',
- $NumNewApplicants,
- ($NumNewApplicants == 1 ? '' : 's')
- );
- }
+ $NumNewApplicants = Applicant::new_applicant_count();
+ if ($NumNewApplicants > 0) {
+ $ModBar[] = sprintf(
+ '%d new Applicant%s',
+ $NumNewApplicants,
+ ($NumNewApplicants == 1 ? '' : 's')
+ );
+ }
- $NumNewReplies = Applicant::new_reply_count();
- if ($NumNewReplies > 0) {
- $ModBar[] = sprintf(
- '%d new Applicant %s',
- $NumNewReplies,
- ($NumNewReplies == 1 ? 'Reply' : 'Replies')
- );
- }
+ $NumNewReplies = Applicant::new_reply_count();
+ if ($NumNewReplies > 0) {
+ $ModBar[] = sprintf(
+ '%d new Applicant %s',
+ $NumNewReplies,
+ ($NumNewReplies == 1 ? 'Reply' : 'Replies')
+ );
+ }
}
if (check_perms('users_mod') && FEATURE_EMAIL_REENABLE) {
- $NumEnableRequests = G::$Cache->get_value(AutoEnable::CACHE_KEY_NAME);
- if ($NumEnableRequests === false) {
- G::$DB->query("SELECT COUNT(1) FROM users_enable_requests WHERE Outcome IS NULL");
- list($NumEnableRequests) = G::$DB->next_record();
- G::$Cache->cache_value(AutoEnable::CACHE_KEY_NAME, $NumEnableRequests);
- }
+ $NumEnableRequests = G::$Cache->get_value(AutoEnable::CACHE_KEY_NAME);
+ if ($NumEnableRequests === false) {
+ G::$DB->query("SELECT COUNT(1) FROM users_enable_requests WHERE Outcome IS NULL");
+ list($NumEnableRequests) = G::$DB->next_record();
+ G::$Cache->cache_value(AutoEnable::CACHE_KEY_NAME, $NumEnableRequests);
+ }
- if ($NumEnableRequests > 0) {
- $ModBar[] = '' . $NumEnableRequests . " Enable requests";
- }
+ if ($NumEnableRequests > 0) {
+ $ModBar[] = '' . $NumEnableRequests . " Enable requests";
+ }
}
if (check_perms('admin_manage_payments')) {
- $DuePayments = G::$Cache->get_value('due_payments');
- if ($DuePayments === false) {
- G::$DB->prepared_query("
- SELECT Text, Expiry
- FROM payment_reminders
- WHERE Active = 1 AND Expiry < ?
- ORDER BY Expiry",
- date('Y-m-d', strtotime('+6 days')));
- $DuePayments = G::$DB->to_array(false, MYSQLI_ASSOC);
- G::$Cache->cache_value('due_payments', $DuePayments, 60 * 60);
- }
+ $DuePayments = G::$Cache->get_value('due_payments');
+ if ($DuePayments === false) {
+ G::$DB->prepared_query("
+ SELECT Text, Expiry
+ FROM payment_reminders
+ WHERE Active = 1 AND Expiry < ?
+ ORDER BY Expiry",
+ date('Y-m-d', strtotime('+6 days')));
+ $DuePayments = G::$DB->to_array(false, MYSQLI_ASSOC);
+ G::$Cache->cache_value('due_payments', $DuePayments, 60 * 60);
+ }
+
+ if (count($DuePayments) > 0) {
+ $AlertText = 'Payments due';
+ foreach ($DuePayments as $p) {
+ list($Text, $Expiry) = array_values($p);
+ $Color = strtotime($Expiry) < (strtotime('+3 days')) ? 'red' : 'orange';
+ $AlertText .= sprintf(' | %s: %s', $Color, $Text, date('Y-m-d', strtotime($Expiry)));
+ }
+ $Alerts[] = $AlertText;
+ }
- if (count($DuePayments) > 0) {
- $AlertText = 'Payments due';
- foreach ($DuePayments as $p) {
- list($Text, $Expiry) = array_values($p);
- $Color = strtotime($Expiry) < (strtotime('+3 days')) ? 'red' : 'orange';
- $AlertText .= sprintf(' | %s: %s', $Color, $Text, date('Y-m-d', strtotime($Expiry)));
- }
- $Alerts[] = $AlertText;
- }
+}
+if (check_perms('site_debug')) {
+ if (!apcu_exists('DB_KEY') || !apcu_fetch('DB_KEY')) {
+ $Alerts[] = 'DB key not loaded';
+ }
}
if (!empty($Alerts) || !empty($ModBar)) { ?>
-
+
-
-">
+
+
+
+
+ -
+
+
+
+
+
-
+
+
+ 0) {
- $Invites = ' ('.G::$LoggedUser['Invites'].')';
+ $Invites = ' ('.G::$LoggedUser['Invites'].')';
} else {
- $Invites = '';
+ $Invites = '';
}
?>
-
-
+
+
-
- >
+
- >
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
- -
-
+
- -
+
+
+
diff --git a/design/publicfooter.php b/design/publicfooter.php
index 42631f6b5..b85c21578 100644
--- a/design/publicfooter.php
+++ b/design/publicfooter.php
@@ -1,8 +1,8 @@
-
-
+
+
<?=display_str($PageTitle)?>
-
-
-
-
-
-
- " rel="stylesheet" type="text/css" />
-
-
-
-
-
-
+ <?=display_str($PageTitle)?>
+
+
+
+
+
+
+ " rel="stylesheet" type="text/css" />
+
+
+
+
+
+
-
+
+
+
- | Project Gazelle
+ | Project Gazelle
diff --git a/design/publicheader.php b/design/publicheader.php
index 86ca164f9..195d15999 100644
--- a/design/publicheader.php
+++ b/design/publicheader.php
@@ -1,42 +1,45 @@
-
- |
-
-
+
+
+ | -
-
-
diff --git a/design/views/generic/reply/staffpm.php b/design/views/generic/reply/staffpm.php
index bbb2e0db1..62a323265 100644
--- a/design/views/generic/reply/staffpm.php
+++ b/design/views/generic/reply/staffpm.php
@@ -1,27 +1,30 @@
-
-
-
+
+
-
+
diff --git a/design/views/generic/textarea/buttons.phtml b/design/views/generic/textarea/buttons.phtml
index 6e06ff0dd..680c5d0f5 100644
--- a/design/views/generic/textarea/buttons.phtml
+++ b/design/views/generic/textarea/buttons.phtml
@@ -1,3 +1,3 @@
-
+
diff --git a/design/views/generic/textarea/preview.phtml b/design/views/generic/textarea/preview.phtml
index 2ba5e7030..7fe7febb7 100644
--- a/design/views/generic/textarea/preview.phtml
+++ b/design/views/generic/textarea/preview.phtml
@@ -1,4 +1,4 @@
diff --git a/design/views/generic/textarea/script_factory.phtml b/design/views/generic/textarea/script_factory.phtml
index 5bcea0672..181ea1f08 100644
--- a/design/views/generic/textarea/script_factory.phtml
+++ b/design/views/generic/textarea/script_factory.phtml
@@ -1,4 +1,4 @@
diff --git a/design/views/generic/textarea/textarea.phtml b/design/views/generic/textarea/textarea.phtml
index 9ca494abe..9912ba410 100644
--- a/design/views/generic/textarea/textarea.phtml
+++ b/design/views/generic/textarea/textarea.phtml
@@ -1,4 +1,4 @@
-
+
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 000000000..207bd6447
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,35 @@
+version: '3'
+
+services:
+ web:
+ build: .
+ ports:
+ - 8080:80
+ depends_on:
+ - memcached
+ - mysql
+ volumes:
+ - .:/var/www
+
+ memcached:
+ image: memcached:1.5-alpine
+
+ mysql:
+ image: mariadb:10.3
+ volumes:
+ - ./.docker/mysql/mysqld_sql_mode.cnf:/etc/mysql/conf.d/mysqld_sql_mode.cnf
+ - ./.docker/data/mysql:/var/lib/mysql
+ environment:
+ - MYSQL_DATABASE=gazelle
+ - MYSQL_USER=gazelle
+ - MYSQL_PASSWORD=password
+ - MYSQL_ROOT_PASSWORD=em%G9Lrey4^N
+
+ sphinxsearch:
+ build: ./.docker/sphinxsearch
+ depends_on:
+ - mysql
+ - web
+ volumes:
+ - ./.docker/data/sphinxsearch:/var/lib/sphinxsearch/data/
+ - ./.docker/sphinxsearch/sphinx.conf:/var/lib/sphinxsearch/conf/sphinx.conf
diff --git a/docs/CodingStandards.txt b/docs/CodingStandards.txt
index 23ebeea4a..846868772 100644
--- a/docs/CodingStandards.txt
+++ b/docs/CodingStandards.txt
@@ -36,30 +36,30 @@ step in properly enforcing coding standards throughout the project.
== TABLE OF CONTENTS ==
-1. FILE FORMATTING
-2. CODE STYLING
-2.1 Code styling for PHP and JavaScript
-2.2 Code styling for CSS
-2.3 Code styling for SQL
-3. NAMING CONVENTIONS
-3.1 Function names
-3.2 Variable names
-3.3 Class names
-3.4 SQL names
-3.5 Miscellaneous names
-4. COMMENTS
-5. USER INTERFACE
-6. EXAMPLES
-6.1 PHP examples
-6.2 CSS examples
-6.3 SQL examples
+1. FILE FORMATTING
+2. CODE STYLING
+2.1 Code styling for PHP and JavaScript
+2.2 Code styling for CSS
+2.3 Code styling for SQL
+3. NAMING CONVENTIONS
+3.1 Function names
+3.2 Variable names
+3.3 Class names
+3.4 SQL names
+3.5 Miscellaneous names
+4. COMMENTS
+5. USER INTERFACE
+6. EXAMPLES
+6.1 PHP examples
+6.2 CSS examples
+6.3 SQL examples
# FILE FORMATTING
Tabs shall always be used for indentation.
-Files shall be encoded in ASCII.
+Files shall be encoded in UTF-8.
Files shall always use Unix-style line endings (LF). The program dos2unix
will take care of this for you, if you have files that use Windows-style
@@ -93,8 +93,10 @@ only one statement.
In loops and conditional blocks, the statement(s) shall be placed on the
following lines.
-When opening a PHP statement, `= 0) {
- $SomeString = "this is a string $DiffString with more text";
- } elseif ($Foo == 0) {
- // other things happen
- } else {
- // more magic
- }
+ if ($Foo >= 0) {
+ $SomeString = "this is a string $DiffString with more text";
+ } elseif ($Foo == 0) {
+ // other things happen
+ } else {
+ // more magic
+ }
- function works_magic($Foo, $Bar) {
- return $Foo;
- }
+ function works_magic($Foo, $Bar) {
+ return $Foo;
+ }
- echo ($Foo == true ? 'foo is true' : 'foo is false');
+ echo ($Foo == true ? 'foo is true' : 'foo is false');
- if ($Foo == true) {
- // magic happens
- }
+ if ($Foo == true) {
+ // magic happens
+ }
- /*
- * This is a good, multi-line comment.
- *
- * Please comment your code!
- */
+ /*
+ * This is a good, multi-line comment.
+ *
+ * Please comment your code!
+ */
- // This is a good, single-line comment.
+ // This is a good, single-line comment.
## CSS examples
link text
- .spellcheck {
- margin: 10px 0;
- font-size: 1.25em;
- font-weight: bold;
- }
+ .spellcheck {
+ margin: 10px 0;
+ font-size: 1.25em;
+ font-weight: bold;
+ }
- .linkbox .brackets:before,
- .linkbox .brackets:after,
- .top10_quantity_links .brackets:before,
- .top10_quantity_links .brackets:after {
- color: #757575;
- }
+ .linkbox .brackets:before,
+ .linkbox .brackets:after,
+ .top10_quantity_links .brackets:before,
+ .top10_quantity_links .brackets:after {
+ color: #757575;
+ }
# SQL examples
- SELECT
- r.ID, e.EditionID, r.Title, r.Year, r.CatalogueNumber,
- l.Name AS Label, r.LabelID, r.Image, r.MusicBrainzID
- FROM releases AS r
- JOIN editions AS e ON e.ReleaseID = r.ID
- LEFT JOIN labels AS l ON l.ID = r.LabelID
- WHERE r.ID IN ($ReleaseIDsSQL)
- ORDER BY e.EditionID, r.Year ASC
-
-
- SELECT SQL_CALC_FOUND_ROWS c.ID, c.Subject, cu.Unread, cu.Sticky,
- cu.ForwardedTo, cu2.UserID, cu.ReceivedDate AS Date
- FROM pm_conversations AS c
- LEFT JOIN pm_conversations_users AS cu ON cu.ConvID = c.ID
- AND cu.UserID = '1'
- LEFT JOIN pm_conversations_users AS cu2 ON cu2.ConvID = c.ID
- AND cu2.UserID != '1'
- AND cu2.ForwardedTo = 0
- LEFT JOIN users_main AS um ON um.ID = cu2.UserID
- WHERE um.Username LIKE 'test'
- AND cu.InInbox = '1'
- GROUP BY c.ID
- ORDER BY cu.Sticky, Date DESC
- LIMIT 25
-
-
- SELECT RequestID AS ID, UserID FROM bookmarks_requests
+ SELECT
+ r.ID, e.EditionID, r.Title, r.Year, r.CatalogueNumber,
+ l.Name AS Label, r.LabelID, r.Image, r.MusicBrainzID
+ FROM releases AS r
+ JOIN editions AS e ON e.ReleaseID = r.ID
+ LEFT JOIN labels AS l ON l.ID = r.LabelID
+ WHERE r.ID IN ($ReleaseIDsSQL)
+ ORDER BY e.EditionID, r.Year ASC
+
+
+ SELECT SQL_CALC_FOUND_ROWS c.ID, c.Subject, cu.Unread, cu.Sticky,
+ cu.ForwardedTo, cu2.UserID, cu.ReceivedDate AS Date
+ FROM pm_conversations AS c
+ LEFT JOIN pm_conversations_users AS cu ON cu.ConvID = c.ID
+ AND cu.UserID = '1'
+ LEFT JOIN pm_conversations_users AS cu2 ON cu2.ConvID = c.ID
+ AND cu2.UserID != '1'
+ AND cu2.ForwardedTo = 0
+ LEFT JOIN users_main AS um ON um.ID = cu2.UserID
+ WHERE um.Username LIKE 'test'
+ AND cu.InInbox = '1'
+ GROUP BY c.ID
+ ORDER BY cu.Sticky, Date DESC
+ LIMIT 25
+
+
+ SELECT RequestID AS ID, UserID FROM bookmarks_requests
diff --git a/docs/INSTALL.txt b/docs/INSTALL.txt
index e6fa5a4b7..638309a38 100644
--- a/docs/INSTALL.txt
+++ b/docs/INSTALL.txt
@@ -1,20 +1,20 @@
INSTALLATION NOTES
1. Set up MySQL and memcached. memcached can be started with the command:
- memcached -d -m 5120 -s /var/run/memcached.sock -a 0777 -t4 -C -u nobody
- This starts 4 threads and gives it 5 gigs of RAM
+ memcached -d -m 5120 -s /var/run/memcached.sock -a 0777 -t4 -C -u nobody
+ This starts 4 threads and gives it 5 gigs of RAM
2. Run gazelle.sql (preferably as root) to create the database, the table, and the default data.
3. Install Sphinx - we recommend you use the included sphinx.conf. You can copy this to
/etc/sphinx/sphinx.conf. You need to fill in the details of the SQL server though!
You might also need to create the /var/lib/sphinx folder.
- For documentation, read http://www.sphinxsearch.com/docs/current.html
+ For documentation, read http://www.sphinxsearch.com/docs/current.html
- After you've installed sphinx, create the indices:
- /usr/bin/indexer -c /etc/sphinx/sphinx.conf --all
+ After you've installed sphinx, create the indices:
+ /usr/bin/indexer -c /etc/sphinx/sphinx.conf --all
4. Move classes/config.template to classes/config.php. Edit the config.php as needed.
- We use http://grc.com/passwords.html for our passwords - you'll be generating a lot of these.
+ We use http://grc.com/passwords.html for our passwords - you'll be generating a lot of these.
5. Sign up. The first user is made a SysOp!
6. Set up cron jobs. You need a cron job for the schedule, a cron job for
the peerupdate (all groups are cached, but the peer counts change often,
@@ -27,8 +27,8 @@ These are our cron jobs. SCHEDULE_KEY is the same as in classes/config.php:
5 0,12 * * * /usr/bin/indexer -c /etc/sphinx/sphinx.conf --rotate --all >>/root/sphinx-indexer.log
7. You're probably going to want IP geolocation information, so first you need to fill in the geoip_country tables by visiting /tools.php?action=update_geoip
- After that finishes parsing information from MaxMind, you may want to map users to countries by running:
- "INSERT INTO users_geodistribution (Code, Users) SELECT g.Code, COUNT(u.ID) AS Users FROM geoip_country AS g JOIN users_main AS u ON INET_ATON(u.IP) BETWEEN g.StartIP AND g.EndIP WHERE u.Enabled = '1' GROUP BY g.Code ORDER BY Users DESC"
- This will fill in the table needed for stats.
+ After that finishes parsing information from MaxMind, you may want to map users to countries by running:
+ "INSERT INTO users_geodistribution (Code, Users) SELECT g.Code, COUNT(u.ID) AS Users FROM geoip_country AS g JOIN users_main AS u ON INET_ATON(u.IP) BETWEEN g.StartIP AND g.EndIP WHERE u.Enabled = '1' GROUP BY g.Code ORDER BY Users DESC"
+ This will fill in the table needed for stats.
8. Start modifying stuff. Hopefully, everything will have gone smoothly so far and nothing will have exploded (ha ha ha)
diff --git a/feeds.php b/feeds.php
index 22a4d163c..fa8406d5f 100644
--- a/feeds.php
+++ b/feeds.php
@@ -1,14 +1,14 @@
",
- '€','‚','ƒ','„','…','†','‡','ˆ',
- '‰','Š','‹','Œ','Ž','‘','’','“',
- '”','•','–','—','˜','™','š','›',
- 'œ','ž','Ÿ'
- );
+ $Replace = array(
+ "'",'"',"<",">",
+ '€','‚','ƒ','„','…','†','‡','ˆ',
+ '‰','Š','‹','Œ','Ž','‘','’','“',
+ '”','•','–','—','˜','™','š','›',
+ 'œ','ž','Ÿ'
+ );
- $With = array(
- ''','"','<','>',
- '€','‚','ƒ','„','…','†','‡','ˆ',
- '‰','Š','‹','Œ','Ž','‘','’','“',
- '”','•','–','—','˜','™','š','›',
- 'œ','ž','Ÿ'
- );
+ $With = array(
+ ''','"','<','>',
+ '€','‚','ƒ','„','…','†','‡','ˆ',
+ '‰','Š','‹','Œ','Ž','‘','’','“',
+ '”','•','–','—','˜','™','š','›',
+ 'œ','ž','Ÿ'
+ );
- $Str = str_replace($Replace, $With, $Str);
- }
- return $Str;
+ $Str = str_replace($Replace, $With, $Str);
+ }
+ return $Str;
}
function make_utf8($Str) {
- if ($Str != '') {
- if (is_utf8($Str)) {
- $Encoding = 'UTF-8';
- }
- if (empty($Encoding)) {
- $Encoding = mb_detect_encoding($Str, 'UTF-8, ISO-8859-1');
- }
- if (empty($Encoding)) {
- $Encoding = 'ISO-8859-1';
- }
- if ($Encoding == 'UTF-8') {
- return $Str;
- } else {
- return @mb_convert_encoding($Str, 'UTF-8', $Encoding);
- }
- }
+ if ($Str != '') {
+ if (is_utf8($Str)) {
+ $Encoding = 'UTF-8';
+ }
+ if (empty($Encoding)) {
+ $Encoding = mb_detect_encoding($Str, 'UTF-8, ISO-8859-1');
+ }
+ if (empty($Encoding)) {
+ $Encoding = 'ISO-8859-1';
+ }
+ if ($Encoding == 'UTF-8') {
+ return $Str;
+ } else {
+ return @mb_convert_encoding($Str, 'UTF-8', $Encoding);
+ }
+ }
}
function is_utf8($Str) {
- return preg_match('%^(?:
+ return preg_match('%^(?:
[\x09\x0A\x0D\x20-\x7E] // ASCII
| [\xC2-\xDF][\x80-\xBF] // non-overlong 2-byte
| \xE0[\xA0-\xBF][\x80-\xBF] // excluding overlongs
@@ -88,16 +88,16 @@ function is_utf8($Str) {
| [\xF1-\xF3][\x80-\xBF]{3} // planes 4-15
| \xF4[\x80-\x8F][\x80-\xBF]{2} // plane 16
)*$%xs', $Str
- );
+ );
}
-function display_array($Array, $Escape = array()) {
- foreach ($Array as $Key => $Val) {
- if ((!is_array($Escape) && $Escape == true) || !in_array($Key, $Escape)) {
- $Array[$Key] = display_str($Val);
- }
- }
- return $Array;
+function display_array($Array, $Escape = []) {
+ foreach ($Array as $Key => $Val) {
+ if ((!is_array($Escape) && $Escape == true) || !in_array($Key, $Escape)) {
+ $Array[$Key] = display_str($Val);
+ }
+ }
+ return $Array;
}
/**
@@ -106,7 +106,7 @@ function display_array($Array, $Escape = array()) {
* @param bool $SSL - whether the URL should be crafted for HTTPS or regular HTTP
*/
function site_url($SSL = true) {
- return $SSL ? 'https://' . SSL_SITE_URL . '/' : 'http://' . NONSSL_SITE_URL . '/';
+ return $SSL ? 'https://' . SSL_SITE_URL . '/' : 'http://' . NONSSL_SITE_URL . '/';
}
header('Cache-Control: no-cache, must-revalidate, post-check=0, pre-check=0');
diff --git a/image.php b/image.php
index 66159121e..264d857ab 100644
--- a/image.php
+++ b/image.php
@@ -3,98 +3,98 @@
error_reporting(E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR);
if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
- header("HTTP/1.1 304 Not Modified");
- die();
+ header("HTTP/1.1 304 Not Modified");
+ die();
}
header('Expires: '.date('D, d-M-Y H:i:s \U\T\C', time() + 3600 * 24 * 120)); // 120 days
header('Last-Modified: '.date('D, d-M-Y H:i:s \U\T\C', time()));
if (!extension_loaded('gd')) {
- error('nogd');
+ error('nogd');
}
function img_error($Type) {
- header('Content-type: image/gif');
- die(file_get_contents(SERVER_ROOT.'/sections/image/'.$Type.'.gif'));
+ header('Content-type: image/gif');
+ die(file_get_contents(SERVER_ROOT.'/sections/image/'.$Type.'.gif'));
}
function invisible($Image) {
- $Count = imagecolorstotal($Image);
- if ($Count == 0) {
- return false;
- }
- $TotalAlpha = 0;
- for ($i = 0; $i < $Count; ++$i) {
- $Color = imagecolorsforindex($Image, $i);
- $TotalAlpha += $Color['alpha'];
- }
- return (($TotalAlpha / $Count) == 127) ? true : false;
+ $Count = imagecolorstotal($Image);
+ if ($Count == 0) {
+ return false;
+ }
+ $TotalAlpha = 0;
+ for ($i = 0; $i < $Count; ++$i) {
+ $Color = imagecolorsforindex($Image, $i);
+ $TotalAlpha += $Color['alpha'];
+ }
+ return (($TotalAlpha / $Count) == 127) ? true : false;
}
function verysmall($Image) {
- return ((imagesx($Image) * imagesy($Image)) < 25) ? true : false;
+ return ((imagesx($Image) * imagesy($Image)) < 25) ? true : false;
}
function image_type($Data) {
- if (!strncmp($Data, 'GIF', 3)) {
- return 'gif';
- }
- if (!strncmp($Data, pack('H*', '89504E47'), 4)) {
- return 'png';
- }
- if (!strncmp($Data, pack('H*', 'FFD8'), 2)) {
- return 'jpeg';
- }
- if (!strncmp($Data, 'BM', 2)) {
- return 'bmp';
- }
- if (!strncmp($Data, 'II', 2) || !strncmp($Data, 'MM', 2)) {
- return 'tiff';
- }
+ if (!strncmp($Data, 'GIF', 3)) {
+ return 'gif';
+ }
+ if (!strncmp($Data, pack('H*', '89504E47'), 4)) {
+ return 'png';
+ }
+ if (!strncmp($Data, pack('H*', 'FFD8'), 2)) {
+ return 'jpeg';
+ }
+ if (!strncmp($Data, 'BM', 2)) {
+ return 'bmp';
+ }
+ if (!strncmp($Data, 'II', 2) || !strncmp($Data, 'MM', 2)) {
+ return 'tiff';
+ }
}
function image_height($Type, $Data) {
- $Length = strlen($Data);
- global $URL, $_GET;
- switch ($Type) {
- case 'jpeg':
- // See http://www.obrador.com/essentialjpeg/headerinfo.htm
- $i = 4;
- $Data = (substr($Data, $i));
- $Block = unpack('nLength', $Data);
- $Data = substr($Data, $Block['Length']);
- $i += $Block['Length'];
- $Str []= "Started 4, + ".$Block['Length'];
- while ($Data != '') { // iterate through the blocks until we find the start of frame marker (FFC0)
- $Block = unpack('CBlock/CType/nLength', $Data); // Get info about the block
- if ($Block['Block'] != '255') { // We should be at the start of a new block
- break;
- }
- if ($Block['Type'] != '192') { // C0
- $Data = substr($Data, $Block['Length'] + 2); // Next block
- $Str []= "Started $i, + ".($Block['Length'] + 2);
- $i += ($Block['Length'] + 2);
- } else { // We're at the FFC0 block
- $Data = substr($Data, 5); // Skip FF C0 Length(2) precision(1)
- $i += 5;
- $Height = unpack('nHeight', $Data);
- return $Height['Height'];
- }
- }
- break;
- case 'gif':
- $Data = substr($Data, 8);
- $Height = unpack('vHeight', $Data);
- return $Height['Height'];
- case 'png':
- $Data = substr($Data, 20);
- $Height = unpack('NHeight', $Data);
- return $Height['Height'];
- default:
- return 0;
- }
+ $Length = strlen($Data);
+ global $URL, $_GET;
+ switch ($Type) {
+ case 'jpeg':
+ // See http://www.obrador.com/essentialjpeg/headerinfo.htm
+ $i = 4;
+ $Data = (substr($Data, $i));
+ $Block = unpack('nLength', $Data);
+ $Data = substr($Data, $Block['Length']);
+ $i += $Block['Length'];
+ $Str []= "Started 4, + ".$Block['Length'];
+ while ($Data != '') { // iterate through the blocks until we find the start of frame marker (FFC0)
+ $Block = unpack('CBlock/CType/nLength', $Data); // Get info about the block
+ if ($Block['Block'] != '255') { // We should be at the start of a new block
+ break;
+ }
+ if ($Block['Type'] != '192') { // C0
+ $Data = substr($Data, $Block['Length'] + 2); // Next block
+ $Str []= "Started $i, + ".($Block['Length'] + 2);
+ $i += ($Block['Length'] + 2);
+ } else { // We're at the FFC0 block
+ $Data = substr($Data, 5); // Skip FF C0 Length(2) precision(1)
+ $i += 5;
+ $Height = unpack('nHeight', $Data);
+ return $Height['Height'];
+ }
+ }
+ break;
+ case 'gif':
+ $Data = substr($Data, 8);
+ $Height = unpack('vHeight', $Data);
+ return $Height['Height'];
+ case 'png':
+ $Data = substr($Data, 20);
+ $Height = unpack('NHeight', $Data);
+ return $Height['Height'];
+ default:
+ return 0;
+ }
}
define('SKIP_NO_CACHE_HEADERS', 1);
diff --git a/index.php b/index.php
index 8fc0ff80e..e257b3749 100644
--- a/index.php
+++ b/index.php
@@ -1,90 +1,91 @@
'torrents.php',
- 'collage' => 'collages.php',
- 'signup' => 'register.php',
- 'whitelist' => 'rules.php?p=clients',
- 'forum' => 'forums.php',
- 'randomcollage' => 'random.php?action=collage'
+ 'browse' => 'torrents.php',
+ 'collage' => 'collages.php',
+ 'signup' => 'register.php',
+ 'whitelist' => 'rules.php?p=clients',
+ 'forum' => 'forums.php',
+ 'randomcollage' => 'random.php?action=collage'
];
$PathInfo = pathinfo($_SERVER['SCRIPT_NAME']);
$Document = $PathInfo['filename'];
if ($PathInfo['dirname'] !== '/') {
- header("Location: /index.php");
+ header("Location: /index.php");
}
elseif (isset($Redirects[$Document])) {
- $Seperator = (strpos($Redirects[$Document], "?") === false) ? "?" : "&";
- $Rest = (!empty($_SERVER['QUERY_STRING'])) ? $Seperator.$_SERVER['QUERY_STRING'] : "";
- header("Location: {$Redirects[$Document]}{$Rest}");
+ $Seperator = (strpos($Redirects[$Document], "?") === false) ? "?" : "&";
+ $Rest = (!empty($_SERVER['QUERY_STRING'])) ? $Seperator.$_SERVER['QUERY_STRING'] : "";
+ header("Location: {$Redirects[$Document]}{$Rest}");
}
elseif (in_array($Document, ['announce', 'scrape'])) {
- echo "d14:failure reason40:Invalid .torrent, try downloading again.e";
- die();
+ echo "d14:failure reason40:Invalid .torrent, try downloading again.e";
+ die();
}
$Valid = false;
switch ($Document) {
- case 'peerupdate':
- /** @noinspection PhpMissingBreakStatementInspection */
- case 'schedule':
- define('MEMORY_EXCEPTION', true);
- define('TIME_EXCEPTION', true);
- case 'artist':
- case 'better':
- case 'bookmarks':
- case 'collages':
- case 'comments':
- case 'forums':
- case 'friends':
- case 'torrents':
- case 'upload':
- case 'user':
- case 'userhistory':
- /** @noinspection PhpMissingBreakStatementInspection */
- case 'wiki':
- define('ERROR_EXCEPTION', true);
- case 'ajax':
- case 'apply':
- case 'blog':
- case 'bonus':
- case 'captcha':
- case 'chat':
- case 'contest':
- case 'donate':
- case 'enable':
- case 'error':
- case 'inbox':
- case 'index':
- case 'irc':
- case 'locked':
- case 'log':
- case 'logchecker':
- case 'login':
- case 'logout':
- case 'questions':
- case 'random':
- case 'referral':
- case 'register':
- case 'reports':
- case 'reportsv2':
- case 'requests':
- case 'rules':
- case 'signup':
- case 'sitehistory':
- case 'staff':
- case 'staffblog':
- case 'staffpm':
- case 'stats':
- case 'top10':
- $Valid = true;
- break;
+ case 'peerupdate':
+ /** @noinspection PhpMissingBreakStatementInspection */
+ case 'schedule':
+ define('MEMORY_EXCEPTION', true);
+ define('TIME_EXCEPTION', true);
+ case 'artist':
+ case 'better':
+ case 'bookmarks':
+ case 'collages':
+ case 'comments':
+ case 'forums':
+ case 'friends':
+ case 'torrents':
+ case 'upload':
+ case 'user':
+ case 'userhistory':
+ /** @noinspection PhpMissingBreakStatementInspection */
+ case 'wiki':
+ define('ERROR_EXCEPTION', true);
+ case 'ajax':
+ case 'apply':
+ case 'blog':
+ case 'bonus':
+ case 'captcha':
+ case 'chat':
+ case 'contest':
+ case 'donate':
+ case 'enable':
+ case 'error':
+ case 'inbox':
+ case 'index':
+ case 'irc':
+ case 'locked':
+ case 'log':
+ case 'logchecker':
+ case 'login':
+ case 'logout':
+ case 'questions':
+ case 'random':
+ case 'recovery':
+ case 'referral':
+ case 'register':
+ case 'reports':
+ case 'reportsv2':
+ case 'requests':
+ case 'rules':
+ case 'signup':
+ case 'sitehistory':
+ case 'staff':
+ case 'staffblog':
+ case 'staffpm':
+ case 'stats':
+ case 'top10':
+ $Valid = true;
+ break;
}
if (!$Valid) {
- $_SERVER['SCRIPT_NAME'] = 'error.php';
- $_SERVER['SCRIPT_FILENAME'] = 'error.php';
- $Error = 404;
+ $_SERVER['SCRIPT_NAME'] = 'error.php';
+ $_SERVER['SCRIPT_FILENAME'] = 'error.php';
+ $Error = 404;
}
require('classes/script_start.php');
diff --git a/opensearch.php b/opensearch.php
index b0a2c5a1b..1b05d7fe2 100644
--- a/opensearch.php
+++ b/opensearch.php
@@ -15,58 +15,58 @@
echo ''; ?>
- Apply
- Current applications
- Resolved applications
+ Apply
+ Current applications
+ Resolved applications
Manage roles at@@ -53,94 +53,101 @@ |
There are no current roles. Create one using the form below.
+ -
-
- 80) {
- $Applicant = new Applicant($LoggedUser['ID'], $Role, $Body);
- header('Location: /apply.php?action=view&id=' . $Applicant->id());
- exit;
- }
- else {
- $Error = "You need to explain things a bit more.";
- }
- }
- else {
- $Error = "You need to choose which role interests you.";
- }
+ if (strlen($Role)) {
+ if (strlen($Body) > 80) {
+ $Applicant = new Applicant($LoggedUser['ID'], $Role, $Body);
+ header('Location: /apply.php?action=view&id=' . $Applicant->id());
+ exit;
+ }
+ else {
+ $Error = "You need to explain things a bit more.";
+ }
+ }
+ else {
+ $Error = "You need to choose which role interests you.";
+ }
}
else {
- $Role = '';
- $Body = '';
+ $Role = '';
+ $Body = '';
}
View::show_header('Apply', 'apply');
?>
Role
-
+
Role
+
-is_published() ? ' checked' : '';
- $checked_archived = $AppRole->is_published() ? '' : ' checked';
+ $checked_published = $AppRole->is_published() ? ' checked' : '';
+ $checked_archived = $AppRole->is_published() ? '' : ' checked';
}
else {
- $checked_published = '';
- $checked_archived = ' checked';
+ $checked_published = '';
+ $checked_archived = ' checked';
}
?>
-
-
+
| Title | -- | ||||||
| Visibility | -
- /> - /> - |
- ||||||
| Description | -
-description() : '', 60, 8, true, false);
- $id = $text->getID();
- echo $text->preview();
+
|
+
-
+
-
+
-user_id() != $LoggedUser['ID']) {
- error(403);
- }
- $note_delete = array_filter($_POST, function ($x) { return preg_match('/^note-delete-\d+$/', $x);}, ARRAY_FILTER_USE_KEY);
- if (is_array($note_delete) && count($note_delete) == 1) {
- $App->delete_note(
- trim(array_keys($note_delete)[0], 'note-delete-')
- );
- }
- elseif (isset($_POST['resolve'])) {
- if ($_POST['resolve'] === 'Resolve') {
- $App->resolve(true);
- }
- elseif ($_POST['resolve'] === 'Reopen') {
- $App->resolve(false);
- }
- }
- elseif (isset($_POST['note_reply'])) {
- $App->save_note(
- $LoggedUser['ID'],
- $_POST['note_reply'],
- $IS_STAFF && $_POST['visibility'] == 'staff' ? 'staff' : 'public'
- );
- }
+ authorize();
+ $ID = intval($_POST['id']);
+ $App = Applicant::factory($ID);
+ if (!$IS_STAFF && $App->user_id() != $LoggedUser['ID']) {
+ error(403);
+ }
+ $note_delete = array_filter($_POST, function ($x) { return preg_match('/^note-delete-\d+$/', $x);}, ARRAY_FILTER_USE_KEY);
+ if (is_array($note_delete) && count($note_delete) == 1) {
+ $App->delete_note(
+ trim(array_keys($note_delete)[0], 'note-delete-')
+ );
+ }
+ elseif (isset($_POST['resolve'])) {
+ if ($_POST['resolve'] === 'Resolve') {
+ $App->resolve(true);
+ }
+ elseif ($_POST['resolve'] === 'Reopen') {
+ $App->resolve(false);
+ }
+ }
+ elseif (isset($_POST['note_reply'])) {
+ $App->save_note(
+ $LoggedUser['ID'],
+ $_POST['note_reply'],
+ $IS_STAFF && $_POST['visibility'] == 'staff' ? 'staff' : 'public'
+ );
+ }
}
elseif (isset($_GET['id']) && is_number($_GET['id'])) {
- $ID = intval($_GET['id']);
- $App = Applicant::factory($ID);
- if (!$IS_STAFF && $App->user_id() != $LoggedUser['ID']) {
- error(403);
- }
+ $ID = intval($_GET['id']);
+ $App = Applicant::factory($ID);
+ if (!$IS_STAFF && $App->user_id() != $LoggedUser['ID']) {
+ error(403);
+ }
}
$Resolved = (isset($_GET['status']) && $_GET['status'] === 'resolved');
?>
@@ -43,154 +43,163 @@
-
+ Apply for a role at
- - - -
+
- Apply for a role at
+ + + +
-
-
+ Open Roles
-
-
- $info) { ?>
-
-
- | - |
| - |
+
+
-
- Open Roles
+
+
+ $info) { ?>
+
+
+ | + |
| + |
-
-
+ Thanks for your interest in helping Orpheus! There are - no openings at the moment. Keep an eye on the front page - or the Orpheus forum for announcements in the future.
-
+
+
-
-Thanks for your interest in helping Orpheus! There are + no openings at the moment. Keep an eye on the front page + or the Orpheus forum for announcements in the future.
+
- Apply
-
- View your applications
-Apply
+
+ View your applications
+
- Current applications
-Current applications
+
- Resolved applications
-
- Manage roles
-Resolved applications
+
+ Manage roles
+
-
+
-
-
- is_resolved() ? ' style="font-style: italic;"' : '' ?>>role_title() ?>
-
-
Application received from user_id(), true, true, true, true, true, false) ?> received created(), 2) ?>. - -
+
-
-
- Application received from user_id(), true, true, true, true, true, false) ?> received created(), 2) ?>. - -
is_resolved() ? ' style="font-style: italic;"' : '' ?>>role_title() ?>
+
+
Application received from user_id(), true, true, true, true, true, false) ?> received created(), 2) ?>. + +
-
+
+
+ Application received from user_id(), true, true, true, true, true, false) ?> received created(), 2) ?>. + +
-
body()) ?>
-is_resolved()) { ?> - +Applications
- -| Role | - -Applicant | - -Date Created | -Comments | -Last comment from | -Last comment added | -
| - - | - - | - | - | - | - |
Applications
+ +| Role | + +Applicant | + +Date Created | +Comments | +Last comment from | +Last comment added | +
| + + | + + | + | + | + | + |
The cupboard is empty. There are no applications to show.
-
- $Group) {
- switch ($Importances[$ID]['Importance']) {
- case '2':
- $Importances[$ID]['ReleaseType'] = 1024;
- $GuestAlbums = true;
- break;
-
- case '3':
- $Importances[$ID]['ReleaseType'] = 1023;
- $RemixerAlbums = true;
- break;
-
- case '4':
- $Importances[$ID]['ReleaseType'] = 1022;
- $ComposerAlbums = true;
- break;
-
- case '7':
- $Importances[$ID]['ReleaseType'] = 1021;
- $ProducerAlbums = true;
- break;
-
- default:
- if (!isset($ReleaseTypes[$TorrentList[$Group['GroupID']]['ReleaseType']])) {
- $TorrentList[$Group['GroupID']]['ReleaseType'] = $UnknownRT;
- }
- $Importances[$ID]['ReleaseType'] = $TorrentList[$Group['GroupID']]['ReleaseType'];
- }
-
- if (!isset($UsedReleases[$Importances[$ID]['ReleaseType']])) {
- $UsedReleases[$Importances[$ID]['ReleaseType']] = true;
- }
- $Importances[$ID]['Sort'] = $ID;
+ switch ($Importances[$ID]['Importance']) {
+ case '2':
+ $Importances[$ID]['ReleaseType'] = 1024;
+ $GuestAlbums = true;
+ break;
+
+ case '3':
+ $Importances[$ID]['ReleaseType'] = 1023;
+ $RemixerAlbums = true;
+ break;
+
+ case '4':
+ $Importances[$ID]['ReleaseType'] = 1022;
+ $ComposerAlbums = true;
+ break;
+
+ case '7':
+ $Importances[$ID]['ReleaseType'] = 1021;
+ $ProducerAlbums = true;
+ break;
+
+ default:
+ if (!isset($ReleaseTypes[$TorrentList[$Group['GroupID']]['ReleaseType']])) {
+ $TorrentList[$Group['GroupID']]['ReleaseType'] = $UnknownRT;
+ }
+ $Importances[$ID]['ReleaseType'] = $TorrentList[$Group['GroupID']]['ReleaseType'];
+ }
+
+ if (!isset($UsedReleases[$Importances[$ID]['ReleaseType']])) {
+ $UsedReleases[$Importances[$ID]['ReleaseType']] = true;
+ }
+ $Importances[$ID]['Sort'] = $ID;
}
if (!empty($GuestAlbums)) {
- $ReleaseTypes[1024] = 'Guest Appearance';
+ $ReleaseTypes[1024] = 'Guest Appearance';
}
if (!empty($RemixerAlbums)) {
- $ReleaseTypes[1023] = 'Remixed By';
+ $ReleaseTypes[1023] = 'Remixed By';
}
if (!empty($ComposerAlbums)) {
- $ReleaseTypes[1022] = 'Composition';
+ $ReleaseTypes[1022] = 'Composition';
}
if (!empty($ProducerAlbums)) {
- $ReleaseTypes[1021] = 'Produced By';
+ $ReleaseTypes[1021] = 'Produced By';
}
//Custom sorting for releases
if (!empty($LoggedUser['SortHide'])) {
- $SortOrder = array_flip(array_keys($LoggedUser['SortHide']));
+ $SortOrder = array_flip(array_keys($LoggedUser['SortHide']));
} else {
- $SortOrder = $ReleaseTypes;
+ $SortOrder = $ReleaseTypes;
}
// If the $SortOrder array doesn't have all release types, put the missing ones at the end
$MissingTypes = array_diff_key($ReleaseTypes, $SortOrder);
if (!empty($MissingTypes)) {
- $MaxOrder = max($SortOrder);
- foreach (array_keys($MissingTypes) as $Missing) {
- $SortOrder[$Missing] = ++$MaxOrder;
- }
+ $MaxOrder = max($SortOrder);
+ foreach (array_keys($MissingTypes) as $Missing) {
+ $SortOrder[$Missing] = ++$MaxOrder;
+ }
}
uasort($Importances, function ($A, $B) use ($SortOrder) {
- if ($SortOrder[$A['ReleaseType']] == $SortOrder[$B['ReleaseType']]) {
- return (($A['Sort'] < $B['Sort']) ? -1 : 1);
- }
- return (($SortOrder[$A['ReleaseType']] < $SortOrder[$B['ReleaseType']]) ? -1 : 1);
+ if ($SortOrder[$A['ReleaseType']] == $SortOrder[$B['ReleaseType']]) {
+ return (($A['Sort'] < $B['Sort']) ? -1 : 1);
+ }
+ return (($SortOrder[$A['ReleaseType']] < $SortOrder[$B['ReleaseType']]) ? -1 : 1);
});
// Sort the anchors at the top of the page the same way as release types
$UsedReleases = array_flip(array_intersect_key($SortOrder, $UsedReleases));
reset($TorrentList);
if (!empty($UsedReleases)) { ?>
-
-Requests
+
+
+ $Group) {
- // $Tags array is for the sidebar on the right.
- // Skip compilations and soundtracks.
- $Merge = $Group['ReleaseType'] != 7 && $Group['ReleaseType'] != 3;
+ // $Tags array is for the sidebar on the right.
+ // Skip compilations and soundtracks.
+ $Merge = $Group['ReleaseType'] != 7 && $Group['ReleaseType'] != 3;
- $TorrentTags = new Tags($Group['TagList'], $Merge);
+ $TorrentTags = new Tags($Group['TagList'], $Merge);
- foreach ($Group['Torrents'] as $TorrentID => $Torrent) {
- $NumTorrents++;
+ foreach ($Group['Torrents'] as $TorrentID => $Torrent) {
+ $NumTorrents++;
- $Torrent['Seeders'] = (int)$Torrent['Seeders'];
- $Torrent['Leechers'] = (int)$Torrent['Leechers'];
- $Torrent['Snatched'] = (int)$Torrent['Snatched'];
+ $Torrent['Seeders'] = (int)$Torrent['Seeders'];
+ $Torrent['Leechers'] = (int)$Torrent['Leechers'];
+ $Torrent['Snatched'] = (int)$Torrent['Snatched'];
- $NumSeeders += $Torrent['Seeders'];
- $NumLeechers += $Torrent['Leechers'];
- $NumSnatches += $Torrent['Snatched'];
- }
+ $NumSeeders += $Torrent['Seeders'];
+ $NumLeechers += $Torrent['Leechers'];
+ $NumSnatches += $Torrent['Snatched'];
+ }
}
@@ -282,199 +284,204 @@ function compare($X, $Y) {
$LastReleaseType = 0;
foreach ($Importances as $Group) {
- extract(Torrents::array_group($TorrentList[$Group['GroupID']]), EXTR_OVERWRITE);
- $ReleaseType = $Group['ReleaseType'];
-
- if ($GroupID == $OldGroupID && $ReleaseType == $OldReleaseType) {
- continue;
- } else {
- $OldGroupID = $GroupID;
- $OldReleaseType = $ReleaseType;
- }
-
-/* if (!empty($LoggedUser['DiscogView']) || (isset($LoggedUser['HideTypes']) && in_array($ReleaseType, $LoggedUser['HideTypes']))) {
- $HideDiscog = ' hidden';
- } else {
- $HideDiscog = '';
- } */
- if (!empty($LoggedUser['DiscogView']) || (isset($LoggedUser['SortHide']) && array_key_exists($ReleaseType, $LoggedUser['SortHide']) && $LoggedUser['SortHide'][$ReleaseType] == 1)) {
- $HideDiscog = ' hidden';
- } else {
- $HideDiscog = '';
- }
-
- $TorrentTags = new Tags($TagList, false);
-
- if ($ReleaseType != $LastReleaseType) {
- switch ($ReleaseTypes[$ReleaseType]) {
- case 'Remix':
- $DisplayName = 'Remixes';
- break;
- case 'Anthology':
- $DisplayName = 'Anthologies';
- break;
- case 'DJ Mix':
- $DisplayName = 'DJ Mixes';
- break;
- default:
- $DisplayName = $ReleaseTypes[$ReleaseType].'s';
- break;
- }
-
- $ReleaseTypeLabel = strtolower(str_replace(' ', '_', $ReleaseTypes[$ReleaseType]));
- if ($OpenTable) { ?>
-
-
- | - | ↑ (View) | -Size | - |
-  |
-  |
-
| + | ↑ (View) | +Size | + |
+ |
+ |
+ ||||||
| - - | -
-
-
-
-
-
-
-
-
-
- Remove bookmark
-
-
-
- Bookmark
-
- group discog">
+
+
+ |
+
+
+ |
-
+
+
+
+
+
+
+
+ Remove bookmark
+
+
+
+ Bookmark
+
+
-
-
- | ||||||||
| − | -− | + + -||||||||||
| - - [ - - | FL - - | [orpheus.network].json" class="tooltip" title="Download JSON">JS - ] - - » - | -- | - | - | - | + + [ + + | FL + + | [] [orpheus.network].json" class="tooltip" title="Download JSON">JS + ] + + » + | ++ | + | + | + + - | ||
-
+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);
+ $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);
}
?>
-
-
+
+ (Revision #) [Vanity House]
-
- Request an Edit
-
- Add request
-
+
-
- (Revision #) [Vanity House]
+
+ Request an Edit
+
+ Add request
+get_value('notify_artists_'.$LoggedUser['ID'])) === false) {
- $DB->query("
- SELECT ID, Artists
- FROM users_notify_filters
- WHERE UserID = '$LoggedUser[ID]'
- AND Label = 'Artist notifications'
- LIMIT 1");
- $Notify = $DB->next_record(MYSQLI_ASSOC, false);
- $Cache->cache_value('notify_artists_'.$LoggedUser['ID'], $Notify, 0);
- }
- if (stripos($Notify['Artists'], "|$Name|") === false) {
+ if (($Notify = $Cache->get_value('notify_artists_'.$LoggedUser['ID'])) === false) {
+ $DB->query("
+ SELECT ID, Artists
+ FROM users_notify_filters
+ WHERE UserID = '$LoggedUser[ID]'
+ AND Label = 'Artist notifications'
+ LIMIT 1");
+ $Notify = $DB->next_record(MYSQLI_ASSOC, false);
+ $Cache->cache_value('notify_artists_'.$LoggedUser['ID'], $Notify, 0);
+ }
+ if (stripos($Notify['Artists'], "|$Name|") === false) {
?>
- Notify of new uploads
-
- Do not notify of new uploads
-&auth=" class="brackets">Notify of new uploads
+
+ Do not notify of new uploads
+
- Remove bookmark
-
- Bookmark
-
-
-
-" onclick="Unbookmark('artist', , 'Bookmark'); return false;" class="brackets">Remove bookmark
+
+ Bookmark
+
+
+
+
- Edit
-
- View history
-
- Revert to this revision
-
- Info
-
- Concerts
-
- Comments
-
- Delete
-
-
-
-
-
+
-
-
-
-
-
- ?>)
-
-
-
-" class="brackets">Edit
+
+ View history
+
+ Revert to this revision
+
+ Info
+
+ Concerts
+
+ Comments
+
+ Delete
+
+ File Lists Search
- -
-
- - - -
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
- File Lists Search
+ -
+
- + + +
-
+ Collector
-
-
-
-
-
+
+
+
+
+
+
-
-
+ Statistics
- -
-
- Number of groups: -
- Number of torrents: -
- Number of seeders: -
- Number of leechers: -
- Number of snatches: -
Statistics
+ -
+
- Number of groups: +
- Number of torrents: +
- Number of seeders: +
- Number of leechers: +
- Number of snatches: +
-
- Similar Artists
-
-
-
-
+ Add similar artist
- -
-
- - - -
+
+
+ Add similar artist
+ -
+
- + + +
+get_value("artists_collages_$ArtistID");
if (!is_array($Collages)) {
- $DB->query("
- SELECT c.Name, c.NumTorrents, c.ID
- FROM collages AS c
- JOIN collages_artists AS ca ON ca.CollageID = c.ID
- WHERE ca.ArtistID = '$ArtistID'
- AND Deleted = '0'
- AND CategoryID = '7'");
- $Collages = $DB->to_array();
- $Cache->cache_value("artists_collages_$ArtistID", $Collages, 3600 * 6);
+ $DB->query("
+ SELECT c.Name, c.NumTorrents, c.ID
+ FROM collages AS c
+ JOIN collages_artists AS ca ON ca.CollageID = c.ID
+ WHERE ca.ArtistID = '$ArtistID'
+ AND Deleted = '0'
+ AND CategoryID = '7'");
+ $Collages = $DB->to_array();
+ $Cache->cache_value("artists_collages_$ArtistID", $Collages, 3600 * 6);
}
if (count($Collages) > 0) {
- if (count($Collages) > MAX_COLLAGES) {
- // Pick some at random
- $Range = range(0,count($Collages) - 1);
- shuffle($Range);
- $Indices = array_slice($Range, 0, MAX_COLLAGES);
- $SeeAll = ' (See all)';
- } else {
- $Indices = range(0, count($Collages)-1);
- $SeeAll = '';
- }
+ if (count($Collages) > MAX_COLLAGES) {
+ // Pick some at random
+ $Range = range(0,count($Collages) - 1);
+ shuffle($Range);
+ $Indices = array_slice($Range, 0, MAX_COLLAGES);
+ $SeeAll = ' (See all)';
+ } else {
+ $Indices = range(0, count($Collages)-1);
+ $SeeAll = '';
+ }
?>
-
-
-
+
-
+
-">
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+ 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);
- }
+ 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);
+ }
?>
-
+
+
-cache_value($Key, $Data, 3600);
diff --git a/sections/artist/autocomplete.php b/sections/artist/autocomplete.php
index bec92ce4a..59cc19ea7 100644
--- a/sections/artist/autocomplete.php
+++ b/sections/artist/autocomplete.php
@@ -1,6 +1,6 @@
-get('autocomplete_artist_'.$KeySize.'_'.$Letters);
if (!$AutoSuggest) {
- $Limit = (($KeySize === $MaxKeySize) ? 250 : 10);
- $DB->query("
- SELECT
- a.ArtistID,
- a.Name
- FROM artists_group AS a
- INNER JOIN torrents_artists AS ta ON ta.ArtistID=a.ArtistID
- INNER JOIN torrents AS t ON t.GroupID=ta.GroupID
- WHERE a.Name LIKE '".db_string(str_replace('\\','\\\\',$Letters),true)."%'
- GROUP BY ta.ArtistID
- ORDER BY t.Snatched DESC
- LIMIT $Limit");
- $AutoSuggest = $DB->to_array(false,MYSQLI_NUM,false);
- $Cache->cache_value('autocomplete_artist_'.$KeySize.'_'.$Letters,$AutoSuggest,1800 + 7200 * ($MaxKeySize - $KeySize)); // Can't cache things for too long in case names are edited
+ $Limit = (($KeySize === $MaxKeySize) ? 250 : 10);
+ $DB->query("
+ SELECT
+ a.ArtistID,
+ a.Name
+ FROM artists_group AS a
+ INNER JOIN torrents_artists AS ta ON (ta.ArtistID=a.ArtistID)
+ INNER JOIN torrents AS t ON (t.GroupID=ta.GroupID)
+ INNER JOIN torrents_leech_stats tls ON (tls.TorrentID = t.ID)
+ WHERE a.Name LIKE '".db_string(str_replace('\\','\\\\',$Letters),true)."%'
+ GROUP BY ta.ArtistID
+ ORDER BY tls.Snatched DESC
+ LIMIT $Limit");
+ $AutoSuggest = $DB->to_array(false,MYSQLI_NUM,false);
+ $Cache->cache_value('autocomplete_artist_'.$KeySize.'_'.$Letters,$AutoSuggest,1800 + 7200 * ($MaxKeySize - $KeySize)); // Can't cache things for too long in case names are edited
}
$Matched = 0;
-$ArtistIDs = array();
-$Response = array(
- 'query' => $FullName,
- 'suggestions' => array()
-);
+$Response = [
+ 'query' => $FullName,
+ 'suggestions' => []
+];
foreach ($AutoSuggest as $Suggestion) {
- list($ID, $Name) = $Suggestion;
- if (stripos($Name, $FullName) === 0) {
- $Response['suggestions'][] = array('value' => $Name, 'data' => $ID);
- if (++$Matched > 9) {
- break;
- }
- }
+ list($ID, $Name) = $Suggestion;
+ if (stripos($Name, $FullName) === 0) {
+ $Response['suggestions'][] = ['value' => $Name, 'data' => $ID];
+ if (++$Matched > 9) {
+ break;
+ }
+ }
}
echo json_encode($Response);
diff --git a/sections/artist/change_artistid.php b/sections/artist/change_artistid.php
index e9705ea03..2b9e5b682 100644
--- a/sections/artist/change_artistid.php
+++ b/sections/artist/change_artistid.php
@@ -1,11 +1,11 @@
-query("
- SELECT Name
- FROM artists_group
- WHERE ArtistID = $ArtistID
- LIMIT 1");
+ SELECT Name
+ FROM artists_group
+ WHERE ArtistID = $ArtistID
+ LIMIT 1");
if (!(list($ArtistName) = $DB->next_record(MYSQLI_NUM, false))) {
- error('An error has occurred.');
+ error('An error has occurred.');
}
if ($NewArtistID > 0) {
- // Make sure that's a real artist ID number, and grab the name
- $DB->query("
- SELECT Name
- FROM artists_group
- WHERE ArtistID = $NewArtistID
- LIMIT 1");
- if (!(list($NewArtistName) = $DB->next_record())) {
- error('Please enter a valid artist ID number.');
- }
+ // Make sure that's a real artist ID number, and grab the name
+ $DB->query("
+ SELECT Name
+ FROM artists_group
+ WHERE ArtistID = $NewArtistID
+ LIMIT 1");
+ if (!(list($NewArtistName) = $DB->next_record())) {
+ error('Please enter a valid artist ID number.');
+ }
} else {
- // Didn't give an ID, so try to grab based on the name
- $DB->query("
- SELECT ArtistID
- FROM artists_alias
- WHERE Name = '".db_string($NewArtistName)."'
- LIMIT 1");
- if (!(list($NewArtistID) = $DB->next_record())) {
- error('No artist by that name was found.');
- }
+ // Didn't give an ID, so try to grab based on the name
+ $DB->query("
+ SELECT ArtistID
+ FROM artists_alias
+ WHERE Name = '".db_string($NewArtistName)."'
+ LIMIT 1");
+ if (!(list($NewArtistID) = $DB->next_record())) {
+ error('No artist by that name was found.');
+ }
}
if ($ArtistID == $NewArtistID) {
- error('You cannot merge an artist with itself.');
+ error('You cannot merge an artist with itself.');
}
if (isset($_POST['confirm'])) {
- // Get the information for the cache update
- $DB->query("
- SELECT DISTINCT GroupID
- FROM torrents_artists
- WHERE ArtistID = $ArtistID");
- $Groups = $DB->collect('GroupID');
- $DB->query("
- SELECT DISTINCT RequestID
- FROM requests_artists
- WHERE ArtistID = $ArtistID");
- $Requests = $DB->collect('RequestID');
- $DB->query("
- SELECT DISTINCT UserID
- FROM bookmarks_artists
- WHERE ArtistID = $ArtistID");
- $BookmarkUsers = $DB->collect('UserID');
- $DB->query("
- SELECT DISTINCT ct.CollageID
- FROM collages_torrents AS ct
- JOIN torrents_artists AS ta ON ta.GroupID = ct.GroupID
- WHERE ta.ArtistID = $ArtistID");
- $Collages = $DB->collect('CollageID');
-
- // And the info to avoid double-listing an artist if it and the target are on the same group
- $DB->query("
- SELECT DISTINCT GroupID
- FROM torrents_artists
- WHERE ArtistID = $NewArtistID");
- $NewArtistGroups = $DB->collect('GroupID');
- $NewArtistGroups[] = '0';
- $NewArtistGroups = implode(',', $NewArtistGroups);
-
- $DB->query("
- SELECT DISTINCT RequestID
- FROM requests_artists
- WHERE ArtistID = $NewArtistID");
- $NewArtistRequests = $DB->collect('RequestID');
- $NewArtistRequests[] = '0';
- $NewArtistRequests = implode(',', $NewArtistRequests);
-
- $DB->query("
- SELECT DISTINCT UserID
- FROM bookmarks_artists
- WHERE ArtistID = $NewArtistID");
- $NewArtistBookmarks = $DB->collect('UserID');
- $NewArtistBookmarks[] = '0';
- $NewArtistBookmarks = implode(',', $NewArtistBookmarks);
-
- // Merge all of this artist's aliases onto the new artist
- $DB->query("
- UPDATE artists_alias
- SET ArtistID = $NewArtistID
- WHERE ArtistID = $ArtistID");
-
- // Update the torrent groups, requests, and bookmarks
- $DB->query("
- UPDATE IGNORE torrents_artists
- SET ArtistID = $NewArtistID
- WHERE ArtistID = $ArtistID
- AND GroupID NOT IN ($NewArtistGroups)");
- $DB->query("
- DELETE FROM torrents_artists
- WHERE ArtistID = $ArtistID");
- $DB->query("
- UPDATE IGNORE requests_artists
- SET ArtistID = $NewArtistID
- WHERE ArtistID = $ArtistID
- AND RequestID NOT IN ($NewArtistRequests)");
- $DB->query("
- DELETE FROM requests_artists
- WHERE ArtistID = $ArtistID");
- $DB->query("
- UPDATE IGNORE bookmarks_artists
- SET ArtistID = $NewArtistID
- WHERE ArtistID = $ArtistID
- AND UserID NOT IN ($NewArtistBookmarks)");
- $DB->query("
- DELETE FROM bookmarks_artists
- WHERE ArtistID = $ArtistID");
-
- // Cache clearing
- if (!empty($Groups)) {
- foreach ($Groups as $GroupID) {
- $Cache->delete_value("groups_artists_$GroupID");
- Torrents::update_hash($GroupID);
- }
- }
- if (!empty($Requests)) {
- foreach ($Requests as $RequestID) {
- $Cache->delete_value("request_artists_$RequestID");
- Requests::update_sphinx_requests($RequestID);
- }
- }
- if (!empty($BookmarkUsers)) {
- foreach ($BookmarkUsers as $UserID) {
- $Cache->delete_value("notify_artists_$UserID");
- }
- }
- if (!empty($Collages)) {
- foreach ($Collages as $CollageID) {
- $Cache->delete_value("collage_$CollageID");
- }
- }
-
- $Cache->delete_value("artist_$ArtistID");
- $Cache->delete_value("artist_$NewArtistID");
- $Cache->delete_value("artist_groups_$ArtistID");
- $Cache->delete_value("artist_groups_$NewArtistID");
-
- // Delete the old artist
- $DB->query("
- DELETE FROM artists_group
- WHERE ArtistID = $ArtistID");
-
- Misc::write_log("The artist $ArtistID ($ArtistName) was made into a non-redirecting alias of artist $NewArtistID ($NewArtistName) by user ".$LoggedUser['ID']." (".$LoggedUser['Username'].')');
-
- header("Location: artist.php?action=edit&artistid=$NewArtistID");
+ // Get the information for the cache update
+ $DB->query("
+ SELECT DISTINCT GroupID
+ FROM torrents_artists
+ WHERE ArtistID = $ArtistID");
+ $Groups = $DB->collect('GroupID');
+ $DB->query("
+ SELECT DISTINCT RequestID
+ FROM requests_artists
+ WHERE ArtistID = $ArtistID");
+ $Requests = $DB->collect('RequestID');
+ $DB->query("
+ SELECT DISTINCT UserID
+ FROM bookmarks_artists
+ WHERE ArtistID = $ArtistID");
+ $BookmarkUsers = $DB->collect('UserID');
+ $DB->query("
+ SELECT DISTINCT ct.CollageID
+ FROM collages_torrents AS ct
+ JOIN torrents_artists AS ta ON ta.GroupID = ct.GroupID
+ WHERE ta.ArtistID = $ArtistID");
+ $Collages = $DB->collect('CollageID');
+
+ // And the info to avoid double-listing an artist if it and the target are on the same group
+ $DB->query("
+ SELECT DISTINCT GroupID
+ FROM torrents_artists
+ WHERE ArtistID = $NewArtistID");
+ $NewArtistGroups = $DB->collect('GroupID');
+ $NewArtistGroups[] = '0';
+ $NewArtistGroups = implode(',', $NewArtistGroups);
+
+ $DB->query("
+ SELECT DISTINCT RequestID
+ FROM requests_artists
+ WHERE ArtistID = $NewArtistID");
+ $NewArtistRequests = $DB->collect('RequestID');
+ $NewArtistRequests[] = '0';
+ $NewArtistRequests = implode(',', $NewArtistRequests);
+
+ $DB->query("
+ SELECT DISTINCT UserID
+ FROM bookmarks_artists
+ WHERE ArtistID = $NewArtistID");
+ $NewArtistBookmarks = $DB->collect('UserID');
+ $NewArtistBookmarks[] = '0';
+ $NewArtistBookmarks = implode(',', $NewArtistBookmarks);
+
+ // Merge all of this artist's aliases onto the new artist
+ $DB->query("
+ UPDATE artists_alias
+ SET ArtistID = $NewArtistID
+ WHERE ArtistID = $ArtistID");
+
+ // Update the torrent groups, requests, and bookmarks
+ $DB->query("
+ UPDATE IGNORE torrents_artists
+ SET ArtistID = $NewArtistID
+ WHERE ArtistID = $ArtistID
+ AND GroupID NOT IN ($NewArtistGroups)");
+ $DB->query("
+ DELETE FROM torrents_artists
+ WHERE ArtistID = $ArtistID");
+ $DB->query("
+ UPDATE IGNORE requests_artists
+ SET ArtistID = $NewArtistID
+ WHERE ArtistID = $ArtistID
+ AND RequestID NOT IN ($NewArtistRequests)");
+ $DB->query("
+ DELETE FROM requests_artists
+ WHERE ArtistID = $ArtistID");
+ $DB->query("
+ UPDATE IGNORE bookmarks_artists
+ SET ArtistID = $NewArtistID
+ WHERE ArtistID = $ArtistID
+ AND UserID NOT IN ($NewArtistBookmarks)");
+ $DB->query("
+ DELETE FROM bookmarks_artists
+ WHERE ArtistID = $ArtistID");
+
+ // Cache clearing
+ if (!empty($Groups)) {
+ foreach ($Groups as $GroupID) {
+ $Cache->delete_value("groups_artists_$GroupID");
+ Torrents::update_hash($GroupID);
+ }
+ }
+ if (!empty($Requests)) {
+ foreach ($Requests as $RequestID) {
+ $Cache->delete_value("request_artists_$RequestID");
+ Requests::update_sphinx_requests($RequestID);
+ }
+ }
+ if (!empty($BookmarkUsers)) {
+ foreach ($BookmarkUsers as $UserID) {
+ $Cache->delete_value("notify_artists_$UserID");
+ }
+ }
+ if (!empty($Collages)) {
+ foreach ($Collages as $CollageID) {
+ $Cache->delete_value("collage_$CollageID");
+ }
+ }
+
+ $Cache->delete_value("artist_$ArtistID");
+ $Cache->delete_value("artist_$NewArtistID");
+ $Cache->delete_value("artist_groups_$ArtistID");
+ $Cache->delete_value("artist_groups_$NewArtistID");
+
+ // Delete the old artist
+ $DB->query("
+ DELETE FROM artists_group
+ WHERE ArtistID = $ArtistID");
+
+ Misc::write_log("The artist $ArtistID ($ArtistName) was made into a non-redirecting alias of artist $NewArtistID ($NewArtistName) by user ".$LoggedUser['ID']." (".$LoggedUser['Username'].')');
+
+ header("Location: artist.php?action=edit&artistid=$NewArtistID");
} else {
- View::show_header('Merging Artists');
+ View::show_header('Merging Artists');
?>
- | ↑ This artist is in collage 1) ? 's' : '')?> | -# artists | -
| ↑ This artist is in collage 1) ? 's' : '')?> | +# artists | +
| - | - | + | + + - - - |
| - ↑ - Request Name - | -- Vote - | -- Bounty - | -- Added - | -
| + ↑ + Request Name + | ++ Vote + | ++ Bounty + | ++ Added + | +
| - - - | -- - - - + - - | -- - | -- - | -
-
- 0 */ ?>
-
- 0 */ ?>
+
+
-
- ↑
- Similar Artist Map
- Switch to cloud
-
-
-write_artists();
+
+
+
+
+
+ ↑
+ Similar Artist Map
+ Switch to cloud
+
+
+write_artists();
?>
-
-
-
-
-
+
+
-
-
-
-
- 'pageid',
- 'InputID' => $ArtistID,
- 'Action' => 'comments.php?page=artist',
- 'InputAction' => 'take_post',
- 'SubscribeBox' => true
- ));
+
+
+
+ 'pageid',
+ 'InputID' => $ArtistID,
+ 'Action' => 'comments.php?page=artist',
+ 'InputAction' => 'take_post',
+ 'SubscribeBox' => true
+ ));
?>
-
-
-
-
+ Confirm merge
-Confirm merge
+ + + diff --git a/sections/artist/concerts.php b/sections/artist/concerts.php index 8bd75c7e3..0ca439f70 100644 --- a/sections/artist/concerts.php +++ b/sections/artist/concerts.php @@ -1,102 +1,102 @@ -An error occurred when retrieving concert info.'; + echo '
An error occurred when retrieving concert info.
'; } elseif (!isset($ArtistEvents['events']['event'])) { // No upcoming events - echo '
This artist has no upcoming concerts.
'; - $Hidden = true; + echo '
This artist has no upcoming concerts.
'; + $Hidden = true; } else { - echo '
- ';
- if (isset($ArtistEvents['events']['event'][0])) { // Multiple events
- foreach ($ArtistEvents['events']['event'] as $Event) {
- make_concert_link($Event);
- }
- } else { // Single event
- make_concert_link($ArtistEvents['events']['event'], $Name);
- }
- echo '
- ';
+ if (isset($ArtistEvents['events']['event'][0])) { // Multiple events
+ foreach ($ArtistEvents['events']['event'] as $Event) {
+ make_concert_link($Event);
+ }
+ } else { // Single event
+ make_concert_link($ArtistEvents['events']['event'], $Name);
+ }
+ echo '
- There are still torrents that have as an artist.
- Please remove the artist from these torrents manually before attempting to delete.
- +
+query("
- SELECT r.Title, r.ID
- FROM requests AS r
- LEFT JOIN requests_artists AS ra ON ra.RequestID = r.ID
- WHERE ra.ArtistID = $ArtistID");
+ SELECT r.Title, r.ID
+ FROM requests AS r
+ LEFT JOIN requests_artists AS ra ON ra.RequestID = r.ID
+ WHERE ra.ArtistID = $ArtistID");
$Count += $DB->record_count();
if ($DB->has_results()) {
?>
- - Please remove the artist from these torrents manually before attempting to delete.
- +
- There are still requests that have as an artist.
- Please remove the artist from these requests manually before attempting to delete.
- +
+
- - Please remove the artist from these requests manually before attempting to delete.
- +
- Artist "" deleted!
-
-
+ Artist "" deleted!
+
+
diff --git a/sections/artist/delete_alias.php b/sections/artist/delete_alias.php
index 8a28fada7..5266f4baa 100644
--- a/sections/artist/delete_alias.php
+++ b/sections/artist/delete_alias.php
@@ -1,51 +1,51 @@
query("
- SELECT aa.AliasID
- FROM artists_alias AS aa
- JOIN artists_alias AS aa2 ON aa.ArtistID=aa2.ArtistID
- WHERE aa.AliasID=".$AliasID);
+ SELECT aa.AliasID
+ FROM artists_alias AS aa
+ JOIN artists_alias AS aa2 ON aa.ArtistID=aa2.ArtistID
+ WHERE aa.AliasID=".$AliasID);
if ($DB->record_count() === 1) {
- //This is the last alias on the artist
- error("That alias is the last alias for that artist; removing it would cause bad things to happen.");
+ //This is the last alias on the artist
+ error("That alias is the last alias for that artist; removing it would cause bad things to happen.");
}
$DB->query("
- SELECT GroupID
- FROM torrents_artists
- WHERE AliasID='$AliasID'");
+ SELECT GroupID
+ FROM torrents_artists
+ WHERE AliasID='$AliasID'");
if ($DB->has_results()) {
- list($GroupID) = $DB->next_record();
- if ($GroupID != 0) {
- error("That alias still has the group ($GroupID) attached. Fix that first.");
- }
+ list($GroupID) = $DB->next_record();
+ if ($GroupID != 0) {
+ error("That alias still has the group ($GroupID) attached. Fix that first.");
+ }
}
$DB->query("
- SELECT aa.ArtistID, ag.Name, aa.Name
- FROM artists_alias AS aa
- JOIN artists_group AS ag ON aa.ArtistID=ag.ArtistID
- WHERE aa.AliasID=$AliasID");
+ SELECT aa.ArtistID, ag.Name, aa.Name
+ FROM artists_alias AS aa
+ JOIN artists_group AS ag ON aa.ArtistID=ag.ArtistID
+ WHERE aa.AliasID=$AliasID");
list($ArtistID, $ArtistName, $AliasName) = $DB->next_record(MYSQLI_NUM, false);
$DB->query("
- DELETE FROM artists_alias
- WHERE AliasID='$AliasID'");
+ DELETE FROM artists_alias
+ WHERE AliasID='$AliasID'");
$DB->query("
- UPDATE artists_alias
- SET Redirect='0'
- WHERE Redirect='$AliasID'");
+ UPDATE artists_alias
+ SET Redirect='0'
+ WHERE Redirect='$AliasID'");
Misc::write_log("The alias $AliasID ($AliasName) was removed from the artist $ArtistID ($ArtistName) by user $LoggedUser[ID] ($LoggedUser[Username])");
diff --git a/sections/artist/delete_similar.php b/sections/artist/delete_similar.php
index 5e764fe60..a633d587f 100644
--- a/sections/artist/delete_similar.php
+++ b/sections/artist/delete_similar.php
@@ -4,30 +4,30 @@
$PrimaryArtistID = intval($_GET['artistid']);
if (!is_number($SimilarID) || !$SimilarID) {
- error(404);
+ error(404);
}
if (!check_perms('site_delete_tag')) {
- error(403);
+ error(403);
}
$DB->query("
- SELECT ArtistID
- FROM artists_similar
- WHERE SimilarID = '$SimilarID'");
+ SELECT ArtistID
+ FROM artists_similar
+ WHERE SimilarID = '$SimilarID'");
$ArtistIDs = $DB->to_array();
$DB->query("
- DELETE FROM artists_similar
- WHERE SimilarID = '$SimilarID'");
+ DELETE FROM artists_similar
+ WHERE SimilarID = '$SimilarID'");
$DB->query("
- DELETE FROM artists_similar_scores
- WHERE SimilarID = '$SimilarID'");
+ DELETE FROM artists_similar_scores
+ WHERE SimilarID = '$SimilarID'");
$DB->query("
- DELETE FROM artists_similar_votes
- WHERE SimilarID = '$SimilarID'");
+ 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");
+ list($ArtistID) = $ArtistID;
+ $Cache->delete_value("artist_$ArtistID"); // Delete artist cache
+ $Cache->delete_value("similar_positions_$ArtistID");
}
$Location = (empty($_SERVER['HTTP_REFERER'])) ? "artist.php?id={$PrimaryArtistID}" : $_SERVER['HTTP_REFERER'];
diff --git a/sections/artist/download.php b/sections/artist/download.php
index 7ec57041d..24e523e9d 100644
--- a/sections/artist/download.php
+++ b/sections/artist/download.php
@@ -1,4 +1,4 @@
- 2
- || count($_REQUEST['list']) === 0
+ !isset($_REQUEST['artistid'])
+ || !isset($_REQUEST['preference'])
+ || !is_number($_REQUEST['preference'])
+ || !is_number($_REQUEST['artistid'])
+ || $_REQUEST['preference'] > 2
+ || count($_REQUEST['list']) === 0
) {
- error(0);
+ error(0);
}
if (!check_perms('zip_downloader')) {
- error(403);
+ error(403);
}
-$Preferences = array('RemasterTitle DESC', 'Seeders ASC', 'Size ASC');
+$Preferences = array('t.RemasterTitle DESC', 'tls.Seeders ASC', 't.Size ASC');
$ArtistID = $_REQUEST['artistid'];
$Preference = $Preferences[$_REQUEST['preference']];
-$DB->query("
- SELECT Name
- FROM artists_group
- WHERE ArtistID = '$ArtistID'");
+$DB->prepared_query('
+ SELECT Name
+ FROM artists_group
+ WHERE ArtistID = ?
+ ', $ArtistID
+);
list($ArtistName) = $DB->next_record(MYSQLI_NUM, false);
-$DB->query("
- SELECT GroupID, Importance
- FROM torrents_artists
- WHERE ArtistID = '$ArtistID'");
+$DB->prepared_query('
+ SELECT GroupID, Importance
+ FROM torrents_artists
+ WHERE ArtistID = ?
+ ', $ArtistID
+);
if (!$DB->has_results()) {
- error(404);
+ error(404);
}
-$ArtistRoles = array();
+$ArtistRoles = [];
while (list($GroupID, $Importance) = $DB->next_record(MYSQLI_NUM, false)) {
- // Get the highest importances to place the .torrents in the most relevant folders
- if (!isset($ArtistRoles[$GroupID]) || $Importance < $ArtistRoles[$GroupID]) {
- $ArtistRoles[$GroupID] = $Importance;
- }
+ // Get the highest importances to place the .torrents in the most relevant folders
+ if (!isset($ArtistRoles[$GroupID]) || $Importance < $ArtistRoles[$GroupID]) {
+ $ArtistRoles[$GroupID] = $Importance;
+ }
}
$GroupIDs = array_keys($ArtistRoles);
$SQL = 'SELECT CASE ';
foreach ($_REQUEST['list'] as $Priority => $Selection) {
- if (!is_number($Priority)) {
- continue;
- }
- $SQL .= 'WHEN ';
- switch ($Selection) {
- case '00': $SQL .= "t.Format = 'MP3' AND t.Encoding = 'V0 (VBR)'"; break;
- case '01': $SQL .= "t.Format = 'MP3' AND t.Encoding = 'APX (VBR)'"; break;
- case '02': $SQL .= "t.Format = 'MP3' AND t.Encoding = '256 (VBR)'"; break;
- case '03': $SQL .= "t.Format = 'MP3' AND t.Encoding = 'V1 (VBR)'"; break;
- case '10': $SQL .= "t.Format = 'MP3' AND t.Encoding = '224 (VBR)'"; break;
- case '11': $SQL .= "t.Format = 'MP3' AND t.Encoding = 'V2 (VBR)'"; break;
- case '12': $SQL .= "t.Format = 'MP3' AND t.Encoding = 'APS (VBR)'"; break;
- case '13': $SQL .= "t.Format = 'MP3' AND t.Encoding = '192 (VBR)'"; break;
- case '20': $SQL .= "t.Format = 'MP3' AND t.Encoding = '320'"; break;
- case '21': $SQL .= "t.Format = 'MP3' AND t.Encoding = '256'"; break;
- case '22': $SQL .= "t.Format = 'MP3' AND t.Encoding = '224'"; break;
- case '23': $SQL .= "t.Format = 'MP3' AND t.Encoding = '192'"; break;
- case '30': $SQL .= "t.Format = 'FLAC' AND t.Encoding = '24bit Lossless' AND t.Media = 'Vinyl'"; break;
- case '31': $SQL .= "t.Format = 'FLAC' AND t.Encoding = '24bit Lossless' AND t.Media = 'DVD'"; break;
- case '32': $SQL .= "t.Format = 'FLAC' AND t.Encoding = '24bit Lossless' AND t.Media = 'SACD'"; break;
- case '33': $SQL .= "t.Format = 'FLAC' AND t.Encoding = '24bit Lossless' AND t.Media = 'WEB'"; break;
- case '34': $SQL .= "t.Format = 'FLAC' AND t.Encoding = 'Lossless' AND HasLog = '1' AND LogScore = '100' AND HasCue = '1'"; break;
- case '35': $SQL .= "t.Format = 'FLAC' AND t.Encoding = 'Lossless' AND HasLog = '1' AND LogScore = '100'"; break;
- case '36': $SQL .= "t.Format = 'FLAC' AND t.Encoding = 'Lossless' AND HasLog = '1'"; break;
- case '37': $SQL .= "t.Format = 'FLAC' AND t.Encoding = 'Lossless'"; break;
- case '40': $SQL .= "t.Format = 'DTS'"; break;
- case '42': $SQL .= "t.Format = 'AAC' AND t.Encoding = '320'"; break;
- case '43': $SQL .= "t.Format = 'AAC' AND t.Encoding = '256'"; break;
- case '44': $SQL .= "t.Format = 'AAC' AND t.Encoding = 'q5.5'"; break;
- case '45': $SQL .= "t.Format = 'AAC' AND t.Encoding = 'q5'"; break;
- case '46': $SQL .= "t.Format = 'AAC' AND t.Encoding = '192'"; break;
- default: error(0);
- }
- $SQL .= " THEN $Priority ";
+ if (!is_number($Priority)) {
+ continue;
+ }
+ $SQL .= 'WHEN ';
+ switch ($Selection) {
+ case '00': $SQL .= "t.Format = 'MP3' AND t.Encoding = 'V0 (VBR)'"; break;
+ case '01': $SQL .= "t.Format = 'MP3' AND t.Encoding = 'APX (VBR)'"; break;
+ case '02': $SQL .= "t.Format = 'MP3' AND t.Encoding = '256 (VBR)'"; break;
+ case '03': $SQL .= "t.Format = 'MP3' AND t.Encoding = 'V1 (VBR)'"; break;
+ case '10': $SQL .= "t.Format = 'MP3' AND t.Encoding = '224 (VBR)'"; break;
+ case '11': $SQL .= "t.Format = 'MP3' AND t.Encoding = 'V2 (VBR)'"; break;
+ case '12': $SQL .= "t.Format = 'MP3' AND t.Encoding = 'APS (VBR)'"; break;
+ case '13': $SQL .= "t.Format = 'MP3' AND t.Encoding = '192 (VBR)'"; break;
+ case '20': $SQL .= "t.Format = 'MP3' AND t.Encoding = '320'"; break;
+ case '21': $SQL .= "t.Format = 'MP3' AND t.Encoding = '256'"; break;
+ case '22': $SQL .= "t.Format = 'MP3' AND t.Encoding = '224'"; break;
+ case '23': $SQL .= "t.Format = 'MP3' AND t.Encoding = '192'"; break;
+ case '30': $SQL .= "t.Format = 'FLAC' AND t.Encoding = '24bit Lossless' AND t.Media = 'Vinyl'"; break;
+ case '31': $SQL .= "t.Format = 'FLAC' AND t.Encoding = '24bit Lossless' AND t.Media = 'DVD'"; break;
+ case '32': $SQL .= "t.Format = 'FLAC' AND t.Encoding = '24bit Lossless' AND t.Media = 'SACD'"; break;
+ case '33': $SQL .= "t.Format = 'FLAC' AND t.Encoding = '24bit Lossless' AND t.Media = 'WEB'"; break;
+ case '34': $SQL .= "t.Format = 'FLAC' AND t.Encoding = 'Lossless' AND HasLog = '1' AND LogScore = '100' AND HasCue = '1'"; break;
+ case '35': $SQL .= "t.Format = 'FLAC' AND t.Encoding = 'Lossless' AND HasLog = '1' AND LogScore = '100'"; break;
+ case '36': $SQL .= "t.Format = 'FLAC' AND t.Encoding = 'Lossless' AND HasLog = '1'"; break;
+ case '37': $SQL .= "t.Format = 'FLAC' AND t.Encoding = 'Lossless'"; break;
+ case '40': $SQL .= "t.Format = 'DTS'"; break;
+ case '42': $SQL .= "t.Format = 'AAC' AND t.Encoding = '320'"; break;
+ case '43': $SQL .= "t.Format = 'AAC' AND t.Encoding = '256'"; break;
+ case '44': $SQL .= "t.Format = 'AAC' AND t.Encoding = 'q5.5'"; break;
+ case '45': $SQL .= "t.Format = 'AAC' AND t.Encoding = 'q5'"; break;
+ case '46': $SQL .= "t.Format = 'AAC' AND t.Encoding = '192'"; break;
+ default: error(0);
+ }
+ $SQL .= " THEN $Priority ";
}
$SQL .= "
- ELSE 100
- END AS Rank,
- t.GroupID,
- t.ID AS TorrentID,
- t.Media,
- t.Format,
- t.Encoding,
- tg.ReleaseType,
- IF(t.RemasterYear = 0, tg.Year, t.RemasterYear) AS Year,
- tg.Name,
- t.Size
+ ELSE 100
+ END AS Rank,
+ t.GroupID,
+ t.ID AS TorrentID,
+ t.Media,
+ t.Format,
+ t.Encoding,
+ tg.ReleaseType,
+ IF(t.RemasterYear = 0, tg.Year, t.RemasterYear) AS Year,
+ tg.Name,
+ t.Size
FROM torrents AS t
- JOIN torrents_group AS tg ON tg.ID = t.GroupID AND tg.CategoryID = '1' AND tg.ID IN (".implode(',', $GroupIDs).")
-ORDER BY t.GroupID ASC, Rank DESC, t.$Preference";
+INNER JOIN torrents_leech_stats tls ON (tls.TorrentID = t.ID) /* FIXME: only needed if sorting by Seeders */
+INNER JOIN torrents_group AS tg ON tg.ID = t.GroupID AND tg.CategoryID = '1' AND tg.ID IN (".implode(',', $GroupIDs).")
+ORDER BY t.GroupID ASC, Rank DESC, $Preference";
$DownloadsQ = $DB->query($SQL);
$Collector = new TorrentsDL($DownloadsQ, $ArtistName);
while (list($Downloads, $GroupIDs) = $Collector->get_downloads('GroupID')) {
- $Artists = Artists::get_artists($GroupIDs);
- $TorrentFilesQ = $DB->query("
- SELECT TorrentID, File
- FROM torrents_files
- WHERE TorrentID IN (".implode(',', array_keys($GroupIDs)).')', false);
- if (is_int($TorrentFilesQ)) {
- // Query failed. Let's not create a broken zip archive
- foreach ($GroupIDs as $GroupID) {
- $Download =& $Downloads[$GroupID];
- $Download['Artist'] = Artists::display_artists($Artists[$GroupID], false, true, false);
- $Collector->fail_file($Download);
- }
- continue;
- }
- while (list($TorrentID, $TorrentFile) = $DB->next_record(MYSQLI_NUM, false)) {
- $GroupID = $GroupIDs[$TorrentID];
- $Download =& $Downloads[$GroupID];
- $Download['Artist'] = Artists::display_artists($Artists[$Download['GroupID']], false, true, false);
- if ($Download['Rank'] == 100) {
- $Collector->skip_file($Download);
- continue;
- }
- switch ($ArtistRoles[$GroupID]) {
- /**
- * 1 => Main artist
- * 2 => Guest artist
- * 3 => Remixer
- * 4 => Composer
- * 5 => Conductor
- * 6 => DJ / Compiler
- * 7 => Producer
- */
- case '1':
- $ReleaseTypeName = $ReleaseTypes[$Download['ReleaseType']];
- break;
- case '2':
- $ReleaseTypeName = 'Guest Appearance';
- break;
- case '3':
- $ReleaseTypeName = 'Remixed By';
- break;
- case '4':
- $ReleaseTypeName = 'Composition';
- break;
- case '5':
- $ReleaseTypeName = 'Conducted By';
- break;
- case '6':
- $ReleaseTypeName = 'DJ Mix';
- break;
- case '7':
- $ReleaseTypeName = 'Produced By';
- break;
- default:
- $ReleaseTypeName = 'Other';
- break;
- }
- $Collector->add_file($TorrentFile, $Download, $ReleaseTypeName);
- unset($Download);
- }
+ $Artists = Artists::get_artists($GroupIDs);
+ $TorrentFilesQ = $DB->query("
+ SELECT TorrentID, File
+ FROM torrents_files
+ WHERE TorrentID IN (".implode(',', array_keys($GroupIDs)).')', false);
+ if (is_int($TorrentFilesQ)) {
+ // Query failed. Let's not create a broken zip archive
+ foreach ($GroupIDs as $GroupID) {
+ $Download =& $Downloads[$GroupID];
+ $Download['Artist'] = Artists::display_artists($Artists[$GroupID], false, true, false);
+ $Collector->fail_file($Download);
+ }
+ continue;
+ }
+ while (list($TorrentID, $TorrentFile) = $DB->next_record(MYSQLI_NUM, false)) {
+ $GroupID = $GroupIDs[$TorrentID];
+ $Download =& $Downloads[$GroupID];
+ $Download['Artist'] = Artists::display_artists($Artists[$Download['GroupID']], false, true, false);
+ if ($Download['Rank'] == 100) {
+ $Collector->skip_file($Download);
+ continue;
+ }
+ switch ($ArtistRoles[$GroupID]) {
+ /**
+ * 1 => Main artist
+ * 2 => Guest artist
+ * 3 => Remixer
+ * 4 => Composer
+ * 5 => Conductor
+ * 6 => DJ / Compiler
+ * 7 => Producer
+ */
+ case '1':
+ $ReleaseTypeName = $ReleaseTypes[$Download['ReleaseType']];
+ break;
+ case '2':
+ $ReleaseTypeName = 'Guest Appearance';
+ break;
+ case '3':
+ $ReleaseTypeName = 'Remixed By';
+ break;
+ case '4':
+ $ReleaseTypeName = 'Composition';
+ break;
+ case '5':
+ $ReleaseTypeName = 'Conducted By';
+ break;
+ case '6':
+ $ReleaseTypeName = 'DJ Mix';
+ break;
+ case '7':
+ $ReleaseTypeName = 'Produced By';
+ break;
+ default:
+ $ReleaseTypeName = 'Other';
+ break;
+ }
+ $Collector->add_file($TorrentFile, $Download, $ReleaseTypeName);
+ unset($Download);
+ }
}
$Collector->finalize();
$Settings = array(implode(':', $_REQUEST['list']), $_REQUEST['preference']);
if (!isset($LoggedUser['Collector']) || $LoggedUser['Collector'] != $Settings) {
- Users::update_site_options($LoggedUser['ID'], array('Collector' => $Settings));
+ Users::update_site_options($LoggedUser['ID'], array('Collector' => $Settings));
}
define('SKIP_NO_CACHE_HEADERS', 1);
-?>
diff --git a/sections/artist/edit.php b/sections/artist/edit.php
index 241eec982..7ee7cc912 100644
--- a/sections/artist/edit.php
+++ b/sections/artist/edit.php
@@ -1,4 +1,4 @@
-query("
- SELECT
- Name,
- Image,
- Body,
- VanityHouse
- FROM artists_group AS a
- LEFT JOIN wiki_artists ON wiki_artists.RevisionID = a.RevisionID
- WHERE a.ArtistID = '$ArtistID'");
+ SELECT
+ Name,
+ Image,
+ Body,
+ VanityHouse
+ FROM artists_group AS a
+ LEFT JOIN wiki_artists ON wiki_artists.RevisionID = a.RevisionID
+ WHERE a.ArtistID = '$ArtistID'");
if (!$DB->has_results()) {
- error("Cannot find an artist with the ID {$ArtistID}: See the site log.");
+ error("Cannot find an artist with the ID {$ArtistID}: See the site log.");
}
list($Name, $Image, $Body, $VanityHouse) = $DB->next_record(MYSQLI_NUM, true);
@@ -36,129 +36,133 @@
View::show_header('Edit artist');
?>
-
-
-
+
diff --git a/sections/artist/editrequest.php b/sections/artist/editrequest.php
index 3a1a80ceb..f2bf20fd4 100644
--- a/sections/artist/editrequest.php
+++ b/sections/artist/editrequest.php
@@ -1,69 +1,69 @@
prepared_query("SELECT
- Name,
- VanityHouse
- FROM artists_group
- WHERE ArtistID = ?", $ArtistID);
+ Name,
+ VanityHouse
+ FROM artists_group
+ WHERE ArtistID = ?", $ArtistID);
if (!$DB->has_results()) {
- error(404);
+ error(404);
}
list($Name, $VanityHouseArtist) = $DB->fetch_record();
if ($VanityHouseArtist) {
- $Name .= ' [Vanity House]';
+ $Name .= ' [Vanity House]';
}
View::show_header("Request an Edit: " . $Name);
?>
-
-
-
- Rename this artist
-
-
-
+
+
+
+
+
+ Rename this artist
+
+
+
- Make into non-redirecting alias
-
-
-
+ Make into non-redirecting alias
+
+
+
- Artist aliases
-
-
+
+
List of existing artist aliases
-
-
+ -
+
- - . - - User - - (writes redirect to ) - + . + + User + + (writes redirect to ) + - X - -&auth=" title="Delete this alias" class="brackets tooltip">X + + -
Artist aliases
+
+
-
-
+ List of existing artist aliases
+
+
- -
-query("
- SELECT AliasID, Name, UserID, Redirect
- FROM artists_alias
- WHERE ArtistID = '$ArtistID'");
- while (list($AliasID, $AliasName, $User, $Redirect) = $DB->next_record(MYSQLI_NUM, true)) {
- if ($AliasName == $Name) {
- $DefaultRedirectID = $AliasID;
- }
+query("
+ SELECT AliasID, Name, UserID, Redirect
+ FROM artists_alias
+ WHERE ArtistID = '$ArtistID'");
+ while (list($AliasID, $AliasName, $User, $Redirect) = $DB->next_record(MYSQLI_NUM, true)) {
+ if ($AliasName == $Name) {
+ $DefaultRedirectID = $AliasID;
+ }
?>
-
-
Add a new artist alias
-
-
- This redirects artist names as they are written (e.g. when new torrents are uploaded or artists added). All uses of this new alias will be redirected to the alias ID you enter here. Use for common misspellings, inclusion of diacritical marks, etc.
- -+
Add a new artist alias
+
+
+ This redirects artist names as they are written (e.g. when new torrents are uploaded or artists added). All uses of this new alias will be redirected to the alias ID you enter here. Use for common misspellings, inclusion of diacritical marks, etc.
+ +
-
query("
- SELECT Name
- FROM artists_group
- WHERE ArtistID = $ArtistID");
+ SELECT Name
+ FROM artists_group
+ WHERE ArtistID = $ArtistID");
if (!$DB->has_results()) {
- error(404);
+ error(404);
}
list($Name) = $DB->next_record();
View::show_header("Revision history for $Name");
?>
+
-query("
- SELECT ArtistID, Name
- FROM artists_alias
- WHERE Name LIKE '" . db_string($NameSearch) . "'");
- if (!$DB->has_results()) {
- if (isset($LoggedUser['SearchType']) && $LoggedUser['SearchType']) {
- header('Location: torrents.php?action=advanced&artistname=' . urlencode($_GET['artistname']));
- } else {
- header('Location: torrents.php?searchstr=' . urlencode($_GET['artistname']));
- }
- die();
- }
- list($FirstID, $Name) = $DB->next_record(MYSQLI_NUM, false);
- if ($DB->record_count() === 1 || !strcasecmp($Name, $NameSearch)) {
- header("Location: artist.php?id=$FirstID");
- die();
- }
- while (list($ID, $Name) = $DB->next_record(MYSQLI_NUM, false)) {
- if (!strcasecmp($Name, $NameSearch)) {
- header("Location: artist.php?id=$ID");
- die();
- }
- }
- header("Location: artist.php?id=$FirstID");
- die();
- } else {
- header('Location: torrents.php');
- }
+ $NameSearch = str_replace('\\', '\\\\', trim($_GET['artistname']));
+ $DB->query("
+ SELECT ArtistID, Name
+ FROM artists_alias
+ WHERE Name LIKE '" . db_string($NameSearch) . "'");
+ if (!$DB->has_results()) {
+ if (isset($LoggedUser['SearchType']) && $LoggedUser['SearchType']) {
+ header('Location: torrents.php?action=advanced&artistname=' . urlencode($_GET['artistname']));
+ } else {
+ header('Location: torrents.php?searchstr=' . urlencode($_GET['artistname']));
+ }
+ die();
+ }
+ list($FirstID, $Name) = $DB->next_record(MYSQLI_NUM, false);
+ if ($DB->record_count() === 1 || !strcasecmp($Name, $NameSearch)) {
+ header("Location: artist.php?id=$FirstID");
+ die();
+ }
+ while (list($ID, $Name) = $DB->next_record(MYSQLI_NUM, false)) {
+ if (!strcasecmp($Name, $NameSearch)) {
+ header("Location: artist.php?id=$ID");
+ die();
+ }
+ }
+ header("Location: artist.php?id=$FirstID");
+ die();
+ } else {
+ header('Location: torrents.php');
+ }
}
?>
diff --git a/sections/artist/notify.php b/sections/artist/notify.php
index 752de6e42..a6b0f8003 100644
--- a/sections/artist/notify.php
+++ b/sections/artist/notify.php
@@ -1,56 +1,56 @@
query("
- SELECT GROUP_CONCAT(Name SEPARATOR '|')
- FROM artists_alias
- WHERE ArtistID = '$ArtistID'
- AND Redirect = 0
- GROUP BY ArtistID");
+ SELECT GROUP_CONCAT(Name SEPARATOR '|')
+ FROM artists_alias
+ WHERE ArtistID = '$ArtistID'
+ AND Redirect = 0
+ GROUP BY ArtistID");
list($ArtistAliases) = $DB->next_record(MYSQLI_NUM, FALSE);
$Notify = $Cache->get_value('notify_artists_'.$LoggedUser['ID']);
if (empty($Notify)) {
- $DB->query("
- SELECT ID, Artists
- FROM users_notify_filters
- WHERE Label = 'Artist notifications'
- AND UserID = '$LoggedUser[ID]'
- ORDER BY ID
- LIMIT 1");
+ $DB->query("
+ SELECT ID, Artists
+ FROM users_notify_filters
+ WHERE Label = 'Artist notifications'
+ AND UserID = '$LoggedUser[ID]'
+ ORDER BY ID
+ LIMIT 1");
} else {
- $DB->query("
- SELECT ID, Artists
- FROM users_notify_filters
- WHERE ID = '$Notify[ID]'");
+ $DB->query("
+ SELECT ID, Artists
+ FROM users_notify_filters
+ WHERE ID = '$Notify[ID]'");
}
if (empty($Notify) && !$DB->has_results()) {
- $DB->query("
- INSERT INTO users_notify_filters
- (UserID, Label, Artists)
- VALUES
- ('$LoggedUser[ID]', 'Artist notifications', '|".db_string($ArtistAliases)."|')");
- $FilterID = $DB->inserted_id();
- $Cache->delete_value('notify_filters_'.$LoggedUser['ID']);
- $Cache->delete_value('notify_artists_'.$LoggedUser['ID']);
+ $DB->query("
+ INSERT INTO users_notify_filters
+ (UserID, Label, Artists)
+ VALUES
+ ('$LoggedUser[ID]', 'Artist notifications', '|".db_string($ArtistAliases)."|')");
+ $FilterID = $DB->inserted_id();
+ $Cache->delete_value('notify_filters_'.$LoggedUser['ID']);
+ $Cache->delete_value('notify_artists_'.$LoggedUser['ID']);
} else {
- list($ID, $ArtistNames) = $DB->next_record(MYSQLI_NUM, FALSE);
- if (stripos($ArtistNames, "|$ArtistAliases|") === false) {
- $ArtistNames .= "$ArtistAliases|";
- $DB->query("
- UPDATE users_notify_filters
- SET Artists = '".db_string($ArtistNames)."'
- WHERE ID = '$ID'");
- $Cache->delete_value('notify_filters_'.$LoggedUser['ID']);
- $Cache->delete_value('notify_artists_'.$LoggedUser['ID']);
- }
+ list($ID, $ArtistNames) = $DB->next_record(MYSQLI_NUM, FALSE);
+ if (stripos($ArtistNames, "|$ArtistAliases|") === false) {
+ $ArtistNames .= "$ArtistAliases|";
+ $DB->query("
+ UPDATE users_notify_filters
+ SET Artists = '".db_string($ArtistNames)."'
+ WHERE ID = '$ID'");
+ $Cache->delete_value('notify_filters_'.$LoggedUser['ID']);
+ $Cache->delete_value('notify_artists_'.$LoggedUser['ID']);
+ }
}
$Location = (empty($_SERVER['HTTP_REFERER'])) ? "artist.php?id={$ArtistID}" : $_SERVER['HTTP_REFERER'];
diff --git a/sections/artist/notifyremove.php b/sections/artist/notifyremove.php
index 8fd0aa624..e4cecb56a 100644
--- a/sections/artist/notifyremove.php
+++ b/sections/artist/notifyremove.php
@@ -1,47 +1,47 @@
-get_value('notify_artists_'.$LoggedUser['ID'])) === false) {
- $DB->query("
- SELECT ID, Artists
- FROM users_notify_filters
- WHERE Label = 'Artist notifications'
- AND UserID = '$LoggedUser[ID]'
- ORDER BY ID
- LIMIT 1");
+ $DB->query("
+ SELECT ID, Artists
+ FROM users_notify_filters
+ WHERE Label = 'Artist notifications'
+ AND UserID = '$LoggedUser[ID]'
+ ORDER BY ID
+ LIMIT 1");
} else {
- $DB->query("
- SELECT ID, Artists
- FROM users_notify_filters
- WHERE ID = '$Notify[ID]'");
+ $DB->query("
+ SELECT ID, Artists
+ FROM users_notify_filters
+ WHERE ID = '$Notify[ID]'");
}
list($ID, $Artists) = $DB->next_record(MYSQLI_NUM, false);
$DB->query("
- SELECT Name
- FROM artists_alias
- WHERE ArtistID = '$ArtistID'
- AND Redirect = 0");
+ SELECT Name
+ FROM artists_alias
+ WHERE ArtistID = '$ArtistID'
+ AND Redirect = 0");
while (list($Alias) = $DB->next_record(MYSQLI_NUM, false)) {
- while (stripos($Artists, "|$Alias|") !== false) {
- $Artists = str_ireplace("|$Alias|", '|', $Artists);
- }
+ while (stripos($Artists, "|$Alias|") !== false) {
+ $Artists = str_ireplace("|$Alias|", '|', $Artists);
+ }
}
if ($Artists == '|') {
- $DB->query("
- DELETE FROM users_notify_filters
- WHERE ID = $ID");
+ $DB->query("
+ DELETE FROM users_notify_filters
+ WHERE ID = $ID");
} else {
- $DB->query("
- UPDATE users_notify_filters
- SET Artists = '".db_string($Artists)."'
- WHERE ID = '$ID'");
+ $DB->query("
+ UPDATE users_notify_filters
+ SET Artists = '".db_string($Artists)."'
+ WHERE ID = '$ID'");
}
$Cache->delete_value('notify_filters_'.$LoggedUser['ID']);
$Cache->delete_value('notify_artists_'.$LoggedUser['ID']);
diff --git a/sections/artist/rename.php b/sections/artist/rename.php
index 453c90dd5..6ab0c0a52 100644
--- a/sections/artist/rename.php
+++ b/sections/artist/rename.php
@@ -26,210 +26,210 @@
$NewName = Artists::normalise_artist_name($_POST['name']);
if (!$ArtistID || !is_number($ArtistID)) {
- error(404);
+ error(404);
}
if (!check_perms('torrents_edit')) {
- error(403);
+ error(403);
}
$DB->query("
- SELECT Name
- FROM artists_group
- WHERE ArtistID = '$ArtistID'");
+ SELECT Name
+ FROM artists_group
+ WHERE ArtistID = '$ArtistID'");
if (!$DB->has_results()) {
- error(404);
+ error(404);
}
list($OldName) = $DB->next_record(MYSQLI_NUM, false);
if ($OldName == $NewName) {
- error('The new name is identical to the old name.');
+ error('The new name is identical to the old name.');
}
$DB->query("
- SELECT AliasID
- FROM artists_alias
- WHERE Name = '".db_string($OldName)."'
- AND ArtistID = '$ArtistID'");
+ SELECT AliasID
+ FROM artists_alias
+ WHERE Name = '".db_string($OldName)."'
+ AND ArtistID = '$ArtistID'");
list($OldAliasID) = $DB->next_record(MYSQLI_NUM, false);
if (!$OldAliasID) {
- error('Could not find old alias ID');
+ error('Could not find old alias ID');
}
$DB->query("
- SELECT AliasID, ArtistID
- FROM artists_alias
- WHERE name LIKE '".db_string($NewName, true)."'");
+ SELECT AliasID, ArtistID
+ FROM artists_alias
+ WHERE name LIKE '".db_string($NewName, true)."'");
list($TargetAliasID, $TargetArtistID) = $DB->next_record(MYSQLI_NUM, false);
if (!$TargetAliasID || $TargetAliasID == $OldAliasID) {
- // no merge, just rename
- $DB->query("
- INSERT INTO artists_alias
- (ArtistID, Name, Redirect, UserID)
- VALUES
- ($ArtistID, '".db_string($NewName)."', '0', '$LoggedUser[ID]')");
- $TargetAliasID = $DB->inserted_id();
-
- $DB->query("
- UPDATE artists_alias
- SET Redirect = '$TargetAliasID'
- WHERE AliasID = '$OldAliasID'");
- $DB->query("
- UPDATE artists_group
- SET Name = '".db_string($NewName)."'
- WHERE ArtistID = '$ArtistID'");
-
- $DB->query("
- SELECT GroupID
- FROM torrents_artists
- WHERE AliasID = '$OldAliasID'");
- $Groups = $DB->collect('GroupID');
- $DB->query("
- UPDATE IGNORE torrents_artists
- SET AliasID = '$TargetAliasID'
- WHERE AliasID = '$OldAliasID'");
- $DB->query("
- DELETE FROM torrents_artists
- WHERE AliasID = '$OldAliasID'");
- if (!empty($Groups)) {
- foreach ($Groups as $GroupID) {
- $Cache->delete_value("groups_artists_$GroupID"); // Delete group artist cache
- Torrents::update_hash($GroupID);
- }
- }
-
- $DB->query("
- SELECT RequestID
- FROM requests_artists
- WHERE AliasID = '$OldAliasID'");
- $Requests = $DB->collect('RequestID');
- $DB->query("
- UPDATE IGNORE requests_artists
- SET AliasID = '$TargetAliasID'
- WHERE AliasID = '$OldAliasID'");
- $DB->query("
- DELETE FROM requests_artists
- WHERE AliasID = '$OldAliasID'");
- if (!empty($Requests)) {
- foreach ($Requests as $RequestID) {
- $Cache->delete_value("request_artists_$RequestID"); // Delete request artist cache
- Requests::update_sphinx_requests($RequestID);
- }
- }
- $TargetArtistID = $ArtistID;
-
-} else { // Merge stuff
- $DB->query("
- UPDATE artists_alias
- SET Redirect = '$TargetAliasID', ArtistID = '$TargetArtistID'
- WHERE AliasID = '$OldAliasID'");
- $DB->query("
- UPDATE artists_alias
- SET Redirect = '0'
- WHERE AliasID = '$TargetAliasID'");
- if ($ArtistID != $TargetArtistID) {
- $DB->query("
- UPDATE artists_alias
- SET ArtistID = '$TargetArtistID'
- WHERE ArtistID = '$ArtistID'");
- $DB->query("
- DELETE FROM artists_group
- WHERE ArtistID = '$ArtistID'");
- } else {
- $DB->query("
- UPDATE artists_group
- SET Name = '".db_string($NewName)."'
- WHERE ArtistID = '$ArtistID'");
- }
-
- $DB->query("
- SELECT GroupID
- FROM torrents_artists
- WHERE AliasID = '$OldAliasID'");
- $Groups = $DB->collect('GroupID');
- $DB->query("
- UPDATE IGNORE torrents_artists
- SET AliasID = '$TargetAliasID', ArtistID = '$TargetArtistID'
- WHERE AliasID = '$OldAliasID'");
- $DB->query("
- DELETE FROM torrents_artists
- WHERE AliasID = '$OldAliasID'");
- if (!empty($Groups)) {
- foreach ($Groups as $GroupID) {
- $Cache->delete_value("groups_artists_$GroupID");
- Torrents::update_hash($GroupID);
- }
- }
-
- $DB->query("
- SELECT RequestID
- FROM requests_artists
- WHERE AliasID = '$OldAliasID'");
- $Requests = $DB->collect('RequestID');
- $DB->query("
- UPDATE IGNORE requests_artists
- SET AliasID = '$TargetAliasID', ArtistID = '$TargetArtistID'
- WHERE AliasID = '$OldAliasID'");
- $DB->query("
- DELETE FROM requests_artists
- WHERE AliasID = '$OldAliasID'");
- if (!empty($Requests)) {
- foreach ($Requests as $RequestID) {
- $Cache->delete_value("request_artists_$RequestID");
- Requests::update_sphinx_requests($RequestID);
- }
- }
-
- if ($ArtistID != $TargetArtistID) {
- $DB->query("
- SELECT GroupID
- FROM torrents_artists
- WHERE ArtistID = '$ArtistID'");
- $Groups = $DB->collect('GroupID');
- $DB->query("
- UPDATE IGNORE torrents_artists
- SET ArtistID = '$TargetArtistID'
- WHERE ArtistID = '$ArtistID'");
- $DB->query("
- DELETE FROM torrents_artists
- WHERE ArtistID = '$ArtistID'");
- if (!empty($Groups)) {
- foreach ($Groups as $GroupID) {
- $Cache->delete_value("groups_artists_$GroupID");
- Torrents::update_hash($GroupID);
- }
- }
-
- $DB->query("
- SELECT RequestID
- FROM requests_artists
- WHERE ArtistID = '$ArtistID'");
- $Requests = $DB->collect('RequestID');
- $DB->query("
- UPDATE IGNORE requests_artists
- SET ArtistID = '$TargetArtistID'
- WHERE ArtistID = '$ArtistID'");
- $DB->query("
- DELETE FROM requests_artists
- WHERE ArtistID = '$ArtistID'");
- if (!empty($Requests)) {
- foreach ($Requests as $RequestID) {
- $Cache->delete_value("request_artists_$RequestID");
- Requests::update_sphinx_requests($RequestID);
- }
- }
-
- Comments::merge('artist', $ArtistID, $TargetArtistID);
- }
+ // no merge, just rename
+ $DB->query("
+ INSERT INTO artists_alias
+ (ArtistID, Name, Redirect, UserID)
+ VALUES
+ ($ArtistID, '".db_string($NewName)."', '0', '$LoggedUser[ID]')");
+ $TargetAliasID = $DB->inserted_id();
+
+ $DB->query("
+ UPDATE artists_alias
+ SET Redirect = '$TargetAliasID'
+ WHERE AliasID = '$OldAliasID'");
+ $DB->query("
+ UPDATE artists_group
+ SET Name = '".db_string($NewName)."'
+ WHERE ArtistID = '$ArtistID'");
+
+ $DB->query("
+ SELECT GroupID
+ FROM torrents_artists
+ WHERE AliasID = '$OldAliasID'");
+ $Groups = $DB->collect('GroupID');
+ $DB->query("
+ UPDATE IGNORE torrents_artists
+ SET AliasID = '$TargetAliasID'
+ WHERE AliasID = '$OldAliasID'");
+ $DB->query("
+ DELETE FROM torrents_artists
+ WHERE AliasID = '$OldAliasID'");
+ if (!empty($Groups)) {
+ foreach ($Groups as $GroupID) {
+ $Cache->delete_value("groups_artists_$GroupID"); // Delete group artist cache
+ Torrents::update_hash($GroupID);
+ }
+ }
+
+ $DB->query("
+ SELECT RequestID
+ FROM requests_artists
+ WHERE AliasID = '$OldAliasID'");
+ $Requests = $DB->collect('RequestID');
+ $DB->query("
+ UPDATE IGNORE requests_artists
+ SET AliasID = '$TargetAliasID'
+ WHERE AliasID = '$OldAliasID'");
+ $DB->query("
+ DELETE FROM requests_artists
+ WHERE AliasID = '$OldAliasID'");
+ if (!empty($Requests)) {
+ foreach ($Requests as $RequestID) {
+ $Cache->delete_value("request_artists_$RequestID"); // Delete request artist cache
+ Requests::update_sphinx_requests($RequestID);
+ }
+ }
+ $TargetArtistID = $ArtistID;
+
+} else { // Merge stuff
+ $DB->query("
+ UPDATE artists_alias
+ SET Redirect = '$TargetAliasID', ArtistID = '$TargetArtistID'
+ WHERE AliasID = '$OldAliasID'");
+ $DB->query("
+ UPDATE artists_alias
+ SET Redirect = '0'
+ WHERE AliasID = '$TargetAliasID'");
+ if ($ArtistID != $TargetArtistID) {
+ $DB->query("
+ UPDATE artists_alias
+ SET ArtistID = '$TargetArtistID'
+ WHERE ArtistID = '$ArtistID'");
+ $DB->query("
+ DELETE FROM artists_group
+ WHERE ArtistID = '$ArtistID'");
+ } else {
+ $DB->query("
+ UPDATE artists_group
+ SET Name = '".db_string($NewName)."'
+ WHERE ArtistID = '$ArtistID'");
+ }
+
+ $DB->query("
+ SELECT GroupID
+ FROM torrents_artists
+ WHERE AliasID = '$OldAliasID'");
+ $Groups = $DB->collect('GroupID');
+ $DB->query("
+ UPDATE IGNORE torrents_artists
+ SET AliasID = '$TargetAliasID', ArtistID = '$TargetArtistID'
+ WHERE AliasID = '$OldAliasID'");
+ $DB->query("
+ DELETE FROM torrents_artists
+ WHERE AliasID = '$OldAliasID'");
+ if (!empty($Groups)) {
+ foreach ($Groups as $GroupID) {
+ $Cache->delete_value("groups_artists_$GroupID");
+ Torrents::update_hash($GroupID);
+ }
+ }
+
+ $DB->query("
+ SELECT RequestID
+ FROM requests_artists
+ WHERE AliasID = '$OldAliasID'");
+ $Requests = $DB->collect('RequestID');
+ $DB->query("
+ UPDATE IGNORE requests_artists
+ SET AliasID = '$TargetAliasID', ArtistID = '$TargetArtistID'
+ WHERE AliasID = '$OldAliasID'");
+ $DB->query("
+ DELETE FROM requests_artists
+ WHERE AliasID = '$OldAliasID'");
+ if (!empty($Requests)) {
+ foreach ($Requests as $RequestID) {
+ $Cache->delete_value("request_artists_$RequestID");
+ Requests::update_sphinx_requests($RequestID);
+ }
+ }
+
+ if ($ArtistID != $TargetArtistID) {
+ $DB->query("
+ SELECT GroupID
+ FROM torrents_artists
+ WHERE ArtistID = '$ArtistID'");
+ $Groups = $DB->collect('GroupID');
+ $DB->query("
+ UPDATE IGNORE torrents_artists
+ SET ArtistID = '$TargetArtistID'
+ WHERE ArtistID = '$ArtistID'");
+ $DB->query("
+ DELETE FROM torrents_artists
+ WHERE ArtistID = '$ArtistID'");
+ if (!empty($Groups)) {
+ foreach ($Groups as $GroupID) {
+ $Cache->delete_value("groups_artists_$GroupID");
+ Torrents::update_hash($GroupID);
+ }
+ }
+
+ $DB->query("
+ SELECT RequestID
+ FROM requests_artists
+ WHERE ArtistID = '$ArtistID'");
+ $Requests = $DB->collect('RequestID');
+ $DB->query("
+ UPDATE IGNORE requests_artists
+ SET ArtistID = '$TargetArtistID'
+ WHERE ArtistID = '$ArtistID'");
+ $DB->query("
+ DELETE FROM requests_artists
+ WHERE ArtistID = '$ArtistID'");
+ if (!empty($Requests)) {
+ foreach ($Requests as $RequestID) {
+ $Cache->delete_value("request_artists_$RequestID");
+ Requests::update_sphinx_requests($RequestID);
+ }
+ }
+
+ Comments::merge('artist', $ArtistID, $TargetArtistID);
+ }
}
// Clear torrent caches
$DB->query("
- SELECT GroupID
- FROM torrents_artists
- WHERE ArtistID = '$ArtistID'");
+ SELECT GroupID
+ FROM torrents_artists
+ WHERE ArtistID = '$ArtistID'");
while (list($GroupID) = $DB->next_record()) {
- $Cache->delete_value("torrents_details_$GroupID");
+ $Cache->delete_value("torrents_details_$GroupID");
}
$Cache->delete_value("artist_$ArtistID");
diff --git a/sections/artist/takeedit.php b/sections/artist/takeedit.php
index 43b0496d6..98896f933 100644
--- a/sections/artist/takeedit.php
+++ b/sections/artist/takeedit.php
@@ -1,4 +1,4 @@
-query("
- INSERT INTO wiki_artists
- (PageID, Body, Image, UserID, Summary, Time)
- VALUES
- ('$ArtistID', '$Body', '$Image', '$UserID', '$Summary', '".sqltime()."')");
+ $DB->query("
+ INSERT INTO wiki_artists
+ (PageID, Body, Image, UserID, Summary, Time)
+ VALUES
+ ('$ArtistID', '$Body', '$Image', '$UserID', '$Summary', '".sqltime()."')");
} else { // revert
- $DB->query("
- INSERT INTO wiki_artists (PageID, Body, Image, UserID, Summary, Time)
- SELECT '$ArtistID', Body, Image, '$UserID', 'Reverted to revision $RevisionID', '".sqltime()."'
- FROM wiki_artists
- WHERE RevisionID = '$RevisionID'");
+ $DB->query("
+ INSERT INTO wiki_artists (PageID, Body, Image, UserID, Summary, Time)
+ SELECT '$ArtistID', Body, Image, '$UserID', 'Reverted to revision $RevisionID', '".sqltime()."'
+ FROM wiki_artists
+ WHERE RevisionID = '$RevisionID'");
}
$RevisionID = $DB->inserted_id();
// Update artists table (technically, we don't need the RevisionID column, but we can use it for a join which is nice and fast)
$DB->query("
- UPDATE artists_group
- SET
- ". (isset($VanityHouse) ? "VanityHouse = '$VanityHouse'," : '') ."
- RevisionID = '$RevisionID'
- WHERE ArtistID = '$ArtistID'");
+ UPDATE artists_group
+ SET
+ ". (isset($VanityHouse) ? "VanityHouse = '$VanityHouse'," : '') ."
+ RevisionID = '$RevisionID'
+ WHERE ArtistID = '$ArtistID'");
// There we go, all done!
$Cache->delete_value("artist_$ArtistID"); // Delete artist cache
diff --git a/sections/artist/takeeditrequest.php b/sections/artist/takeeditrequest.php
index 5acc6eb93..7168f2e34 100644
--- a/sections/artist/takeeditrequest.php
+++ b/sections/artist/takeeditrequest.php
@@ -3,7 +3,7 @@
authorize();
if (empty($_POST['artistid']) || !is_numeric($_POST['artistid'])) {
- error(403);
+ error(403);
}
$EditForumID = EDITING_FORUM_ID;
@@ -12,19 +12,19 @@
$ArtistID = intval($_POST['artistid']);
$DB->prepared_query("SELECT
- Name,
- VanityHouse
- FROM artists_group
- WHERE ArtistID = ?", $ArtistID);
+ Name,
+ VanityHouse
+ FROM artists_group
+ WHERE ArtistID = ?", $ArtistID);
if (!$DB->has_results()) {
- error(404);
+ error(404);
}
list($Name, $VanityHouseArtist) = $DB->fetch_record();
if ($VanityHouseArtist) {
- $Name .= ' [Vanity House]';
+ $Name .= ' [Vanity House]';
}
$sqltime = sqltime();
@@ -39,109 +39,109 @@
POST;
$DB->prepared_query("
- INSERT INTO forums_topics
- (Title, AuthorID, ForumID, LastPostTime, LastPostAuthorID, CreatedTime)
- Values
- (?, ?, ?, ?, ?, ?)", $Title, $BotID, $EditForumID, $sqltime, $BotID, $sqltime);
+ INSERT INTO forums_topics
+ (Title, AuthorID, ForumID, LastPostTime, LastPostAuthorID, CreatedTime)
+ Values
+ (?, ?, ?, ?, ?, ?)", $Title, $BotID, $EditForumID, $sqltime, $BotID, $sqltime);
$TopicID = $DB->inserted_id();
$DB->prepared_query("
- INSERT INTO forums_posts
- (TopicID, AuthorID, AddedTime, Body)
- VALUES
- (?, ?, ?, ?)", $TopicID, $BotID, $sqltime, $Body);
+ INSERT INTO forums_posts
+ (TopicID, AuthorID, AddedTime, Body)
+ VALUES
+ (?, ?, ?, ?)", $TopicID, $BotID, $sqltime, $Body);
$PostID = $DB->inserted_id();
$DB->prepared_query("
- UPDATE forums
- SET
- NumPosts = NumPosts + 1,
- NumTopics = NumTopics + 1,
- LastPostID = ?,
- LastPostAuthorID = ?,
- LastPostTopicID = ?,
- LastPostTime = ?
- WHERE ID = ?", $PostID, $BotID, $TopicID, $sqltime, $EditForumID);
+ UPDATE forums
+ SET
+ NumPosts = NumPosts + 1,
+ NumTopics = NumTopics + 1,
+ LastPostID = ?,
+ LastPostAuthorID = ?,
+ LastPostTopicID = ?,
+ LastPostTime = ?
+ WHERE ID = ?", $PostID, $BotID, $TopicID, $sqltime, $EditForumID);
$DB->prepared_query("
- UPDATE forums_topics
- SET
- NumPosts = NumPosts + 1,
- LastPostID = ?,
- LastPostAuthorID = ?,
- LastPostTime = ?
- WHERE ID = ?", $PostID, $BotID, $sqltime, $TopicID);
+ UPDATE forums_topics
+ SET
+ NumPosts = NumPosts + 1,
+ LastPostID = ?,
+ LastPostAuthorID = ?,
+ LastPostTime = ?
+ WHERE ID = ?", $PostID, $BotID, $sqltime, $TopicID);
// if cache exists modify it, if not, then it will be correct when selected next, and we can skip this block
if ($Forum = $Cache->get_value("forums_{$EditForumID}")) {
- list($Forum,,,$Stickies) = $Forum;
-
- // Remove the last thread from the index
- if (count($Forum) == TOPICS_PER_PAGE && $Stickies < TOPICS_PER_PAGE) {
- array_pop($Forum);
- }
-
- if ($Stickies > 0) {
- $Part1 = array_slice($Forum, 0, $Stickies, true); // Stickies
- $Part3 = array_slice($Forum, $Stickies, TOPICS_PER_PAGE - $Stickies - 1, true); // Rest of page
- } else {
- $Part1 = array();
- $Part3 = $Forum;
- }
- $Part2 = array($TopicID => array(
- 'ID' => $TopicID,
- 'Title' => $Title,
- 'AuthorID' => $BotID,
- 'IsLocked' => 0,
- 'IsSticky' => 0,
- 'NumPosts' => 1,
- 'LastPostID' => $PostID,
- 'LastPostTime' => $sqltime,
- 'LastPostAuthorID' => $BotID,
- 'NoPoll' => 1
- )); // Bumped
- $Forum = $Part1 + $Part2 + $Part3;
-
- $Cache->cache_value("forums_{$EditForumID}", array($Forum, '', 0, $Stickies), 0);
-
- // Update the forum root
- $Cache->begin_transaction('forums_list');
- $Cache->update_row($EditForumID, array(
- 'NumPosts' => '+1',
- 'NumTopics' => '+1',
- 'LastPostID' => $PostID,
- 'LastPostAuthorID' => $BotID,
- 'LastPostTopicID' => $TopicID,
- 'LastPostTime' => $sqltime,
- 'Title' => $Title,
- 'IsLocked' => 0,
- 'IsSticky' => 0
- ));
- $Cache->commit_transaction(0);
+ list($Forum,,,$Stickies) = $Forum;
+
+ // Remove the last thread from the index
+ if (count($Forum) == TOPICS_PER_PAGE && $Stickies < TOPICS_PER_PAGE) {
+ array_pop($Forum);
+ }
+
+ if ($Stickies > 0) {
+ $Part1 = array_slice($Forum, 0, $Stickies, true); // Stickies
+ $Part3 = array_slice($Forum, $Stickies, TOPICS_PER_PAGE - $Stickies - 1, true); // Rest of page
+ } else {
+ $Part1 = [];
+ $Part3 = $Forum;
+ }
+ $Part2 = array($TopicID => array(
+ 'ID' => $TopicID,
+ 'Title' => $Title,
+ 'AuthorID' => $BotID,
+ 'IsLocked' => 0,
+ 'IsSticky' => 0,
+ 'NumPosts' => 1,
+ 'LastPostID' => $PostID,
+ 'LastPostTime' => $sqltime,
+ 'LastPostAuthorID' => $BotID,
+ 'NoPoll' => 1
+ )); // Bumped
+ $Forum = $Part1 + $Part2 + $Part3;
+
+ $Cache->cache_value("forums_{$EditForumID}", array($Forum, '', 0, $Stickies), 0);
+
+ // Update the forum root
+ $Cache->begin_transaction('forums_list');
+ $Cache->update_row($EditForumID, array(
+ 'NumPosts' => '+1',
+ 'NumTopics' => '+1',
+ 'LastPostID' => $PostID,
+ 'LastPostAuthorID' => $BotID,
+ 'LastPostTopicID' => $TopicID,
+ 'LastPostTime' => $sqltime,
+ 'Title' => $Title,
+ 'IsLocked' => 0,
+ 'IsSticky' => 0
+ ));
+ $Cache->commit_transaction(0);
}
else {
- // If there's no cache, we have no data, and if there's no data
- $Cache->delete_value('forums_list');
+ // If there's no cache, we have no data, and if there's no data
+ $Cache->delete_value('forums_list');
}
$Cache->begin_transaction("thread_{$TopicID}_catalogue_0");
$Post = [
- 'ID' => $PostID,
- 'AuthorID' => $BotID,
- 'AddedTime' => $sqltime,
- 'Body' => $Body,
- 'EditedUserID' => 0,
- 'EditedTime' => '0000-00-00 00:00:00'
+ 'ID' => $PostID,
+ 'AuthorID' => $BotID,
+ 'AddedTime' => $sqltime,
+ 'Body' => $Body,
+ 'EditedUserID' => 0,
+ 'EditedTime' => '0000-00-00 00:00:00'
];
$Cache->insert('', $Post);
$Cache->commit_transaction(0);
$Cache->begin_transaction("thread_{$TopicID}_info");
$Cache->update_row(false, [
- 'Posts' => '+1',
- 'LastPostAuthorID' => $BotID,
- 'LastPostTime' => $sqltime
+ 'Posts' => '+1',
+ 'LastPostAuthorID' => $BotID,
+ 'LastPostTime' => $sqltime
]);
$Cache->commit_transaction(0);
diff --git a/sections/artist/vote_similar.php b/sections/artist/vote_similar.php
index da2ec523c..104196b63 100644
--- a/sections/artist/vote_similar.php
+++ b/sections/artist/vote_similar.php
@@ -5,34 +5,34 @@
$Way = db_string($_GET['way']);
if (!is_number($SimilarID) || !is_number($ArtistID)) {
- error(404);
+ error(404);
}
if (!in_array($Way, array('up', 'down'))) {
- error(404);
+ error(404);
}
$DB->query("
- SELECT SimilarID
- FROM artists_similar_votes
- WHERE SimilarID='$SimilarID'
- AND UserID='$UserID'
- AND Way='$Way'");
+ 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
+ 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
}
$Location = (empty($_SERVER['HTTP_REFERER'])) ? "artist.php?id={$ArtistID}" : $_SERVER['HTTP_REFERER'];
diff --git a/sections/better/index.php b/sections/better/index.php
index b2bc799bb..8dce26c5b 100644
--- a/sections/better/index.php
+++ b/sections/better/index.php
@@ -1,54 +1,21 @@
-
diff --git a/sections/better/missing.php b/sections/better/missing.php
new file mode 100644
index 000000000..b89988390
--- /dev/null
+++ b/sections/better/missing.php
@@ -0,0 +1,363 @@
+ 'torrents_bad_tags',
+ 'folders' => 'torrents_bad_folders',
+ 'files' => 'torrents_bad_files',
+ 'lineage' => 'torrents_missing_lineage'
+];
+
+if (!empty($_GET['userid']) && is_number($_GET['userid'])) {
+ if (check_perms('users_override_paranoia')) {
+ $userId = $_GET['userid'];
+ } else {
+ error(403);
+ }
+} else {
+ $userId = $LoggedUser['ID'];
+}
+
+if (empty($_GET['type']) || !in_array($_GET['type'], ['checksum', 'tags', 'folders', 'files', 'lineage', 'artwork', 'artistimg', 'artistdesc'])) {
+ $_GET['type'] = 'checksum';
+}
+$type = $_GET['type'];
+
+if (empty($_GET['filter']) || !in_array($_GET['filter'], ['snatched', 'uploaded'])) {
+ $_GET['filter'] = 'all';
+}
+$filter = $_GET['filter'];
+
+if (empty($_GET['search'])) {
+ $_GET['search'] = '';
+}
+$search = $_GET['search'];
+
+if (check_perms('admin_reports') && in_array($type, array_keys($badMap)) && !empty($_GET['remove']) && is_number($_GET['remove'])) {
+ $remove = $_GET['remove'];
+ $DB->prepared_query(sprintf('
+ DELETE FROM %s
+ WHERE TorrentID = ?', $badMap[$type]), $remove);
+ $DB->prepared_query('
+ SELECT GroupID
+ FROM torrents
+ WHERE ID = ?', $remove);
+ list($groupId) = $DB->next_record();
+ $Cache->delete_value('torrents_details_'.$groupId);
+}
+
+$query = '';
+$joins = [];
+$where = [];
+$order = '';
+$params = [];
+$joinparams = [];
+
+switch ($type) {
+ case 'checksum':
+ $query = '
+ SELECT SQL_CALC_FOUND_ROWS t.ID AS TorrentID, t.GroupID
+ FROM torrents t
+ INNER JOIN torrents_group tg ON tg.ID = t.GroupID';
+ $order = 'ORDER BY t.Time ASC';
+ $where[] = "t.HasLogDB = '1' AND t.LogChecksum = '0'";
+ $mode = 'torrents';
+ switch ($filter) {
+ case 'snatched':
+ $joins[] = 'INNER JOIN xbt_snatched as x ON x.fid = t.TorrentID AND x.uid = ?';
+ $joinparams[] = $userId;
+ break;
+ case 'uploaded':
+ $where[] = 't.UserID = ?';
+ $params[] = $userId;
+ break;
+ }
+ break;
+ case 'tags':
+ case 'folders':
+ case 'files':
+ case 'lineage':
+ $query = sprintf('
+ SELECT SQL_CALC_FOUND_ROWS bad.TorrentID, t.GroupID
+ FROM %s AS bad
+ INNER JOIN torrents t ON t.ID = bad.TorrentID
+ INNER JOIN torrents_group tg ON tg.ID = t.GroupID', $badMap[$type]);
+ $order = 'ORDER BY bad.TimeAdded ASC';
+ $mode = 'torrents';
+ switch ($filter) {
+ case 'snatched':
+ $joins[] = 'INNER JOIN xbt_snatched as x ON x.fid = bad.TorrentID AND x.uid = ?';
+ $joinparams[] = $userId;
+ break;
+ case 'uploaded':
+ $where[] = 't.UserID = ?';
+ $params[] = $userId;
+ break;
+ }
+ break;
+ case 'artwork':
+ $query = '
+ SELECT SQL_CALC_FOUND_ROWS tg.ID, tg.Name
+ FROM torrents_group tg';
+ $where[] = "tg.CategoryID = 1 AND coalesce(wt.Image, tg.WikiImage) = ''";
+ $order = 'ORDER BY tg.Name';
+ $joins[] = 'LEFT JOIN wiki_torrents wt ON wt.RevisionID = tg.RevisionID';
+ $mode = 'groups';
+ break;
+ case 'artistimg':
+ $query = '
+ SELECT SQL_CALC_FOUND_ROWS a.ArtistID, a.Name
+ FROM artists_group a';
+ $where[] = "(wa.Image IS NULL OR wa.Image = '')";
+ $order = 'ORDER BY a.Name';
+ $joins[] = 'LEFT JOIN wiki_artists wa ON wa.RevisionID = a.RevisionID';
+ $mode = 'artists';
+ break;
+ case 'artistdesc':
+ $query = '
+ SELECT SQL_CALC_FOUND_ROWS a.ArtistID, a.Name
+ FROM artists_group a';
+ $where[] = "(wa.Body IS NULL OR wa.Body = '')";
+ $order = 'ORDER BY a.Name';
+ $joins[] = 'LEFT JOIN wiki_artists wa ON wa.RevisionID = a.RevisionID';
+ $mode = 'artists';
+ break;
+}
+
+if ($search !== '') {
+ switch ($mode) {
+ case 'torrents':
+ $where[] = '(
+ tg.Name LIKE ?
+ OR t.Description LIKE ?
+ OR coalesce(wt.Body, tg.WikiBody) LIKE ?
+ OR tg.TagList LIKE ?
+ )';
+ $searchString = "%$search%";
+ $params = array_merge($params, array_fill(0, 4, $searchString));
+ $joins[] = 'LEFT JOIN wiki_torrents wt ON wt.RevisionID = tg.RevisionID';
+ break;
+ case 'groups':
+ $where[] = '(
+ tg.Name LIKE ?
+ OR coalesce(wt.Body, tg.WikiBody) LIKE ?
+ OR tg.TagList LIKE ?
+ )';
+ $searchString = "%$search%";
+ $params = array_merge($params, array_fill(0, 3, $searchString));
+ break;
+ case 'artists':
+ $where[] = 'a.Name LIKE ?';
+ $searchString = "%$search%";
+ $params = array_merge($params, [$searchString]);
+ break;
+ }
+}
+
+if (count($where) > 0) {
+ $where = 'WHERE '.implode(' AND ', $where);
+} else {
+ $where = '';
+}
+
+$page = !empty($_GET['page']) ? intval($_GET['page']) : 1;
+$page = max(1, $page);
+$limit = TORRENTS_PER_PAGE;
+$offset = TORRENTS_PER_PAGE * ($page - 1);
+
+$joins = implode("\n", $joins);
+$params = array_merge($joinparams, $params);
+$query = sprintf('
+%s
+%s
+%s
+%s LIMIT %s OFFSET %s', $query, $joins, $where, $order, $limit, $offset);
+
+$qId = $DB->prepared_query($query, ...$params);
+$DB->prepared_query('SELECT FOUND_ROWS()');
+list($resultCount) = $DB->next_record();
+
+$pages = Format::get_pages($page, $resultCount, TORRENTS_PER_PAGE);
+
+switch ($mode) {
+ case 'torrents':
+ if ($resultCount > 0) {
+ $DB->set_query_id($qId);
+ $torrents = $DB->to_array('TorrentID', MYSQLI_ASSOC);
+ } else {
+ $torrents = [];
+ }
+ $groups = array_map(function ($t) { return $t['GroupID']; }, $torrents);
+ $results = Torrents::get_groups($groups);
+ break;
+ case 'groups':
+ if ($resultCount > 0) {
+ $DB->set_query_id($qId);
+ $groups = $DB->to_array('ID', MYSQLI_ASSOC);
+ foreach (Artists::get_artists(array_keys($groups)) as $groupId => $data) {
+ $groups[$groupId]['Artists'] = [];
+ $groups[$groupId]['ExtendedArtists'] = [];
+ foreach ([1, 4, 6] as $importance) {
+ if (isset($data[$importance])) {
+ $groups[$groupId]['Artists'] = array_merge($groups[$groupId]['Artists'], $data[$importance]);
+ }
+ }
+ }
+ } else {
+ $groups = [];
+ }
+ break;
+ case 'artists':
+ if ($resultCount > 0) {
+ $DB->set_query_id($qId);
+ $artists = $DB->to_array('ArtistID', MYSQLI_ASSOC);
+ } else {
+ $artists = [];
+ }
+ break;
+}
+
+View::show_header('Missing Search');
+
+function selected($val) {
+ return $val ? ' selected="selected"' : '';
+}
+?>
+
+
-
- Request an Edit:
-
-
-
-
+
- Please detail all information that needs to be edited for the artist. Include all relevant links (discogs, musicbrainz, etc.).
- This will not generate a report, but will create a thread in the Editing forum.
+
+
+ Request an Edit:
+
+
+
+
+
-
+ Please detail all information that needs to be edited for the artist. Include all relevant links (discogs, musicbrainz, etc.).
+ This will not generate a report, but will create a thread in the Editing forum.
- What this form can be used for:
-
-
-
- Renaming the artist -
- Non-redirecting or redirecting aliases -
- Adding/Deleting aliases -
- etc... -
Do NOT use this form for individual torrents or torrent groups. For individual - torrents, use the torrent report feature. For torrent groups, go to their respective - pages and use the edit request feature.
-
-
+ Edit Details
+ What this form can be used for: + +-
+
- Renaming the artist +
- Non-redirecting or redirecting aliases +
- Adding/Deleting aliases +
- etc... +
Do NOT use this form for individual torrents or torrent groups. For individual + torrents, use the torrent report feature. For torrent groups, go to their respective + pages and use the edit request feature.
+
+
- Edit Details
-
-
-
-
+
+
+ +
+
+
+
diff --git a/sections/better/single.php b/sections/better/single.php
index fa95e06b7..4ac7a0522 100644
--- a/sections/better/single.php
+++ b/sections/better/single.php
@@ -1,75 +1,82 @@
-get_value('better_single_groupids')) === false) {
- $DB->query("
- SELECT
- t.ID AS TorrentID,
- t.GroupID AS GroupID
- FROM xbt_files_users AS x
- JOIN torrents AS t ON t.ID=x.fid
- WHERE t.Format='FLAC'
- GROUP BY x.fid
- HAVING COUNT(x.uid) = 1
- ORDER BY t.LogScore DESC, t.Time ASC
- LIMIT 30");
+ $DB->query("
+ SELECT
+ t.ID AS TorrentID,
+ t.GroupID AS GroupID
+ FROM xbt_files_users AS x
+ JOIN torrents AS t ON t.ID=x.fid
+ WHERE t.Format='FLAC'
+ GROUP BY x.fid
+ HAVING COUNT(x.uid) = 1
+ ORDER BY t.LogScore DESC, t.Time ASC
+ LIMIT 30");
- $Results = $DB->to_pair('GroupID', 'TorrentID', false);
- $Cache->cache_value('better_single_groupids', $Results, 30 * 60);
+ $Results = $DB->to_pair('GroupID', 'TorrentID', false);
+ $Cache->cache_value('better_single_groupids', $Results, 30 * 60);
}
$Groups = Torrents::get_groups(array_keys($Results));
View::show_header('Single seeder FLACs');
?>
-
+Missing
+ + +
+
+
+
+
+ $info) {
+ $group = $results[$info['GroupID']];
+ $groupId = $group['ID'];
+ $groupYear = $group['Year'];
+ $groupName = $group['Name'];
+ $groupFlags = isset($group['Flags']) ? $group['Flags'] : ['IsSnatched' => false];
+ $groupTorrents = isset($group['Torrents']) ? $group['Torrents'] : [];
+ $releaseType = $group['ReleaseType'];
+ $tags = new Tags($group['TagList']);
+ $extendedArtists = $group['ExtendedArtists'];
+
+ if (!empty($extendedArtists[1]) || !empty($extendedArtists[4]) || !empty($extendedArtists[5]) || !empty($extendedArtists[6])) {
+ unset($extendedArtists[2]);
+ unset($extendedArtists[3]);
+ $displayName = Artists::display_artists($extendedArtists);
+ } else {
+ $displayName = '';
+ }
+ $displayName .= "$groupName";
+ if ($groupYear > 0) {
+ $displayName .= " [$groupYear]";
+ }
+ if ($releaseType > 0) {
+ $displayName .= ' ['.$ReleaseTypes[$releaseType].']';
+ }
+
+ $extraInfo = Torrents::torrent_info($groupTorrents[$torrent]);
+ if ($extraInfo) {
+ $displayName .= " - $extraInfo";
+ }
+?>
+
+
+
+
+
+ There are remaining 1 && check_perms('zip_downloader')) { + $idList = implode(',', array_map(function ($t) { return $t['TorrentID']; }, $torrents)); +?> + + Download All + +
+| + + DL + + + + X + + + | +
| - | +
| + |
-
-
+
-
diff --git a/sections/better/transcode.php b/sections/better/transcode.php
index 0b542ce30..cc2f88186 100644
--- a/sections/better/transcode.php
+++ b/sections/better/transcode.php
@@ -1,186 +1,359 @@
- 3) {
- error(0);
+ 'V0 (VBR)', 'v2' => 'V2 (VBR)', '320' => '320'];
-if ($_GET['type'] === '3') {
- $List = "!(v0 | v2 | 320)";
-} else {
- $List = '!'.$Options[$_GET['type']];
- if ($_GET['type'] !== '0') {
- $_GET['type'] = display_str($_GET['type']);
- }
+function transcode_init_sphql() {
+ // Initializes a basic SphinxqlQuery object
+ $sqlQL = new SphinxqlQuery();
+ $sqlQL->select('groupid')
+ ->from('better_transcode')
+ ->where('logscore', 100)
+ ->where_match('FLAC', 'format')
+ ->order_by('RAND()')
+ ->limit(0, TORRENTS_PER_PAGE, TORRENTS_PER_PAGE);
+ if (in_array($_GET['target'], ['v0', 'v2', '320'])) {
+ // V0/V2/320 is missing
+ $sqlQL->where_match('!'.$_GET['target'], 'encoding', false);
+ } elseif ($_GET['target'] === 'all') {
+ // all transcodes are missing
+ $sqlQL->where_match('!(v0 | v2 | 320)', 'encoding', false);
+ } else {
+ // any transcode is missing
+ $sqlQL->where_match('!(v0 v2 320)', 'encoding', false);
+ }
+ if (!empty($_GET['search'])) {
+ $sqlQL->where_match($_GET['search'], '(groupname,artistname,year,taglist)');
+ }
+ return $sqlQL;
}
-$SphQL = new SphinxqlQuery();
-$SphQL->select('id, groupid')
- ->from('better_transcode')
- ->where('logscore', 100)
- ->where_match('FLAC', 'format')
- ->where_match($List, 'encoding', false)
- ->order_by('RAND()')
- ->limit(0, TORRENTS_PER_PAGE, TORRENTS_PER_PAGE);
-if (!empty($_GET['search'])) {
- $SphQL->where_match($_GET['search'], '(groupname,artistname,year,taglist)');
+
+function transcode_parse_groups($groups) {
+ $torrentGroups = [];
+ foreach ($groups as $groupID => $group) {
+ if (empty($group['Torrents'])) {
+ continue;
+ }
+ foreach ($group['Torrents'] as $torrentID => $torrent) {
+ $remIdent = "$torrent[Media] $torrent[RemasterYear] $torrent[RemasterTitle] $torrent[RemasterRecordLabel] $torrent[RemasterCatalogueNumber]";
+ if (!isset($torrentGroups[$groupID])) {
+ $torrentGroups[$groupID] = [
+ 'Year' => $group['Year'],
+ 'ExtendedArtists' => $group['ExtendedArtists'],
+ 'Name' => $group['Name'],
+ 'ReleaseType' => $group['ReleaseType'],
+ 'TagList' => $group['TagList'],
+ 'Editions' => []
+ ];
+ }
+ if (!isset($torrentGroups[$groupID]['Editions'][$remIdent])) {
+ if ($torrent['Remastered'] && $torrent['RemasterYear'] != 0) {
+ $editionName = $torrent['RemasterYear'];
+ $addExtra = ' - ';
+ if ($torrent['RemasterRecordLabel']) {
+ $editionName .= $addExtra.display_str($torrent['RemasterRecordLabel']);
+ $addExtra = ' / ';
+ }
+ if ($torrent['RemasterCatalogueNumber']) {
+ $editionName .= $addExtra.display_str($torrent['RemasterCatalogueNumber']);
+ $addExtra = ' / ';
+ }
+ if ($torrent['RemasterTitle']) {
+ $editionName .= $addExtra.display_str($torrent['RemasterTitle']);
+ $addExtra = ' / ';
+ }
+ $editionName .= $addExtra.display_str($torrent['Media']);
+ } else {
+ $addExtra = ' / ';
+ if (!$torrent['Remastered']) {
+ $editionName = 'Original Release';
+ if ($group['RecordLabel']) {
+ $editionName .= $addExtra.$group['RecordLabel'];
+ $addExtra = ' / ';
+ }
+ if ($group['CatalogueNumber']) {
+ $editionName .= $addExtra.$group['CatalogueNumber'];
+ $addExtra = ' / ';
+ }
+ } else {
+ $editionName = 'Unknown Release(s)';
+ }
+ $editionName .= $addExtra.display_str($torrent['Media']);
+ }
+ $torrentGroups[$groupID]['Editions'][$remIdent] = [
+ 'FlacIDs' => [],
+ 'MP3s' => [],
+ 'Media' => $torrent['Media'],
+ 'EditionName' => $editionName,
+ 'FLACIsSnatched' => false
+ ];
+ }
+
+ if ($torrent['Format'] == 'MP3') {
+ $torrentGroups[$groupID]['Editions'][$remIdent]['MP3s'][$torrent['Encoding']] = true;
+ } elseif ($torrent['Format'] == 'FLAC' && ($torrent['LogScore'] == 100 || $torrent['Media'] != 'CD')
+ && !isset($torrentGroups[$groupID]['Editions'][$remIdent]['FlacIDs'][$torrentID])) {
+ $torrentGroups[$groupID]['Editions'][$remIdent]['FlacIDs'][$torrentID] = true;
+ $torrentGroups[$groupID]['Editions'][$remIdent]['FLACIsSnatched'] = $torrentGroups[$groupID]['Editions'][$remIdent]['FLACIsSnatched'] || $torrent['IsSnatched'];
+ }
+ }
+ }
+ return $torrentGroups;
}
-$SphQLResult = $SphQL->query();
-$TorrentCount = $SphQLResult->get_meta('total');
+$groups = [];
+$resultCount = 0;
+if (in_array($_GET['filter'], ['all', 'uploaded'])) {
+ $sqlQL = transcode_init_sphql();
+ if ($_GET['filter'] === 'uploaded') {
+ $sqlQL->where('uploader', $userId);
+ }
+
+ $sqlQLResult = $sqlQL->query();
+ $resultCount = $sqlQLResult->get_meta('total');
+ if ($resultCount != 0) {
+ $results = $sqlQLResult->collect('groupid');
+ $groups = Torrents::get_groups(array_values($results));
+ $groups = transcode_parse_groups($groups);
+ }
+ unset($sqlQL, $sqlQLResult, $results);
+} elseif (in_array($_GET['filter'], ['snatched', 'seeding'])) {
+ // Read all snatched/seeding torrents
+ $table = $_GET['filter'] === 'seeding' ? 'xbt_files_users' : 'xbt_snatched';
+ $extraFilter = $_GET['filter'] === 'seeding' ? 'AND x.active = 1 AND x.Remaining = 0' : '';
+ $DB->prepared_query(sprintf("
+ SELECT t.GroupID, x.fid
+ FROM %s AS x
+ JOIN torrents AS t ON t.ID=x.fid
+ JOIN torrents_group AS tg ON tg.ID = t.GroupID
+ WHERE t.Format = 'FLAC'
+ AND (t.LogScore = '100' OR t.Media != 'CD')
+ AND tg.CategoryID = 1
+ AND x.uid = ?
+ %s", $table, $extraFilter), $userId);
+ $snatched = $DB->to_array();
+ shuffle($snatched); // randomize results
+ while ($resultCount < TORRENTS_PER_PAGE && count($snatched) > 0) {
+ // we throw TORRENTS_PER_PAGE results into Sphinx until we have at least TORRENTS_PER_PAGE results (or no snatches left)
+ $snatchedTmp = array_slice($snatched, 0, TORRENTS_PER_PAGE);
+ $snatched = array_slice($snatched, TORRENTS_PER_PAGE);
-if ($TorrentCount == 0) {
- error('No results found!');
+ $sqlQL = transcode_init_sphql();
+ $sqlQL->where('groupid', array_map(function ($row) { return $row['GroupID']; }, $snatchedTmp));
+
+ $sqlQLResult = $sqlQL->query();
+ $resultsTmp = $sqlQLResult->collect('groupid');
+ $groupsTmp = Torrents::get_groups(array_values($resultsTmp));
+ $groupsTmp = transcode_parse_groups($groupsTmp);
+ // Since we're asking Sphinxql about groups and remidents, the result can/will contain different editions that are transcodable but weren't snatched, so let's filter them out
+ foreach ($groupsTmp as $groupID => $group) {
+ foreach ($group['Editions'] as $remIdent => $edition) {
+ $editionSnatched = false;
+ foreach ($snatchedTmp as $snatchedTmpE) {
+ if (isset($edition['FlacIDs'][$snatchedTmpE['fid']])) {
+ $editionSnatched = true;
+ break;
+ }
+ }
+ if (!$editionSnatched || count($edition['MP3s']) === 3) {
+ unset($groupsTmp[$groupID]['Editions'][$remIdent]);
+ }
+ }
+ $resultCount += count($groupsTmp[$groupID]['Editions']);
+ if (count($groupsTmp[$groupID]['Editions']) === 0) {
+ unset($groupsTmp[$groupID]);
+ }
+ }
+ $groups = $groupsTmp + $groups;
+ unset($snatchedTmp, $sqlQL, $sqlQLResult, $resultsTmp, $groupsTmp);
+ }
}
-$Results = $SphQLResult->to_array('groupid');
-$Groups = Torrents::get_groups(array_keys($Results));
-$TorrentGroups = array();
-foreach ($Groups as $GroupID => $Group) {
- if (empty($Group['Torrents'])) {
- unset($Groups[$GroupID]);
- continue;
- }
- foreach ($Group['Torrents'] as $Torrent) {
- $TorRemIdent = "$Torrent[Media] $Torrent[RemasterYear] $Torrent[RemasterTitle] $Torrent[RemasterRecordLabel] $Torrent[RemasterCatalogueNumber]";
- if (!isset($TorrentGroups[$Group['ID']])) {
- $TorrentGroups[$Group['ID']] = array(
- $TorRemIdent => array(
- 'FlacID' => 0,
- 'Formats' => array(),
- 'RemasterTitle' => $Torrent['RemasterTitle'],
- 'RemasterYear' => $Torrent['RemasterYear'],
- 'RemasterRecordLabel' => $Torrent['RemasterRecordLabel'],
- 'RemasterCatalogueNumber' => $Torrent['RemasterCatalogueNumber'],
- 'IsSnatched' => false
- )
- );
- } elseif (!isset($TorrentGroups[$Group['ID']][$TorRemIdent])) {
- $TorrentGroups[$Group['ID']][$TorRemIdent] = array(
- 'FlacID' => 0,
- 'Formats' => array(),
- 'RemasterTitle' => $Torrent['RemasterTitle'],
- 'RemasterYear' => $Torrent['RemasterYear'],
- 'RemasterRecordLabel' => $Torrent['RemasterRecordLabel'],
- 'RemasterCatalogueNumber' => $Torrent['RemasterCatalogueNumber'],
- 'IsSnatched' => false
- );
- }
- if ($Torrent['Format'] == 'MP3' && isset($EncodingKeys[$Torrent['Encoding']])) {
- $TorrentGroups[$Group['ID']][$TorRemIdent]['Formats'][$Torrent['Encoding']] = true;
- } elseif ($TorrentGroups[$Group['ID']][$TorRemIdent]['FlacID'] == 0 && $Torrent['Format'] == 'FLAC' && ($Torrent['LogScore'] == 100 || $Torrent['Media'] != 'CD')) {
- $TorrentGroups[$Group['ID']][$TorRemIdent]['FlacID'] = $Torrent['ID'];
- $TorrentGroups[$Group['ID']][$TorRemIdent]['IsSnatched'] = $Torrent['IsSnatched'];
- }
- }
+$counter = [
+ 'total' => 0, //how many FLAC torrents can be transcoded?
+ 'miss_total' => 0, //how many transcodes are missing?
+ 'miss_V0 (VBR)' => 0, //how many V0 transcodes are missing?
+ 'miss_V2 (VBR)' => 0, //how many V2 transcodes are missing?
+ 'miss_320' => 0, //how many 320 transcodes are missing?
+ 'ids' => []
+];
+foreach ($groups as $groupID => $group) {
+ foreach ($group['Editions'] as $remIdent => $edition) {
+ if (count($edition['FlacIDs']) === 0 //no FLAC in this group
+ || (!empty($edition['MP3s']) && $_GET['target'] === 'all') //at least one transcode present when we only wanted groups containing no transcodes at all
+ || (isset($encodings[$_GET['target']]) && isset($edition['MP3s'][$encodings[$_GET['target']]])) //the transcode we asked for is already there
+ || count($edition['MP3s']) === 3) //all 3 transcodes are there already (this can happen due to the caching of Sphinx's better_transcode table)
+ {
+ unset($groups[$groupID]['Editions'][$remIdent]);
+ continue;
+ }
+ $edition_miss = 0; //number of transcodes missing in this edition
+ foreach ($encodings as $Encoding) {
+ if (!isset($edition['MP3s'][$Encoding])) {
+ ++$edition_miss;
+ ++$counter['miss_'.$Encoding];
+ }
+ }
+ $counter['miss_total'] += $edition_miss;
+ $counter['total'] += (bool)$edition_miss;
+ if ($edition_miss) {
+ foreach ($edition['FlacIDs'] as $id => $_) {
+ $counter['ids'][] = $id;
+ }
+ }
+ }
}
View::show_header('Transcode Search');
+
+function selected($val) {
+ return $val ? ' selected="selected"' : '';
+}
?>
| Torrent | -
| Torrent | +
| - - DL - - - - | -
-
-
-
-
-
+
+
-
diff --git a/sections/blog/blog_page.php b/sections/blog/blog_page.php
index 113a108c5..812f94ae1 100644
--- a/sections/blog/blog_page.php
+++ b/sections/blog/blog_page.php
@@ -3,125 +3,125 @@
View::show_header('Blog','bbcode');
if (check_perms('admin_manage_blog')) {
- $BlogID = 0;
- $Title = '';
- $Body = '';
- $ThreadID = null;
- if (!empty($_GET['action']) && $_GET['action'] === 'editblog' && !empty($_GET['id'])) {
- $BlogID = intval($_GET['id']);
- $DB->prepared_query("
+ $BlogID = 0;
+ $Title = '';
+ $Body = '';
+ $ThreadID = null;
+ if (!empty($_GET['action']) && $_GET['action'] === 'editblog' && !empty($_GET['id'])) {
+ $BlogID = intval($_GET['id']);
+ $DB->prepared_query("
SELECT Title, Body, ThreadID
FROM blog
WHERE ID = ?", $BlogID);
- list($Title, $Body, $ThreadID) = $DB->fetch_record(0, 1);
- $ThreadID = $ThreadID ?? 0;
- }
- ?>
- -
| Torrent | -V2 | -V0 | -320 | -- - DL - - - - - | -YES' : 'NO'?> | -YES' : 'NO'?> | -YES' : 'NO'?> | - - +
| Torrent | +V2 | +V0 | +320 | +
| No results found! | + + DL + + + + + | +YES' : 'NO')?> | +YES' : 'NO')?> | +YES' : 'NO')?> | + + -
-
+
+
+
-
-
- + -
- get_value('blog')) {
- $DB->prepared_query("
- SELECT
- b.ID,
- um.Username,
- b.UserID,
- b.Title,
- b.Body,
- b.Time,
- b.ThreadID
- FROM blog AS b
- LEFT JOIN users_main AS um ON b.UserID = um.ID
- ORDER BY Time DESC
- LIMIT 20");
- $Blog = $DB->to_array();
- $Cache->cache_value('blog', $Blog, 1209600);
- }
+ ?>
+
\ No newline at end of file
+?>
diff --git a/sections/blog/dead_thread.php b/sections/blog/dead_thread.php
index 894475973..853c40e74 100644
--- a/sections/blog/dead_thread.php
+++ b/sections/blog/dead_thread.php
@@ -3,15 +3,15 @@
authorize();
if (!isset($_GET['id'])) {
- error('Please provide an ID for a blog post to remove the thread link from.');
+ error('Please provide an ID for a blog post to remove the thread link from.');
}
$ID = intval($_GET['id']);
G::$DB->prepared_query('UPDATE blog SET ThreadID = NULL WHERE ID = ? ', $ID);
if (G::$DB->affected_rows() > 0) {
- $Cache->delete_value('blog');
- $Cache->delete_value('feed_blog');
+ $Cache->delete_value('blog');
+ $Cache->delete_value('feed_blog');
}
-header('Location: blog.php');
\ No newline at end of file
+header('Location: blog.php');
diff --git a/sections/blog/delete_blog.php b/sections/blog/delete_blog.php
index e9deb92b7..967e1de2b 100644
--- a/sections/blog/delete_blog.php
+++ b/sections/blog/delete_blog.php
@@ -2,13 +2,13 @@
authorize();
if (empty($_GET['id'])) {
- error('You must provide an ID of a blog to delete');
+ error('You must provide an ID of a blog to delete');
}
$BlogID = intval($_GET['id']);
if ($BlogID > 0) {
- $DB->prepared_query("DELETE FROM blog WHERE ID = ?", $BlogID);
- $Cache->delete_value('blog');
- $Cache->delete_value('feed_blog');
+ $DB->prepared_query("DELETE FROM blog WHERE ID = ?", $BlogID);
+ $Cache->delete_value('blog');
+ $Cache->delete_value('feed_blog');
}
header('Location: blog.php');
diff --git a/sections/blog/index.php b/sections/blog/index.php
index 9003e05c2..7c5df7138 100644
--- a/sections/blog/index.php
+++ b/sections/blog/index.php
@@ -1,29 +1,29 @@
- 0) {
- $DB->prepared_query("
- SELECT ForumID
- FROM forums_topics
- WHERE ID = ?", $ThreadID);
- if (!$DB->has_results()) {
- error('No such thread exists!');
- }
+ $DB->prepared_query("
+ SELECT ForumID
+ FROM forums_topics
+ WHERE ID = ?", $ThreadID);
+ if (!$DB->has_results()) {
+ error('No such thread exists!');
+ }
}
elseif ($ThreadID === '') {
- $ThreadID = Misc::create_thread(ANNOUNCEMENT_FORUM_ID, G::$LoggedUser['ID'], $_POST['title'], $_POST['body']);
- if ($ThreadID < 1) {
- error(0);
- }
+ $ThreadID = Misc::create_thread(ANNOUNCEMENT_FORUM_ID, G::$LoggedUser['ID'], $_POST['title'], $_POST['body']);
+ if ($ThreadID < 1) {
+ error(0);
+ }
}
else {
- $ThreadID = null;
+ $ThreadID = null;
}
$Important = isset($_POST['important']) ? '1' : '0';
if ($BlogID > 0) {
- $DB->prepared_query("
- UPDATE blog
- SET
- Title = ?,
- Body = ?,
- ThreadID = ?,
- Important = ?
- WHERE ID = ?", $_POST['title'], $_POST['body'], $ThreadID, $Important, $BlogID);
- $Cache->delete_value('blog');
- $Cache->delete_value('feed_blog');
- if ($Important == '1') {
- $Cache->delete_value('blog_latest_id');
- }
- if (isset($_POST['subscribe']) && $ThreadID !== null && $ThreadID > 0) {
- $DB->prepared_query("
- INSERT IGNORE INTO users_subscriptions
- VALUES (?, ?)", G::$LoggedUser['ID'], $ThreadID);
- $Cache->delete_value('subscriptions_user_'.G::$LoggedUser['ID']);
- }
+ $DB->prepared_query("
+ UPDATE blog
+ SET
+ Title = ?,
+ Body = ?,
+ ThreadID = ?,
+ Important = ?
+ WHERE ID = ?", $_POST['title'], $_POST['body'], $ThreadID, $Important, $BlogID);
+ $Cache->delete_value('blog');
+ $Cache->delete_value('feed_blog');
+ if ($Important == '1') {
+ $Cache->delete_value('blog_latest_id');
+ }
+ if (isset($_POST['subscribe']) && $ThreadID !== null && $ThreadID > 0) {
+ $DB->prepared_query("
+ INSERT IGNORE INTO users_subscriptions
+ VALUES (?, ?)", G::$LoggedUser['ID'], $ThreadID);
+ $Cache->delete_value('subscriptions_user_'.G::$LoggedUser['ID']);
+ }
}
-header('Location: blog.php');
\ No newline at end of file
+header('Location: blog.php');
diff --git a/sections/blog/take_new_blog.php b/sections/blog/take_new_blog.php
index 0b5c3960b..5163e8db2 100644
--- a/sections/blog/take_new_blog.php
+++ b/sections/blog/take_new_blog.php
@@ -2,47 +2,47 @@
authorize();
if (empty($_POST['title']) || empty($_POST['body'])) {
- error('You must have a title and body for the blog post.');
+ error('You must have a title and body for the blog post.');
}
$ThreadID = !isset($_POST['thread']) || $_POST['thread'] === '' ? '' : max(0, intval($_POST['thread']));
if ($ThreadID > 0) {
- $DB->prepared_query("
- SELECT ForumID
- FROM forums_topics
- WHERE ID = ?", $ThreadID);
- if (!$DB->has_results()) {
- error('No such thread exists!');
- }
+ $DB->prepared_query("
+ SELECT ForumID
+ FROM forums_topics
+ WHERE ID = ?", $ThreadID);
+ if (!$DB->has_results()) {
+ error('No such thread exists!');
+ }
}
elseif ($ThreadID === '') {
- $ThreadID = Misc::create_thread(ANNOUNCEMENT_FORUM_ID, G::$LoggedUser['ID'], $_POST['title'], $_POST['body']);
- if ($ThreadID < 1) {
- error(0);
- }
+ $ThreadID = Misc::create_thread(ANNOUNCEMENT_FORUM_ID, G::$LoggedUser['ID'], $_POST['title'], $_POST['body']);
+ if ($ThreadID < 1) {
+ error(0);
+ }
}
else {
- $ThreadID = null;
+ $ThreadID = null;
}
$Important = isset($_POST['important']) ? '1' : '0';
$DB->prepared_query("
- INSERT INTO blog
- (UserID, Title, Body, Time, ThreadID, Important)
- VALUES
- (?, ?, ?, ?, ?, ?)", G::$LoggedUser['ID'], $_POST['title'], $_POST['body'], sqltime(), $ThreadID, $Important);
+ INSERT INTO blog
+ (UserID, Title, Body, Time, ThreadID, Important)
+ VALUES
+ (?, ?, ?, ?, ?, ?)", G::$LoggedUser['ID'], $_POST['title'], $_POST['body'], sqltime(), $ThreadID, $Important);
$Cache->delete_value('blog');
if ($Important == '1') {
- $Cache->delete_value('blog_latest_id');
+ $Cache->delete_value('blog_latest_id');
}
if (isset($_POST['subscribe']) && $ThreadID !== null && $ThreadID > 0) {
- $DB->prepared_query("
- INSERT IGNORE INTO users_subscriptions
- VALUES (?, ?)", G::$LoggedUser['ID'], $ThreadID);
- $Cache->delete_value('subscriptions_user_'.G::$LoggedUser['ID']);
+ $DB->prepared_query("
+ INSERT IGNORE INTO users_subscriptions
+ VALUES (?, ?)", G::$LoggedUser['ID'], $ThreadID);
+ $Cache->delete_value('subscriptions_user_'.G::$LoggedUser['ID']);
}
NotificationsManager::send_push(NotificationsManager::get_push_enabled_users(), $_POST['title'], $_POST['body'], site_url() . 'index.php', NotificationsManager::BLOG);
-header('Location: blog.php');
\ No newline at end of file
+header('Location: blog.php');
diff --git a/sections/bonus/bprates.php b/sections/bonus/bprates.php
index 99a882800..d16b11cb0 100644
--- a/sections/bonus/bprates.php
+++ b/sections/bonus/bprates.php
@@ -5,16 +5,19 @@
$Limit = TORRENTS_PER_PAGE;
$Offset = TORRENTS_PER_PAGE * ($Page-1);
-if (!empty($_GET['userid']) && check_perms('users_mod')) {
- $UserID = intval($_GET['userid']);
- $User = array_merge(Users::user_stats($_GET['userid']), Users::user_info($_GET['userid']), Users::user_heavy_info($_GET['userid']));
- if (empty($User)) {
- error(404);
- }
+if (!empty($_GET['userid'])) {
+ if (!check_perms('admin_bp_history')) {
+ error(403);
+ }
+ $UserID = intval($_GET['userid']);
+ $User = array_merge(Users::user_stats($_GET['userid']), Users::user_info($_GET['userid']), Users::user_heavy_info($_GET['userid']));
+ if (empty($User)) {
+ error(404);
+ }
}
else {
- $UserID = $LoggedUser['ID'];
- $User = $LoggedUser;
+ $UserID = $LoggedUser['ID'];
+ $User = $LoggedUser;
}
$Title = ($UserID === $LoggedUser['ID']) ? 'Your Bonus Points Rate' : "{$User['Username']}'s Bonus Point Rate";
@@ -22,19 +25,21 @@
$DB->prepared_query("
SELECT
- COUNT(xfu.uid) as TotalTorrents,
- SUM(t.Size) as TotalSize,
- SUM(IFNULL((t.Size / (1024 * 1024 * 1024)) * (
- 0.0433 + (
- (0.07 * LN(1 + (xfh.seedtime / (24)))) / (POW(GREATEST(t.Seeders, 1), 0.35))
- )
- ), 0)) AS TotalHourlyPoints
-FROM
- (SELECT DISTINCT uid,fid FROM xbt_files_users WHERE active=1 AND remaining=0 AND mtime > unix_timestamp(NOW() - INTERVAL 1 HOUR) AND uid = ?) AS xfu
- JOIN xbt_files_history AS xfh ON xfh.uid = xfu.uid AND xfh.fid = xfu.fid
- JOIN torrents AS t ON t.ID = xfu.fid
+ COUNT(xfu.uid) as TotalTorrents,
+ SUM(t.Size) as TotalSize,
+ SUM(IFNULL((t.Size / (1024 * 1024 * 1024)) * (
+ 0.0433 + (
+ (0.07 * LN(1 + (xfh.seedtime / (24)))) / (POW(GREATEST(tls.Seeders, 1), 0.35))
+ )
+ ), 0)) AS TotalHourlyPoints
+FROM (
+ SELECT DISTINCT uid,fid FROM xbt_files_users WHERE active=1 AND remaining=0 AND mtime > unix_timestamp(NOW() - INTERVAL 1 HOUR) AND uid = ?
+) AS xfu
+INNER JOIN xbt_files_history AS xfh ON (xfh.uid = xfu.uid AND xfh.fid = xfu.fid)
+INNER JOIN torrents AS t ON (t.ID = xfu.fid)
+INNER JOIN torrents_leech_stats tls ON (tls.TorrentID = t.ID)
WHERE
- xfu.uid = ?", $UserID, $UserID);
+ xfu.uid = ?", $UserID, $UserID);
list($TotalTorrents, $TotalSize, $TotalHourlyPoints) = $DB->next_record();
$TotalTorrents = intval($TotalTorrents);
@@ -51,157 +56,160 @@
?>
+ get_value('blog')) {
+ $DB->prepared_query("
+ SELECT
+ b.ID,
+ um.Username,
+ b.UserID,
+ b.Title,
+ b.Body,
+ b.Time,
+ b.ThreadID
+ FROM blog AS b
+ LEFT JOIN users_main AS um ON b.UserID = um.ID
+ ORDER BY Time DESC
+ LIMIT 20");
+ $Blog = $DB->to_array();
+ $Cache->cache_value('blog', $Blog, 1209600);
+ }
- if (count($Blog) > 0 && G::$LoggedUser['LastReadBlog'] < $Blog[0][0]) {
- $Cache->begin_transaction('user_info_heavy_'.G::$LoggedUser['ID']);
- $Cache->update_row(false, array('LastReadBlog' => $Blog[0][0]));
- $Cache->commit_transaction(0);
- $DB->prepared_query("
- UPDATE users_info
- SET LastReadBlog = ?
- WHERE UserID = ?", $Blog[0][0], G::$LoggedUser['ID']);
- G::$LoggedUser['LastReadBlog'] = $Blog[0][0];
- }
+ if (count($Blog) > 0 && G::$LoggedUser['LastReadBlog'] < $Blog[0][0]) {
+ $Cache->begin_transaction('user_info_heavy_'.G::$LoggedUser['ID']);
+ $Cache->update_row(false, array('LastReadBlog' => $Blog[0][0]));
+ $Cache->commit_transaction(0);
+ $DB->prepared_query("
+ UPDATE users_info
+ SET LastReadBlog = ?
+ WHERE UserID = ?", $Blog[0][0], G::$LoggedUser['ID']);
+ G::$LoggedUser['LastReadBlog'] = $Blog[0][0];
+ }
- foreach ($Blog as $BlogItem) {
- list($BlogID, $Author, $AuthorID, $Title, $Body, $BlogTime, $ThreadID) = $BlogItem;
- ?>
-
- +
+ -
+
-
-
-
- - +
+
+
+
+ + -
-
-
-
Points:
+ +Points:
| Total Torrents | -Size | -BP/hour | -BP/day | -BP/week | -BP/month | -BP/year | -
| - | - | - | - | - | - | - |
| Total Torrents | +Size | +BP/hour | +BP/day | +BP/week | +BP/month | +BP/year | +
| + | + | + | + | + | + | + |
+
+
+
| Torrent | -Size | -Seeders | -Seedtime | -BP/hour | -BP/day | -BP/week | -BP/month | -BP/year | -
| Torrent | +Size | +Seeders | +Seedtime | +BP/hour | +BP/day | +BP/week | +BP/month | +BP/year | +
| - | - | - | - | - | - | - | - | - |
| + | + | + | + | + | + | + | + | + |
| No torrents being seeded currently | -||||||||
| No torrents being seeded currently | +||||||||
+
+
diff --git a/sections/bonus/history.php b/sections/bonus/history.php
index c699ca5a7..6c2009b3d 100644
--- a/sections/bonus/history.php
+++ b/sections/bonus/history.php
@@ -2,15 +2,18 @@
View::show_header('Bonus Points Purchase History', 'bonus');
-if (check_perms('admin_bp_history') && isset($_GET['id']) && is_number($_GET['id'])) {
- $ID = (int)$_GET['id'];
- $Header = 'Bonus Points Spending History for ' . Users::format_username($ID);
- $WhoSpent = Users::format_username($ID) . ' has spent';
+if (isset($_GET['userid']) && is_number($_GET['userid'])) {
+ if (!check_perms('admin_bp_history')) {
+ error(403);
+ }
+ $ID = (int)$_GET['userid'];
+ $Header = 'Bonus Points Spending History for ' . Users::format_username($ID);
+ $WhoSpent = Users::format_username($ID) . ' has spent';
}
else {
- $ID = G::$LoggedUser['ID'];
- $Header = 'Bonus Points Spending History';
- $WhoSpent = 'You have spent';
+ $ID = G::$LoggedUser['ID'];
+ $Header = 'Bonus Points Spending History';
+ $WhoSpent = 'You have spent';
}
$Summary = $Bonus->getUserSummary($ID);
@@ -19,56 +22,91 @@
$Pages = Format::get_pages($Page, $Summary['nr'], TORRENTS_PER_PAGE);
if ($Summary['nr'] > 0) {
- $History = $Bonus->getUserHistory($ID, $Page, TORRENTS_PER_PAGE);
+ $History = $Bonus->getUserHistory($ID, $Page, TORRENTS_PER_PAGE);
}
?>
-
+
- About Bonus Points
- Bonus Point Shop
- " class="brackets">Bonus Point Rates
+ About Bonus Points
+ Bonus Point Shop
+ " class="brackets">Bonus Point Rates
-
-
-
-
-
-
+
+
+
+
-getItem($Label);
- if ($Item) {
- $Price = $Bonus->getEffectivePrice($Label, G::$LoggedUser['EffectiveClass']);
- if ($Price > G::$LoggedUser['BonusPoints']) {
- error('You cannot afford this item.');
- }
- switch($Label) {
- case 'token-1': case 'token-2': case 'token-3':
- case 'other-1': case 'other-2': case 'other-3':
- require_once(SERVER_ROOT . '/sections/bonus/tokens.php');
- break;
- case 'invite':
- require_once(SERVER_ROOT . '/sections/bonus/invite.php');
- break;
- case 'title-bb-y':
- case 'title-bb-n':
- case 'title-off':
- require_once(SERVER_ROOT . '/sections/bonus/title.php');
- break;
- default:
- require_once(SERVER_ROOT . DEFAULT_PAGE);
- break;
- }
- }
- else {
- require_once(SERVER_ROOT . DEFAULT_PAGE);
- break;
- }
- }
- break;
- case 'bprates':
- require_once(SERVER_ROOT . '/sections/bonus/bprates.php');
- break;
- case 'title':
- require_once(SERVER_ROOT . '/sections/bonus/title.php');
- break;
- case 'history':
- require_once(SERVER_ROOT . '/sections/bonus/history.php');
- break;
- default:
- require_once(SERVER_ROOT . DEFAULT_PAGE);
- break;
- }
+ switch ($_GET['action']) {
+ case 'purchase':
+ /* handle validity and cost as early as possible */
+ if (isset($_REQUEST['label']) && preg_match('/^[a-z]{1,15}(-\w{1,15}){0,4}/', $_REQUEST['label'])) {
+ $Label = $_REQUEST['label'];
+ $Item = $Bonus->getItem($Label);
+ if ($Item) {
+ $Price = $Bonus->getEffectivePrice($Label, G::$LoggedUser['EffectiveClass']);
+ if ($Price > G::$LoggedUser['BonusPoints']) {
+ error('You cannot afford this item.');
+ }
+ switch($Label) {
+ case 'token-1': case 'token-2': case 'token-3':
+ case 'other-1': case 'other-2': case 'other-3':
+ require_once(SERVER_ROOT . '/sections/bonus/tokens.php');
+ break;
+ case 'invite':
+ require_once(SERVER_ROOT . '/sections/bonus/invite.php');
+ break;
+ case 'title-bb-y':
+ case 'title-bb-n':
+ case 'title-off':
+ require_once(SERVER_ROOT . '/sections/bonus/title.php');
+ break;
+ default:
+ require_once(SERVER_ROOT . DEFAULT_PAGE);
+ break;
+ }
+ }
+ else {
+ require_once(SERVER_ROOT . DEFAULT_PAGE);
+ break;
+ }
+ }
+ break;
+ case 'bprates':
+ require_once(SERVER_ROOT . '/sections/bonus/bprates.php');
+ break;
+ case 'title':
+ require_once(SERVER_ROOT . '/sections/bonus/title.php');
+ break;
+ case 'history':
+ require_once(SERVER_ROOT . '/sections/bonus/history.php');
+ break;
+ case 'donate':
+ default:
+ require_once(SERVER_ROOT . DEFAULT_PAGE);
+ break;
+ }
}
else {
- require_once(SERVER_ROOT . DEFAULT_PAGE);
+ require_once(SERVER_ROOT . DEFAULT_PAGE);
}
diff --git a/sections/bonus/invite.php b/sections/bonus/invite.php
index cc6da6f4c..a57594b76 100644
--- a/sections/bonus/invite.php
+++ b/sections/bonus/invite.php
@@ -2,8 +2,8 @@
authorize();
if ($Bonus->purchaseInvite(G::$LoggedUser['ID'])) {
- header('Location: bonus.php?complete=invite');
+ header('Location: bonus.php?complete=invite');
}
else {
- error(403);
+ error(403);
}
diff --git a/sections/bonus/store.php b/sections/bonus/store.php
index b158bd925..47153c043 100644
--- a/sections/bonus/store.php
+++ b/sections/bonus/store.php
@@ -5,76 +5,141 @@
if (isset($_GET['complete'])) {
$label = $_GET['complete'];
$item = $Bonus->getItem($label);
- print <<
- {$item['Title']} purchased!
+ {$item['Title']} purchased!
HTML;
}
?>
bonus points to purchase .
- -No purchase history
-getUserPoolHistory($ID); +$pool_total = 0; +if (!is_null($PoolSummary)) { + $has_spent++; + foreach ($PoolSummary as $p) { + $when = (time() < strtotime($p['UntilDate'])) + ? " ending in " . time_diff($p['UntilDate']) + : " ended " . time_diff($p['UntilDate']) . ' ago'; + $pool_total += $p['Total']; +?> +bonus points to donate to the .
+ +bonus points to purchase .
+ 500000) { $adj = 'very '; } + elseif ($total > 1000000) { $adj = 'very, very '; } + elseif ($total > 5000000) { $adj = 'extremely '; } + elseif ($total > 10000000) { $adj = 'exceptionally '; } + else { $adj = ''; } +?> +That makes a grand total of points, well done!
+ +No purchase history.
+ -
-
-
- | Item | -Price | -Purchase Date | -For | -
| - | - | - | - |
-
-
+
+
+
+ | Item | +Price | +Purchase Date | +For | +
| + | + | + | + |
+
+
-
Bonus Points Shop
+Bonus Points Shop
- About Bonus Points
- Bonus Point Rates
- History
+ About Bonus Points
+ Bonus Point Rates
+ History
+
+
+
+
+donate($_POST['poolid'], $value, G::$LoggedUser['ID'], G::$LoggedUser['EffectiveClass'])) {
+?>
+
+
+
+getOpenPool();
+if (count($pool) > 0) {
+?>
+
+
+
+
+
+
+The pool is open for business!
+Donate points for greater good! The points you give here will be distributed out to everyone
+ who participates in the contest. You can give as many times as you want until the end.
+ +
The grand total currently stands at points
+ +
-
-
-
+
+
+
+
+
purchaseTitle($ID, $Label, $_POST['title'], G::$LoggedUser['EffectiveClass'])) {
- header('Location: bonus.php?complete=' . urlencode($Label));
- }
- else {
- error('You cannot afford this item.');
- }
+ authorize();
+ if (!isset($_POST['title'])) {
+ error(403);
+ }
+ if ($Bonus->purchaseTitle($ID, $Label, $_POST['title'], G::$LoggedUser['EffectiveClass'])) {
+ header('Location: bonus.php?complete=' . urlencode($Label));
+ }
+ else {
+ error('You cannot afford this item.');
+ }
}
View::show_header('Bonus Points - Title', 'bonus');
?>
| Option | -Description | -Points | -Checkout | -
| Option | +Description | +Points | +Checkout | +{$Cnt} | -{$Item['Title']} | -{$FormattedPrice} | -+ if ($Item['MinClass'] > G::$LoggedUser['EffectiveClass']) { + continue; + } + $Cnt++; + $RowClass = ($Cnt % 2 === 0) ? 'rowb' : 'rowa'; + $Price = $Bonus->getEffectivePrice($Label, G::$LoggedUser['EffectiveClass']); + $FormattedPrice = number_format($Price); + print << + | {$Cnt} | +{$Item['Title']} | +{$FormattedPrice} | +HTML; - if (G::$LoggedUser['BonusPoints'] >= $Price) { + if (G::$LoggedUser['BonusPoints'] >= $Price) { $NextFunction = preg_match('/^other-\d$/', $Label) ? 'ConfirmOther' : 'null'; $OnClick = preg_match('/^title-bbcode-[yn]$/', $Label) ? "NoOp" : "ConfirmPurchase"; - print <<Purchase + print <<Purchase HTML; - } - else { - print <<Too Expensive + } + else { + print <<Too Expensive HTML; - } - print << - + } + print << + HTML; } ?> - | -
-
-
-
+
+
+
-purchaseToken(G::$LoggedUser['ID'], $Label, G::$LoggedUser)) {
- error('Purchase not concluded.');
+ error('Purchase not concluded.');
}
}
else {
- if (empty($_GET['user'])) {
- error('You have to enter a username to give tokens to.');
- }
- $ID = Users::ID_from_username(urldecode($_GET['user']));
- if (is_null($ID)) {
- error('Invalid username. Please select a valid user');
- }
- elseif ($ID == G::$LoggedUser['ID']) {
- error('You cannot give yourself tokens.');
- }
+ if (empty($_GET['user'])) {
+ error('You have to enter a username to give tokens to.');
+ }
+ $ID = Users::ID_from_username(urldecode($_GET['user']));
+ if (is_null($ID)) {
+ error('Invalid username. Please select a valid user');
+ }
+ elseif ($ID == G::$LoggedUser['ID']) {
+ error('You cannot give yourself tokens.');
+ }
if (!$Bonus->purchaseTokenOther(G::$LoggedUser['ID'], $ID, $Label, G::$LoggedUser)) {
- error('Purchase for other not concluded.');
+ error('Purchase for other not concluded.');
}
}
diff --git a/sections/bookmarks/add.php b/sections/bookmarks/add.php
index 82b7617b0..7b2ae43a6 100644
--- a/sections/bookmarks/add.php
+++ b/sections/bookmarks/add.php
@@ -1,10 +1,10 @@
-query("
- SELECT UserID
- FROM $Table
- WHERE UserID = '$LoggedUser[ID]'
- AND $Col = $PageID");
+ SELECT UserID
+ FROM $Table
+ WHERE UserID = '$LoggedUser[ID]'
+ AND $Col = $PageID");
if (!$DB->has_results()) {
- if ($Type === 'torrent') {
- $DB->query("
- SELECT MAX(Sort)
- FROM `bookmarks_torrents`
- WHERE UserID = $LoggedUser[ID]");
- list($Sort) = $DB->next_record();
- if (!$Sort) {
- $Sort = 0;
- }
- $Sort += 1;
- $DB->query("
- INSERT IGNORE INTO $Table (UserID, $Col, Time, Sort)
- VALUES ('$LoggedUser[ID]', $PageID, '".sqltime()."', $Sort)");
- } else {
- $DB->query("
- INSERT IGNORE INTO $Table (UserID, $Col, Time)
- VALUES ('$LoggedUser[ID]', $PageID, '".sqltime()."')");
- }
- $Cache->delete_value('bookmarks_'.$Type.'_'.$LoggedUser['ID']);
- if ($Type == 'torrent') {
- $Cache->delete_value("bookmarks_group_ids_$UserID");
+ if ($Type === 'torrent') {
+ $DB->query("
+ SELECT MAX(Sort)
+ FROM `bookmarks_torrents`
+ WHERE UserID = $LoggedUser[ID]");
+ list($Sort) = $DB->next_record();
+ if (!$Sort) {
+ $Sort = 0;
+ }
+ $Sort += 1;
+ $DB->query("
+ INSERT IGNORE INTO $Table (UserID, $Col, Time, Sort)
+ VALUES ('$LoggedUser[ID]', $PageID, '".sqltime()."', $Sort)");
+ } else {
+ $DB->query("
+ INSERT IGNORE INTO $Table (UserID, $Col, Time)
+ VALUES ('$LoggedUser[ID]', $PageID, '".sqltime()."')");
+ }
+ $Cache->delete_value('bookmarks_'.$Type.'_'.$LoggedUser['ID']);
+ if ($Type == 'torrent') {
+ $Cache->delete_value("bookmarks_group_ids_$UserID");
- $DB->query("
- SELECT Name, Year, WikiBody, TagList
- FROM torrents_group
- WHERE ID = $PageID");
- list($GroupTitle, $Year, $Body, $TagList) = $DB->next_record();
- $TagList = str_replace('_', '.', $TagList);
+ $DB->query("
+ SELECT Name, Year, WikiBody, TagList
+ FROM torrents_group
+ WHERE ID = $PageID");
+ list($GroupTitle, $Year, $Body, $TagList) = $DB->next_record();
+ $TagList = str_replace('_', '.', $TagList);
- $DB->query("
- SELECT ID, Format, Encoding, HasLog, HasCue, HasLogDB, LogScore, LogChecksum, Media, Scene, FreeTorrent, UserID
- FROM torrents
- WHERE GroupID = $PageID");
- // RSS feed stuff
- while ($Torrent = $DB->next_record()) {
- $Title = $GroupTitle;
- list($TorrentID, $Format, $Bitrate, $HasLog, $HasCue, $HasLogDB, $LogScore, $LogChecksum, $Media, $Scene, $Freeleech, $UploaderID) = $Torrent;
- $Title .= " [$Year] - ";
- $Title .= "$Format / $Bitrate";
- if ($HasLog == "'1'") {
- $Title .= ' / Log';
- }
- if ($HasLogDB) {
- $Title .= " / $LogScore%";
- }
- if ($HasCue == "'1'") {
- $Title .= ' / Cue';
- }
- $Title .= ' / '.trim($Media);
- if ($Scene == '1') {
- $Title .= ' / Scene';
- }
- if ($Freeleech == '1') {
- $Title .= ' / Freeleech!';
- }
- if ($Freeleech == '2') {
- $Title .= ' / Neutral leech!';
- }
+ $DB->query("
+ SELECT ID, Format, Encoding, HasLog, HasCue, HasLogDB, LogScore, LogChecksum, Media, Scene, FreeTorrent, UserID
+ FROM torrents
+ WHERE GroupID = $PageID");
+ // RSS feed stuff
+ while ($Torrent = $DB->next_record()) {
+ $Title = $GroupTitle;
+ list($TorrentID, $Format, $Bitrate, $HasLog, $HasCue, $HasLogDB, $LogScore, $LogChecksum, $Media, $Scene, $Freeleech, $UploaderID) = $Torrent;
+ $Title .= " [$Year] - ";
+ $Title .= "$Format / $Bitrate";
+ if ($HasLog == "'1'") {
+ $Title .= ' / Log';
+ }
+ if ($HasLogDB) {
+ $Title .= " / $LogScore%";
+ }
+ if ($HasCue == "'1'") {
+ $Title .= ' / Cue';
+ }
+ $Title .= ' / '.trim($Media);
+ if ($Scene == '1') {
+ $Title .= ' / Scene';
+ }
+ if ($Freeleech == '1') {
+ $Title .= ' / Freeleech!';
+ }
+ if ($Freeleech == '2') {
+ $Title .= ' / Neutral leech!';
+ }
- $UploaderInfo = Users::user_info($UploaderID);
- $Item = $Feed->item($Title,
- Text::strip_bbcode($Body),
- 'torrents.php?action=download&authkey=[[AUTHKEY]]&torrent_pass=[[PASSKEY]]&id='.$TorrentID,
- $UploaderInfo['Username'],
- "torrents.php?id=$PageID",
- trim($TagList));
- $Feed->populate('torrents_bookmarks_t_'.$LoggedUser['torrent_pass'], $Item);
- }
- } elseif ($Type == 'request') {
- $DB->query("
- SELECT UserID
- FROM $Table
- WHERE $Col = '".db_string($PageID)."'");
- if ($DB->record_count() < 100) {
- // Sphinx doesn't like huge MVA updates. Update sphinx_requests_delta
- // and live with the <= 1 minute delay if we have more than 100 bookmarkers
- $Bookmarkers = implode(',', $DB->collect('UserID'));
- $SphQL = new SphinxqlQuery();
- $SphQL->raw_query("UPDATE requests, requests_delta SET bookmarker = ($Bookmarkers) WHERE id = $PageID");
- } else {
- Requests::update_sphinx_requests($PageID);
- }
- }
+ $UploaderInfo = Users::user_info($UploaderID);
+ $Item = $Feed->item($Title,
+ Text::strip_bbcode($Body),
+ 'torrents.php?action=download&authkey=[[AUTHKEY]]&torrent_pass=[[PASSKEY]]&id='.$TorrentID,
+ $UploaderInfo['Username'],
+ "torrents.php?id=$PageID",
+ trim($TagList));
+ $Feed->populate('torrents_bookmarks_t_'.$LoggedUser['torrent_pass'], $Item);
+ }
+ } elseif ($Type == 'request') {
+ $DB->query("
+ SELECT UserID
+ FROM $Table
+ WHERE $Col = '".db_string($PageID)."'");
+ if ($DB->record_count() < 100) {
+ // Sphinx doesn't like huge MVA updates. Update sphinx_requests_delta
+ // and live with the <= 1 minute delay if we have more than 100 bookmarkers
+ $Bookmarkers = implode(',', $DB->collect('UserID'));
+ $SphQL = new SphinxqlQuery();
+ $SphQL->raw_query("UPDATE requests, requests_delta SET bookmarker = ($Bookmarkers) WHERE id = $PageID");
+ } else {
+ Requests::update_sphinx_requests($PageID);
+ }
+ }
}
diff --git a/sections/bookmarks/artists.php b/sections/bookmarks/artists.php
index b762e532d..1ac65f1f2 100644
--- a/sections/bookmarks/artists.php
+++ b/sections/bookmarks/artists.php
@@ -1,21 +1,21 @@
-query("
- SELECT Username
- FROM users_main
- WHERE ID = '$UserID'");
- list($Username) = $DB->next_record();
+ if (!check_perms('users_override_paranoia')) {
+ error(403);
+ }
+ $UserID = $_GET['userid'];
+ $Sneaky = $UserID !== $LoggedUser['ID'];
+ if (!is_number($UserID)) {
+ error(404);
+ }
+ $DB->query("
+ SELECT Username
+ FROM users_main
+ WHERE ID = '$UserID'");
+ list($Username) = $DB->next_record();
} else {
- $UserID = $LoggedUser['ID'];
+ $UserID = $LoggedUser['ID'];
}
$Sneaky = $UserID !== $LoggedUser['ID'];
@@ -23,11 +23,11 @@
//$ArtistList = Bookmarks::all_bookmarks('artist', $UserID);
$DB->query("
- SELECT ag.ArtistID, ag.Name
- FROM bookmarks_artists AS ba
- INNER JOIN artists_group AS ag ON ba.ArtistID = ag.ArtistID
- WHERE ba.UserID = $UserID
- ORDER BY ag.Name");
+ SELECT ag.ArtistID, ag.Name
+ FROM bookmarks_artists AS ba
+ INNER JOIN artists_group AS ag ON ba.ArtistID = ag.ArtistID
+ WHERE ba.UserID = $UserID
+ ORDER BY ag.Name");
$ArtistList = $DB->to_array();
@@ -37,72 +37,73 @@
?>
| Custom Title, - Points | -
| - - | -
| Custom Title, - Points | +
| + + | +
-
-
-
-
-
-
+
+ You have not bookmarked any artists.
-
+
+
You have not bookmarked any artists.
+| Artist | -|
| Artist | +|
-
-
-get_value('notify_artists_'.$LoggedUser['ID'])) === false) {
- $DB->query("
- SELECT ID, Artists
- FROM users_notify_filters
- WHERE UserID = '$LoggedUser[ID]'
- AND Label = 'Artist notifications'
- LIMIT 1");
- $Notify = $DB->next_record(MYSQLI_ASSOC);
- $Cache->cache_value('notify_artists_'.$LoggedUser['ID'], $Notify, 0);
- }
- if (stripos($Notify['Artists'], "|$Name|") === false) {
+ |
+
+
+get_value('notify_artists_'.$LoggedUser['ID'])) === false) {
+ $DB->query("
+ SELECT ID, Artists
+ FROM users_notify_filters
+ WHERE UserID = '$LoggedUser[ID]'
+ AND Label = 'Artist notifications'
+ LIMIT 1");
+ $Notify = $DB->next_record(MYSQLI_ASSOC);
+ $Cache->cache_value('notify_artists_'.$LoggedUser['ID'], $Notify, 0);
+ }
+ if (stripos($Notify['Artists'], "|$Name|") === false) {
?>
- Notify of new uploads
-&auth=" class="brackets">Notify of new uploads
+
- Do not notify of new uploads
-&auth=" class="brackets">Do not notify of new uploads
+
- Remove bookmark
-
- |
- |
+
-
-
-
-
-
-
-
-
-
+ You have not bookmarked any torrents.
-
+
+
+
+
+
+
You have not bookmarked any torrents.
+
-
-
-
+
-
-
- ![<?=$Artist['Name']?>](<?=ImageTools::process($Artist['Image'], true)?> "<?=$Artist['Name']?>")
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ 0 && $NumGroups >= $MaxGroups) || ($MaxGroupsPerUser > 0 && $NumGroupsByUser >= $MaxGroupsPerUser))) {
- $PreventAdditions = true;
+ $PreventAdditions = true;
}
// Silly hack for people who are on the old setting
$CollageCovers = (isset($LoggedUser['CollageCovers']) ? $LoggedUser['CollageCovers'] : 25 * (abs($LoggedUser['HideCollage'] - 1)));
-$CollagePages = array();
+$CollagePages = [];
// Pad it out
if ($NumGroups > $CollageCovers) {
- for ($i = $NumGroups + 1; $i <= ceil($NumGroups / $CollageCovers) * $CollageCovers; $i++) {
- $Collage[] = '';
- }
+ for ($i = $NumGroups + 1; $i <= ceil($NumGroups / $CollageCovers) * $CollageCovers; $i++) {
+ $Collage[] = '';
+ }
}
for ($i = 0; $i < $NumGroups / $CollageCovers; $i++) {
- $Groups = array_slice($Collage, $i * $CollageCovers, $CollageCovers);
- $CollagePage = '';
- foreach ($Groups as $Group) {
- $CollagePage .= $Group;
- }
- $CollagePages[] = $CollagePage;
+ $Groups = array_slice($Collage, $i * $CollageCovers, $CollageCovers);
+ $CollagePage = '';
+ foreach ($Groups as $Group) {
+ $CollagePage .= $Group;
+ }
+ $CollagePages[] = $CollagePage;
}
View::show_header($Name, 'browse,collage,bbcode,voting,recommend');
?>
+
-
-
-
-
- Stats
- -
-
- Torrent groups: -
- Artists: -
-
query("
- SELECT IRCKey
- FROM users_main
- WHERE ID = $LoggedUser[ID]");
+ SELECT IRCKey
+ FROM users_main
+ WHERE ID = $LoggedUser[ID]");
list($IRCKey) = $DB->next_record();
if (empty($IRCKey)) {
?>
Top Artists
-
- 0) {
- echo "$Indent
+ - \n";
- uasort($ArtistCount, 'compare');
- $i = 0;
- foreach ($ArtistCount as $ID => $Artist) {
- $i++;
- if ($i > 10) {
- break;
- }
+
-
-
+
+
+
-
-
+
-
+
+
-
- $CollageCovers) { ?>
-
-
+ collageShow.init();
+
- Cover art
- -
-
+
Cover art
+ -
+
-
| - | - | Torrents | -Size | - |
- |
- |
-
| + | + | Torrents | +Size | + |
+ |
+ |
+
| - - | -- - | -
-
-
-
- Remove bookmark
- - - - - - |
- ||||
| + + | ++ + | +
+
+
+
+ Remove bookmark
+ + + + + + |
+ ||||
| - |
-
-
- |
- - - [ DL - - | - FL - - | RP ] - - - - - Remove bookmark - - + 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 ($Torrent['PersonalFL']) { + $DisplayName .= ' ' . Format::torrent_label('Personal Freeleech!'); + } + $SnatchedTorrentClass = $Torrent['IsSnatched'] ? ' snatched_torrent' : ''; + ?> + | ||||
| + |
+
+
+ |
+ + + [ DL + + | + FL + + | RP ] + + + + + Remove bookmark + + - | -- | - | - | - | + | + | + | + + - |
-
-
-
- IRC Rules - Please read these carefully!
-
-
+ - Please set your IRC Key on your profile first! For more information on IRC, please read the wiki article. -
-
+
+ IRC Rules - Please read these carefully!
+
+
+ Please set your IRC Key on your profile first! For more information on IRC, please read the wiki article. +
+
-
-
-
- IRC Rules - Please read these carefully!
-
-
-
-
+
+
+ IRC Rules - Please read these carefully!
+
+
+
+
-
-query("
- SELECT MAX(Sort)
- FROM collages_artists
- WHERE CollageID = '$CollageID'");
- list($Sort) = $DB->next_record();
- $Sort += 10;
-
- $DB->query("
- SELECT ArtistID
- FROM collages_artists
- WHERE CollageID = '$CollageID'
- AND ArtistID = '$ArtistID'");
- if (!$DB->has_results()) {
- $DB->query("
- INSERT IGNORE INTO collages_artists
- (CollageID, ArtistID, UserID, Sort, AddedOn)
- VALUES
- ('$CollageID', '$ArtistID', '$LoggedUser[ID]', '$Sort', '" . sqltime() . "')");
-
- $DB->query("
- UPDATE collages
- SET NumTorrents = NumTorrents + 1, Updated = '" . sqltime() . "'
- WHERE ID = '$CollageID'");
-
- $Cache->delete_value("collage_$CollageID");
- $Cache->delete_value("artists_collages_$ArtistID");
- $Cache->delete_value("artists_collages_personal_$ArtistID");
-
- $DB->query("
- SELECT UserID
- FROM users_collage_subs
- WHERE CollageID = $CollageID");
- while (list($CacheUserID) = $DB->next_record()) {
- $Cache->delete_value("collage_subs_user_new_$CacheUserID");
- }
- }
+ global $Cache, $LoggedUser, $DB;
+
+ $DB->query("
+ SELECT MAX(Sort)
+ FROM collages_artists
+ WHERE CollageID = '$CollageID'");
+ list($Sort) = $DB->next_record();
+ $Sort += 10;
+
+ $DB->query("
+ SELECT ArtistID
+ FROM collages_artists
+ WHERE CollageID = '$CollageID'
+ AND ArtistID = '$ArtistID'");
+ if (!$DB->has_results()) {
+ $DB->query("
+ INSERT IGNORE INTO collages_artists
+ (CollageID, ArtistID, UserID, Sort, AddedOn)
+ VALUES
+ ('$CollageID', '$ArtistID', '$LoggedUser[ID]', '$Sort', '" . sqltime() . "')");
+
+ $DB->query("
+ UPDATE collages
+ SET NumTorrents = NumTorrents + 1, Updated = '" . sqltime() . "'
+ WHERE ID = '$CollageID'");
+
+ $Cache->delete_value("collage_$CollageID");
+ $Cache->delete_value("artists_collages_$ArtistID");
+ $Cache->delete_value("artists_collages_personal_$ArtistID");
+
+ $DB->query("
+ SELECT UserID
+ FROM users_collage_subs
+ WHERE CollageID = $CollageID");
+ while (list($CacheUserID) = $DB->next_record()) {
+ $Cache->delete_value("collage_subs_user_new_$CacheUserID");
+ }
+ }
}
$CollageID = $_POST['collageid'];
if (!is_number($CollageID)) {
- error(404);
+ error(404);
}
$DB->query("
- SELECT UserID, CategoryID, Locked, NumTorrents, MaxGroups, MaxGroupsPerUser
- FROM collages
- WHERE ID = '$CollageID'");
+ SELECT UserID, CategoryID, Locked, NumTorrents, MaxGroups, MaxGroupsPerUser
+ FROM collages
+ WHERE ID = '$CollageID'");
list($UserID, $CategoryID, $Locked, $NumTorrents, $MaxGroups, $MaxGroupsPerUser) = $DB->next_record();
if (!check_perms('site_collages_delete')) {
- if ($Locked) {
- $Err = 'This collage is locked';
- }
- if ($CategoryID == 0 && $UserID != $LoggedUser['ID']) {
- $Err = 'You cannot edit someone else\'s personal collage.';
- }
- if ($MaxGroups > 0 && $NumTorrents >= $MaxGroups) {
- $Err = 'This collage already holds its maximum allowed number of artists.';
- }
-
- if (isset($Err)) {
- error($Err);
- }
+ if ($Locked) {
+ $Err = 'This collage is locked';
+ }
+ if ($CategoryID == 0 && $UserID != $LoggedUser['ID']) {
+ $Err = 'You cannot edit someone else\'s personal collage.';
+ }
+ if ($MaxGroups > 0 && $NumTorrents >= $MaxGroups) {
+ $Err = 'This collage already holds its maximum allowed number of artists.';
+ }
+
+ if (isset($Err)) {
+ error($Err);
+ }
}
if ($MaxGroupsPerUser > 0) {
- $DB->query("
- SELECT COUNT(*)
- FROM collages_artists
- WHERE CollageID = '$CollageID'
- AND UserID = '$LoggedUser[ID]'");
- list($GroupsForUser) = $DB->next_record();
- if (!check_perms('site_collages_delete') && $GroupsForUser >= $MaxGroupsPerUser) {
- error(403);
- }
+ $DB->query("
+ SELECT COUNT(*)
+ FROM collages_artists
+ WHERE CollageID = '$CollageID'
+ AND UserID = '$LoggedUser[ID]'");
+ list($GroupsForUser) = $DB->next_record();
+ if (!check_perms('site_collages_delete') && $GroupsForUser >= $MaxGroupsPerUser) {
+ error(403);
+ }
}
if ($_REQUEST['action'] == 'add_artist') {
- $Val->SetFields('url', '1', 'regex', 'The URL must be a link to a artist on the site.', array('regex' => '/^'.ARTIST_REGEX.'/i'));
- $Err = $Val->ValidateForm($_POST);
-
- if ($Err) {
- error($Err);
- }
-
- $URL = $_POST['url'];
-
- // Get artist ID
- preg_match('/^'.ARTIST_REGEX.'/i', $URL, $Matches);
- $ArtistID = $Matches[4];
- if (!$ArtistID || (int)$ArtistID === 0) {
- error(404);
- }
-
- $DB->query("
- SELECT ArtistID
- FROM artists_group
- WHERE ArtistID = '$ArtistID'");
- list($ArtistID) = $DB->next_record();
- if (!$ArtistID) {
- error('The artist was not found in the database.');
- }
-
- add_artist($CollageID, $ArtistID);
+ $Val->SetFields('url', '1', 'regex', 'The URL must be a link to a artist on the site.', array('regex' => '/^'.ARTIST_REGEX.'/i'));
+ $Err = $Val->ValidateForm($_POST);
+
+ if ($Err) {
+ error($Err);
+ }
+
+ $URL = $_POST['url'];
+
+ // Get artist ID
+ preg_match('/^'.ARTIST_REGEX.'/i', $URL, $Matches);
+ $ArtistID = $Matches[4];
+ if (!$ArtistID || (int)$ArtistID === 0) {
+ error(404);
+ }
+
+ $DB->query("
+ SELECT ArtistID
+ FROM artists_group
+ WHERE ArtistID = '$ArtistID'");
+ list($ArtistID) = $DB->next_record();
+ if (!$ArtistID) {
+ error('The artist was not found in the database.');
+ }
+
+ add_artist($CollageID, $ArtistID);
} else {
- $URLs = explode("\n", $_REQUEST['urls']);
- $ArtistIDs = array();
- $Err = '';
- foreach ($URLs as $Key => &$URL) {
- $URL = trim($URL);
- if ($URL == '') {
- unset($URLs[$Key]);
- }
- }
- unset($URL);
-
- if (!check_perms('site_collages_delete')) {
- if ($MaxGroups > 0 && ($NumTorrents + count($URLs) > $MaxGroups)) {
- $Err = "This collage can only hold $MaxGroups artists.";
- }
- if ($MaxGroupsPerUser > 0 && ($GroupsForUser + count($URLs) > $MaxGroupsPerUser)) {
- $Err = "You may only have $MaxGroupsPerUser artists in this collage.";
- }
- }
-
- foreach ($URLs as $URL) {
- $Matches = array();
- if (preg_match('/^'.ARTIST_REGEX.'/i', $URL, $Matches)) {
- $ArtistIDs[] = $Matches[4];
- $ArtistID = $Matches[4];
- } else {
- $Err = "One of the entered URLs ($URL) does not correspond to an artist on the site.";
- break;
- }
-
- $DB->query("
- SELECT ArtistID
- FROM artists_group
- WHERE ArtistID = '$ArtistID'");
- if (!$DB->has_results()) {
- $Err = "One of the entered URLs ($URL) does not correspond to an artist on the site.";
- break;
- }
- }
-
- if ($Err) {
- error($Err);
- }
-
- foreach ($ArtistIDs as $ArtistID) {
- add_artist($CollageID, $ArtistID);
- }
+ $URLs = explode("\n", $_REQUEST['urls']);
+ $ArtistIDs = [];
+ $Err = '';
+ foreach ($URLs as $Key => &$URL) {
+ $URL = trim($URL);
+ if ($URL == '') {
+ unset($URLs[$Key]);
+ }
+ }
+ unset($URL);
+
+ if (!check_perms('site_collages_delete')) {
+ if ($MaxGroups > 0 && ($NumTorrents + count($URLs) > $MaxGroups)) {
+ $Err = "This collage can only hold $MaxGroups artists.";
+ }
+ if ($MaxGroupsPerUser > 0 && ($GroupsForUser + count($URLs) > $MaxGroupsPerUser)) {
+ $Err = "You may only have $MaxGroupsPerUser artists in this collage.";
+ }
+ }
+
+ foreach ($URLs as $URL) {
+ $Matches = [];
+ if (preg_match('/^'.ARTIST_REGEX.'/i', $URL, $Matches)) {
+ $ArtistIDs[] = $Matches[4];
+ $ArtistID = $Matches[4];
+ } else {
+ $Err = "One of the entered URLs ($URL) does not correspond to an artist on the site.";
+ break;
+ }
+
+ $DB->query("
+ SELECT ArtistID
+ FROM artists_group
+ WHERE ArtistID = '$ArtistID'");
+ if (!$DB->has_results()) {
+ $Err = "One of the entered URLs ($URL) does not correspond to an artist on the site.";
+ break;
+ }
+ }
+
+ if ($Err) {
+ error($Err);
+ }
+
+ foreach ($ArtistIDs as $ArtistID) {
+ add_artist($CollageID, $ArtistID);
+ }
}
header("Location: collages.php?id=$CollageID");
diff --git a/sections/collages/add_torrent.php b/sections/collages/add_torrent.php
index c5e7228af..3c89c6b82 100644
--- a/sections/collages/add_torrent.php
+++ b/sections/collages/add_torrent.php
@@ -1,4 +1,4 @@
-query("
- SELECT MAX(Sort)
- FROM collages_torrents
- WHERE CollageID = '$CollageID'");
- list($Sort) = $DB->next_record();
- $Sort += 10;
-
- $DB->query("
- SELECT GroupID
- FROM collages_torrents
- WHERE CollageID = '$CollageID'
- AND GroupID = '$GroupID'");
- if (!$DB->has_results()) {
- $DB->query("
- INSERT IGNORE INTO collages_torrents
- (CollageID, GroupID, UserID, Sort, AddedOn)
- VALUES
- ('$CollageID', '$GroupID', '$LoggedUser[ID]', '$Sort', '" . sqltime() . "')");
-
- $DB->query("
- UPDATE collages
- SET NumTorrents = NumTorrents + 1, Updated = '" . sqltime() . "'
- WHERE ID = '$CollageID'");
-
- $Cache->delete_value("collage_$CollageID");
- $Cache->delete_value("torrents_details_$GroupID");
- $Cache->delete_value("torrent_collages_$GroupID");
- $Cache->delete_value("torrent_collages_personal_$GroupID");
-
- $DB->query("
- SELECT UserID
- FROM users_collage_subs
- WHERE CollageID = $CollageID");
- while (list($CacheUserID) = $DB->next_record()) {
- $Cache->delete_value("collage_subs_user_new_$CacheUserID");
- }
- }
+ global $Cache, $LoggedUser, $DB;
+
+ $DB->query("
+ SELECT MAX(Sort)
+ FROM collages_torrents
+ WHERE CollageID = '$CollageID'");
+ list($Sort) = $DB->next_record();
+ $Sort += 10;
+
+ $DB->query("
+ SELECT GroupID
+ FROM collages_torrents
+ WHERE CollageID = '$CollageID'
+ AND GroupID = '$GroupID'");
+ if (!$DB->has_results()) {
+ $DB->query("
+ INSERT IGNORE INTO collages_torrents
+ (CollageID, GroupID, UserID, Sort, AddedOn)
+ VALUES
+ ('$CollageID', '$GroupID', '$LoggedUser[ID]', '$Sort', '" . sqltime() . "')");
+
+ $DB->query("
+ UPDATE collages
+ SET NumTorrents = NumTorrents + 1, Updated = '" . sqltime() . "'
+ WHERE ID = '$CollageID'");
+
+ $Cache->delete_value("collage_$CollageID");
+ $Cache->delete_value("torrents_details_$GroupID");
+ $Cache->delete_value("torrent_collages_$GroupID");
+ $Cache->delete_value("torrent_collages_personal_$GroupID");
+
+ $DB->query("
+ SELECT UserID
+ FROM users_collage_subs
+ WHERE CollageID = $CollageID");
+ while (list($CacheUserID) = $DB->next_record()) {
+ $Cache->delete_value("collage_subs_user_new_$CacheUserID");
+ }
+ }
}
$CollageID = $_POST['collageid'];
if (!is_number($CollageID)) {
- error(404);
+ error(404);
}
$DB->query("
- SELECT UserID, CategoryID, Locked, NumTorrents, MaxGroups, MaxGroupsPerUser
- FROM collages
- WHERE ID = '$CollageID'");
+ SELECT UserID, CategoryID, Locked, NumTorrents, MaxGroups, MaxGroupsPerUser
+ FROM collages
+ WHERE ID = '$CollageID'");
list($UserID, $CategoryID, $Locked, $NumTorrents, $MaxGroups, $MaxGroupsPerUser) = $DB->next_record();
if (!check_perms('site_collages_delete')) {
- if ($Locked) {
- $Err = 'This collage is locked';
- }
- if ($CategoryID == 0 && $UserID != $LoggedUser['ID']) {
- $Err = 'You cannot edit someone else\'s personal collage.';
- }
- if ($MaxGroups > 0 && $NumTorrents >= $MaxGroups) {
- $Err = 'This collage already holds its maximum allowed number of torrents.';
- }
-
- if (isset($Err)) {
- error($Err);
- }
+ if ($Locked) {
+ $Err = 'This collage is locked';
+ }
+ if ($CategoryID == 0 && $UserID != $LoggedUser['ID']) {
+ $Err = 'You cannot edit someone else\'s personal collage.';
+ }
+ if ($MaxGroups > 0 && $NumTorrents >= $MaxGroups) {
+ $Err = 'This collage already holds its maximum allowed number of torrents.';
+ }
+
+ if (isset($Err)) {
+ error($Err);
+ }
}
if ($MaxGroupsPerUser > 0) {
- $DB->query("
- SELECT COUNT(*)
- FROM collages_torrents
- WHERE CollageID = '$CollageID'
- AND UserID = '$LoggedUser[ID]'");
- list($GroupsForUser) = $DB->next_record();
- if (!check_perms('site_collages_delete') && $GroupsForUser >= $MaxGroupsPerUser) {
- error(403);
- }
+ $DB->query("
+ SELECT COUNT(*)
+ FROM collages_torrents
+ WHERE CollageID = '$CollageID'
+ AND UserID = '$LoggedUser[ID]'");
+ list($GroupsForUser) = $DB->next_record();
+ if (!check_perms('site_collages_delete') && $GroupsForUser >= $MaxGroupsPerUser) {
+ error(403);
+ }
}
if ($_REQUEST['action'] == 'add_torrent') {
- $Val->SetFields('url', '1', 'regex', 'The URL must be a link to a torrent on the site.', array('regex' => '/^'.TORRENT_GROUP_REGEX.'/i'));
- $Err = $Val->ValidateForm($_POST);
-
- if ($Err) {
- error($Err);
- }
-
- $URL = $_POST['url'];
-
- // Get torrent ID
- preg_match('/^'.TORRENT_GROUP_REGEX.'/i', $URL, $Matches);
- $TorrentID = $Matches[4];
- if (!$TorrentID || (int)$TorrentID == 0) {
- error(404);
- }
-
- $DB->query("
- SELECT ID
- FROM torrents_group
- WHERE ID = '$TorrentID'");
- list($GroupID) = $DB->next_record();
- if (!$GroupID) {
- error('The torrent was not found in the database.');
- }
-
- add_torrent($CollageID, $GroupID);
+ $Val->SetFields('url', '1', 'regex', 'The URL must be a link to a torrent on the site.', array('regex' => '/^'.TORRENT_GROUP_REGEX.'/i'));
+ $Err = $Val->ValidateForm($_POST);
+
+ if ($Err) {
+ error($Err);
+ }
+
+ $URL = $_POST['url'];
+
+ // Get torrent ID
+ preg_match('/^'.TORRENT_GROUP_REGEX.'/i', $URL, $Matches);
+ $TorrentID = $Matches[4];
+ if (!$TorrentID || (int)$TorrentID == 0) {
+ error(404);
+ }
+
+ $DB->query("
+ SELECT ID
+ FROM torrents_group
+ WHERE ID = '$TorrentID'");
+ list($GroupID) = $DB->next_record();
+ if (!$GroupID) {
+ error('The torrent was not found in the database.');
+ }
+
+ add_torrent($CollageID, $GroupID);
} else {
- $URLs = explode("\n", $_REQUEST['urls']);
- $GroupIDs = array();
- $Err = '';
- foreach ($URLs as $Key => &$URL) {
- $URL = trim($URL);
- if ($URL == '') {
- unset($URLs[$Key]);
- }
- }
- unset($URL);
-
- if (!check_perms('site_collages_delete')) {
- if ($MaxGroups > 0 && ($NumTorrents + count($URLs) > $MaxGroups)) {
- $Err = "This collage can only hold $MaxGroups torrents.";
- }
- if ($MaxGroupsPerUser > 0 && ($GroupsForUser + count($URLs) > $MaxGroupsPerUser)) {
- $Err = "You may only have $MaxGroupsPerUser torrents in this collage.";
- }
- }
-
- foreach ($URLs as $URL) {
- $Matches = array();
- if (preg_match('/^'.TORRENT_GROUP_REGEX.'/i', $URL, $Matches)) {
- $GroupIDs[] = $Matches[4];
- $GroupID = $Matches[4];
- } else {
- $Err = "One of the entered URLs ($URL) does not correspond to a torrent group on the site.";
- break;
- }
-
- $DB->query("
- SELECT ID
- FROM torrents_group
- WHERE ID = '$GroupID'");
- if (!$DB->has_results()) {
- $Err = "One of the entered URLs ($URL) does not correspond to a torrent group on the site.";
- break;
- }
- }
-
- if ($Err) {
- error($Err);
- }
-
- foreach ($GroupIDs as $GroupID) {
- add_torrent($CollageID, $GroupID);
- }
+ $URLs = explode("\n", $_REQUEST['urls']);
+ $GroupIDs = [];
+ $Err = '';
+ foreach ($URLs as $Key => &$URL) {
+ $URL = trim($URL);
+ if ($URL == '') {
+ unset($URLs[$Key]);
+ }
+ }
+ unset($URL);
+
+ if (!check_perms('site_collages_delete')) {
+ if ($MaxGroups > 0 && ($NumTorrents + count($URLs) > $MaxGroups)) {
+ $Err = "This collage can only hold $MaxGroups torrents.";
+ }
+ if ($MaxGroupsPerUser > 0 && ($GroupsForUser + count($URLs) > $MaxGroupsPerUser)) {
+ $Err = "You may only have $MaxGroupsPerUser torrents in this collage.";
+ }
+ }
+
+ foreach ($URLs as $URL) {
+ $Matches = [];
+ if (preg_match('/^'.TORRENT_GROUP_REGEX.'/i', $URL, $Matches)) {
+ $GroupIDs[] = $Matches[4];
+ $GroupID = $Matches[4];
+ } else {
+ $Err = "One of the entered URLs ($URL) does not correspond to a torrent group on the site.";
+ break;
+ }
+
+ $DB->query("
+ SELECT ID
+ FROM torrents_group
+ WHERE ID = '$GroupID'");
+ if (!$DB->has_results()) {
+ $Err = "One of the entered URLs ($URL) does not correspond to a torrent group on the site.";
+ break;
+ }
+ }
+
+ if ($Err) {
+ error($Err);
+ }
+
+ foreach ($GroupIDs as $GroupID) {
+ add_torrent($CollageID, $GroupID);
+ }
}
header('Location: collages.php?id='.$CollageID);
diff --git a/sections/collages/all_comments.php b/sections/collages/all_comments.php
index e237d6184..5be166ab9 100644
--- a/sections/collages/all_comments.php
+++ b/sections/collages/all_comments.php
@@ -1,10 +1,10 @@
-query("
- SELECT Name
- FROM collages
- WHERE ID = '$CollageID'");
+ SELECT Name
+ FROM collages
+ WHERE ID = '$CollageID'");
list($Name) = $DB->next_record();
// Start printing
View::show_header("Comments for collage $Name", 'comments,bbcode,subscriptions');
?>
-
- IRC
-
-
-
-
+ If you have an IRC client, refer to this wiki article for information on how to connect. (IRC applet users are automatically identified with Drone.)
-
-
+ 'pageid',
- 'InputID' => $CollageID,
- 'Action' => 'comments.php?page=collages',
- 'InputAction' => 'take_post',
- 'TextareaCols' => 90,
- 'SubscribeBox' => true
- ));
- }
+ if ($ThreadInfo['MinClassWrite'] <= $LoggedUser['Class'] && !$LoggedUser['DisablePosting']) {
+ View::parse('generic/reply/quickreply.php', array(
+ 'InputName' => 'pageid',
+ 'InputID' => $CollageID,
+ 'Action' => 'comments.php?page=collages',
+ 'InputAction' => 'take_post',
+ 'TextareaCols' => 90,
+ 'SubscribeBox' => true
+ ));
+ }
}
?>
-
-
+
diff --git a/sections/collages/artist_collage.php b/sections/collages/artist_collage.php
index 372b0eb0d..2ec746249 100644
--- a/sections/collages/artist_collage.php
+++ b/sections/collages/artist_collage.php
@@ -1,298 +1,314 @@
-query("
- SELECT
- ca.ArtistID,
- ag.Name,
- aw.Image,
- ca.UserID
- FROM collages_artists AS ca
- JOIN artists_group AS ag ON ag.ArtistID = ca.ArtistID
- LEFT JOIN wiki_artists AS aw ON aw.RevisionID = ag.RevisionID
- WHERE ca.CollageID = '$CollageID'
- ORDER BY ca.Sort");
+ SELECT
+ ca.ArtistID,
+ ag.Name,
+ aw.Image,
+ ca.UserID
+ FROM collages_artists AS ca
+ JOIN artists_group AS ag ON ag.ArtistID = ca.ArtistID
+ LEFT JOIN wiki_artists AS aw ON aw.RevisionID = ag.RevisionID
+ WHERE ca.CollageID = '$CollageID'
+ ORDER BY ca.Sort");
$Artists = $DB->to_array('ArtistID', MYSQLI_ASSOC);
// Loop through the result set, building up $Collage and $TorrentTable
// Then we print them.
-$Collage = array();
+$Collage = [];
$ArtistTable = '';
$NumGroups = count($Artists);
$NumGroupsByUser = 0;
-$UserAdditions = array();
+$UserAdditions = [];
foreach ($Artists as $Artist) {
- $UserID = $Artist['UserID'];
- if ($UserID == $LoggedUser['ID']) {
- $NumGroupsByUser++;
- }
+ $UserID = $Artist['UserID'];
+ if ($UserID == $LoggedUser['ID']) {
+ $NumGroupsByUser++;
+ }
- if (!isset($UserAdditions[$UserID])) {
- $UserAdditions[$UserID] = 0;
- }
- $UserAdditions[$UserID]++;
+ if (!isset($UserAdditions[$UserID])) {
+ $UserAdditions[$UserID] = 0;
+ }
+ $UserAdditions[$UserID]++;
- ob_start();
+ ob_start();
?>
-
-
-
+
+
+
-
+
-
-
-
+
-
-
+ View all comments
+
- List of collages
-
- New collage
-
-
- - - + +
-
+
+ - - - + +
+ List of collages
+
+ New collage
+
+
+ + + - Edit description - - Locked -" class="brackets">Edit description + + Locked + - Remove bookmark - - Bookmark -" class="brackets" onclick="Unbookmark('collage', , 'Bookmark'); return false;">Remove bookmark + + Bookmark + - Manage artists - - Report collage - - Delete - -
- + + + - Edit description - - Locked -" class="brackets">Edit description + + Locked + - Remove bookmark - - Bookmark -" class="brackets" onclick="Unbookmark('collage', , 'Bookmark'); return false;">Remove bookmark + + Bookmark + - Manage artists - - Report collage - - Delete - -
+
+
+ Add ArtistsBatch add
+
+
+
+
+ Comments
+query(" - SELECT - c.ID, - c.Body, - c.AuthorID, - um.Username, - c.AddedTime - FROM comments AS c - LEFT JOIN users_main AS um ON um.ID = c.AuthorID - WHERE c.Page = 'collages' - AND c.PageID = $CollageID - ORDER BY c.ID DESC - LIMIT 15"); - $CommentList = $DB->to_array(false, MYSQLI_NUM); + $DB->query(" + SELECT + c.ID, + c.Body, + c.AuthorID, + um.Username, + c.AddedTime + FROM comments AS c + LEFT JOIN users_main AS um ON um.ID = c.AuthorID + WHERE c.Page = 'collages' + AND c.PageID = $CollageID + ORDER BY c.ID DESC + LIMIT 15"); + $CommentList = $DB->to_array(false, MYSQLI_NUM); } foreach ($CommentList as $Comment) { - list($CommentID, $Body, $UserID, $Username, $CommentTime) = $Comment; + list($CommentID, $Body, $UserID, $Username, $CommentTime) = $Comment; ?> -
+
+
+ Report +
+
+ + Report +
-
-
+ Add comment
-
- Add comment
+
+
-
+
-
+
-
+
+
-
diff --git a/sections/collages/browse.php b/sections/collages/browse.php
index ab3c4328f..29b7ccbb4 100644
--- a/sections/collages/browse.php
+++ b/sections/collages/browse.php
@@ -11,150 +11,150 @@
// Are we searching in bodies, or just names?
if (!empty($_GET['type'])) {
- $Type = $_GET['type'];
- if (!in_array($Type, array('c.name', 'description'))) {
- $Type = 'c.name';
- }
+ $Type = $_GET['type'];
+ if (!in_array($Type, array('c.name', 'description'))) {
+ $Type = 'c.name';
+ }
} else {
- $Type = 'c.name';
+ $Type = 'c.name';
}
if (!empty($_GET['search'])) {
- // What are we looking for? Let's make sure it isn't dangerous.
- $Search = db_string(trim($_GET['search']));
- // Break search string down into individual words
- $Words = explode(' ', $Search);
+ // What are we looking for? Let's make sure it isn't dangerous.
+ $Search = db_string(trim($_GET['search']));
+ // Break search string down into individual words
+ $Words = explode(' ', $Search);
}
if (!empty($_GET['tags'])) {
- $Tags = explode(',', db_string(trim($_GET['tags'])));
- foreach ($Tags as $ID => $Tag) {
- $Tags[$ID] = Misc::sanitize_tag($Tag);
- }
+ $Tags = explode(',', db_string(trim($_GET['tags'])));
+ foreach ($Tags as $ID => $Tag) {
+ $Tags[$ID] = Misc::sanitize_tag($Tag);
+ }
}
if (!empty($_GET['cats'])) {
- $Categories = $_GET['cats'];
- foreach ($Categories as $Cat => $Accept) {
- if (empty($CollageCats[$Cat]) || !$Accept) {
- unset($Categories[$Cat]);
- }
- }
- $Categories = array_keys($Categories);
+ $Categories = $_GET['cats'];
+ foreach ($Categories as $Cat => $Accept) {
+ if (empty($CollageCats[$Cat]) || !$Accept) {
+ unset($Categories[$Cat]);
+ }
+ }
+ $Categories = array_keys($Categories);
} else {
- $Categories = array(1, 2, 3, 4, 5, 6, 7);
+ $Categories = array(1, 2, 3, 4, 5, 6, 7);
}
// Ordering
if (!empty($_GET['order_by']) && !empty($OrderTable[$_GET['order_by']])) {
- $Order = $OrderTable[$_GET['order_by']];
+ $Order = $OrderTable[$_GET['order_by']];
} else {
- $Order = 'ID';
+ $Order = 'ID';
}
if (!empty($_GET['order_way']) && !empty($WayTable[$_GET['order_way']])) {
- $Way = $WayTable[$_GET['order_way']];
+ $Way = $WayTable[$_GET['order_way']];
} else {
- $Way = 'DESC';
+ $Way = 'DESC';
}
$BookmarkView = !empty($_GET['bookmarks']);
if ($BookmarkView) {
- $Categories[] = 0;
- $BookmarkJoin = 'INNER JOIN bookmarks_collages AS bc ON c.ID = bc.CollageID';
+ $Categories[] = 0;
+ $BookmarkJoin = 'INNER JOIN bookmarks_collages AS bc ON c.ID = bc.CollageID';
} else {
- $BookmarkJoin = '';
+ $BookmarkJoin = '';
}
$BaseSQL = $SQL = "
- SELECT
- SQL_CALC_FOUND_ROWS
- c.ID,
- c.Name,
- c.NumTorrents,
- c.TagList,
- c.CategoryID,
- c.UserID,
- c.Subscribers,
- c.Updated
- FROM collages AS c
- $BookmarkJoin
- WHERE Deleted = '0'";
+ SELECT
+ SQL_CALC_FOUND_ROWS
+ c.ID,
+ c.Name,
+ c.NumTorrents,
+ c.TagList,
+ c.CategoryID,
+ c.UserID,
+ c.Subscribers,
+ c.Updated
+ FROM collages AS c
+ $BookmarkJoin
+ WHERE Deleted = '0'";
if ($BookmarkView) {
- $SQL .= " AND bc.UserID = '" . $LoggedUser['ID'] . "'";
+ $SQL .= " AND bc.UserID = '" . $LoggedUser['ID'] . "'";
}
if (!empty($Search)) {
- $SQL .= " AND $Type LIKE '%";
- $SQL .= implode("%' AND $Type LIKE '%", $Words);
- $SQL .= "%'";
+ $SQL .= " AND $Type LIKE '%";
+ $SQL .= implode("%' AND $Type LIKE '%", $Words);
+ $SQL .= "%'";
}
if (isset($_GET['tags_type']) && $_GET['tags_type'] === '0') { // Any
- $_GET['tags_type'] = '0';
+ $_GET['tags_type'] = '0';
} else { // All
- $_GET['tags_type'] = '1';
+ $_GET['tags_type'] = '1';
}
if (!empty($Tags)) {
- $SQL.= " AND (TagList LIKE '%";
- if ($_GET['tags_type'] === '0') {
- $SQL .= implode("%' OR TagList LIKE '%", $Tags);
- } else {
- $SQL .= implode("%' AND TagList LIKE '%", $Tags);
- }
- $SQL .= "%')";
+ $SQL.= " AND (TagList LIKE '%";
+ if ($_GET['tags_type'] === '0') {
+ $SQL .= implode("%' OR TagList LIKE '%", $Tags);
+ } else {
+ $SQL .= implode("%' AND TagList LIKE '%", $Tags);
+ }
+ $SQL .= "%')";
}
if (!empty($_GET['userid'])) {
- $UserID = $_GET['userid'];
- if (!is_number($UserID)) {
- error(404);
- }
- $User = Users::user_info($UserID);
- $Perms = Permissions::get_permissions($User['PermissionID']);
- $UserClass = $Perms['Class'];
+ $UserID = $_GET['userid'];
+ if (!is_number($UserID)) {
+ error(404);
+ }
+ $User = Users::user_info($UserID);
+ $Perms = Permissions::get_permissions($User['PermissionID']);
+ $UserClass = $Perms['Class'];
- $UserLink = ''.$User['Username'].'';
- if (!empty($_GET['contrib'])) {
- if (!check_paranoia('collagecontribs', $User['Paranoia'], $UserClass, $UserID)) {
- error(403);
- }
- $DB->query("
- SELECT DISTINCT CollageID
- FROM collages_torrents
- WHERE UserID = $UserID");
- $CollageIDs = $DB->collect('CollageID');
- if (empty($CollageIDs)) {
- $SQL .= " AND 0";
- } else {
- $SQL .= " AND c.ID IN(".db_string(implode(',', $CollageIDs)).')';
- }
- } else {
- if (!check_paranoia('collages', $User['Paranoia'], $UserClass, $UserID)) {
- error(403);
- }
- $SQL .= " AND UserID = '".$_GET['userid']."'";
- }
- $Categories[] = 0;
+ $UserLink = ''.$User['Username'].'';
+ if (!empty($_GET['contrib'])) {
+ if (!check_paranoia('collagecontribs', $User['Paranoia'], $UserClass, $UserID)) {
+ error(403);
+ }
+ $DB->query("
+ SELECT DISTINCT CollageID
+ FROM collages_torrents
+ WHERE UserID = $UserID");
+ $CollageIDs = $DB->collect('CollageID');
+ if (empty($CollageIDs)) {
+ $SQL .= " AND 0";
+ } else {
+ $SQL .= " AND c.ID IN(".db_string(implode(',', $CollageIDs)).')';
+ }
+ } else {
+ if (!check_paranoia('collages', $User['Paranoia'], $UserClass, $UserID)) {
+ error(403);
+ }
+ $SQL .= " AND UserID = '".$_GET['userid']."'";
+ }
+ $Categories[] = 0;
}
if (!empty($Categories)) {
- $SQL .= " AND CategoryID IN(".db_string(implode(',', $Categories)).')';
+ $SQL .= " AND CategoryID IN(".db_string(implode(',', $Categories)).')';
}
if (isset($_GET['action']) && $_GET['action'] === 'mine') {
- $SQL = $BaseSQL;
- $SQL .= "
- AND c.UserID = '".$LoggedUser['ID']."'
- AND c.CategoryID = 0";
+ $SQL = $BaseSQL;
+ $SQL .= "
+ AND c.UserID = '".$LoggedUser['ID']."'
+ AND c.CategoryID = 0";
}
$SQL .= "
- ORDER BY $Order $Way
- LIMIT $Limit";
+ ORDER BY $Order $Way
+ LIMIT $Limit";
$DB->query($SQL);
$Collages = $DB->to_array();
$DB->query('SELECT FOUND_ROWS()');
@@ -163,182 +163,189 @@
View::show_header(($BookmarkView) ? 'Your bookmarked collages' : 'Browse collages');
?>
+
-
+ $CollageCovers) { ?>
+
+
+
-
-
- $CollageCovers) { ?>
-
-
-
+ Cover Art
- -
-
+
Cover Art
+ -
+
-
| Artists | -
| Artists | +
-
+
-
-
-
- Your bookmarked collages
- -Browse collages
- -
-
-
-
-
-
+
+
+
+ Your bookmarked collages
+ +Browse collages
+ +
+
+
+
+
+
- New collage
-New collage
+query("
- SELECT ID
- FROM collages
- WHERE UserID = '$LoggedUser[ID]'
- AND CategoryID = '0'
- AND Deleted = '0'");
- $CollageCount = $DB->record_count();
+ $DB->query("
+ SELECT ID
+ FROM collages
+ WHERE UserID = '$LoggedUser[ID]'
+ AND CategoryID = '0'
+ AND Deleted = '0'");
+ $CollageCount = $DB->record_count();
- if ($CollageCount === 1) {
- list($CollageID) = $DB->next_record();
+ if ($CollageCount === 1) {
+ list($CollageID) = $DB->next_record();
?>
- Personal collage
- 1) { ?>
- Personal collages
-" class="brackets">Personal collage
+ 1) { ?>
+ Personal collages
+
- Subscribed collages
-
- Bookmarked collages
-
- Recover collage
-Subscribed collages
+
+ Bookmarked collages
+
+ Recover collage
+
-
- - Collages you started - Collages you contributed to - Random collage -
- - Torrents - Artists - Collages - Requests -
- + + Collages you started + Collages you contributed to + Random collage +
+ + Torrents + Artists + Collages + Requests +
+ -
-
+ - - Collages you started - Collages you contributed to - Random collage -
- - Torrents - Artists - Collages - Requests -
- + + Collages you started + Collages you contributed to + Random collage +
+ + Torrents + Artists + Collages + Requests +
+ -
-
-
-
You have not bookmarked any collages.
- -Your search did not match anything.
-Make sure all names are spelled correctly, or try making your search less specific.
- + +You have not bookmarked any collages.
+ +Your search did not match anything.
+Make sure all names are spelled correctly, or try making your search less specific.
+| Category | -Collage | -Torrents | -Subscribers | -Updated | -Author | -Category | +Collage | +Torrents | +Subscribers | +Updated | +Author | + + -
| - - | -- - - - Remove bookmark - - - - | -- | - | - | - | + + | ++ + + + Remove bookmark + + + + | ++ | + | + | + + |
-
+
-
diff --git a/sections/collages/download.php b/sections/collages/download.php
index 2cb392ffb..384cf9388 100644
--- a/sections/collages/download.php
+++ b/sections/collages/download.php
@@ -1,4 +1,4 @@
- 2
- || count($_REQUEST['list']) === 0
+ !isset($_REQUEST['collageid'])
+ || !isset($_REQUEST['preference'])
+ || !is_number($_REQUEST['preference'])
+ || !is_number($_REQUEST['collageid'])
+ || $_REQUEST['preference'] > 2
+ || count($_REQUEST['list']) === 0
) {
- error(0);
+ error(0);
}
if (!check_perms('zip_downloader')) {
- error(403);
+ error(403);
}
-$Preferences = array('RemasterTitle DESC', 'Seeders ASC', 'Size ASC');
+$Preferences = array('t.RemasterTitle DESC', 'tls.Seeders ASC', 't.Size ASC');
$CollageID = $_REQUEST['collageid'];
$Preference = $Preferences[$_REQUEST['preference']];
-$DB->query("
- SELECT Name
- FROM collages
- WHERE ID = '$CollageID'");
+$DB->prepared_query('
+ SELECT Name
+ FROM collages
+ WHERE ID = ?
+ ', $CollageID
+);
list($CollageName) = $DB->next_record(MYSQLI_NUM, false);
$SQL = 'SELECT CASE ';
foreach ($_REQUEST['list'] as $Priority => $Selection) {
- if (!is_number($Priority)) {
- continue;
- }
- $SQL .= 'WHEN ';
- switch ($Selection) {
- case '00': $SQL .= "t.Format = 'MP3' AND t.Encoding = 'V0 (VBR)'"; break;
- case '01': $SQL .= "t.Format = 'MP3' AND t.Encoding = 'APX (VBR)'"; break;
- case '02': $SQL .= "t.Format = 'MP3' AND t.Encoding = '256 (VBR)'"; break;
- case '03': $SQL .= "t.Format = 'MP3' AND t.Encoding = 'V1 (VBR)'"; break;
- case '10': $SQL .= "t.Format = 'MP3' AND t.Encoding = '224 (VBR)'"; break;
- case '11': $SQL .= "t.Format = 'MP3' AND t.Encoding = 'V2 (VBR)'"; break;
- case '12': $SQL .= "t.Format = 'MP3' AND t.Encoding = 'APS (VBR)'"; break;
- case '13': $SQL .= "t.Format = 'MP3' AND t.Encoding = '192 (VBR)'"; break;
- case '20': $SQL .= "t.Format = 'MP3' AND t.Encoding = '320'"; break;
- case '21': $SQL .= "t.Format = 'MP3' AND t.Encoding = '256'"; break;
- case '22': $SQL .= "t.Format = 'MP3' AND t.Encoding = '224'"; break;
- case '23': $SQL .= "t.Format = 'MP3' AND t.Encoding = '192'"; break;
- case '30': $SQL .= "t.Format = 'FLAC' AND t.Encoding = '24bit Lossless' AND t.Media = 'Vinyl'"; break;
- case '31': $SQL .= "t.Format = 'FLAC' AND t.Encoding = '24bit Lossless' AND t.Media = 'DVD'"; break;
- case '32': $SQL .= "t.Format = 'FLAC' AND t.Encoding = '24bit Lossless' AND t.Media = 'SACD'"; break;
- case '33': $SQL .= "t.Format = 'FLAC' AND t.Encoding = '24bit Lossless' AND t.Media = 'WEB'"; break;
- case '34': $SQL .= "t.Format = 'FLAC' AND t.Encoding = 'Lossless' AND HasLog = '1' AND LogScore = '100' AND HasCue = '1'"; break;
- case '35': $SQL .= "t.Format = 'FLAC' AND t.Encoding = 'Lossless' AND HasLog = '1' AND LogScore = '100'"; break;
- case '36': $SQL .= "t.Format = 'FLAC' AND t.Encoding = 'Lossless' AND HasLog = '1'"; break;
- case '37': $SQL .= "t.Format = 'FLAC' AND t.Encoding = 'Lossless'"; break;
- case '40': $SQL .= "t.Format = 'DTS'"; break;
- case '42': $SQL .= "t.Format = 'AAC' AND t.Encoding = '320'"; break;
- case '43': $SQL .= "t.Format = 'AAC' AND t.Encoding = '256'"; break;
- case '44': $SQL .= "t.Format = 'AAC' AND t.Encoding = 'q5.5'"; break;
- case '45': $SQL .= "t.Format = 'AAC' AND t.Encoding = 'q5'"; break;
- case '46': $SQL .= "t.Format = 'AAC' AND t.Encoding = '192'"; break;
- default: error(0);
- }
- $SQL .= " THEN $Priority ";
+ if (!is_number($Priority)) {
+ continue;
+ }
+ $SQL .= 'WHEN ';
+ switch ($Selection) {
+ case '00': $SQL .= "t.Format = 'MP3' AND t.Encoding = 'V0 (VBR)'"; break;
+ case '01': $SQL .= "t.Format = 'MP3' AND t.Encoding = 'APX (VBR)'"; break;
+ case '02': $SQL .= "t.Format = 'MP3' AND t.Encoding = '256 (VBR)'"; break;
+ case '03': $SQL .= "t.Format = 'MP3' AND t.Encoding = 'V1 (VBR)'"; break;
+ case '10': $SQL .= "t.Format = 'MP3' AND t.Encoding = '224 (VBR)'"; break;
+ case '11': $SQL .= "t.Format = 'MP3' AND t.Encoding = 'V2 (VBR)'"; break;
+ case '12': $SQL .= "t.Format = 'MP3' AND t.Encoding = 'APS (VBR)'"; break;
+ case '13': $SQL .= "t.Format = 'MP3' AND t.Encoding = '192 (VBR)'"; break;
+ case '20': $SQL .= "t.Format = 'MP3' AND t.Encoding = '320'"; break;
+ case '21': $SQL .= "t.Format = 'MP3' AND t.Encoding = '256'"; break;
+ case '22': $SQL .= "t.Format = 'MP3' AND t.Encoding = '224'"; break;
+ case '23': $SQL .= "t.Format = 'MP3' AND t.Encoding = '192'"; break;
+ case '30': $SQL .= "t.Format = 'FLAC' AND t.Encoding = '24bit Lossless' AND t.Media = 'Vinyl'"; break;
+ case '31': $SQL .= "t.Format = 'FLAC' AND t.Encoding = '24bit Lossless' AND t.Media = 'DVD'"; break;
+ case '32': $SQL .= "t.Format = 'FLAC' AND t.Encoding = '24bit Lossless' AND t.Media = 'SACD'"; break;
+ case '33': $SQL .= "t.Format = 'FLAC' AND t.Encoding = '24bit Lossless' AND t.Media = 'WEB'"; break;
+ case '34': $SQL .= "t.Format = 'FLAC' AND t.Encoding = 'Lossless' AND HasLog = '1' AND LogScore = '100' AND HasCue = '1'"; break;
+ case '35': $SQL .= "t.Format = 'FLAC' AND t.Encoding = 'Lossless' AND HasLog = '1' AND LogScore = '100'"; break;
+ case '36': $SQL .= "t.Format = 'FLAC' AND t.Encoding = 'Lossless' AND HasLog = '1'"; break;
+ case '37': $SQL .= "t.Format = 'FLAC' AND t.Encoding = 'Lossless'"; break;
+ case '40': $SQL .= "t.Format = 'DTS'"; break;
+ case '42': $SQL .= "t.Format = 'AAC' AND t.Encoding = '320'"; break;
+ case '43': $SQL .= "t.Format = 'AAC' AND t.Encoding = '256'"; break;
+ case '44': $SQL .= "t.Format = 'AAC' AND t.Encoding = 'q5.5'"; break;
+ case '45': $SQL .= "t.Format = 'AAC' AND t.Encoding = 'q5'"; break;
+ case '46': $SQL .= "t.Format = 'AAC' AND t.Encoding = '192'"; break;
+ default: error(0);
+ }
+ $SQL .= " THEN $Priority ";
}
$SQL .= "
- ELSE 100
- END AS Rank,
- t.GroupID,
- t.ID AS TorrentID,
- t.Media,
- t.Format,
- t.Encoding,
- IF(t.RemasterYear = 0, tg.Year, t.RemasterYear) AS Year,
- tg.Name,
- t.Size
+ ELSE 100
+ END AS Rank,
+ t.GroupID,
+ t.ID AS TorrentID,
+ t.Media,
+ t.Format,
+ t.Encoding,
+ IF(t.RemasterYear = 0, tg.Year, t.RemasterYear) AS Year,
+ tg.Name,
+ t.Size
FROM torrents AS t
- INNER JOIN collages_torrents AS c ON t.GroupID = c.GroupID AND c.CollageID = '$CollageID'
- INNER JOIN torrents_group AS tg ON tg.ID = t.GroupID AND tg.CategoryID = '1'
-ORDER BY t.GroupID ASC, Rank DESC, t.$Preference";
+INNER JOIN torrents_leech_stats tls ON (tls.TorrentID = t.ID) /* FIXME: only needed if sorting by Seeders */
+INNER JOIN collages_torrents AS c ON (t.GroupID = c.GroupID AND c.CollageID = '$CollageID')
+INNER JOIN torrents_group AS tg ON (tg.ID = t.GroupID AND tg.CategoryID = '1')
+ORDER BY t.GroupID ASC, Rank DESC, $Preference";
$DownloadsQ = $DB->query($SQL);
$Collector = new TorrentsDL($DownloadsQ, $CollageName);
while (list($Downloads, $GroupIDs) = $Collector->get_downloads('GroupID')) {
- $Artists = Artists::get_artists($GroupIDs);
- $TorrentFilesQ = $DB->query("
- SELECT TorrentID, File
- FROM torrents_files
- WHERE TorrentID IN (".implode(',', array_keys($GroupIDs)).')', false);
- if (is_int($TorrentFilesQ)) {
- // Query failed. Let's not create a broken zip archive
- foreach ($GroupIDs as $GroupID) {
- $Download =& $Downloads[$GroupID];
- $Download['Artist'] = Artists::display_artists($Artists[$GroupID], false, true, false);
- $Collector->fail_file($Download);
- }
- continue;
- }
- while (list($TorrentID, $TorrentFile) = $DB->next_record(MYSQLI_NUM, false)) {
- $GroupID = $GroupIDs[$TorrentID];
- $Download =& $Downloads[$GroupID];
- $Download['Artist'] = Artists::display_artists($Artists[$Download['GroupID']], false, true, false);
- if ($Download['Rank'] == 100) {
- $Collector->skip_file($Download);
- continue;
- }
- $Collector->add_file($TorrentFile, $Download);
- unset($Download);
- }
+ $Artists = Artists::get_artists($GroupIDs);
+ $TorrentFilesQ = $DB->query("
+ SELECT TorrentID, File
+ FROM torrents_files
+ WHERE TorrentID IN (".implode(',', array_keys($GroupIDs)).')', false);
+ if (is_int($TorrentFilesQ)) {
+ // Query failed. Let's not create a broken zip archive
+ foreach ($GroupIDs as $GroupID) {
+ $Download =& $Downloads[$GroupID];
+ $Download['Artist'] = Artists::display_artists($Artists[$GroupID], false, true, false);
+ $Collector->fail_file($Download);
+ }
+ continue;
+ }
+ while (list($TorrentID, $TorrentFile) = $DB->next_record(MYSQLI_NUM, false)) {
+ $GroupID = $GroupIDs[$TorrentID];
+ $Download =& $Downloads[$GroupID];
+ $Download['Artist'] = Artists::display_artists($Artists[$Download['GroupID']], false, true, false);
+ if ($Download['Rank'] == 100) {
+ $Collector->skip_file($Download);
+ continue;
+ }
+ $Collector->add_file($TorrentFile, $Download);
+ unset($Download);
+ }
}
$Collector->finalize();
$Settings = array(implode(':', $_REQUEST['list']), $_REQUEST['preference']);
if (!isset($LoggedUser['Collector']) || $LoggedUser['Collector'] != $Settings) {
- Users::update_site_options($LoggedUser['ID'], array('Collector' => $Settings));
+ Users::update_site_options($LoggedUser['ID'], array('Collector' => $Settings));
}
define('SKIP_NO_CACHE_HEADERS', 1);
-?>
diff --git a/sections/collages/edit.php b/sections/collages/edit.php
index c8efb33e6..07a098e07 100644
--- a/sections/collages/edit.php
+++ b/sections/collages/edit.php
@@ -1,102 +1,107 @@
-query("
- SELECT Name, Description, TagList, UserID, CategoryID, Locked, MaxGroups, MaxGroupsPerUser, Featured
- FROM collages
- WHERE ID = '$CollageID'");
+ SELECT Name, Description, TagList, UserID, CategoryID, Locked, MaxGroups, MaxGroupsPerUser, Featured
+ FROM collages
+ WHERE ID = '$CollageID'");
list($Name, $Description, $TagList, $UserID, $CategoryID, $Locked, $MaxGroups, $MaxGroupsPerUser, $Featured) = $DB->next_record();
$TagList = implode(', ', explode(' ', $TagList));
if ($CategoryID == 0 && $UserID != $LoggedUser['ID'] && !check_perms('site_collages_delete')) {
- error(403);
+ error(403);
}
View::show_header('Edit collage');
if (!empty($Err)) {
- if (isset($ErrNoEscape)) {
- echo '';
- } else {
- echo '';
- }
+ if (isset($ErrNoEscape)) {
+ echo '';
+ } else {
+ echo '';
+ }
}
?>
-
+
diff --git a/sections/collages/edit_handle.php b/sections/collages/edit_handle.php
index 98e995b32..106490cf6 100644
--- a/sections/collages/edit_handle.php
+++ b/sections/collages/edit_handle.php
@@ -1,88 +1,88 @@
-query("
- SELECT UserID, CategoryID, Locked, MaxGroups, MaxGroupsPerUser
- FROM collages
- WHERE ID = '$CollageID'");
+ SELECT UserID, CategoryID, Locked, MaxGroups, MaxGroupsPerUser
+ FROM collages
+ WHERE ID = '$CollageID'");
list($UserID, $CategoryID, $Locked, $MaxGroups, $MaxGroupsPerUser) = $DB->next_record();
if ($CategoryID == 0 && $UserID != $LoggedUser['ID'] && !check_perms('site_collages_delete')) {
- error(403);
+ error(403);
}
if (isset($_POST['name'])) {
- $DB->query("
- SELECT ID, Deleted
- FROM collages
- WHERE Name = '".db_string($_POST['name'])."'
- AND ID != '$CollageID'
- LIMIT 1");
- if ($DB->has_results()) {
- list($ID, $Deleted) = $DB->next_record();
- if ($Deleted) {
- $Err = 'A collage with that name already exists but needs to be recovered, please contact the staff team!';
- } else {
- $Err = "A collage with that name already exists: $_POST[name].";
- }
- $ErrNoEscape = true;
- include(SERVER_ROOT.'/sections/collages/edit.php');
- die();
- }
+ $DB->query("
+ SELECT ID, Deleted
+ FROM collages
+ WHERE Name = '".db_string($_POST['name'])."'
+ AND ID != '$CollageID'
+ LIMIT 1");
+ if ($DB->has_results()) {
+ list($ID, $Deleted) = $DB->next_record();
+ if ($Deleted) {
+ $Err = 'A collage with that name already exists but needs to be recovered, please contact the staff team!';
+ } else {
+ $Err = "A collage with that name already exists: $_POST[name].";
+ }
+ $ErrNoEscape = true;
+ include(SERVER_ROOT.'/sections/collages/edit.php');
+ die();
+ }
}
$TagList = explode(',', $_POST['tags']);
foreach ($TagList as $ID => $Tag) {
- $TagList[$ID] = Misc::sanitize_tag($Tag);
+ $TagList[$ID] = Misc::sanitize_tag($Tag);
}
$TagList = implode(' ', $TagList);
$Updates = array("Description='".db_string($_POST['description'])."', TagList='".db_string($TagList)."'");
if (!check_perms('site_collages_delete') && ($CategoryID == 0 && $UserID == $LoggedUser['ID'] && check_perms('site_collages_renamepersonal'))) {
- if (!stristr($_POST['name'], $LoggedUser['Username'])) {
- error("Your personal collage's title must include your username.");
- }
+ if (!stristr($_POST['name'], $LoggedUser['Username'])) {
+ error("Your personal collage's title must include your username.");
+ }
}
if (isset($_POST['featured']) && $CategoryID == 0 && (($LoggedUser['ID'] == $UserID && check_perms('site_collages_personal')) || check_perms('site_collages_delete'))) {
- $DB->query("
- UPDATE collages
- SET Featured = 0
- WHERE CategoryID = 0
- AND UserID = $UserID");
- $Updates[] = 'Featured = 1';
+ $DB->query("
+ UPDATE collages
+ SET Featured = 0
+ WHERE CategoryID = 0
+ AND UserID = $UserID");
+ $Updates[] = 'Featured = 1';
}
if (check_perms('site_collages_delete') || ($CategoryID == 0 && $UserID == $LoggedUser['ID'] && check_perms('site_collages_renamepersonal'))) {
- $Updates[] = "Name = '".db_string($_POST['name'])."'";
+ $Updates[] = "Name = '".db_string($_POST['name'])."'";
}
if (isset($_POST['category']) && !empty($CollageCats[$_POST['category']]) && $_POST['category'] != $CategoryID && ($_POST['category'] != 0 || check_perms('site_collages_delete'))) {
- $Updates[] = 'CategoryID = '.$_POST['category'];
+ $Updates[] = 'CategoryID = '.$_POST['category'];
}
if (check_perms('site_collages_delete')) {
- if (isset($_POST['locked']) != $Locked) {
- $Updates[] = 'Locked = ' . ($Locked ? "'0'" : "'1'");
- }
- if (isset($_POST['maxgroups']) && ($_POST['maxgroups'] == 0 || is_number($_POST['maxgroups'])) && $_POST['maxgroups'] != $MaxGroups) {
- $Updates[] = 'MaxGroups = ' . $_POST['maxgroups'];
- }
- if (isset($_POST['maxgroups']) && ($_POST['maxgroupsperuser'] == 0 || is_number($_POST['maxgroupsperuser'])) && $_POST['maxgroupsperuser'] != $MaxGroupsPerUser) {
- $Updates[] = 'MaxGroupsPerUser = ' . $_POST['maxgroupsperuser'];
- }
+ if (isset($_POST['locked']) != $Locked) {
+ $Updates[] = 'Locked = ' . ($Locked ? "'0'" : "'1'");
+ }
+ if (isset($_POST['maxgroups']) && ($_POST['maxgroups'] == 0 || is_number($_POST['maxgroups'])) && $_POST['maxgroups'] != $MaxGroups) {
+ $Updates[] = 'MaxGroups = ' . $_POST['maxgroups'];
+ }
+ if (isset($_POST['maxgroups']) && ($_POST['maxgroupsperuser'] == 0 || is_number($_POST['maxgroupsperuser'])) && $_POST['maxgroupsperuser'] != $MaxGroupsPerUser) {
+ $Updates[] = 'MaxGroupsPerUser = ' . $_POST['maxgroupsperuser'];
+ }
}
if (!empty($Updates)) {
- $DB->query('
- UPDATE collages
- SET '.implode(', ', $Updates)."
- WHERE ID = $CollageID");
+ $DB->query('
+ UPDATE collages
+ SET '.implode(', ', $Updates)."
+ WHERE ID = $CollageID");
}
$Cache->delete_value('collage_'.$CollageID);
header('Location: collages.php?id='.$CollageID);
diff --git a/sections/collages/index.php b/sections/collages/index.php
index 6a0a45bcd..d21b78583 100644
--- a/sections/collages/index.php
+++ b/sections/collages/index.php
@@ -1,108 +1,108 @@
-
diff --git a/sections/collages/manage.php b/sections/collages/manage.php
index d6aa88c85..0f05fcebb 100644
--- a/sections/collages/manage.php
+++ b/sections/collages/manage.php
@@ -1,146 +1,147 @@
-query("
- SELECT Name, UserID, CategoryID
- FROM collages
- WHERE ID = '$CollageID'");
+ SELECT Name, UserID, CategoryID
+ FROM collages
+ WHERE ID = '$CollageID'");
list($Name, $UserID, $CategoryID) = $DB->next_record();
if ($CategoryID == 0 && $UserID != $LoggedUser['ID'] && !check_perms('site_collages_delete')) {
- error(403);
+ error(403);
}
if ($CategoryID == array_search(ARTIST_COLLAGE, $CollageCats)) {
- error(404);
+ error(404);
}
$DB->query("
- SELECT
- ct.GroupID,
- um.ID,
- um.Username,
- ct.Sort,
- tg.CatalogueNumber
- FROM collages_torrents AS ct
- JOIN torrents_group AS tg ON tg.ID = ct.GroupID
- LEFT JOIN users_main AS um ON um.ID = ct.UserID
- WHERE ct.CollageID = '$CollageID'
- ORDER BY ct.Sort");
+ SELECT
+ ct.GroupID,
+ um.ID,
+ um.Username,
+ ct.Sort,
+ tg.CatalogueNumber
+ FROM collages_torrents AS ct
+ JOIN torrents_group AS tg ON tg.ID = ct.GroupID
+ LEFT JOIN users_main AS um ON um.ID = ct.UserID
+ WHERE ct.CollageID = '$CollageID'
+ ORDER BY ct.Sort");
$GroupIDs = $DB->collect('GroupID');
$CollageDataList = $DB->to_array('GroupID', MYSQLI_ASSOC);
if (count($GroupIDs) > 0) {
- $TorrentList = Torrents::get_groups($GroupIDs);
+ $TorrentList = Torrents::get_groups($GroupIDs);
} else {
- $TorrentList = array();
+ $TorrentList = [];
}
View::show_header("Manage collage: $Name", 'jquery-ui,jquery.tablesorter,sort');
?>
-
+
- Delete collage
-
-
-
-
-
+ Reason:
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
-
-
+
+
+
+
+
+
+
+
-
+
diff --git a/sections/collages/manage_artists.php b/sections/collages/manage_artists.php
index ee6380d2b..b306e1ba5 100644
--- a/sections/collages/manage_artists.php
+++ b/sections/collages/manage_artists.php
@@ -1,33 +1,33 @@
-query("
- SELECT Name, UserID, CategoryID
- FROM collages
- WHERE ID = '$CollageID'");
+ SELECT Name, UserID, CategoryID
+ FROM collages
+ WHERE ID = '$CollageID'");
list($Name, $UserID, $CategoryID) = $DB->next_record();
if ($CategoryID === '0' && $UserID !== $LoggedUser['ID'] && !check_perms('site_collages_delete')) {
- error(403);
+ error(403);
}
if ($CategoryID != array_search(ARTIST_COLLAGE, $CollageCats)) {
- error(404);
+ error(404);
}
$DB->query("
- SELECT
- ca.ArtistID,
- ag.Name,
- um.ID AS UserID,
- um.Username,
- ca.Sort
- FROM collages_artists AS ca
- JOIN artists_group AS ag ON ag.ArtistID = ca.ArtistID
- LEFT JOIN users_main AS um ON um.ID = ca.UserID
- WHERE ca.CollageID = '$CollageID'
- ORDER BY ca.Sort");
+ SELECT
+ ca.ArtistID,
+ ag.Name,
+ um.ID AS UserID,
+ um.Username,
+ ca.Sort
+ FROM collages_artists AS ca
+ JOIN artists_group AS ag ON ag.ArtistID = ca.ArtistID
+ LEFT JOIN users_main AS um ON um.ID = ca.UserID
+ WHERE ca.CollageID = '$CollageID'
+ ORDER BY ca.Sort");
$Artists = $DB->to_array('ArtistID', MYSQLI_ASSOC);
@@ -37,76 +37,77 @@
?>
| Sorting |
-
|
-
| Sorting |
+
|
+
| Order | -# | -Cat. # | -Year | -Artist | -Torrent | -User | -Tweak | -
|---|
| Order | +# | +Cat. # | +Year | +Artist | +Torrent | +User | +Tweak | +
|---|---|---|---|---|---|---|---|
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
diff --git a/sections/collages/manage_artists_handle.php b/sections/collages/manage_artists_handle.php
index 2801fa737..9d8d3f699 100644
--- a/sections/collages/manage_artists_handle.php
+++ b/sections/collages/manage_artists_handle.php
@@ -4,72 +4,72 @@
$CollageID = $_POST['collageid'];
if (!is_number($CollageID)) {
- error(404);
+ error(404);
}
$DB->query("
- SELECT UserID, CategoryID
- FROM collages
- WHERE ID = '$CollageID'");
+ SELECT UserID, CategoryID
+ FROM collages
+ WHERE ID = '$CollageID'");
list($UserID, $CategoryID) = $DB->next_record();
if ($CategoryID === '0' && $UserID !== $LoggedUser['ID'] && !check_perms('site_collages_delete')) {
- error(403);
+ error(403);
}
if ($CategoryID !== array_search(ARTIST_COLLAGE, $CollageCats)) {
- error(403);
+ error(403);
}
$ArtistID = $_POST['artistid'];
if (!is_number($ArtistID)) {
- error(404);
+ error(404);
}
if ($_POST['submit'] === 'Remove') {
- $DB->query("
- DELETE FROM collages_artists
- WHERE CollageID = '$CollageID'
- AND ArtistID = '$ArtistID'");
- $Rows = $DB->affected_rows();
- $DB->query("
- UPDATE collages
- SET NumTorrents = NumTorrents - $Rows
- WHERE ID = '$CollageID'");
- $Cache->delete_value("artists_collages_$ArtistID");
- $Cache->delete_value("artists_collages_personal_$ArtistID");
+ $DB->query("
+ DELETE FROM collages_artists
+ WHERE CollageID = '$CollageID'
+ AND ArtistID = '$ArtistID'");
+ $Rows = $DB->affected_rows();
+ $DB->query("
+ UPDATE collages
+ SET NumTorrents = NumTorrents - $Rows
+ WHERE ID = '$CollageID'");
+ $Cache->delete_value("artists_collages_$ArtistID");
+ $Cache->delete_value("artists_collages_personal_$ArtistID");
} elseif (isset($_POST['drag_drop_collage_sort_order'])) {
- @parse_str($_POST['drag_drop_collage_sort_order'], $Series);
- $Series = @array_shift($Series);
- if (is_array($Series)) {
- $SQL = array();
- foreach ($Series as $Sort => $ArtistID) {
- if (is_number($Sort) && is_number($ArtistID)) {
- $Sort = ($Sort + 1) * 10;
- $SQL[] = sprintf('(%d, %d, %d)', $ArtistID, $Sort, $CollageID);
- }
- }
+ @parse_str($_POST['drag_drop_collage_sort_order'], $Series);
+ $Series = @array_shift($Series);
+ if (is_array($Series)) {
+ $SQL = [];
+ foreach ($Series as $Sort => $ArtistID) {
+ if (is_number($Sort) && is_number($ArtistID)) {
+ $Sort = ($Sort + 1) * 10;
+ $SQL[] = sprintf('(%d, %d, %d)', $ArtistID, $Sort, $CollageID);
+ }
+ }
- $SQL = '
- INSERT INTO collages_artists
- (ArtistID, Sort, CollageID)
- VALUES
- ' . implode(', ', $SQL) . '
- ON DUPLICATE KEY UPDATE
- Sort = VALUES (Sort)';
+ $SQL = '
+ INSERT INTO collages_artists
+ (ArtistID, Sort, CollageID)
+ VALUES
+ ' . implode(', ', $SQL) . '
+ ON DUPLICATE KEY UPDATE
+ Sort = VALUES (Sort)';
- $DB->query($SQL);
- }
+ $DB->query($SQL);
+ }
} else {
- $Sort = $_POST['sort'];
- if (!is_number($Sort)) {
- error(404);
- }
- $DB->query("
- UPDATE collages_artists
- SET Sort = '$Sort'
- WHERE CollageID = '$CollageID'
- AND ArtistID = '$ArtistID'");
+ $Sort = $_POST['sort'];
+ if (!is_number($Sort)) {
+ error(404);
+ }
+ $DB->query("
+ UPDATE collages_artists
+ SET Sort = '$Sort'
+ WHERE CollageID = '$CollageID'
+ AND ArtistID = '$ArtistID'");
}
$Cache->delete_value("collage_$CollageID");
diff --git a/sections/collages/manage_handle.php b/sections/collages/manage_handle.php
index b32aa2027..563c64e0f 100644
--- a/sections/collages/manage_handle.php
+++ b/sections/collages/manage_handle.php
@@ -4,71 +4,71 @@
$CollageID = $_POST['collageid'];
if (!is_number($CollageID)) {
- error(404);
+ error(404);
}
$DB->query("
- SELECT UserID, CategoryID
- FROM collages
- WHERE ID = '$CollageID'");
+ SELECT UserID, CategoryID
+ FROM collages
+ WHERE ID = '$CollageID'");
list($UserID, $CategoryID) = $DB->next_record();
if ($CategoryID === '0' && $UserID !== $LoggedUser['ID'] && !check_perms('site_collages_delete')) {
- error(403);
+ error(403);
}
$GroupID = $_POST['groupid'];
if (!is_number($GroupID)) {
- error(404);
+ error(404);
}
if ($_POST['submit'] === 'Remove') {
- $DB->query("
- DELETE FROM collages_torrents
- WHERE CollageID = '$CollageID'
- AND GroupID = '$GroupID'");
- $Rows = $DB->affected_rows();
- $DB->query("
- UPDATE collages
- SET NumTorrents = NumTorrents - $Rows
- WHERE ID = '$CollageID'");
- $Cache->delete_value("torrents_details_$GroupID");
- $Cache->delete_value("torrent_collages_$GroupID");
- $Cache->delete_value("torrent_collages_personal_$GroupID");
+ $DB->query("
+ DELETE FROM collages_torrents
+ WHERE CollageID = '$CollageID'
+ AND GroupID = '$GroupID'");
+ $Rows = $DB->affected_rows();
+ $DB->query("
+ UPDATE collages
+ SET NumTorrents = NumTorrents - $Rows
+ WHERE ID = '$CollageID'");
+ $Cache->delete_value("torrents_details_$GroupID");
+ $Cache->delete_value("torrent_collages_$GroupID");
+ $Cache->delete_value("torrent_collages_personal_$GroupID");
} elseif (isset($_POST['drag_drop_collage_sort_order'])) {
- @parse_str($_POST['drag_drop_collage_sort_order'], $Series);
- $Series = @array_shift($Series);
- if (is_array($Series)) {
- $SQL = array();
- foreach ($Series as $Sort => $GroupID) {
- if (is_number($Sort) && is_number($GroupID)) {
- $Sort = ($Sort + 1) * 10;
- $SQL[] = sprintf('(%d, %d, %d)', $GroupID, $Sort, $CollageID);
- }
- }
+ @parse_str($_POST['drag_drop_collage_sort_order'], $Series);
+ $Series = @array_shift($Series);
+ if (is_array($Series)) {
+ $SQL = [];
+ foreach ($Series as $Sort => $GroupID) {
+ if (is_number($Sort) && is_number($GroupID)) {
+ $Sort = ($Sort + 1) * 10;
+ $SQL[] = sprintf('(%d, %d, %d)', $GroupID, $Sort, $CollageID);
+ }
+ }
- $SQL = '
- INSERT INTO collages_torrents
- (GroupID, Sort, CollageID)
- VALUES
- ' . implode(', ', $SQL) . '
- ON DUPLICATE KEY UPDATE
- Sort = VALUES (Sort)';
+ $SQL = '
+ INSERT INTO collages_torrents
+ (GroupID, Sort, CollageID)
+ VALUES
+ ' . implode(', ', $SQL) . '
+ ON DUPLICATE KEY UPDATE
+ Sort = VALUES (Sort)';
- $DB->query($SQL);
- }
+ $DB->query($SQL);
+ }
} else {
- $Sort = $_POST['sort'];
- if (!is_number($Sort)) {
- error(404);
- }
- $DB->query("
- UPDATE collages_torrents
- SET Sort = '$Sort'
- WHERE CollageID = '$CollageID'
- AND GroupID = '$GroupID'");
+ $Sort = $_POST['sort'];
+ if (!is_number($Sort)) {
+ error(404);
+ }
+ $DB->query("
+ UPDATE collages_torrents
+ SET Sort = '$Sort'
+ WHERE CollageID = '$CollageID'
+ AND GroupID = '$GroupID'");
}
$Cache->delete_value("collage_$CollageID");
diff --git a/sections/collages/new.php b/sections/collages/new.php
index 01989f841..294ac64c8 100644
--- a/sections/collages/new.php
+++ b/sections/collages/new.php
@@ -1,92 +1,93 @@
-
| Sorting |
-
|
-
| Sorting |
+
|
+
| Order | -# | -Artist | -User | -Tweak | -
|---|---|---|---|---|
| Order | +# | +Artist | +User | +Tweak | +
|---|---|---|---|---|
-
-
-
-
+ -
+ - - + diff --git a/sections/collages/new_handle.php b/sections/collages/new_handle.php index 289ead34b..8fb0c065c 100644 --- a/sections/collages/new_handle.php +++ b/sections/collages/new_handle.php @@ -4,89 +4,89 @@ include(SERVER_ROOT.'/classes/validate.class.php'); $Val = new VALIDATE; -$P = array(); +$P = []; $P = db_array($_POST); if ($P['category'] > 0 || check_perms('site_collages_renamepersonal')) { - $Val->SetFields('name', '1', 'string', 'The name must be between 3 and 100 characters', array('maxlength' => 100, 'minlength' => 3)); + $Val->SetFields('name', '1', 'string', 'The name must be between 3 and 100 characters', array('maxlength' => 100, 'minlength' => 3)); } else { - // Get a collage name and make sure it's unique - $name = $LoggedUser['Username']."'s personal collage"; - $P['name'] = db_string($name); - $DB->query(" - SELECT ID - FROM collages - WHERE Name = '".$P['name']."'"); - $i = 2; - while ($DB->has_results()) { - $P['name'] = db_string("$name no. $i"); - $DB->query(" - SELECT ID - FROM collages - WHERE Name = '".$P['name']."'"); - $i++; - } + // Get a collage name and make sure it's unique + $name = $LoggedUser['Username']."'s personal collage"; + $P['name'] = db_string($name); + $DB->query(" + SELECT ID + FROM collages + WHERE Name = '".$P['name']."'"); + $i = 2; + while ($DB->has_results()) { + $P['name'] = db_string("$name no. $i"); + $DB->query(" + SELECT ID + FROM collages + WHERE Name = '".$P['name']."'"); + $i++; + } } $Val->SetFields('description', '1', 'string', 'The description must be between 10 and 65535 characters', array('maxlength' => 65535, 'minlength' => 10)); $Err = $Val->ValidateForm($_POST); if (!$Err && $P['category'] === '0') { - $DB->query(" - SELECT COUNT(ID) - FROM collages - WHERE UserID = '$LoggedUser[ID]' - AND CategoryID = '0' - AND Deleted = '0'"); - list($CollageCount) = $DB->next_record(); - if (($CollageCount >= $LoggedUser['Permissions']['MaxCollages']) || !check_perms('site_collages_personal')) { - $Err = 'You may not create a personal collage.'; - } elseif (check_perms('site_collages_renamepersonal') && !stristr($P['name'], $LoggedUser['Username'])) { - $Err = 'Your personal collage\'s title must include your username.'; - } + $DB->query(" + SELECT COUNT(ID) + FROM collages + WHERE UserID = '$LoggedUser[ID]' + AND CategoryID = '0' + AND Deleted = '0'"); + list($CollageCount) = $DB->next_record(); + if (($CollageCount >= $LoggedUser['Permissions']['MaxCollages']) || !check_perms('site_collages_personal')) { + $Err = 'You may not create a personal collage.'; + } elseif (check_perms('site_collages_renamepersonal') && !stristr($P['name'], $LoggedUser['Username'])) { + $Err = 'Your personal collage\'s title must include your username.'; + } } if (!$Err) { - $DB->query(" - SELECT ID, Deleted - FROM collages - WHERE Name = '$P[name]'"); - if ($DB->has_results()) { - list($ID, $Deleted) = $DB->next_record(); - if ($Deleted) { - $Err = 'That collection already exists but needs to be recovered; please contact the staff team!'; - } else { - $Err = "That collection already exists: $ID."; - } - } + $DB->query(" + SELECT ID, Deleted + FROM collages + WHERE Name = '$P[name]'"); + if ($DB->has_results()) { + list($ID, $Deleted) = $DB->next_record(); + if ($Deleted) { + $Err = 'That collection already exists but needs to be recovered; please contact the staff team!'; + } else { + $Err = "That collection already exists: $ID."; + } + } } if (!$Err) { - if (empty($CollageCats[$P['category']])) { - $Err = 'Please select a category'; - } + if (empty($CollageCats[$P['category']])) { + $Err = 'Please select a category'; + } } if ($Err) { - $Name = $_POST['name']; - $Category = $_POST['category']; - $Tags = $_POST['tags']; - $Description = $_POST['description']; - include(SERVER_ROOT.'/sections/collages/new.php'); - die(); + $Name = $_POST['name']; + $Category = $_POST['category']; + $Tags = $_POST['tags']; + $Description = $_POST['description']; + include(SERVER_ROOT.'/sections/collages/new.php'); + die(); } $TagList = explode(',', $_POST['tags']); foreach ($TagList as $ID => $Tag) { - $TagList[$ID] = Misc::sanitize_tag($Tag); + $TagList[$ID] = Misc::sanitize_tag($Tag); } $TagList = implode(' ', $TagList); $DB->query(" - INSERT INTO collages - (Name, Description, UserID, TagList, CategoryID) - VALUES - ('$P[name]', '$P[description]', $LoggedUser[ID], '$TagList', '$P[category]')"); + INSERT INTO collages + (Name, Description, UserID, TagList, CategoryID) + VALUES + ('$P[name]', '$P[description]', $LoggedUser[ID], '$TagList', '$P[category]')"); $CollageID = $DB->inserted_id(); $Cache->delete_value("collage_$CollageID"); diff --git a/sections/collages/recover.php b/sections/collages/recover.php index ad25db211..e05e67634 100644 --- a/sections/collages/recover.php +++ b/sections/collages/recover.php @@ -1,49 +1,49 @@ -query(" - SELECT Name - FROM collages - WHERE ID = $CollageID"); - if (!$DB->has_results()) { - error('Collage is completely deleted'); - } else { - $DB->query(" - UPDATE collages - SET Deleted = '0' - WHERE ID = $CollageID"); - $Cache->delete_value("collage_$CollageID"); - Misc::write_log("Collage $CollageID was recovered by ".$LoggedUser['Username']); - header("Location: collages.php?id=$CollageID"); - } + $DB->query(" + SELECT Name + FROM collages + WHERE ID = $CollageID"); + if (!$DB->has_results()) { + error('Collage is completely deleted'); + } else { + $DB->query(" + UPDATE collages + SET Deleted = '0' + WHERE ID = $CollageID"); + $Cache->delete_value("collage_$CollageID"); + Misc::write_log("Collage $CollageID was recovered by ".$LoggedUser['Username']); + header("Location: collages.php?id=$CollageID"); + } } View::show_header('Collage recovery!'); ?>
-
-query("
- SELECT Name, CategoryID, UserID
- FROM collages
- WHERE ID = '$CollageID'");
+ SELECT Name, CategoryID, UserID
+ FROM collages
+ WHERE ID = '$CollageID'");
list($Name, $CategoryID, $UserID) = $DB->next_record(MYSQLI_NUM, false);
if (!check_perms('site_collages_delete') && $UserID !== $LoggedUser['ID']) {
- error(403);
+ error(403);
}
$Reason = trim($_POST['reason']);
if (!$Reason) {
- error('You must enter a reason!');
+ error('You must enter a reason!');
}
$DB->query("
- SELECT GroupID
- FROM collages_torrents
- WHERE CollageID = '$CollageID'");
+ SELECT GroupID
+ FROM collages_torrents
+ WHERE CollageID = '$CollageID'");
while (list($GroupID) = $DB->next_record()) {
- $Cache->delete_value("torrents_details_$GroupID");
- $Cache->delete_value("torrent_collages_$GroupID");
- $Cache->delete_value("torrent_collages_personal_$GroupID");
+ $Cache->delete_value("torrents_details_$GroupID");
+ $Cache->delete_value("torrent_collages_$GroupID");
+ $Cache->delete_value("torrent_collages_personal_$GroupID");
}
//Personal collages have CategoryID 0
if ($CategoryID == 0) {
- $DB->query("
- DELETE FROM collages
- WHERE ID = '$CollageID'");
- $DB->query("
- DELETE FROM collages_torrents
- WHERE CollageID = '$CollageID'");
- Comments::delete_page('collages', $CollageID);
+ $DB->query("
+ DELETE FROM collages
+ WHERE ID = '$CollageID'");
+ $DB->query("
+ DELETE FROM collages_torrents
+ WHERE CollageID = '$CollageID'");
+ Comments::delete_page('collages', $CollageID);
} else {
- $DB->query("
- UPDATE collages
- SET Deleted = '1'
- WHERE ID = '$CollageID'");
- Subscriptions::flush_subscriptions('collages', $CollageID);
- Subscriptions::flush_quote_notifications('collages', $CollageID);
+ $DB->query("
+ UPDATE collages
+ SET Deleted = '1'
+ WHERE ID = '$CollageID'");
+ Subscriptions::flush_subscriptions('collages', $CollageID);
+ Subscriptions::flush_quote_notifications('collages', $CollageID);
}
Misc::write_log("Collage $CollageID ($Name) was deleted by ".$LoggedUser['Username'].": $Reason");
diff --git a/sections/collages/torrent_collage.php b/sections/collages/torrent_collage.php
index be4a09d02..2e043160d 100644
--- a/sections/collages/torrent_collage.php
+++ b/sections/collages/torrent_collage.php
@@ -1,32 +1,32 @@
query("
- SELECT
- ct.GroupID,
- ct.UserID
- FROM collages_torrents AS ct
- JOIN torrents_group AS tg ON tg.ID = ct.GroupID
- WHERE ct.CollageID = '$CollageID'
- ORDER BY ct.Sort");
+ SELECT
+ ct.GroupID,
+ ct.UserID
+ FROM collages_torrents AS ct
+ JOIN torrents_group AS tg ON tg.ID = ct.GroupID
+ WHERE ct.CollageID = '$CollageID'
+ ORDER BY ct.Sort");
$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']);
+ $TorrentList = Torrents::get_groups($GroupIDs);
+ $UserVotes = Votes::get_user_votes($LoggedUser['ID']);
} else {
- $TorrentList = array();
+ $TorrentList = [];
}
$NumGroups = count($TorrentList);
$NumGroupsByUser = 0;
-$TopArtists = array();
-$UserAdditions = array();
+$TopArtists = [];
+$UserAdditions = [];
$Number = 0;
// We loop through all groups building some basic statistics for them
@@ -34,64 +34,64 @@ function compare($X, $Y) {
// HTML inline instead of doing it all up here. Yeah, it's more complicated
// but the memory savings are a lot
foreach ($GroupIDs as $Idx => $GroupID) {
- if (!isset($TorrentList[$GroupID])) {
- unset($GroupIDs[$Idx]);
- continue;
- }
- $Group = $TorrentList[$GroupID];
- extract(Torrents::array_group($Group));
- $UserID = $Contributors[$GroupID];
- new Tags($TagList);
+ if (!isset($TorrentList[$GroupID])) {
+ unset($GroupIDs[$Idx]);
+ continue;
+ }
+ $Group = $TorrentList[$GroupID];
+ extract(Torrents::array_group($Group));
+ $UserID = $Contributors[$GroupID];
+ new Tags($TagList);
- // Handle stats and stuff
- $Number++;
- if ($UserID == $LoggedUser['ID']) {
- $NumGroupsByUser++;
- }
+ // Handle stats and stuff
+ $Number++;
+ if ($UserID == $LoggedUser['ID']) {
+ $NumGroupsByUser++;
+ }
- if (!empty($ExtendedArtists[1])
- || !empty($ExtendedArtists[4])
- || !empty($ExtendedArtists[5])
- || !empty($ExtendedArtists[6])
- ) {
- $CountArtists = array_merge((array)$ExtendedArtists[1], (array)$ExtendedArtists[4], (array)$ExtendedArtists[5], (array)$ExtendedArtists[6]);
- } else {
- $CountArtists = $GroupArtists;
- }
+ if (!empty($ExtendedArtists[1])
+ || !empty($ExtendedArtists[4])
+ || !empty($ExtendedArtists[5])
+ || !empty($ExtendedArtists[6])
+ ) {
+ $CountArtists = array_merge((array)$ExtendedArtists[1], (array)$ExtendedArtists[4], (array)$ExtendedArtists[5], (array)$ExtendedArtists[6]);
+ } else {
+ $CountArtists = $GroupArtists;
+ }
- if ($CountArtists) {
- foreach ($CountArtists as $Artist) {
- if (!isset($TopArtists[$Artist['id']])) {
- $TopArtists[$Artist['id']] = array('name' => $Artist['name'], 'count' => 1);
- } else {
- $TopArtists[$Artist['id']]['count']++;
- }
- }
- }
+ if ($CountArtists) {
+ foreach ($CountArtists as $Artist) {
+ if (!isset($TopArtists[$Artist['id']])) {
+ $TopArtists[$Artist['id']] = array('name' => $Artist['name'], 'count' => 1);
+ } else {
+ $TopArtists[$Artist['id']]['count']++;
+ }
+ }
+ }
- if (!isset($UserAdditions[$UserID])) {
- $UserAdditions[$UserID] = 0;
- }
- $UserAdditions[$UserID]++;
+ if (!isset($UserAdditions[$UserID])) {
+ $UserAdditions[$UserID] = 0;
+ }
+ $UserAdditions[$UserID]++;
}
// Re-index the array so we can abuse that later to slice parts out of it
$GroupIDs = array_values($GroupIDs);
if ($CollageCategoryID === '0' && !check_perms('site_collages_delete')) {
- if (!check_perms('site_collages_personal') || $CreatorID !== $LoggedUser['ID']) {
- $PreventAdditions = true;
- }
+ if (!check_perms('site_collages_personal') || $CreatorID !== $LoggedUser['ID']) {
+ $PreventAdditions = true;
+ }
}
if (!check_perms('site_collages_delete')
- && (
- $Locked
- || ($MaxGroups > 0 && $NumGroups >= $MaxGroups)
- || ($MaxGroupsPerUser > 0 && $NumGroupsByUser >= $MaxGroupsPerUser)
- )
+ && (
+ $Locked
+ || ($MaxGroups > 0 && $NumGroups >= $MaxGroups)
+ || ($MaxGroupsPerUser > 0 && $NumGroupsByUser >= $MaxGroupsPerUser)
+ )
) {
- $PreventAdditions = true;
+ $PreventAdditions = true;
}
// Silly hack for people who are on the old setting
@@ -100,535 +100,550 @@ function compare($X, $Y) {
View::show_header($Name, 'browse,collage,bbcode,voting,recommend');
?>
-
+
- Recover deleted collage
-
-
-
-
-
+
+ Recover deleted collage
+
+
+
+
+
-
+
-
-
+ View all comments
+
+
-
-
-
+
+
+
+
- List of collages
-
- New collage
-
-
- - - + +
-
-
+ - - - + +
+ List of collages
+
+ New collage
+
+
+ + + - Edit description - - Locked -" class="brackets">Edit description + + Locked + - Remove bookmark - - Bookmark - + Remove bookmark + + Bookmark + - - Manage torrents - - Report collage - - Delete - -
- + + + - Edit description - - Locked -" class="brackets">Edit description + + Locked + - Remove bookmark - - Bookmark - + Remove bookmark + + Bookmark + - - Manage torrents - - Report collage - - Delete - -
+
+
+ Add torrent groupBatch add
+
+
+
+
+ Comments
+query(" - SELECT - c.ID, - c.Body, - c.AuthorID, - um.Username, - c.AddedTime - FROM comments AS c - LEFT JOIN users_main AS um ON um.ID = c.AuthorID - WHERE c.Page = 'collages' - AND c.PageID = $CollageID - ORDER BY c.ID DESC - LIMIT 15"); - $CommentList = $DB->to_array(false, MYSQLI_NUM); + $DB->query(" + SELECT + c.ID, + c.Body, + c.AuthorID, + um.Username, + c.AddedTime + FROM comments AS c + LEFT JOIN users_main AS um ON um.ID = c.AuthorID + WHERE c.Page = 'collages' + AND c.PageID = $CollageID + ORDER BY c.ID DESC + LIMIT 15"); + $CommentList = $DB->to_array(false, MYSQLI_NUM); } foreach ($CommentList as $Comment) { - list($CommentID, $Body, $UserID, $Username, $CommentTime) = $Comment; + list($CommentID, $Body, $UserID, $Username, $CommentTime) = $Comment; ?> -
-
-
+
-
-
- Report -
-
- - Report -
+
+
+ Report +
+
+ + Report +
-
-
+ Add comment
-
- Add comment
+
+
+
-
-
-
+
-
+
-
+
+
- torrents.Time';
- $Conditions[] = "comments.AuthorID != $UserID";
- $Title = 'Comments left on torrents ' . ($Self ? 'you\'ve' : $Username . ' has') . ' uploaded';
- $Header = 'Comments left on torrents ' . ($Self ? 'you\'ve' : Users::format_username($UserID, false, false, false) . ' has') . ' uploaded';
- } else {
- $Type = 'default';
- $Conditions[] = "comments.AuthorID = $UserID";
- $Title = 'Torrent comments left by ' . ($Self ? 'you' : $Username);
- $Header = 'Torrent comments left by ' . ($Self ? 'you' : Users::format_username($UserID, false, false, false));
- }
- break;
+ case 'artist':
+ $Field1 = 'artists_group.ArtistID';
+ $Field2 = 'artists_group.Name';
+ $Table = 'artists_group';
+ $Title = 'Artist comments left by ' . ($Self ? 'you' : $Username);
+ $Header = 'Artist comments left by ' . ($Self ? 'you' : Users::format_username($UserID, false, false, false));
+ $Conditions[] = "comments.AuthorID = $UserID";
+ break;
+ case 'collages':
+ $Field1 = 'collages.ID';
+ $Field2 = 'collages.Name';
+ $Table = 'collages';
+ $Conditions[] = "collages.Deleted = '0'";
+ if ($Type == 'created') {
+ $Conditions[] = "collages.UserID = $UserID";
+ $Conditions[] = "comments.AuthorID != $UserID";
+ $Title = 'Comments left on collages ' . ($Self ? 'you' : $Username) . ' created';
+ $Header = 'Comments left on collages ' . ($Self ? 'you' : Users::format_username($UserID, false, false, false)) . ' created';
+ } elseif ($Type == 'contributed') {
+ $Conditions[] = 'IF(collages.CategoryID = ' . array_search('Artists', $CollageCats) . ', collages_artists.ArtistID, collages_torrents.GroupID) IS NOT NULL';
+ $Conditions[] = "comments.AuthorID != $UserID";
+ $Join[] = "LEFT JOIN collages_torrents ON collages_torrents.CollageID = collages.ID AND collages_torrents.UserID = $UserID";
+ $Join[] = "LEFT JOIN collages_artists ON collages_artists.CollageID = collages.ID AND collages_artists.UserID = $UserID";
+ $Title = 'Comments left on collages ' . ($Self ? 'you\'ve' : $Username . ' has') . ' contributed to';
+ $Header = 'Comments left on collages ' . ($Self ? 'you\'ve' : Users::format_username($UserID, false, false, false).' has') . ' contributed to';
+ } else {
+ $Type = 'default';
+ $Conditions[] = "comments.AuthorID = $UserID";
+ $Title = 'Collage comments left by ' . ($Self ? 'you' : $Username);
+ $Header = 'Collage comments left by ' . ($Self ? 'you' : Users::format_username($UserID, false, false, false));
+ }
+ break;
+ case 'requests':
+ $Field1 = 'requests.ID';
+ $Field2 = 'requests.Title';
+ $Table = 'requests';
+ if ($Type == 'created') {
+ $Conditions[] = "requests.UserID = $UserID";
+ $Conditions[] = "comments.AuthorID != $UserID";
+ $Title = 'Comments left on requests ' . ($Self ? 'you' : $Username) . ' created';
+ $Header = 'Comments left on requests ' . ($Self ? 'you' : Users::format_username($UserID, false, false, false)) . ' created';
+ } elseif ($Type == 'voted') {
+ $Conditions[] = "requests_votes.UserID = $UserID";
+ $Conditions[] = "comments.AuthorID != $UserID";
+ $Join[] = 'JOIN requests_votes ON requests_votes.RequestID = requests.ID';
+ $Title = 'Comments left on requests ' . ($Self ? 'you\'ve' : $Username . ' has') . ' voted on';
+ $Header = 'Comments left on requests ' . ($Self ? 'you\'ve' : Users::format_username($UserID, false, false, false) . ' has') . ' voted on';
+ } else {
+ $Type = 'default';
+ $Conditions[] = "comments.AuthorID = $UserID";
+ $Title = 'Request comments left by ' . ($Self ? 'you' : $Username);
+ $Header = 'Request comments left by ' . ($Self ? 'you' : Users::format_username($UserID, false, false, false));
+ }
+ break;
+ case 'torrents':
+ default:
+ $Action = 'torrents';
+ $Field1 = 'torrents.GroupID';
+ $Field2 = 'torrents_group.Name';
+ $Table = 'torrents';
+ $Join[] = 'JOIN torrents_group ON torrents.GroupID = torrents_group.ID';
+ if ($Type == 'uploaded') {
+ $Conditions[] = "torrents.UserID = $UserID";
+ $Conditions[] = 'comments.AddedTime > torrents.Time';
+ $Conditions[] = "comments.AuthorID != $UserID";
+ $Title = 'Comments left on torrents ' . ($Self ? 'you\'ve' : $Username . ' has') . ' uploaded';
+ $Header = 'Comments left on torrents ' . ($Self ? 'you\'ve' : Users::format_username($UserID, false, false, false) . ' has') . ' uploaded';
+ } else {
+ $Type = 'default';
+ $Conditions[] = "comments.AuthorID = $UserID";
+ $Title = 'Torrent comments left by ' . ($Self ? 'you' : $Username);
+ $Header = 'Torrent comments left by ' . ($Self ? 'you' : Users::format_username($UserID, false, false, false));
+ }
+ break;
}
$Join[] = "JOIN comments ON comments.Page = '$Action' AND comments.PageID = $Field1";
$Join = implode("\n\t\t", $Join);
@@ -139,23 +139,23 @@
$Conditions = ($Conditions ? 'WHERE ' . $Conditions : '');
$SQL = "
- SELECT
- SQL_CALC_FOUND_ROWS
- comments.AuthorID,
- comments.Page,
- comments.PageID,
- $Field2,
- comments.ID,
- comments.Body,
- comments.AddedTime,
- comments.EditedTime,
- comments.EditedUserID
- FROM $Table
- $Join
- $Conditions
- GROUP BY comments.ID
- ORDER BY comments.ID DESC
- LIMIT $Limit";
+ SELECT
+ SQL_CALC_FOUND_ROWS
+ comments.AuthorID,
+ comments.Page,
+ comments.PageID,
+ $Field2,
+ comments.ID,
+ comments.Body,
+ comments.AddedTime,
+ comments.EditedTime,
+ comments.EditedUserID
+ FROM $Table
+ $Join
+ $Conditions
+ GROUP BY comments.ID
+ ORDER BY comments.ID DESC
+ LIMIT $Limit";
$Comments = $DB->query($SQL);
$Count = $DB->record_count();
@@ -166,110 +166,113 @@
$DB->set_query_id($Comments);
if ($Action == 'requests') {
- $RequestIDs = array_flip(array_flip($DB->collect('PageID')));
- $Artists = array();
- foreach ($RequestIDs as $RequestID) {
- $Artists[$RequestID] = Requests::get_artists($RequestID);
- }
- $DB->set_query_id($Comments);
+ $RequestIDs = array_flip(array_flip($DB->collect('PageID')));
+ $Artists = [];
+ foreach ($RequestIDs as $RequestID) {
+ $Artists[$RequestID] = Requests::get_artists($RequestID);
+ }
+ $DB->set_query_id($Comments);
} elseif ($Action == 'torrents') {
- $GroupIDs = array_flip(array_flip($DB->collect('PageID')));
- $Artists = Artists::get_artists($GroupIDs);
- $DB->set_query_id($Comments);
+ $GroupIDs = array_flip(array_flip($DB->collect('PageID')));
+ $Artists = Artists::get_artists($GroupIDs);
+ $DB->set_query_id($Comments);
}
$LinkID = (!$Self ? '&id=' . $UserID : '');
-$ActionLinks = $TypeLinks = array();
+$ActionLinks = $TypeLinks = [];
if ($Action != 'artist') {
- $ActionLinks[] = 'Artist comments';
+ $ActionLinks[] = 'Artist comments';
}
if ($Action != 'collages') {
- $ActionLinks[] = 'Collage comments';
+ $ActionLinks[] = 'Collage comments';
}
if ($Action != 'requests') {
- $ActionLinks[] = 'Request comments';
+ $ActionLinks[] = 'Request comments';
}
if ($Action != 'torrents') {
- $ActionLinks[] = 'Torrent comments';
+ $ActionLinks[] = 'Torrent comments';
}
switch ($Action) {
- case 'collages':
- $BaseLink = 'comments.php?action=collages' . $LinkID;
- if ($Type != 'default') {
- $TypeLinks[] = 'Display comments left on collages ' . ($Self ? 'you\'ve' : $Username . ' has') . ' made';
- }
- if ($Type != 'created') {
- $TypeLinks[] = 'Display comments left on ' . ($Self ? 'your collages' : 'collages created by ' .$Username) . '';
- }
- if ($Type != 'contributed') {
- $TypeLinks[] = 'Display comments left on collages ' . ($Self ? 'you\'ve' : $Username . ' has') . ' contributed to';
- }
- break;
- case 'requests':
- $BaseLink = 'comments.php?action=requests' . $LinkID;
- if ($Type != 'default') {
- $TypeLinks[] = 'Display comments left on requests ' . ($Self ? 'you\'ve' : $Username . 'has') . ' made';
- }
- if ($Type != 'created') {
- //
- //your requests
- $TypeLinks[] = 'Display comments left on requests ' . ($Self ? 'you' : $Username) . ' created';
- }
- if ($Type != 'voted') {
- $TypeLinks[] = 'Display comments left on requests ' . ($Self ? 'you\'ve' : $Username . ' has') . ' voted on';
- }
- break;
- case 'torrents':
- if ($Type != 'default') {
- $TypeLinks[] = 'Display comments left on torrents ' . ($Self ? 'you\'ve' : $Username . ' has' ) . ' made';
- }
- if ($Type != 'uploaded') {
- $TypeLinks[] = 'Display comments left on torrents ' . ($Self ? 'you\'ve' : $Username . ' has') . ' uploaded';
- }
- break;
+ case 'collages':
+ $BaseLink = 'comments.php?action=collages' . $LinkID;
+ if ($Type != 'default') {
+ $TypeLinks[] = 'Display comments left on collages ' . ($Self ? 'you\'ve' : $Username . ' has') . ' made';
+ }
+ if ($Type != 'created') {
+ $TypeLinks[] = 'Display comments left on ' . ($Self ? 'your collages' : 'collages created by ' .$Username) . '';
+ }
+ if ($Type != 'contributed') {
+ $TypeLinks[] = 'Display comments left on collages ' . ($Self ? 'you\'ve' : $Username . ' has') . ' contributed to';
+ }
+ break;
+ case 'requests':
+ $BaseLink = 'comments.php?action=requests' . $LinkID;
+ if ($Type != 'default') {
+ $TypeLinks[] = 'Display comments left on requests ' . ($Self ? 'you\'ve' : $Username . 'has') . ' made';
+ }
+ if ($Type != 'created') {
+ //
+ //your requests
+ $TypeLinks[] = 'Display comments left on requests ' . ($Self ? 'you' : $Username) . ' created';
+ }
+ if ($Type != 'voted') {
+ $TypeLinks[] = 'Display comments left on requests ' . ($Self ? 'you\'ve' : $Username . ' has') . ' voted on';
+ }
+ break;
+ case 'torrents':
+ if ($Type != 'default') {
+ $TypeLinks[] = 'Display comments left on torrents ' . ($Self ? 'you\'ve' : $Username . ' has' ) . ' made';
+ }
+ if ($Type != 'uploaded') {
+ $TypeLinks[] = 'Display comments left on torrents ' . ($Self ? 'you\'ve' : $Username . ' has') . ' uploaded';
+ }
+ break;
}
$Links = implode(' ', $ActionLinks) . (count($TypeLinks) ? '
+
-
+ $CollageCovers) { ?>
+
+ $CollageCovers) {
+ for ($i = $NumGroups + 1; $i <= ceil($NumGroups / $CollageCovers) * $CollageCovers; $i++) {
+ $CollagePages[count($CollagePages) - 1] .= '';
+ }
+ }
?>
-
-//);
+ //]]>
+
-
-
- $CollageCovers) { ?>
-
- $CollageCovers) {
- for ($i = $NumGroups + 1; $i <= ceil($NumGroups / $CollageCovers) * $CollageCovers; $i++) {
- $CollagePages[count($CollagePages) - 1] .= '';
- }
-}
+
+ Cover Art
- -
-
+
Cover Art
+ -
+
-
| - | - | Torrents | -Size | - |
- |
- |
-
| + | + | Torrents | +Size | + |
+ |
+ |
+
| - - | -- - | -- - - - Remove bookmark - - - - Bookmark - - - - | -||||
| + + | ++ + | ++ + + + Remove bookmark + + + + Bookmark + + + + | +||||
| - |
-
-
- |
- - - DL - - | FL - - | RP - - - - - | -- | - | - | - |
| + |
+
+
+ |
+ + + DL + + | FL + + | RP + + + + + | ++ | + | + | + |
' . implode(' ', $TypeLinks) : ''); View::show_header($Title, 'bbcode,comments'); ?>
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ 0) {
- $DB->set_query_id($Comments);
- while (list($AuthorID, $Page, $PageID, $Name, $PostID, $Body, $AddedTime, $EditedTime, $EditedUserID) = $DB->next_record()) {
- $Link = Comments::get_url($Page, $PageID, $PostID);
- switch ($Page) {
- case 'artist':
- $Header = " on $Name";
- break;
- case 'collages':
- $Header = " on $Name";
- break;
- case 'requests':
- $Header = ' on ' . Artists::display_artists($Artists[$PageID]) . " $Name";
- break;
- case 'torrents':
- $Header = ' on ' . Artists::display_artists($Artists[$PageID]) . " $Name";
- break;
- }
- CommentsView::render_comment($AuthorID, $PostID, $Body, $AddedTime, $EditedUserID, $EditedTime, $Link, false, $Header, false);
- }
+ $DB->set_query_id($Comments);
+ while (list($AuthorID, $Page, $PageID, $Name, $PostID, $Body, $AddedTime, $EditedTime, $EditedUserID) = $DB->next_record()) {
+ $Link = Comments::get_url($Page, $PageID, $PostID);
+ switch ($Page) {
+ case 'artist':
+ $Header = " on $Name";
+ break;
+ case 'collages':
+ $Header = " on $Name";
+ break;
+ case 'requests':
+ $Header = ' on ' . Artists::display_artists($Artists[$PageID]) . " $Name";
+ break;
+ case 'torrents':
+ $Header = ' on ' . Artists::display_artists($Artists[$PageID]) . " $Name";
+ break;
+ }
+ CommentsView::render_comment($AuthorID, $PostID, $Body, $AddedTime, $EditedUserID, $EditedTime, $Link, false, $Header, false);
+ }
} else { ?>
- No results.
-
-
-
-
+ No results.
+
+
+
+
-query("
- SELECT Body
- FROM comments
- WHERE ID = $PostID");
+ SELECT Body
+ FROM comments
+ WHERE ID = $PostID");
list($Body) = $DB->next_record(MYSQLI_NUM);
-echo trim($Body);
\ No newline at end of file
+echo trim($Body);
diff --git a/sections/comments/index.php b/sections/comments/index.php
index 60f911609..f97a3e1df 100644
--- a/sections/comments/index.php
+++ b/sections/comments/index.php
@@ -1,46 +1,46 @@
-query("
- SELECT AuthorID
- FROM comments
- WHERE ID = $PostID");
+ SELECT AuthorID
+ FROM comments
+ WHERE ID = $PostID");
if (!$DB->has_results()) {
- error(404);
+ error(404);
}
list($AuthorID) = $DB->next_record();
$UserInfo = Users::user_info($AuthorID);
if ($UserInfo['Class'] > $LoggedUser['Class']) {
- error(403);
+ error(403);
}
$URL = site_url() . Comments::get_url_query($PostID);
if ($Length !== 'verbal') {
- $Time = (int)$Length * (7 * 24 * 60 * 60);
- Tools::warn_user($AuthorID, $Time, "$URL - $Reason");
- $Subject = 'You have received a warning';
- $PrivateMessage = "You have received a $Length week warning for [url=$URL]this comment[/url].\n\n[quote]{$PrivateMessage}[/quote]";
- $WarnTime = time_plus($Time);
- $AdminComment = date('Y-m-d') . " - Warned until $WarnTime by " . $LoggedUser['Username'] . "\nReason: $URL - $Reason\n\n";
+ $Time = (int)$Length * (7 * 24 * 60 * 60);
+ Tools::warn_user($AuthorID, $Time, "$URL - $Reason");
+ $Subject = 'You have received a warning';
+ $PrivateMessage = "You have received a $Length week warning for [url=$URL]this comment[/url].\n\n[quote]{$PrivateMessage}[/quote]";
+ $WarnTime = time_plus($Time);
+ $AdminComment = date('Y-m-d') . " - Warned until $WarnTime by " . $LoggedUser['Username'] . "\nReason: $URL - $Reason\n\n";
} else {
- $Subject = 'You have received a verbal warning';
- $PrivateMessage = "You have received a verbal warning for [url=$URL]this comment[/url].\n\n[quote]{$PrivateMessage}[/quote]";
- $AdminComment = date('Y-m-d') . ' - Verbally warned by ' . $LoggedUser['Username'] . " for $URL\nReason: $Reason\n\n";
- Tools::update_user_notes($AuthorID, $AdminComment);
+ $Subject = 'You have received a verbal warning';
+ $PrivateMessage = "You have received a verbal warning for [url=$URL]this comment[/url].\n\n[quote]{$PrivateMessage}[/quote]";
+ $AdminComment = date('Y-m-d') . ' - Verbally warned by ' . $LoggedUser['Username'] . " for $URL\nReason: $Reason\n\n";
+ Tools::update_user_notes($AuthorID, $AdminComment);
}
$DB->query("
- INSERT INTO users_warnings_forums
- (UserID, Comment)
- VALUES
- ('$AuthorID', '" . db_string($AdminComment) . "')
- ON DUPLICATE KEY UPDATE
- Comment = CONCAT('" . db_string($AdminComment) . "', Comment)");
+ INSERT INTO users_warnings_forums
+ (UserID, Comment)
+ VALUES
+ ('$AuthorID', '" . db_string($AdminComment) . "')
+ ON DUPLICATE KEY UPDATE
+ Comment = CONCAT('" . db_string($AdminComment) . "', Comment)");
Misc::send_pm($AuthorID, $LoggedUser['ID'], $Subject, $PrivateMessage);
Comments::edit($PostID, $Body);
diff --git a/sections/comments/warn.php b/sections/comments/warn.php
index b69d4d27a..309e0705f 100644
--- a/sections/comments/warn.php
+++ b/sections/comments/warn.php
@@ -1,16 +1,16 @@
query("
- SELECT Body, AuthorID
- FROM comments
- WHERE ID = $PostID");
+ SELECT Body, AuthorID
+ FROM comments
+ WHERE ID = $PostID");
if (!$DB->has_results()) {
- error(404);
+ error(404);
}
list($PostBody, $AuthorID) = $DB->next_record();
$UserInfo = Users::user_info($AuthorID);
@@ -19,49 +19,49 @@
?>
-get_contest($ContestMgr->save($_POST));
+ $Saved = 1;
}
-
-if (!empty($_POST['name'])) {
- authorize();
- Contest::save($_POST);
- $Contest = Contest::get_contest($_POST['cid']);
- $Saved = 1;
+elseif (isset($_GET['id']) && intval($_GET['id'])) {
+ $Contest = $ContestMgr->get_contest(intval($_GET['id']));
+}
+elseif (!$Create) {
+ $Contest = $ContestMgr->get_current_contest();
}
View::show_header('contest admin');
?>
-
-
+
diff --git a/sections/forums/mod_thread.php b/sections/forums/mod_thread.php
index 7f5d1325e..4cd46961a 100644
--- a/sections/forums/mod_thread.php
+++ b/sections/forums/mod_thread.php
@@ -1,4 +1,4 @@
- 0) {
- $Ranking = 0;
+ $Ranking = 0;
} elseif (0 > $Ranking) {
- error('Ranking cannot be a negative value');
+ error('Ranking cannot be a negative value');
}
$Title = db_string($_POST['title']);
$RawTitle = $_POST['title'];
@@ -42,362 +42,372 @@
$Page = (int)$_POST['page'];
$Action = '';
-$TrashForumID = ($ForumID === EDITING_FORUM_ID) ? EDITING_TRASH_FORUM_ID : TRASH_FORUM_ID;
-$ResolveForumID = ($ForumID === HELP_FORUM_ID) ? HELP_RESOLVED_FORUM_ID : (($ForumID === BUGS_FORUM_ID) ? BUGS_RESOLVED_FORUM_ID : '');
-
-if ($Locked == 1) {
- $DB->query("
- DELETE FROM forums_last_read_topics
- WHERE TopicID = '$TopicID'");
+if ($Locked == 1 && check_perms('site_moderate_forums')) {
+ $DB->query("
+ DELETE FROM forums_last_read_topics
+ WHERE TopicID = '$TopicID'");
}
$DB->query("
- SELECT
- t.ForumID,
- f.Name,
- f.MinClassWrite,
- COUNT(p.ID) AS Posts,
- t.AuthorID,
- t.Title,
- t.IsLocked,
- t.IsSticky,
- t.Ranking
- FROM forums_topics AS t
- LEFT JOIN forums_posts AS p ON p.TopicID = t.ID
- LEFT JOIN forums AS f ON f.ID = t.ForumID
- WHERE t.ID = '$TopicID'
- GROUP BY p.TopicID");
+ SELECT
+ t.ForumID,
+ f.Name,
+ f.MinClassWrite,
+ COUNT(p.ID) AS Posts,
+ t.AuthorID,
+ t.Title,
+ t.IsLocked,
+ t.IsSticky,
+ t.Ranking
+ FROM forums_topics AS t
+ LEFT JOIN forums_posts AS p ON p.TopicID = t.ID
+ LEFT JOIN forums AS f ON f.ID = t.ForumID
+ WHERE t.ID = '$TopicID'
+ GROUP BY p.TopicID");
list($OldForumID, $OldForumName, $MinClassWrite, $Posts, $ThreadAuthorID, $OldTitle, $OldLocked, $OldSticky, $OldRanking) = $DB->next_record(MYSQLI_BOTH, false);
if ($MinClassWrite > $LoggedUser['Class']) {
- error(403);
+ error(403);
+}
+
+if (isset($_POST['transition'])) {
+ if (is_number($_POST['transition'])) {
+ // Permissions are handled inside forums.class.php
+ $transitions = Forums::get_transitions();
+ $Debug->log_var($transitions);
+ if (isset($transitions[$_POST['transition']])) {
+ $transition = $transitions[$_POST['transition']];
+ if ($transition['source'] != $OldForumID) {
+ error(403);
+ }
+ $ForumID = $transition['destination'];
+ $Sticky = $OldSticky;
+ $Locked = $OldLocked;
+ $Ranking = $OldRanking;
+ $Title = db_string($OldTitle);
+ $RawTitle = $OldTitle;
+ $Action = 'transitioning';
+ } else {
+ error(0);
+ }
+ } else {
+ error(0);
+ }
}
// If we're deleting a thread
if (isset($_POST['delete'])) {
- if (!check_perms('site_admin_forums')) {
- error(403);
- }
-
- $DB->query("
- DELETE FROM forums_posts
- WHERE TopicID = '$TopicID'");
- $DB->query("
- DELETE FROM forums_topics
- WHERE ID = '$TopicID'");
-
- $DB->query("
- SELECT
- t.ID,
- t.LastPostID,
- t.Title,
- p.AuthorID,
- um.Username,
- p.AddedTime,
- (
- SELECT COUNT(pp.ID)
- FROM forums_posts AS pp
- JOIN forums_topics AS tt ON pp.TopicID = tt.ID
- WHERE tt.ForumID = '$ForumID'
- ),
- t.IsLocked,
- t.IsSticky
- FROM forums_topics AS t
- JOIN forums_posts AS p ON p.ID = t.LastPostID
- LEFT JOIN users_main AS um ON um.ID = p.AuthorID
- WHERE t.ForumID = '$ForumID'
- GROUP BY t.ID
- ORDER BY t.LastPostID DESC
- LIMIT 1");
- list($NewLastTopic, $NewLastPostID, $NewLastTitle, $NewLastAuthorID, $NewLastAuthorName, $NewLastAddedTime, $NumPosts, $NewLocked, $NewSticky) = $DB->next_record(MYSQLI_NUM, false);
-
- $DB->query("
- UPDATE forums
- SET
- NumTopics = NumTopics - 1,
- NumPosts = NumPosts - '$Posts',
- LastPostTopicID = '$NewLastTopic',
- LastPostID = '$NewLastPostID',
- LastPostAuthorID = '$NewLastAuthorID',
- LastPostTime = '$NewLastAddedTime'
- WHERE ID = '$ForumID'");
- $Cache->delete_value("forums_$ForumID");
-
- $Cache->delete_value("thread_$TopicID");
-
- $Cache->begin_transaction('forums_list');
- $UpdateArray = array(
- 'NumPosts' => $NumPosts,
- 'NumTopics' => '-1',
- 'LastPostID' => $NewLastPostID,
- 'LastPostAuthorID' => $NewLastAuthorID,
- 'LastPostTopicID' => $NewLastTopic,
- 'LastPostTime' => $NewLastAddedTime,
- 'Title' => $NewLastTitle,
- 'IsLocked' => $NewLocked,
- 'IsSticky' => $NewSticky
- );
-
- $Cache->update_row($ForumID, $UpdateArray);
- $Cache->commit_transaction(0);
- $Cache->delete_value("thread_{$TopicID}_info");
-
- // subscriptions
- Subscriptions::move_subscriptions('forums', $TopicID, null);
-
- // quote notifications
- Subscriptions::flush_quote_notifications('forums', $TopicID);
- $DB->query("
- DELETE FROM users_notify_quoted
- WHERE Page = 'forums'
- AND PageID = '$TopicID'");
-
- header("Location: forums.php?action=viewforum&forumid=$ForumID");
+ if (!check_perms('site_admin_forums')) {
+ error(403);
+ }
+
+ $DB->query("
+ DELETE FROM forums_posts
+ WHERE TopicID = '$TopicID'");
+ $DB->query("
+ DELETE FROM forums_topics
+ WHERE ID = '$TopicID'");
+
+ $DB->query("
+ SELECT
+ t.ID,
+ t.LastPostID,
+ t.Title,
+ p.AuthorID,
+ um.Username,
+ p.AddedTime,
+ (
+ SELECT COUNT(pp.ID)
+ FROM forums_posts AS pp
+ JOIN forums_topics AS tt ON pp.TopicID = tt.ID
+ WHERE tt.ForumID = '$ForumID'
+ ),
+ t.IsLocked,
+ t.IsSticky
+ FROM forums_topics AS t
+ JOIN forums_posts AS p ON p.ID = t.LastPostID
+ LEFT JOIN users_main AS um ON um.ID = p.AuthorID
+ WHERE t.ForumID = '$ForumID'
+ GROUP BY t.ID
+ ORDER BY t.LastPostID DESC
+ LIMIT 1");
+ list($NewLastTopic, $NewLastPostID, $NewLastTitle, $NewLastAuthorID, $NewLastAuthorName, $NewLastAddedTime, $NumPosts, $NewLocked, $NewSticky) = $DB->next_record(MYSQLI_NUM, false);
+
+ $DB->query("
+ UPDATE forums
+ SET
+ NumTopics = NumTopics - 1,
+ NumPosts = NumPosts - '$Posts',
+ LastPostTopicID = '$NewLastTopic',
+ LastPostID = '$NewLastPostID',
+ LastPostAuthorID = '$NewLastAuthorID',
+ LastPostTime = '$NewLastAddedTime'
+ WHERE ID = '$ForumID'");
+ $Cache->delete_value("forums_$ForumID");
+
+ $Cache->delete_value("thread_$TopicID");
+
+ $Cache->begin_transaction('forums_list');
+ $UpdateArray = array(
+ 'NumPosts' => $NumPosts,
+ 'NumTopics' => '-1',
+ 'LastPostID' => $NewLastPostID,
+ 'LastPostAuthorID' => $NewLastAuthorID,
+ 'LastPostTopicID' => $NewLastTopic,
+ 'LastPostTime' => $NewLastAddedTime,
+ 'Title' => $NewLastTitle,
+ 'IsLocked' => $NewLocked,
+ 'IsSticky' => $NewSticky
+ );
+
+ $Cache->update_row($ForumID, $UpdateArray);
+ $Cache->commit_transaction(0);
+ $Cache->delete_value("thread_{$TopicID}_info");
+
+ // subscriptions
+ Subscriptions::move_subscriptions('forums', $TopicID, null);
+
+ // quote notifications
+ Subscriptions::flush_quote_notifications('forums', $TopicID);
+ $DB->query("
+ DELETE FROM users_notify_quoted
+ WHERE Page = 'forums'
+ AND PageID = '$TopicID'");
+
+ header("Location: forums.php?action=viewforum&forumid=$ForumID");
} else { // If we're just editing it
- $Action = 'editing';
-
- if (isset($_POST['trash'])) {
- $ForumID = $TrashForumID;
- $Action = 'trashing';
- }
-
- if (isset($_POST['resolve'])) {
- $ForumID = $ResolveForumID;
- $Action = 'resolving';
- }
-
- $Cache->begin_transaction("thread_{$TopicID}_info");
- $UpdateArray = array(
- 'IsSticky' => $Sticky,
- 'Ranking' => $Ranking,
- 'IsLocked' => $Locked,
- 'Title' => Format::cut_string($RawTitle, 150, 1, 0),
- 'ForumID' => $ForumID
- );
- $Cache->update_row(false, $UpdateArray);
- $Cache->commit_transaction(0);
-
- $DB->query("
- UPDATE forums_topics
- SET
- IsSticky = '$Sticky',
- Ranking = '$Ranking',
- IsLocked = '$Locked',
- Title = '$Title',
- ForumID = '$ForumID'
- WHERE ID = '$TopicID'");
-
- // always clear cache when editing a thread.
- // if a thread title, etc. is changed, this cache key must be cleared so the thread listing
- // properly shows the new thread title.
- $Cache->delete_value("forums_$ForumID");
-
- if ($ForumID != $OldForumID) { // If we're moving a thread, change the forum stats
- $Cache->delete_value("forums_$OldForumID");
-
- $DB->query("
- SELECT MinClassRead, MinClassWrite, Name
- FROM forums
- WHERE ID = '$ForumID'");
- list($MinClassRead, $MinClassWrite, $ForumName) = $DB->next_record(MYSQLI_NUM, false);
- $Cache->begin_transaction("thread_{$TopicID}_info");
- $UpdateArray = array(
- 'ForumName' => $ForumName,
- 'MinClassRead' => $MinClassRead,
- 'MinClassWrite' => $MinClassWrite
- );
- $Cache->update_row(false, $UpdateArray);
- $Cache->commit_transaction(3600 * 24 * 5);
-
- $Cache->begin_transaction('forums_list');
-
- // Forum we're moving from
- $DB->query("
- SELECT
- t.ID,
- t.LastPostID,
- t.Title,
- p.AuthorID,
- um.Username,
- p.AddedTime,
- (
- SELECT COUNT(pp.ID)
- FROM forums_posts AS pp
- JOIN forums_topics AS tt ON pp.TopicID = tt.ID
- WHERE tt.ForumID = '$OldForumID'
- ),
- t.IsLocked,
- t.IsSticky,
- t.Ranking
- FROM forums_topics AS t
- JOIN forums_posts AS p ON p.ID = t.LastPostID
- LEFT JOIN users_main AS um ON um.ID = p.AuthorID
- WHERE t.ForumID = '$OldForumID'
- ORDER BY t.LastPostID DESC
- LIMIT 1");
- list($NewLastTopic, $NewLastPostID, $NewLastTitle, $NewLastAuthorID, $NewLastAuthorName, $NewLastAddedTime, $NumPosts, $NewLocked, $NewSticky, $NewRanking) = $DB->next_record(MYSQLI_NUM, false);
-
- $DB->query("
- UPDATE forums
- SET
- NumTopics = NumTopics - 1,
- NumPosts = NumPosts - '$Posts',
- LastPostTopicID = '$NewLastTopic',
- LastPostID = '$NewLastPostID',
- LastPostAuthorID = '$NewLastAuthorID',
- LastPostTime = '$NewLastAddedTime'
- WHERE ID = '$OldForumID'");
-
-
- $UpdateArray = array(
- 'NumPosts' => $NumPosts,
- 'NumTopics' => '-1',
- 'LastPostID' => $NewLastPostID,
- 'LastPostAuthorID' => $NewLastAuthorID,
- 'LastPostTopicID' => $NewLastTopic,
- 'LastPostTime' => $NewLastAddedTime,
- 'Title' => $NewLastTitle,
- 'IsLocked' => $NewLocked,
- 'IsSticky' => $NewSticky,
- 'Ranking' => $NewRanking
- );
-
-
- $Cache->update_row($OldForumID, $UpdateArray);
-
- // Forum we're moving to
-
- $DB->query("
- SELECT
- t.ID,
- t.LastPostID,
- t.Title,
- p.AuthorID,
- um.Username,
- p.AddedTime,
- (
- SELECT COUNT(pp.ID)
- FROM forums_posts AS pp
- JOIN forums_topics AS tt ON pp.TopicID = tt.ID
- WHERE tt.ForumID = '$ForumID'
- )
- FROM forums_topics AS t
- JOIN forums_posts AS p ON p.ID = t.LastPostID
- LEFT JOIN users_main AS um ON um.ID = p.AuthorID
- WHERE t.ForumID = '$ForumID'
- ORDER BY t.LastPostID DESC
- LIMIT 1");
- list($NewLastTopic, $NewLastPostID, $NewLastTitle, $NewLastAuthorID, $NewLastAuthorName, $NewLastAddedTime, $NumPosts) = $DB->next_record(MYSQLI_NUM, false);
-
- $DB->query("
- UPDATE forums
- SET
- NumTopics = NumTopics + 1,
- NumPosts = NumPosts + '$Posts',
- LastPostTopicID = '$NewLastTopic',
- LastPostID = '$NewLastPostID',
- LastPostAuthorID = '$NewLastAuthorID',
- LastPostTime = '$NewLastAddedTime'
- WHERE ID = '$ForumID'");
-
-
- $UpdateArray = array(
- 'NumPosts' => ($NumPosts + $Posts),
- 'NumTopics' => '+1',
- 'LastPostID' => $NewLastPostID,
- 'LastPostAuthorID' => $NewLastAuthorID,
- 'LastPostTopicID' => $NewLastTopic,
- 'LastPostTime' => $NewLastAddedTime,
- 'Title' => $NewLastTitle
- );
-
- $Cache->update_row($ForumID, $UpdateArray);
-
- $Cache->commit_transaction(0);
-
- if ($ForumID == $TrashForumID) {
- $Action = 'trashing';
- }
- if ($ForumID == $ResolveForumID) {
- $Action = 'resolving';
- }
- } else { // Editing
- $DB->query("
- SELECT LastPostTopicID
- FROM forums
- WHERE ID = '$ForumID'");
- list($LastTopicID) = $DB->next_record();
- if ($LastTopicID == $TopicID) {
- $UpdateArray = array(
- 'Title' => $RawTitle,
- 'IsLocked' => $Locked,
- 'IsSticky' => $Sticky,
- 'Ranking' => $Ranking
- );
- $Cache->begin_transaction('forums_list');
- $Cache->update_row($ForumID, $UpdateArray);
- $Cache->commit_transaction(0);
- }
- }
- if ($Locked) {
- $CatalogueID = floor($NumPosts / THREAD_CATALOGUE);
- for ($i = 0; $i <= $CatalogueID; $i++) {
- $Cache->expire_value("thread_{$TopicID}_catalogue_$i", 3600 * 24 * 7); // 7 days
- }
- $Cache->expire_value("thread_{$TopicID}_info", 3600 * 24 * 7); // 7 days
-
- $DB->query("
- UPDATE forums_polls
- SET Closed = '0'
- WHERE TopicID = '$TopicID'");
- $Cache->delete_value("polls_$TopicID");
- }
-
- // topic notes and notifications
- $TopicNotes = [];
- switch ($Action) {
- case 'editing':
- if ($OldTitle != $RawTitle) {
- // title edited
- $TopicNotes[] = "Title edited from \"$OldTitle\" to \"$RawTitle\"";
- }
- if ($OldLocked != $Locked) {
- if (!$OldLocked) {
- $TopicNotes[] = 'Locked';
- } else {
- $TopicNotes[] = 'Unlocked';
- }
- }
- if ($OldSticky != $Sticky) {
- if (!$OldSticky) {
- $TopicNotes[] = 'Stickied';
- } else {
- $TopicNotes[] = 'Unstickied';
- }
- }
- if ($OldRanking != $Ranking) {
- $TopicNotes[] = "Ranking changed from \"$OldRanking\" to \"$Ranking\"";
- }
- if ($ForumID != $OldForumID) {
- $TopicNotes[] = "Moved from [url=" . site_url() . "forums.php?action=viewforum&forumid=$OldForumID]{$OldForumName}[/url] to [url=" . site_url() . "forums.php?action=viewforum&forumid=$ForumID]{$ForumName}[/url]";
- }
- break;
- case 'trashing':
- $TopicNotes[] = "Trashed (moved from [url=" . site_url() . "forums.php?action=viewforum&forumid=$OldForumID]{$OldForumName}[/url] to [url=" . site_url() . "forums.php?action=viewforum&forumid=$ForumID]{$ForumName}[/url])";
- $Notification = "Your thread \"$NewLastTitle\" has been trashed";
- break;
- case 'resolving':
- $TopicNotes[] = "Resolved (moved from [url=" . site_url() . "forums.php?action=viewforum&forumid=$OldForumID]{$OldForumName}[/url] to [url=" . site_url() . "forums.php?action=viewforum&forumid=$ForumID]{$ForumName}[/url])";
- $Notification = "Your thread \"$NewLastTitle\" has been resolved";
- break;
- default:
- break;
- }
- if (isset($Notification)) {
- NotificationsManager::notify_user($ThreadAuthorID, NotificationsManager::FORUMALERTS, $Notification, "forums.php?action=viewthread&threadid=$TopicID");
- }
- if (count($TopicNotes) > 0) {
- Forums::add_topic_note($TopicID, implode("\n", $TopicNotes));
- }
- header("Location: forums.php?action=viewthread&threadid=$TopicID&page=$Page");
+ if ($Action == '') {
+ $Action = 'editing';
+ }
+
+ $Cache->begin_transaction("thread_{$TopicID}_info");
+ $UpdateArray = array(
+ 'IsSticky' => $Sticky,
+ 'Ranking' => $Ranking,
+ 'IsLocked' => $Locked,
+ 'Title' => Format::cut_string($RawTitle, 150, 1, 0),
+ 'ForumID' => $ForumID
+ );
+ $Cache->update_row(false, $UpdateArray);
+ $Cache->commit_transaction(0);
+
+ $DB->query("
+ UPDATE forums_topics
+ SET
+ IsSticky = '$Sticky',
+ Ranking = '$Ranking',
+ IsLocked = '$Locked',
+ Title = '$Title',
+ ForumID = '$ForumID'
+ WHERE ID = '$TopicID'");
+
+ // always clear cache when editing a thread.
+ // if a thread title, etc. is changed, this cache key must be cleared so the thread listing
+ // properly shows the new thread title.
+ $Cache->delete_value("forums_$ForumID");
+
+ if ($ForumID != $OldForumID) { // If we're moving a thread, change the forum stats
+ $Cache->delete_value("forums_$OldForumID");
+
+ $DB->query("
+ SELECT MinClassRead, MinClassWrite, Name
+ FROM forums
+ WHERE ID = '$ForumID'");
+ list($MinClassRead, $MinClassWrite, $ForumName) = $DB->next_record(MYSQLI_NUM, false);
+ $Cache->begin_transaction("thread_{$TopicID}_info");
+ $UpdateArray = array(
+ 'ForumName' => $ForumName,
+ 'MinClassRead' => $MinClassRead,
+ 'MinClassWrite' => $MinClassWrite
+ );
+ $Cache->update_row(false, $UpdateArray);
+ $Cache->commit_transaction(3600 * 24 * 5);
+
+ $Cache->begin_transaction('forums_list');
+
+ // Forum we're moving from
+ $DB->query("
+ SELECT
+ t.ID,
+ t.LastPostID,
+ t.Title,
+ p.AuthorID,
+ um.Username,
+ p.AddedTime,
+ (
+ SELECT COUNT(pp.ID)
+ FROM forums_posts AS pp
+ JOIN forums_topics AS tt ON pp.TopicID = tt.ID
+ WHERE tt.ForumID = '$OldForumID'
+ ),
+ t.IsLocked,
+ t.IsSticky,
+ t.Ranking
+ FROM forums_topics AS t
+ JOIN forums_posts AS p ON p.ID = t.LastPostID
+ LEFT JOIN users_main AS um ON um.ID = p.AuthorID
+ WHERE t.ForumID = '$OldForumID'
+ ORDER BY t.LastPostID DESC
+ LIMIT 1");
+ list($NewLastTopic, $NewLastPostID, $NewLastTitle, $NewLastAuthorID, $NewLastAuthorName, $NewLastAddedTime, $NumPosts, $NewLocked, $NewSticky, $NewRanking) = $DB->next_record(MYSQLI_NUM, false);
+
+ $DB->query("
+ UPDATE forums
+ SET
+ NumTopics = NumTopics - 1,
+ NumPosts = NumPosts - '$Posts',
+ LastPostTopicID = '$NewLastTopic',
+ LastPostID = '$NewLastPostID',
+ LastPostAuthorID = '$NewLastAuthorID',
+ LastPostTime = '$NewLastAddedTime'
+ WHERE ID = '$OldForumID'");
+
+
+ $UpdateArray = array(
+ 'NumPosts' => $NumPosts,
+ 'NumTopics' => '-1',
+ 'LastPostID' => $NewLastPostID,
+ 'LastPostAuthorID' => $NewLastAuthorID,
+ 'LastPostTopicID' => $NewLastTopic,
+ 'LastPostTime' => $NewLastAddedTime,
+ 'Title' => $NewLastTitle,
+ 'IsLocked' => $NewLocked,
+ 'IsSticky' => $NewSticky,
+ 'Ranking' => $NewRanking
+ );
+
+
+ $Cache->update_row($OldForumID, $UpdateArray);
+
+ // Forum we're moving to
+
+ $DB->query("
+ SELECT
+ t.ID,
+ t.LastPostID,
+ t.Title,
+ p.AuthorID,
+ um.Username,
+ p.AddedTime,
+ (
+ SELECT COUNT(pp.ID)
+ FROM forums_posts AS pp
+ JOIN forums_topics AS tt ON pp.TopicID = tt.ID
+ WHERE tt.ForumID = '$ForumID'
+ )
+ FROM forums_topics AS t
+ JOIN forums_posts AS p ON p.ID = t.LastPostID
+ LEFT JOIN users_main AS um ON um.ID = p.AuthorID
+ WHERE t.ForumID = '$ForumID'
+ ORDER BY t.LastPostID DESC
+ LIMIT 1");
+ list($NewLastTopic, $NewLastPostID, $NewLastTitle, $NewLastAuthorID, $NewLastAuthorName, $NewLastAddedTime, $NumPosts) = $DB->next_record(MYSQLI_NUM, false);
+
+ $DB->query("
+ UPDATE forums
+ SET
+ NumTopics = NumTopics + 1,
+ NumPosts = NumPosts + '$Posts',
+ LastPostTopicID = '$NewLastTopic',
+ LastPostID = '$NewLastPostID',
+ LastPostAuthorID = '$NewLastAuthorID',
+ LastPostTime = '$NewLastAddedTime'
+ WHERE ID = '$ForumID'");
+
+
+ $UpdateArray = array(
+ 'NumPosts' => ($NumPosts + $Posts),
+ 'NumTopics' => '+1',
+ 'LastPostID' => $NewLastPostID,
+ 'LastPostAuthorID' => $NewLastAuthorID,
+ 'LastPostTopicID' => $NewLastTopic,
+ 'LastPostTime' => $NewLastAddedTime,
+ 'Title' => $NewLastTitle
+ );
+
+ $Cache->update_row($ForumID, $UpdateArray);
+
+ $Cache->commit_transaction(0);
+ } else { // Editing
+ $DB->query("
+ SELECT LastPostTopicID
+ FROM forums
+ WHERE ID = '$ForumID'");
+ list($LastTopicID) = $DB->next_record();
+ if ($LastTopicID == $TopicID) {
+ $UpdateArray = array(
+ 'Title' => $RawTitle,
+ 'IsLocked' => $Locked,
+ 'IsSticky' => $Sticky,
+ 'Ranking' => $Ranking
+ );
+ $Cache->begin_transaction('forums_list');
+ $Cache->update_row($ForumID, $UpdateArray);
+ $Cache->commit_transaction(0);
+ }
+ }
+ if ($Locked) {
+ $CatalogueID = floor($NumPosts / THREAD_CATALOGUE);
+ for ($i = 0; $i <= $CatalogueID; $i++) {
+ $Cache->expire_value("thread_{$TopicID}_catalogue_$i", 3600 * 24 * 7); // 7 days
+ }
+ $Cache->expire_value("thread_{$TopicID}_info", 3600 * 24 * 7); // 7 days
+
+ $DB->query("
+ UPDATE forums_polls
+ SET Closed = '0'
+ WHERE TopicID = '$TopicID'");
+ $Cache->delete_value("polls_$TopicID");
+ }
+
+ // topic notes and notifications
+ $TopicNotes = [];
+ switch ($Action) {
+ case 'editing':
+ if ($OldTitle != $RawTitle) {
+ // title edited
+ $TopicNotes[] = "Title edited from \"$OldTitle\" to \"$RawTitle\"";
+ }
+ if ($OldLocked != $Locked) {
+ if (!$OldLocked) {
+ $TopicNotes[] = 'Locked';
+ } else {
+ $TopicNotes[] = 'Unlocked';
+ }
+ }
+ if ($OldSticky != $Sticky) {
+ if (!$OldSticky) {
+ $TopicNotes[] = 'Stickied';
+ } else {
+ $TopicNotes[] = 'Unstickied';
+ }
+ }
+ if ($OldRanking != $Ranking) {
+ $TopicNotes[] = "Ranking changed from \"$OldRanking\" to \"$Ranking\"";
+ }
+ if ($ForumID != $OldForumID) {
+ $TopicNotes[] = "Moved from [url=" . site_url() . "forums.php?action=viewforum&forumid=$OldForumID]{$OldForumName}[/url] to [url=" . site_url() . "forums.php?action=viewforum&forumid=$ForumID]{$ForumName}[/url]";
+ }
+ break;
+ case 'trashing':
+ $TopicNotes[] = "Trashed (moved from [url=" . site_url() . "forums.php?action=viewforum&forumid=$OldForumID]{$OldForumName}[/url] to [url=" . site_url() . "forums.php?action=viewforum&forumid=$ForumID]{$ForumName}[/url])";
+ $Notification = "Your thread \"$NewLastTitle\" has been trashed";
+ break;
+ case 'resolving':
+ $TopicNotes[] = "Resolved (moved from [url=" . site_url() . "forums.php?action=viewforum&forumid=$OldForumID]{$OldForumName}[/url] to [url=" . site_url() . "forums.php?action=viewforum&forumid=$ForumID]{$ForumName}[/url])";
+ $Notification = "Your thread \"$NewLastTitle\" has been resolved";
+ break;
+ case 'transitioning':
+ $TopicNotes[] = "Moved from [url=" . site_url() . "forums.php?action=viewforum&forumid=$OldForumID]{$OldForumName}[/url] to [url=" . site_url() . "forums.php?action=viewforum&forumid=$ForumID]{$ForumName}[/url] (" . $transition['label'] . " transition)";
+ break;
+ default:
+ break;
+ }
+ if (isset($Notification)) {
+ NotificationsManager::notify_user($ThreadAuthorID, NotificationsManager::FORUMALERTS, $Notification, "forums.php?action=viewthread&threadid=$TopicID");
+ }
+ if (count($TopicNotes) > 0) {
+ Forums::add_topic_note($TopicID, implode("\n", $TopicNotes));
+ }
+ header("Location: forums.php?action=viewthread&threadid=$TopicID&page=$Page");
}
diff --git a/sections/forums/newthread.php b/sections/forums/newthread.php
index 212206c72..3762ad92e 100644
--- a/sections/forums/newthread.php
+++ b/sections/forums/newthread.php
@@ -1,167 +1,174 @@
-
-
+ Contest admin
-
- Intro
- Leaderboard
-
-
+
Contest information saved.";
+ echo "Contest admin
+ +Contest information saved.
"; } +$ContestType = $ContestMgr->get_type(); -Contest::init_admin(); - -G::$DB->query(" - SELECT c.ID, c.Name, c.DateBegin, c.DateEnd, t.ID as ContestType - FROM contest c - INNER JOIN contest_type t ON (t.ID = c.ContestTypeID) - ORDER BY c.DateBegin - "); -if (G::$DB->has_results()) { +if (!$Create) { + $ContestList = $ContestMgr->get_list(); + if (count($ContestList)) { ?> -
-
-
+
- | Name | -Contest Type | -Date Begins | -Date Ends | -
-
-
+
-
+
-
-
+
+
get_current_contest();
if ($Contest !== false and strlen($Contest['Banner'])) {
?>
+
+
Request pairs
- +Request pairs
+get_request_pairs(); + if (!count($Pairs)) { ?> -No members have filled out more than one request for the same member.
-No members have filled out more than one request for the same member. + -The following members have filled out more than one request for the same member.
-| Request filler | -Request creator | -Filled | -|||||
| Request filler | +Request creator | +Filled | +
| - | - | - | + | + | + + - |
- ![<?=$Contest['Name'] ?>](<?=$Contest['Banner'] ?>)
+
-
- Leaderboard
- Admin' : ''?>
+ Leaderboard
+ Admin' : ''?>
-
+
-
- There is no contest at the moment.
-
+
+
diff --git a/sections/contest/leaderboard.php b/sections/contest/leaderboard.php
index 282329eb5..a26c3c21b 100644
--- a/sections/contest/leaderboard.php
+++ b/sections/contest/leaderboard.php
@@ -1,196 +1,213 @@
get_contest(intval($_POST['leaderboard']));
}
elseif (isset($_GET['id']) && is_number($_GET['id'])) {
- $Contest = Contest::get_contest(intval($_GET['id']));
+ $Contest = $ContestMgr->get_contest(intval($_GET['id']));
}
else {
- $Contest = Contest::get_current_contest();
+ $Contest = $ContestMgr->get_current_contest();
}
if (!empty($Contest)) {
- $Leaderboard = Contest::get_leaderboard($Contest['ID']);
- View::show_header($Contest['Name'].' Leaderboard');
+ $Leaderboard = $ContestMgr->get_leaderboard($Contest['ID']);
+ View::show_header($Contest['Name'].' Leaderboard');
}
else {
- View::show_header('Leaderboard');
+ View::show_header('Leaderboard');
}
if ($Contest['Banner']) {
?>
There is no contest at the moment.
+
- ![<?= $Contest['Name'] ?>](<?= $Contest['Banner'] ?>)
+
-
Leaderboard
-get_prior_contests();
+if (check_perms('admin_manage_contest') && count($Prior)) {
?>
-
-
+
+
+
+
+
+
+
+
+
+ There are no topics here.Create one!' : '')?>
+
+ 0
+ 0
+
+
+
+ 50) ? "title='".display_str($LastTopic)."'" : "")?>>
+
+
+
+
+
+
+ by
+
+
+
+
+ 0) {
+ $bp = new \Gazelle\BonusPool($DB, $Cache, $Contest['BonusPool']);
+?>
+
-
+
-
-
-
-
+ +
+
- + « - - + + - - Original Post - + Original Post + 0) { ?> - » - + » + diff --git a/sections/forums/catchup.php b/sections/forums/catchup.php index 7f59af899..5d860dea9 100644 --- a/sections/forums/catchup.php +++ b/sections/forums/catchup.php @@ -1,28 +1,28 @@ -query(" - UPDATE users_info - SET CatchupTime = NOW() - WHERE UserID = $LoggedUser[ID]"); - $Cache->delete_value('user_info_'.$LoggedUser['ID']); - header('Location: forums.php'); + $DB->query(" + UPDATE users_info + SET CatchupTime = NOW() + WHERE UserID = $LoggedUser[ID]"); + $Cache->delete_value('user_info_'.$LoggedUser['ID']); + header('Location: forums.php'); } else { - // Insert a value for each topic - $DB->query(" - INSERT INTO forums_last_read_topics (UserID, TopicID, PostID) - SELECT '$LoggedUser[ID]', ID, LastPostID - FROM forums_topics - WHERE (LastPostTime > '".time_minus(3600 * 24 * 30)."' OR IsSticky = '1') - AND ForumID = ".$_GET['forumid']." - ON DUPLICATE KEY UPDATE - PostID = LastPostID"); + // Insert a value for each topic + $DB->query(" + INSERT INTO forums_last_read_topics (UserID, TopicID, PostID) + SELECT '$LoggedUser[ID]', ID, LastPostID + FROM forums_topics + WHERE (LastPostTime > '".time_minus(3600 * 24 * 30)."' OR IsSticky = '1') + AND ForumID = ".$_GET['forumid']." + ON DUPLICATE KEY UPDATE + PostID = LastPostID"); - header('Location: forums.php?action=viewforum&forumid='.$_GET['forumid']); + header('Location: forums.php?action=viewforum&forumid='.$_GET['forumid']); } ?> diff --git a/sections/forums/change_vote.php b/sections/forums/change_vote.php index 7dff1e442..0eeea20eb 100644 --- a/sections/forums/change_vote.php +++ b/sections/forums/change_vote.php @@ -1,28 +1,28 @@ -query(" - SELECT ForumID - FROM forums_topics - WHERE ID = $ThreadID"); - list($ForumID) = $DB->next_record(); - if (!in_array($ForumID, $ForumsRevealVoters)) { - error(403); - } - } + if (!check_perms('site_moderate_forums')) { + $DB->query(" + SELECT ForumID + FROM forums_topics + WHERE ID = $ThreadID"); + list($ForumID) = $DB->next_record(); + if (!in_array($ForumID, $ForumsRevealVoters)) { + error(403); + } + } - $DB->query(" - UPDATE forums_polls_votes - SET Vote = $NewVote - WHERE TopicID = $ThreadID - AND UserID = ".$LoggedUser['ID']); - $Cache->delete_value('polls_'.$ThreadID); - header("Location: forums.php?action=viewthread&threadid=".$ThreadID); + $DB->query(" + UPDATE forums_polls_votes + SET Vote = $NewVote + WHERE TopicID = $ThreadID + AND UserID = ".$LoggedUser['ID']); + $Cache->delete_value('polls_'.$ThreadID); + header("Location: forums.php?action=viewthread&threadid=".$ThreadID); } else { - error(404); + error(404); } diff --git a/sections/forums/delete.php b/sections/forums/delete.php index 6ddfbbda7..2b2868a27 100644 --- a/sections/forums/delete.php +++ b/sections/forums/delete.php @@ -1,36 +1,36 @@ -query(" - SELECT - TopicID, - ForumID, - CEIL(COUNT(p.ID) / ".POSTS_PER_PAGE.") AS Pages, - CEIL(SUM(IF(p.ID <= '$PostID', 1, 0)) / ".POSTS_PER_PAGE.") AS Page, - StickyPostID - FROM forums_posts AS p - JOIN forums_topics AS t ON t.ID = p.TopicID - WHERE p.TopicID = ( - SELECT TopicID - FROM forums_posts - WHERE ID = '$PostID' - ) - GROUP BY t.ID"); + SELECT + TopicID, + ForumID, + CEIL(COUNT(p.ID) / ".POSTS_PER_PAGE.") AS Pages, + CEIL(SUM(IF(p.ID <= '$PostID', 1, 0)) / ".POSTS_PER_PAGE.") AS Page, + StickyPostID + FROM forums_posts AS p + JOIN forums_topics AS t ON t.ID = p.TopicID + WHERE p.TopicID = ( + SELECT TopicID + FROM forums_posts + WHERE ID = '$PostID' + ) + GROUP BY t.ID"); list($TopicID, $ForumID, $Pages, $Page, $StickyPostID) = $DB->next_record(); if (!$TopicID) { - // Post is deleted or thread doesn't exist - error(0); // This is evil, but the ajax call doesn't check the response + // Post is deleted or thread doesn't exist + error(0); // This is evil, but the ajax call doesn't check the response } // $Pages = number of pages in the thread @@ -38,101 +38,101 @@ // These are set for cache clearing. $DB->query(" - DELETE FROM forums_posts - WHERE ID = '$PostID'"); + DELETE FROM forums_posts + WHERE ID = '$PostID'"); $DB->query(" - SELECT MAX(ID) - FROM forums_posts - WHERE TopicID = '$TopicID'"); + SELECT MAX(ID) + FROM forums_posts + WHERE TopicID = '$TopicID'"); list($LastID) = $DB->next_record(); $DB->query(" - UPDATE forums AS f, forums_topics AS t - SET f.NumPosts = f.NumPosts - 1, - t.NumPosts = t.NumPosts - 1 - WHERE f.ID = '$ForumID' - AND t.ID = '$TopicID'"); + UPDATE forums AS f, forums_topics AS t + SET f.NumPosts = f.NumPosts - 1, + t.NumPosts = t.NumPosts - 1 + WHERE f.ID = '$ForumID' + AND t.ID = '$TopicID'"); if ($LastID < $PostID) { // Last post in a topic was removed - $DB->query(" - SELECT p.AuthorID, u.Username, p.AddedTime - FROM forums_posts AS p - LEFT JOIN users_main AS u ON u.ID = p.AuthorID - WHERE p.ID = '$LastID'"); - list($LastAuthorID, $LastAuthorName, $LastTime) = $DB->next_record(); - $DB->query(" - UPDATE forums_topics - SET - LastPostID = '$LastID', - LastPostAuthorID = '$LastAuthorID', - LastPostTime = '$LastTime' - WHERE ID = '$TopicID'"); - $DB->query(" - SELECT - t.ID, - t.Title, - t.LastPostID, - t.LastPostTime, - t.LastPostAuthorID, - u.Username - FROM forums_topics AS t - LEFT JOIN users_main AS u ON u.ID = t.LastPostAuthorID - WHERE ForumID = '$ForumID' - AND t.ID != '$TopicID' - ORDER BY LastPostID DESC - LIMIT 1"); - list($LastTopicID, $LastTopicTitle, $LastTopicPostID, $LastTopicPostTime, $LastTopicAuthorID, $LastTopicAuthorName) = $DB->next_record(MYSQLI_BOTH, false); + $DB->query(" + SELECT p.AuthorID, u.Username, p.AddedTime + FROM forums_posts AS p + LEFT JOIN users_main AS u ON u.ID = p.AuthorID + WHERE p.ID = '$LastID'"); + list($LastAuthorID, $LastAuthorName, $LastTime) = $DB->next_record(); + $DB->query(" + UPDATE forums_topics + SET + LastPostID = '$LastID', + LastPostAuthorID = '$LastAuthorID', + LastPostTime = '$LastTime' + WHERE ID = '$TopicID'"); + $DB->query(" + SELECT + t.ID, + t.Title, + t.LastPostID, + t.LastPostTime, + t.LastPostAuthorID, + u.Username + FROM forums_topics AS t + LEFT JOIN users_main AS u ON u.ID = t.LastPostAuthorID + WHERE ForumID = '$ForumID' + AND t.ID != '$TopicID' + ORDER BY LastPostID DESC + LIMIT 1"); + list($LastTopicID, $LastTopicTitle, $LastTopicPostID, $LastTopicPostTime, $LastTopicAuthorID, $LastTopicAuthorName) = $DB->next_record(MYSQLI_BOTH, false); - if ($LastID < $LastTopicPostID) { // Topic is no longer the most recent in its forum - $DB->query(" - UPDATE forums - SET - LastPostTopicID = '$LastTopicID', - LastPostID = '$LastTopicPostID', - LastPostAuthorID = '$LastTopicAuthorID', - LastPostTime = '$LastTopicPostTime' - WHERE ID = '$ForumID' - AND LastPostTopicID = '$TopicID'"); - $UpdateArrayForums = array( - 'NumPosts' => '-1', - 'LastPostID' => $LastTopicPostID, - 'LastPostAuthorID' => $LastTopicAuthorID, - 'LastPostTime' => $LastTopicPostTime, - 'LastPostTopicID' => $LastTopicID, - 'Title' => $LastTopicTitle); - } else { // Topic is still the most recent in its forum - $DB->query(" - UPDATE forums - SET - LastPostID = '$LastID', - LastPostAuthorID = '$LastAuthorID', - LastPostTime = '$LastTime' - WHERE ID = '$ForumID' - AND LastPostTopicID = '$TopicID'"); - $UpdateArrayForums = array( - 'NumPosts' => '-1', - 'LastPostID' => $LastID, - 'LastPostAuthorID' => $LastAuthorID, - 'LastPostTime' => $LastTime); - } - $UpdateArrayThread = array('Posts' => '-1', 'LastPostAuthorID' => $LastAuthorID, 'LastPostTime' => $LastTime); + if ($LastID < $LastTopicPostID) { // Topic is no longer the most recent in its forum + $DB->query(" + UPDATE forums + SET + LastPostTopicID = '$LastTopicID', + LastPostID = '$LastTopicPostID', + LastPostAuthorID = '$LastTopicAuthorID', + LastPostTime = '$LastTopicPostTime' + WHERE ID = '$ForumID' + AND LastPostTopicID = '$TopicID'"); + $UpdateArrayForums = array( + 'NumPosts' => '-1', + 'LastPostID' => $LastTopicPostID, + 'LastPostAuthorID' => $LastTopicAuthorID, + 'LastPostTime' => $LastTopicPostTime, + 'LastPostTopicID' => $LastTopicID, + 'Title' => $LastTopicTitle); + } else { // Topic is still the most recent in its forum + $DB->query(" + UPDATE forums + SET + LastPostID = '$LastID', + LastPostAuthorID = '$LastAuthorID', + LastPostTime = '$LastTime' + WHERE ID = '$ForumID' + AND LastPostTopicID = '$TopicID'"); + $UpdateArrayForums = array( + 'NumPosts' => '-1', + 'LastPostID' => $LastID, + 'LastPostAuthorID' => $LastAuthorID, + 'LastPostTime' => $LastTime); + } + $UpdateArrayThread = array('Posts' => '-1', 'LastPostAuthorID' => $LastAuthorID, 'LastPostTime' => $LastTime); } else { - $UpdateArrayForums = array('NumPosts' => '-1'); - $UpdateArrayThread = array('Posts' => '-1'); + $UpdateArrayForums = array('NumPosts' => '-1'); + $UpdateArrayThread = array('Posts' => '-1'); } if ($StickyPostID == $PostID) { - $DB->query(" - UPDATE forums_topics - SET StickyPostID = 0 - WHERE ID = $TopicID"); + $DB->query(" + UPDATE forums_topics + SET StickyPostID = 0 + WHERE ID = $TopicID"); } //We need to clear all subsequential catalogues as they've all been bumped with the absence of this post $ThisCatalogue = floor((POSTS_PER_PAGE * $Page - POSTS_PER_PAGE) / THREAD_CATALOGUE); $LastCatalogue = floor((POSTS_PER_PAGE * $Pages - POSTS_PER_PAGE) / THREAD_CATALOGUE); for ($i = $ThisCatalogue; $i <= $LastCatalogue; $i++) { - $Cache->delete_value("thread_$TopicID"."_catalogue_$i"); + $Cache->delete_value("thread_$TopicID"."_catalogue_$i"); } $Cache->begin_transaction("thread_$TopicID".'_info'); @@ -150,6 +150,6 @@ // quote notifications Subscriptions::flush_quote_notifications('forums', $TopicID); $DB->query(" - DELETE FROM users_notify_quoted - WHERE Page = 'forums' - AND PostID = '$PostID'"); + DELETE FROM users_notify_quoted + WHERE Page = 'forums' + AND PostID = '$PostID'"); diff --git a/sections/forums/delete_poll_option.php b/sections/forums/delete_poll_option.php index 51259bd21..d7839d9cd 100644 --- a/sections/forums/delete_poll_option.php +++ b/sections/forums/delete_poll_option.php @@ -1,46 +1,46 @@ -query(" - SELECT ForumID - FROM forums_topics - WHERE ID = $ThreadID"); - list($ForumID) = $DB->next_record(); - if (!in_array($ForumID, $ForumsRevealVoters)) { - error(403); - } + $DB->query(" + SELECT ForumID + FROM forums_topics + WHERE ID = $ThreadID"); + list($ForumID) = $DB->next_record(); + if (!in_array($ForumID, $ForumsRevealVoters)) { + error(403); + } - $DB->query(" - SELECT Answers - FROM forums_polls - WHERE TopicID = $ThreadID"); - if (!$DB->has_results()) { - error(404); - } + $DB->query(" + SELECT Answers + FROM forums_polls + WHERE TopicID = $ThreadID"); + if (!$DB->has_results()) { + error(404); + } - list($Answers) = $DB->next_record(MYSQLI_NUM, false); - $Answers = unserialize($Answers); - unset($Answers[$PollOption]); - $Answers = serialize($Answers); + list($Answers) = $DB->next_record(MYSQLI_NUM, false); + $Answers = unserialize($Answers); + unset($Answers[$PollOption]); + $Answers = serialize($Answers); - $DB->query(" - UPDATE forums_polls - SET Answers = '".db_string($Answers)."' - WHERE TopicID = $ThreadID"); - $DB->query(" - DELETE FROM forums_polls_votes - WHERE Vote = $PollOption - AND TopicID = $ThreadID"); + $DB->query(" + UPDATE forums_polls + SET Answers = '".db_string($Answers)."' + WHERE TopicID = $ThreadID"); + $DB->query(" + DELETE FROM forums_polls_votes + WHERE Vote = $PollOption + AND TopicID = $ThreadID"); - $Cache->delete_value("polls_$ThreadID"); - header("Location: forums.php?action=viewthread&threadid=$ThreadID"); + $Cache->delete_value("polls_$ThreadID"); + header("Location: forums.php?action=viewthread&threadid=$ThreadID"); } else { - error(404); + error(404); } diff --git a/sections/forums/edit_rules.php b/sections/forums/edit_rules.php index ce796eace..911847864 100644 --- a/sections/forums/edit_rules.php +++ b/sections/forums/edit_rules.php @@ -1,82 +1,84 @@ -query(" - INSERT INTO forums_specific_rules (ForumID, ThreadID) - VALUES ($ForumID, ".$_POST['new_thread'].')'); - } - } - if (!empty($_POST['del'])) { - if (is_number($_POST['threadid'])) { - $DB->query(" - DELETE FROM forums_specific_rules - WHERE ForumID = $ForumID - AND ThreadID = ".$_POST['threadid']); - } - } - $Cache->delete_value('forums_list'); + if (!empty($_POST['add'])) { + if (is_number($_POST['new_thread'])) { + $DB->query(" + INSERT INTO forums_specific_rules (ForumID, ThreadID) + VALUES ($ForumID, ".$_POST['new_thread'].')'); + } + } + if (!empty($_POST['del'])) { + if (is_number($_POST['threadid'])) { + $DB->query(" + DELETE FROM forums_specific_rules + WHERE ForumID = $ForumID + AND ThreadID = ".$_POST['threadid']); + } + } + $Cache->delete_value('forums_list'); } $DB->query(" - SELECT ThreadID - FROM forums_specific_rules - WHERE ForumID = $ForumID"); + SELECT ThreadID + FROM forums_specific_rules + WHERE ForumID = $ForumID"); $ThreadIDs = $DB->collect('ThreadID'); View::show_header(); ?>
+
-
-
-
-
+ The Bonus Point pool currently stands at getTotalSent()) ?> points.
+ + + +The scheduler has not run yet, there are no results to display.
+ +
That's not supposed to happen. Looks like the contest hasn't begun yet!
+ -
That's not supposed to happen. Looks like the contest hasn't begun yet!
- -
A grand total of get_value("contest_leaderboard_total_{$Contest['ID']}") ?: "many, many, many" ?> .
| Rank | -Who | -Most recent | -Most recent time | -- | Rank | +Who | +Most recent | +Most recent time | ++ + $Contest['Display'] || $nr_rows > $Contest['Display']) { // cut off at limit, even if we haven't reached last winning place because of too many ties break; } - ++$nr_rows; + ++$nr_rows; - if ($row[0] == $LoggedUser['ID']) { - $user_extra = " (that's you!)"; - $user_seen = 1; - } - else { - $user_extra = ''; - } + if ($row[0] == $LoggedUser['ID']) { + $user_extra = " (that's you!)"; + $user_seen = 1; + } + else { + $user_extra = ''; + } - $artist_markup = ''; - $artist_id = explode(',', $row[4]); - $artist_name = explode(chr(1), $row[5]); - if (count($artist_id) > 2) { - $artist_markup = 'Various Artists - '; - } - elseif (count($artist_id) == 2) { - $artist_markup = sprintf( - '%s & %s - ', - $artist_id[0], $artist_name[0], - $artist_id[1], $artist_name[1] - ); - } - //For non-music torrents, $artist_id[0] does exist but has no value. - else { - if ((string)$artist_id[0] == '') { - $artist_markup = ''; - } - else { - $artist_markup = sprintf( - '%s - ', - $artist_id[0], $artist_name[0] - ); - } - } + $artist_markup = ''; + $artist_id = explode(',', $row[4]); + $artist_name = explode(chr(1), $row[5]); + if (count($artist_id) > 2) { + $artist_markup = 'Various Artists - '; + } + elseif (count($artist_id) == 2) { + $artist_markup = sprintf( + '%s & %s - ', + $artist_id[0], $artist_name[0], + $artist_id[1], $artist_name[1] + ); + } + //For non-music torrents, $artist_id[0] does exist but has no value. + else { + if ((string)$artist_id[0] == '') { + $artist_markup = ''; + } + else { + $artist_markup = sprintf( + '%s - ', + $artist_id[0], $artist_name[0] + ); + } + } - $userinfo = Users::user_info($row[0]); - printf(<< | %d | -%s$user_extra | -%s%s | -%s | -%d | - + $userinfo = Users::user_info($row[0]); + printf(<<%d | +%s$user_extra | +%s%s | +%s | +%d | + END_STR - , $rank, - $row[0], $userinfo['Username'], - $artist_markup, - $row[2], $row[3], // torrent - time_diff($row[6], 1), - $score - ); - } + , $rank, + $row[0], $userinfo['Username'], + $artist_markup, + $row[2], $row[3], // torrent + time_diff($row[6], 1), + $score + ); + } ?>
With your upload, you are currently ranked number on the leaderboard. Keep going and see if you can make it!
-With your upload, you are currently ranked number on the leaderboard. Keep going and see if you can make it! + -It doesn't look like you're on the leaderboard at all... for fame and glory!
+It doesn't look like you're on the leaderboard at all... for fame and glory!
- - - + - Why donate? -
- {$SiteName} has no advertisements, is not sponsored, and provides its services free of charge. For these reasons, {$SiteName}'s financial obligations can only be met with the help of voluntary user donations. Supporting {$SiteName} is and will always remain voluntary. If you are financially able, help pay {$SiteName}'s bills by donating. {$SiteName}'s survival is up to you.
-
- {$SiteName} uses all voluntary donations to cover the costs of running the site, tracker, and IRC network. These costs represent the hardware the site runs on (e.g. servers, upgrades, fixes, etc.), and recurring operating expenses (e.g. hosting, bandwidth, power, etc.).
-
- Please note that {$SiteName} is a nonprofit organization. No staff member or other individual responsible for the site's operation personally profits from user donations. As a donor, your financial support is exclusively applied to operating costs. When you donate you aren't paying the {$SiteName} Staff, purchasing upload credit, or buying the ability to download. When you donate you are paying {$SiteName}'s bills.
-
- {$SiteName}'s Donor Rank system is currently available to all credited donors. This system provides donors with perks. Some of these perks are cosmetic (e.g. a donor icon added to your account), some are one-time benefits (e.g. additional invites), and others modify specific site options (e.g. additional profile information boxes, or personal collages). -
+ Why donate?
+ -
- {$SiteName} uses all voluntary donations to cover the costs of running the site, tracker, and IRC network. These costs represent the hardware the site runs on (e.g. servers, upgrades, fixes, etc.), and recurring operating expenses (e.g. hosting, bandwidth, power, etc.).
-
- Please note that {$SiteName} is a nonprofit organization. No staff member or other individual responsible for the site's operation personally profits from user donations. As a donor, your financial support is exclusively applied to operating costs. When you donate you aren't paying the {$SiteName} Staff, purchasing upload credit, or buying the ability to download. When you donate you are paying {$SiteName}'s bills.
-
- {$SiteName}'s Donor Rank system is currently available to all credited donors. This system provides donors with perks. Some of these perks are cosmetic (e.g. a donor icon added to your account), some are one-time benefits (e.g. additional invites), and others modify specific site options (e.g. additional profile information boxes, or personal collages). -
+ {$SiteName} has no advertisements, is not sponsored, and provides its services free of charge. For these reasons, {$SiteName}'s financial obligations can only be met with the help of voluntary user donations. Supporting {$SiteName} is and will always remain voluntary. If you are financially able, help pay {$SiteName}'s bills by donating. {$SiteName}'s survival is up to you.
+
+ {$SiteName} uses all voluntary donations to cover the costs of running the site, tracker, and IRC network. These costs represent the hardware the site runs on (e.g. servers, upgrades, fixes, etc.), and recurring operating expenses (e.g. hosting, bandwidth, power, etc.).
+
+ Please note that {$SiteName} is a nonprofit organization. No staff member or other individual responsible for the site's operation personally profits from user donations. As a donor, your financial support is exclusively applied to operating costs. When you donate you aren't paying the {$SiteName} Staff, purchasing upload credit, or buying the ability to download. When you donate you are paying {$SiteName}'s bills.
+
+ {$SiteName}'s Donor Rank system is currently available to all credited donors. This system provides donors with perks. Some of these perks are cosmetic (e.g. a donor icon added to your account), some are one-time benefits (e.g. additional invites), and others modify specific site options (e.g. additional profile information boxes, or personal collages). +
- Donating
- +
+ {$SiteName} uses all voluntary donations to cover the costs of running the site, tracker, and IRC network. These costs represent the hardware the site runs on (e.g. servers, upgrades, fixes, etc.), and recurring operating expenses (e.g. hosting, bandwidth, power, etc.).
+
+ Please note that {$SiteName} is a nonprofit organization. No staff member or other individual responsible for the site's operation personally profits from user donations. As a donor, your financial support is exclusively applied to operating costs. When you donate you aren't paying the {$SiteName} Staff, purchasing upload credit, or buying the ability to download. When you donate you are paying {$SiteName}'s bills.
+
+ {$SiteName}'s Donor Rank system is currently available to all credited donors. This system provides donors with perks. Some of these perks are cosmetic (e.g. a donor icon added to your account), some are one-time benefits (e.g. additional invites), and others modify specific site options (e.g. additional profile information boxes, or personal collages). +
- If you wish to donate, please contact Athena, and they will handle your donation manually.
-
- The minimum amount required for donating is 10 USD, and must be paid in Bitcoin. -
+ Donating
+ - The minimum amount required for donating is 10 USD, and must be paid in Bitcoin. -
+ If you wish to donate, please contact Spine, and they will handle your donation manually.
+
+ The minimum amount required for donating is 10 USD, and must be paid in Bitcoin. +
- What you will receive for donating
- + The minimum amount required for donating is 10 USD, and must be paid in Bitcoin. +
- Any donation or contribution option listed above gives you the opportunity to receive Donor Points. After acquiring your first Donor Point, your account will unlock Donor Rank #1. This rank will last forever, and you'll receive the following perks upon unlocking it:
-
-
- There are a number of additional perks waiting for you when you unlock additional Donor Ranks. -
-
- - Be reminded that when you make a donation, you aren't "purchasing" Donor Ranks, invites, or any {$SiteName}-specific benefit. When donating, you are helping {$SiteName} pay its bills, and your donation should be made in this spirit. The {$SiteName} Staff does its best to recognize {$SiteName}'s financial supporters in a fair and fun way, but all Donor Perks are subject to change or cancellation at any time, without notice. -
+ What you will receive for donating
+ -
-
-
-
- Our eternal love, as represented by the red heart you get next to your name -
- Inactivity timer immunity -
- Access to the notifications system -
- Two invites -
- Collage creation privileges -
- Personal collage creation privileges -
- One additional personal collage -
- A warm, fuzzy feeling -
- There are a number of additional perks waiting for you when you unlock additional Donor Ranks. -
-
- - Be reminded that when you make a donation, you aren't "purchasing" Donor Ranks, invites, or any {$SiteName}-specific benefit. When donating, you are helping {$SiteName} pay its bills, and your donation should be made in this spirit. The {$SiteName} Staff does its best to recognize {$SiteName}'s financial supporters in a fair and fun way, but all Donor Perks are subject to change or cancellation at any time, without notice. -
+ Any donation or contribution option listed above gives you the opportunity to receive Donor Points. After acquiring your first Donor Point, your account will unlock Donor Rank #1. This rank will last forever, and you'll receive the following perks upon unlocking it:
+
+
+ There are a number of additional perks waiting for you when you unlock additional Donor Ranks. +
+
+ + Be reminded that when you make a donation, you aren't "purchasing" Donor Ranks, invites, or any {$SiteName}-specific benefit. When donating, you are helping {$SiteName} pay its bills, and your donation should be made in this spirit. The {$SiteName} Staff does its best to recognize {$SiteName}'s financial supporters in a fair and fun way, but all Donor Perks are subject to change or cancellation at any time, without notice. +
- What you won't receive for donating
- +
+
-
+
- Our eternal love, as represented by the red heart you get next to your name +
- Inactivity timer immunity +
- Access to the notifications system +
- Two invites +
- Collage creation privileges +
- Personal collage creation privileges +
- One additional personal collage +
- A warm, fuzzy feeling +
+ There are a number of additional perks waiting for you when you unlock additional Donor Ranks. +
+
+ + Be reminded that when you make a donation, you aren't "purchasing" Donor Ranks, invites, or any {$SiteName}-specific benefit. When donating, you are helping {$SiteName} pay its bills, and your donation should be made in this spirit. The {$SiteName} Staff does its best to recognize {$SiteName}'s financial supporters in a fair and fun way, but all Donor Perks are subject to change or cancellation at any time, without notice. +
-
+ What you won't receive for donating
+ - Immunity from the rules
- Additional upload credit
+
HTML;
diff --git a/sections/enable/index.php b/sections/enable/index.php
index df5030712..08e1f7c84 100644
--- a/sections/enable/index.php
+++ b/sections/enable/index.php
@@ -1,4 +1,4 @@
-Error: 403 Forbidden.
-Error: 404 Not Found.
-Error: 413 Request is too large.
-Error: 504 Gateway timeout.
-Search Log';
- }
+ if (isset($Log) && $Log) {
+ $Description .= ' Search Log';
+ }
- if (empty($NoHTML) && $Error != -1) {
- View::show_header($Title);
+ if (empty($NoHTML) && $Error != -1) {
+ View::show_header($Title);
?>
- - Immunity from the rules
- Additional upload credit
-
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+open_feed();
- $Feed->channel('Blocked', 'RSS feed.');
- $Feed->close_feed();
- die();
+ $Feed->open_feed();
+ $Feed->channel('Blocked', 'RSS feed.');
+ $Feed->close_feed();
+ die();
}
$User = (int)$_GET['user'];
if (!$Enabled = $Cache->get_value("enabled_$User")) {
- require(SERVER_ROOT.'/classes/mysql.class.php');
- $DB = NEW DB_MYSQL; //Load the database wrapper
- $DB->query("
- SELECT Enabled
- FROM users_main
- WHERE ID = '$User'");
- list($Enabled) = $DB->next_record();
- $Cache->cache_value("enabled_$User", $Enabled, 0);
+ require(SERVER_ROOT.'/classes/mysql.class.php');
+ $DB = NEW DB_MYSQL; //Load the database wrapper
+ $DB->query("
+ SELECT Enabled
+ FROM users_main
+ WHERE ID = '$User'");
+ list($Enabled) = $DB->next_record();
+ $Cache->cache_value("enabled_$User", $Enabled, 0);
}
if (md5($User.RSS_HASH.$_GET['passkey']) !== $_GET['auth'] || $Enabled != 1) {
- $Feed->open_feed();
- $Feed->channel('Blocked', 'RSS feed.');
- $Feed->close_feed();
- die();
+ $Feed->open_feed();
+ $Feed->channel('Blocked', 'RSS feed.');
+ $Feed->close_feed();
+ die();
}
require(SERVER_ROOT.'/classes/text.class.php');
$Feed->open_feed();
switch ($_GET['feed']) {
- case 'feed_news':
- $Feed->channel('News', 'RSS feed for site news.');
- if (!$News = $Cache->get_value('news')) {
- require(SERVER_ROOT.'/classes/mysql.class.php'); //Require the database wrapper
- $DB = NEW DB_MYSQL; //Load the database wrapper
- $DB->query("
- SELECT
- ID,
- Title,
- Body,
- Time
- FROM news
- ORDER BY Time DESC
- LIMIT 10");
- $News = $DB->to_array(false, MYSQLI_NUM, false);
- $Cache->cache_value('news', $News, 1209600);
- }
- $Count = 0;
- foreach ($News as $NewsItem) {
- list($NewsID, $Title, $Body, $NewsTime) = $NewsItem;
- if (strtotime($NewsTime) >= time()) {
- continue;
- }
- echo $Feed->item($Title, Text::strip_bbcode($Body), "index.php#news$NewsID", SITE_NAME.' Staff', '', '', $NewsTime);
- if (++$Count > 4) {
- break;
- }
- }
- break;
- case 'feed_blog':
- $Feed->channel('Blog', 'RSS feed for site blog.');
- if (!$Blog = $Cache->get_value('blog')) {
- require(SERVER_ROOT.'/classes/mysql.class.php'); //Require the database wrapper
- $DB = NEW DB_MYSQL; //Load the database wrapper
- $DB->query("
- SELECT
- b.ID,
- um.Username,
- b.UserID,
- b.Title,
- b.Body,
- b.Time,
- b.ThreadID
- FROM blog AS b
- LEFT JOIN users_main AS um ON b.UserID = um.ID
- ORDER BY Time DESC
- LIMIT 20");
- $Blog = $DB->to_array();
- $Cache->cache_value('blog', $Blog, 1209600);
- }
- foreach ($Blog as $BlogItem) {
- list($BlogID, $Author, $AuthorID, $Title, $Body, $BlogTime, $ThreadID) = $BlogItem;
- if ($ThreadID) {
- echo $Feed->item($Title, Text::strip_bbcode($Body), "forums.php?action=viewthread&threadid=$ThreadID", SITE_NAME.' Staff', '', '', $BlogTime);
- } else {
- echo $Feed->item($Title, Text::strip_bbcode($Body), "blog.php#blog$BlogID", SITE_NAME.' Staff', '', '', $BlogTime);
- }
- }
- break;
- case 'feed_changelog':
- $Feed->channel('Gazelle Change Log', 'RSS feed for Gazelle\'s changelog.');
- if (!$Changelog = $Cache->get_value('changelog')) {
- require(SERVER_ROOT.'/classes/mysql.class.php');
- require(SERVER_ROOT.'/classes/misc.class.php');
+ case 'feed_news':
+ $Feed->channel('News', 'RSS feed for site news.');
+ if (!$News = $Cache->get_value('news')) {
+ require(SERVER_ROOT.'/classes/mysql.class.php'); //Require the database wrapper
+ $DB = NEW DB_MYSQL; //Load the database wrapper
+ $DB->query("
+ SELECT
+ ID,
+ Title,
+ Body,
+ Time
+ FROM news
+ ORDER BY Time DESC
+ LIMIT 10");
+ $News = $DB->to_array(false, MYSQLI_NUM, false);
+ $Cache->cache_value('news', $News, 1209600);
+ }
+ $Count = 0;
+ foreach ($News as $NewsItem) {
+ list($NewsID, $Title, $Body, $NewsTime) = $NewsItem;
+ if (strtotime($NewsTime) >= time()) {
+ continue;
+ }
+ echo $Feed->item($Title, Text::strip_bbcode($Body), "index.php#news$NewsID", SITE_NAME.' Staff', '', '', $NewsTime);
+ if (++$Count > 4) {
+ break;
+ }
+ }
+ break;
+ case 'feed_blog':
+ $Feed->channel('Blog', 'RSS feed for site blog.');
+ if (!$Blog = $Cache->get_value('blog')) {
+ require(SERVER_ROOT.'/classes/mysql.class.php'); //Require the database wrapper
+ $DB = NEW DB_MYSQL; //Load the database wrapper
+ $DB->query("
+ SELECT
+ b.ID,
+ um.Username,
+ b.UserID,
+ b.Title,
+ b.Body,
+ b.Time,
+ b.ThreadID
+ FROM blog AS b
+ LEFT JOIN users_main AS um ON b.UserID = um.ID
+ ORDER BY Time DESC
+ LIMIT 20");
+ $Blog = $DB->to_array();
+ $Cache->cache_value('blog', $Blog, 1209600);
+ }
+ foreach ($Blog as $BlogItem) {
+ list($BlogID, $Author, $AuthorID, $Title, $Body, $BlogTime, $ThreadID) = $BlogItem;
+ if ($ThreadID) {
+ echo $Feed->item($Title, Text::strip_bbcode($Body), "forums.php?action=viewthread&threadid=$ThreadID", SITE_NAME.' Staff', '', '', $BlogTime);
+ } else {
+ echo $Feed->item($Title, Text::strip_bbcode($Body), "blog.php#blog$BlogID", SITE_NAME.' Staff', '', '', $BlogTime);
+ }
+ }
+ break;
+ case 'feed_changelog':
+ $Feed->channel('Gazelle Change Log', 'RSS feed for Gazelle\'s changelog.');
+ if (!$Changelog = $Cache->get_value('changelog')) {
+ require(SERVER_ROOT.'/classes/mysql.class.php');
+ require(SERVER_ROOT.'/classes/misc.class.php');
- $DB = NEW DB_MYSQL;
- $DB->query("
- SELECT Message, Author, Date(Time)
- FROM changelog
- ORDER BY Time DESC
- LIMIT 20");
- $Changelog = $DB->to_array();
- $Cache->cache_value('changelog', $Changelog, 86400);
- }
- foreach ($Changelog as $Change) {
- list($Message, $Author, $Date) = $Change;
- echo $Feed->item("$Date by $Author", $Message, 'tools.php?action=change_log', SITE_NAME.' Staff', '', '', $Date);
- }
- break;
- case 'torrents_all':
- $Feed->channel('All Torrents', 'RSS feed for all new torrent uploads.');
- $Feed->retrieve('torrents_all', $_GET['authkey'], $_GET['passkey']);
- break;
- case 'torrents_music':
- $Feed->channel('Music Torrents', 'RSS feed for all new music torrents.');
- $Feed->retrieve('torrents_music', $_GET['authkey'], $_GET['passkey']);
- break;
- case 'torrents_apps':
- $Feed->channel('Application Torrents', 'RSS feed for all new application torrents.');
- $Feed->retrieve('torrents_apps', $_GET['authkey'], $_GET['passkey']);
- break;
- case 'torrents_ebooks':
- $Feed->channel('E-Book Torrents', 'RSS feed for all new e-book torrents.');
- $Feed->retrieve('torrents_ebooks', $_GET['authkey'], $_GET['passkey']);
- break;
- case 'torrents_abooks':
- $Feed->channel('Audiobook Torrents', 'RSS feed for all new audiobook torrents.');
- $Feed->retrieve('torrents_abooks', $_GET['authkey'], $_GET['passkey']);
- break;
- case 'torrents_evids':
- $Feed->channel('E-Learning Video Torrents', 'RSS feed for all new e-learning video torrents.');
- $Feed->retrieve('torrents_evids', $_GET['authkey'], $_GET['passkey']);
- break;
- case 'torrents_comedy':
- $Feed->channel('Comedy Torrents', 'RSS feed for all new comedy torrents.');
- $Feed->retrieve('torrents_comedy', $_GET['authkey'], $_GET['passkey']);
- break;
- case 'torrents_comics':
- $Feed->channel('Comic Torrents', 'RSS feed for all new comic torrents.');
- $Feed->retrieve('torrents_comics', $_GET['authkey'], $_GET['passkey']);
- break;
- case 'torrents_mp3':
- $Feed->channel('MP3 Torrents', 'RSS feed for all new mp3 torrents.');
- $Feed->retrieve('torrents_mp3', $_GET['authkey'], $_GET['passkey']);
- break;
- case 'torrents_flac':
- $Feed->channel('FLAC Torrents', 'RSS feed for all new FLAC torrents.');
- $Feed->retrieve('torrents_flac', $_GET['authkey'], $_GET['passkey']);
- break;
- case 'torrents_vinyl':
- $Feed->channel('Vinyl Sourced Torrents', 'RSS feed for all new vinyl sourced torrents.');
- $Feed->retrieve('torrents_vinyl', $_GET['authkey'], $_GET['passkey']);
- break;
- case 'torrents_lossless':
- $Feed->channel('Lossless Torrents', 'RSS feed for all new lossless uploads.');
- $Feed->retrieve('torrents_lossless', $_GET['authkey'], $_GET['passkey']);
- break;
- case 'torrents_lossless24':
- $Feed->channel('24bit Lossless Torrents', 'RSS feed for all new 24bit uploads.');
- $Feed->retrieve('torrents_lossless24', $_GET['authkey'], $_GET['passkey']);
- break;
- default:
- // Personalized torrents
- if (empty($_GET['name']) && substr($_GET['feed'], 0, 16) == 'torrents_notify_') {
- // All personalized torrent notifications
- $Feed->channel('Personalized torrent notifications', 'RSS feed for personalized torrent notifications.');
- $Feed->retrieve($_GET['feed'], $_GET['authkey'], $_GET['passkey']);
- } elseif (!empty($_GET['name']) && substr($_GET['feed'], 0, 16) == 'torrents_notify_') {
- // Specific personalized torrent notification channel
- $Feed->channel(display_str($_GET['name']), 'Personal RSS feed: '.display_str($_GET['name']));
- $Feed->retrieve($_GET['feed'], $_GET['authkey'], $_GET['passkey']);
- } elseif (!empty($_GET['name']) && substr($_GET['feed'], 0, 21) == 'torrents_bookmarks_t_') {
- // Bookmarks
- $Feed->channel('Bookmarked torrent notifications', 'RSS feed for bookmarked torrents.');
- $Feed->retrieve($_GET['feed'], $_GET['authkey'], $_GET['passkey']);
- } else {
- $Feed->channel('All Torrents', 'RSS feed for all new torrent uploads.');
- $Feed->retrieve('torrents_all', $_GET['authkey'], $_GET['passkey']);
- }
+ $DB = NEW DB_MYSQL;
+ $DB->query("
+ SELECT Message, Author, Date(Time)
+ FROM changelog
+ ORDER BY Time DESC
+ LIMIT 20");
+ $Changelog = $DB->to_array();
+ $Cache->cache_value('changelog', $Changelog, 86400);
+ }
+ foreach ($Changelog as $Change) {
+ list($Message, $Author, $Date) = $Change;
+ echo $Feed->item("$Date by $Author", $Message, 'tools.php?action=change_log', SITE_NAME.' Staff', '', '', $Date);
+ }
+ break;
+ case 'torrents_all':
+ $Feed->channel('All Torrents', 'RSS feed for all new torrent uploads.');
+ $Feed->retrieve('torrents_all', $_GET['authkey'], $_GET['passkey']);
+ break;
+ case 'torrents_music':
+ $Feed->channel('Music Torrents', 'RSS feed for all new music torrents.');
+ $Feed->retrieve('torrents_music', $_GET['authkey'], $_GET['passkey']);
+ break;
+ case 'torrents_apps':
+ $Feed->channel('Application Torrents', 'RSS feed for all new application torrents.');
+ $Feed->retrieve('torrents_apps', $_GET['authkey'], $_GET['passkey']);
+ break;
+ case 'torrents_ebooks':
+ $Feed->channel('E-Book Torrents', 'RSS feed for all new e-book torrents.');
+ $Feed->retrieve('torrents_ebooks', $_GET['authkey'], $_GET['passkey']);
+ break;
+ case 'torrents_abooks':
+ $Feed->channel('Audiobook Torrents', 'RSS feed for all new audiobook torrents.');
+ $Feed->retrieve('torrents_abooks', $_GET['authkey'], $_GET['passkey']);
+ break;
+ case 'torrents_evids':
+ $Feed->channel('E-Learning Video Torrents', 'RSS feed for all new e-learning video torrents.');
+ $Feed->retrieve('torrents_evids', $_GET['authkey'], $_GET['passkey']);
+ break;
+ case 'torrents_comedy':
+ $Feed->channel('Comedy Torrents', 'RSS feed for all new comedy torrents.');
+ $Feed->retrieve('torrents_comedy', $_GET['authkey'], $_GET['passkey']);
+ break;
+ case 'torrents_comics':
+ $Feed->channel('Comic Torrents', 'RSS feed for all new comic torrents.');
+ $Feed->retrieve('torrents_comics', $_GET['authkey'], $_GET['passkey']);
+ break;
+ case 'torrents_mp3':
+ $Feed->channel('MP3 Torrents', 'RSS feed for all new mp3 torrents.');
+ $Feed->retrieve('torrents_mp3', $_GET['authkey'], $_GET['passkey']);
+ break;
+ case 'torrents_flac':
+ $Feed->channel('FLAC Torrents', 'RSS feed for all new FLAC torrents.');
+ $Feed->retrieve('torrents_flac', $_GET['authkey'], $_GET['passkey']);
+ break;
+ case 'torrents_vinyl':
+ $Feed->channel('Vinyl Sourced Torrents', 'RSS feed for all new vinyl sourced torrents.');
+ $Feed->retrieve('torrents_vinyl', $_GET['authkey'], $_GET['passkey']);
+ break;
+ case 'torrents_lossless':
+ $Feed->channel('Lossless Torrents', 'RSS feed for all new lossless uploads.');
+ $Feed->retrieve('torrents_lossless', $_GET['authkey'], $_GET['passkey']);
+ break;
+ case 'torrents_lossless24':
+ $Feed->channel('24bit Lossless Torrents', 'RSS feed for all new 24bit uploads.');
+ $Feed->retrieve('torrents_lossless24', $_GET['authkey'], $_GET['passkey']);
+ break;
+ default:
+ // Personalized torrents
+ if (empty($_GET['name']) && substr($_GET['feed'], 0, 16) == 'torrents_notify_') {
+ // All personalized torrent notifications
+ $Feed->channel('Personalized torrent notifications', 'RSS feed for personalized torrent notifications.');
+ $Feed->retrieve($_GET['feed'], $_GET['authkey'], $_GET['passkey']);
+ } elseif (!empty($_GET['name']) && substr($_GET['feed'], 0, 16) == 'torrents_notify_') {
+ // Specific personalized torrent notification channel
+ $Feed->channel(display_str($_GET['name']), 'Personal RSS feed: '.display_str($_GET['name']));
+ $Feed->retrieve($_GET['feed'], $_GET['authkey'], $_GET['passkey']);
+ } elseif (!empty($_GET['name']) && substr($_GET['feed'], 0, 21) == 'torrents_bookmarks_t_') {
+ // Bookmarks
+ $Feed->channel('Bookmarked torrent notifications', 'RSS feed for bookmarked torrents.');
+ $Feed->retrieve($_GET['feed'], $_GET['authkey'], $_GET['passkey']);
+ } else {
+ $Feed->channel('All Torrents', 'RSS feed for all new torrent uploads.');
+ $Feed->retrieve('torrents_all', $_GET['authkey'], $_GET['passkey']);
+ }
}
$Feed->close_feed();
?>
diff --git a/sections/forums/add_poll_option.php b/sections/forums/add_poll_option.php
index ea442c71c..a05401543 100644
--- a/sections/forums/add_poll_option.php
+++ b/sections/forums/add_poll_option.php
@@ -1,28 +1,28 @@
-query("
- SELECT ForumID
- FROM forums_topics
- WHERE ID = $ThreadID");
- list($ForumID) = $DB->next_record();
- if (!in_array($ForumID, $ForumsRevealVoters)) {
- error(403);
- }
+ $DB->query("
+ SELECT ForumID
+ FROM forums_topics
+ WHERE ID = $ThreadID");
+ list($ForumID) = $DB->next_record();
+ if (!in_array($ForumID, $ForumsRevealVoters)) {
+ error(403);
+ }
}
$DB->query("
- SELECT Answers
- FROM forums_polls
- WHERE TopicID = $ThreadID");
+ SELECT Answers
+ FROM forums_polls
+ WHERE TopicID = $ThreadID");
if (!$DB->has_results()) {
- error(404);
+ error(404);
}
list($Answers) = $DB->next_record(MYSQLI_NUM, false);
@@ -31,9 +31,9 @@
$Answers = serialize($Answers);
$DB->query("
- UPDATE forums_polls
- SET Answers = '".db_string($Answers)."'
- WHERE TopicID = $ThreadID");
+ UPDATE forums_polls
+ SET Answers = '".db_string($Answers)."'
+ WHERE TopicID = $ThreadID");
$Cache->delete_value("polls_$ThreadID");
header("Location: forums.php?action=viewthread&threadid=$ThreadID");
diff --git a/sections/forums/ajax_get_edit.php b/sections/forums/ajax_get_edit.php
index cddc65208..e60a5bdb7 100644
--- a/sections/forums/ajax_get_edit.php
+++ b/sections/forums/ajax_get_edit.php
@@ -1,78 +1,82 @@
-get_value($Type.'_edits_'.$PostID);
if (!is_array($Edits)) {
- $DB->query("
- SELECT EditUser, EditTime, Body
- FROM comments_edits
- WHERE Page = '$Type' AND PostID = $PostID
- ORDER BY EditTime DESC");
- $Edits = $DB->to_array();
- $Cache->cache_value($Type.'_edits_'.$PostID, $Edits, 0);
+ $DB->query("
+ SELECT EditUser, EditTime, Body
+ FROM comments_edits
+ WHERE Page = '$Type' AND PostID = $PostID
+ ORDER BY EditTime DESC");
+ $Edits = $DB->to_array();
+ $Cache->cache_value($Type.'_edits_'.$PostID, $Edits, 0);
}
list($UserID, $Time) = $Edits[$Depth];
if ($Depth != 0) {
- list(,,$Body) = $Edits[$Depth - 1];
+ list(,,$Body) = $Edits[$Depth - 1];
} else {
- //Not an edit, have to get from the original
- switch ($Type) {
- case 'forums':
- //Get from normal forum stuffs
- $DB->query("
- SELECT Body
- FROM forums_posts
- WHERE ID = $PostID");
- list($Body) = $DB->next_record();
- break;
- case 'collages':
- case 'requests':
- case 'artist':
- case 'torrents':
- $DB->query("
- SELECT Body
- FROM comments
- WHERE Page = '$Type' AND ID = $PostID");
- list($Body) = $DB->next_record();
- break;
- }
+ //Not an edit, have to get from the original
+ switch ($Type) {
+ case 'forums':
+ //Get from normal forum stuffs
+ $DB->query("
+ SELECT Body
+ FROM forums_posts
+ WHERE ID = $PostID");
+ list($Body) = $DB->next_record();
+ break;
+ case 'collages':
+ case 'requests':
+ case 'artist':
+ case 'torrents':
+ $DB->query("
+ SELECT Body
+ FROM comments
+ WHERE Page = '$Type' AND ID = $PostID");
+ list($Body) = $DB->next_record();
+ break;
+ }
}
?>
-
- -
+ +
+
- + « - - + + - - Original Post - + Original Post + 0) { ?> - » - + » + diff --git a/sections/forums/catchup.php b/sections/forums/catchup.php index 7f59af899..5d860dea9 100644 --- a/sections/forums/catchup.php +++ b/sections/forums/catchup.php @@ -1,28 +1,28 @@ -query(" - UPDATE users_info - SET CatchupTime = NOW() - WHERE UserID = $LoggedUser[ID]"); - $Cache->delete_value('user_info_'.$LoggedUser['ID']); - header('Location: forums.php'); + $DB->query(" + UPDATE users_info + SET CatchupTime = NOW() + WHERE UserID = $LoggedUser[ID]"); + $Cache->delete_value('user_info_'.$LoggedUser['ID']); + header('Location: forums.php'); } else { - // Insert a value for each topic - $DB->query(" - INSERT INTO forums_last_read_topics (UserID, TopicID, PostID) - SELECT '$LoggedUser[ID]', ID, LastPostID - FROM forums_topics - WHERE (LastPostTime > '".time_minus(3600 * 24 * 30)."' OR IsSticky = '1') - AND ForumID = ".$_GET['forumid']." - ON DUPLICATE KEY UPDATE - PostID = LastPostID"); + // Insert a value for each topic + $DB->query(" + INSERT INTO forums_last_read_topics (UserID, TopicID, PostID) + SELECT '$LoggedUser[ID]', ID, LastPostID + FROM forums_topics + WHERE (LastPostTime > '".time_minus(3600 * 24 * 30)."' OR IsSticky = '1') + AND ForumID = ".$_GET['forumid']." + ON DUPLICATE KEY UPDATE + PostID = LastPostID"); - header('Location: forums.php?action=viewforum&forumid='.$_GET['forumid']); + header('Location: forums.php?action=viewforum&forumid='.$_GET['forumid']); } ?> diff --git a/sections/forums/change_vote.php b/sections/forums/change_vote.php index 7dff1e442..0eeea20eb 100644 --- a/sections/forums/change_vote.php +++ b/sections/forums/change_vote.php @@ -1,28 +1,28 @@ -query(" - SELECT ForumID - FROM forums_topics - WHERE ID = $ThreadID"); - list($ForumID) = $DB->next_record(); - if (!in_array($ForumID, $ForumsRevealVoters)) { - error(403); - } - } + if (!check_perms('site_moderate_forums')) { + $DB->query(" + SELECT ForumID + FROM forums_topics + WHERE ID = $ThreadID"); + list($ForumID) = $DB->next_record(); + if (!in_array($ForumID, $ForumsRevealVoters)) { + error(403); + } + } - $DB->query(" - UPDATE forums_polls_votes - SET Vote = $NewVote - WHERE TopicID = $ThreadID - AND UserID = ".$LoggedUser['ID']); - $Cache->delete_value('polls_'.$ThreadID); - header("Location: forums.php?action=viewthread&threadid=".$ThreadID); + $DB->query(" + UPDATE forums_polls_votes + SET Vote = $NewVote + WHERE TopicID = $ThreadID + AND UserID = ".$LoggedUser['ID']); + $Cache->delete_value('polls_'.$ThreadID); + header("Location: forums.php?action=viewthread&threadid=".$ThreadID); } else { - error(404); + error(404); } diff --git a/sections/forums/delete.php b/sections/forums/delete.php index 6ddfbbda7..2b2868a27 100644 --- a/sections/forums/delete.php +++ b/sections/forums/delete.php @@ -1,36 +1,36 @@ -query(" - SELECT - TopicID, - ForumID, - CEIL(COUNT(p.ID) / ".POSTS_PER_PAGE.") AS Pages, - CEIL(SUM(IF(p.ID <= '$PostID', 1, 0)) / ".POSTS_PER_PAGE.") AS Page, - StickyPostID - FROM forums_posts AS p - JOIN forums_topics AS t ON t.ID = p.TopicID - WHERE p.TopicID = ( - SELECT TopicID - FROM forums_posts - WHERE ID = '$PostID' - ) - GROUP BY t.ID"); + SELECT + TopicID, + ForumID, + CEIL(COUNT(p.ID) / ".POSTS_PER_PAGE.") AS Pages, + CEIL(SUM(IF(p.ID <= '$PostID', 1, 0)) / ".POSTS_PER_PAGE.") AS Page, + StickyPostID + FROM forums_posts AS p + JOIN forums_topics AS t ON t.ID = p.TopicID + WHERE p.TopicID = ( + SELECT TopicID + FROM forums_posts + WHERE ID = '$PostID' + ) + GROUP BY t.ID"); list($TopicID, $ForumID, $Pages, $Page, $StickyPostID) = $DB->next_record(); if (!$TopicID) { - // Post is deleted or thread doesn't exist - error(0); // This is evil, but the ajax call doesn't check the response + // Post is deleted or thread doesn't exist + error(0); // This is evil, but the ajax call doesn't check the response } // $Pages = number of pages in the thread @@ -38,101 +38,101 @@ // These are set for cache clearing. $DB->query(" - DELETE FROM forums_posts - WHERE ID = '$PostID'"); + DELETE FROM forums_posts + WHERE ID = '$PostID'"); $DB->query(" - SELECT MAX(ID) - FROM forums_posts - WHERE TopicID = '$TopicID'"); + SELECT MAX(ID) + FROM forums_posts + WHERE TopicID = '$TopicID'"); list($LastID) = $DB->next_record(); $DB->query(" - UPDATE forums AS f, forums_topics AS t - SET f.NumPosts = f.NumPosts - 1, - t.NumPosts = t.NumPosts - 1 - WHERE f.ID = '$ForumID' - AND t.ID = '$TopicID'"); + UPDATE forums AS f, forums_topics AS t + SET f.NumPosts = f.NumPosts - 1, + t.NumPosts = t.NumPosts - 1 + WHERE f.ID = '$ForumID' + AND t.ID = '$TopicID'"); if ($LastID < $PostID) { // Last post in a topic was removed - $DB->query(" - SELECT p.AuthorID, u.Username, p.AddedTime - FROM forums_posts AS p - LEFT JOIN users_main AS u ON u.ID = p.AuthorID - WHERE p.ID = '$LastID'"); - list($LastAuthorID, $LastAuthorName, $LastTime) = $DB->next_record(); - $DB->query(" - UPDATE forums_topics - SET - LastPostID = '$LastID', - LastPostAuthorID = '$LastAuthorID', - LastPostTime = '$LastTime' - WHERE ID = '$TopicID'"); - $DB->query(" - SELECT - t.ID, - t.Title, - t.LastPostID, - t.LastPostTime, - t.LastPostAuthorID, - u.Username - FROM forums_topics AS t - LEFT JOIN users_main AS u ON u.ID = t.LastPostAuthorID - WHERE ForumID = '$ForumID' - AND t.ID != '$TopicID' - ORDER BY LastPostID DESC - LIMIT 1"); - list($LastTopicID, $LastTopicTitle, $LastTopicPostID, $LastTopicPostTime, $LastTopicAuthorID, $LastTopicAuthorName) = $DB->next_record(MYSQLI_BOTH, false); + $DB->query(" + SELECT p.AuthorID, u.Username, p.AddedTime + FROM forums_posts AS p + LEFT JOIN users_main AS u ON u.ID = p.AuthorID + WHERE p.ID = '$LastID'"); + list($LastAuthorID, $LastAuthorName, $LastTime) = $DB->next_record(); + $DB->query(" + UPDATE forums_topics + SET + LastPostID = '$LastID', + LastPostAuthorID = '$LastAuthorID', + LastPostTime = '$LastTime' + WHERE ID = '$TopicID'"); + $DB->query(" + SELECT + t.ID, + t.Title, + t.LastPostID, + t.LastPostTime, + t.LastPostAuthorID, + u.Username + FROM forums_topics AS t + LEFT JOIN users_main AS u ON u.ID = t.LastPostAuthorID + WHERE ForumID = '$ForumID' + AND t.ID != '$TopicID' + ORDER BY LastPostID DESC + LIMIT 1"); + list($LastTopicID, $LastTopicTitle, $LastTopicPostID, $LastTopicPostTime, $LastTopicAuthorID, $LastTopicAuthorName) = $DB->next_record(MYSQLI_BOTH, false); - if ($LastID < $LastTopicPostID) { // Topic is no longer the most recent in its forum - $DB->query(" - UPDATE forums - SET - LastPostTopicID = '$LastTopicID', - LastPostID = '$LastTopicPostID', - LastPostAuthorID = '$LastTopicAuthorID', - LastPostTime = '$LastTopicPostTime' - WHERE ID = '$ForumID' - AND LastPostTopicID = '$TopicID'"); - $UpdateArrayForums = array( - 'NumPosts' => '-1', - 'LastPostID' => $LastTopicPostID, - 'LastPostAuthorID' => $LastTopicAuthorID, - 'LastPostTime' => $LastTopicPostTime, - 'LastPostTopicID' => $LastTopicID, - 'Title' => $LastTopicTitle); - } else { // Topic is still the most recent in its forum - $DB->query(" - UPDATE forums - SET - LastPostID = '$LastID', - LastPostAuthorID = '$LastAuthorID', - LastPostTime = '$LastTime' - WHERE ID = '$ForumID' - AND LastPostTopicID = '$TopicID'"); - $UpdateArrayForums = array( - 'NumPosts' => '-1', - 'LastPostID' => $LastID, - 'LastPostAuthorID' => $LastAuthorID, - 'LastPostTime' => $LastTime); - } - $UpdateArrayThread = array('Posts' => '-1', 'LastPostAuthorID' => $LastAuthorID, 'LastPostTime' => $LastTime); + if ($LastID < $LastTopicPostID) { // Topic is no longer the most recent in its forum + $DB->query(" + UPDATE forums + SET + LastPostTopicID = '$LastTopicID', + LastPostID = '$LastTopicPostID', + LastPostAuthorID = '$LastTopicAuthorID', + LastPostTime = '$LastTopicPostTime' + WHERE ID = '$ForumID' + AND LastPostTopicID = '$TopicID'"); + $UpdateArrayForums = array( + 'NumPosts' => '-1', + 'LastPostID' => $LastTopicPostID, + 'LastPostAuthorID' => $LastTopicAuthorID, + 'LastPostTime' => $LastTopicPostTime, + 'LastPostTopicID' => $LastTopicID, + 'Title' => $LastTopicTitle); + } else { // Topic is still the most recent in its forum + $DB->query(" + UPDATE forums + SET + LastPostID = '$LastID', + LastPostAuthorID = '$LastAuthorID', + LastPostTime = '$LastTime' + WHERE ID = '$ForumID' + AND LastPostTopicID = '$TopicID'"); + $UpdateArrayForums = array( + 'NumPosts' => '-1', + 'LastPostID' => $LastID, + 'LastPostAuthorID' => $LastAuthorID, + 'LastPostTime' => $LastTime); + } + $UpdateArrayThread = array('Posts' => '-1', 'LastPostAuthorID' => $LastAuthorID, 'LastPostTime' => $LastTime); } else { - $UpdateArrayForums = array('NumPosts' => '-1'); - $UpdateArrayThread = array('Posts' => '-1'); + $UpdateArrayForums = array('NumPosts' => '-1'); + $UpdateArrayThread = array('Posts' => '-1'); } if ($StickyPostID == $PostID) { - $DB->query(" - UPDATE forums_topics - SET StickyPostID = 0 - WHERE ID = $TopicID"); + $DB->query(" + UPDATE forums_topics + SET StickyPostID = 0 + WHERE ID = $TopicID"); } //We need to clear all subsequential catalogues as they've all been bumped with the absence of this post $ThisCatalogue = floor((POSTS_PER_PAGE * $Page - POSTS_PER_PAGE) / THREAD_CATALOGUE); $LastCatalogue = floor((POSTS_PER_PAGE * $Pages - POSTS_PER_PAGE) / THREAD_CATALOGUE); for ($i = $ThisCatalogue; $i <= $LastCatalogue; $i++) { - $Cache->delete_value("thread_$TopicID"."_catalogue_$i"); + $Cache->delete_value("thread_$TopicID"."_catalogue_$i"); } $Cache->begin_transaction("thread_$TopicID".'_info'); @@ -150,6 +150,6 @@ // quote notifications Subscriptions::flush_quote_notifications('forums', $TopicID); $DB->query(" - DELETE FROM users_notify_quoted - WHERE Page = 'forums' - AND PostID = '$PostID'"); + DELETE FROM users_notify_quoted + WHERE Page = 'forums' + AND PostID = '$PostID'"); diff --git a/sections/forums/delete_poll_option.php b/sections/forums/delete_poll_option.php index 51259bd21..d7839d9cd 100644 --- a/sections/forums/delete_poll_option.php +++ b/sections/forums/delete_poll_option.php @@ -1,46 +1,46 @@ -query(" - SELECT ForumID - FROM forums_topics - WHERE ID = $ThreadID"); - list($ForumID) = $DB->next_record(); - if (!in_array($ForumID, $ForumsRevealVoters)) { - error(403); - } + $DB->query(" + SELECT ForumID + FROM forums_topics + WHERE ID = $ThreadID"); + list($ForumID) = $DB->next_record(); + if (!in_array($ForumID, $ForumsRevealVoters)) { + error(403); + } - $DB->query(" - SELECT Answers - FROM forums_polls - WHERE TopicID = $ThreadID"); - if (!$DB->has_results()) { - error(404); - } + $DB->query(" + SELECT Answers + FROM forums_polls + WHERE TopicID = $ThreadID"); + if (!$DB->has_results()) { + error(404); + } - list($Answers) = $DB->next_record(MYSQLI_NUM, false); - $Answers = unserialize($Answers); - unset($Answers[$PollOption]); - $Answers = serialize($Answers); + list($Answers) = $DB->next_record(MYSQLI_NUM, false); + $Answers = unserialize($Answers); + unset($Answers[$PollOption]); + $Answers = serialize($Answers); - $DB->query(" - UPDATE forums_polls - SET Answers = '".db_string($Answers)."' - WHERE TopicID = $ThreadID"); - $DB->query(" - DELETE FROM forums_polls_votes - WHERE Vote = $PollOption - AND TopicID = $ThreadID"); + $DB->query(" + UPDATE forums_polls + SET Answers = '".db_string($Answers)."' + WHERE TopicID = $ThreadID"); + $DB->query(" + DELETE FROM forums_polls_votes + WHERE Vote = $PollOption + AND TopicID = $ThreadID"); - $Cache->delete_value("polls_$ThreadID"); - header("Location: forums.php?action=viewthread&threadid=$ThreadID"); + $Cache->delete_value("polls_$ThreadID"); + header("Location: forums.php?action=viewthread&threadid=$ThreadID"); } else { - error(404); + error(404); } diff --git a/sections/forums/edit_rules.php b/sections/forums/edit_rules.php index ce796eace..911847864 100644 --- a/sections/forums/edit_rules.php +++ b/sections/forums/edit_rules.php @@ -1,82 +1,84 @@ -query(" - INSERT INTO forums_specific_rules (ForumID, ThreadID) - VALUES ($ForumID, ".$_POST['new_thread'].')'); - } - } - if (!empty($_POST['del'])) { - if (is_number($_POST['threadid'])) { - $DB->query(" - DELETE FROM forums_specific_rules - WHERE ForumID = $ForumID - AND ThreadID = ".$_POST['threadid']); - } - } - $Cache->delete_value('forums_list'); + if (!empty($_POST['add'])) { + if (is_number($_POST['new_thread'])) { + $DB->query(" + INSERT INTO forums_specific_rules (ForumID, ThreadID) + VALUES ($ForumID, ".$_POST['new_thread'].')'); + } + } + if (!empty($_POST['del'])) { + if (is_number($_POST['threadid'])) { + $DB->query(" + DELETE FROM forums_specific_rules + WHERE ForumID = $ForumID + AND ThreadID = ".$_POST['threadid']); + } + } + $Cache->delete_value('forums_list'); } $DB->query(" - SELECT ThreadID - FROM forums_specific_rules - WHERE ForumID = $ForumID"); + SELECT ThreadID + FROM forums_specific_rules + WHERE ForumID = $ForumID"); $ThreadIDs = $DB->collect('ThreadID'); View::show_header(); ?>
-
-
+
+
-
diff --git a/sections/forums/forum.php b/sections/forums/forum.php
index 71fa339e2..9aa31d47a 100644
--- a/sections/forums/forum.php
+++ b/sections/forums/forum.php
@@ -2,9 +2,9 @@
/**********|| Page to show individual forums || ********************************\
Things to expect in $_GET:
- ForumID: ID of the forum curently being browsed
- page: The page the user's on.
- page = 1 is the same as no page
+ ForumID: ID of the forum curently being browsed
+ page: The page the user's on.
+ page = 1 is the same as no page
********************************************************************************/
@@ -13,16 +13,16 @@
// Check for lame SQL injection attempts
$ForumID = $_GET['forumid'];
if (!is_number($ForumID)) {
- error(0);
+ error(0);
}
$IsDonorForum = $ForumID == DONOR_FORUM ? true : false;
$Tooltip = $ForumID == DONOR_FORUM ? "tooltip_gold" : "tooltip";
if (isset($LoggedUser['PostsPerPage'])) {
- $PerPage = $LoggedUser['PostsPerPage'];
+ $PerPage = $LoggedUser['PostsPerPage'];
} else {
- $PerPage = POSTS_PER_PAGE;
+ $PerPage = POSTS_PER_PAGE;
}
list($Page, $Limit) = Format::page_limit(TOPICS_PER_PAGE);
@@ -32,246 +32,246 @@
// Caching anything beyond the first page of any given forum is just wasting RAM.
// Users are more likely to search than to browse to page 2.
if ($Page == 1) {
- list($Forum,,,$Stickies) = $Cache->get_value("forums_$ForumID");
+ list($Forum,,,$Stickies) = $Cache->get_value("forums_$ForumID");
}
if (!isset($Forum) || !is_array($Forum)) {
- $DB->query("
- SELECT
- ID,
- Title,
- AuthorID,
- IsLocked,
- IsSticky,
- NumPosts,
- LastPostID,
- LastPostTime,
- LastPostAuthorID
- FROM forums_topics
- WHERE ForumID = '$ForumID'
- ORDER BY Ranking = 0, Ranking ASC, IsSticky DESC, LastPostTime DESC
- LIMIT $Limit"); // Can be cached until someone makes a new post
- $Forum = $DB->to_array('ID', MYSQLI_ASSOC, false);
+ $DB->query("
+ SELECT
+ ID,
+ Title,
+ AuthorID,
+ IsLocked,
+ IsSticky,
+ NumPosts,
+ LastPostID,
+ LastPostTime,
+ LastPostAuthorID
+ FROM forums_topics
+ WHERE ForumID = '$ForumID'
+ ORDER BY Ranking = 0, Ranking ASC, IsSticky DESC, LastPostTime DESC
+ LIMIT $Limit"); // Can be cached until someone makes a new post
+ $Forum = $DB->to_array('ID', MYSQLI_ASSOC, false);
- if ($Page == 1) {
- $DB->query("
- SELECT COUNT(ID)
- FROM forums_topics
- WHERE ForumID = '$ForumID'
- AND IsSticky = '1'");
- list($Stickies) = $DB->next_record();
- $Cache->cache_value("forums_$ForumID", array($Forum, '', 0, $Stickies), 0);
- }
+ if ($Page == 1) {
+ $DB->query("
+ SELECT COUNT(ID)
+ FROM forums_topics
+ WHERE ForumID = '$ForumID'
+ AND IsSticky = '1'");
+ list($Stickies) = $DB->next_record();
+ $Cache->cache_value("forums_$ForumID", array($Forum, '', 0, $Stickies), 0);
+ }
}
if (!isset($Forums[$ForumID])) {
- error(404);
+ error(404);
}
// Make sure they're allowed to look at the page
if (!check_perms('site_moderate_forums')) {
- if (isset($LoggedUser['CustomForums'][$ForumID]) && $LoggedUser['CustomForums'][$ForumID] === 0) {
- error(403);
- }
+ if (isset($LoggedUser['CustomForums'][$ForumID]) && $LoggedUser['CustomForums'][$ForumID] === 0) {
+ error(403);
+ }
}
$ForumName = display_str($Forums[$ForumID]['Name']);
if (!Forums::check_forumperm($ForumID)) {
- error(403);
+ error(403);
}
// Start printing
View::show_header('Forums > '. $Forums[$ForumID]['Name'], '', $IsDonorForum ? 'donor' : '');
?>
-
- - Forums - > - - > - Edit forum specific rules -
-| Thread ID | -- |
| - | - - | -
+
+ + Forums + > + + > + Edit forum specific rules +
+| Thread ID | ++ |
| + | + + | +
-
Forums >
- - - - - -
- Forum Specific Rules
-Forums >
+
+
+
+
+
+
-
-
+
+
-
+
-
-
+ if ($CategoryID != $LastCategoryID) {
+ $Row = 'b';
+ $LastCategoryID = $CategoryID;
+ if ($OpenTable) { ?>
+
+
-
- | - | Latest | -Replies | -Author | -||
| + | Latest | +Replies | +Author | +||
| - No threads to display in this forum! - | -+ No threads to display in this forum! + | + +query(" - SELECT - l.TopicID, - l.PostID, - CEIL(( - SELECT COUNT(p.ID) - FROM forums_posts AS p - WHERE p.TopicID = l.TopicID - AND p.ID <= l.PostID - ) / $PerPage - ) AS Page - FROM forums_last_read_topics AS l - WHERE l.TopicID IN (".implode(', ', array_keys($Forum)).') - AND l.UserID = \''.$LoggedUser['ID'].'\''); + // forums_last_read_topics is a record of the last post a user read in a topic, and what page that was on + $DB->query(" + SELECT + l.TopicID, + l.PostID, + CEIL(( + SELECT COUNT(p.ID) + FROM forums_posts AS p + WHERE p.TopicID = l.TopicID + AND p.ID <= l.PostID + ) / $PerPage + ) AS Page + FROM forums_last_read_topics AS l + WHERE l.TopicID IN (".implode(', ', array_keys($Forum)).') + AND l.UserID = \''.$LoggedUser['ID'].'\''); - // Turns the result set into a multi-dimensional array, with - // forums_last_read_topics.TopicID as the key. - // This is done here so we get the benefit of the caching, and we - // don't have to make a database query for each topic on the page - $LastRead = $DB->to_array('TopicID'); + // Turns the result set into a multi-dimensional array, with + // forums_last_read_topics.TopicID as the key. + // This is done here so we get the benefit of the caching, and we + // don't have to make a database query for each topic on the page + $LastRead = $DB->to_array('TopicID'); - //---------- Begin printing + //---------- Begin printing - $Row = 'a'; - foreach ($Forum as $Topic) { - list($TopicID, $Title, $AuthorID, $Locked, $Sticky, $PostCount, $LastID, $LastTime, $LastAuthorID) = array_values($Topic); - $Row = $Row === 'a' ? 'b' : 'a'; - // Build list of page links - // Only do this if there is more than one page - $PageLinks = array(); - $ShownEllipses = false; - $PagesText = ''; - $TopicPages = ceil($PostCount / $PerPage); + $Row = 'a'; + foreach ($Forum as $Topic) { + list($TopicID, $Title, $AuthorID, $Locked, $Sticky, $PostCount, $LastID, $LastTime, $LastAuthorID) = array_values($Topic); + $Row = $Row === 'a' ? 'b' : 'a'; + // Build list of page links + // Only do this if there is more than one page + $PageLinks = []; + $ShownEllipses = false; + $PagesText = ''; + $TopicPages = ceil($PostCount / $PerPage); - if ($TopicPages > 1) { - $PagesText = ' ('; - for ($i = 1; $i <= $TopicPages; $i++) { - if ($TopicPages > 4 && ($i > 2 && $i <= $TopicPages - 2)) { - if (!$ShownEllipses) { - $PageLinks[] = '-'; - $ShownEllipses = true; - } - continue; - } - $PageLinks[] = "$i"; - } - $PagesText .= implode(' ', $PageLinks); - $PagesText .= ')'; - } + if ($TopicPages > 1) { + $PagesText = ' ('; + for ($i = 1; $i <= $TopicPages; $i++) { + if ($TopicPages > 4 && ($i > 2 && $i <= $TopicPages - 2)) { + if (!$ShownEllipses) { + $PageLinks[] = '-'; + $ShownEllipses = true; + } + continue; + } + $PageLinks[] = "$i"; + } + $PagesText .= implode(' ', $PageLinks); + $PagesText .= ')'; + } - // handle read/unread posts - the reason we can't cache the whole page - if ((!$Locked || $Sticky) && ((empty($LastRead[$TopicID]) || $LastRead[$TopicID]['PostID'] < $LastID) && strtotime($LastTime) > $LoggedUser['CatchupTime'])) { - $Read = 'unread'; - } else { - $Read = 'read'; - } - if ($Locked) { - $Read .= '_locked'; - } - if ($Sticky) { - $Read .= '_sticky'; - } + // handle read/unread posts - the reason we can't cache the whole page + if ((!$Locked || $Sticky) && ((empty($LastRead[$TopicID]) || $LastRead[$TopicID]['PostID'] < $LastID) && strtotime($LastTime) > $LoggedUser['CatchupTime'])) { + $Read = 'unread'; + } else { + $Read = 'read'; + } + if ($Locked) { + $Read .= '_locked'; + } + if ($Sticky) { + $Read .= '_sticky'; + } ?> -||||
| - | - -"> + | + | + + - - $TopicLength ? "title='".$Title."'" : "")?>> - - - - - - - - - - by - - | -- | - | + | + + |
-
-
-
+
+
+
+
-
+
diff --git a/sections/forums/get_post.php b/sections/forums/get_post.php
index 1e90446b1..6cea017fe 100644
--- a/sections/forums/get_post.php
+++ b/sections/forums/get_post.php
@@ -1,4 +1,4 @@
-query("
- SELECT
- p.Body,
- t.ForumID
- FROM forums_posts AS p
- JOIN forums_topics AS t ON p.TopicID = t.ID
- WHERE p.ID = '$PostID'");
+ SELECT
+ p.Body,
+ t.ForumID
+ FROM forums_posts AS p
+ JOIN forums_topics AS t ON p.TopicID = t.ID
+ WHERE p.ID = '$PostID'");
list($Body, $ForumID) = $DB->next_record(MYSQLI_NUM);
// Is the user allowed to view the post?
if (!Forums::check_forumperm($ForumID)) {
- error(0);
+ error(0);
}
// This gets sent to the browser, which echoes it wherever
diff --git a/sections/forums/index.php b/sections/forums/index.php
index 9a01febad..50b13c3e5 100644
--- a/sections/forums/index.php
+++ b/sections/forums/index.php
@@ -1,9 +1,9 @@
-
-
Forums
-
-Forums
+
+
-
| - | Forum | -Last Post | -Topics | -Posts | -|||
| + | Forum | +Last Post | +Topics | +Posts | +|||
| - |
- - -- |
-
- - There are no topics here.Create one!' : '')?> - | -0 | -0 | - -- - 50) ? "title='".display_str($LastTopic)."'" : "")?>> - - - - - - - by - | -- | - - |
+ +
+
-
-
+
diff --git a/sections/forums/poll_mod.php b/sections/forums/poll_mod.php
index 9eec66f75..b476f2372 100644
--- a/sections/forums/poll_mod.php
+++ b/sections/forums/poll_mod.php
@@ -1,60 +1,60 @@
-get_value('polls_'.$TopicID)) {
- $DB->query("
- SELECT Question, Answers, Featured, Closed
- FROM forums_polls
- WHERE TopicID='".$TopicID."'");
- list($Question, $Answers, $Featured, $Closed) = $DB->next_record(MYSQLI_NUM, array(1));
- $Answers = unserialize($Answers);
- $DB->query("
- SELECT Vote, COUNT(UserID)
- FROM forums_polls_votes
- WHERE TopicID = '$TopicID'
- AND Vote != '0'
- GROUP BY Vote");
- $VoteArray = $DB->to_array(false, MYSQLI_NUM);
+ $DB->query("
+ SELECT Question, Answers, Featured, Closed
+ FROM forums_polls
+ WHERE TopicID='".$TopicID."'");
+ list($Question, $Answers, $Featured, $Closed) = $DB->next_record(MYSQLI_NUM, array(1));
+ $Answers = unserialize($Answers);
+ $DB->query("
+ SELECT Vote, COUNT(UserID)
+ FROM forums_polls_votes
+ WHERE TopicID = '$TopicID'
+ AND Vote != '0'
+ GROUP BY Vote");
+ $VoteArray = $DB->to_array(false, MYSQLI_NUM);
- $Votes = array();
- foreach ($VoteArray as $VoteSet) {
- list($Key,$Value) = $VoteSet;
- $Votes[$Key] = $Value;
- }
+ $Votes = [];
+ foreach ($VoteArray as $VoteSet) {
+ list($Key,$Value) = $VoteSet;
+ $Votes[$Key] = $Value;
+ }
- for ($i = 1, $il = count($Answers); $i <= $il; ++$i) {
- if (!isset($Votes[$i])) {
- $Votes[$i] = 0;
- }
- }
+ for ($i = 1, $il = count($Answers); $i <= $il; ++$i) {
+ if (!isset($Votes[$i])) {
+ $Votes[$i] = 0;
+ }
+ }
}
if (isset($_POST['feature'])) {
- if (!$Featured || $Featured == '0000-00-00 00:00:00') {
- $Featured = sqltime();
- $Cache->cache_value('polls_featured',$TopicID,0);
- $DB->query('
- UPDATE forums_polls
- SET Featured=\''.sqltime().'\'
- WHERE TopicID=\''.$TopicID.'\'');
- }
+ if (!$Featured || $Featured == '0000-00-00 00:00:00') {
+ $Featured = sqltime();
+ $Cache->cache_value('polls_featured',$TopicID,0);
+ $DB->query('
+ UPDATE forums_polls
+ SET Featured=\''.sqltime().'\'
+ WHERE TopicID=\''.$TopicID.'\'');
+ }
}
if (isset($_POST['close'])) {
- $Closed = !$Closed;
- $DB->query('
- UPDATE forums_polls
- SET Closed=\''.$Closed.'\'
- WHERE TopicID=\''.$TopicID.'\'');
+ $Closed = !$Closed;
+ $DB->query('
+ UPDATE forums_polls
+ SET Closed=\''.$Closed.'\'
+ WHERE TopicID=\''.$TopicID.'\'');
}
$Cache->cache_value('polls_'.$TopicID, array($Question,$Answers,$Votes,$Featured,$Closed), 0);
diff --git a/sections/forums/poll_vote.php b/sections/forums/poll_vote.php
index 697e8be0b..c5fe56d01 100644
--- a/sections/forums/poll_vote.php
+++ b/sections/forums/poll_vote.php
@@ -1,170 +1,172 @@
-get_value("thread_$TopicID".'_info')) {
- $DB->query("
- SELECT
- t.Title,
- t.ForumID,
- t.IsLocked,
- t.IsSticky,
- COUNT(fp.id) AS Posts,
- t.LastPostAuthorID,
- ISNULL(p.TopicID) AS NoPoll
- FROM forums_topics AS t
- JOIN forums_posts AS fp ON fp.TopicID = t.ID
- LEFT JOIN forums_polls AS p ON p.TopicID = t.ID
- WHERE t.ID = '$TopicID'
- GROUP BY fp.TopicID");
- if (!$DB->has_results()) {
- die();
- }
- $ThreadInfo = $DB->next_record(MYSQLI_ASSOC);
- if (!$ThreadInfo['IsLocked'] || $ThreadInfo['IsSticky']) {
- $Cache->cache_value("thread_$TopicID".'_info', $ThreadInfo, 0);
- }
+ $DB->query("
+ SELECT
+ t.Title,
+ t.ForumID,
+ t.IsLocked,
+ t.IsSticky,
+ COUNT(fp.id) AS Posts,
+ t.LastPostAuthorID,
+ ISNULL(p.TopicID) AS NoPoll
+ FROM forums_topics AS t
+ JOIN forums_posts AS fp ON fp.TopicID = t.ID
+ LEFT JOIN forums_polls AS p ON p.TopicID = t.ID
+ WHERE t.ID = '$TopicID'
+ GROUP BY fp.TopicID");
+ if (!$DB->has_results()) {
+ die();
+ }
+ $ThreadInfo = $DB->next_record(MYSQLI_ASSOC);
+ if (!$ThreadInfo['IsLocked'] || $ThreadInfo['IsSticky']) {
+ $Cache->cache_value("thread_$TopicID".'_info', $ThreadInfo, 0);
+ }
}
$ForumID = $ThreadInfo['ForumID'];
if (!list($Question, $Answers, $Votes, $Featured, $Closed) = $Cache->get_value("polls_$TopicID")) {
- $DB->query("
- SELECT
- Question,
- Answers,
- Featured,
- Closed
- FROM forums_polls
- WHERE TopicID = '$TopicID'");
- list($Question, $Answers, $Featured, $Closed) = $DB->next_record(MYSQLI_NUM, array(1));
- $Answers = unserialize($Answers);
- $DB->query("
- SELECT Vote, COUNT(UserID)
- FROM forums_polls_votes
- WHERE TopicID = '$TopicID'
- AND Vote != '0'
- GROUP BY Vote");
- $VoteArray = $DB->to_array(false, MYSQLI_NUM);
+ $DB->query("
+ SELECT
+ Question,
+ Answers,
+ Featured,
+ Closed
+ FROM forums_polls
+ WHERE TopicID = '$TopicID'");
+ list($Question, $Answers, $Featured, $Closed) = $DB->next_record(MYSQLI_NUM, array(1));
+ $Answers = unserialize($Answers);
+ $DB->query("
+ SELECT Vote, COUNT(UserID)
+ FROM forums_polls_votes
+ WHERE TopicID = '$TopicID'
+ AND Vote != '0'
+ GROUP BY Vote");
+ $VoteArray = $DB->to_array(false, MYSQLI_NUM);
- $Votes = array();
- foreach ($VoteArray as $VoteSet) {
- list($Key,$Value) = $VoteSet;
- $Votes[$Key] = $Value;
- }
+ $Votes = [];
+ foreach ($VoteArray as $VoteSet) {
+ list($Key,$Value) = $VoteSet;
+ $Votes[$Key] = $Value;
+ }
- for ($i = 1, $il = count($Answers); $i <= $il; ++$i) {
- if (!isset($Votes[$i])) {
- $Votes[$i] = 0;
- }
- }
- $Cache->cache_value("polls_$TopicID", array($Question, $Answers, $Votes, $Featured, $Closed), 0);
+ for ($i = 1, $il = count($Answers); $i <= $il; ++$i) {
+ if (!isset($Votes[$i])) {
+ $Votes[$i] = 0;
+ }
+ }
+ $Cache->cache_value("polls_$TopicID", array($Question, $Answers, $Votes, $Featured, $Closed), 0);
}
if ($Closed) {
- error(403,true);
+ error(403,true);
}
if (!empty($Votes)) {
- $TotalVotes = array_sum($Votes);
- $MaxVotes = max($Votes);
+ $TotalVotes = array_sum($Votes);
+ $MaxVotes = max($Votes);
} else {
- $TotalVotes = 0;
- $MaxVotes = 0;
+ $TotalVotes = 0;
+ $MaxVotes = 0;
}
if (!isset($_POST['vote']) || !is_number($_POST['vote'])) {
?>
Please select an option.Forums > > New Topic
-
-
-
-
-
-
-
-
-
-
- Report thread
-
-
- | - #XXXXXX - by - Just now - - - Report - - ↑ - - | -|
| - - | - -- - | -
-
+
-query(" - INSERT IGNORE INTO forums_polls_votes - (TopicID, UserID, Vote) - VALUES - ($TopicID, " . $LoggedUser['ID'] . ", $Vote)"); - if ($DB->affected_rows() == 1 && $Vote != 0) { - $Cache->begin_transaction("polls_$TopicID"); - $Cache->update_row(2, array($Vote => '+1')); - $Cache->commit_transaction(0); - $Votes[$Vote]++; - $TotalVotes++; - $MaxVotes++; - } + //Add our vote + $DB->query(" + INSERT IGNORE INTO forums_polls_votes + (TopicID, UserID, Vote) + VALUES + ($TopicID, " . $LoggedUser['ID'] . ", $Vote)"); + if ($DB->affected_rows() == 1 && $Vote != 0) { + $Cache->begin_transaction("polls_$TopicID"); + $Cache->update_row(2, array($Vote => '+1')); + $Cache->commit_transaction(0); + $Votes[$Vote]++; + $TotalVotes++; + $MaxVotes++; + } - if ($Vote != 0) { - $Answers[$Vote] = '=> '.$Answers[$Vote]; - } + if ($Vote != 0) { + $Answers[$Vote] = '=> '.$Answers[$Vote]; + } ?> -
-
- 0) {
- $Ratio = $Votes[$i] / $MaxVotes;
- $Percent = $Votes[$i] / $TotalVotes;
- } else {
- $Ratio = 0;
- $Percent = 0;
- }
+
- (%) -
- - - - - -query(" - SELECT GROUP_CONCAT(um.Username SEPARATOR ', '), - fpv.Vote - FROM users_main AS um - JOIN forums_polls_votes AS fpv ON um.ID = fpv.UserID - WHERE TopicID = $TopicID - GROUP BY fpv.Vote"); +
- (%) +
- + + + + +query(" + SELECT GROUP_CONCAT(um.Username SEPARATOR ', '), + fpv.Vote + FROM users_main AS um + JOIN forums_polls_votes AS fpv ON um.ID = fpv.UserID + WHERE TopicID = $TopicID + GROUP BY fpv.Vote"); - $StaffVotes = $DB->to_array(); - foreach ($StaffVotes as $StaffVote) { - list($StaffString, $StaffVoted) = $StaffVote; + $StaffVotes = $DB->to_array(); + foreach ($StaffVotes as $StaffVote) { + list($StaffString, $StaffVoted) = $StaffVote; ?> -
- - - - + -
-
+ 0) {
+ $Ratio = $Votes[$i] / $MaxVotes;
+ $Percent = $Votes[$i] / $TotalVotes;
+ } else {
+ $Ratio = 0;
+ $Percent = 0;
+ }
?>
-
Votes: - +
Votes: +query(" - SELECT ID - FROM users_main - WHERE Username = '".db_string($User)."'"); - list($AuthorID) = $DB->next_record(); - if ($AuthorID === null) { - $AuthorID = 0; - //this will cause the search to return 0 results. - //workaround in line 276 to display that the username was wrong. - } + $User = trim($_GET['user']); + $DB->query(" + SELECT ID + FROM users_main + WHERE Username = '".db_string($User)."'"); + list($AuthorID) = $DB->next_record(); + if ($AuthorID === null) { + $AuthorID = 0; + //this will cause the search to return 0 results. + //workaround in line 276 to display that the username was wrong. + } } else { - $User = ''; + $User = ''; } // Are we looking in individual forums? if (isset($_GET['forums']) && is_array($_GET['forums'])) { - $ForumArray = array(); - foreach ($_GET['forums'] as $Forum) { - if (is_number($Forum)) { - $ForumArray[] = $Forum; - } - } - if (count($ForumArray) > 0) { - $SearchForums = implode(', ', $ForumArray); - } + $ForumArray = []; + foreach ($_GET['forums'] as $Forum) { + if (is_number($Forum)) { + $ForumArray[] = $Forum; + } + } + if (count($ForumArray) > 0) { + $SearchForums = implode(', ', $ForumArray); + } } // Searching for posts in a specific thread if (!empty($_GET['threadid']) && is_number($_GET['threadid'])) { - $ThreadID = $_GET['threadid']; - $Type = 'body'; - $SQL = " - SELECT - Title - FROM forums_topics AS t - JOIN forums AS f ON f.ID = t.ForumID - WHERE t.ID = $ThreadID - AND " . Forums::user_forums_sql(); - $DB->query($SQL); - if (list($Title) = $DB->next_record()) { - $Title = " > $Title"; - } else { - error(404); - } + $ThreadID = $_GET['threadid']; + $Type = 'body'; + $SQL = " + SELECT + Title + FROM forums_topics AS t + JOIN forums AS f ON f.ID = t.ForumID + WHERE t.ID = $ThreadID + AND " . Forums::user_forums_sql(); + $DB->query($SQL); + if (list($Title) = $DB->next_record()) { + $Title = " > $Title"; + } else { + error(404); + } } else { - $ThreadID = ''; + $ThreadID = ''; } // Let's hope we got some results - start printing out the content. View::show_header('Forums > Search', 'bbcode,forum_search,datetime_picker', 'datetime_picker'); ?>
-
-
+
+
-
-
+
diff --git a/sections/forums/sticky_post.php b/sections/forums/sticky_post.php
index 098c2cc23..e85794cf5 100644
--- a/sections/forums/sticky_post.php
+++ b/sections/forums/sticky_post.php
@@ -1,8 +1,8 @@
-query("
- SELECT
- CEIL(COUNT(ID)/".POSTS_PER_PAGE.") AS Pages,
- CEIL(SUM(IF(ID<=$PostID,1,0))/".POSTS_PER_PAGE.") AS Page
- FROM forums_posts
- WHERE TopicID=$ThreadID
- GROUP BY TopicID");
+ SELECT
+ CEIL(COUNT(ID)/".POSTS_PER_PAGE.") AS Pages,
+ CEIL(SUM(IF(ID<=$PostID,1,0))/".POSTS_PER_PAGE.") AS Page
+ FROM forums_posts
+ WHERE TopicID=$ThreadID
+ GROUP BY TopicID");
if ($DB->has_results()) {
- list($Pages,$Page) = $DB->next_record();
- if ($Delete) {
- $DB->query("
- UPDATE forums_topics
- SET StickyPostID = 0
- WHERE ID = $ThreadID");
- Forums::add_topic_note($ThreadID, "Post $PostID unstickied");
- } else {
- $DB->query("
- UPDATE forums_topics
- SET StickyPostID = $PostID
- WHERE ID = $ThreadID");
- Forums::add_topic_note($ThreadID, "Post $PostID stickied");
- }
- $Cache->delete_value('thread_'.$ThreadID.'_info');
- $ThisCatalogue = floor((POSTS_PER_PAGE * $Page - POSTS_PER_PAGE) / THREAD_CATALOGUE);
- $LastCatalogue = floor((POSTS_PER_PAGE * $Pages - POSTS_PER_PAGE) / THREAD_CATALOGUE);
- for ($i = $ThisCatalogue; $i <= $LastCatalogue; $i++) {
- $Cache->delete_value('thread_'.$ThreadID.'_catalogue_'.$i);
- }
+ list($Pages,$Page) = $DB->next_record();
+ if ($Delete) {
+ $DB->query("
+ UPDATE forums_topics
+ SET StickyPostID = 0
+ WHERE ID = $ThreadID");
+ Forums::add_topic_note($ThreadID, "Post $PostID unstickied");
+ } else {
+ $DB->query("
+ UPDATE forums_topics
+ SET StickyPostID = $PostID
+ WHERE ID = $ThreadID");
+ Forums::add_topic_note($ThreadID, "Post $PostID stickied");
+ }
+ $Cache->delete_value('thread_'.$ThreadID.'_info');
+ $ThisCatalogue = floor((POSTS_PER_PAGE * $Page - POSTS_PER_PAGE) / THREAD_CATALOGUE);
+ $LastCatalogue = floor((POSTS_PER_PAGE * $Pages - POSTS_PER_PAGE) / THREAD_CATALOGUE);
+ for ($i = $ThisCatalogue; $i <= $LastCatalogue; $i++) {
+ $Cache->delete_value('thread_'.$ThreadID.'_catalogue_'.$i);
+ }
}
header('Location: forums.php?action=viewthread&threadid='.$ThreadID);
diff --git a/sections/forums/take_new_thread.php b/sections/forums/take_new_thread.php
index ff347db59..5446d279f 100644
--- a/sections/forums/take_new_thread.php
+++ b/sections/forums/take_new_thread.php
@@ -3,43 +3,43 @@
/*
'new' if the user is creating a new thread
- It will be accompanied with:
- $_POST['forum']
- $_POST['title']
- $_POST['body']
-
- and optionally include:
- $_POST['question']
- $_POST['answers']
- the latter of which is an array
+ It will be accompanied with:
+ $_POST['forum']
+ $_POST['title']
+ $_POST['body']
+
+ and optionally include:
+ $_POST['question']
+ $_POST['answers']
+ the latter of which is an array
*/
if (isset($LoggedUser['PostsPerPage'])) {
- $PerPage = $LoggedUser['PostsPerPage'];
+ $PerPage = $LoggedUser['PostsPerPage'];
} else {
- $PerPage = POSTS_PER_PAGE;
+ $PerPage = POSTS_PER_PAGE;
}
if (isset($_POST['thread']) && !is_number($_POST['thread'])) {
- error(0);
+ error(0);
}
if (isset($_POST['forum']) && !is_number($_POST['forum'])) {
- error(0);
+ error(0);
}
// If you're not sending anything, go back
if (empty($_POST['body']) || empty($_POST['title'])) {
- $Location = (empty($_SERVER['HTTP_REFERER'])) ? "forums.php?action=viewforum&forumid={$_POST['forum']}": $_SERVER['HTTP_REFERER'];
- header("Location: {$Location}");
- die();
+ $Location = (empty($_SERVER['HTTP_REFERER'])) ? "forums.php?action=viewforum&forumid={$_POST['forum']}": $_SERVER['HTTP_REFERER'];
+ header("Location: {$Location}");
+ die();
}
$Body = $_POST['body'];
if ($LoggedUser['DisablePosting']) {
- error('Your posting privileges have been removed.');
+ error('Your posting privileges have been removed.');
}
$Title = Format::cut_string(trim($_POST['title']), 150, 1, 0);
@@ -48,151 +48,151 @@
$ForumID = $_POST['forum'];
if (!isset($Forums[$ForumID])) {
- error(404);
+ error(404);
}
if (!Forums::check_forumperm($ForumID, 'Write') || !Forums::check_forumperm($ForumID, 'Create')) {
- error(403);
+ error(403);
}
if (empty($_POST['question']) || empty($_POST['answers']) || !check_perms('forums_polls_create')) {
- $NoPoll = 1;
+ $NoPoll = 1;
} else {
- $NoPoll = 0;
- $Question = trim($_POST['question']);
- $Answers = array();
- $Votes = array();
-
- //This can cause polls to have answer IDs of 1 3 4 if the second box is empty
- foreach ($_POST['answers'] as $i => $Answer) {
- if ($Answer == '') {
- continue;
- }
- $Answers[$i + 1] = $Answer;
- $Votes[$i + 1] = 0;
- }
-
- if (count($Answers) < 2) {
- error('You cannot create a poll with only one answer.');
- } elseif (count($Answers) > 25) {
- error('You cannot create a poll with greater than 25 answers.');
- }
+ $NoPoll = 0;
+ $Question = trim($_POST['question']);
+ $Answers = [];
+ $Votes = [];
+
+ //This can cause polls to have answer IDs of 1 3 4 if the second box is empty
+ foreach ($_POST['answers'] as $i => $Answer) {
+ if ($Answer == '') {
+ continue;
+ }
+ $Answers[$i + 1] = $Answer;
+ $Votes[$i + 1] = 0;
+ }
+
+ if (count($Answers) < 2) {
+ error('You cannot create a poll with only one answer.');
+ } elseif (count($Answers) > 25) {
+ error('You cannot create a poll with greater than 25 answers.');
+ }
}
$sqltime = sqltime();
$DB->query("
- INSERT INTO forums_topics
- (Title, AuthorID, ForumID, LastPostTime, LastPostAuthorID, CreatedTime)
- Values
- ('".db_string($Title)."', '".$LoggedUser['ID']."', '$ForumID', '".$sqltime."', '".$LoggedUser['ID']."', '".$sqltime."')");
+ INSERT INTO forums_topics
+ (Title, AuthorID, ForumID, LastPostTime, LastPostAuthorID, CreatedTime)
+ Values
+ ('".db_string($Title)."', '".$LoggedUser['ID']."', '$ForumID', '".$sqltime."', '".$LoggedUser['ID']."', '".$sqltime."')");
$TopicID = $DB->inserted_id();
$DB->query("
- INSERT INTO forums_posts
- (TopicID, AuthorID, AddedTime, Body)
- VALUES
- ('$TopicID', '".$LoggedUser['ID']."', '".$sqltime."', '".db_string($Body)."')");
+ INSERT INTO forums_posts
+ (TopicID, AuthorID, AddedTime, Body)
+ VALUES
+ ('$TopicID', '".$LoggedUser['ID']."', '".$sqltime."', '".db_string($Body)."')");
$PostID = $DB->inserted_id();
$DB->query("
- UPDATE forums
- SET
- NumPosts = NumPosts + 1,
- NumTopics = NumTopics + 1,
- LastPostID = '$PostID',
- LastPostAuthorID = '".$LoggedUser['ID']."',
- LastPostTopicID = '$TopicID',
- LastPostTime = '".$sqltime."'
- WHERE ID = '$ForumID'");
+ UPDATE forums
+ SET
+ NumPosts = NumPosts + 1,
+ NumTopics = NumTopics + 1,
+ LastPostID = '$PostID',
+ LastPostAuthorID = '".$LoggedUser['ID']."',
+ LastPostTopicID = '$TopicID',
+ LastPostTime = '".$sqltime."'
+ WHERE ID = '$ForumID'");
$DB->query("
- UPDATE forums_topics
- SET
- NumPosts = NumPosts + 1,
- LastPostID = '$PostID',
- LastPostAuthorID = '".$LoggedUser['ID']."',
- LastPostTime = '".$sqltime."'
- WHERE ID = '$TopicID'");
+ UPDATE forums_topics
+ SET
+ NumPosts = NumPosts + 1,
+ LastPostID = '$PostID',
+ LastPostAuthorID = '".$LoggedUser['ID']."',
+ LastPostTime = '".$sqltime."'
+ WHERE ID = '$TopicID'");
if (isset($_POST['subscribe'])) {
- Subscriptions::subscribe($TopicID);
+ Subscriptions::subscribe($TopicID);
}
if (!$NoPoll) { // god, I hate double negatives...
- $DB->query("
- INSERT INTO forums_polls
- (TopicID, Question, Answers)
- VALUES
- ('$TopicID', '".db_string($Question)."', '".db_string(serialize($Answers))."')");
- $Cache->cache_value("polls_$TopicID", array($Question, $Answers, $Votes, '0000-00-00 00:00:00', '0'), 0);
-
- if ($ForumID == STAFF_FORUM) {
- send_irc('PRIVMSG '.ADMIN_CHAN.' :!mod Poll created by '.$LoggedUser['Username'].": \"$Question\" ".site_url()."forums.php?action=viewthread&threadid=$TopicID");
- }
+ $DB->query("
+ INSERT INTO forums_polls
+ (TopicID, Question, Answers)
+ VALUES
+ ('$TopicID', '".db_string($Question)."', '".db_string(serialize($Answers))."')");
+ $Cache->cache_value("polls_$TopicID", array($Question, $Answers, $Votes, '0000-00-00 00:00:00', '0'), 0);
+
+ if ($ForumID == STAFF_FORUM) {
+ send_irc('PRIVMSG '.ADMIN_CHAN.' :!mod Poll created by '.$LoggedUser['Username'].": \"$Question\" ".site_url()."forums.php?action=viewthread&threadid=$TopicID");
+ }
}
// if cache exists modify it, if not, then it will be correct when selected next, and we can skip this block
if ($Forum = $Cache->get_value("forums_$ForumID")) {
- list($Forum,,,$Stickies) = $Forum;
-
- // Remove the last thread from the index
- if (count($Forum) == TOPICS_PER_PAGE && $Stickies < TOPICS_PER_PAGE) {
- array_pop($Forum);
- }
-
- if ($Stickies > 0) {
- $Part1 = array_slice($Forum, 0, $Stickies, true); // Stickies
- $Part3 = array_slice($Forum, $Stickies, TOPICS_PER_PAGE - $Stickies - 1, true); // Rest of page
- } else {
- $Part1 = array();
- $Part3 = $Forum;
- }
- $Part2 = array($TopicID => array(
- 'ID' => $TopicID,
- 'Title' => $Title,
- 'AuthorID' => $LoggedUser['ID'],
- 'IsLocked' => 0,
- 'IsSticky' => 0,
- 'NumPosts' => 1,
- 'LastPostID' => $PostID,
- 'LastPostTime' => $sqltime,
- 'LastPostAuthorID' => $LoggedUser['ID'],
- 'NoPoll' => $NoPoll
- )); // Bumped
- $Forum = $Part1 + $Part2 + $Part3;
-
- $Cache->cache_value("forums_$ForumID", array($Forum, '', 0, $Stickies), 0);
-
- // Update the forum root
- $Cache->begin_transaction('forums_list');
- $Cache->update_row($ForumID, array(
- 'NumPosts' => '+1',
- 'NumTopics' => '+1',
- 'LastPostID' => $PostID,
- 'LastPostAuthorID' => $LoggedUser['ID'],
- 'LastPostTopicID' => $TopicID,
- 'LastPostTime' => $sqltime,
- 'Title' => $Title,
- 'IsLocked' => 0,
- 'IsSticky' => 0
- ));
- $Cache->commit_transaction(0);
+ list($Forum,,,$Stickies) = $Forum;
+
+ // Remove the last thread from the index
+ if (count($Forum) == TOPICS_PER_PAGE && $Stickies < TOPICS_PER_PAGE) {
+ array_pop($Forum);
+ }
+
+ if ($Stickies > 0) {
+ $Part1 = array_slice($Forum, 0, $Stickies, true); // Stickies
+ $Part3 = array_slice($Forum, $Stickies, TOPICS_PER_PAGE - $Stickies - 1, true); // Rest of page
+ } else {
+ $Part1 = [];
+ $Part3 = $Forum;
+ }
+ $Part2 = array($TopicID => array(
+ 'ID' => $TopicID,
+ 'Title' => $Title,
+ 'AuthorID' => $LoggedUser['ID'],
+ 'IsLocked' => 0,
+ 'IsSticky' => 0,
+ 'NumPosts' => 1,
+ 'LastPostID' => $PostID,
+ 'LastPostTime' => $sqltime,
+ 'LastPostAuthorID' => $LoggedUser['ID'],
+ 'NoPoll' => $NoPoll
+ )); // Bumped
+ $Forum = $Part1 + $Part2 + $Part3;
+
+ $Cache->cache_value("forums_$ForumID", array($Forum, '', 0, $Stickies), 0);
+
+ // Update the forum root
+ $Cache->begin_transaction('forums_list');
+ $Cache->update_row($ForumID, array(
+ 'NumPosts' => '+1',
+ 'NumTopics' => '+1',
+ 'LastPostID' => $PostID,
+ 'LastPostAuthorID' => $LoggedUser['ID'],
+ 'LastPostTopicID' => $TopicID,
+ 'LastPostTime' => $sqltime,
+ 'Title' => $Title,
+ 'IsLocked' => 0,
+ 'IsSticky' => 0
+ ));
+ $Cache->commit_transaction(0);
} else {
- // If there's no cache, we have no data, and if there's no data
- $Cache->delete_value('forums_list');
+ // If there's no cache, we have no data, and if there's no data
+ $Cache->delete_value('forums_list');
}
$Cache->begin_transaction("thread_$TopicID".'_catalogue_0');
$Post = array(
- 'ID' => $PostID,
- 'AuthorID' => $LoggedUser['ID'],
- 'AddedTime' => $sqltime,
- 'Body' => $Body,
- 'EditedUserID' => 0,
- 'EditedTime' => '0000-00-00 00:00:00'
- );
+ 'ID' => $PostID,
+ 'AuthorID' => $LoggedUser['ID'],
+ 'AddedTime' => $sqltime,
+ 'Body' => $Body,
+ 'EditedUserID' => 0,
+ 'EditedTime' => '0000-00-00 00:00:00'
+ );
$Cache->insert('', $Post);
$Cache->commit_transaction(0);
diff --git a/sections/forums/take_reply.php b/sections/forums/take_reply.php
index a7d8a9dd3..f20c15e61 100644
--- a/sections/forums/take_reply.php
+++ b/sections/forums/take_reply.php
@@ -12,9 +12,9 @@
$_POST['action'] is what the user is trying to do. It can be:
'reply' if the user is replying to a thread
- It will be accompanied with:
- $_POST['thread']
- $_POST['body']
+ It will be accompanied with:
+ $_POST['thread']
+ $_POST['body']
\*********************************************************************/
@@ -22,247 +22,247 @@
// Quick SQL injection checks
if (isset($LoggedUser['PostsPerPage'])) {
- $PerPage = $LoggedUser['PostsPerPage'];
+ $PerPage = $LoggedUser['PostsPerPage'];
} else {
- $PerPage = POSTS_PER_PAGE;
+ $PerPage = POSTS_PER_PAGE;
}
if (isset($_POST['thread']) && !is_number($_POST['thread'])) {
- error(0);
+ error(0);
}
if (isset($_POST['forum']) && !is_number($_POST['forum'])) {
- error(0);
+ error(0);
}
// If you're not sending anything, go back
if ($_POST['body'] === '' || !isset($_POST['body'])) {
- $Location = empty($_SERVER['HTTP_REFERER']) ? "forums.php?action=viewthread&threadid={$_POST['thread']}" : $_SERVER['HTTP_REFERER'];
- header("Location: {$Location}");
- die();
+ $Location = empty($_SERVER['HTTP_REFERER']) ? "forums.php?action=viewthread&threadid={$_POST['thread']}" : $_SERVER['HTTP_REFERER'];
+ header("Location: {$Location}");
+ die();
}
$Body = $_POST['body'];
if (!empty($LoggedUser['DisablePosting'])) {
- error('Your posting privileges have been removed.');
+ error('Your posting privileges have been removed.');
}
$TopicID = $_POST['thread'];
$ThreadInfo = Forums::get_thread_info($TopicID);
if ($ThreadInfo === null) {
- error(404);
+ error(404);
}
$ForumID = $ThreadInfo['ForumID'];
$SQLTime = sqltime();
if (!Forums::check_forumperm($ForumID)) {
- error(403);
+ error(403);
}
if (!Forums::check_forumperm($ForumID, 'Write') || $LoggedUser['DisablePosting'] || $ThreadInfo['IsLocked'] == '1' && !check_perms('site_moderate_forums')) {
- error(403);
+ error(403);
}
if (isset($_POST['subscribe']) && Subscriptions::has_subscribed($TopicID) === false) {
- Subscriptions::subscribe($TopicID);
+ Subscriptions::subscribe($TopicID);
}
//Now lets handle the special case of merging posts, we can skip bumping the thread and all that fun
if ($ThreadInfo['LastPostAuthorID'] == $LoggedUser['ID'] && isset($_POST['merge'])) {
- //Get the id for this post in the database to append
- $DB->query("
- SELECT ID, Body
- FROM forums_posts
- WHERE TopicID = '$TopicID'
- AND AuthorID = '".$LoggedUser['ID']."'
- ORDER BY ID DESC
- LIMIT 1");
- list($PostID, $OldBody) = $DB->next_record(MYSQLI_NUM, false);
-
- //Edit the post
- $DB->query("
- UPDATE forums_posts
- SET
- Body = CONCAT(Body,'\n\n".db_string($Body)."'),
- EditedUserID = '".$LoggedUser['ID']."',
- EditedTime = '$SQLTime'
- WHERE ID = '$PostID'");
-
- //Store edit history
- $DB->query("
- INSERT INTO comments_edits
- (Page, PostID, EditUser, EditTime, Body)
- VALUES
- ('forums', $PostID, ".$LoggedUser['ID'].", '$SQLTime', '".db_string($OldBody)."')");
- $Cache->delete_value("forums_edits_$PostID");
-
- //Get the catalogue it is in
- $CatalogueID = floor((POSTS_PER_PAGE * ceil($ThreadInfo['Posts'] / POSTS_PER_PAGE) - POSTS_PER_PAGE) / THREAD_CATALOGUE);
-
- //Get the catalogue value for the post we're appending to
- if ($ThreadInfo['Posts'] % THREAD_CATALOGUE == 0) {
- $Key = THREAD_CATALOGUE - 1;
- } else {
- $Key = ($ThreadInfo['Posts'] % THREAD_CATALOGUE) - 1;
- }
- if ($ThreadInfo['StickyPostID'] == $PostID) {
- $ThreadInfo['StickyPost']['Body'] .= "\n\n$Body";
- $ThreadInfo['StickyPost']['EditedUserID'] = $LoggedUser['ID'];
- $ThreadInfo['StickyPost']['EditedTime'] = $SQLTime;
- $Cache->cache_value("thread_$TopicID".'_info', $ThreadInfo, 0);
- }
-
- //Edit the post in the cache
- $Cache->begin_transaction("thread_$TopicID"."_catalogue_$CatalogueID");
- $Cache->update_row($Key, array(
- 'Body' => $Cache->MemcacheDBArray[$Key]['Body']."\n\n$Body",
- 'EditedUserID' => $LoggedUser['ID'],
- 'EditedTime' => $SQLTime,
- 'Username' => $LoggedUser['Username']
- ));
- $Cache->commit_transaction(0);
+ //Get the id for this post in the database to append
+ $DB->query("
+ SELECT ID, Body
+ FROM forums_posts
+ WHERE TopicID = '$TopicID'
+ AND AuthorID = '".$LoggedUser['ID']."'
+ ORDER BY ID DESC
+ LIMIT 1");
+ list($PostID, $OldBody) = $DB->next_record(MYSQLI_NUM, false);
+
+ //Edit the post
+ $DB->query("
+ UPDATE forums_posts
+ SET
+ Body = CONCAT(Body,'\n\n".db_string($Body)."'),
+ EditedUserID = '".$LoggedUser['ID']."',
+ EditedTime = '$SQLTime'
+ WHERE ID = '$PostID'");
+
+ //Store edit history
+ $DB->query("
+ INSERT INTO comments_edits
+ (Page, PostID, EditUser, EditTime, Body)
+ VALUES
+ ('forums', $PostID, ".$LoggedUser['ID'].", '$SQLTime', '".db_string($OldBody)."')");
+ $Cache->delete_value("forums_edits_$PostID");
+
+ //Get the catalogue it is in
+ $CatalogueID = floor((POSTS_PER_PAGE * ceil($ThreadInfo['Posts'] / POSTS_PER_PAGE) - POSTS_PER_PAGE) / THREAD_CATALOGUE);
+
+ //Get the catalogue value for the post we're appending to
+ if ($ThreadInfo['Posts'] % THREAD_CATALOGUE == 0) {
+ $Key = THREAD_CATALOGUE - 1;
+ } else {
+ $Key = ($ThreadInfo['Posts'] % THREAD_CATALOGUE) - 1;
+ }
+ if ($ThreadInfo['StickyPostID'] == $PostID) {
+ $ThreadInfo['StickyPost']['Body'] .= "\n\n$Body";
+ $ThreadInfo['StickyPost']['EditedUserID'] = $LoggedUser['ID'];
+ $ThreadInfo['StickyPost']['EditedTime'] = $SQLTime;
+ $Cache->cache_value("thread_$TopicID".'_info', $ThreadInfo, 0);
+ }
+
+ //Edit the post in the cache
+ $Cache->begin_transaction("thread_$TopicID"."_catalogue_$CatalogueID");
+ $Cache->update_row($Key, array(
+ 'Body' => $Cache->MemcacheDBArray[$Key]['Body']."\n\n$Body",
+ 'EditedUserID' => $LoggedUser['ID'],
+ 'EditedTime' => $SQLTime,
+ 'Username' => $LoggedUser['Username']
+ ));
+ $Cache->commit_transaction(0);
//Now we're dealing with a normal post
} else {
- //Insert the post into the posts database
- $DB->query("
- INSERT INTO forums_posts (TopicID, AuthorID, AddedTime, Body)
- VALUES ('$TopicID', '".$LoggedUser['ID']."', '$SQLTime', '".db_string($Body)."')");
-
- $PostID = $DB->inserted_id();
-
- //This updates the root index
- $DB->query("
- UPDATE forums
- SET
- NumPosts = NumPosts + 1,
- LastPostID = '$PostID',
- LastPostAuthorID = '".$LoggedUser['ID']."',
- LastPostTopicID = '$TopicID',
- LastPostTime = '$SQLTime'
- WHERE ID = '$ForumID'");
-
- //Update the topic
- $DB->query("
- UPDATE forums_topics
- SET
- NumPosts = NumPosts + 1,
- LastPostID = '$PostID',
- LastPostAuthorID = '".$LoggedUser['ID']."',
- LastPostTime = '$SQLTime'
- WHERE ID = '$TopicID'");
-
- // if cache exists modify it, if not, then it will be correct when selected next, and we can skip this block
- if ($Forum = $Cache->get_value("forums_$ForumID")) {
- list($Forum,,,$Stickies) = $Forum;
-
- // if the topic is already on this page
- if (array_key_exists($TopicID, $Forum)) {
- $Thread = $Forum[$TopicID];
- unset($Forum[$TopicID]);
- $Thread['NumPosts'] = $Thread['NumPosts'] + 1; // Increment post count
- $Thread['LastPostID'] = $PostID; // Set post ID for read/unread
- $Thread['LastPostTime'] = $SQLTime; // Time of last post
- $Thread['LastPostAuthorID'] = $LoggedUser['ID']; // Last poster ID
- $Part2 = array($TopicID => $Thread); // Bumped thread
-
- // if we're bumping from an older page
- } else {
- // Remove the last thread from the index
- if (count($Forum) == TOPICS_PER_PAGE && $Stickies < TOPICS_PER_PAGE) {
- array_pop($Forum);
- }
- // Never know if we get a page full of stickies...
- if ($Stickies < TOPICS_PER_PAGE || $ThreadInfo['IsSticky'] == 1) {
- //Pull the data for the thread we're bumping
- $DB->query("
- SELECT
- f.AuthorID,
- f.IsLocked,
- f.IsSticky,
- f.NumPosts,
- ISNULL(p.TopicID) AS NoPoll
- FROM forums_topics AS f
- LEFT JOIN forums_polls AS p ON p.TopicID = f.ID
- WHERE f.ID = '$TopicID'");
- list($AuthorID, $IsLocked, $IsSticky, $NumPosts, $NoPoll) = $DB->next_record();
- $Part2 = array($TopicID => array(
- 'ID' => $TopicID,
- 'Title' => $ThreadInfo['Title'],
- 'AuthorID' => $AuthorID,
- 'IsLocked' => $IsLocked,
- 'IsSticky' => $IsSticky,
- 'NumPosts' => $NumPosts,
- 'LastPostID' => $PostID,
- 'LastPostTime' => $SQLTime,
- 'LastPostAuthorID' => $LoggedUser['ID'],
- 'NoPoll' => $NoPoll
- )); //Bumped
- } else {
- $Part2 = array();
- }
- }
- if ($Stickies > 0) {
- $Part1 = array_slice($Forum, 0, $Stickies, true); //Stickies
- $Part3 = array_slice($Forum, $Stickies, TOPICS_PER_PAGE - $Stickies - 1, true); //Rest of page
- } else {
- $Part1 = array();
- $Part3 = $Forum;
- }
- if (is_null($Part1)) {
- $Part1 = array();
- }
- if (is_null($Part3)) {
- $Part3 = array();
- }
- if ($ThreadInfo['IsSticky'] == 1) {
- $Forum = $Part2 + $Part1 + $Part3; //Merge it
- } else {
- $Forum = $Part1 + $Part2 + $Part3; //Merge it
- }
- $Cache->cache_value("forums_$ForumID", array($Forum, '', 0, $Stickies), 0);
-
- //Update the forum root
- $Cache->begin_transaction('forums_list');
- $Cache->update_row($ForumID, array(
- 'NumPosts'=>'+1',
- 'LastPostID'=>$PostID,
- 'LastPostAuthorID'=>$LoggedUser['ID'],
- 'LastPostTopicID'=>$TopicID,
- 'LastPostTime'=>$SQLTime,
- 'Title'=>$ThreadInfo['Title'],
- 'IsLocked'=>$ThreadInfo['IsLocked'],
- 'IsSticky'=>$ThreadInfo['IsSticky']
- ));
- $Cache->commit_transaction(0);
- } else {
- //If there's no cache, we have no data, and if there's no data
- $Cache->delete_value('forums_list');
- }
-
-
- //This calculates the block of 500 posts that this one will fall under
- $CatalogueID = floor((POSTS_PER_PAGE * ceil($ThreadInfo['Posts'] / POSTS_PER_PAGE) - POSTS_PER_PAGE) / THREAD_CATALOGUE);
-
- //Insert the post into the thread catalogue (block of 500 posts)
- $Cache->begin_transaction("thread_$TopicID"."_catalogue_$CatalogueID");
- $Cache->insert('', array(
- 'ID'=>$PostID,
- 'AuthorID'=>$LoggedUser['ID'],
- 'AddedTime'=>$SQLTime,
- 'Body'=>$Body,
- 'EditedUserID'=>0,
- 'EditedTime'=>'0000-00-00 00:00:00',
- 'Username'=>$LoggedUser['Username'] //TODO: Remove, it's never used?
- ));
- $Cache->commit_transaction(0);
-
- //Update the thread info
- $Cache->begin_transaction("thread_$TopicID".'_info');
- $Cache->update_row(false, array('Posts' => '+1', 'LastPostAuthorID' => $LoggedUser['ID'], 'LastPostTime' => $SQLTime));
- $Cache->commit_transaction(0);
-
- //Increment this now to make sure we redirect to the correct page
- $ThreadInfo['Posts']++;
+ //Insert the post into the posts database
+ $DB->query("
+ INSERT INTO forums_posts (TopicID, AuthorID, AddedTime, Body)
+ VALUES ('$TopicID', '".$LoggedUser['ID']."', '$SQLTime', '".db_string($Body)."')");
+
+ $PostID = $DB->inserted_id();
+
+ //This updates the root index
+ $DB->query("
+ UPDATE forums
+ SET
+ NumPosts = NumPosts + 1,
+ LastPostID = '$PostID',
+ LastPostAuthorID = '".$LoggedUser['ID']."',
+ LastPostTopicID = '$TopicID',
+ LastPostTime = '$SQLTime'
+ WHERE ID = '$ForumID'");
+
+ //Update the topic
+ $DB->query("
+ UPDATE forums_topics
+ SET
+ NumPosts = NumPosts + 1,
+ LastPostID = '$PostID',
+ LastPostAuthorID = '".$LoggedUser['ID']."',
+ LastPostTime = '$SQLTime'
+ WHERE ID = '$TopicID'");
+
+ // if cache exists modify it, if not, then it will be correct when selected next, and we can skip this block
+ if ($Forum = $Cache->get_value("forums_$ForumID")) {
+ list($Forum,,,$Stickies) = $Forum;
+
+ // if the topic is already on this page
+ if (array_key_exists($TopicID, $Forum)) {
+ $Thread = $Forum[$TopicID];
+ unset($Forum[$TopicID]);
+ $Thread['NumPosts'] = $Thread['NumPosts'] + 1; // Increment post count
+ $Thread['LastPostID'] = $PostID; // Set post ID for read/unread
+ $Thread['LastPostTime'] = $SQLTime; // Time of last post
+ $Thread['LastPostAuthorID'] = $LoggedUser['ID']; // Last poster ID
+ $Part2 = array($TopicID => $Thread); // Bumped thread
+
+ // if we're bumping from an older page
+ } else {
+ // Remove the last thread from the index
+ if (count($Forum) == TOPICS_PER_PAGE && $Stickies < TOPICS_PER_PAGE) {
+ array_pop($Forum);
+ }
+ // Never know if we get a page full of stickies...
+ if ($Stickies < TOPICS_PER_PAGE || $ThreadInfo['IsSticky'] == 1) {
+ //Pull the data for the thread we're bumping
+ $DB->query("
+ SELECT
+ f.AuthorID,
+ f.IsLocked,
+ f.IsSticky,
+ f.NumPosts,
+ ISNULL(p.TopicID) AS NoPoll
+ FROM forums_topics AS f
+ LEFT JOIN forums_polls AS p ON p.TopicID = f.ID
+ WHERE f.ID = '$TopicID'");
+ list($AuthorID, $IsLocked, $IsSticky, $NumPosts, $NoPoll) = $DB->next_record();
+ $Part2 = array($TopicID => array(
+ 'ID' => $TopicID,
+ 'Title' => $ThreadInfo['Title'],
+ 'AuthorID' => $AuthorID,
+ 'IsLocked' => $IsLocked,
+ 'IsSticky' => $IsSticky,
+ 'NumPosts' => $NumPosts,
+ 'LastPostID' => $PostID,
+ 'LastPostTime' => $SQLTime,
+ 'LastPostAuthorID' => $LoggedUser['ID'],
+ 'NoPoll' => $NoPoll
+ )); //Bumped
+ } else {
+ $Part2 = [];
+ }
+ }
+ if ($Stickies > 0) {
+ $Part1 = array_slice($Forum, 0, $Stickies, true); //Stickies
+ $Part3 = array_slice($Forum, $Stickies, TOPICS_PER_PAGE - $Stickies - 1, true); //Rest of page
+ } else {
+ $Part1 = [];
+ $Part3 = $Forum;
+ }
+ if (is_null($Part1)) {
+ $Part1 = [];
+ }
+ if (is_null($Part3)) {
+ $Part3 = [];
+ }
+ if ($ThreadInfo['IsSticky'] == 1) {
+ $Forum = $Part2 + $Part1 + $Part3; //Merge it
+ } else {
+ $Forum = $Part1 + $Part2 + $Part3; //Merge it
+ }
+ $Cache->cache_value("forums_$ForumID", array($Forum, '', 0, $Stickies), 0);
+
+ //Update the forum root
+ $Cache->begin_transaction('forums_list');
+ $Cache->update_row($ForumID, array(
+ 'NumPosts'=>'+1',
+ 'LastPostID'=>$PostID,
+ 'LastPostAuthorID'=>$LoggedUser['ID'],
+ 'LastPostTopicID'=>$TopicID,
+ 'LastPostTime'=>$SQLTime,
+ 'Title'=>$ThreadInfo['Title'],
+ 'IsLocked'=>$ThreadInfo['IsLocked'],
+ 'IsSticky'=>$ThreadInfo['IsSticky']
+ ));
+ $Cache->commit_transaction(0);
+ } else {
+ //If there's no cache, we have no data, and if there's no data
+ $Cache->delete_value('forums_list');
+ }
+
+
+ //This calculates the block of 500 posts that this one will fall under
+ $CatalogueID = floor((POSTS_PER_PAGE * ceil($ThreadInfo['Posts'] / POSTS_PER_PAGE) - POSTS_PER_PAGE) / THREAD_CATALOGUE);
+
+ //Insert the post into the thread catalogue (block of 500 posts)
+ $Cache->begin_transaction("thread_$TopicID"."_catalogue_$CatalogueID");
+ $Cache->insert('', array(
+ 'ID'=>$PostID,
+ 'AuthorID'=>$LoggedUser['ID'],
+ 'AddedTime'=>$SQLTime,
+ 'Body'=>$Body,
+ 'EditedUserID'=>0,
+ 'EditedTime'=>'0000-00-00 00:00:00',
+ 'Username'=>$LoggedUser['Username'] //TODO: Remove, it's never used?
+ ));
+ $Cache->commit_transaction(0);
+
+ //Update the thread info
+ $Cache->begin_transaction("thread_$TopicID".'_info');
+ $Cache->update_row(false, array('Posts' => '+1', 'LastPostAuthorID' => $LoggedUser['ID'], 'LastPostTime' => $SQLTime));
+ $Cache->commit_transaction(0);
+
+ //Increment this now to make sure we redirect to the correct page
+ $ThreadInfo['Posts']++;
}
Subscriptions::flush_subscriptions('forums', $TopicID);
diff --git a/sections/forums/take_topic_notes.php b/sections/forums/take_topic_notes.php
index 11ebcf9be..b7ceb0acc 100644
--- a/sections/forums/take_topic_notes.php
+++ b/sections/forums/take_topic_notes.php
@@ -1,12 +1,12 @@
- $LoggedUser['Class']) {
- error(403);
+ error(403);
}
$URL = site_url() . "forums.php?action=viewthread&postid=$PostID#post$PostID";
if ($WarningLength !== 'verbal') {
- $Time = (int)$WarningLength * (7 * 24 * 60 * 60);
- Tools::warn_user($UserID, $Time, "$URL - $Reason");
- $Subject = 'You have received a warning';
- $PrivateMessage = "You have received a $WarningLength week warning for [url=$URL]this post[/url].\n\n" . $PrivateMessage;
+ $Time = (int)$WarningLength * (7 * 24 * 60 * 60);
+ Tools::warn_user($UserID, $Time, "$URL - $Reason");
+ $Subject = 'You have received a warning';
+ $PrivateMessage = "You have received a $WarningLength week warning for [url=$URL]this post[/url].\n\n" . $PrivateMessage;
- $WarnTime = time_plus($Time);
- $AdminComment = date('Y-m-d') . " - Warned until $WarnTime by " . $LoggedUser['Username'] . " for $URL\nReason: $Reason\n\n";
+ $WarnTime = time_plus($Time);
+ $AdminComment = date('Y-m-d') . " - Warned until $WarnTime by " . $LoggedUser['Username'] . " for $URL\nReason: $Reason\n\n";
} else {
- $Subject = 'You have received a verbal warning';
- $PrivateMessage = "You have received a verbal warning for [url=$URL]this post[/url].\n\n" . $PrivateMessage;
- $AdminComment = date('Y-m-d') . ' - Verbally warned by ' . $LoggedUser['Username'] . " for $URL\nReason: $Reason\n\n";
- Tools::update_user_notes($UserID, $AdminComment);
+ $Subject = 'You have received a verbal warning';
+ $PrivateMessage = "You have received a verbal warning for [url=$URL]this post[/url].\n\n" . $PrivateMessage;
+ $AdminComment = date('Y-m-d') . ' - Verbally warned by ' . $LoggedUser['Username'] . " for $URL\nReason: $Reason\n\n";
+ Tools::update_user_notes($UserID, $AdminComment);
}
$DB->query("
- INSERT INTO users_warnings_forums
- (UserID, Comment)
- VALUES
- ('$UserID', '" . db_string($AdminComment) . "')
- ON DUPLICATE KEY UPDATE
- Comment = CONCAT('" . db_string($AdminComment) . "', Comment)");
+ INSERT INTO users_warnings_forums
+ (UserID, Comment)
+ VALUES
+ ('$UserID', '" . db_string($AdminComment) . "')
+ ON DUPLICATE KEY UPDATE
+ Comment = CONCAT('" . db_string($AdminComment) . "', Comment)");
Misc::send_pm($UserID, $LoggedUser['ID'], $Subject, $PrivateMessage);
//edit the post
$DB->query("
- SELECT
- p.Body,
- p.AuthorID,
- p.TopicID,
- t.ForumID,
- CEIL(
- (
- SELECT COUNT(p2.ID)
- FROM forums_posts AS p2
- WHERE p2.TopicID = p.TopicID
- AND p2.ID <= '$PostID'
- ) / " . POSTS_PER_PAGE . "
- ) AS Page
- FROM forums_posts AS p
- JOIN forums_topics AS t ON p.TopicID = t.ID
- JOIN forums AS f ON t.ForumID = f.ID
- WHERE p.ID = '$PostID'");
+ SELECT
+ p.Body,
+ p.AuthorID,
+ p.TopicID,
+ t.ForumID,
+ CEIL(
+ (
+ SELECT COUNT(p2.ID)
+ FROM forums_posts AS p2
+ WHERE p2.TopicID = p.TopicID
+ AND p2.ID <= '$PostID'
+ ) / " . POSTS_PER_PAGE . "
+ ) AS Page
+ FROM forums_posts AS p
+ JOIN forums_topics AS t ON p.TopicID = t.ID
+ JOIN forums AS f ON t.ForumID = f.ID
+ WHERE p.ID = '$PostID'");
list($OldBody, $AuthorID, $TopicID, $ForumID, $Page) = $DB->next_record();
// Perform the update
$DB->query("
- UPDATE forums_posts
- SET Body = '" . db_string($Body) . "',
- EditedUserID = '$UserID',
- EditedTime = '$SQLTime'
- WHERE ID = '$PostID'");
+ UPDATE forums_posts
+ SET Body = '" . db_string($Body) . "',
+ EditedUserID = '$UserID',
+ EditedTime = '$SQLTime'
+ WHERE ID = '$PostID'");
$CatalogueID = floor((POSTS_PER_PAGE * $Page - POSTS_PER_PAGE) / THREAD_CATALOGUE);
$Cache->begin_transaction("thread_$TopicID" . "_catalogue_$CatalogueID");
if ($Cache->MemcacheDBArray[$Key]['ID'] != $PostID) {
- $Cache->cancel_transaction();
- $Cache->delete_value("thread_$TopicID" . "_catalogue_$CatalogueID");
- //just clear the cache for would be cache-screwer-uppers
+ $Cache->cancel_transaction();
+ $Cache->delete_value("thread_$TopicID" . "_catalogue_$CatalogueID");
+ //just clear the cache for would be cache-screwer-uppers
} else {
- $Cache->update_row($Key, array(
- 'ID' => $Cache->MemcacheDBArray[$Key]['ID'],
- 'AuthorID' => $Cache->MemcacheDBArray[$Key]['AuthorID'],
- 'AddedTime' => $Cache->MemcacheDBArray[$Key]['AddedTime'],
- 'Body' => $Body, //Don't url decode.
- 'EditedUserID' => $LoggedUser['ID'],
- 'EditedTime' => $SQLTime,
- 'Username' => $LoggedUser['Username']));
- $Cache->commit_transaction(3600 * 24 * 5);
+ $Cache->update_row($Key, array(
+ 'ID' => $Cache->MemcacheDBArray[$Key]['ID'],
+ 'AuthorID' => $Cache->MemcacheDBArray[$Key]['AuthorID'],
+ 'AddedTime' => $Cache->MemcacheDBArray[$Key]['AddedTime'],
+ 'Body' => $Body, //Don't url decode.
+ 'EditedUserID' => $LoggedUser['ID'],
+ 'EditedTime' => $SQLTime,
+ 'Username' => $LoggedUser['Username']));
+ $Cache->commit_transaction(3600 * 24 * 5);
}
$ThreadInfo = Forums::get_thread_info($TopicID);
if ($ThreadInfo === null) {
- error(404);
+ error(404);
}
if ($ThreadInfo['StickyPostID'] == $PostID) {
- $ThreadInfo['StickyPost']['Body'] = $Body;
- $ThreadInfo['StickyPost']['EditedUserID'] = $LoggedUser['ID'];
- $ThreadInfo['StickyPost']['EditedTime'] = $SQLTime;
- $Cache->cache_value("thread_$TopicID" . '_info', $ThreadInfo, 0);
+ $ThreadInfo['StickyPost']['Body'] = $Body;
+ $ThreadInfo['StickyPost']['EditedUserID'] = $LoggedUser['ID'];
+ $ThreadInfo['StickyPost']['EditedTime'] = $SQLTime;
+ $Cache->cache_value("thread_$TopicID" . '_info', $ThreadInfo, 0);
}
$DB->query("
- INSERT INTO comments_edits
- (Page, PostID, EditUser, EditTime, Body)
- VALUES
- ('forums', $PostID, $UserID, '$SQLTime', '" . db_string($OldBody) . "')");
+ INSERT INTO comments_edits
+ (Page, PostID, EditUser, EditTime, Body)
+ VALUES
+ ('forums', $PostID, $UserID, '$SQLTime', '" . db_string($OldBody) . "')");
$Cache->delete_value("forums_edits_$PostID");
header("Location: forums.php?action=viewthread&postid=$PostID#post$PostID");
diff --git a/sections/forums/takeedit.php b/sections/forums/takeedit.php
index 34528ae29..e6710177f 100644
--- a/sections/forums/takeedit.php
+++ b/sections/forums/takeedit.php
@@ -1,4 +1,4 @@
-query("
- SELECT
- p.Body,
- p.AuthorID,
- p.TopicID,
- t.IsLocked,
- t.ForumID,
- f.MinClassWrite,
- CEIL((
- SELECT COUNT(p2.ID)
- FROM forums_posts AS p2
- WHERE p2.TopicID = p.TopicID
- AND p2.ID <= '$PostID'
- ) / ".POSTS_PER_PAGE."
- ) AS Page
- FROM forums_posts AS p
- JOIN forums_topics AS t ON p.TopicID = t.ID
- JOIN forums AS f ON t.ForumID = f.ID
- WHERE p.ID = '$PostID'");
+ SELECT
+ p.Body,
+ p.AuthorID,
+ p.TopicID,
+ t.IsLocked,
+ t.ForumID,
+ f.MinClassWrite,
+ CEIL((
+ SELECT COUNT(p2.ID)
+ FROM forums_posts AS p2
+ WHERE p2.TopicID = p.TopicID
+ AND p2.ID <= '$PostID'
+ ) / ".POSTS_PER_PAGE."
+ ) AS Page
+ FROM forums_posts AS p
+ JOIN forums_topics AS t ON p.TopicID = t.ID
+ JOIN forums AS f ON t.ForumID = f.ID
+ WHERE p.ID = '$PostID'");
list($OldBody, $AuthorID, $TopicID, $IsLocked, $ForumID, $MinClassWrite, $Page) = $DB->next_record();
// Make sure they aren't trying to edit posts they shouldn't
// We use die() here instead of error() because whatever we spit out is displayed to the user in the box where his forum post is
if (!Forums::check_forumperm($ForumID, 'Write') || ($IsLocked && !check_perms('site_moderate_forums'))) {
- error('Either the thread is locked, or you lack the permission to edit this post.', true);
+ error('Either the thread is locked, or you lack the permission to edit this post.', true);
}
if ($UserID != $AuthorID && !check_perms('site_moderate_forums')) {
- error(403,true);
+ error(403,true);
}
if ($LoggedUser['DisablePosting']) {
- error('Your posting privileges have been removed.', true);
+ error('Your posting privileges have been removed.', true);
}
if (!$DB->has_results()) {
- error(404,true);
+ error(404,true);
}
// Send a PM to the user to notify them of the edit
if ($UserID != $AuthorID && $DoPM) {
- $PMSubject = "Your post #$PostID has been edited";
- $PMurl = site_url()."forums.php?action=viewthread&postid=$PostID#post$PostID";
- $ProfLink = '[url='.site_url()."user.php?id=$UserID]".$LoggedUser['Username'].'[/url]';
- $PMBody = "One of your posts has been edited by $ProfLink: [url]{$PMurl}[/url]";
- Misc::send_pm($AuthorID, 0, $PMSubject, $PMBody);
+ $PMSubject = "Your post #$PostID has been edited";
+ $PMurl = site_url()."forums.php?action=viewthread&postid=$PostID#post$PostID";
+ $ProfLink = '[url='.site_url()."user.php?id=$UserID]".$LoggedUser['Username'].'[/url]';
+ $PMBody = "One of your posts has been edited by $ProfLink: [url]{$PMurl}[/url]";
+ Misc::send_pm($AuthorID, 0, $PMSubject, $PMBody);
}
// Perform the update
$DB->query("
- UPDATE forums_posts
- SET
- Body = '" . db_string($Body) . "',
- EditedUserID = '$UserID',
- EditedTime = '$SQLTime'
- WHERE ID = '$PostID'");
+ UPDATE forums_posts
+ SET
+ Body = '" . db_string($Body) . "',
+ EditedUserID = '$UserID',
+ EditedTime = '$SQLTime'
+ WHERE ID = '$PostID'");
$CatalogueID = floor((POSTS_PER_PAGE * $Page - POSTS_PER_PAGE) / THREAD_CATALOGUE);
$Cache->begin_transaction("thread_$TopicID"."_catalogue_$CatalogueID");
if ($Cache->MemcacheDBArray[$Key]['ID'] != $PostID) {
- $Cache->cancel_transaction();
- $Cache->delete_value("thread_$TopicID"."_catalogue_$CatalogueID"); //just clear the cache for would be cache-screwer-uppers
+ $Cache->cancel_transaction();
+ $Cache->delete_value("thread_$TopicID"."_catalogue_$CatalogueID"); //just clear the cache for would be cache-screwer-uppers
} else {
- $Cache->update_row($Key, array(
- 'ID'=>$Cache->MemcacheDBArray[$Key]['ID'],
- 'AuthorID'=>$Cache->MemcacheDBArray[$Key]['AuthorID'],
- 'AddedTime'=>$Cache->MemcacheDBArray[$Key]['AddedTime'],
- 'Body'=>$Body, //Don't url decode.
- 'EditedUserID'=>$LoggedUser['ID'],
- 'EditedTime'=>$SQLTime,
- 'Username'=>$LoggedUser['Username']
- ));
- $Cache->commit_transaction(3600 * 24 * 5);
+ $Cache->update_row($Key, array(
+ 'ID'=>$Cache->MemcacheDBArray[$Key]['ID'],
+ 'AuthorID'=>$Cache->MemcacheDBArray[$Key]['AuthorID'],
+ 'AddedTime'=>$Cache->MemcacheDBArray[$Key]['AddedTime'],
+ 'Body'=>$Body, //Don't url decode.
+ 'EditedUserID'=>$LoggedUser['ID'],
+ 'EditedTime'=>$SQLTime,
+ 'Username'=>$LoggedUser['Username']
+ ));
+ $Cache->commit_transaction(3600 * 24 * 5);
}
$ThreadInfo = Forums::get_thread_info($TopicID);
if ($ThreadInfo === null) {
- error(404);
+ error(404);
}
if ($ThreadInfo['StickyPostID'] == $PostID) {
- $ThreadInfo['StickyPost']['Body'] = $Body;
- $ThreadInfo['StickyPost']['EditedUserID'] = $LoggedUser['ID'];
- $ThreadInfo['StickyPost']['EditedTime'] = $SQLTime;
- $Cache->cache_value("thread_$TopicID".'_info', $ThreadInfo, 0);
+ $ThreadInfo['StickyPost']['Body'] = $Body;
+ $ThreadInfo['StickyPost']['EditedUserID'] = $LoggedUser['ID'];
+ $ThreadInfo['StickyPost']['EditedTime'] = $SQLTime;
+ $Cache->cache_value("thread_$TopicID".'_info', $ThreadInfo, 0);
}
$DB->query("
- INSERT INTO comments_edits
- (Page, PostID, EditUser, EditTime, Body)
- VALUES
- ('forums', $PostID, $UserID, '$SQLTime', '".db_string($OldBody)."')");
+ INSERT INTO comments_edits
+ (Page, PostID, EditUser, EditTime, Body)
+ VALUES
+ ('forums', $PostID, $UserID, '$SQLTime', '".db_string($OldBody)."')");
$Cache->delete_value("forums_edits_$PostID");
// This gets sent to the browser, which echoes it in place of the old body
echo Text::full_format($Body);
diff --git a/sections/forums/thread.php b/sections/forums/thread.php
index cdd442db0..57832908e 100644
--- a/sections/forums/thread.php
+++ b/sections/forums/thread.php
@@ -3,9 +3,9 @@
/**********|| Page to show individual threads || ********************************\
Things to expect in $_GET:
- ThreadID: ID of the forum curently being browsed
- page: The page the user's on.
- page = 1 is the same as no page
+ ThreadID: ID of the forum curently being browsed
+ page: The page the user's on.
+ page = 1 is the same as no page
********************************************************************************/
@@ -16,31 +16,31 @@
// Check for lame SQL injection attempts
if (!isset($_GET['threadid']) || !is_number($_GET['threadid'])) {
- if (isset($_GET['topicid']) && is_number($_GET['topicid'])) {
- $ThreadID = $_GET['topicid'];
- } elseif (isset($_GET['postid']) && is_number($_GET['postid'])) {
- $DB->query("
- SELECT TopicID
- FROM forums_posts
- WHERE ID = $_GET[postid]");
- list($ThreadID) = $DB->next_record();
- if ($ThreadID) {
- header("Location: forums.php?action=viewthread&threadid=$ThreadID&postid=$_GET[postid]#post$_GET[postid]");
- die();
- } else {
- error(404);
- }
- } else {
- error(404);
- }
+ if (isset($_GET['topicid']) && is_number($_GET['topicid'])) {
+ $ThreadID = $_GET['topicid'];
+ } elseif (isset($_GET['postid']) && is_number($_GET['postid'])) {
+ $DB->query("
+ SELECT TopicID
+ FROM forums_posts
+ WHERE ID = $_GET[postid]");
+ list($ThreadID) = $DB->next_record();
+ if ($ThreadID) {
+ header("Location: forums.php?action=viewthread&threadid=$ThreadID&postid=$_GET[postid]#post$_GET[postid]");
+ die();
+ } else {
+ error(404);
+ }
+ } else {
+ error(404);
+ }
} else {
- $ThreadID = $_GET['threadid'];
+ $ThreadID = $_GET['threadid'];
}
if (isset($LoggedUser['PostsPerPage'])) {
- $PerPage = $LoggedUser['PostsPerPage'];
+ $PerPage = $LoggedUser['PostsPerPage'];
} else {
- $PerPage = POSTS_PER_PAGE;
+ $PerPage = POSTS_PER_PAGE;
}
//---------- Get some data to start processing
@@ -48,7 +48,7 @@
// Thread information, constant across all pages
$ThreadInfo = Forums::get_thread_info($ThreadID, true, true);
if ($ThreadInfo === null) {
- error(404);
+ error(404);
}
$ForumID = $ThreadInfo['ForumID'];
@@ -56,7 +56,7 @@
// Make sure they're allowed to look at the page
if (!Forums::check_forumperm($ForumID)) {
- error(403);
+ error(403);
}
//Escape strings for later display
$ThreadTitle = display_str($ThreadInfo['Title']);
@@ -64,51 +64,51 @@
//Post links utilize the catalogue & key params to prevent issues with custom posts per page
if ($ThreadInfo['Posts'] > $PerPage) {
- if (isset($_GET['post']) && is_number($_GET['post'])) {
- $PostNum = $_GET['post'];
- } elseif (isset($_GET['postid']) && is_number($_GET['postid']) && $_GET['postid'] != $ThreadInfo['StickyPostID']) {
- $SQL = "
- SELECT COUNT(ID)
- FROM forums_posts
- WHERE TopicID = $ThreadID
- AND ID <= $_GET[postid]";
- if ($ThreadInfo['StickyPostID'] < $_GET['postid']) {
- $SQL .= " AND ID != $ThreadInfo[StickyPostID]";
- }
- $DB->query($SQL);
- list($PostNum) = $DB->next_record();
- } else {
- $PostNum = 1;
- }
+ if (isset($_GET['post']) && is_number($_GET['post'])) {
+ $PostNum = $_GET['post'];
+ } elseif (isset($_GET['postid']) && is_number($_GET['postid']) && $_GET['postid'] != $ThreadInfo['StickyPostID']) {
+ $SQL = "
+ SELECT COUNT(ID)
+ FROM forums_posts
+ WHERE TopicID = $ThreadID
+ AND ID <= $_GET[postid]";
+ if ($ThreadInfo['StickyPostID'] < $_GET['postid']) {
+ $SQL .= " AND ID != $ThreadInfo[StickyPostID]";
+ }
+ $DB->query($SQL);
+ list($PostNum) = $DB->next_record();
+ } else {
+ $PostNum = 1;
+ }
} else {
- $PostNum = 1;
+ $PostNum = 1;
}
list($Page, $Limit) = Format::page_limit($PerPage, min($ThreadInfo['Posts'],$PostNum));
if (($Page - 1) * $PerPage > $ThreadInfo['Posts']) {
- $Page = ceil($ThreadInfo['Posts'] / $PerPage);
+ $Page = ceil($ThreadInfo['Posts'] / $PerPage);
}
list($CatalogueID,$CatalogueLimit) = Format::catalogue_limit($Page, $PerPage, THREAD_CATALOGUE);
// Cache catalogue from which the page is selected, allows block caches and future ability to specify posts per page
if (!$Catalogue = $Cache->get_value("thread_{$ThreadID}_catalogue_$CatalogueID")) {
- $DB->query("
- SELECT
- p.ID,
- p.AuthorID,
- p.AddedTime,
- p.Body,
- p.EditedUserID,
- p.EditedTime,
- ed.Username
- FROM forums_posts AS p
- LEFT JOIN users_main AS ed ON ed.ID = p.EditedUserID
- WHERE p.TopicID = '$ThreadID'
- AND p.ID != '".$ThreadInfo['StickyPostID']."'
- LIMIT $CatalogueLimit");
- $Catalogue = $DB->to_array(false, MYSQLI_ASSOC);
- if (!$ThreadInfo['IsLocked'] || $ThreadInfo['IsSticky']) {
- $Cache->cache_value("thread_{$ThreadID}_catalogue_$CatalogueID", $Catalogue, 0);
- }
+ $DB->query("
+ SELECT
+ p.ID,
+ p.AuthorID,
+ p.AddedTime,
+ p.Body,
+ p.EditedUserID,
+ p.EditedTime,
+ ed.Username
+ FROM forums_posts AS p
+ LEFT JOIN users_main AS ed ON ed.ID = p.EditedUserID
+ WHERE p.TopicID = '$ThreadID'
+ AND p.ID != '".$ThreadInfo['StickyPostID']."'
+ LIMIT $CatalogueLimit");
+ $Catalogue = $DB->to_array(false, MYSQLI_ASSOC);
+ if (!$ThreadInfo['IsLocked'] || $ThreadInfo['IsSticky']) {
+ $Cache->cache_value("thread_{$ThreadID}_catalogue_$CatalogueID", $Catalogue, 0);
+ }
}
$Thread = Format::catalogue_select($Catalogue, $Page, $PerPage, THREAD_CATALOGUE);
$LastPost = end($Thread);
@@ -116,554 +116,598 @@
$FirstPost = reset($Thread);
$FirstPost = $FirstPost['ID'];
if ($ThreadInfo['Posts'] <= $PerPage*$Page && $ThreadInfo['StickyPostID'] > $LastPost) {
- $LastPost = $ThreadInfo['StickyPostID'];
+ $LastPost = $ThreadInfo['StickyPostID'];
}
//Handle last read
if (!$ThreadInfo['IsLocked'] || $ThreadInfo['IsSticky']) {
- $DB->query("
- SELECT PostID
- FROM forums_last_read_topics
- WHERE UserID = '$LoggedUser[ID]'
- AND TopicID = '$ThreadID'");
- list($LastRead) = $DB->next_record();
- if ($LastRead < $LastPost) {
- $DB->query("
- INSERT INTO forums_last_read_topics
- (UserID, TopicID, PostID)
- VALUES
- ('$LoggedUser[ID]', '$ThreadID', '".db_string($LastPost)."')
- ON DUPLICATE KEY UPDATE
- PostID = '$LastPost'");
- }
+ $DB->query("
+ SELECT PostID
+ FROM forums_last_read_topics
+ WHERE UserID = '$LoggedUser[ID]'
+ AND TopicID = '$ThreadID'");
+ list($LastRead) = $DB->next_record();
+ if ($LastRead < $LastPost) {
+ $DB->query("
+ INSERT INTO forums_last_read_topics
+ (UserID, TopicID, PostID)
+ VALUES
+ ('$LoggedUser[ID]', '$ThreadID', '".db_string($LastPost)."')
+ ON DUPLICATE KEY UPDATE
+ PostID = '$LastPost'");
+ }
}
//Handle subscriptions
$UserSubscriptions = Subscriptions::get_subscriptions();
if (empty($UserSubscriptions)) {
- $UserSubscriptions = array();
+ $UserSubscriptions = [];
}
if (in_array($ThreadID, $UserSubscriptions)) {
- $Cache->delete_value('subscriptions_user_new_'.$LoggedUser['ID']);
+ $Cache->delete_value('subscriptions_user_new_'.$LoggedUser['ID']);
}
$QuoteNotificationsCount = $Cache->get_value('notify_quoted_' . $LoggedUser['ID']);
if ($QuoteNotificationsCount === false || $QuoteNotificationsCount > 0) {
- $DB->query("
- UPDATE users_notify_quoted
- SET UnRead = false
- WHERE UserID = '$LoggedUser[ID]'
- AND Page = 'forums'
- AND PageID = '$ThreadID'
- AND PostID >= '$FirstPost'
- AND PostID <= '$LastPost'");
- $Cache->delete_value('notify_quoted_' . $LoggedUser['ID']);
+ $DB->query("
+ UPDATE users_notify_quoted
+ SET UnRead = false
+ WHERE UserID = '$LoggedUser[ID]'
+ AND Page = 'forums'
+ AND PageID = '$ThreadID'
+ AND PostID >= '$FirstPost'
+ AND PostID <= '$LastPost'");
+ $Cache->delete_value('notify_quoted_' . $LoggedUser['ID']);
}
// Start printing
View::show_header($ThreadInfo['Title'] . ' < '.$Forums[$ForumID]['Name'].' < Forums','comments,subscriptions,bbcode', $IsDonorForum ? 'donor' : '');
?>
-
-
+ Forums > Search
-
+= '$ThreadAfterDate'";
- }
- if (!empty($ThreadBeforeDate)) {
- $SQL .= " AND t.CreatedTime <= '$ThreadBeforeDate'";
- }
- if (!empty($PostAfterDate)) {
- $SQL .= " AND p.AddedTime >= '$PostAfterDate'";
- }
- if (!empty($PostBeforeDate)) {
- $SQL .= " AND p.AddedTime <= '$PostBeforeDate'";
- }
+ if (isset($SearchForums)) {
+ $SQL .= " AND f.ID IN ($SearchForums)";
+ }
+ if (isset($AuthorID)) {
+ $SQL .= " AND p.AuthorID = '$AuthorID' ";
+ }
+ if (!empty($ThreadID)) {
+ $SQL .= " AND t.ID = '$ThreadID' ";
+ }
+ if (!empty($ThreadAfterDate)) {
+ $SQL .= " AND t.CreatedTime >= '$ThreadAfterDate'";
+ }
+ if (!empty($ThreadBeforeDate)) {
+ $SQL .= " AND t.CreatedTime <= '$ThreadBeforeDate'";
+ }
+ if (!empty($PostAfterDate)) {
+ $SQL .= " AND p.AddedTime >= '$PostAfterDate'";
+ }
+ if (!empty($PostBeforeDate)) {
+ $SQL .= " AND p.AddedTime <= '$PostBeforeDate'";
+ }
- $SQL .= "
- ORDER BY p.AddedTime DESC
- LIMIT $Limit";
+ $SQL .= "
+ ORDER BY p.AddedTime DESC
+ LIMIT $Limit";
} else {
- $SQL = "
- SELECT
- SQL_CALC_FOUND_ROWS
- t.ID,
- t.Title,
- t.ForumID,
- f.Name,
- t.LastPostTime,
- '',
- '',
- t.CreatedTime
- FROM forums_topics AS t
- JOIN forums AS f ON f.ID = t.ForumID
- WHERE " . Forums::user_forums_sql() . ' AND ';
- $SQL .= "t.Title LIKE '%";
- $SQL .= implode("%' AND t.Title LIKE '%", $Words);
- $SQL .= "%' ";
- if (isset($SearchForums)) {
- $SQL .= " AND f.ID IN ($SearchForums)";
- }
- if (isset($AuthorID)) {
- $SQL .= " AND t.AuthorID = '$AuthorID' ";
- }
- if (!empty($ThreadAfterDate)) {
- $SQL .= " AND t.CreatedTime >= '$ThreadAfterDate'";
- }
- if (!empty($ThreadBeforeDate)) {
- $SQL .= " AND t.CreatedTime <= '$ThreadBeforeDate'";
- }
- $SQL .= "
- ORDER BY t.LastPostTime DESC
- LIMIT $Limit";
+ $SQL = "
+ SELECT
+ SQL_CALC_FOUND_ROWS
+ t.ID,
+ t.Title,
+ t.ForumID,
+ f.Name,
+ t.LastPostTime,
+ '',
+ '',
+ t.CreatedTime
+ FROM forums_topics AS t
+ JOIN forums AS f ON f.ID = t.ForumID
+ WHERE " . Forums::user_forums_sql() . ' AND ';
+ $SQL .= "t.Title LIKE '%";
+ $SQL .= implode("%' AND t.Title LIKE '%", $Words);
+ $SQL .= "%' ";
+ if (isset($SearchForums)) {
+ $SQL .= " AND f.ID IN ($SearchForums)";
+ }
+ if (isset($AuthorID)) {
+ $SQL .= " AND t.AuthorID = '$AuthorID' ";
+ }
+ if (!empty($ThreadAfterDate)) {
+ $SQL .= " AND t.CreatedTime >= '$ThreadAfterDate'";
+ }
+ if (!empty($ThreadBeforeDate)) {
+ $SQL .= " AND t.CreatedTime <= '$ThreadBeforeDate'";
+ }
+ $SQL .= "
+ ORDER BY t.LastPostTime DESC
+ LIMIT $Limit";
}
// Perform the query
@@ -307,56 +307,56 @@
$Pages = Format::get_pages($Page, $Results, POSTS_PER_PAGE, 9);
echo $Pages;
?>
-
- | Forum | -- | Topic creation time | -Last post time | -
| Nothing found! | |||
| Forum | ++ | Topic creation time | +Last post time | +
| Nothing found! | |||
| - - | -- - - - - - (Show) "> - - | -- - | -- - | -+ + | ++ + + + + + (Show) "> + + | ++ + | ++ + | + + + + -
-
-
+
+
+
-
-
-
+
+
+query("
- SELECT ID, AuthorID, AddedTime, Body
- FROM forums_topic_notes
- WHERE TopicID = $ThreadID
- ORDER BY ID ASC");
- $Notes = G::$DB->to_array();
+ G::$DB->query("
+ SELECT ID, AuthorID, AddedTime, Body
+ FROM forums_topic_notes
+ WHERE TopicID = $ThreadID
+ ORDER BY ID ASC");
+ $Notes = G::$DB->to_array();
?>
-
-
-query("
- SELECT p.Body, t.ForumID
- FROM forums_posts AS p
- JOIN forums_topics AS t ON p.TopicID = t.ID
- WHERE p.ID = '$PostID'");
+ SELECT p.Body, t.ForumID
+ FROM forums_posts AS p
+ JOIN forums_topics AS t ON p.TopicID = t.ID
+ WHERE p.ID = '$PostID'");
list($PostBody, $ForumID) = $DB -> next_record();
View::show_header('Warn User');
?>
-
+
diff --git a/sections/friends/add.php b/sections/friends/add.php
index 945384588..d5db530f1 100644
--- a/sections/friends/add.php
+++ b/sections/friends/add.php
@@ -1,23 +1,23 @@
query("
- SELECT 1
- FROM users_main
- WHERE ID = '$FriendID'");
+ SELECT 1
+ FROM users_main
+ WHERE ID = '$FriendID'");
if (!$DB->has_results()) {
- error(404);
+ error(404);
}
$DB->query("
- INSERT IGNORE INTO friends
- (UserID, FriendID)
- VALUES
- ('$LoggedUser[ID]', '$FriendID')");
+ INSERT IGNORE INTO friends
+ (UserID, FriendID)
+ VALUES
+ ('$LoggedUser[ID]', '$FriendID')");
header('Location: friends.php');
diff --git a/sections/friends/comment.php b/sections/friends/comment.php
index 94a5186e3..7f031ed62 100644
--- a/sections/friends/comment.php
+++ b/sections/friends/comment.php
@@ -1,9 +1,9 @@
-query("
- UPDATE friends
- SET Comment='$P[comment]'
- WHERE UserID='$LoggedUser[ID]'
- AND FriendID='$P[friendid]'");
+ UPDATE friends
+ SET Comment='$P[comment]'
+ WHERE UserID='$LoggedUser[ID]'
+ AND FriendID='$P[friendid]'");
header('Location: friends.php');
?>
diff --git a/sections/friends/friends.php b/sections/friends/friends.php
index 6694954c7..309564101 100644
--- a/sections/friends/friends.php
+++ b/sections/friends/friends.php
@@ -18,35 +18,32 @@
$UserID = $LoggedUser['ID'];
-
-$Select = "f.FriendID";
-$Where = "f.UserID = '$UserID'";
-$Join1 = "f.FriendID = m.ID";
-$Join2 = "f.FriendID = i.UserID";
-
-
+$Where = "";
list($Page, $Limit) = Format::page_limit(FRIENDS_PER_PAGE);
// Main query
-$DB->query("
- SELECT
- SQL_CALC_FOUND_ROWS
- $Select,
- f.Comment,
- m.Username,
- m.Uploaded,
- m.Downloaded,
- m.PermissionID,
- m.Paranoia,
- m.LastAccess,
- i.Avatar
- FROM friends AS f
- JOIN users_main AS m ON $Join1
- JOIN users_info AS i ON $Join2
- WHERE $Where
- ORDER BY Username
- LIMIT $Limit");
+$DB->prepared_query('
+ SELECT
+ SQL_CALC_FOUND_ROWS
+ f.FriendID,
+ f.Comment,
+ m.Username,
+ uls.Uploaded,
+ uls.Downloaded,
+ m.PermissionID,
+ m.Paranoia,
+ m.LastAccess,
+ i.Avatar
+ FROM friends AS f
+ INNER JOIN users_main AS m ON (m.ID = f.FriendID)
+ INNER JOIN users_info AS i ON (i.UserID = f.FriendID)
+ INNER JOIN users_leech_stats AS uls ON (uls.UserID = f.FriendID)
+ WHERE f.UserID = ?
+ ORDER BY m.Username
+ LIMIT ?
+ ', $UserID, $Limit
+);
$Friends = $DB->to_array(false, MYSQLI_BOTH, array(6, 'Paranoia'));
// Number of results (for pagination)
@@ -56,80 +53,86 @@
// Start printing stuff
?>
- Forums > - > - -
-
-
-
+ $Post) {
- list($PostID, $AuthorID, $AddedTime, $Body, $EditedUserID, $EditedTime, $EditedUsername) = array_values($Post);
- list($AuthorID, $Username, $PermissionID, $Paranoia, $Artist, $Donor, $Warned, $Avatar, $Enabled, $UserTitle) = array_values(Users::user_info($AuthorID));
+ list($PostID, $AuthorID, $AddedTime, $Body, $EditedUserID, $EditedTime, $EditedUsername) = array_values($Post);
+ list($AuthorID, $Username, $PermissionID, $Paranoia, $Artist, $Donor, $Warned, $Avatar, $Enabled, $UserTitle) = array_values(Users::user_info($AuthorID));
?>
-
-
-
+ Forums >
+ >
+
+
+
-
-
- Search this thread:
- --
+
+
-
+get_value("polls_$ThreadID")) {
- $DB->query("
- SELECT Question, Answers, Featured, Closed
- FROM forums_polls
- WHERE TopicID = '$ThreadID'");
- list($Question, $Answers, $Featured, $Closed) = $DB->next_record(MYSQLI_NUM, array(1));
- $Answers = unserialize($Answers);
- $DB->query("
- SELECT Vote, COUNT(UserID)
- FROM forums_polls_votes
- WHERE TopicID = '$ThreadID'
- GROUP BY Vote");
- $VoteArray = $DB->to_array(false, MYSQLI_NUM);
-
- $Votes = array();
- foreach ($VoteArray as $VoteSet) {
- list($Key,$Value) = $VoteSet;
- $Votes[$Key] = $Value;
- }
-
- foreach (array_keys($Answers) as $i) {
- if (!isset($Votes[$i])) {
- $Votes[$i] = 0;
- }
- }
- $Cache->cache_value("polls_$ThreadID", array($Question, $Answers, $Votes, $Featured, $Closed), 0);
- }
-
- if (!empty($Votes)) {
- $TotalVotes = array_sum($Votes);
- $MaxVotes = max($Votes);
- } else {
- $TotalVotes = 0;
- $MaxVotes = 0;
- }
-
- $RevealVoters = in_array($ForumID, $ForumsRevealVoters);
- //Polls lose the you voted arrow thingy
- $DB->query("
- SELECT Vote
- FROM forums_polls_votes
- WHERE UserID = '".$LoggedUser['ID']."'
- AND TopicID = '$ThreadID'");
- list($UserResponse) = $DB->next_record();
- if (!empty($UserResponse) && $UserResponse != 0) {
- $Answers[$UserResponse] = '» '.$Answers[$UserResponse];
- } else {
- if (!empty($UserResponse) && $RevealVoters) {
- $Answers[$UserResponse] = '» '.$Answers[$UserResponse];
- }
- }
+ if (!list($Question, $Answers, $Votes, $Featured, $Closed) = $Cache->get_value("polls_$ThreadID")) {
+ $DB->query("
+ SELECT Question, Answers, Featured, Closed
+ FROM forums_polls
+ WHERE TopicID = '$ThreadID'");
+ list($Question, $Answers, $Featured, $Closed) = $DB->next_record(MYSQLI_NUM, array(1));
+ $Answers = unserialize($Answers);
+ $DB->query("
+ SELECT Vote, COUNT(UserID)
+ FROM forums_polls_votes
+ WHERE TopicID = '$ThreadID'
+ GROUP BY Vote");
+ $VoteArray = $DB->to_array(false, MYSQLI_NUM);
+
+ $Votes = [];
+ foreach ($VoteArray as $VoteSet) {
+ list($Key,$Value) = $VoteSet;
+ $Votes[$Key] = $Value;
+ }
+
+ foreach (array_keys($Answers) as $i) {
+ if (!isset($Votes[$i])) {
+ $Votes[$i] = 0;
+ }
+ }
+ $Cache->cache_value("polls_$ThreadID", array($Question, $Answers, $Votes, $Featured, $Closed), 0);
+ }
+
+ if (!empty($Votes)) {
+ $TotalVotes = array_sum($Votes);
+ $MaxVotes = max($Votes);
+ } else {
+ $TotalVotes = 0;
+ $MaxVotes = 0;
+ }
+
+ $RevealVoters = in_array($ForumID, $ForumsRevealVoters);
+ //Polls lose the you voted arrow thingy
+ $DB->query("
+ SELECT Vote
+ FROM forums_polls_votes
+ WHERE UserID = '".$LoggedUser['ID']."'
+ AND TopicID = '$ThreadID'");
+ list($UserResponse) = $DB->next_record();
+ if (!empty($UserResponse) && $UserResponse != 0) {
+ $Answers[$UserResponse] = '» '.$Answers[$UserResponse];
+ } else {
+ if (!empty($UserResponse) && $RevealVoters) {
+ $Answers[$UserResponse] = '» '.$Answers[$UserResponse];
+ }
+ }
?>
-
+
+
-
+
+
+ Search this thread:
+ ++
-
+ Poll View
-
-
+
+
+
+
+
+
+
+
+
+ |
- #
-
-
- - Quote
-
- - Edit
- 1) { ?>
- - Delete
-
- Sticky
-
- - X
- $LastRead
+ && strtotime($AddedTime) > $LoggedUser['CatchupTime']
+ ) || (isset($RequestKey) && $Key == $RequestKey)
+ ) {
+ echo ' forum_unread';
+ }
+ if (!Users::has_avatars_enabled()) {
+ echo ' noavatar';
+ }
+ if ($ThreadInfo['OP'] == $AuthorID) {
+ echo ' important_user';
+ }
+ if ($PostID == $ThreadInfo['StickyPostID']) {
+ echo ' sticky_post';
+ } ?>" id="post">
+
+
+ |
- #
+
+
+ - Quote
+
+ - Edit
+ 1) { ?>
+ - Delete
+
+ Sticky
+
+ - X
+
- - ⇕
-&postid=&auth=" title="Sticky this post" class="brackets tooltip">⇕
+
-
-
- Report
-= $AuthorInfo['Class']) {
+
+
-
-
- |
-
- >
-
+ |
+
+
+ |
+
+ >
+
- |
- |
+ ||
-
+
- 'Post reply',
- 'InputName' => 'thread',
- 'InputID' => $ThreadID,
- 'ForumID' => $ForumID,
- 'TextareaCols' => 90
- ));
- }
+ if (Forums::check_forumperm($ForumID, 'Write') && !$LoggedUser['DisablePosting']) {
+ View::parse('generic/reply/quickreply.php', array(
+ 'InputTitle' => 'Post reply',
+ 'InputName' => 'thread',
+ 'InputID' => $ThreadID,
+ 'ForumID' => $ForumID,
+ 'TextareaCols' => 90
+ ));
+ }
+}
+$transitions = Forums::get_thread_transitions($ForumID);
+if (count($transitions) > 0 && !check_perms('site_moderate_forums')) {
+?>
+ Edit thread
+| + + + + | +
-
Thread notes
Toggle - + + +
-
-
diff --git a/sections/friends/index.php b/sections/friends/index.php
index 81662be71..c1fbcf973 100644
--- a/sections/friends/index.php
+++ b/sections/friends/index.php
@@ -1,31 +1,31 @@
-
diff --git a/sections/friends/remove.php b/sections/friends/remove.php
index 9bd8f0194..6c221fe43 100644
--- a/sections/friends/remove.php
+++ b/sections/friends/remove.php
@@ -1,8 +1,8 @@
-query("
- DELETE FROM friends
- WHERE UserID='$LoggedUser[ID]'
- AND FriendID='$P[friendid]'");
+ DELETE FROM friends
+ WHERE UserID='$LoggedUser[ID]'
+ AND FriendID='$P[friendid]'");
header('Location: friends.php');
?>
diff --git a/sections/image/index.php b/sections/image/index.php
index f25e9887d..89753aeb9 100644
--- a/sections/image/index.php
+++ b/sections/image/index.php
@@ -1,146 +1,146 @@
-get_value('image_cache_'.md5($URL));
- $Cached = true;
+ list($Data, $FileType) = $Cache->get_value('image_cache_'.md5($URL));
+ $Cached = true;
}
if (!isset($Data) || !$Data) {
- $Cached = false;
- $ch = curl_init();
- curl_setopt($ch, CURLOPT_URL, $URL);
- curl_setopt($ch, CURLOPT_HEADER, false);
- curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
- curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
- curl_setopt($ch, CURLOPT_TIMEOUT, 15);
- curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.1 Safari/537.11');
- $Data = curl_exec($ch);
- $rescode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
- curl_close($ch);
-
- if (!$Data || empty($Data)) {
- img_error('timeout');
- }
- $FileType = image_type($Data);
- if ($FileType && function_exists("imagecreatefrom$FileType")) {
- $Image = imagecreatefromstring($Data);
- if (invisible($Image)) {
- img_error('invisible');
- }
- if (verysmall($Image)) {
- img_error('small');
- }
- }
-
- if (isset($_GET['c']) && strlen($Data) < 262144) {
- $Cache->cache_value('image_cache_'.md5($URL), array($Data, $FileType), 3600 * 24 * 7);
- }
+ $Cached = false;
+ $ch = curl_init();
+ curl_setopt($ch, CURLOPT_URL, $URL);
+ curl_setopt($ch, CURLOPT_HEADER, false);
+ curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+ curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+ curl_setopt($ch, CURLOPT_TIMEOUT, 15);
+ curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.1 Safari/537.11');
+ $Data = curl_exec($ch);
+ $rescode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+ curl_close($ch);
+
+ if (!$Data || empty($Data)) {
+ img_error('timeout');
+ }
+ $FileType = image_type($Data);
+ if ($FileType && function_exists("imagecreatefrom$FileType")) {
+ $Image = imagecreatefromstring($Data);
+ if (invisible($Image)) {
+ img_error('invisible');
+ }
+ if (verysmall($Image)) {
+ img_error('small');
+ }
+ }
+
+ if (isset($_GET['c']) && strlen($Data) < 262144) {
+ $Cache->cache_value('image_cache_'.md5($URL), array($Data, $FileType), 3600 * 24 * 7);
+ }
}
// Reset avatar, add mod note
function reset_image($UserID, $Type, $AdminComment, $PrivMessage) {
- if ($Type === 'avatar') {
- $CacheKey = "user_info_$UserID";
- $DBTable = 'users_info';
- $DBColumn = 'Avatar';
- $PMSubject = 'Your avatar has been automatically reset';
- } elseif ($Type === 'avatar2') {
- $CacheKey = "donor_info_$UserID";
- $DBTable = 'donor_rewards';
- $DBColumn = 'SecondAvatar';
- $PMSubject = 'Your second avatar has been automatically reset';
- } elseif ($Type === 'donoricon') {
- $CacheKey = "donor_info_$UserID";
- $DBTable = 'donor_rewards';
- $DBColumn = 'CustomIcon';
- $PMSubject = 'Your donor icon has been automatically reset';
- }
-
- $UserInfo = G::$Cache->get_value($CacheKey, true);
- if ($UserInfo !== false) {
- if ($UserInfo[$DBColumn] === '') {
- // This image has already been reset
- return;
- }
- $UserInfo[$DBColumn] = '';
- G::$Cache->cache_value($CacheKey, $UserInfo, 2592000); // cache for 30 days
- }
-
- // reset the avatar or donor icon URL
- G::$DB->query("
- UPDATE $DBTable
- SET $DBColumn = ''
- WHERE UserID = '$UserID'");
-
- // write comment to staff notes
- G::$DB->query("
- UPDATE users_info
- SET AdminComment = CONCAT('".sqltime().' - '.db_string($AdminComment)."\n\n', AdminComment)
- WHERE UserID = '$UserID'");
-
- // clear cache keys
- G::$Cache->delete_value($CacheKey);
-
- Misc::send_pm($UserID, 0, $PMSubject, $PrivMessage);
+ if ($Type === 'avatar') {
+ $CacheKey = "user_info_$UserID";
+ $DBTable = 'users_info';
+ $DBColumn = 'Avatar';
+ $PMSubject = 'Your avatar has been automatically reset';
+ } elseif ($Type === 'avatar2') {
+ $CacheKey = "donor_info_$UserID";
+ $DBTable = 'donor_rewards';
+ $DBColumn = 'SecondAvatar';
+ $PMSubject = 'Your second avatar has been automatically reset';
+ } elseif ($Type === 'donoricon') {
+ $CacheKey = "donor_info_$UserID";
+ $DBTable = 'donor_rewards';
+ $DBColumn = 'CustomIcon';
+ $PMSubject = 'Your donor icon has been automatically reset';
+ }
+
+ $UserInfo = G::$Cache->get_value($CacheKey, true);
+ if ($UserInfo !== false) {
+ if ($UserInfo[$DBColumn] === '') {
+ // This image has already been reset
+ return;
+ }
+ $UserInfo[$DBColumn] = '';
+ G::$Cache->cache_value($CacheKey, $UserInfo, 2592000); // cache for 30 days
+ }
+
+ // reset the avatar or donor icon URL
+ G::$DB->query("
+ UPDATE $DBTable
+ SET $DBColumn = ''
+ WHERE UserID = '$UserID'");
+
+ // write comment to staff notes
+ G::$DB->query("
+ UPDATE users_info
+ SET AdminComment = CONCAT('".sqltime().' - '.db_string($AdminComment)."\n\n', AdminComment)
+ WHERE UserID = '$UserID'");
+
+ // clear cache keys
+ G::$Cache->delete_value($CacheKey);
+
+ Misc::send_pm($UserID, 0, $PMSubject, $PrivMessage);
}
// Enforce avatar rules
if (isset($_GET['type']) && isset($_GET['userid'])) {
- $ValidTypes = array('avatar', 'avatar2', 'donoricon');
- if (!is_number($_GET['userid']) || !in_array($_GET['type'], $ValidTypes)) {
- die();
- }
- $UserID = $_GET['userid'];
- $Type = $_GET['type'];
-
- if ($Type === 'avatar' || $Type === 'avatar2') {
- $MaxFileSize = 256 * 1024; // 256 kB
- $MaxImageHeight = 400; // pixels
- $TypeName = $Type === 'avatar' ? 'avatar' : 'second avatar';
- } elseif ($Type === 'donoricon') {
- $MaxFileSize = 64 * 1024; // 64 kB
- $MaxImageHeight = 100; // pixels
- $TypeName = 'donor icon';
- }
-
- $Height = image_height($FileType, $Data);
- if (strlen($Data) > $MaxFileSize || $Height > $MaxImageHeight) {
- // Sometimes the cached image we have isn't the actual image
- if ($Cached) {
- $Data2 = @file_get_contents($URL, 0, stream_context_create(array('http' => array('timeout' => 15))));
- } else {
- $Data2 = $Data;
- }
-
- if (strlen($Data2) > $MaxFileSize || image_height($FileType, $Data2) > $MaxImageHeight) {
- require_once(SERVER_ROOT.'/classes/mysql.class.php');
- require_once(SERVER_ROOT.'/classes/time.class.php');
- $DBURL = db_string($URL);
- $AdminComment = ucfirst($TypeName)." reset automatically (Size: ".number_format((strlen($Data)) / 1024)." kB, Height: ".$Height."px). Used to be $DBURL";
- $PrivMessage = SITE_NAME." has the following requirements for {$TypeName}s:\n\n".
- "[b]".ucfirst($TypeName)."s must not exceed ".($MaxFileSize / 1024)." kB or be vertically longer than {$MaxImageHeight}px.[/b]\n\n".
- "Your $TypeName at $DBURL has been found to exceed these rules. As such, it has been automatically reset. You are welcome to reinstate your $TypeName once it has been resized down to an acceptable size.";
- reset_image($UserID, $Type, $AdminComment, $PrivMessage);
- }
- }
+ $ValidTypes = array('avatar', 'avatar2', 'donoricon');
+ if (!is_number($_GET['userid']) || !in_array($_GET['type'], $ValidTypes)) {
+ die();
+ }
+ $UserID = $_GET['userid'];
+ $Type = $_GET['type'];
+
+ if ($Type === 'avatar' || $Type === 'avatar2') {
+ $MaxFileSize = 256 * 1024; // 256 kB
+ $MaxImageHeight = 400; // pixels
+ $TypeName = $Type === 'avatar' ? 'avatar' : 'second avatar';
+ } elseif ($Type === 'donoricon') {
+ $MaxFileSize = 64 * 1024; // 64 kB
+ $MaxImageHeight = 100; // pixels
+ $TypeName = 'donor icon';
+ }
+
+ $Height = image_height($FileType, $Data);
+ if (strlen($Data) > $MaxFileSize || $Height > $MaxImageHeight) {
+ // Sometimes the cached image we have isn't the actual image
+ if ($Cached) {
+ $Data2 = @file_get_contents($URL, 0, stream_context_create(array('http' => array('timeout' => 15))));
+ } else {
+ $Data2 = $Data;
+ }
+
+ if (strlen($Data2) > $MaxFileSize || image_height($FileType, $Data2) > $MaxImageHeight) {
+ require_once(SERVER_ROOT.'/classes/mysql.class.php');
+ require_once(SERVER_ROOT.'/classes/time.class.php');
+ $DBURL = db_string($URL);
+ $AdminComment = ucfirst($TypeName)." reset automatically (Size: ".number_format((strlen($Data)) / 1024)." kB, Height: ".$Height."px). Used to be $DBURL";
+ $PrivMessage = SITE_NAME." has the following requirements for {$TypeName}s:\n\n".
+ "[b]".ucfirst($TypeName)."s must not exceed ".($MaxFileSize / 1024)." kB or be vertically longer than {$MaxImageHeight}px.[/b]\n\n".
+ "Your $TypeName at $DBURL has been found to exceed these rules. As such, it has been automatically reset. You are welcome to reinstate your $TypeName once it has been resized down to an acceptable size.";
+ reset_image($UserID, $Type, $AdminComment, $PrivMessage);
+ }
+ }
}
if (!isset($FileType)) {
- img_error('timeout');
+ img_error('timeout');
}
header("Content-type: image/$FileType");
diff --git a/sections/inbox/compose.php b/sections/inbox/compose.php
index fb4a6af33..6a4d976bf 100644
--- a/sections/inbox/compose.php
+++ b/sections/inbox/compose.php
@@ -1,54 +1,54 @@
-query("
- SELECT Username
- FROM users_main
- WHERE ID='$ToID'");
+ SELECT Username
+ FROM users_main
+ WHERE ID='$ToID'");
list($Username) = $DB->next_record();
if (!$Username) {
- error(404);
+ error(404);
}
View::show_header('Compose', 'inbox,bbcode,jquery.validate,form_validate');
?>
-
diff --git a/sections/inbox/conversation.php b/sections/inbox/conversation.php
index e8de315fb..043a1f2c5 100644
--- a/sections/inbox/conversation.php
+++ b/sections/inbox/conversation.php
@@ -1,18 +1,18 @@
-query("
- SELECT InInbox, InSentbox
- FROM pm_conversations_users
- WHERE UserID = '$UserID'
- AND ConvID = '$ConvID'");
+ SELECT InInbox, InSentbox
+ FROM pm_conversations_users
+ WHERE UserID = '$UserID'
+ AND ConvID = '$ConvID'");
if (!$DB->has_results()) {
- error(403);
+ error(403);
}
list($InInbox, $InSentbox) = $DB->next_record();
@@ -20,35 +20,35 @@
if (!$InInbox && !$InSentbox) {
- error(404);
+ error(404);
}
// Get information on the conversation
$DB->query("
- SELECT
- c.Subject,
- cu.Sticky,
- cu.UnRead,
- cu.ForwardedTo
- FROM pm_conversations AS c
- JOIN pm_conversations_users AS cu ON c.ID = cu.ConvID
- WHERE c.ID = '$ConvID'
- AND UserID = '$UserID'");
+ SELECT
+ c.Subject,
+ cu.Sticky,
+ cu.UnRead,
+ cu.ForwardedTo
+ FROM pm_conversations AS c
+ JOIN pm_conversations_users AS cu ON c.ID = cu.ConvID
+ WHERE c.ID = '$ConvID'
+ AND UserID = '$UserID'");
list($Subject, $Sticky, $UnRead, $ForwardedID) = $DB->next_record();
$DB->query("
- SELECT um.ID, Username
- FROM pm_messages AS pm
- JOIN users_main AS um ON um.ID = pm.SenderID
- WHERE pm.ConvID = '$ConvID'");
+ SELECT um.ID, Username
+ FROM pm_messages AS pm
+ JOIN users_main AS um ON um.ID = pm.SenderID
+ WHERE pm.ConvID = '$ConvID'");
$ConverstionParticipants = $DB->to_array();
foreach ($ConverstionParticipants as $Participant) {
- $PMUserID = (int)$Participant['ID'];
- $Users[$PMUserID]['UserStr'] = Users::format_username($PMUserID, true, true, true, true);
- $Users[$PMUserID]['Username'] = $Participant['Username'];
+ $PMUserID = (int)$Participant['ID'];
+ $Users[$PMUserID]['UserStr'] = Users::format_username($PMUserID, true, true, true, true);
+ $Users[$PMUserID]['Username'] = $Participant['Username'];
}
$Users[0]['UserStr'] = 'System'; // in case it's a message from the system
@@ -57,142 +57,144 @@
if ($UnRead == '1') {
- $DB->query("
- UPDATE pm_conversations_users
- SET UnRead = '0'
- WHERE ConvID = '$ConvID'
- AND UserID = '$UserID'");
- // Clear the caches of the inbox and sentbox
- $Cache->decrement("inbox_new_$UserID");
+ $DB->query("
+ UPDATE pm_conversations_users
+ SET UnRead = '0'
+ WHERE ConvID = '$ConvID'
+ AND UserID = '$UserID'");
+ // Clear the caches of the inbox and sentbox
+ $Cache->decrement("inbox_new_$UserID");
}
View::show_header("View conversation $Subject", 'comments,inbox,bbcode,jquery.validate,form_validate');
// Get messages
$DB->query("
- SELECT SentDate, SenderID, Body, ID
- FROM pm_messages
- WHERE ConvID = '$ConvID'
- ORDER BY ID");
+ SELECT SentDate, SenderID, Body, ID
+ FROM pm_messages
+ WHERE ConvID = '$ConvID'
+ ORDER BY ID");
?>
-
- Friends List
-
-
+
+ Friends List
+
+
-
-
-
+
+
+You have no friends! :(';
+ echo '
- You have no friends! :(
'; } // Start printing out friends foreach ($Friends as $Friend) { - list($FriendID, $Comment, $Username, $Uploaded, $Downloaded, $Class, $Paranoia, $LastAccess, $Avatar) = $Friend; + list($FriendID, $Comment, $Username, $Uploaded, $Downloaded, $Class, $Paranoia, $LastAccess, $Avatar) = $Friend; ?> - ?> -
-
-
- */ ?>
+
+
+
+ */ ?>
-
+query("
- SELECT UserID
- FROM pm_conversations_users
- WHERE UserID != '$LoggedUser[ID]'
- AND ConvID = '$ConvID'
- AND (ForwardedTo = 0 OR ForwardedTo = UserID)");
+ SELECT UserID
+ FROM pm_conversations_users
+ WHERE UserID != '$LoggedUser[ID]'
+ AND ConvID = '$ConvID'
+ AND (ForwardedTo = 0 OR ForwardedTo = UserID)");
$ReceiverIDs = $DB->collect('UserID');
if (!empty($ReceiverIDs) && (empty($LoggedUser['DisablePM']) || array_intersect($ReceiverIDs, array_keys($StaffIDs)))) {
?>
- 0 ? " (Forwarded to $ForwardedName)" : '')?>
-
- Back to inbox
-
- 0 ? " (Forwarded to $ForwardedName)" : '')?>
+
+ Back to inbox
+
+next_record()) { ?>
-
-
-
-
+
+
-
-
-
+
+
+ Reply
-Manage conversation
- -Manage conversation + +query(" - SELECT SupportFor - FROM users_info - WHERE UserID = ".$LoggedUser['ID']); + SELECT SupportFor + FROM users_info + WHERE UserID = ".$LoggedUser['ID']); list($FLS) = $DB->next_record(); if ((check_perms('users_mod') || $FLS != '') && (!$ForwardedID || $ForwardedID == $LoggedUser['ID'])) { ?> -Forward conversation
- + - diff --git a/sections/inbox/forward.php b/sections/inbox/forward.php index 9e5eec574..739c9c106 100644 --- a/sections/inbox/forward.php +++ b/sections/inbox/forward.php @@ -1,51 +1,51 @@ -query(" - SELECT ConvID - FROM pm_conversations_users - WHERE UserID = '$UserID' - AND InInbox = '1' - AND (ForwardedTo = 0 OR ForwardedTo = UserID) - AND ConvID = '$ConvID'"); + SELECT ConvID + FROM pm_conversations_users + WHERE UserID = '$UserID' + AND InInbox = '1' + AND (ForwardedTo = 0 OR ForwardedTo = UserID) + AND ConvID = '$ConvID'"); if (!$DB->has_results()) { - error(403); + error(403); } $DB->query(" - SELECT ConvID - FROM pm_conversations_users - WHERE UserID = '$ReceiverID' - AND (ForwardedTo = 0 OR ForwardedTo = UserID) - AND InInbox = '1' - AND ConvID = '$ConvID'"); + SELECT ConvID + FROM pm_conversations_users + WHERE UserID = '$ReceiverID' + AND (ForwardedTo = 0 OR ForwardedTo = UserID) + AND InInbox = '1' + AND ConvID = '$ConvID'"); if (!$DB->has_results()) { - $DB->query(" - INSERT IGNORE INTO pm_conversations_users - (UserID, ConvID, InInbox, InSentbox, ReceivedDate) - VALUES ('$ReceiverID', '$ConvID', '1', '0', NOW()) - ON DUPLICATE KEY UPDATE - ForwardedTo = 0, - UnRead = 1"); - $DB->query(" - UPDATE pm_conversations_users - SET ForwardedTo = '$ReceiverID' - WHERE ConvID = '$ConvID' - AND UserID = '$UserID'"); - $Cache->delete_value("inbox_new_$ReceiverID"); - header('Location: ' . Inbox::get_inbox_link()); + $DB->query(" + INSERT IGNORE INTO pm_conversations_users + (UserID, ConvID, InInbox, InSentbox, ReceivedDate) + VALUES ('$ReceiverID', '$ConvID', '1', '0', NOW()) + ON DUPLICATE KEY UPDATE + ForwardedTo = 0, + UnRead = 1"); + $DB->query(" + UPDATE pm_conversations_users + SET ForwardedTo = '$ReceiverID' + WHERE ConvID = '$ConvID' + AND UserID = '$UserID'"); + $Cache->delete_value("inbox_new_$ReceiverID"); + header('Location: ' . Inbox::get_inbox_link()); } else { - error("$StaffIDs[$ReceiverID] already has this conversation in their inbox."); - header("Location: inbox.php?action=viewconv&id=$ConvID"); + error("$StaffIDs[$ReceiverID] already has this conversation in their inbox."); + header("Location: inbox.php?action=viewconv&id=$ConvID"); } //View::show_footer(); ?> diff --git a/sections/inbox/get_post.php b/sections/inbox/get_post.php index 38b6a840e..bff33dd9c 100644 --- a/sections/inbox/get_post.php +++ b/sections/inbox/get_post.php @@ -1,4 +1,4 @@ -query(" - SELECT m.Body - FROM pm_messages AS m - JOIN pm_conversations_users AS u ON m.ConvID = u.ConvID - WHERE m.ID = '$PostID' - AND u.UserID = ".$LoggedUser['ID']); + SELECT m.Body + FROM pm_messages AS m + JOIN pm_conversations_users AS u ON m.ConvID = u.ConvID + WHERE m.ID = '$PostID' + AND u.UserID = ".$LoggedUser['ID']); list($Body) = $DB->next_record(MYSQLI_NUM); // This gets sent to the browser, which echoes it wherever diff --git a/sections/inbox/inbox.php b/sections/inbox/inbox.php index 5a4ef27d5..879cd6244 100644 --- a/sections/inbox/inbox.php +++ b/sections/inbox/inbox.php @@ -6,13 +6,13 @@ if (empty($_GET['action'])) { - $Section = 'inbox'; - $_GET['action'] = 'inbox'; + $Section = 'inbox'; + $_GET['action'] = 'inbox'; } else { - $Section = $_GET['action']; // either 'inbox' or 'sentbox' + $Section = $_GET['action']; // either 'inbox' or 'sentbox' } if (!in_array($Section, array('inbox', 'sentbox'))) { - error(404); + error(404); } list($Page, $Limit) = Format::page_limit(MESSAGES_PER_PAGE); @@ -20,60 +20,60 @@ View::show_header('Inbox'); ?>
-
-
+
\ No newline at end of file
+?>
diff --git a/sections/index/private.php b/sections/index/private.php
index d643a1cc7..203ac236f 100644
--- a/sections/index/private.php
+++ b/sections/index/private.php
@@ -3,561 +3,552 @@
$NewsCount = 5;
if (!$News = $Cache->get_value('news')) {
- $DB->query("
- SELECT
- ID,
- Title,
- Body,
- Time
- FROM news
- ORDER BY Time DESC
- LIMIT $NewsCount");
- $News = $DB->to_array(false, MYSQLI_NUM, false);
- $Cache->cache_value('news', $News, 3600 * 24 * 30);
- if (count($News) > 0) {
- $Cache->cache_value('news_latest_id', $News[0][0], 0);
- $Cache->cache_value('news_latest_title', $News[0][1], 0);
- }
+ $DB->query("
+ SELECT
+ ID,
+ Title,
+ Body,
+ Time
+ FROM news
+ ORDER BY Time DESC
+ LIMIT $NewsCount");
+ $News = $DB->to_array(false, MYSQLI_NUM, false);
+ $Cache->cache_value('news', $News, 3600 * 24 * 30);
+ if (count($News) > 0) {
+ $Cache->cache_value('news_latest_id', $News[0][0], 0);
+ $Cache->cache_value('news_latest_title', $News[0][1], 0);
+ }
}
if (count($News) > 0 && $LoggedUser['LastReadNews'] != $News[0][0]) {
- $Cache->begin_transaction("user_info_heavy_$UserID");
- $Cache->update_row(false, array('LastReadNews' => $News[0][0]));
- $Cache->commit_transaction(0);
- $DB->query("
- UPDATE users_info
- SET LastReadNews = '".$News[0][0]."'
- WHERE UserID = $UserID");
- $LoggedUser['LastReadNews'] = $News[0][0];
+ $Cache->begin_transaction("user_info_heavy_$UserID");
+ $Cache->update_row(false, array('LastReadNews' => $News[0][0]));
+ $Cache->commit_transaction(0);
+ $DB->query("
+ UPDATE users_info
+ SET LastReadNews = '".$News[0][0]."'
+ WHERE UserID = $UserID");
+ $LoggedUser['LastReadNews'] = $News[0][0];
}
View::show_header('News', 'bbcode,news_ajax');
?>
-
+
-
diff --git a/sections/inbox/index.php b/sections/inbox/index.php
index 4cde17209..eab9ace98 100644
--- a/sections/inbox/index.php
+++ b/sections/inbox/index.php
@@ -1,45 +1,45 @@
-get_value('staff_ids');
if (!is_array($StaffIDs)) {
- $DB->query("
- SELECT m.ID, m.Username
- FROM users_main AS m
- JOIN permissions AS p ON p.ID=m.PermissionID
- WHERE p.DisplayStaff='1'");
- while (list($StaffID, $StaffName) = $DB->next_record()) {
- $StaffIDs[$StaffID] = $StaffName;
- }
- uasort($StaffIDs, 'strcasecmp');
- $Cache->cache_value('staff_ids', $StaffIDs);
+ $DB->query("
+ SELECT m.ID, m.Username
+ FROM users_main AS m
+ JOIN permissions AS p ON p.ID=m.PermissionID
+ WHERE p.DisplayStaff='1'");
+ while (list($StaffID, $StaffName) = $DB->next_record()) {
+ $StaffIDs[$StaffID] = $StaffName;
+ }
+ uasort($StaffIDs, 'strcasecmp');
+ $Cache->cache_value('staff_ids', $StaffIDs);
}
if (!isset($_REQUEST['action'])) {
- $_REQUEST['action'] = '';
+ $_REQUEST['action'] = '';
}
switch ($_REQUEST['action']) {
- case 'takecompose':
- require('takecompose.php');
- break;
- case 'takeedit':
- require('takeedit.php');
- break;
- case 'compose':
- require('compose.php');
- break;
- case 'viewconv':
- require('conversation.php');
- break;
- case 'masschange':
- require('massdelete_handle.php');
- break;
- case 'get_post':
- require('get_post.php');
- break;
- case 'forward':
- require('forward.php');
- break;
- default:
- require(SERVER_ROOT.'/sections/inbox/inbox.php');
+ case 'takecompose':
+ require('takecompose.php');
+ break;
+ case 'takeedit':
+ require('takeedit.php');
+ break;
+ case 'compose':
+ require('compose.php');
+ break;
+ case 'viewconv':
+ require('conversation.php');
+ break;
+ case 'masschange':
+ require('massdelete_handle.php');
+ break;
+ case 'get_post':
+ require('get_post.php');
+ break;
+ case 'forward':
+ require('forward.php');
+ break;
+ default:
+ require(SERVER_ROOT.'/sections/inbox/inbox.php');
}
diff --git a/sections/inbox/massdelete_handle.php b/sections/inbox/massdelete_handle.php
index 8091561c2..9d1cd331a 100644
--- a/sections/inbox/massdelete_handle.php
+++ b/sections/inbox/massdelete_handle.php
@@ -1,4 +1,4 @@
-query("
- SELECT COUNT(ConvID)
- FROM pm_conversations_users
- WHERE ConvID IN ($ConvIDs)
- AND UserID=$UserID");
+ SELECT COUNT(ConvID)
+ FROM pm_conversations_users
+ WHERE ConvID IN ($ConvIDs)
+ AND UserID=$UserID");
list($MessageCount) = $DB->next_record();
if ($MessageCount != count($Messages)) {
- error(0);
+ error(0);
}
if (isset($_POST['delete'])) {
- $DB->query("
- UPDATE pm_conversations_users
- SET
- InInbox='0',
- InSentbox='0',
- Sticky='0',
- UnRead='0'
- WHERE ConvID IN($ConvIDs)
- AND UserID=$UserID");
+ $DB->query("
+ UPDATE pm_conversations_users
+ SET
+ InInbox='0',
+ InSentbox='0',
+ Sticky='0',
+ UnRead='0'
+ WHERE ConvID IN($ConvIDs)
+ AND UserID=$UserID");
} elseif (isset($_POST['unread'])) {
- $DB->query("
- UPDATE pm_conversations_users
- SET Unread='1'
- WHERE ConvID IN($ConvIDs) AND UserID=$UserID");
+ $DB->query("
+ UPDATE pm_conversations_users
+ SET Unread='1'
+ WHERE ConvID IN($ConvIDs) AND UserID=$UserID");
} elseif (isset($_POST['read'])) {
- $DB->query("
- UPDATE pm_conversations_users
- SET Unread='0'
- WHERE ConvID IN($ConvIDs) AND UserID=$UserID");
+ $DB->query("
+ UPDATE pm_conversations_users
+ SET Unread='0'
+ WHERE ConvID IN($ConvIDs) AND UserID=$UserID");
}
$Cache->delete_value('inbox_new_'.$UserID);
diff --git a/sections/inbox/takecompose.php b/sections/inbox/takecompose.php
index 245d0e046..26a10594d 100644
--- a/sections/inbox/takecompose.php
+++ b/sections/inbox/takecompose.php
@@ -2,54 +2,54 @@
authorize();
if (empty($_POST['toid'])) {
- error(404);
+ error(404);
}
if (!empty($LoggedUser['DisablePM']) && !isset($StaffIDs[$_POST['toid']])) {
- error(403);
+ error(403);
}
if (isset($_POST['convid']) && is_number($_POST['convid'])) {
- $ConvID = $_POST['convid'];
- $Subject = '';
- $ToID = explode(',', $_POST['toid']);
- foreach ($ToID as $TID) {
- if (!is_number($TID)) {
- $Err = 'A recipient does not exist.';
- }
- }
- $DB->query("
- SELECT UserID
- FROM pm_conversations_users
- WHERE UserID = '$LoggedUser[ID]'
- AND ConvID = '$ConvID'");
- if (!$DB->has_results()) {
- error(403);
- }
+ $ConvID = $_POST['convid'];
+ $Subject = '';
+ $ToID = explode(',', $_POST['toid']);
+ foreach ($ToID as $TID) {
+ if (!is_number($TID)) {
+ $Err = 'A recipient does not exist.';
+ }
+ }
+ $DB->query("
+ SELECT UserID
+ FROM pm_conversations_users
+ WHERE UserID = '$LoggedUser[ID]'
+ AND ConvID = '$ConvID'");
+ if (!$DB->has_results()) {
+ error(403);
+ }
} else {
- $ConvID = '';
- if (!is_number($_POST['toid'])) {
- $Err = 'This recipient does not exist.';
- } else {
- $ToID = $_POST['toid'];
- }
- $Subject = trim($_POST['subject']);
- if (empty($Subject)) {
- $Err = 'You cannot send a message without a subject.';
- }
+ $ConvID = '';
+ if (!is_number($_POST['toid'])) {
+ $Err = 'This recipient does not exist.';
+ } else {
+ $ToID = $_POST['toid'];
+ }
+ $Subject = trim($_POST['subject']);
+ if (empty($Subject)) {
+ $Err = 'You cannot send a message without a subject.';
+ }
}
$Body = trim($_POST['body']);
if ($Body === '' || $Body === false) {
- $Err = 'You cannot send a message without a body.';
+ $Err = 'You cannot send a message without a body.';
}
if (!empty($Err)) {
- error($Err);
- //header('Location: inbox.php?action=compose&to='.$_POST['toid']);
- $ToID = $_POST['toid'];
- $Return = true;
- include(SERVER_ROOT.'/sections/inbox/compose.php');
- die();
+ error($Err);
+ //header('Location: inbox.php?action=compose&to='.$_POST['toid']);
+ $ToID = $_POST['toid'];
+ $Return = true;
+ include(SERVER_ROOT.'/sections/inbox/compose.php');
+ die();
}
$ConvID = Misc::send_pm($ToID, $LoggedUser['ID'], $Subject, $Body, $ConvID);
diff --git a/sections/inbox/takeedit.php b/sections/inbox/takeedit.php
index 290b80294..4454d253b 100644
--- a/sections/inbox/takeedit.php
+++ b/sections/inbox/takeedit.php
@@ -1,46 +1,46 @@
-query("
- SELECT UserID
- FROM pm_conversations_users
- WHERE UserID='$UserID' AND ConvID='$ConvID'");
+ SELECT UserID
+ FROM pm_conversations_users
+ WHERE UserID='$UserID' AND ConvID='$ConvID'");
if (!$DB->has_results()) {
- error(403);
+ error(403);
}
if (isset($_POST['delete'])) {
- $DB->query("
- UPDATE pm_conversations_users
- SET
- InInbox='0',
- InSentbox='0',
- Sticky='0'
- WHERE ConvID='$ConvID' AND UserID='$UserID'");
+ $DB->query("
+ UPDATE pm_conversations_users
+ SET
+ InInbox='0',
+ InSentbox='0',
+ Sticky='0'
+ WHERE ConvID='$ConvID' AND UserID='$UserID'");
} else {
- if (isset($_POST['sticky'])) {
- $DB->query("
- UPDATE pm_conversations_users
- SET Sticky='1'
- WHERE ConvID='$ConvID' AND UserID='$UserID'");
- } else {
- $DB->query("
- UPDATE pm_conversations_users
- SET Sticky='0'
- WHERE ConvID='$ConvID' AND UserID='$UserID'");
- }
- if (isset($_POST['mark_unread'])) {
- $DB->query("
- UPDATE pm_conversations_users
- SET Unread='1'
- WHERE ConvID='$ConvID' AND UserID='$UserID'");
- $Cache->increment('inbox_new_'.$UserID);
- }
+ if (isset($_POST['sticky'])) {
+ $DB->query("
+ UPDATE pm_conversations_users
+ SET Sticky='1'
+ WHERE ConvID='$ConvID' AND UserID='$UserID'");
+ } else {
+ $DB->query("
+ UPDATE pm_conversations_users
+ SET Sticky='0'
+ WHERE ConvID='$ConvID' AND UserID='$UserID'");
+ }
+ if (isset($_POST['mark_unread'])) {
+ $DB->query("
+ UPDATE pm_conversations_users
+ SET Unread='1'
+ WHERE ConvID='$ConvID' AND UserID='$UserID'");
+ $Cache->increment('inbox_new_'.$UserID);
+ }
}
header('Location: ' . Inbox::get_inbox_link());
?>
diff --git a/sections/index/contest_leaderboard.php b/sections/index/contest_leaderboard.php
index 9b274fe84..713af41ab 100644
--- a/sections/index/contest_leaderboard.php
+++ b/sections/index/contest_leaderboard.php
@@ -1,31 +1,33 @@
get_current_contest();
if (empty($Contest)) {
- return;
+ return;
}
-$Leaderboard = Contest::get_leaderboard($Contest['ID']);
+$Leaderboard = $ContestMgr->get_leaderboard($Contest['ID']);
if (empty($Leaderboard)) {
- return;
+ return;
}
?>
+
- Sentbox
-
- Inbox
-" class="brackets">Sentbox
+
+ Inbox
+
-
-
+query($sql); $DB->query('SELECT FOUND_ROWS()'); list($NumResults) = $DB->next_record(); @@ -83,106 +83,106 @@ $Pages = Format::get_pages($Page, $NumResults, MESSAGES_PER_PAGE, 9); echo "\t\t$Pages\n"; ?> -
-
- -
+query($sql); $DB->query('SELECT FOUND_ROWS()'); list($NumResults) = $DB->next_record(); @@ -83,106 +83,106 @@ $Pages = Format::get_pages($Page, $NumResults, MESSAGES_PER_PAGE, 9); echo "\t\t$Pages\n"; ?> -
-
-
+ Your is empty.
- - - + +
+
+
-
+
-
-
+
diff --git a/sections/index/feat_merch.php b/sections/index/feat_merch.php
index 1452555ef..023de031b 100644
--- a/sections/index/feat_merch.php
+++ b/sections/index/feat_merch.php
@@ -1,44 +1,44 @@
-get_value('featured_merch');
- if ($FeaturedMerch === false) {
- $DB->query('
- SELECT ProductID, Title, Image, ArtistID
- FROM featured_merch
- WHERE Ended = 0');
- $FeaturedMerch = $DB->next_record(MYSQLI_ASSOC);
- $Cache->cache_value('featured_merch', $FeaturedMerch, 0);
- }
+ $FeaturedMerch = $Cache->get_value('featured_merch');
+ if ($FeaturedMerch === false) {
+ $DB->query('
+ SELECT ProductID, Title, Image, ArtistID
+ FROM featured_merch
+ WHERE Ended = 0');
+ $FeaturedMerch = $DB->next_record(MYSQLI_ASSOC);
+ $Cache->cache_value('featured_merch', $FeaturedMerch, 0);
+ }
- if ($FeaturedMerch != null) {
+ if ($FeaturedMerch != null) {
?>
Contest Leaderboard
- | - | - |
| + | + |
- View More
-
-
\ No newline at end of file
+
+ View More
+
+
-
-
+
- Featured Product
-
-
- ?>)
-
-
- Product Page
- 0) {
- $UserInfo = Users::user_info($FeaturedMerch['ArtistID']);
-?> - Artist:
-
-
+
+ Featured Product
+
+
+
+
+
+ Product Page
+ 0) {
+ $UserInfo = Users::user_info($FeaturedMerch['ArtistID']);
+?> - Artist:
+
+
-
diff --git a/sections/index/index.php b/sections/index/index.php
index 38814cbf3..7f0e8e66a 100644
--- a/sections/index/index.php
+++ b/sections/index/index.php
@@ -1,17 +1,17 @@
-
diff --git a/sections/index/month_album.php b/sections/index/month_album.php
index 4127f8d8d..c3e5dae94 100644
--- a/sections/index/month_album.php
+++ b/sections/index/month_album.php
@@ -1,33 +1,33 @@
-get_value('album_of_the_month');
if ($FeaturedAlbum === false) {
- $DB->query('
- SELECT
- fa.GroupID,
- tg.Name,
- tg.WikiImage,
- fa.ThreadID,
- fa.Title
- FROM featured_albums AS fa
- JOIN torrents_group AS tg ON tg.ID = fa.GroupID
- WHERE Ended = 0 AND type = 0');
- $FeaturedAlbum = $DB->next_record();
- $Cache->cache_value('album_of_the_month', $FeaturedAlbum, 0);
+ $DB->query('
+ SELECT
+ fa.GroupID,
+ tg.Name,
+ tg.WikiImage,
+ fa.ThreadID,
+ fa.Title
+ FROM featured_albums AS fa
+ JOIN torrents_group AS tg ON tg.ID = fa.GroupID
+ WHERE Ended = 0 AND type = 0');
+ $FeaturedAlbum = $DB->next_record();
+ $Cache->cache_value('album_of_the_month', $FeaturedAlbum, 0);
}
if (is_number($FeaturedAlbum['GroupID'])) {
- $Artists = Artists::get_artist($FeaturedAlbum['GroupID']);
+ $Artists = Artists::get_artist($FeaturedAlbum['GroupID']);
?>
-
-
+
- It's a mystery!
-
-
- You may want to put an image here.
-
+
+ It's a mystery!
+
+
+ You may want to put an image here.
+
+ Album of the Month
+ [Discuss]
+
+
+
+ ![<?=Artists::display_artists($Artists, false, false)?> - <?=$FeaturedAlbum['Name']?>](<?=ImageTools::process($FeaturedAlbum['WikiImage'], true)?>)
+
+
+
-
-
- Seeders:
+ Leechers:
+ Seeder/leecher ratio:
+
+
+get_value('polls_featured')) === false) {
- $DB->query("
- SELECT TopicID
- FROM forums_polls
- ORDER BY Featured DESC
- LIMIT 1");
- list($TopicID) = $DB->next_record();
- $Cache->cache_value('polls_featured', $TopicID, 0);
+ $DB->query("
+ SELECT TopicID
+ FROM forums_polls
+ ORDER BY Featured DESC
+ LIMIT 1");
+ list($TopicID) = $DB->next_record();
+ $Cache->cache_value('polls_featured', $TopicID, 0);
}
if ($TopicID) {
- if (($Poll = $Cache->get_value("polls_$TopicID")) === false) {
- $DB->query("
- SELECT Question, Answers, Featured, Closed
- FROM forums_polls
- WHERE TopicID = '$TopicID'");
- list($Question, $Answers, $Featured, $Closed) = $DB->next_record(MYSQLI_NUM, array(1));
- $Answers = unserialize($Answers);
- $DB->query("
- SELECT Vote, COUNT(UserID)
- FROM forums_polls_votes
- WHERE TopicID = '$TopicID'
- AND Vote != '0'
- GROUP BY Vote");
- $VoteArray = $DB->to_array(false, MYSQLI_NUM);
-
- $Votes = array();
- foreach ($VoteArray as $VoteSet) {
- list($Key,$Value) = $VoteSet;
- $Votes[$Key] = $Value;
- }
-
- for ($i = 1, $il = count($Answers); $i <= $il; ++$i) {
- if (!isset($Votes[$i])) {
- $Votes[$i] = 0;
- }
- }
- $Cache->cache_value("polls_$TopicID", array($Question, $Answers, $Votes, $Featured, $Closed), 0);
- } else {
- list($Question, $Answers, $Votes, $Featured, $Closed) = $Poll;
- }
-
- if (!empty($Votes)) {
- $TotalVotes = array_sum($Votes);
- $MaxVotes = max($Votes);
- } else {
- $TotalVotes = 0;
- $MaxVotes = 0;
- }
-
- $DB->query("
- SELECT Vote
- FROM forums_polls_votes
- WHERE UserID = '".$LoggedUser['ID']."'
- AND TopicID = '$TopicID'");
- list($UserResponse) = $DB->next_record();
- if (!empty($UserResponse) && $UserResponse != 0) {
- $Answers[$UserResponse] = '» '.$Answers[$UserResponse];
- }
+ if (($Poll = $Cache->get_value("polls_$TopicID")) === false) {
+ $DB->query("
+ SELECT Question, Answers, Featured, Closed
+ FROM forums_polls
+ WHERE TopicID = '$TopicID'");
+ list($Question, $Answers, $Featured, $Closed) = $DB->next_record(MYSQLI_NUM, array(1));
+ $Answers = unserialize($Answers);
+ $DB->query("
+ SELECT Vote, COUNT(UserID)
+ FROM forums_polls_votes
+ WHERE TopicID = '$TopicID'
+ AND Vote != '0'
+ GROUP BY Vote");
+ $VoteArray = $DB->to_array(false, MYSQLI_NUM);
+
+ $Votes = [];
+ foreach ($VoteArray as $VoteSet) {
+ list($Key,$Value) = $VoteSet;
+ $Votes[$Key] = $Value;
+ }
+
+ for ($i = 1, $il = count($Answers); $i <= $il; ++$i) {
+ if (!isset($Votes[$i])) {
+ $Votes[$i] = 0;
+ }
+ }
+ $Cache->cache_value("polls_$TopicID", array($Question, $Answers, $Votes, $Featured, $Closed), 0);
+ } else {
+ list($Question, $Answers, $Votes, $Featured, $Closed) = $Poll;
+ }
+
+ if (!empty($Votes)) {
+ $TotalVotes = array_sum($Votes);
+ $MaxVotes = max($Votes);
+ } else {
+ $TotalVotes = 0;
+ $MaxVotes = 0;
+ }
+
+ $DB->query("
+ SELECT Vote
+ FROM forums_polls_votes
+ WHERE UserID = '".$LoggedUser['ID']."'
+ AND TopicID = '$TopicID'");
+ list($UserResponse) = $DB->next_record();
+ if (!empty($UserResponse) && $UserResponse != 0) {
+ $Answers[$UserResponse] = '» '.$Answers[$UserResponse];
+ }
?>
-
-
-Peers:
+ Stats
- -
- 0) { ?>
-
- Maximum users: - +
- Maximum users: +get_value('stats_user_count')) === false) { - $DB->query(" - SELECT COUNT(ID) - FROM users_main - WHERE Enabled = '1'"); - list($UserCount) = $DB->next_record(); - $Cache->cache_value('stats_user_count', $UserCount, 0); //inf cache -} -$UserCount = (int)$UserCount; +$UserCount = Users::get_enabled_users_count(); ?> -
- Enabled users: Details -Enabled users: Details +get_value('stats_users')) === false) { - $DB->query(" - SELECT COUNT(ID) - FROM users_main - WHERE Enabled = '1' - AND LastAccess > '".time_minus(3600 * 24)."'"); - list($UserStats['Day']) = $DB->next_record(); - - $DB->query(" - SELECT COUNT(ID) - FROM users_main - WHERE Enabled = '1' - AND LastAccess > '".time_minus(3600 * 24 * 7)."'"); - list($UserStats['Week']) = $DB->next_record(); - - $DB->query(" - SELECT COUNT(ID) - FROM users_main - WHERE Enabled = '1' - AND LastAccess > '".time_minus(3600 * 24 * 30)."'"); - list($UserStats['Month']) = $DB->next_record(); - - $Cache->cache_value('stats_users', $UserStats, 0); + $DB->query(" + SELECT COUNT(ID) + FROM users_main + WHERE Enabled = '1' + AND LastAccess > '".time_minus(3600 * 24)."'"); + list($UserStats['Day']) = $DB->next_record(); + + $DB->query(" + SELECT COUNT(ID) + FROM users_main + WHERE Enabled = '1' + AND LastAccess > '".time_minus(3600 * 24 * 7)."'"); + list($UserStats['Week']) = $DB->next_record(); + + $DB->query(" + SELECT COUNT(ID) + FROM users_main + WHERE Enabled = '1' + AND LastAccess > '".time_minus(3600 * 24 * 30)."'"); + list($UserStats['Month']) = $DB->next_record(); + + $Cache->cache_value('stats_users', $UserStats, 0); } ?> -
- Users active today: (%) -
- Users active this week: (%) -
- Users active this month: (%) -Users active today: (%) +
- Users active this week: (%) +
- Users active this month: (%) +get_value('stats_torrent_count')) === false) { - $DB->query(" - SELECT COUNT(ID) - FROM torrents"); - list($TorrentCount) = $DB->next_record(); - $Cache->cache_value('stats_torrent_count', $TorrentCount, 604800); // staggered 1 week cache + $DB->query(" + SELECT COUNT(ID) + FROM torrents"); + list($TorrentCount) = $DB->next_record(); + $Cache->cache_value('stats_torrent_count', $TorrentCount, 604800); // staggered 1 week cache } if (($AlbumCount = $Cache->get_value('stats_album_count')) === false) { - $DB->query(" - SELECT COUNT(ID) - FROM torrents_group - WHERE CategoryID = '1'"); - list($AlbumCount) = $DB->next_record(); - $Cache->cache_value('stats_album_count', $AlbumCount, 604830); // staggered 1 week cache + $DB->query(" + SELECT COUNT(ID) + FROM torrents_group + WHERE CategoryID = '1'"); + list($AlbumCount) = $DB->next_record(); + $Cache->cache_value('stats_album_count', $AlbumCount, 604830); // staggered 1 week cache } if (($ArtistCount = $Cache->get_value('stats_artist_count')) === false) { - $DB->query(" - SELECT COUNT(ArtistID) - FROM artists_group"); - list($ArtistCount) = $DB->next_record(); - $Cache->cache_value('stats_artist_count', $ArtistCount, 604860); // staggered 1 week cache + $DB->query(" + SELECT COUNT(ArtistID) + FROM artists_group"); + list($ArtistCount) = $DB->next_record(); + $Cache->cache_value('stats_artist_count', $ArtistCount, 604860); // staggered 1 week cache } if (($PerfectCount = $Cache->get_value('stats_perfect_count')) === false) { - $DB->query(" - SELECT COUNT(ID) - FROM torrents - WHERE ((LogScore = 100 AND Format = 'FLAC') - OR (Media = 'Vinyl' AND Format = 'FLAC') - OR (Media = 'WEB' AND Format = 'FLAC') - OR (Media = 'DVD' AND Format = 'FLAC') - OR (Media = 'Soundboard' AND Format = 'FLAC') + $DB->query(" + SELECT COUNT(ID) + FROM torrents + WHERE ((LogScore = 100 AND Format = 'FLAC') + OR (Media = 'Vinyl' AND Format = 'FLAC') + OR (Media = 'WEB' AND Format = 'FLAC') + OR (Media = 'DVD' AND Format = 'FLAC') + OR (Media = 'Soundboard' AND Format = 'FLAC') OR (Media = 'BD' AND Format = 'FLAC') OR (Media = 'SASD' AND Format = 'FLAC') OR (Media = 'BD' AND Format = 'FLAC') - )"); - list($PerfectCount) = $DB->next_record(); - $Cache->cache_value('stats_perfect_count', $PerfectCount, 3600); // staggered 1 week cache + )"); + list($PerfectCount) = $DB->next_record(); + $Cache->cache_value('stats_perfect_count', $PerfectCount, 3600); // staggered 1 week cache } ?> -
- Torrents: -
- Releases: -
- Artists: -
- "Perfect" FLACs: -Torrents: +
- Releases: +
- Artists: +
- "Perfect" FLACs: +get_value('stats_collages')) === false) { - $DB->query(" - SELECT COUNT(ID) - FROM collages"); - list($CollageCount) = $DB->next_record(); - $Cache->cache_value('stats_collages', $CollageCount, 11280); //staggered 1 week cache + $DB->query(" + SELECT COUNT(ID) + FROM collages"); + list($CollageCount) = $DB->next_record(); + $Cache->cache_value('stats_collages', $CollageCount, 11280); //staggered 1 week cache } ?> -
- Collages: -Collages: +get_value('stats_requests')) === false) { - $DB->query(" - SELECT COUNT(ID) - FROM requests"); - list($RequestCount) = $DB->next_record(); - $DB->query(" - SELECT COUNT(ID) - FROM requests - WHERE FillerID > 0"); - list($FilledCount) = $DB->next_record(); - $Cache->cache_value('stats_requests', array($RequestCount, $FilledCount), 11280); + $DB->query(" + SELECT COUNT(ID) + FROM requests"); + list($RequestCount) = $DB->next_record(); + $DB->query(" + SELECT COUNT(ID) + FROM requests + WHERE FillerID > 0"); + list($FilledCount) = $DB->next_record(); + $Cache->cache_value('stats_requests', array($RequestCount, $FilledCount), 11280); } else { - list($RequestCount, $FilledCount) = $RequestStats; + list($RequestCount, $FilledCount) = $RequestStats; } $RequestPercentage = $RequestCount > 0 ? $FilledCount / $RequestCount * 100: 0; ?> -
- Requests: (% filled) -Requests: (% filled) +get_value('stats_snatches')) { ?> -
- Snatches: -Snatches: +get_value('stats_peers')) === false) { - //Cache lock! - $PeerStatsLocked = $Cache->get_value('stats_peers_lock'); - if (!$PeerStatsLocked) { - $Cache->cache_value('stats_peers_lock', 1, 30); - $DB->query(" - SELECT IF(remaining=0,'Seeding','Leeching') AS Type, COUNT(uid) - FROM xbt_files_users - WHERE active = 1 - GROUP BY Type"); - $PeerCount = $DB->to_array(0, MYSQLI_NUM, false); - $SeederCount = $PeerCount['Seeding'][1] ?: 0; - $LeecherCount = $PeerCount['Leeching'][1] ?: 0; - $Cache->cache_value('stats_peers', array($LeecherCount, $SeederCount), 1209600); // 2 week cache - $Cache->delete_value('stats_peers_lock'); - } + //Cache lock! + $PeerStatsLocked = $Cache->get_value('stats_peers_lock'); + if (!$PeerStatsLocked) { + $Cache->cache_value('stats_peers_lock', 1, 30); + $DB->query(" + SELECT IF(remaining=0,'Seeding','Leeching') AS Type, COUNT(uid) + FROM xbt_files_users + WHERE active = 1 + GROUP BY Type"); + $PeerCount = $DB->to_array(0, MYSQLI_NUM, false); + $SeederCount = $PeerCount['Seeding'][1] ?: 0; + $LeecherCount = $PeerCount['Leeching'][1] ?: 0; + $Cache->cache_value('stats_peers', array($LeecherCount, $SeederCount), 1209600); // 2 week cache + $Cache->delete_value('stats_peers_lock'); + } } else { - $PeerStatsLocked = false; - list($LeecherCount, $SeederCount) = $PeerStats; + $PeerStatsLocked = false; + list($LeecherCount, $SeederCount) = $PeerStats; } if (!$PeerStatsLocked) { - $Ratio = Format::get_ratio_html($SeederCount, $LeecherCount); - $PeerCount = number_format($SeederCount + $LeecherCount); - $SeederCount = number_format($SeederCount); - $LeecherCount = number_format($LeecherCount); + $Ratio = Format::get_ratio_html($SeederCount, $LeecherCount); + $PeerCount = number_format($SeederCount + $LeecherCount); + $SeederCount = number_format($SeederCount); + $LeecherCount = number_format($LeecherCount); } else { - $PeerCount = $SeederCount = $LeecherCount = $Ratio = 'Server busy'; + $PeerCount = $SeederCount = $LeecherCount = $Ratio = 'Server busy'; } ?> -
- Peers: -
- Seeders: -
- Leechers: -
- Seeder/leecher ratio: -
Stats
+ -
+ 0) { ?>
+
-
-
+ Poll
-
-
- -
Topic: Visit -
- - -
-
- $Answer) {
- if ($TotalVotes > 0) {
- $Ratio = $Votes[$i] / $MaxVotes;
- $Percent = $Votes[$i] / $TotalVotes;
- } else {
- $Ratio = 0;
- $Percent = 0;
- }
-?>
- (%) -
-
-
-
-
-
-
-
-
- -
-
-
-
- Topic: Visit -
Poll
+
+
+ +
Topic: Visit +
+
+
-
- + +
-
+ $Answer) {
+ if ($TotalVotes > 0) {
+ $Ratio = $Votes[$i] / $MaxVotes;
+ $Percent = $Votes[$i] / $TotalVotes;
+ } else {
+ $Ratio = 0;
+ $Percent = 0;
+ }
+?>
- (%) +
-
+
+
+
+
+
+
+
+ +
+
+
+
+ Topic: Visit +
-
+
-true));
function contest() {
- global $DB, $Cache, $LoggedUser;
-
- list($Contest, $TotalPoints) = $Cache->get_value('contest');
- if (!$Contest) {
- $DB->query("
- SELECT
- UserID,
- SUM(Points),
- Username
- FROM users_points AS up
- JOIN users_main AS um ON um.ID = up.UserID
- GROUP BY UserID
- ORDER BY SUM(Points) DESC
- LIMIT 20");
- $Contest = $DB->to_array();
-
- $DB->query("
- SELECT SUM(Points)
- FROM users_points");
- list($TotalPoints) = $DB->next_record();
-
- $Cache->cache_value('contest', array($Contest, $TotalPoints), 600);
- }
+ global $DB, $Cache, $LoggedUser;
+
+ list($Contest, $TotalPoints) = $Cache->get_value('contest');
+ if (!$Contest) {
+ $DB->query("
+ SELECT
+ UserID,
+ SUM(Points),
+ Username
+ FROM users_points AS up
+ JOIN users_main AS um ON um.ID = up.UserID
+ GROUP BY UserID
+ ORDER BY SUM(Points) DESC
+ LIMIT 20");
+ $Contest = $DB->to_array();
+
+ $DB->query("
+ SELECT SUM(Points)
+ FROM users_points");
+ list($TotalPoints) = $DB->next_record();
+
+ $Cache->cache_value('contest', array($Contest, $TotalPoints), 600);
+ }
?>
-
+get_value('recommend');
$Recommend_artists = $Cache->get_value('recommend_artists');
if (!is_array($Recommend) || !is_array($Recommend_artists)) {
- $DB->query("
- SELECT
- tr.GroupID,
- tr.UserID,
- u.Username,
- tg.Name,
- tg.TagList
- FROM torrents_recommended AS tr
- JOIN torrents_group AS tg ON tg.ID = tr.GroupID
- LEFT JOIN users_main AS u ON u.ID = tr.UserID
- ORDER BY tr.Time DESC
- LIMIT 10");
- $Recommend = $DB->to_array();
- $Cache->cache_value('recommend', $Recommend, 1209600);
-
- $Recommend_artists = Artists::get_artists($DB->collect('GroupID'));
- $Cache->cache_value('recommend_artists', $Recommend_artists, 1209600);
+ $DB->query("
+ SELECT
+ tr.GroupID,
+ tr.UserID,
+ u.Username,
+ tg.Name,
+ tg.TagList
+ FROM torrents_recommended AS tr
+ JOIN torrents_group AS tg ON tg.ID = tr.GroupID
+ LEFT JOIN users_main AS u ON u.ID = tr.UserID
+ ORDER BY tr.Time DESC
+ LIMIT 10");
+ $Recommend = $DB->to_array();
+ $Cache->cache_value('recommend', $Recommend, 1209600);
+
+ $Recommend_artists = Artists::get_artists($DB->collect('GroupID'));
+ $Cache->cache_value('recommend_artists', $Recommend_artists, 1209600);
}
if (count($Recommend) >= 4) {
$Cache->increment('usage_index');
?>
-
+
-
- time()) {
- continue;
- }
+ list($NewsID, $Title, $Body, $NewsTime) = $NewsItem;
+ if (strtotime($NewsTime) > time()) {
+ continue;
+ }
?>
-
- ($NewsCount - 1)) {
- break;
- }
+
+ ($NewsCount - 1)) {
+ break;
+ }
}
?>
-
- Latest Vanity House additions
- Show
-
-
-
+
-
-
- Click to load more news. To browse old news posts, click here.
-
-
+
+
+ Click to load more news. To browse old news posts, click here.
+
+
-
+ Full scoreboard +
+
+
+
diff --git a/sections/index/public.php b/sections/index/public.php
index 1c295177b..b49da2f8d 100644
--- a/sections/index/public.php
+++ b/sections/index/public.php
@@ -9,6 +9,7 @@
echo <<
+Quality time scoreboard
-
-
-
- ()
+
+
+ Total uploads: -
-
+
Quality time scoreboard
+
- + Full scoreboard +
Orpheus with his lute made trees
And the mountain tops that freeze
diff --git a/sections/index/vanity_album.php b/sections/index/vanity_album.php
index a35d2e1c8..3834bd6fd 100644
--- a/sections/index/vanity_album.php
+++ b/sections/index/vanity_album.php
@@ -1,30 +1,30 @@
-get_value('vanity_house_album');
if ($FeaturedAlbum === false) {
- $DB->query('
- SELECT
- fa.GroupID,
- tg.Name,
- tg.WikiImage,
- fa.ThreadID,
- fa.Title
- FROM featured_albums AS fa
- JOIN torrents_group AS tg ON tg.ID = fa.GroupID
- WHERE Ended = 0 AND type = 1');
- $FeaturedAlbum = $DB->next_record();
- $Cache->cache_value('vanity_house_album', $FeaturedAlbum, 0);
+ $DB->query('
+ SELECT
+ fa.GroupID,
+ tg.Name,
+ tg.WikiImage,
+ fa.ThreadID,
+ fa.Title
+ FROM featured_albums AS fa
+ JOIN torrents_group AS tg ON tg.ID = fa.GroupID
+ WHERE Ended = 0 AND type = 1');
+ $FeaturedAlbum = $DB->next_record();
+ $Cache->cache_value('vanity_house_album', $FeaturedAlbum, 0);
}
if (is_number($FeaturedAlbum['GroupID'])) {
- $Artists = Artists::get_artist($FeaturedAlbum['GroupID']);
+ $Artists = Artists::get_artist($FeaturedAlbum['GroupID']);
?>
-
Vanity House [Discuss]
+
+
+
+
+
+
+
\ No newline at end of file
+?>
diff --git a/sections/locked/default.php b/sections/locked/default.php
index 62ea4b7ac..13d49903b 100644
--- a/sections/locked/default.php
+++ b/sections/locked/default.php
@@ -1,12 +1,14 @@
-
Locked Account
Your account has been locked. Please send a Staff PM to find out how this happened.
-
-
+
- LOG_ENTRIES_PER_PAGE) { ?>
-
+ LOG_ENTRIES_PER_PAGE) { ?>
+
-
diff --git a/sections/log/sphinx.php b/sections/log/sphinx.php
index ae0ca6b3c..37aa11ef0 100644
--- a/sections/log/sphinx.php
+++ b/sections/log/sphinx.php
@@ -1,56 +1,56 @@
query("
- SELECT ID, Message, Time
- FROM log
- ORDER BY ID DESC
- LIMIT $Offset, ".LOG_ENTRIES_PER_PAGE);
- $NumResults = $DB->record_count();
- if (!$NumResults) {
- $TotalMatches = 0;
- } elseif ($NumResults == LOG_ENTRIES_PER_PAGE) {
- // This is a lot faster than SQL_CALC_FOUND_ROWS
- $SphQL = new SphinxqlQuery();
- $Result = $SphQL->select('id')->from('log, log_delta')->limit(0, 1, 1)->query();
- $Debug->log_var($Result, '$Result');
- $TotalMatches = min(SPHINX_MAX_MATCHES, $Result->get_meta('total_found'));
- } else {
- $TotalMatches = $NumResults + $Offset;
- }
- $QueryStatus = 0;
+ $Log = $DB->query("
+ SELECT ID, Message, Time
+ FROM log
+ ORDER BY ID DESC
+ LIMIT $Offset, ".LOG_ENTRIES_PER_PAGE);
+ $NumResults = $DB->record_count();
+ if (!$NumResults) {
+ $TotalMatches = 0;
+ } elseif ($NumResults == LOG_ENTRIES_PER_PAGE) {
+ // This is a lot faster than SQL_CALC_FOUND_ROWS
+ $SphQL = new SphinxqlQuery();
+ $Result = $SphQL->select('id')->from('log, log_delta')->limit(0, 1, 1)->query();
+ $Debug->log_var($Result, '$Result');
+ $TotalMatches = min(SPHINX_MAX_MATCHES, $Result->get_meta('total_found'));
+ } else {
+ $TotalMatches = $NumResults + $Offset;
+ }
+ $QueryStatus = 0;
} else {
- $Page = min(SPHINX_MAX_MATCHES / TORRENTS_PER_PAGE, $Page);
- $SphQL = new SphinxqlQuery();
- $SphQL->select('id')
- ->from('log, log_delta')
- ->where_match($_GET['search'], 'message')
- ->order_by('id', 'DESC')
- ->limit($Offset, LOG_ENTRIES_PER_PAGE, $Offset + LOG_ENTRIES_PER_PAGE);
+ $Page = min(SPHINX_MAX_MATCHES / TORRENTS_PER_PAGE, $Page);
+ $SphQL = new SphinxqlQuery();
+ $SphQL->select('id')
+ ->from('log, log_delta')
+ ->where_match($_GET['search'], 'message')
+ ->order_by('id', 'DESC')
+ ->limit($Offset, LOG_ENTRIES_PER_PAGE, $Offset + LOG_ENTRIES_PER_PAGE);
- $Result = $SphQL->query();
- $Debug->log_var($Result, '$Result');
- $Debug->set_flag('Finished SphQL query');
- if ($QueryStatus = $Result->Errno) {
- $QueryError = $Result->Error;
- }
- $NumResults = $Result->get_result_info('num_rows');
- $TotalMatches = min(SPHINX_MAX_MATCHES, $Result->get_meta('total_found'));
- if ($NumResults > 0) {
- $LogIDs = $Result->collect('id');
- $Log = $DB->query('
- SELECT ID, Message, Time
- FROM log
- WHERE ID IN ('.implode(',', $LogIDs).')
- ORDER BY ID DESC');
- } else {
- $Log = $DB->query('
- SET @nothing = 0');
- }
+ $Result = $SphQL->query();
+ $Debug->log_var($Result, '$Result');
+ $Debug->set_flag('Finished SphQL query');
+ if ($QueryStatus = $Result->Errno) {
+ $QueryError = $Result->Error;
+ }
+ $NumResults = $Result->get_result_info('num_rows');
+ $TotalMatches = min(SPHINX_MAX_MATCHES, $Result->get_meta('total_found'));
+ if ($NumResults > 0) {
+ $LogIDs = $Result->collect('id');
+ $Log = $DB->query('
+ SELECT ID, Message, Time
+ FROM log
+ WHERE ID IN ('.implode(',', $LogIDs).')
+ ORDER BY ID DESC');
+ } else {
+ $Log = $DB->query('
+ SET @nothing = 0');
+ }
}
diff --git a/sections/log/sql.php b/sections/log/sql.php
index f9bb0cbfe..9debc06d8 100644
--- a/sections/log/sql.php
+++ b/sections/log/sql.php
@@ -2,35 +2,35 @@
list($Page, $Limit) = Format::page_limit(LOG_ENTRIES_PER_PAGE);
if (!empty($_GET['search'])) {
- $Search = db_string($_GET['search']);
+ $Search = db_string($_GET['search']);
} else {
- $Search = false;
+ $Search = false;
}
$Words = explode(' ', $Search);
$SQL = '
- SELECT
- SQL_CALC_FOUND_ROWS
- ID,
- Message,
- Time
- FROM log ';
+ SELECT
+ SQL_CALC_FOUND_ROWS
+ ID,
+ Message,
+ Time
+ FROM log ';
if ($Search) {
- $SQL .= "WHERE Message LIKE '%";
- $SQL .= implode("%' AND Message LIKE '%", $Words);
- $SQL .= "%' ";
+ $SQL .= "WHERE Message LIKE '%";
+ $SQL .= implode("%' AND Message LIKE '%", $Words);
+ $SQL .= "%' ";
}
if (!check_perms('site_view_full_log')) {
- if ($Search) {
- $SQL .= ' AND ';
- } else {
- $SQL .= ' WHERE ';
- }
- $SQL .= " Time>'".time_minus(3600 * 24 * 28)."' ";
+ if ($Search) {
+ $SQL .= ' AND ';
+ } else {
+ $SQL .= ' WHERE ';
+ }
+ $SQL .= " Time>'".time_minus(3600 * 24 * 28)."' ";
}
$SQL .= "
- ORDER BY ID DESC
- LIMIT $Limit";
+ ORDER BY ID DESC
+ LIMIT $Limit";
$Log = $DB->query($SQL);
$DB->query('SELECT FOUND_ROWS()');
diff --git a/sections/logchecker/index.php b/sections/logchecker/index.php
index 712c74610..8a79b7663 100644
--- a/sections/logchecker/index.php
+++ b/sections/logchecker/index.php
@@ -1,28 +1,28 @@
- $TmpFile, 'name' => $TmpFile);
+ $ValidateChecksum = false;
+ $TmpFile = tempnam('/tmp', 'log_');
+ file_put_contents($TmpFile, $_POST["pastelog"]);
+ $File = array('tmp_name' => $TmpFile, 'name' => $TmpFile);
} else {
- error('No log file uploaded or file is empty.');
+ error('No log file uploaded or file is empty.');
}
@@ -22,11 +22,11 @@
echo <<
- Test Another Log File
- Upload Missing Logs
+ Test Another Log File
+ Upload Missing Logs
-
- Site log
-
-
-
+
+
+ Site log
+
+
+
- LOG_ENTRIES_PER_PAGE) { ?>
-
-
-
-
- | Time | -Message | -
| Search request failed (). | |
| Nothing found! | |
| Time | +Message | +
| Search request failed (). | |
| Nothing found! | |
| - - | -
- |
- + + | +
+ |
+
+
-
-
-
-
+
+
+
+
-
- Bad/No Checksum(s) - + echo << + Trumpable For: +
+ Bad/No Checksum(s) + HTML; } echo << - Score: {$Score} (out of 100) - +
HTML;
View::show_footer();
if (!empty($TmpFile) && is_file($TmpFile)) {
- unlink($TmpFile);
+ unlink($TmpFile);
}
diff --git a/sections/logchecker/take_upload.php b/sections/logchecker/take_upload.php
index 1b59143b2..157eece41 100644
--- a/sections/logchecker/take_upload.php
+++ b/sections/logchecker/take_upload.php
@@ -5,7 +5,7 @@
enforce_login();
if (empty($_POST['torrentid'])) {
- error('No torrent is selected.');
+ error('No torrent is selected.');
}
$TorrentID = intval($_POST['torrentid']) ?? null;
// Some browsers will report an empty file when you submit, prune those out
@@ -18,105 +18,105 @@
$Extra = check_perms('users_mod') ? '' : " AND t.UserID = '{$LoggedUser['ID']}'";
$DB->query("
- SELECT t.ID, t.GroupID
- FROM torrents t
- WHERE t.ID = {$TorrentID} AND t.HasLog='1'" . $Extra);
+ SELECT t.ID, t.GroupID
+ FROM torrents t
+ WHERE t.ID = {$TorrentID} AND t.HasLog='1'" . $Extra);
-$DetailsArray = array();
+$DetailsArray = [];
$Logchecker = new Logchecker();
if ($TorrentID != 0 && $DB->has_results() && $FileCount > 0) {
- list($TorrentID, $GroupID) = $DB->next_record(MYSQLI_BOTH);
- $DB->query("SELECT LogID FROM torrents_logs WHERE TorrentID='{$TorrentID}'");
- while(list($LogID) = $DB->next_record(MYSQLI_NUM)) {
- @unlink(SERVER_ROOT . "/logs/{$TorrentID}_{$LogID}.log");
- }
- $DB->query("DELETE FROM torrents_logs WHERE TorrentID='{$TorrentID}'");
- ini_set('upload_max_filesize', 1000000);
- foreach ($_FILES['logfiles']['name'] as $Pos => $File) {
- if (!$_FILES['logfiles']['size'][$Pos]) {
- break;
- }
- $FileName = $_FILES['logfiles']['name'][$Pos];
- $LogPath = $_FILES['logfiles']['tmp_name'][$Pos];
- $Logchecker->new_file($LogPath);
- list($Score, $Details, $Checksum, $LogText) = $Logchecker->parse();
- $Details = trim(implode("\r\n", $Details));
- $DetailsArray[] = $Details;
- $LogScore = min($LogScore, $Score);
- $LogChecksum = min(intval($Checksum), $LogChecksum);
- $Logs[] = array($Details, $LogText);
- $DB->query("INSERT INTO torrents_logs (TorrentID, Log, Details, Score, `Checksum`, `FileName`) VALUES ($TorrentID, '".db_string($LogText)."', '".db_string($Details)."', $Score, '".enum_boolean($Checksum)."', '".db_string($FileName)."')");
- $LogID = $DB->inserted_id();
- if (move_uploaded_file($LogPath, SERVER_ROOT . "/logs/{$TorrentID}_{$LogID}.log") === false) {
- die("Could not copy logfile to the server.");
- }
- }
-
- $DB->query("UPDATE torrents SET HasLogDB='1', LogScore={$LogScore}, LogChecksum='".enum_boolean($LogChecksum)."' WHERE ID='{$TorrentID}'");
- $Cache->delete_value("torrent_group_{$GroupID}");
- $Cache->delete_value("torrents_details_{$GroupID}");
+ list($TorrentID, $GroupID) = $DB->next_record(MYSQLI_BOTH);
+ $DB->query("SELECT LogID FROM torrents_logs WHERE TorrentID='{$TorrentID}'");
+ while(list($LogID) = $DB->next_record(MYSQLI_NUM)) {
+ @unlink(SERVER_ROOT . "/logs/{$TorrentID}_{$LogID}.log");
+ }
+ $DB->query("DELETE FROM torrents_logs WHERE TorrentID='{$TorrentID}'");
+ ini_set('upload_max_filesize', 1000000);
+ foreach ($_FILES['logfiles']['name'] as $Pos => $File) {
+ if (!$_FILES['logfiles']['size'][$Pos]) {
+ break;
+ }
+ $FileName = $_FILES['logfiles']['name'][$Pos];
+ $LogPath = $_FILES['logfiles']['tmp_name'][$Pos];
+ $Logchecker->new_file($LogPath);
+ list($Score, $Details, $Checksum, $LogText) = $Logchecker->parse();
+ $Details = trim(implode("\r\n", $Details));
+ $DetailsArray[] = $Details;
+ $LogScore = min($LogScore, $Score);
+ $LogChecksum = min(intval($Checksum), $LogChecksum);
+ $Logs[] = array($Details, $LogText);
+ $DB->query("INSERT INTO torrents_logs (TorrentID, Log, Details, Score, `Checksum`, `FileName`) VALUES ($TorrentID, '".db_string($LogText)."', '".db_string($Details)."', $Score, '".enum_boolean($Checksum)."', '".db_string($FileName)."')");
+ $LogID = $DB->inserted_id();
+ if (move_uploaded_file($LogPath, SERVER_ROOT . "/logs/{$TorrentID}_{$LogID}.log") === false) {
+ die("Could not copy logfile to the server.");
+ }
+ }
+
+ $DB->query("UPDATE torrents SET HasLogDB='1', LogScore={$LogScore}, LogChecksum='".enum_boolean($LogChecksum)."' WHERE ID='{$TorrentID}'");
+ $Cache->delete_value("torrent_group_{$GroupID}");
+ $Cache->delete_value("torrents_details_{$GroupID}");
} else {
- error('No log file uploaded or invalid torrent id was selected.');
+ error('No log file uploaded or invalid torrent id was selected.');
}
View::show_header();
echo <<
- Logchecker Test Results
+Logchecker Test Results
HTML; $Log = new Logchecker(); @@ -36,60 +36,60 @@ list($Score, $Bad, $Checksum, $Text) = $Log->parse(); if($Score == 100) { - $Color = '#418B00'; + $Color = '#418B00'; } elseif($Score > 90) { - $Color = '#74C42E'; + $Color = '#74C42E'; } elseif($Score > 75) { - $Color = '#FFAA00'; + $Color = '#FFAA00'; } elseif($Score > 50) { - $Color = '#FF5E00'; + $Color = '#FF5E00'; } else { - $Color = '#FF0000'; + $Color = '#FF0000'; } if (!$Checksum) { - echo << - Trumpable For: -- Bad/No Checksum(s) - + echo << + Trumpable For: +
+ Bad/No Checksum(s) + HTML; } echo << - Score: {$Score} (out of 100) - +
+ Score: {$Score} (out of 100) +HTML; if($Bad){ - echo << -
Log validation report:
--
+ echo <<
+
- {$Property} "; - } + foreach($Bad as $Property) { + echo "\t\t\t
- {$Property} "; + } echo << - +
Log validation report:
+-
HTML;
- foreach($Bad as $Property) {
- echo "\t\t\t
{$Text}
-
+
+ {$Text}
+
Upload another log file +
Upload another log file
HTML;
if($LogScore == 100) {
- $Color = '#418B00';
+ $Color = '#418B00';
}
elseif($LogScore > 90) {
- $Color = '#74C42E';
+ $Color = '#74C42E';
}
elseif($LogScore > 75) {
- $Color = '#FFAA00';
+ $Color = '#FFAA00';
}
elseif($LogScore > 50) {
- $Color = '#FF5E00';
+ $Color = '#FF5E00';
}
else {
- $Color = '#FF0000';
+ $Color = '#FF0000';
}
echo "
- Bad/No Checksum(s) - + echo << + Trumpable For: +
+ Bad/No Checksum(s) + HTML; } foreach ($Logs as $Log) { - list($Details, $Text) = $Log; - if (!empty($Details)) { - $Details = explode("\r\n", $Details); - print << -
HTML;
diff --git a/sections/logchecker/test.php b/sections/logchecker/test.php
index 4ba3eaef0..e6b8966c0 100644
--- a/sections/logchecker/test.php
+++ b/sections/logchecker/test.php
@@ -13,10 +13,10 @@
WHERE t.HasLog='1' AND t.LogScore=0 AND t.UserID = " . $LoggedUser['ID']);
if ($DB->has_results()) {
- $output = '';
- while (list($ID, $AlbumName, $ArtistName, $Year, $Format, $Encoding) = $DB->next_record()) {
- $output .= "Score: $LogScore (out of 100)"; if ($LogChecksum === 0) { - echo << - Trumpable For: -
- Bad/No Checksum(s) - + echo << + Trumpable For: +
+ Bad/No Checksum(s) + HTML; } foreach ($Logs as $Log) { - list($Details, $Text) = $Log; - if (!empty($Details)) { - $Details = explode("\r\n", $Details); - print << -
Log validation report:
--
+ list($Details, $Text) = $Log;
+ if (!empty($Details)) {
+ $Details = explode("\r\n", $Details);
+ print <<
+
- {$Property} "; - } - print << - + foreach ($Details as $Property) { + print "\t\t
- {$Property} "; + } + print << + HTML; - } + } - echo << -
Log validation report:
+-
HTML;
- foreach ($Details as $Property) {
- print "\t\t
{$Text}
-
+ echo <<
+ {$Text}
+
-
HTML;
diff --git a/sections/logchecker/update.php b/sections/logchecker/update.php
index 091cab68a..1ea602618 100644
--- a/sections/logchecker/update.php
+++ b/sections/logchecker/update.php
@@ -6,106 +6,106 @@
print <<
- Test Logchecker
- Upload Missing Logs
+ Test Logchecker
+ Upload Missing Logs
Orpheus Logchecker: EAC and XLD.
-
-
-
-
-
-
+ - Use this page to test our logchecker. You can either upload a log or paste it into the - text box below. This will then run the file/text against our logchecker displaying to you - what it would look like on our site. To verify checksum, you need to upload log file. -
-| Upload file | -|
| - - | -|
| Paste log (No checksum verification) | -|
| - - | -|
Orpheus Logchecker: EAC and XLD.
+
+
+
+
+
+
+ Use this page to test our logchecker. You can either upload a log or paste it into the + text box below. This will then run the file/text against our logchecker displaying to you + what it would look like on our site. To verify checksum, you need to upload log file. +
+| Upload file | +|
| + + | +|
| Paste log (No checksum verification) | +|
| + + | +|
-
-
diff --git a/sections/tools/managers/permissions_alter.php b/sections/tools/managers/permissions_alter.php
index ff067e796..ca0200d43 100644
--- a/sections/tools/managers/permissions_alter.php
+++ b/sections/tools/managers/permissions_alter.php
@@ -1,18 +1,18 @@
-
"; - echo "$Perm\n"; + global $Values; + $Perm = "$Title
"; + echo "$Perm\n"; } $DB->prepared_query(" - SELECT ID, Name - FROM staff_groups - ORDER BY Sort"); + SELECT ID, Name + FROM staff_groups + ORDER BY Sort"); $Groups = $DB->to_array(false, MYSQLI_ASSOC); View::show_header('Manage Permissions', 'validate'); @@ -20,58 +20,60 @@ function display_perm($Key, $Title) { echo $Val->GenerateJS('permissionsform'); ?>
+
+ Update Log
-
-
- + +
-
+
diff --git a/sections/tools/managers/ocelot.php b/sections/tools/managers/ocelot.php
index 45c1d6ab9..2cabe7e78 100644
--- a/sections/tools/managers/ocelot.php
+++ b/sections/tools/managers/ocelot.php
@@ -1,50 +1,50 @@
- $Token) {
- list($UserID, $TorrentID) = explode(':', $Token);
- if (!is_number($UserID) || !is_number($TorrentID)) {
- continue;
- }
- $Cond[] = "(UserID = $UserID AND TorrentID = $TorrentID)";
- $UserIDs[] = $UserID;
- }
- if (!empty($Cond)) {
- $Query = "
- UPDATE users_freeleeches
- SET Expired = TRUE
- WHERE ".implode(" OR ", $Cond);
- $DB->query($Query);
- foreach ($UserIDs as $UserID) {
- $Cache->delete_value("users_tokens_$UserID");
- }
- }
- } else {
- $TorrentID = $_REQUEST['torrentid'];
- $UserID = $_REQUEST['userid'];
- if (!is_number($TorrentID) || !is_number($UserID)) {
- error(403);
- }
- $DB->query("
- UPDATE users_freeleeches
- SET Expired = TRUE
- WHERE UserID = $UserID
- AND TorrentID = $TorrentID");
- $Cache->delete_value("users_tokens_$UserID");
- }
- break;
+ case 'expiretoken':
+ if (isset($_GET['tokens'])) {
+ $Tokens = explode(',', $_GET['tokens']);
+ if (empty($Tokens)) {
+ error(0);
+ }
+ $Cond = $UserIDs = [];
+ foreach ($Tokens as $Key => $Token) {
+ list($UserID, $TorrentID) = explode(':', $Token);
+ if (!is_number($UserID) || !is_number($TorrentID)) {
+ continue;
+ }
+ $Cond[] = "(UserID = $UserID AND TorrentID = $TorrentID)";
+ $UserIDs[] = $UserID;
+ }
+ if (!empty($Cond)) {
+ $Query = "
+ UPDATE users_freeleeches
+ SET Expired = TRUE
+ WHERE ".implode(" OR ", $Cond);
+ $DB->query($Query);
+ foreach ($UserIDs as $UserID) {
+ $Cache->delete_value("users_tokens_$UserID");
+ }
+ }
+ } else {
+ $TorrentID = $_REQUEST['torrentid'];
+ $UserID = $_REQUEST['userid'];
+ if (!is_number($TorrentID) || !is_number($UserID)) {
+ error(403);
+ }
+ $DB->query("
+ UPDATE users_freeleeches
+ SET Expired = TRUE
+ WHERE UserID = $UserID
+ AND TorrentID = $TorrentID");
+ $Cache->delete_value("users_tokens_$UserID");
+ }
+ break;
}
?>
diff --git a/sections/tools/managers/official_tags.php b/sections/tools/managers/official_tags.php
index 650e26d94..74c7b35fe 100644
--- a/sections/tools/managers/official_tags.php
+++ b/sections/tools/managers/official_tags.php
@@ -1,129 +1,129 @@
-query("
- UPDATE tags
- SET TagType = 'other'
- WHERE ID IN ($OldTagIDs)");
- }
+ $DB->query("
+ UPDATE tags
+ SET TagType = 'other'
+ WHERE ID IN ($OldTagIDs)");
+ }
- if ($_POST['newtag']) {
- $TagName = Misc::sanitize_tag($_POST['newtag']);
+ if ($_POST['newtag']) {
+ $TagName = Misc::sanitize_tag($_POST['newtag']);
- $DB->query("
- SELECT ID
- FROM tags
- WHERE Name LIKE '$TagName'");
- list($TagID) = $DB->next_record();
+ $DB->query("
+ SELECT ID
+ FROM tags
+ WHERE Name LIKE '$TagName'");
+ list($TagID) = $DB->next_record();
- if ($TagID) {
- $DB->query("
- UPDATE tags
- SET TagType = 'genre'
- WHERE ID = $TagID");
- } else { // Tag doesn't exist yet - create tag
- $DB->query("
- INSERT INTO tags
- (Name, UserID, TagType, Uses)
- VALUES
- ('$TagName', ".$LoggedUser['ID'].", 'genre', 0)");
- $TagID = $DB->inserted_id();
- }
- }
+ if ($TagID) {
+ $DB->query("
+ UPDATE tags
+ SET TagType = 'genre'
+ WHERE ID = $TagID");
+ } else { // Tag doesn't exist yet - create tag
+ $DB->query("
+ INSERT INTO tags
+ (Name, UserID, TagType, Uses)
+ VALUES
+ ('$TagName', ".$LoggedUser['ID'].", 'genre', 0)");
+ $TagID = $DB->inserted_id();
+ }
+ }
- $Cache->delete_value('genre_tags');
+ $Cache->delete_value('genre_tags');
}
View::show_header('Official Tags Manager');
?>
- This form allows you to update the logs for any torrent that you've uploaded. - Select a torrent and upload the log files in the form below, making sure to add - all logs that you wish to upload. This will overwrite any previously uploaded logs for - this torrent. If you wish to just have a torrent manually rescored, please report it - to staff. -
-- + +
News archive
+query(' - SELECT - ID, - Title, - Body, - Time - FROM news - ORDER BY Time DESC - LIMIT ' . $NewsCount);// LIMIT 20 + SELECT + ID, + Title, + Body, + Time + FROM news + ORDER BY Time DESC + LIMIT ' . $NewsCount);// LIMIT 20 $Count = 0; while (list($NewsID, $Title, $Body, $NewsTime) = $DB->next_record()) { ?> - - ($NewsCount - 1)) { - break; - } + + ($NewsCount - 1)) { + break; + } } ?> -
-
-
-
+
+
+
+
-
Official Tags Manager
+Official Tags Manager
-
-
+
diff --git a/sections/tools/managers/payment_alter.php b/sections/tools/managers/payment_alter.php
index d0056a6d5..6d8a9533c 100644
--- a/sections/tools/managers/payment_alter.php
+++ b/sections/tools/managers/payment_alter.php
@@ -1,45 +1,45 @@
prepared_query("
- DELETE
- FROM payment_reminders
- WHERE ID = ?", $_POST['id']);
+ $DB->prepared_query("
+ DELETE
+ FROM payment_reminders
+ WHERE ID = ?", $_POST['id']);
} else {
- $Val->SetFields('text', '1', 'string', 'The payment text must be set, and has a max length of 100 characters', ['maxlength' => 100]);
- $Val->SetFields('expiry', '1', 'regex', 'The expiry must be a date in the form of YYYY-MM-DD', ['regex' => '/^\d{4}-\d{2}-\d{2}$/']);
- $Err = $Val->ValidateForm($_POST);
+ $Val->SetFields('text', '1', 'string', 'The payment text must be set, and has a max length of 100 characters', ['maxlength' => 100]);
+ $Val->SetFields('expiry', '1', 'regex', 'The expiry must be a date in the form of YYYY-MM-DD', ['regex' => '/^\d{4}-\d{2}-\d{2}$/']);
+ $Err = $Val->ValidateForm($_POST);
- if ($Err) {
- include(SERVER_ROOT.'/sections/tools/managers/payment_list.php');
- die();
- }
+ if ($Err) {
+ include(SERVER_ROOT.'/sections/tools/managers/payment_list.php');
+ die();
+ }
- if ($_POST['submit'] == 'Create') {
- $DB->prepared_query("
- INSERT INTO payment_reminders
- (Text, Expiry, Active)
- VALUES (?, ?, ?)",
- $_POST['text'], $_POST['expiry'], $_POST['active'] == 'on' ? 1 : 0);
- } else {
- if (!is_number($_POST['id']) || $_POST['id'] == '') {
- error(0);
- }
+ if ($_POST['submit'] == 'Create') {
+ $DB->prepared_query("
+ INSERT INTO payment_reminders
+ (Text, Expiry, Active)
+ VALUES (?, ?, ?)",
+ $_POST['text'], $_POST['expiry'], $_POST['active'] == 'on' ? 1 : 0);
+ } else {
+ if (!is_number($_POST['id']) || $_POST['id'] == '') {
+ error(0);
+ }
- $DB->prepared_query("
- UPDATE payment_reminders
- SET Text = ?, Expiry = ?, Active = ?
- WHERE ID = ?",
- $_POST['text'], $_POST['expiry'], $_POST['active'] == 'on' ? 1 : 0,
- $_POST['id']);
- }
+ $DB->prepared_query("
+ UPDATE payment_reminders
+ SET Text = ?, Expiry = ?, Active = ?
+ WHERE ID = ?",
+ $_POST['text'], $_POST['expiry'], $_POST['active'] == 'on' ? 1 : 0,
+ $_POST['id']);
+ }
}
$Cache->delete_value('due_payments');
diff --git a/sections/tools/managers/payment_list.php b/sections/tools/managers/payment_list.php
index 8169bc75e..92b1ddc5c 100644
--- a/sections/tools/managers/payment_list.php
+++ b/sections/tools/managers/payment_list.php
@@ -1,75 +1,75 @@
prepared_query("
- SELECT ID, Text, Expiry, Active
- FROM payment_reminders");
+ SELECT ID, Text, Expiry, Active
+ FROM payment_reminders");
$Reminders = $DB->has_results() ? $DB->to_array('ID', MYSQLI_ASSOC) : [];
View::show_header('Payment Dates');
?>
-
+
-
Payment Dates
+Payment Dates
| Payment | -Expiry | -Active | -Submit | -
| Payment | +Expiry | +Active | +Submit | +
| Create Payment | -|||
| Create Payment | +|||
"; - echo "$Perm\n"; + global $Values; + $Perm = "$Title
"; + echo "$Perm\n"; } $DB->prepared_query(" - SELECT ID, Name - FROM staff_groups - ORDER BY Sort"); + SELECT ID, Name + FROM staff_groups + ORDER BY Sort"); $Groups = $DB->to_array(false, MYSQLI_ASSOC); View::show_header('Manage Permissions', 'validate'); @@ -20,58 +20,60 @@ function display_perm($Key, $Title) { echo $Val->GenerateJS('permissionsform'); ?>
-
+ diff --git a/sections/top10/users.php b/sections/top10/users.php index 2cb34a4bc..8f524d803 100644 --- a/sections/top10/users.php +++ b/sections/top10/users.php @@ -1,91 +1,92 @@ -
-
-query("
- SELECT
- tags.Name,
- ((COUNT(tags.Name) - 2) * (SUM(tt.PositiveVotes) - SUM(tt.NegativeVotes))) / (tags.Uses * 0.8) AS Score
- FROM xbt_snatched AS s
- INNER JOIN torrents AS t ON t.ID = s.fid
- INNER JOIN torrents_group AS g ON t.GroupID = g.ID
- INNER JOIN torrents_tags AS tt ON tt.GroupID = g.ID
- INNER JOIN tags ON tags.ID = tt.TagID
- WHERE s.uid = '$LoggedUser[ID]'
- AND tt.TagID != '13679'
- AND tt.TagID != '4820'
- AND tt.TagID != '2838'
- AND g.CategoryID = '1'
- AND tags.Uses > '10'
- GROUP BY tt.TagID
- ORDER BY Score DESC
- LIMIT 8");
- $TagText = array();
- while (list($Tag) = $DB->next_record()) {
- $TagText[] = "{$Tag}";
- }
- $TagText = implode(", ", $TagText);
- print <<query("
+ SELECT
+ tags.Name,
+ ((COUNT(tags.Name) - 2) * (SUM(tt.PositiveVotes) - SUM(tt.NegativeVotes))) / (tags.Uses * 0.8) AS Score
+ FROM xbt_snatched AS s
+ INNER JOIN torrents AS t ON t.ID = s.fid
+ INNER JOIN torrents_group AS g ON t.GroupID = g.ID
+ INNER JOIN torrents_tags AS tt ON tt.GroupID = g.ID
+ INNER JOIN tags ON tags.ID = tt.TagID
+ WHERE s.uid = '$LoggedUser[ID]'
+ AND tt.TagID != '13679'
+ AND tt.TagID != '4820'
+ AND tt.TagID != '2838'
+ AND g.CategoryID = '1'
+ AND tags.Uses > '10'
+ GROUP BY tt.TagID
+ ORDER BY Score DESC
+ LIMIT 8");
+ $TagText = [];
+ while (list($Tag) = $DB->next_record()) {
+ $TagText[] = "{$Tag}";
+ }
+ $TagText = implode(", ", $TagText);
+ print <<
-
-
-
'; - return; - } - $Rank = 0; - foreach ($Details as $Detail) { - $Rank++; - $Highlight = ($Rank % 2 ? 'a' : 'b'); +
+
'; + return; + } + $Rank = 0; + foreach ($Details as $Detail) { + $Rank++; + $Highlight = ($Rank % 2 ? 'a' : 'b'); ?> -
- /s
- /s
-
-
+
+ /s
+ /s
+
+
- diff --git a/sections/top10/votes.php b/sections/top10/votes.php index f33ab5a59..af2dc680f 100644 --- a/sections/top10/votes.php +++ b/sections/top10/votes.php @@ -1,4 +1,4 @@ -:]]'"; - } - } - $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"; - } + 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; + $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); + $Where = implode(' AND ', $Where); } $WhereSum = (empty($Where)) ? '' : md5($Where); @@ -47,351 +47,351 @@ // 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'; + 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 "; + $Query .= " + JOIN torrents_group AS g ON g.ID = v.GroupID + WHERE $Where AND "; } else { - $Query .= ' - WHERE '; + $Query .= ' + WHERE '; } $Query .= " - Score > 0 - ORDER BY Score DESC - LIMIT $Limit"; + 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); + 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)); + $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)); + $Groups = Torrents::get_groups(array_keys($Results)); - $TopVotes = array(); - 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]; - } + $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; - } + $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'); ?>
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+ ∧
+
+ ∨
+
+ Total
+
+
+ + Score: + | + % positive + +
+
+ $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;
- }
- if ($Torrent['Remastered'] && !$Torrent['RemasterYear']) {
- $FirstUnknown = !isset($FirstUnknown);
- }
- $SnatchedTorrentClass = $Torrent['IsSnatched'] ? ' snatched_torrent' : '';
+ 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;
+ }
+ if ($Torrent['Remastered'] && !$Torrent['RemasterYear']) {
+ $FirstUnknown = !isset($FirstUnknown);
+ }
+ $SnatchedTorrentClass = $Torrent['IsSnatched'] ? ' snatched_torrent' : '';
- if ($Torrent['RemasterTitle'] != $LastRemasterTitle
- || $Torrent['RemasterYear'] != $LastRemasterYear
- || $Torrent['RemasterRecordLabel'] != $LastRemasterRecordLabel
- || $Torrent['RemasterCatalogueNumber'] != $LastRemasterCatalogueNumber
- || (isset($FirstUnknown) && $FirstUnknown)
- || $Torrent['Media'] != $LastMedia
- ) {
- $EditionID++;
+ if ($Torrent['RemasterTitle'] != $LastRemasterTitle
+ || $Torrent['RemasterYear'] != $LastRemasterYear
+ || $Torrent['RemasterRecordLabel'] != $LastRemasterRecordLabel
+ || $Torrent['RemasterCatalogueNumber'] != $LastRemasterCatalogueNumber
+ || (isset($FirstUnknown) && $FirstUnknown)
+ || $Torrent['Media'] != $LastMedia
+ ) {
+ $EditionID++;
?>
-
- edition hidden">
+ −
+
+
-
- 1 || $GroupCategoryID == 1)
- // Viewing a type that does not require grouping
+
+ 1 || $GroupCategoryID == 1)
+ // Viewing a type that does not require grouping
- list($TorrentID, $Torrent) = each($Torrents);
- $Torrent['IsSnatched'] = Torrents::has_snatched($TorrentID);
+ list($TorrentID, $Torrent) = each($Torrents);
+ $Torrent['IsSnatched'] = Torrents::has_snatched($TorrentID);
- $DisplayName = $Number .' - '.$GroupName.'';
- 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' : '';
+ $DisplayName = $Number .' - '.$GroupName.'';
+ 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' : '';
?>
-
-
-
-
-
-
-
- 1 || $GroupCategoryID == 1)
- $TorrentTable .= ob_get_clean();
+
+
+
+
+
+
+
+ 1 || $GroupCategoryID == 1)
+ $TorrentTable .= ob_get_clean();
}
?>
-
-query("
- SELECT Name
- FROM torrents_group
- WHERE ID = $GroupID");
+ SELECT Name
+ FROM torrents_group
+ WHERE ID = $GroupID");
if (!$DB->has_results()) {
- error(404);
+ error(404);
}
list($GroupName) = $DB->next_record(MYSQLI_NUM, false);
$Changed = false;
for ($i = 0; $i < count($AliasNames); $i++) {
- $AliasName = Artists::normalise_artist_name($AliasNames[$i]);
- $Importance = $Importances[$i];
+ $AliasName = Artists::normalise_artist_name($AliasNames[$i]);
+ $Importance = $Importances[$i];
- if ($Importance != '1' && $Importance != '2' && $Importance != '3' && $Importance != '4' && $Importance != '5' && $Importance != '6' && $Importance != '7') {
- break;
- }
+ if ($Importance != '1' && $Importance != '2' && $Importance != '3' && $Importance != '4' && $Importance != '5' && $Importance != '6' && $Importance != '7') {
+ break;
+ }
- if (strlen($AliasName) > 0) {
- $DB->query("
- SELECT AliasID, ArtistID, Redirect, Name
- FROM artists_alias
- WHERE Name = '".db_string($AliasName)."'");
- while (list($AliasID, $ArtistID, $Redirect, $FoundAliasName) = $DB->next_record(MYSQLI_NUM, false)) {
- if (!strcasecmp($AliasName, $FoundAliasName)) {
- if ($Redirect) {
- $AliasID = $Redirect;
- }
- break;
- }
- }
- if (!$AliasID) {
- $AliasName = db_string($AliasName);
- $DB->query("
- INSERT INTO artists_group (Name)
- VALUES ('$AliasName')");
- $ArtistID = $DB->inserted_id();
- $DB->query("
- INSERT INTO artists_alias (ArtistID, Name)
- VALUES ('$ArtistID', '$AliasName')");
- $AliasID = $DB->inserted_id();
- }
+ if (strlen($AliasName) > 0) {
+ $DB->query("
+ SELECT AliasID, ArtistID, Redirect, Name
+ FROM artists_alias
+ WHERE Name = '".db_string($AliasName)."'");
+ while (list($AliasID, $ArtistID, $Redirect, $FoundAliasName) = $DB->next_record(MYSQLI_NUM, false)) {
+ if (!strcasecmp($AliasName, $FoundAliasName)) {
+ if ($Redirect) {
+ $AliasID = $Redirect;
+ }
+ break;
+ }
+ }
+ if (!$AliasID) {
+ $AliasName = db_string($AliasName);
+ $DB->query("
+ INSERT INTO artists_group (Name)
+ VALUES ('$AliasName')");
+ $ArtistID = $DB->inserted_id();
+ $DB->query("
+ INSERT INTO artists_alias (ArtistID, Name)
+ VALUES ('$ArtistID', '$AliasName')");
+ $AliasID = $DB->inserted_id();
+ }
- $DB->query("
- SELECT Name
- FROM artists_group
- WHERE ArtistID = $ArtistID");
- list($ArtistName) = $DB->next_record(MYSQLI_NUM, false);
+ $DB->query("
+ SELECT Name
+ FROM artists_group
+ WHERE ArtistID = $ArtistID");
+ list($ArtistName) = $DB->next_record(MYSQLI_NUM, false);
- $DB->query("
- INSERT IGNORE INTO torrents_artists
- (GroupID, ArtistID, AliasID, Importance, UserID)
- VALUES
- ('$GroupID', '$ArtistID', '$AliasID', '$Importance', '$UserID')");
+ $DB->query("
+ INSERT IGNORE INTO torrents_artists
+ (GroupID, ArtistID, AliasID, Importance, UserID)
+ VALUES
+ ('$GroupID', '$ArtistID', '$AliasID', '$Importance', '$UserID')");
- if ($DB->affected_rows()) {
- $Changed = true;
- Misc::write_log("Artist $ArtistID ($ArtistName) was added to the group $GroupID ($GroupName) as ".$ArtistTypes[$Importance].' by user '.$LoggedUser['ID'].' ('.$LoggedUser['Username'].')');
- Torrents::write_group_log($GroupID, 0, $LoggedUser['ID'], "added artist $ArtistName as ".$ArtistTypes[$Importance], 0);
- }
- }
+ if ($DB->affected_rows()) {
+ $Changed = true;
+ Misc::write_log("Artist $ArtistID ($ArtistName) was added to the group $GroupID ($GroupName) as ".$ArtistTypes[$Importance].' by user '.$LoggedUser['ID'].' ('.$LoggedUser['Username'].')');
+ Torrents::write_group_log($GroupID, 0, $LoggedUser['ID'], "added artist $ArtistName as ".$ArtistTypes[$Importance], 0);
+ }
+ }
}
if ($Changed) {
- $Cache->delete_value("torrents_details_$GroupID");
- $Cache->delete_value("groups_artists_$GroupID"); // Delete group artist cache
- Torrents::update_hash($GroupID);
+ $Cache->delete_value("torrents_details_$GroupID");
+ $Cache->delete_value("groups_artists_$GroupID"); // Delete group artist cache
+ Torrents::update_hash($GroupID);
}
$Location = (empty($_SERVER['HTTP_REFERER'])) ? "torrents.php?id={$GroupID}" : $_SERVER['HTTP_REFERER'];
diff --git a/sections/torrents/add_cover_art.php b/sections/torrents/add_cover_art.php
index 82cbd35c0..01d807056 100644
--- a/sections/torrents/add_cover_art.php
+++ b/sections/torrents/add_cover_art.php
@@ -2,7 +2,7 @@
authorize();
if (!check_perms('site_edit_wiki')) {
- error(403);
+ error(403);
}
$UserID = $LoggedUser['ID'];
@@ -12,38 +12,38 @@
$Time = sqltime();
if (!is_number($GroupID) || !$GroupID) {
- error(0);
+ error(0);
}
if (count($Images) != count($Summaries)) {
- error('Missing an image or a summary');
+ error('Missing an image or a summary');
}
$Changed = false;
for ($i = 0; $i < count($Images); $i++) {
- $Image = $Images[$i];
- $Summary = $Summaries[$i];
-
- if (ImageTools::blacklisted($Image, true) || !preg_match("/^".IMAGE_REGEX."$/i", $Image)) {
- continue;
- }
-
- // sanitize inputs
- $Image = db_string($Image);
- $Summary = db_string($Summary);
- $DB->query("
- INSERT IGNORE INTO cover_art
- (GroupID, Image, Summary, UserID, Time)
- VALUES
- ('$GroupID', '$Image', '$Summary', '$UserID', '$Time')");
-
- if ($DB->affected_rows()) {
- $Changed = true;
- }
+ $Image = $Images[$i];
+ $Summary = $Summaries[$i];
+
+ if (ImageTools::blacklisted($Image, true) || !preg_match("/^".IMAGE_REGEX."$/i", $Image)) {
+ continue;
+ }
+
+ // sanitize inputs
+ $Image = db_string($Image);
+ $Summary = db_string($Summary);
+ $DB->query("
+ INSERT IGNORE INTO cover_art
+ (GroupID, Image, Summary, UserID, Time)
+ VALUES
+ ('$GroupID', '$Image', '$Summary', '$UserID', '$Time')");
+
+ if ($DB->affected_rows()) {
+ $Changed = true;
+ }
}
if ($Changed) {
- $Cache->delete_value("torrents_cover_art_$GroupID");
+ $Cache->delete_value("torrents_cover_art_$GroupID");
}
$Location = (empty($_SERVER['HTTP_REFERER'])) ? "torrents.php?id={$GroupID}" : $_SERVER['HTTP_REFERER'];
diff --git a/sections/torrents/add_tag.php b/sections/torrents/add_tag.php
index 2be54bb4e..b967cd620 100644
--- a/sections/torrents/add_tag.php
+++ b/sections/torrents/add_tag.php
@@ -1,7 +1,7 @@
-delete_value("deleted_tags_$GroupID".'_'.$LoggedUser['ID']);
+ $Cache->delete_value("deleted_tags_$GroupID".'_'.$LoggedUser['ID']);
}
$Tags = explode(',', $_POST['tagname']);
foreach ($Tags as $TagName) {
- $TagName = Misc::sanitize_tag($TagName);
+ $TagName = Misc::sanitize_tag($TagName);
- if (!empty($TagName)) {
- $TagName = Misc::get_alias_tag($TagName);
- // Check DB for tag matching name
- $DB->query("
- SELECT ID
- FROM tags
- WHERE Name LIKE '$TagName'");
- list($TagID) = $DB->next_record();
+ if (!empty($TagName)) {
+ $TagName = Misc::get_alias_tag($TagName);
+ // Check DB for tag matching name
+ $DB->query("
+ SELECT ID
+ FROM tags
+ WHERE Name LIKE '$TagName'");
+ list($TagID) = $DB->next_record();
- if (!$TagID) { // Tag doesn't exist yet - create tag
- $DB->query("
- INSERT INTO tags (Name, UserID)
- VALUES ('$TagName', $UserID)");
- $TagID = $DB->inserted_id();
- } else {
- $DB->query("
- SELECT TagID
- FROM torrents_tags_votes
- WHERE GroupID = '$GroupID'
- AND TagID = '$TagID'
- AND UserID = '$UserID'");
- if ($DB->has_results()) { // User has already voted on this tag, and is trying hax to make the rating go up
- header("Location: {$Location}");
- die();
- }
- }
+ if (!$TagID) { // Tag doesn't exist yet - create tag
+ $DB->query("
+ INSERT INTO tags (Name, UserID)
+ VALUES ('$TagName', $UserID)");
+ $TagID = $DB->inserted_id();
+ } else {
+ $DB->query("
+ SELECT TagID
+ FROM torrents_tags_votes
+ WHERE GroupID = '$GroupID'
+ AND TagID = '$TagID'
+ AND UserID = '$UserID'");
+ if ($DB->has_results()) { // User has already voted on this tag, and is trying hax to make the rating go up
+ header("Location: {$Location}");
+ die();
+ }
+ }
- $DB->query("
- INSERT INTO torrents_tags
- (TagID, GroupID, PositiveVotes, UserID)
- VALUES
- ('$TagID', '$GroupID', '3', '$UserID')
- ON DUPLICATE KEY UPDATE
- PositiveVotes = PositiveVotes + 2");
+ $DB->query("
+ INSERT INTO torrents_tags
+ (TagID, GroupID, PositiveVotes, UserID)
+ VALUES
+ ('$TagID', '$GroupID', '3', '$UserID')
+ ON DUPLICATE KEY UPDATE
+ PositiveVotes = PositiveVotes + 2");
- $DB->query("
- INSERT INTO torrents_tags_votes
- (GroupID, TagID, UserID, Way)
- VALUES
- ('$GroupID', '$TagID', '$UserID', 'up')");
+ $DB->query("
+ INSERT INTO torrents_tags_votes
+ (GroupID, TagID, UserID, Way)
+ VALUES
+ ('$GroupID', '$TagID', '$UserID', 'up')");
- $DB->query("
- INSERT INTO group_log
- (GroupID, UserID, Time, Info)
- VALUES
- ('$GroupID', ".$LoggedUser['ID'].", '".sqltime()."', '".db_string("Tag \"$TagName\" added to group")."')");
- }
+ $DB->query("
+ INSERT INTO group_log
+ (GroupID, UserID, Time, Info)
+ VALUES
+ ('$GroupID', ".$LoggedUser['ID'].", '".sqltime()."', '".db_string("Tag \"$TagName\" added to group")."')");
+ }
}
Torrents::update_hash($GroupID); // Delete torrent group cache
diff --git a/sections/torrents/autocomplete_tags.php b/sections/torrents/autocomplete_tags.php
index 94deb256e..f23ec293e 100644
--- a/sections/torrents/autocomplete_tags.php
+++ b/sections/torrents/autocomplete_tags.php
@@ -1,4 +1,4 @@
-get("autocomplete_tags_{$KeySize}_$Letters");
if (!$AutoSuggest) {
- $Limit = (($KeySize === $MaxKeySize) ? 250 : 10);
- $DB->query("
- SELECT Name
- FROM tags
- WHERE Name != ''
- AND Name LIKE '".db_string(str_replace('\\', '\\\\', $Letters), true)."%'
- AND (Uses > 700 OR TagType = 'genre')
- ORDER BY TagType = 'genre' DESC, Uses DESC
- LIMIT $Limit");
- $AutoSuggest = $DB->to_array(false, MYSQLI_NUM, false);
- $Cache->cache_value("autocomplete_tags_{$KeySize}_$Letters", $AutoSuggest, 1800 + 7200 * ($MaxKeySize - $KeySize)); // Can't cache things for too long in case names are edited
+ $Limit = (($KeySize === $MaxKeySize) ? 250 : 10);
+ $DB->query("
+ SELECT Name
+ FROM tags
+ WHERE Name != ''
+ AND Name LIKE '".db_string(str_replace('\\', '\\\\', $Letters), true)."%'
+ AND (Uses > 700 OR TagType = 'genre')
+ ORDER BY TagType = 'genre' DESC, Uses DESC
+ LIMIT $Limit");
+ $AutoSuggest = $DB->to_array(false, MYSQLI_NUM, false);
+ $Cache->cache_value("autocomplete_tags_{$KeySize}_$Letters", $AutoSuggest, 1800 + 7200 * ($MaxKeySize - $KeySize)); // Can't cache things for too long in case names are edited
}
$Matched = 0;
-$ArtistIDs = array();
+$ArtistIDs = [];
$Response = array(
- 'query' => $FullName,
- 'suggestions' => array()
+ 'query' => $FullName,
+ 'suggestions' => []
);
foreach ($AutoSuggest as $Suggestion) {
- list($Name) = $Suggestion;
- if (stripos($Name, $FullName) === 0) {
- $Response['suggestions'][] = array('value' => $Name);
- if (++$Matched > 9) {
- break;
- }
- }
+ list($Name) = $Suggestion;
+ if (stripos($Name, $FullName) === 0) {
+ $Response['suggestions'][] = array('value' => $Name);
+ if (++$Matched > 9) {
+ break;
+ }
+ }
}
echo json_encode($Response);
diff --git a/sections/torrents/browse.php b/sections/torrents/browse.php
index f4af82844..4f3f30ade 100644
--- a/sections/torrents/browse.php
+++ b/sections/torrents/browse.php
@@ -1,111 +1,111 @@
-prepared_query("
- SELECT ID, GroupID
- FROM torrents
- WHERE info_hash = UNHEX(?)", $InfoHash);
- if ($DB->has_results()) {
- list($ID, $GroupID) = $DB->next_record();
- header("Location: torrents.php?id=$GroupID&torrentid=$ID");
- die();
- }
- }
+ if (!empty($_GET['searchstr'])) {
+ $InfoHash = $_GET['searchstr'];
+
+ } else {
+ $InfoHash = $_GET['groupname'];
+ }
+
+ // Search by infohash
+ if ($InfoHash = is_valid_torrenthash($InfoHash)) {
+ $DB->prepared_query("
+ SELECT ID, GroupID
+ FROM torrents
+ WHERE info_hash = UNHEX(?)", $InfoHash);
+ if ($DB->has_results()) {
+ list($ID, $GroupID) = $DB->next_record();
+ header("Location: torrents.php?id=$GroupID&torrentid=$ID");
+ die();
+ }
+ }
}
// Setting default search options
if (!empty($_GET['setdefault'])) {
- $UnsetList = array('page', 'setdefault');
- $UnsetRegexp = '/(&|^)('.implode('|', $UnsetList).')=.*?(&|$)/i';
-
- $DB->query("
- SELECT SiteOptions
- FROM users_info
- WHERE UserID = '".db_string($LoggedUser['ID'])."'");
- list($SiteOptions) = $DB->next_record(MYSQLI_NUM, false);
- $SiteOptions = unserialize_array($SiteOptions);
- $SiteOptions = array_merge(Users::default_site_options(), $SiteOptions);
-
- $SiteOptions['DefaultSearch'] = preg_replace($UnsetRegexp, '', $_SERVER['QUERY_STRING']);
- $DB->query("
- UPDATE users_info
- SET SiteOptions = '".db_string(serialize($SiteOptions))."'
- WHERE UserID = '".db_string($LoggedUser['ID'])."'");
- $Cache->begin_transaction("user_info_heavy_$UserID");
- $Cache->update_row(false, array('DefaultSearch' => $SiteOptions['DefaultSearch']));
- $Cache->commit_transaction(0);
+ $UnsetList = array('page', 'setdefault');
+ $UnsetRegexp = '/(&|^)('.implode('|', $UnsetList).')=.*?(&|$)/i';
+
+ $DB->query("
+ SELECT SiteOptions
+ FROM users_info
+ WHERE UserID = '".db_string($LoggedUser['ID'])."'");
+ list($SiteOptions) = $DB->next_record(MYSQLI_NUM, false);
+ $SiteOptions = unserialize_array($SiteOptions);
+ $SiteOptions = array_merge(Users::default_site_options(), $SiteOptions);
+
+ $SiteOptions['DefaultSearch'] = preg_replace($UnsetRegexp, '', $_SERVER['QUERY_STRING']);
+ $DB->query("
+ UPDATE users_info
+ SET SiteOptions = '".db_string(serialize($SiteOptions))."'
+ WHERE UserID = '".db_string($LoggedUser['ID'])."'");
+ $Cache->begin_transaction("user_info_heavy_$UserID");
+ $Cache->update_row(false, array('DefaultSearch' => $SiteOptions['DefaultSearch']));
+ $Cache->commit_transaction(0);
// Clearing default search options
} elseif (!empty($_GET['cleardefault'])) {
- $DB->query("
- SELECT SiteOptions
- FROM users_info
- WHERE UserID = '".db_string($LoggedUser['ID'])."'");
- list($SiteOptions) = $DB->next_record(MYSQLI_NUM, false);
- $SiteOptions = unserialize_array($SiteOptions);
- $SiteOptions['DefaultSearch'] = '';
- $DB->query("
- UPDATE users_info
- SET SiteOptions = '".db_string(serialize($SiteOptions))."'
- WHERE UserID = '".db_string($LoggedUser['ID'])."'");
- $Cache->begin_transaction("user_info_heavy_$UserID");
- $Cache->update_row(false, array('DefaultSearch' => ''));
- $Cache->commit_transaction(0);
+ $DB->query("
+ SELECT SiteOptions
+ FROM users_info
+ WHERE UserID = '".db_string($LoggedUser['ID'])."'");
+ list($SiteOptions) = $DB->next_record(MYSQLI_NUM, false);
+ $SiteOptions = unserialize_array($SiteOptions);
+ $SiteOptions['DefaultSearch'] = '';
+ $DB->query("
+ UPDATE users_info
+ SET SiteOptions = '".db_string(serialize($SiteOptions))."'
+ WHERE UserID = '".db_string($LoggedUser['ID'])."'");
+ $Cache->begin_transaction("user_info_heavy_$UserID");
+ $Cache->update_row(false, array('DefaultSearch' => ''));
+ $Cache->commit_transaction(0);
// Use default search options
} elseif (empty($_SERVER['QUERY_STRING']) || (count($_GET) === 1 && isset($_GET['page']))) {
- if (!empty($LoggedUser['DefaultSearch'])) {
- if (!empty($_GET['page'])) {
- $Page = $_GET['page'];
- parse_str($LoggedUser['DefaultSearch'], $_GET);
- $_GET['page'] = $Page;
- } else {
- parse_str($LoggedUser['DefaultSearch'], $_GET);
- }
- }
+ if (!empty($LoggedUser['DefaultSearch'])) {
+ if (!empty($_GET['page'])) {
+ $Page = $_GET['page'];
+ parse_str($LoggedUser['DefaultSearch'], $_GET);
+ $_GET['page'] = $Page;
+ } else {
+ parse_str($LoggedUser['DefaultSearch'], $_GET);
+ }
+ }
}
// Terms were not submitted via the search form
if (isset($_GET['searchsubmit'])) {
- $GroupResults = !empty($_GET['group_results']);
+ $GroupResults = !empty($_GET['group_results']);
} else {
- $GroupResults = !$LoggedUser['DisableGrouping2'];
+ $GroupResults = !$LoggedUser['DisableGrouping2'];
}
if (!empty($_GET['order_way']) && $_GET['order_way'] == 'asc') {
- $OrderWay = 'asc';
+ $OrderWay = 'asc';
} else {
- $OrderWay = 'desc';
+ $OrderWay = 'desc';
}
if (empty($_GET['order_by']) || !isset(TorrentSearch::$SortOrders[$_GET['order_by']])) {
- $OrderBy = 'time'; // For header links
+ $OrderBy = 'time'; // For header links
} else {
- $OrderBy = $_GET['order_by'];
+ $OrderBy = $_GET['order_by'];
}
$Page = !empty($_GET['page']) ? (int) $_GET['page'] : 1;
@@ -115,7 +115,7 @@ function header_link($SortKey, $DefaultWay = 'desc') {
$RealNumResults = $NumResults = $Search->record_count();
if (!check_perms('site_search_many')) {
- $NumResults = min($NumResults, SPHINX_MAX_MATCHES);
+ $NumResults = min($NumResults, SPHINX_MAX_MATCHES);
}
$HideFilter = isset($LoggedUser['ShowTorFilter']) && $LoggedUser['ShowTorFilter'] == 0;
@@ -124,355 +124,355 @@ function header_link($SortKey, $DefaultWay = 'desc') {
$AdvancedSearch |= !empty($LoggedUser['SearchType']) && (empty($_GET['action']) || $_GET['action'] == 'advanced');
$AdvancedSearch &= check_perms('site_advanced_search');
if ($AdvancedSearch) {
- $Action = 'action=advanced';
- $HideBasic = ' hidden';
- $HideAdvanced = '';
+ $Action = 'action=advanced';
+ $HideBasic = ' hidden';
+ $HideAdvanced = '';
} else {
- $Action = 'action=basic';
- $HideBasic = '';
- $HideAdvanced = ' hidden';
+ $Action = 'action=basic';
+ $HideBasic = '';
+ $HideAdvanced = ' hidden';
}
View::show_header('Browse Torrents', 'browse');
?>
Top 10 Users
- +
+
-
+'". 5 * 1024 * 1024 * 1024 ."'
- AND Downloaded>'". 5 * 1024 * 1024 * 1024 ."'
- AND (Paranoia IS NULL OR (Paranoia NOT LIKE '%\"uploaded\"%' AND Paranoia NOT LIKE '%\"downloaded\"%'))
- GROUP BY u.ID";
+ SELECT
+ um.ID,
+ ui.JoinDate,
+ uls.Uploaded,
+ uls.Downloaded,
+ ABS(uls.Uploaded-".STARTING_UPLOAD.") / (".time()." - UNIX_TIMESTAMP(ui.JoinDate)) AS UpSpeed,
+ uls.Downloaded / (".time()." - UNIX_TIMESTAMP(ui.JoinDate)) AS DownSpeed,
+ count(t.ID) AS NumUploads
+ FROM users_main AS um
+ INNER JOIN users_info AS ui ON (ui.UserID = um.ID)
+ INNER JOIN users_leech_stats AS uls ON (uls.UserID = um.ID)
+ LEFT JOIN torrents AS t ON (t.UserID = um.ID)
+ WHERE um.Enabled='1'
+ AND uls.Uploaded>'". 5 * 1024 * 1024 * 1024 ."'
+ AND uls.Downloaded>'". 5 * 1024 * 1024 * 1024 ."'
+ AND (um.Paranoia IS NULL OR (um.Paranoia NOT LIKE '%\"uploaded\"%' AND um.Paranoia NOT LIKE '%\"downloaded\"%'))
+ GROUP BY um.ID";
- if ($Details == 'all' || $Details == 'ul') {
- if (!$TopUserUploads = $Cache->get_value('topuser_ul_'.$Limit)) {
- $DB->query("$BaseQuery ORDER BY u.Uploaded DESC LIMIT $Limit;");
- $TopUserUploads = $DB->to_array();
- $Cache->cache_value('topuser_ul_'.$Limit,$TopUserUploads, 3600 * 12);
- }
- generate_user_table('Uploaders', 'ul', $TopUserUploads, $Limit);
- }
+ if ($Details == 'all' || $Details == 'ul') {
+ if (!$TopUserUploads = $Cache->get_value('topuser_ul_'.$Limit)) {
+ $DB->query("$BaseQuery ORDER BY uls.Uploaded DESC LIMIT $Limit;");
+ $TopUserUploads = $DB->to_array();
+ $Cache->cache_value('topuser_ul_'.$Limit,$TopUserUploads, 3600 * 12);
+ }
+ generate_user_table('Uploaders', 'ul', $TopUserUploads, $Limit);
+ }
- if ($Details == 'all' || $Details == 'dl') {
- if (!$TopUserDownloads = $Cache->get_value('topuser_dl_'.$Limit)) {
- $DB->query("$BaseQuery ORDER BY u.Downloaded DESC LIMIT $Limit;");
- $TopUserDownloads = $DB->to_array();
- $Cache->cache_value('topuser_dl_'.$Limit,$TopUserDownloads, 3600 * 12);
- }
- generate_user_table('Downloaders', 'dl', $TopUserDownloads, $Limit);
- }
+ if ($Details == 'all' || $Details == 'dl') {
+ if (!$TopUserDownloads = $Cache->get_value('topuser_dl_'.$Limit)) {
+ $DB->query("$BaseQuery ORDER BY uls.Downloaded DESC LIMIT $Limit;");
+ $TopUserDownloads = $DB->to_array();
+ $Cache->cache_value('topuser_dl_'.$Limit,$TopUserDownloads, 3600 * 12);
+ }
+ generate_user_table('Downloaders', 'dl', $TopUserDownloads, $Limit);
+ }
- if ($Details == 'all' || $Details == 'numul') {
- if (!$TopUserNumUploads = $Cache->get_value('topuser_numul_'.$Limit)) {
- $DB->query("$BaseQuery ORDER BY NumUploads DESC LIMIT $Limit;");
- $TopUserNumUploads = $DB->to_array();
- $Cache->cache_value('topuser_numul_'.$Limit,$TopUserNumUploads, 3600 * 12);
- }
- generate_user_table('Torrents Uploaded', 'numul', $TopUserNumUploads, $Limit);
- }
+ if ($Details == 'all' || $Details == 'numul') {
+ if (!$TopUserNumUploads = $Cache->get_value('topuser_numul_'.$Limit)) {
+ $DB->query("$BaseQuery ORDER BY NumUploads DESC LIMIT $Limit;");
+ $TopUserNumUploads = $DB->to_array();
+ $Cache->cache_value('topuser_numul_'.$Limit,$TopUserNumUploads, 3600 * 12);
+ }
+ generate_user_table('Torrents Uploaded', 'numul', $TopUserNumUploads, $Limit);
+ }
- if ($Details == 'all' || $Details == 'uls') {
- if (!$TopUserUploadSpeed = $Cache->get_value('topuser_ulspeed_'.$Limit)) {
- $DB->query("$BaseQuery ORDER BY UpSpeed DESC LIMIT $Limit;");
- $TopUserUploadSpeed = $DB->to_array();
- $Cache->cache_value('topuser_ulspeed_'.$Limit,$TopUserUploadSpeed, 3600 * 12);
- }
- generate_user_table('Fastest Uploaders', 'uls', $TopUserUploadSpeed, $Limit);
- }
+ if ($Details == 'all' || $Details == 'uls') {
+ if (!$TopUserUploadSpeed = $Cache->get_value('topuser_ulspeed_'.$Limit)) {
+ $DB->query("$BaseQuery ORDER BY UpSpeed DESC LIMIT $Limit;");
+ $TopUserUploadSpeed = $DB->to_array();
+ $Cache->cache_value('topuser_ulspeed_'.$Limit,$TopUserUploadSpeed, 3600 * 12);
+ }
+ generate_user_table('Fastest Uploaders', 'uls', $TopUserUploadSpeed, $Limit);
+ }
- if ($Details == 'all' || $Details == 'dls') {
- if (!$TopUserDownloadSpeed = $Cache->get_value('topuser_dlspeed_'.$Limit)) {
- $DB->query("$BaseQuery ORDER BY DownSpeed DESC LIMIT $Limit;");
- $TopUserDownloadSpeed = $DB->to_array();
- $Cache->cache_value('topuser_dlspeed_'.$Limit,$TopUserDownloadSpeed, 3600 * 12);
- }
- generate_user_table('Fastest Downloaders', 'dls', $TopUserDownloadSpeed, $Limit);
- }
+ if ($Details == 'all' || $Details == 'dls') {
+ if (!$TopUserDownloadSpeed = $Cache->get_value('topuser_dlspeed_'.$Limit)) {
+ $DB->query("$BaseQuery ORDER BY DownSpeed DESC LIMIT $Limit;");
+ $TopUserDownloadSpeed = $DB->to_array();
+ $Cache->cache_value('topuser_dlspeed_'.$Limit,$TopUserDownloadSpeed, 3600 * 12);
+ }
+ generate_user_table('Fastest Downloaders', 'dls', $TopUserDownloadSpeed, $Limit);
+ }
@@ -95,71 +96,73 @@
// generate a table based on data from most recent query to $DB
function generate_user_table($Caption, $Tag, $Details, $Limit) {
- global $Time;
+ global $Time;
?>
- Top 10 Users
+ -Top - - - - Top 10 - - Top 100 - - Top 250 - - - Top 10 - - Top 100 - - Top 250 - - - Top 10 - - Top 100 - - Top 250 - - -
-| Rank | -User | -Uploaded | -UL speed | -Downloaded | -DL speed | -Uploads | -Ratio | -Joined | -- Found no users matching the criteria - | - -
'; - return; - } - $Rank = 0; - foreach ($Details as $Detail) { - $Rank++; - $Highlight = ($Rank % 2 ? 'a' : 'b'); +
Top + + + - Top 10 + - Top 100 + - Top 250 + + - Top 10 + - Top 100 + - Top 250 + + - Top 10 + - Top 100 + - Top 250 + + +
+| Rank | +User | +Uploaded | +UL speed | +Downloaded | +DL speed | +Uploads | +Ratio | +Joined | ++ Found no users matching the criteria + | + +
'; + return; + } + $Rank = 0; + foreach ($Details as $Detail) { + $Rank++; + $Highlight = ($Rank % 2 ? 'a' : 'b'); ?> -
- diff --git a/sections/top10/votes.php b/sections/top10/votes.php index f33ab5a59..af2dc680f 100644 --- a/sections/top10/votes.php +++ b/sections/top10/votes.php @@ -1,4 +1,4 @@ -:]]'"; - } - } - $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"; - } + 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; + $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); + $Where = implode(' AND ', $Where); } $WhereSum = (empty($Where)) ? '' : md5($Where); @@ -47,351 +47,351 @@ // 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'; + 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 "; + $Query .= " + JOIN torrents_group AS g ON g.ID = v.GroupID + WHERE $Where AND "; } else { - $Query .= ' - WHERE '; + $Query .= ' + WHERE '; } $Query .= " - Score > 0 - ORDER BY Score DESC - LIMIT $Limit"; + 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); + 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)); + $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)); + $Groups = Torrents::get_groups(array_keys($Results)); - $TopVotes = array(); - 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]; - } + $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; - } + $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'); ?>
-
+
-
-
+
+
+
-
-
+ Top Voted Groups
- -Top Voted Groups
+ +| Tags (comma-separated): | ++ + /> + /> + | +
| Year: | ++ + to + + | +
| + + | +|
Top -Top + - - - - Top 25 - - Top 100 - - Top 250 - - - Top 25 - - Top 100 - - Top 250 - - - Top 25 - - Top 100 - - Top 250 - - - + + - Top 25 + - Top 100 + - Top 250 + + - Top 25 + - Top 100 + - Top 250 + + - Top 25 + - Top 100 + - Top 250 + + + -
- + $Group) { - extract(Torrents::array_group($Group)); - $UpVotes = $Group['Ups']; - $TotalVotes = $Group['Total']; - $Score = $Group['Score']; - $DownVotes = $TotalVotes - $UpVotes; + 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'] : ''; + $IsBookmarked = in_array($GroupID, $Bookmarks); + $UserVote = isset($UserVotes[$GroupID]) ? $UserVotes[$GroupID]['Type'] : ''; - $TorrentTags = new Tags($TagList); - $DisplayName = "$Group[Rank] - "; + $TorrentTags = new Tags($TagList); + $DisplayName = "$Group[Rank] - "; - if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4]) || !empty($ExtendedArtists[5])|| !empty($ExtendedArtists[6])) { - unset($ExtendedArtists[2]); - unset($ExtendedArtists[3]); - $DisplayName .= Artists::display_artists($ExtendedArtists); - } elseif (count($Artists) > 0) { - $DisplayName .= Artists::display_artists(array('1' => $Artists)); - } + if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4]) || !empty($ExtendedArtists[5])|| !empty($ExtendedArtists[6])) { + unset($ExtendedArtists[2]); + unset($ExtendedArtists[3]); + $DisplayName .= Artists::display_artists($ExtendedArtists); + } elseif (count($Artists) > 0) { + $DisplayName .= Artists::display_artists(array('1' => $Artists)); + } - $DisplayName .= ''.$GroupName.''; - if ($GroupYear > 0) { - $DisplayName = $DisplayName. " [$GroupYear]"; - } - if ($GroupVanityHouse) { - $DisplayName .= ' [VH]'; - } - // Start an output buffer, so we can store this output in $TorrentTable - ob_start(); + $DisplayName .= ''.$GroupName.''; + if ($GroupYear > 0) { + $DisplayName = $DisplayName. " [$GroupYear]"; + } + if ($GroupVanityHouse) { + $DisplayName .= ' [VH]'; + } + // 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' : ''; + 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' : ''; ?> -
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
- ∧
-
- ∨
-
- Total
-
-
- - Score: - | - % positive - -
-
-
+
+
+
+
+
- - - Score: - | - % positive - -
+ + Score: + | + % positive + +
-
-
-
-
-
-
-
- [ DL
-
- | FL
-
- | RP
-
- | Remove bookmark
-
- | Bookmark
-
- ]
-
-
-
-
-
+
+
+
+
+
+
+
+ [ DL
+
+ | FL
+
+ | RP
+
+ | Remove bookmark
+
+ | Bookmark
+
+ ]
+
+
+
+
+ | - | - | Torrents | -Size | - |
- |
- |
- + | + | Torrents | +Size | + |
+ |
+ |
+
+
-
| Server is busy processing another top list request. Please try again in a minute. | -Server is busy processing another top list request. Please try again in a minute. | + + -|||||
| No torrents were found that meet your criteria. | -No torrents were found that meet your criteria. | + +|||||
-
Torrents
+Torrents
Your search did not match anything.
-Make sure all names are spelled correctly, or try making your search less specific.
-You might like (beta): {$TagText}
+Your search did not match anything.
+Make sure all names are spelled correctly, or try making your search less specific.
+You might like (beta): {$TagText}
HTML; - View::show_footer(); - die(); + View::show_footer(); + die(); } if ($NumResults < ($Page - 1) * TORRENTS_PER_PAGE + 1) { - $LastPage = ceil($NumResults / TORRENTS_PER_PAGE); - $Pages = Format::get_pages(0, $NumResults, TORRENTS_PER_PAGE); + $LastPage = ceil($NumResults / TORRENTS_PER_PAGE); + $Pages = Format::get_pages(0, $NumResults, TORRENTS_PER_PAGE); ?>
-
The requested page contains no matches.
-You are requesting page , but the search returned only pages.
+The requested page contains no matches.
+You are requesting page , but the search returned only pages.
Go to page
-
| - - | - | Name / Year | -Files | -Time | -Size | -
-
- 
-
- |
-
-
- 
-
- |
-
-
- 
-
- |
- + + | + | Name / Year | +Files | +Time | +Size | +
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+ $GroupID) {
- $GroupInfo = $Groups[$GroupID];
- if (empty($GroupInfo['Torrents'])) {
- continue;
- }
-
- $CategoryID = $GroupInfo['CategoryID'];
- $GroupYear = $GroupInfo['Year'];
- $ExtendedArtists = $GroupInfo['ExtendedArtists'];
- $GroupCatalogueNumber = $GroupInfo['CatalogueNumber'];
- $GroupName = $GroupInfo['Name'];
- $GroupRecordLabel = $GroupInfo['RecordLabel'];
- $ReleaseType = $GroupInfo['ReleaseType'];
- if ($GroupResults) {
- $Torrents = $GroupInfo['Torrents'];
- $GroupTime = $MaxSize = $TotalLeechers = $TotalSeeders = $TotalSnatched = 0;
- foreach ($Torrents as $T) {
- $GroupTime = max($GroupTime, strtotime($T['Time']));
- $MaxSize = max($MaxSize, $T['Size']);
- $TotalLeechers += $T['Leechers'];
- $TotalSeeders += $T['Seeders'];
- $TotalSnatched += $T['Snatched'];
- }
- } else {
- $TorrentID = $Key;
- $Torrents = array($TorrentID => $GroupInfo['Torrents'][$TorrentID]);
- }
-
- $TorrentTags = new Tags($GroupInfo['TagList']);
-
- if (!empty($ExtendedArtists[1])
- || !empty($ExtendedArtists[4])
- || !empty($ExtendedArtists[5])
- || !empty($ExtendedArtists[6])
- ) {
- unset($ExtendedArtists[2]);
- unset($ExtendedArtists[3]);
- $DisplayName = Artists::display_artists($ExtendedArtists);
- } else {
- $DisplayName = '';
- }
- $SnatchedGroupClass = $GroupInfo['Flags']['IsSnatched'] ? ' snatched_group' : '';
-
- if ($GroupResults && (count($Torrents) > 1 || isset($GroupedCategories[$CategoryID - 1]))) {
- // These torrents are in a group
- $DisplayName .= "$GroupName";
- if ($GroupYear > 0) {
- $DisplayName .= " [$GroupYear]";
- }
- if ($GroupInfo['VanityHouse']) {
- $DisplayName .= ' [VH]';
- }
- $DisplayName .= ' ['.$ReleaseTypes[$ReleaseType].']';
+ $GroupInfo = $Groups[$GroupID];
+ if (empty($GroupInfo['Torrents'])) {
+ continue;
+ }
+
+ $CategoryID = $GroupInfo['CategoryID'];
+ $GroupYear = $GroupInfo['Year'];
+ $ExtendedArtists = $GroupInfo['ExtendedArtists'];
+ $GroupCatalogueNumber = $GroupInfo['CatalogueNumber'];
+ $GroupName = $GroupInfo['Name'];
+ $GroupRecordLabel = $GroupInfo['RecordLabel'];
+ $ReleaseType = $GroupInfo['ReleaseType'];
+ if ($GroupResults) {
+ $Torrents = $GroupInfo['Torrents'];
+ $GroupTime = $MaxSize = $TotalLeechers = $TotalSeeders = $TotalSnatched = 0;
+ foreach ($Torrents as $T) {
+ $GroupTime = max($GroupTime, strtotime($T['Time']));
+ $MaxSize = max($MaxSize, $T['Size']);
+ $TotalLeechers += $T['Leechers'];
+ $TotalSeeders += $T['Seeders'];
+ $TotalSnatched += $T['Snatched'];
+ }
+ } else {
+ $TorrentID = $Key;
+ $Torrents = array($TorrentID => $GroupInfo['Torrents'][$TorrentID]);
+ }
+
+ $TorrentTags = new Tags($GroupInfo['TagList']);
+
+ if (!empty($ExtendedArtists[1])
+ || !empty($ExtendedArtists[4])
+ || !empty($ExtendedArtists[5])
+ || !empty($ExtendedArtists[6])
+ ) {
+ unset($ExtendedArtists[2]);
+ unset($ExtendedArtists[3]);
+ $DisplayName = Artists::display_artists($ExtendedArtists);
+ } else {
+ $DisplayName = '';
+ }
+ $SnatchedGroupClass = $GroupInfo['Flags']['IsSnatched'] ? ' snatched_group' : '';
+
+ if ($GroupResults && (count($Torrents) > 1 || isset($GroupedCategories[$CategoryID - 1]))) {
+ // These torrents are in a group
+ $DisplayName .= "$GroupName";
+ if ($GroupYear > 0) {
+ $DisplayName .= " [$GroupYear]";
+ }
+ if ($GroupInfo['VanityHouse']) {
+ $DisplayName .= ' [VH]';
+ }
+ $DisplayName .= ' ['.$ReleaseTypes[$ReleaseType].']';
?>
-
| - - | -
-
-
- |
-
-
-
-
-
-
-
- |
- - | (Max) | -- | - | - | + + | +
+
+
+ |
+
+
+
+
+
+
+
+ |
+ + | (Max) | ++ | + | + + $Data) { + // All of the individual torrents in the group + + //Get report info for each torrent, use the cache if available, if not, add to it. + $Reported = false; + $Reports = Torrents::get_reports($TorrentID); + if (count($Reports) > 0) { + $Reported = true; + } + + if ($Data['Remastered'] && !$Data['RemasterYear']) { + $FirstUnknown = !isset($FirstUnknown); + } + $SnatchedTorrentClass = $Data['IsSnatched'] ? ' snatched_torrent' : ''; + + if (isset($GroupedCategories[$CategoryID - 1]) + && ($Data['RemasterTitle'] != $LastRemasterTitle + || $Data['RemasterYear'] != $LastRemasterYear + || $Data['RemasterRecordLabel'] != $LastRemasterRecordLabel + || $Data['RemasterCatalogueNumber'] != $LastRemasterCatalogueNumber) + || (isset($FirstUnknown) && $FirstUnknown) + || $Data['Media'] != $LastMedia + ) { + $EditionID++; ?> - - edition"> + | − | + + - -$GroupName"; - if (isset($GroupedCategories[$CategoryID - 1])) { - if ($GroupYear) { - $DisplayName .= " [$GroupYear]"; - } - if ($CategoryID == 1 && $ReleaseType > 0) { - $DisplayName .= ' ['.$ReleaseTypes[$ReleaseType].']'; - } - $ExtraInfo = Torrents::torrent_info($Data, true, true); - } elseif ($Data['IsSnatched']) { - $ExtraInfo = Format::torrent_label('Snatched!'); - } else { - $ExtraInfo = ''; - } - $SnatchedTorrentClass = $Data['IsSnatched'] ? ' snatched_torrent' : ''; + +$GroupName"; + if (isset($GroupedCategories[$CategoryID - 1])) { + if ($GroupYear) { + $DisplayName .= " [$GroupYear]"; + } + if ($CategoryID == 1 && $ReleaseType > 0) { + $DisplayName .= ' ['.$ReleaseTypes[$ReleaseType].']'; + } + $ExtraInfo = Torrents::torrent_info($Data, true, true); + } elseif ($Data['IsSnatched']) { + $ExtraInfo = Format::torrent_label('Snatched!'); + } else { + $ExtraInfo = ''; + } + $SnatchedTorrentClass = $Data['IsSnatched'] ? ' snatched_torrent' : ''; ?> -
| - - | - - | -
-
-
-
-
-
-
- |
- - | - | - | - | - | - | + + | + + | +
+
+
+
+
+
+
+ |
+ + | + | + | + | + | + + |
-
-
-
+
- Delete torrent
-
-
-
-
-
+
+ Delete torrent
+
+
+
+
+
-query("
- SELECT
- tg.Name,
- tg.ID,
- CASE COUNT(ta.GroupID)
- WHEN 1 THEN aa.ArtistID
- WHEN 0 THEN '0'
- ELSE '0'
- END AS ArtistID,
- CASE COUNT(ta.GroupID)
- WHEN 1 THEN aa.Name
- WHEN 0 THEN ''
- ELSE 'Various Artists'
- END AS ArtistName,
- tg.Year,
- tg.CategoryID,
- t.Time,
- t.Remastered,
- t.RemasterTitle,
- t.RemasterYear,
- t.Media,
- t.Format,
- t.Encoding,
- t.Size,
- t.HasLog,
- t.HasLogDB,
- t.LogScore,
- t.LogChecksum,
- t.UserID AS UploaderID,
- uploader.Username
- FROM torrents AS t
- LEFT JOIN torrents_group AS tg ON tg.ID = t.GroupID
- LEFT JOIN torrents_artists AS ta ON ta.GroupID = tg.ID AND ta.Importance = '1'
- LEFT JOIN artists_alias AS aa ON aa.AliasID = ta.AliasID
- LEFT JOIN users_main AS uploader ON uploader.ID = t.UserID
- WHERE t.ID = $TorrentID");
+ require(SERVER_ROOT.'/sections/reportsv2/array.php');
+ $ReportID = 0;
+ $DB->query("
+ SELECT
+ tg.Name,
+ tg.ID,
+ CASE COUNT(ta.GroupID)
+ WHEN 1 THEN aa.ArtistID
+ WHEN 0 THEN '0'
+ ELSE '0'
+ END AS ArtistID,
+ CASE COUNT(ta.GroupID)
+ WHEN 1 THEN aa.Name
+ WHEN 0 THEN ''
+ ELSE 'Various Artists'
+ END AS ArtistName,
+ tg.Year,
+ tg.CategoryID,
+ t.Time,
+ t.Remastered,
+ t.RemasterTitle,
+ t.RemasterYear,
+ t.Media,
+ t.Format,
+ t.Encoding,
+ t.Size,
+ t.HasLog,
+ t.HasLogDB,
+ t.LogScore,
+ t.LogChecksum,
+ t.UserID AS UploaderID,
+ uploader.Username
+ FROM torrents AS t
+ LEFT JOIN torrents_group AS tg ON tg.ID = t.GroupID
+ LEFT JOIN torrents_artists AS ta ON ta.GroupID = tg.ID AND ta.Importance = '1'
+ LEFT JOIN artists_alias AS aa ON aa.AliasID = ta.AliasID
+ LEFT JOIN users_main AS uploader ON uploader.ID = t.UserID
+ WHERE t.ID = $TorrentID");
- if (!$DB->has_results()) {
- die();
- }
- list($GroupName, $GroupID, $ArtistID, $ArtistName, $Year, $CategoryID, $Time, $Remastered, $RemasterTitle,
- $RemasterYear, $Media, $Format, $Encoding, $Size, $HasLog, $HasLogDB, $LogScore, $LogChecksum, $UploaderID, $UploaderName) = $DB->next_record();
+ if (!$DB->has_results()) {
+ die();
+ }
+ list($GroupName, $GroupID, $ArtistID, $ArtistName, $Year, $CategoryID, $Time, $Remastered, $RemasterTitle,
+ $RemasterYear, $Media, $Format, $Encoding, $Size, $HasLog, $HasLogDB, $LogScore, $LogChecksum, $UploaderID, $UploaderName) = $DB->next_record();
- $Type = 'dupe'; //hardcoded default
+ $Type = 'dupe'; //hardcoded default
- if (array_key_exists($Type, $Types[$CategoryID])) {
- $ReportType = $Types[$CategoryID][$Type];
- } elseif (array_key_exists($Type,$Types['master'])) {
- $ReportType = $Types['master'][$Type];
- } else {
- //There was a type but it wasn't an option!
- $Type = 'other';
- $ReportType = $Types['master']['other'];
- }
- $RemasterDisplayString = Reports::format_reports_remaster_info($Remastered, $RemasterTitle, $RemasterYear);
+ if (array_key_exists($Type, $Types[$CategoryID])) {
+ $ReportType = $Types[$CategoryID][$Type];
+ } elseif (array_key_exists($Type,$Types['master'])) {
+ $ReportType = $Types['master'][$Type];
+ } else {
+ //There was a type but it wasn't an option!
+ $Type = 'other';
+ $ReportType = $Types['master']['other'];
+ }
+ $RemasterDisplayString = Reports::format_reports_remaster_info($Remastered, $RemasterTitle, $RemasterYear);
- if ($ArtistID == 0 && empty($ArtistName)) {
- $RawName = $GroupName.($Year ? " ($Year)" : '').($Format || $Encoding || $Media ? " [$Format/$Encoding/$Media]" : '') . $RemasterDisplayString . ($HasLog ? " (Log".($HasLogDB ? ": {$LogScore}%" : '').')' : '').' ('.number_format($Size / (1024 * 1024), 2).' MB)';
- $LinkName = "$GroupName".($Year ? " ($Year)" : '')." ".($Format || $Encoding || $Media ? " [$Format/$Encoding/$Media]" : '') . "$RemasterDisplayString" . ($HasLog ? " (Log".($HasLogDB ? ": {$LogScore}%" : '').')' : '').' ('.number_format($Size / (1024 * 1024), 2).' MB)';
- $BBName = "[url=torrents.php?id=$GroupID]$GroupName".($Year ? " ($Year)" : '')."[/url] [url=torrents.php?torrentid=$TorrentID][$Format/$Encoding/$Media]{$RemasterDisplayString}[/url] " . ($HasLog ? " [url=torrents.php?action=viewlog&torrentid=$TorrentID&groupid=$GroupID](Log".($HasLogDB ? ": {$LogScore}%" : '').')[/url]' : '').' ('.number_format($Size / (1024 * 1024), 2).' MB)';
- } elseif ($ArtistID == 0 && $ArtistName == 'Various Artists') {
- $RawName = "Various Artists - $GroupName".($Year ? " ($Year)" : '')." [$Format/$Encoding/$Media]$RemasterDisplayString" . ($HasLog ? " ({$LogScore}%)" : '').' ('.number_format($Size / (1024 * 1024), 2).' MB)';
- $LinkName = "Various Artists - $GroupName".($Year ? " ($Year)" : '')." [$Format/$Encoding/$Media]$RemasterDisplayString ".($HasLog ? " (Log".($HasLogDB ? ": {$LogScore}%" : '').')' : '').' ('.number_format($Size / (1024 * 1024), 2).' MB)';
- $BBName = "Various Artists - [url=torrents.php?id=$GroupID]$GroupName".($Year ? " ($Year)" : '')."[/url] [url=torrents.php?torrentid=$TorrentID][$Format/$Encoding/$Media]{$RemasterDisplayString}[/url] ".($HasLog ? " [url=torrents.php?action=viewlog&torrentid=$TorrentID&groupid=$GroupID](Log".($HasLogDB ? ": {$LogScore}%" : '').')[/url]' : '').' ('.number_format($Size / (1024 * 1024), 2).' MB)';
- } else {
- $RawName = "$ArtistName - $GroupName".($Year ? " ($Year)" : '')." [$Format/$Encoding/$Media]$RemasterDisplayString" . ($HasLog ? " (Log".($HasLogDB ? ": {$LogScore}%" : '').')' : '').' ('.number_format($Size / (1024 * 1024), 2).' MB)';
- $LinkName = "$ArtistName - $GroupName".($Year ? " ($Year)" : '')." [$Format/$Encoding/$Media]$RemasterDisplayString ".($HasLog ? " (Log".($HasLogDB ? ": {$LogScore}%" : '').')' : '').' ('.number_format($Size / (1024 * 1024), 2).' MB)';
- $BBName = "[url=artist.php?id=$ArtistID]".$ArtistName."[/url] - [url=torrents.php?id=$GroupID]$GroupName".($Year ? " ($Year)" : '')."[/url] [url=torrents.php?torrentid=$TorrentID][$Format/$Encoding/$Media]{$RemasterDisplayString}[/url] " . ($HasLog ? " [url=torrents.php?action=viewlog&torrentid=$TorrentID&groupid=$GroupID](Log".($HasLogDB ? ": {$LogScore}%" : '').')[/url]' : '').' ('.number_format($Size / (1024 * 1024), 2).' MB)';
- }
+ if ($ArtistID == 0 && empty($ArtistName)) {
+ $RawName = $GroupName.($Year ? " ($Year)" : '').($Format || $Encoding || $Media ? " [$Format/$Encoding/$Media]" : '') . $RemasterDisplayString . ($HasLog ? " (Log".($HasLogDB ? ": {$LogScore}%" : '').')' : '').' ('.number_format($Size / (1024 * 1024), 2).' MB)';
+ $LinkName = "$GroupName".($Year ? " ($Year)" : '')." ".($Format || $Encoding || $Media ? " [$Format/$Encoding/$Media]" : '') . "$RemasterDisplayString" . ($HasLog ? " (Log".($HasLogDB ? ": {$LogScore}%" : '').')' : '').' ('.number_format($Size / (1024 * 1024), 2).' MB)';
+ $BBName = "[url=torrents.php?id=$GroupID]$GroupName".($Year ? " ($Year)" : '')."[/url] [url=torrents.php?torrentid=$TorrentID][$Format/$Encoding/$Media]{$RemasterDisplayString}[/url] " . ($HasLog ? " [url=torrents.php?action=viewlog&torrentid=$TorrentID&groupid=$GroupID](Log".($HasLogDB ? ": {$LogScore}%" : '').')[/url]' : '').' ('.number_format($Size / (1024 * 1024), 2).' MB)';
+ } elseif ($ArtistID == 0 && $ArtistName == 'Various Artists') {
+ $RawName = "Various Artists - $GroupName".($Year ? " ($Year)" : '')." [$Format/$Encoding/$Media]$RemasterDisplayString" . ($HasLog ? " ({$LogScore}%)" : '').' ('.number_format($Size / (1024 * 1024), 2).' MB)';
+ $LinkName = "Various Artists - $GroupName".($Year ? " ($Year)" : '')." [$Format/$Encoding/$Media]$RemasterDisplayString ".($HasLog ? " (Log".($HasLogDB ? ": {$LogScore}%" : '').')' : '').' ('.number_format($Size / (1024 * 1024), 2).' MB)';
+ $BBName = "Various Artists - [url=torrents.php?id=$GroupID]$GroupName".($Year ? " ($Year)" : '')."[/url] [url=torrents.php?torrentid=$TorrentID][$Format/$Encoding/$Media]{$RemasterDisplayString}[/url] ".($HasLog ? " [url=torrents.php?action=viewlog&torrentid=$TorrentID&groupid=$GroupID](Log".($HasLogDB ? ": {$LogScore}%" : '').')[/url]' : '').' ('.number_format($Size / (1024 * 1024), 2).' MB)';
+ } else {
+ $RawName = "$ArtistName - $GroupName".($Year ? " ($Year)" : '')." [$Format/$Encoding/$Media]$RemasterDisplayString" . ($HasLog ? " (Log".($HasLogDB ? ": {$LogScore}%" : '').')' : '').' ('.number_format($Size / (1024 * 1024), 2).' MB)';
+ $LinkName = "$ArtistName - $GroupName".($Year ? " ($Year)" : '')." [$Format/$Encoding/$Media]$RemasterDisplayString ".($HasLog ? " (Log".($HasLogDB ? ": {$LogScore}%" : '').')' : '').' ('.number_format($Size / (1024 * 1024), 2).' MB)';
+ $BBName = "[url=artist.php?id=$ArtistID]".$ArtistName."[/url] - [url=torrents.php?id=$GroupID]$GroupName".($Year ? " ($Year)" : '')."[/url] [url=torrents.php?torrentid=$TorrentID][$Format/$Encoding/$Media]{$RemasterDisplayString}[/url] " . ($HasLog ? " [url=torrents.php?action=viewlog&torrentid=$TorrentID&groupid=$GroupID](Log".($HasLogDB ? ": {$LogScore}%" : '').')[/url]' : '').' ('.number_format($Size / (1024 * 1024), 2).' MB)';
+ }
?>
-
-
diff --git a/sections/torrents/delete_alias.php b/sections/torrents/delete_alias.php
index 289ab1ea1..496b6e03d 100644
--- a/sections/torrents/delete_alias.php
+++ b/sections/torrents/delete_alias.php
@@ -1,64 +1,64 @@
-prepared_query('
- DELETE FROM torrents_artists
- WHERE GroupID = ?
- AND ArtistID = ?
- AND Importance = ?
- ', $GroupID, $ArtistID, $Importance
+ DELETE FROM torrents_artists
+ WHERE GroupID = ?
+ AND ArtistID = ?
+ AND Importance = ?
+ ', $GroupID, $ArtistID, $Importance
);
echo "$GroupID, $ArtistID, $Importance.
-
+
+
+
"; $DB->prepared_query(' - SELECT Name - FROM artists_group - WHERE ArtistID = ? - ', $ArtistID + SELECT Name + FROM artists_group + WHERE ArtistID = ? + ', $ArtistID ); list($ArtistName) = $DB->next_record(MYSQLI_NUM, false); $DB->prepared_query(' - SELECT Name - FROM torrents_group - WHERE ID = ? - ', $GroupID + SELECT Name + FROM torrents_group + WHERE ID = ? + ', $GroupID ); if (!$DB->has_results()) { - error(404); + error(404); } list($GroupName) = $DB->next_record(MYSQLI_NUM, false); // Get a count of how many groups or requests use this artist ID $DB->prepared_query(' - SELECT count(*) - FROM artists_group AS ag - LEFT JOIN requests_artists AS ra USING (ArtistID) - WHERE ra.ArtistID IS NOT NULL - AND ag.ArtistID = ? - ', $ArtistID + SELECT count(*) + FROM artists_group AS ag + LEFT JOIN requests_artists AS ra USING (ArtistID) + WHERE ra.ArtistID IS NOT NULL + AND ag.ArtistID = ? + ', $ArtistID ); list($ReqCount) = $DB->next_record(MYSQLI_NUM, false); $DB->prepared_query(' - SELECT count(*) - FROM artists_group AS ag - LEFT JOIN torrents_artists AS ta USING (ArtistID) - WHERE ta.ArtistID IS NOT NULL - AND ag.ArtistID = ? - ', $ArtistID + SELECT count(*) + FROM artists_group AS ag + LEFT JOIN torrents_artists AS ta USING (ArtistID) + WHERE ta.ArtistID IS NOT NULL + AND ag.ArtistID = ? + ', $ArtistID ); list($GroupCount) = $DB->next_record(MYSQLI_NUM, false); if (($ReqCount + $GroupCount) == 0) { - // The only group to use this artist - Artists::delete_artist($ArtistID); + // The only group to use this artist + Artists::delete_artist($ArtistID); } $Cache->delete_value("torrents_details_$GroupID"); // Delete torrent group cache diff --git a/sections/torrents/delete_log.php b/sections/torrents/delete_log.php index 9e4f13be5..64ccdb879 100644 --- a/sections/torrents/delete_log.php +++ b/sections/torrents/delete_log.php @@ -4,12 +4,12 @@ $LogID = intval($_GET['logid']); if ($TorrentID === 0 || $LogID === 0) { - error(404); + error(404); } G::$DB->prepared_query("SELECT GroupID FROM torrents WHERE ID=?", $TorrentID); if (!G::$DB->has_results()) { - error(404); + error(404); } list($GroupID) = G::$DB->fetch_record(); diff --git a/sections/torrents/delete_tag.php b/sections/torrents/delete_tag.php index eff686572..a39face3e 100644 --- a/sections/torrents/delete_tag.php +++ b/sections/torrents/delete_tag.php @@ -1,53 +1,53 @@ -query(" - SELECT Name - FROM tags - WHERE ID = '$TagID'"); + SELECT Name + FROM tags + WHERE ID = '$TagID'"); if (list($TagName) = $DB->next_record()) { - $DB->query(" - INSERT INTO group_log - (GroupID, UserID, Time, Info) - VALUES - ('$GroupID',".$LoggedUser['ID'].",'".sqltime()."','".db_string('Tag "'.$TagName.'" removed from group')."')"); + $DB->query(" + INSERT INTO group_log + (GroupID, UserID, Time, Info) + VALUES + ('$GroupID',".$LoggedUser['ID'].",'".sqltime()."','".db_string('Tag "'.$TagName.'" removed from group')."')"); } $DB->query(" - DELETE FROM torrents_tags_votes - WHERE GroupID = '$GroupID' - AND TagID = '$TagID'"); + DELETE FROM torrents_tags_votes + WHERE GroupID = '$GroupID' + AND TagID = '$TagID'"); $DB->query(" - DELETE FROM torrents_tags - WHERE GroupID = '$GroupID' - AND TagID = '$TagID'"); + DELETE FROM torrents_tags + WHERE GroupID = '$GroupID' + AND TagID = '$TagID'"); Torrents::update_hash($GroupID); $DB->query(" - SELECT COUNT(GroupID) - FROM torrents_tags - WHERE TagID = $TagID"); + SELECT COUNT(GroupID) + FROM torrents_tags + WHERE TagID = $TagID"); list($Count) = $DB->next_record(); if ($Count < 1) { - $DB->query(" - SELECT Name - FROM tags - WHERE ID = $TagID"); - list($TagName) = $DB->next_record(); + $DB->query(" + SELECT Name + FROM tags + WHERE ID = $TagID"); + list($TagName) = $DB->next_record(); - $DB->query(" - DELETE FROM tags - WHERE ID = $TagID"); + $DB->query(" + DELETE FROM tags + WHERE ID = $TagID"); } // Cache the deleted tag for 5 minutes $Cache->cache_value('deleted_tags_'.$GroupID.'_'.$LoggedUser['ID'], $TagName, 300); diff --git a/sections/torrents/details.php b/sections/torrents/details.php index c8d051c92..f23386e49 100644 --- a/sections/torrents/details.php +++ b/sections/torrents/details.php @@ -1,6 +1,6 @@ $GroupName"; $AltName = $GroupName; // Goes in the alt text of the image @@ -33,53 +33,53 @@ function compare($X, $Y) { $Artists = Artists::get_artist($GroupID); if ($Artists) { - $DisplayName = Artists::display_artists($Artists, true) . "$DisplayName"; - $AltName = display_str(Artists::display_artists($Artists, false)) . $AltName; - $Title = $AltName; + $DisplayName = Artists::display_artists($Artists, true) . "$DisplayName"; + $AltName = display_str(Artists::display_artists($Artists, false)) . $AltName; + $Title = $AltName; } if ($GroupYear > 0) { - $DisplayName .= " [$GroupYear]"; - $AltName .= " [$GroupYear]"; - $Title .= " [$GroupYear]"; + $DisplayName .= " [$GroupYear]"; + $AltName .= " [$GroupYear]"; + $Title .= " [$GroupYear]"; } if ($GroupVanityHouse) { - $DisplayName .= ' [Vanity House]'; - $AltName .= ' [Vanity House]'; + $DisplayName .= ' [Vanity House]'; + $AltName .= ' [Vanity House]'; } if ($GroupCategoryID == 1) { - $DisplayName .= ' ['.$ReleaseTypes[$ReleaseType].']'; - $AltName .= ' ['.$ReleaseTypes[$ReleaseType].']'; + $DisplayName .= ' ['.$ReleaseTypes[$ReleaseType].']'; + $AltName .= ' ['.$ReleaseTypes[$ReleaseType].']'; } -$Tags = array(); +$Tags = []; if ($TorrentTags != '') { - $TorrentTags = explode('|', $TorrentTags); - $TorrentTagIDs = explode('|', $TorrentTagIDs); - $TorrentTagUserIDs = explode('|', $TorrentTagUserIDs); - $TagPositiveVotes = explode('|', $TagPositiveVotes); - $TagNegativeVotes = explode('|', $TagNegativeVotes); - - foreach ($TorrentTags as $TagKey => $TagName) { - $Tags[$TagKey]['name'] = $TagName; - $Tags[$TagKey]['score'] = ($TagPositiveVotes[$TagKey] - $TagNegativeVotes[$TagKey]); - $Tags[$TagKey]['id'] = $TorrentTagIDs[$TagKey]; - $Tags[$TagKey]['userid'] = $TorrentTagUserIDs[$TagKey]; - } - uasort($Tags, 'compare'); + $TorrentTags = explode('|', $TorrentTags); + $TorrentTagIDs = explode('|', $TorrentTagIDs); + $TorrentTagUserIDs = explode('|', $TorrentTagUserIDs); + $TagPositiveVotes = explode('|', $TagPositiveVotes); + $TagNegativeVotes = explode('|', $TagNegativeVotes); + + foreach ($TorrentTags as $TagKey => $TagName) { + $Tags[$TagKey]['name'] = $TagName; + $Tags[$TagKey]['score'] = ($TagPositiveVotes[$TagKey] - $TagNegativeVotes[$TagKey]); + $Tags[$TagKey]['id'] = $TorrentTagIDs[$TagKey]; + $Tags[$TagKey]['userid'] = $TorrentTagUserIDs[$TagKey]; + } + uasort($Tags, 'compare'); } $CoverArt = $Cache->get_value("torrents_cover_art_$GroupID"); if (!$CoverArt) { - $DB->prepared_query(' - SELECT ID, Image, Summary, UserID, Time - FROM cover_art - WHERE GroupID = ? - ORDER BY Time ASC', $GroupID); - $CoverArt = $DB->to_array(); - if ($DB->has_results()) { - $Cache->cache_value("torrents_cover_art_$GroupID", $CoverArt, 0); - } + $DB->prepared_query(' + SELECT ID, Image, Summary, UserID, Time + FROM cover_art + WHERE GroupID = ? + ORDER BY Time ASC', $GroupID); + $CoverArt = $DB->to_array(); + if ($DB->has_results()) { + $Cache->cache_value("torrents_cover_art_$GroupID", $CoverArt, 0); + } } // Comments (must be loaded before View::show_header so that subscriptions and quote notifications are handled properly) @@ -89,288 +89,296 @@ function compare($X, $Y) { View::show_header($Title, 'browse,comments,torrent,bbcode,recommend,cover_art,subscriptions'); ?>
-
-
-
-
+
-
-
- Edit description
-
- Request an Edit
- View history
-
- Revert to this revision
-
- Remove bookmark
-
- Bookmark
-
-
+
+ 4, 'class' => 'artists_composers', 'title' => 'Composers:', 'role' => 'Composer'],
- ['offset' => 6, 'class' => 'artists_dj', 'title' => 'DJ / Compiler:', 'role' => 'DJ'],
- ['offset' => 1, 'class' => 'artists_main', 'title' => $title, 'role' => 'Artist'],
- ['offset' => 2, 'class' => 'artists_guest', 'title' => 'With:', 'role' => 'Guest'],
- ['offset' => 5, 'class' => 'artists_conductors', 'title' => 'Conducted by:', 'role' => 'Conductor'],
- ['offset' => 3, 'class' => 'artists_remix', 'title' => 'Remixed by:', 'role' => 'Remixer'],
- ['offset' => 7, 'class' => 'artists_producer', 'title' => 'Produced by:', 'role' => 'Producer'],
- ];
-?>
-
+
+
-
+
+
+ Edit description
+
+ Request an Edit
+ View history
+
+ Revert to this revision
+
+ Remove bookmark
+
+ Bookmark
+
+
-
- Add format
-
- Request format
-
- View log
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+ 0 ? 'Covers (' . (count($CoverArt) + 1) . ')' : 'Cover')?>
+ 0) {
+ if (empty($LoggedUser['ShowExtraCovers'])) {
+ for ($Index = 0; $Index <= count($CoverArt); $Index++) { ?>
+ 0 ? ' style="display: none;"' : '')?>>
+
+ Prev
+ Show all
+ Next
+ 0) { ?>
+ Prev
+ Show all
+ Next
+ 0) { ?>
+ Prev
+ Show all
+ Next
+
+
+
+
+ Hide
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
- Add alternate cover
-
-
-
-
-
-
+
+
+
+
+
+ Add alternate cover
+
+
+
+
+
+
-
-
- Artists
- Edit' : ''?>
-
- -
-
- 0) { ?>
-
- - -
- - - (get_alias($Artist['id'], $Artist['name']) ?>) - X - - - -
-
- 4, 'class' => 'artists_composers', 'title' => 'Composers:', 'role' => 'Composer'],
+ ['offset' => 6, 'class' => 'artists_dj', 'title' => 'DJ / Compiler:', 'role' => 'DJ'],
+ ['offset' => 1, 'class' => 'artists_main', 'title' => $title, 'role' => 'Artist'],
+ ['offset' => 2, 'class' => 'artists_guest', 'title' => 'With:', 'role' => 'Guest'],
+ ['offset' => 5, 'class' => 'artists_conductors', 'title' => 'Conducted by:', 'role' => 'Conductor'],
+ ['offset' => 3, 'class' => 'artists_remix', 'title' => 'Remixed by:', 'role' => 'Remixer'],
+ ['offset' => 7, 'class' => 'artists_producer', 'title' => 'Produced by:', 'role' => 'Producer'],
+ ];
+?>
+ Add artist+
-
-
-
-
+
+
+ Artists
+ Edit' : ''?>
+
+ -
+
+ 0) { ?>
+
- + +
- + + (get_alias($Artist['id'], $Artist['name']) ?>) + X + + + +
+
+
-
-
+
- Add artist+
+
+
+
+
-
-
+ Add tag
-
- Add tag
+
+
-
-
";
+ }
+
+ $CanEdit = (check_perms('torrents_edit') || (($UserID == $LoggedUser['ID'] && !$LoggedUser['DisableWiki']) && !($Remastered && !$RemasterYear)));
+
+ $RegenLink = check_perms('users_mod') ? ' Regenerate' : '';
+ $FileTable = '
+
+
';
+
+ $ExtraInfo = Torrents::torrent_info($Torrent, false, false, true, $GroupName);
+
+ if ($GroupCategoryID == 1
+ && ($RemasterTitle != $LastRemasterTitle
+ || $RemasterYear != $LastRemasterYear
+ || $RemasterRecordLabel != $LastRemasterRecordLabel
+ || $RemasterCatalogueNumber != $LastRemasterCatalogueNumber
+ || $FirstUnknown
+ || $Media != $LastMedia)) {
+
+ $EditionID++;
+
+?>
+
+ −
+
+
+
+
+
+
+ deleted
+
+ —
+ —
+ —
+ —
+
+ [
+
+ | FL
+
+ | RP
+
+ | ED
+
+ | RM
+
+ | PL
+ | JS
+ ]
+ »
+
+
+
+
+
+
+
+
+ 0) {
- $i = 0;
-?>
-
-
- MAX_COLLAGES) {
+ // Pick some at random
+ $Range = range(0, count($Collages) - 1);
+ shuffle($Range);
+ $Indices = array_slice($Range, 0, MAX_COLLAGES);
+ $SeeAll = ' (See all)';
+ } else {
+ $Indices = range(0, count($Collages) - 1);
+ $SeeAll = '';
+ }
+?>
+
+
+get_value("torrent_collages_personal_$GroupID");
if (!is_array($PersonalCollages)) {
- $DB->query("
- SELECT c.Name, c.NumTorrents, c.ID
- FROM collages AS c
- JOIN collages_torrents AS ct ON ct.CollageID = c.ID
- WHERE ct.GroupID = '$GroupID'
- AND Deleted = '0'
- AND CategoryID = '0'");
- $PersonalCollages = $DB->to_array(false, MYSQLI_NUM);
- $Cache->cache_value("torrent_collages_personal_$GroupID", $PersonalCollages, 3600 * 6);
+ $DB->query("
+ SELECT c.Name, c.NumTorrents, c.ID
+ FROM collages AS c
+ JOIN collages_torrents AS ct ON ct.CollageID = c.ID
+ WHERE ct.GroupID = '$GroupID'
+ AND Deleted = '0'
+ AND CategoryID = '0'");
+ $PersonalCollages = $DB->to_array(false, MYSQLI_NUM);
+ $Cache->cache_value("torrent_collages_personal_$GroupID", $PersonalCollages, 3600 * 6);
}
if (count($PersonalCollages) > 0) {
- if (count($PersonalCollages) > MAX_PERS_COLLAGES) {
- // Pick some at random
- $Range = range(0,count($PersonalCollages) - 1);
- shuffle($Range);
- $Indices = array_slice($Range, 0, MAX_PERS_COLLAGES);
- $SeeAll = ' (See all)';
- } else {
- $Indices = range(0, count($PersonalCollages) - 1);
- $SeeAll = '';
- }
-?>
-
-
- MAX_PERS_COLLAGES) {
+ // Pick some at random
+ $Range = range(0,count($PersonalCollages) - 1);
+ shuffle($Range);
+ $Indices = array_slice($Range, 0, MAX_PERS_COLLAGES);
+ $SeeAll = ' (See all)';
+ } else {
+ $Indices = range(0, count($PersonalCollages) - 1);
+ $SeeAll = '';
+ }
+?>
+
+
+
-
+
- | Torrents | -Size | - |
- |
- |
- ||||
| Torrents | +Size | + |
+ |
+ |
+ ".Format::get_size($Str[1])." | "; + return "".Format::get_size($Str[1])." | "; } $LastRemasterYear = '-'; @@ -382,414 +390,433 @@ function filelist($Str) { $Edition = []; foreach ($TorrentList as $t) { - if ($t['is_deleted'] == 0) { - $r = $t['Remastered']; - $key = implode('.', [ - $r ? $t['RemasterYear'] : $GroupYear, - $r ? $t['RemasterRecordLabel'] : $GroupRecordLabel, - $r ? $t['RemasterCatalogueNumber'] : $GroupCatalogueNumber, - $r ? $t['RemasterTitle'] : $GroupName - ]); - if (isset($Edition[$key])) { - $Edition[$key]++; - } else { - $Edition[$key] = 1; - } - } + if ($t['is_deleted'] == 0) { + $r = $t['Remastered']; + $key = implode('.', [ + $r ? $t['RemasterYear'] : $GroupYear, + $r ? $t['RemasterRecordLabel'] : $GroupRecordLabel, + $r ? $t['RemasterCatalogueNumber'] : $GroupCatalogueNumber, + $r ? $t['RemasterTitle'] : $GroupName + ]); + if (isset($Edition[$key])) { + $Edition[$key]++; + } else { + $Edition[$key] = 1; + } + } } $LastMedia = null; foreach ($TorrentList as $Torrent) { - list($TorrentID, $Media, $Format, $Encoding, $Remastered, $RemasterYear, - $RemasterTitle, $RemasterRecordLabel, $RemasterCatalogueNumber, $Scene, - $HasLog, $HasCue, $HasLogDB, $LogScore, $LogChecksum, $FileCount, $Size, $Seeders, $Leechers, - $Snatched, $FreeTorrent, $TorrentTime, $Description, $FileList, - $FilePath, $UserID, $LastActive, $InfoHash, $BadTags, $BadFolders, $BadFiles, - $MissingLineage, $CassetteApproved, $LossymasterApproved, $LossywebApproved, - $LastReseedRequest, $HasFile, $LogCount, $is_deleted, $PersonalFL, $IsSnatched) = array_values($Torrent); - - if ($is_deleted && count($TorrentList) > 1) { - continue; - } - $FirstUnknown = ($Remastered && !$RemasterYear); - - unset($ReportedTimes); - $Reports = Torrents::get_reports($TorrentID); - $NumReports = count($Reports); - - if ($NumReports == 0) { - $Reported = false; - } - else { + list($TorrentID, $Media, $Format, $Encoding, $Remastered, $RemasterYear, + $RemasterTitle, $RemasterRecordLabel, $RemasterCatalogueNumber, $Scene, + $HasLog, $HasCue, $HasLogDB, $LogScore, $LogChecksum, $FileCount, $Size, $Seeders, $Leechers, + $Snatched, $FreeTorrent, $TorrentTime, $Description, $FileList, + $FilePath, $UserID, $LastActive, $InfoHash, $BadTags, $BadFolders, $BadFiles, + $MissingLineage, $CassetteApproved, $LossymasterApproved, $LossywebApproved, + $LastReseedRequest, $HasFile, $LogCount, $is_deleted, $PersonalFL, $IsSnatched) = array_values($Torrent); + + if ($is_deleted && count($TorrentList) > 1) { + continue; + } + $FirstUnknown = ($Remastered && !$RemasterYear); + + unset($ReportedTimes); + $Reports = Torrents::get_reports($TorrentID); + $NumReports = count($Reports); + + if ($NumReports == 0) { + $Reported = false; + } + else { $Reported = true; $Torrent['Reported'] = $NumReports; - include(SERVER_ROOT.'/sections/reportsv2/array.php'); - $ReportInfo = ' -||
| This torrent has '.$NumReports.' active '.($NumReports === 1 ? 'report' : 'reports').": | -
$ReportLinks ".time_diff($Report['ReportedTime'], 2, true, true).' for the reason "'.$ReportType['title'].'":
- '.Text::full_format($Report['UserComment']).'- |
-
|
- File Names' . $RegenLink . '
- ' . ($FilePath ? "/$FilePath/" : '') . '
- |
- - Size - | -
| %s | %s |
-
-
-
-
- - Uploaded by - 1576800000) { ?> --
Last active: Never -= 1209600) { ?> -
Last active: - -
Last active: -= 345678 && time() - strtotime($LastReseedRequest) >= 864000) || check_perms('users_mod')) { ?> -
Request re-seed - -
If you download this, your ratio will become . -
- View peer list
-
- View log
-
-
- View download list
- View snatch list
-
- View file list
-
- View report information
-
-
-
-
-
-
-
-
-
-".Text::full_format($Description).'';
- }
-?>
- '.Text::full_format($Report['UserComment']).'+
|
+ File Names' . $RegenLink . '
+ ' . ($FilePath ? "/$FilePath/" : '') . '
+ |
+ + Size + | +
| %s | %s |
+
+
+
+
+ + Uploaded by + 1576800000) { ?> ++
Last active: Never += 1209600) { ?> +
Last active: + +
Last active: += 345678 && time() - strtotime($LastReseedRequest) >= 864000) || check_perms('users_mod')) { ?> +
Request re-seed + +
If you download this, your ratio will become . +
+ View peer list
+
+ View log
+
+ View download list
+ View snatch list
+
+ View file list
+
+ View report information
+
+
+
+
+
+
+
+
+
+".Text::full_format($Description).'';
+ }
+?>
+
-
-
+
- Requests ()
- Show
-
-
-
+
+get_value("torrent_collages_$GroupID");
if (!is_array($Collages)) {
- $DB->query("
- SELECT c.Name, c.NumTorrents, c.ID
- FROM collages AS c
- JOIN collages_torrents AS ct ON ct.CollageID = c.ID
- WHERE ct.GroupID = '$GroupID'
- AND Deleted = '0'
- AND CategoryID != '0'");
- $Collages = $DB->to_array();
- $Cache->cache_value("torrent_collages_$GroupID", $Collages, 3600 * 6);
+ $DB->query("
+ SELECT c.Name, c.NumTorrents, c.ID
+ FROM collages AS c
+ JOIN collages_torrents AS ct ON ct.CollageID = c.ID
+ WHERE ct.GroupID = '$GroupID'
+ AND Deleted = '0'
+ AND CategoryID != '0'");
+ $Collages = $DB->to_array();
+ $Cache->cache_value("torrent_collages_$GroupID", $Collages, 3600 * 6);
}
if (count($Collages) > 0) {
- if (count($Collages) > MAX_COLLAGES) {
- // Pick some at random
- $Range = range(0, count($Collages) - 1);
- shuffle($Range);
- $Indices = array_slice($Range, 0, MAX_COLLAGES);
- $SeeAll = ' (See all)';
- } else {
- $Indices = range(0, count($Collages) - 1);
- $SeeAll = '';
- }
-?>
-
+ Requests ()
+ Show
+
+
+ | ↑ This album is in collage 1) ? 's' : '')?> | -# torrents | -
| - | - |
| ↑ This album is in collage 1) ? 's' : '')?> | +# torrents | +
| + | + |
| ↑ This album is in personal collage 1) ? 's' : '')?> | -# torrents | -
| - | - |
| ↑ This album is in personal collage 1) ? 's' : '')?> | +# torrents | +
| + | + |
-
-
-
-
+
+
+
-
-
+
+
-
-
+
-
-
- 'pageid',
- 'InputID' => $GroupID,
- 'Action' => 'comments.php?page=torrents',
- 'InputAction' => 'take_post',
- 'TextareaCols' => 65,
- 'SubscribeBox' => true
- ));
-?>
-
+
+
+ 'pageid',
+ 'InputID' => $GroupID,
+ 'Action' => 'comments.php?page=torrents',
+ 'InputAction' => 'take_post',
+ 'TextareaCols' => 65,
+ 'SubscribeBox' => true
+ ));
+?>
+
+
-get_value('user_'.$_REQUEST['torrent_pass']);
- if (!is_array($UserInfo)) {
- $DB->query("
- SELECT ID, DownloadAlt, SiteOptions, la.UserID
- FROM users_main AS m
- INNER JOIN users_info AS i ON i.UserID = m.ID
- LEFT JOIN locked_accounts AS la ON la.UserID = m.ID
- WHERE m.torrent_pass = '".db_string($_REQUEST['torrent_pass'])."'
- AND m.Enabled = '1'");
- $UserInfo = $DB->next_record(MYSQLI_NUM, array(2));
- $SiteOptions = array_merge(Users::default_site_options(), unserialize_array($UserInfo[2]));
- $UserInfo[2] = $SiteOptions['HttpsTracker'];
- $Cache->cache_value('user_'.$_REQUEST['torrent_pass'], $UserInfo, 3600);
- }
- $UserInfo = array($UserInfo);
- list($UserID, $DownloadAlt, $HttpsTracker, $Locked) = array_shift($UserInfo);
- if (!$UserID) {
- error(0);
- }
- $TorrentPass = $_REQUEST['torrent_pass'];
- $AuthKey = $_REQUEST['authkey'];
-
- if ($Locked == $UserID) {
- header('HTTP/1.1 403 Forbidden');
- die();
- }
+ if (strpos($_REQUEST['torrent_pass'], '_') !== false) {
+ error(404);
+ }
+
+ $UserInfo = $Cache->get_value('user_'.$_REQUEST['torrent_pass']);
+ if (!is_array($UserInfo)) {
+ $DB->query("
+ SELECT ID, DownloadAlt, SiteOptions, la.UserID
+ FROM users_main AS m
+ INNER JOIN users_info AS i ON i.UserID = m.ID
+ LEFT JOIN locked_accounts AS la ON la.UserID = m.ID
+ WHERE m.torrent_pass = '".db_string($_REQUEST['torrent_pass'])."'
+ AND m.Enabled = '1'");
+ $UserInfo = $DB->next_record(MYSQLI_NUM, array(2));
+ $SiteOptions = array_merge(Users::default_site_options(), unserialize_array($UserInfo[2]));
+ $UserInfo[2] = $SiteOptions['HttpsTracker'];
+ $Cache->cache_value('user_'.$_REQUEST['torrent_pass'], $UserInfo, 3600);
+ }
+ $UserInfo = array($UserInfo);
+ list($UserID, $DownloadAlt, $HttpsTracker, $Locked) = array_shift($UserInfo);
+ if (!$UserID) {
+ error(0);
+ }
+ $TorrentPass = $_REQUEST['torrent_pass'];
+ $AuthKey = $_REQUEST['authkey'];
+
+ if ($Locked == $UserID) {
+ header('HTTP/1.1 403 Forbidden');
+ die();
+ }
}
$TorrentID = $_REQUEST['id'];
if (!is_number($TorrentID)) {
- error(0);
+ error(0);
}
/* uTorrent Remote and various scripts redownload .torrent files periodically.
- To prevent this retardation from blowing bandwidth etc., let's block it
- if the .torrent file has been downloaded four times before */
+ To prevent this retardation from blowing bandwidth etc., let's block it
+ if the .torrent file has been downloaded four times before */
$ScriptUAs = array('BTWebClient*', 'Python-urllib*', 'python-requests*', 'uTorrent*');
if (Misc::in_array_partial($_SERVER['HTTP_USER_AGENT'], $ScriptUAs)) {
- $DB->query("
- SELECT 1
- FROM users_downloads
- WHERE UserID = $UserID
- AND TorrentID = $TorrentID
- LIMIT 4");
- if ($DB->record_count() === 4) {
- error('You have already downloaded this torrent file four times. If you need to download it again, please do so from your browser.', true);
- die();
- }
+ $DB->query("
+ SELECT 1
+ FROM users_downloads
+ WHERE UserID = $UserID
+ AND TorrentID = $TorrentID
+ LIMIT 4");
+ if ($DB->record_count() === 4) {
+ error('You have already downloaded this torrent file four times. If you need to download it again, please do so from your browser.', true);
+ die();
+ }
}
$Info = $Cache->get_value('torrent_download_'.$TorrentID);
if (!is_array($Info) || !array_key_exists('PlainArtists', $Info) || empty($Info[10])) {
- $DB->query("
- SELECT
- t.Media,
- t.Format,
- t.Encoding,
- IF(t.RemasterYear = 0, tg.Year, t.RemasterYear),
- tg.ID AS GroupID,
- tg.Name,
- tg.WikiImage,
- tg.CategoryID,
- t.Size,
- t.FreeTorrent,
- t.info_hash,
- t.UserID
- FROM torrents AS t
- INNER JOIN torrents_group AS tg ON tg.ID = t.GroupID
- WHERE t.ID = '".db_string($TorrentID)."'");
- if (!$DB->has_results()) {
- error(404);
- }
- $Info = array($DB->next_record(MYSQLI_NUM, array(4, 5, 6, 10)));
- $Artists = Artists::get_artist($Info[0][4]);
- $Info['Artists'] = Artists::display_artists($Artists, false, true);
- $Info['PlainArtists'] = Artists::display_artists($Artists, false, true, false);
- $Cache->cache_value("torrent_download_$TorrentID", $Info, 0);
+ $DB->query("
+ SELECT
+ t.Media,
+ t.Format,
+ t.Encoding,
+ IF(t.RemasterYear = 0, tg.Year, t.RemasterYear),
+ tg.ID AS GroupID,
+ tg.Name,
+ tg.WikiImage,
+ tg.CategoryID,
+ t.Size,
+ t.FreeTorrent,
+ t.info_hash,
+ t.UserID
+ FROM torrents AS t
+ INNER JOIN torrents_group AS tg ON tg.ID = t.GroupID
+ WHERE t.ID = '".db_string($TorrentID)."'");
+ if (!$DB->has_results()) {
+ error(404);
+ }
+ $Info = array($DB->next_record(MYSQLI_NUM, array(4, 5, 6, 10)));
+ $Artists = Artists::get_artist($Info[0][4]);
+ $Info['Artists'] = Artists::display_artists($Artists, false, true);
+ $Info['PlainArtists'] = Artists::display_artists($Artists, false, true, false);
+ $Cache->cache_value("torrent_download_$TorrentID", $Info, 0);
}
if (!is_array($Info[0])) {
- error(404);
+ error(404);
}
list($Media, $Format, $Encoding, $Year, $GroupID, $Name, $Image, $CategoryID, $Size, $FreeTorrent, $InfoHash, $TorrentUploaderID) = array_shift($Info); // used for generating the filename
$Artists = $Info['Artists'];
@@ -99,90 +99,90 @@
// If he's trying use a token on this, we need to make sure he has one,
// deduct it, add this to the FLs table, and update his cache key.
if ($_REQUEST['usetoken'] && $FreeTorrent == '0') {
- if (isset($LoggedUser)) {
- $FLTokens = $LoggedUser['FLTokens'];
- if ($LoggedUser['CanLeech'] != '1') {
- error('You cannot use tokens while leech disabled.');
- }
- }
- else {
- $UInfo = Users::user_heavy_info($UserID);
- if ($UInfo['CanLeech'] != '1') {
- error('You may not use tokens while leech disabled.');
- }
- $FLTokens = $UInfo['FLTokens'];
- }
-
- // First make sure this isn't already FL, and if it is, do nothing
-
- if (!Torrents::has_token($TorrentID)) {
- if ($FLTokens <= 0) {
- error('You do not have any freeleech tokens left. Please use the regular DL link.');
- }
- if ($Size >= 2147483648) {
- error('This torrent is too large. Please use the regular DL link.');
- }
-
- // Let the tracker know about this
- if (!Tracker::update_tracker('add_token', array('info_hash' => rawurlencode($InfoHash), 'userid' => $UserID))) {
- error('Sorry! An error occurred while trying to register your token. Most often, this is due to the tracker being down or under heavy load. Please try again later.');
- }
-
- if (!Torrents::has_token($TorrentID)) {
- $DB->query("
- INSERT INTO users_freeleeches (UserID, TorrentID, Time)
- VALUES ($UserID, $TorrentID, NOW())
- ON DUPLICATE KEY UPDATE
- Time = VALUES(Time),
- Expired = FALSE,
- Uses = Uses + 1");
- $DB->query("
- UPDATE users_main
- SET FLTokens = FLTokens - 1
- WHERE ID = $UserID");
-
- // Fix for downloadthemall messing with the cached token count
- $UInfo = Users::user_heavy_info($UserID);
- $FLTokens = $UInfo['FLTokens'];
-
- $Cache->begin_transaction("user_info_heavy_$UserID");
- $Cache->update_row(false, array('FLTokens' => ($FLTokens - 1)));
- $Cache->commit_transaction(0);
-
- $Cache->delete_value("users_tokens_$UserID");
- }
- }
+ if (isset($LoggedUser)) {
+ $FLTokens = $LoggedUser['FLTokens'];
+ if ($LoggedUser['CanLeech'] != '1') {
+ error('You cannot use tokens while leech disabled.');
+ }
+ }
+ else {
+ $UInfo = Users::user_heavy_info($UserID);
+ if ($UInfo['CanLeech'] != '1') {
+ error('You may not use tokens while leech disabled.');
+ }
+ $FLTokens = $UInfo['FLTokens'];
+ }
+
+ // First make sure this isn't already FL, and if it is, do nothing
+
+ if (!Torrents::has_token($TorrentID)) {
+ if ($FLTokens <= 0) {
+ error('You do not have any freeleech tokens left. Please use the regular DL link.');
+ }
+ if ($Size >= 2147483648) {
+ error('This torrent is too large. Please use the regular DL link.');
+ }
+
+ // Let the tracker know about this
+ if (!Tracker::update_tracker('add_token', array('info_hash' => rawurlencode($InfoHash), 'userid' => $UserID))) {
+ error('Sorry! An error occurred while trying to register your token. Most often, this is due to the tracker being down or under heavy load. Please try again later.');
+ }
+
+ if (!Torrents::has_token($TorrentID)) {
+ $DB->query("
+ INSERT INTO users_freeleeches (UserID, TorrentID, Time)
+ VALUES ($UserID, $TorrentID, NOW())
+ ON DUPLICATE KEY UPDATE
+ Time = VALUES(Time),
+ Expired = FALSE,
+ Uses = Uses + 1");
+ $DB->query("
+ UPDATE users_main
+ SET FLTokens = FLTokens - 1
+ WHERE ID = $UserID");
+
+ // Fix for downloadthemall messing with the cached token count
+ $UInfo = Users::user_heavy_info($UserID);
+ $FLTokens = $UInfo['FLTokens'];
+
+ $Cache->begin_transaction("user_info_heavy_$UserID");
+ $Cache->update_row(false, array('FLTokens' => ($FLTokens - 1)));
+ $Cache->commit_transaction(0);
+
+ $Cache->delete_value("users_tokens_$UserID");
+ }
+ }
}
//Stupid Recent Snatches On User Page
if ($CategoryID == '1' && $Image != '' && $TorrentUploaderID != $UserID) {
- $RecentSnatches = $Cache->get_value("recent_snatches_$UserID");
- if (isset($RecentSnatches)) {
- $Snatch = array(
- 'ID' => $GroupID,
- 'Name' => $Name,
- 'Artist' => $Artists,
- 'WikiImage' => $Image);
- if (!in_array($Snatch, $RecentSnatches)) {
- if (count($RecentSnatches) === 5) {
- array_pop($RecentSnatches);
- }
- array_unshift($RecentSnatches, $Snatch);
- } elseif (!is_array($RecentSnatches)) {
- $RecentSnatches = array($Snatch);
- }
- $Cache->cache_value("recent_snatches_$UserID", $RecentSnatches, 0);
- }
+ $RecentSnatches = $Cache->get_value("recent_snatches_$UserID");
+ if (isset($RecentSnatches)) {
+ $Snatch = array(
+ 'ID' => $GroupID,
+ 'Name' => $Name,
+ 'Artist' => $Artists,
+ 'WikiImage' => $Image);
+ if (!in_array($Snatch, $RecentSnatches)) {
+ if (count($RecentSnatches) === 5) {
+ array_pop($RecentSnatches);
+ }
+ array_unshift($RecentSnatches, $Snatch);
+ } elseif (!is_array($RecentSnatches)) {
+ $RecentSnatches = array($Snatch);
+ }
+ $Cache->cache_value("recent_snatches_$UserID", $RecentSnatches, 0);
+ }
}
$DB->query("
- INSERT IGNORE INTO users_downloads (UserID, TorrentID, Time)
- VALUES ('$UserID', '$TorrentID', '".sqltime()."')");
+ INSERT IGNORE INTO users_downloads (UserID, TorrentID, Time)
+ VALUES ('$UserID', '$TorrentID', '".sqltime()."')");
$DB->query("
- SELECT File
- FROM torrents_files
- WHERE TorrentID = '$TorrentID'");
+ SELECT File
+ FROM torrents_files
+ WHERE TorrentID = '$TorrentID'");
Torrents::set_snatch_update_time($UserID, Torrents::SNATCHED_UPDATE_AFTERDL);
list($Contents) = $DB->next_record(MYSQLI_NUM, false);
@@ -190,10 +190,10 @@
$FileName = TorrentsDL::construct_file_name($Info['PlainArtists'], $Name, $Year, $Media, $Format, $Encoding, $TorrentID, $DownloadAlt);
$AnnounceURL = ($HttpsTracker) ? ANNOUNCE_HTTPS_URL : ANNOUNCE_HTTP_URL;
if ($DownloadAlt) {
- header('Content-Type: text/plain; charset=utf-8');
+ header('Content-Type: text/plain; charset=utf-8');
}
elseif (!$DownloadAlt || $Failed) {
- header('Content-Type: application/x-bittorrent; charset=utf-8');
+ header('Content-Type: application/x-bittorrent; charset=utf-8');
}
header('Content-disposition: attachment; filename="'.$FileName.'"');
diff --git a/sections/torrents/downloadlist.php b/sections/torrents/downloadlist.php
index 2ba50c955..5c34ff7b3 100644
--- a/sections/torrents/downloadlist.php
+++ b/sections/torrents/downloadlist.php
@@ -1,26 +1,26 @@
-query("
- SELECT
- SQL_CALC_FOUND_ROWS
- UserID,
- Time
- FROM users_downloads
- WHERE TorrentID = '$TorrentID'
- ORDER BY Time DESC
- LIMIT $Limit");
+ SELECT
+ SQL_CALC_FOUND_ROWS
+ UserID,
+ Time
+ FROM users_downloads
+ WHERE TorrentID = '$TorrentID'
+ ORDER BY Time DESC
+ LIMIT $Limit");
$UserIDs = $DB->collect('UserID');
$Results = $DB->to_array('UserID', MYSQLI_ASSOC);
@@ -28,64 +28,64 @@
list($NumResults) = $DB->next_record();
if (count($UserIDs) > 0) {
- $UserIDs = implode(',', $UserIDs);
- $DB->query("
- SELECT uid
- FROM xbt_snatched
- WHERE fid = '$TorrentID'
- AND uid IN($UserIDs)");
- $Snatched = $DB->to_array('uid');
+ $UserIDs = implode(',', $UserIDs);
+ $DB->query("
+ SELECT uid
+ FROM xbt_snatched
+ WHERE fid = '$TorrentID'
+ AND uid IN($UserIDs)");
+ $Snatched = $DB->to_array('uid');
- $DB->query("
- SELECT uid
- FROM xbt_files_users
- WHERE fid = '$TorrentID'
- AND Remaining = 0
- AND uid IN($UserIDs)");
- $Seeding = $DB->to_array('uid');
+ $DB->query("
+ SELECT uid
+ FROM xbt_files_users
+ WHERE fid = '$TorrentID'
+ AND Remaining = 0
+ AND uid IN($UserIDs)");
+ $Seeding = $DB->to_array('uid');
}
?>
List of Downloaders
- 100) { ?> + 100) { ?> - +| User | -Time | +||
| User | +Time | -User | -Time | -
| Time | +|||
| - | - + | + - |
- Change Group
- Split Off into New Group
-
- Change Category
-
+ Change Group
+ Split Off into New Group
+
+ Change Category
+
-head();
- switch ($UploadForm) {
- case 'Music':
- $TorrentForm->music_form('');
- break;
+ $TorrentForm->head();
+ switch ($UploadForm) {
+ case 'Music':
+ $TorrentForm->music_form('');
+ break;
- case 'Audiobooks':
- case 'Comedy':
- $TorrentForm->audiobook_form();
- break;
+ case 'Audiobooks':
+ case 'Comedy':
+ $TorrentForm->audiobook_form();
+ break;
- case 'Applications':
- case 'Comics':
- case 'E-Books':
- case 'E-Learning Videos':
- $TorrentForm->simple_form($Properties['CategoryID']);
- break;
+ case 'Applications':
+ case 'Comics':
+ case 'E-Books':
+ case 'E-Learning Videos':
+ $TorrentForm->simple_form($Properties['CategoryID']);
+ break;
- default:
- $TorrentForm->music_form('');
- }
- $TorrentForm->foot();
+ default:
+ $TorrentForm->music_form('');
+ }
+ $TorrentForm->foot();
}
if (check_perms('torrents_edit') && (check_perms('users_mod') || $Properties['CategoryID'] == 1)) {
?>
+
+ Split off into new group
+ ++ +
Change category
+ + - diff --git a/sections/torrents/edit_log.php b/sections/torrents/edit_log.php index 97a1008bb..b73a5e0eb 100644 --- a/sections/torrents/edit_log.php +++ b/sections/torrents/edit_log.php @@ -1,7 +1,7 @@ query("SELECT GroupID FROM torrents WHERE ID='{$TorrentID}'"); if (!$DB->has_results()) { - error(404); + error(404); } list($GroupID) = $DB->next_record(MYSQLI_NUM); $Group = Torrents::array_group(Torrents::get_groups(array($GroupID))[$GroupID]); $TorrentTags = new Tags($Group['TagList']); if (!empty($Group['ExtendedArtists'][1]) || !empty($Group['ExtendedArtists'][4]) || !empty($Group['ExtendedArtists'][5])) { - unset($Group['ExtendedArtists'][2]); - unset($Group['ExtendedArtists'][3]); - $DisplayName = Artists::display_artists($Group['ExtendedArtists']); + unset($Group['ExtendedArtists'][2]); + unset($Group['ExtendedArtists'][3]); + $DisplayName = Artists::display_artists($Group['ExtendedArtists']); } elseif (!empty($Artists)) { - $DisplayName = Artists::display_artists(array(1 => $Group['Artists'])); + $DisplayName = Artists::display_artists(array(1 => $Group['Artists'])); } else { - $DisplayName = ''; + $DisplayName = ''; } $DisplayName .= '' . $Group['GroupName'] . ''; if ($Group['GroupYear'] > 0) { - $DisplayName .= " [{$Group['GroupYear']}"; + $DisplayName .= " [{$Group['GroupYear']}"; } if ($Group['GroupVanityHouse']) { - $DisplayName .= ' [VH]'; + $DisplayName .= ' [VH]'; } $ExtraInfo = Torrents::torrent_info($Group['Torrents'][$TorrentID]); if ($ExtraInfo) { - $DisplayName .= " - $ExtraInfo"; + $DisplayName .= " - $ExtraInfo"; } $DB->query("SELECT Log, FileName, Details, Score, Checksum, Adjusted, AdjustedScore, AdjustedChecksum, AdjustedBy, AdjustmentReason, AdjustmentDetails FROM torrents_logs WHERE TorrentID='{$TorrentID}' AND LogID='{$LogID}'"); if (!$DB->has_results()) { - error(404); + error(404); } $Log = $DB->next_record(MYSQLI_ASSOC, array('AdjustmentDetails')); @@ -47,12 +47,12 @@ $Checksum = ($Log['Checksum'] == '1') ? 'Good' : 'Missing/Invalid Checksum'; $Details = ""; if (!empty($Log['Details'])) { - $Log['Details'] = explode("\r\n", $Log['Details']); - $Details .= '- ';
- foreach($Log['Details'] as $Entry) {
- $Details .='
- '.$Entry.' '; - } - $Details .= '
- ';
+ foreach($Log['Details'] as $Entry) {
+ $Details .='
- '.$Entry.' '; + } + $Details .= '
-
query("
- SELECT
- tg.Name,
- wt.Image,
- wt.Body,
- tg.WikiImage,
- tg.WikiBody,
- tg.Year,
- tg.RecordLabel,
- tg.CatalogueNumber,
- tg.ReleaseType,
- tg.CategoryID,
- tg.VanityHouse
- FROM torrents_group AS tg
- LEFT JOIN wiki_torrents AS wt ON wt.RevisionID = tg.RevisionID
- WHERE tg.ID = '$GroupID'");
+ SELECT
+ tg.Name,
+ wt.Image,
+ wt.Body,
+ tg.WikiImage,
+ tg.WikiBody,
+ tg.Year,
+ tg.RecordLabel,
+ tg.CatalogueNumber,
+ tg.ReleaseType,
+ tg.CategoryID,
+ tg.VanityHouse
+ FROM torrents_group AS tg
+ LEFT JOIN wiki_torrents AS wt ON wt.RevisionID = tg.RevisionID
+ WHERE tg.ID = '$GroupID'");
if (!$DB->has_results()) {
- error(404);
+ error(404);
}
list($Name, $Image, $Body, $WikiImage, $WikiBody, $Year, $RecordLabel, $CatalogueNumber, $ReleaseType, $CategoryID, $VanityHouse) = $DB->next_record();
if (!$Body) {
- $Body = $WikiBody;
- $Image = $WikiImage;
+ $Body = $WikiBody;
+ $Image = $WikiImage;
}
View::show_header('Edit torrent group');
@@ -50,133 +50,141 @@
// Start printing form
?>
+query("
+ SELECT UserID
+ FROM torrents
+ WHERE GroupID = $GroupID");
+ //Users can edit the group info if they've uploaded a torrent to the group or have torrents_edit
+ if (in_array($LoggedUser['ID'], $DB->collect('UserID')) || check_perms('torrents_edit')) { ?>
+ Edit Log
- +Edit Log
+Non-wiki torrent group editing
+
+
+
+
- Rename (will not merge)
-
-
-
- Merge with another group
-
-
-
-
+ Rename (will not merge)
+
+
+
+ Merge with another group
+
+
+
+
-
+
diff --git a/sections/torrents/editgroupid.php b/sections/torrents/editgroupid.php
index 03d8a77ea..6f563ee31 100644
--- a/sections/torrents/editgroupid.php
+++ b/sections/torrents/editgroupid.php
@@ -6,7 +6,7 @@
****************************************************************/
if (!check_perms('torrents_edit')) {
- error(403);
+ error(403);
}
$OldGroupID = $_POST['oldgroupid'];
@@ -15,106 +15,106 @@
if (!is_number($OldGroupID) || !is_number($GroupID) || !is_number($TorrentID) || !$OldGroupID || !$GroupID || !$TorrentID) {
- error(0);
+ error(0);
}
if ($OldGroupID == $GroupID) {
- $Location = (empty($_SERVER['HTTP_REFERER'])) ? "torrents.php?action=edit&id={$GroupID}" : $_SERVER['HTTP_REFERER'];
- header("Location: {$Location}");
- die();
+ $Location = (empty($_SERVER['HTTP_REFERER'])) ? "torrents.php?action=edit&id={$GroupID}" : $_SERVER['HTTP_REFERER'];
+ header("Location: {$Location}");
+ die();
}
//Everything is legit, let's just confim they're not retarded
if (empty($_POST['confirm'])) {
- $DB->query("
- SELECT Name
- FROM torrents_group
- WHERE ID = $OldGroupID");
- if (!$DB->has_results()) {
- //Trying to move to an empty group? I think not!
- set_message('The destination torrent group does not exist!');
- $Location = (empty($_SERVER['HTTP_REFERER'])) ? "torrents.php?action=edit&id={$OldGroupID}" : $_SERVER['HTTP_REFERER'];
- header("Location: {$Location}");
- die();
- }
- list($Name) = $DB->next_record();
- $DB->query("
- SELECT CategoryID, Name
- FROM torrents_group
- WHERE ID = $GroupID");
- list($CategoryID, $NewName) = $DB->next_record();
- if ($Categories[$CategoryID - 1] != 'Music') {
- error('Destination torrent group must be in the "Music" category.');
- }
+ $DB->query("
+ SELECT Name
+ FROM torrents_group
+ WHERE ID = $OldGroupID");
+ if (!$DB->has_results()) {
+ //Trying to move to an empty group? I think not!
+ set_message('The destination torrent group does not exist!');
+ $Location = (empty($_SERVER['HTTP_REFERER'])) ? "torrents.php?action=edit&id={$OldGroupID}" : $_SERVER['HTTP_REFERER'];
+ header("Location: {$Location}");
+ die();
+ }
+ list($Name) = $DB->next_record();
+ $DB->query("
+ SELECT CategoryID, Name
+ FROM torrents_group
+ WHERE ID = $GroupID");
+ list($CategoryID, $NewName) = $DB->next_record();
+ if ($Categories[$CategoryID - 1] != 'Music') {
+ error('Destination torrent group must be in the "Music" category.');
+ }
- $Artists = Artists::get_artists(array($OldGroupID, $GroupID));
+ $Artists = Artists::get_artists(array($OldGroupID, $GroupID));
- View::show_header();
+ View::show_header();
?>
-
-
-
+
-
- Torrent Group ID Change Confirmation
-
-
-
-
+
+ Torrent Group ID Change Confirmation
+
+
+
+
+query("
- UPDATE torrents
- SET GroupID = '$GroupID'
- WHERE ID = $TorrentID");
+ $DB->query("
+ UPDATE torrents
+ SET GroupID = '$GroupID'
+ WHERE ID = $TorrentID");
- // Delete old torrent group if it's empty now
- $DB->query("
- SELECT COUNT(ID)
- FROM torrents
- WHERE GroupID = '$OldGroupID'");
- list($TorrentsInGroup) = $DB->next_record();
- if ($TorrentsInGroup == 0) {
- // TODO: votes etc!
- $DB->query("
- UPDATE comments
- SET PageID = '$GroupID'
- WHERE Page = 'torrents'
- AND PageID = '$OldGroupID'");
- $Cache->delete_value("torrent_comments_{$GroupID}_catalogue_0");
- $Cache->delete_value("torrent_comments_$GroupID");
- Torrents::delete_group($OldGroupID);
- } else {
- Torrents::update_hash($OldGroupID);
- }
- Torrents::update_hash($GroupID);
+ // Delete old torrent group if it's empty now
+ $DB->query("
+ SELECT COUNT(ID)
+ FROM torrents
+ WHERE GroupID = '$OldGroupID'");
+ list($TorrentsInGroup) = $DB->next_record();
+ if ($TorrentsInGroup == 0) {
+ // TODO: votes etc!
+ $DB->query("
+ UPDATE comments
+ SET PageID = '$GroupID'
+ WHERE Page = 'torrents'
+ AND PageID = '$OldGroupID'");
+ $Cache->delete_value("torrent_comments_{$GroupID}_catalogue_0");
+ $Cache->delete_value("torrent_comments_$GroupID");
+ Torrents::delete_group($OldGroupID);
+ } else {
+ Torrents::update_hash($OldGroupID);
+ }
+ Torrents::update_hash($GroupID);
- Misc::write_log("Torrent $TorrentID was edited by " . $LoggedUser['Username']); // TODO: this is probably broken
- Torrents::write_group_log($GroupID, 0, $LoggedUser['ID'], "merged group $OldGroupID", 0);
- $DB->query("
- UPDATE group_log
- SET GroupID = $GroupID
- WHERE GroupID = $OldGroupID");
+ Misc::write_log("Torrent $TorrentID was edited by " . $LoggedUser['Username']); // TODO: this is probably broken
+ Torrents::write_group_log($GroupID, 0, $LoggedUser['ID'], "merged group $OldGroupID", 0);
+ $DB->query("
+ UPDATE group_log
+ SET GroupID = $GroupID
+ WHERE GroupID = $OldGroupID");
- $Cache->delete_value("torrents_details_$GroupID");
- $Cache->delete_value("torrent_download_$TorrentID");
+ $Cache->delete_value("torrents_details_$GroupID");
+ $Cache->delete_value("torrent_download_$TorrentID");
- header("Location: torrents.php?id=$GroupID");
+ header("Location: torrents.php?id=$GroupID");
}
diff --git a/sections/torrents/editrequest.php b/sections/torrents/editrequest.php
index 8ed5b5754..7c7aac736 100644
--- a/sections/torrents/editrequest.php
+++ b/sections/torrents/editrequest.php
@@ -1,7 +1,7 @@
0) {
- $Extra .= ' ['.$GroupYear.']';
+ $Extra .= ' ['.$GroupYear.']';
}
if ($GroupVanityHouse) {
- $Extra .= ' [Vanity House]';
+ $Extra .= ' [Vanity House]';
}
$Title = "Request an Edit: " . $Title . $Extra;
@@ -41,45 +41,45 @@
?>
-
get_value("torrents_details_$GroupID");
- }
- if ($RevisionID || !is_array($TorrentCache)) {
- // Fetch the group details
-
- $SQL = 'SELECT ';
-
- if (!$RevisionID) {
- $SQL .= '
- g.WikiBody,
- g.WikiImage, ';
- } else {
- $SQL .= '
- w.Body,
- w.Image, ';
- }
-
- $SQL .= "
- g.ID,
- g.Name,
- g.Year,
- g.RecordLabel,
- g.CatalogueNumber,
- g.ReleaseType,
- g.CategoryID,
- g.Time,
- g.VanityHouse,
- GROUP_CONCAT(DISTINCT tags.Name SEPARATOR '|'),
- GROUP_CONCAT(DISTINCT tags.ID SEPARATOR '|'),
- GROUP_CONCAT(tt.UserID SEPARATOR '|'),
- GROUP_CONCAT(tt.PositiveVotes SEPARATOR '|'),
- GROUP_CONCAT(tt.NegativeVotes SEPARATOR '|')
- FROM torrents_group AS g
- LEFT JOIN torrents_tags AS tt ON (tt.GroupID = g.ID)
- LEFT JOIN tags ON (tags.ID = tt.TagID)";
-
- $args = [];
- if ($RevisionID) {
- $SQL .= '
- LEFT JOIN wiki_torrents AS w ON (w.PageID = ? AND w.RevisionID = ?)';
- $args[] = $GroupID;
- $args[] = $RevisionID;
- }
-
- $SQL .= '
- WHERE g.ID = ?
- GROUP BY NULL';
- $args[] = $GroupID;
-
- $DB->prepared_query_array($SQL, $args);
- $TorrentDetails = $DB->next_record(MYSQLI_ASSOC);
-
- // Fetch the individual torrents
- $columns = "
- t.ID,
- t.Media,
- t.Format,
- t.Encoding,
- t.Remastered,
- t.RemasterYear,
- t.RemasterTitle,
- t.RemasterRecordLabel,
- t.RemasterCatalogueNumber,
- t.Scene,
- t.HasLog,
- t.HasCue,
- t.HasLogDB,
- t.LogScore,
- t.LogChecksum,
- t.FileCount,
- t.Size,
- t.Seeders,
- t.Leechers,
- t.Snatched,
- t.FreeTorrent,
- t.Time,
- t.Description,
- t.FileList,
- t.FilePath,
- t.UserID,
- t.last_action,
- HEX(t.info_hash) AS InfoHash,
- tbt.TorrentID AS BadTags,
- tbf.TorrentID AS BadFolders,
- tfi.TorrentID AS BadFiles,
- ml.TorrentID AS MissingLineage,
- ca.TorrentID AS CassetteApproved,
- lma.TorrentID AS LossymasterApproved,
- lwa.TorrentID AS LossywebApproved,
- t.LastReseedRequest,
- t.ID AS HasFile,
- COUNT(tl.LogID) AS LogCount
- ";
-
- $DB->prepared_query("
- SELECT $columns
- ,0 as is_deleted
- FROM torrents AS t
- LEFT JOIN torrents_bad_tags AS tbt ON (tbt.TorrentID = t.ID)
- LEFT JOIN torrents_bad_folders AS tbf ON (tbf.TorrentID = t.ID)
- LEFT JOIN torrents_bad_files AS tfi ON (tfi.TorrentID = t.ID)
- LEFT JOIN torrents_missing_lineage AS ml ON (ml.TorrentID = t.ID)
- LEFT JOIN torrents_cassette_approved AS ca ON (ca.TorrentID = t.ID)
- LEFT JOIN torrents_lossymaster_approved AS lma ON (lma.TorrentID = t.ID)
- LEFT JOIN torrents_lossyweb_approved AS lwa ON (lwa.TorrentID = t.ID)
- LEFT JOIN torrents_logs AS tl ON (tl.TorrentID = t.ID)
- WHERE t.GroupID = ?
- GROUP BY t.ID
- UNION DISTINCT
- SELECT $columns
- ,1 as is_deleted
- FROM deleted_torrents AS t
- LEFT JOIN torrents_bad_tags AS tbt ON (tbt.TorrentID = t.ID)
- LEFT JOIN torrents_bad_folders AS tbf ON (tbf.TorrentID = t.ID)
- LEFT JOIN torrents_bad_files AS tfi ON (tfi.TorrentID = t.ID)
- LEFT JOIN torrents_missing_lineage AS ml ON (ml.TorrentID = t.ID)
- LEFT JOIN torrents_cassette_approved AS ca ON (ca.TorrentID = t.ID)
- LEFT JOIN torrents_lossymaster_approved AS lma ON (lma.TorrentID = t.ID)
- LEFT JOIN torrents_lossyweb_approved AS lwa ON (lwa.TorrentID = t.ID)
- LEFT JOIN torrents_logs AS tl ON (tl.TorrentID = t.ID)
- WHERE t.GroupID = ?
- GROUP BY t.ID
- ORDER BY Remastered ASC,
- (RemasterYear != 0) DESC,
- RemasterYear ASC,
- RemasterTitle ASC,
- RemasterRecordLabel ASC,
- RemasterCatalogueNumber ASC,
- Media ASC,
- Format,
- Encoding,
- ID", $GroupID, $GroupID);
-
- $TorrentList = $DB->to_array('ID', MYSQLI_ASSOC);
- if (count($TorrentList) === 0 && $ApiCall == false) {
- header('Location: log.php?search='.(empty($_GET['torrentid']) ? "Group+$GroupID" : "Torrent+$_GET[torrentid]"));
- die();
- } elseif (count($TorrentList) === 0 && $ApiCall == true) {
- return null;
- }
- if (in_array(0, $DB->collect('Seeders'))) {
- $CacheTime = 600;
- } else {
- $CacheTime = 3600;
- }
- // Store it all in cache
- if (!$RevisionID) {
- $Cache->cache_value("torrents_details_$GroupID", array($TorrentDetails, $TorrentList), $CacheTime);
- }
- } else { // If we're reading from cache
- $TorrentDetails = $TorrentCache[0];
- $TorrentList = $TorrentCache[1];
- }
-
- if ($PersonalProperties) {
- // Fetch all user specific torrent and group properties
- $TorrentDetails['Flags'] = array('IsSnatched' => false);
- foreach ($TorrentList as &$Torrent) {
- Torrents::torrent_properties($Torrent, $TorrentDetails['Flags']);
- }
- }
-
- if ($Return) {
- return [$TorrentDetails, $TorrentList];
- }
+ global $Cache, $DB;
+ if (!$RevisionID) {
+ $TorrentCache = $Cache->get_value("torrents_details_$GroupID");
+ }
+ if ($RevisionID || !is_array($TorrentCache)) {
+ // Fetch the group details
+
+ $SQL = 'SELECT ';
+
+ if (!$RevisionID) {
+ $SQL .= '
+ g.WikiBody,
+ g.WikiImage, ';
+ } else {
+ $SQL .= '
+ w.Body,
+ w.Image, ';
+ }
+
+ $SQL .= "
+ g.ID,
+ g.Name,
+ g.Year,
+ g.RecordLabel,
+ g.CatalogueNumber,
+ g.ReleaseType,
+ g.CategoryID,
+ g.Time,
+ g.VanityHouse,
+ GROUP_CONCAT(DISTINCT tags.Name SEPARATOR '|'),
+ GROUP_CONCAT(DISTINCT tags.ID SEPARATOR '|'),
+ GROUP_CONCAT(tt.UserID SEPARATOR '|'),
+ GROUP_CONCAT(tt.PositiveVotes SEPARATOR '|'),
+ GROUP_CONCAT(tt.NegativeVotes SEPARATOR '|')
+ FROM torrents_group AS g
+ LEFT JOIN torrents_tags AS tt ON (tt.GroupID = g.ID)
+ LEFT JOIN tags ON (tags.ID = tt.TagID)";
+
+ $args = [];
+ if ($RevisionID) {
+ $SQL .= '
+ LEFT JOIN wiki_torrents AS w ON (w.PageID = ? AND w.RevisionID = ?)';
+ $args[] = $GroupID;
+ $args[] = $RevisionID;
+ }
+
+ $SQL .= '
+ WHERE g.ID = ?
+ GROUP BY NULL';
+ $args[] = $GroupID;
+
+ $DB->prepared_query_array($SQL, $args);
+ $TorrentDetails = $DB->next_record(MYSQLI_ASSOC);
+
+ // Fetch the individual torrents
+ $columns = "
+ t.ID,
+ t.Media,
+ t.Format,
+ t.Encoding,
+ t.Remastered,
+ t.RemasterYear,
+ t.RemasterTitle,
+ t.RemasterRecordLabel,
+ t.RemasterCatalogueNumber,
+ t.Scene,
+ t.HasLog,
+ t.HasCue,
+ t.HasLogDB,
+ t.LogScore,
+ t.LogChecksum,
+ t.FileCount,
+ t.Size,
+ tls.Seeders,
+ tls.Leechers,
+ tls.Snatched,
+ t.FreeTorrent,
+ t.Time,
+ t.Description,
+ t.FileList,
+ t.FilePath,
+ t.UserID,
+ tls.last_action,
+ HEX(t.info_hash) AS InfoHash,
+ tbt.TorrentID AS BadTags,
+ tbf.TorrentID AS BadFolders,
+ tfi.TorrentID AS BadFiles,
+ ml.TorrentID AS MissingLineage,
+ ca.TorrentID AS CassetteApproved,
+ lma.TorrentID AS LossymasterApproved,
+ lwa.TorrentID AS LossywebApproved,
+ t.LastReseedRequest,
+ t.ID AS HasFile,
+ COUNT(tl.LogID) AS LogCount
+ ";
+
+ $DB->prepared_query("
+ SELECT $columns
+ ,0 as is_deleted
+ FROM torrents AS t
+ INNER JOIN torrents_leech_stats tls ON (tls.TorrentID = t.ID)
+ LEFT JOIN torrents_bad_tags AS tbt ON (tbt.TorrentID = t.ID)
+ LEFT JOIN torrents_bad_folders AS tbf ON (tbf.TorrentID = t.ID)
+ LEFT JOIN torrents_bad_files AS tfi ON (tfi.TorrentID = t.ID)
+ LEFT JOIN torrents_missing_lineage AS ml ON (ml.TorrentID = t.ID)
+ LEFT JOIN torrents_cassette_approved AS ca ON (ca.TorrentID = t.ID)
+ LEFT JOIN torrents_lossymaster_approved AS lma ON (lma.TorrentID = t.ID)
+ LEFT JOIN torrents_lossyweb_approved AS lwa ON (lwa.TorrentID = t.ID)
+ LEFT JOIN torrents_logs AS tl ON (tl.TorrentID = t.ID)
+ WHERE t.GroupID = ?
+ GROUP BY t.ID
+ UNION DISTINCT
+ SELECT $columns
+ ,1 as is_deleted
+ FROM deleted_torrents AS t
+ INNER JOIN deleted_torrents_leech_stats tls ON (tls.TorrentID = t.ID)
+ LEFT JOIN deleted_torrents_bad_tags AS tbt ON (tbt.TorrentID = t.ID)
+ LEFT JOIN deleted_torrents_bad_folders AS tbf ON (tbf.TorrentID = t.ID)
+ LEFT JOIN deleted_torrents_bad_files AS tfi ON (tfi.TorrentID = t.ID)
+ LEFT JOIN deleted_torrents_missing_lineage AS ml ON (ml.TorrentID = t.ID)
+ LEFT JOIN deleted_torrents_cassette_approved AS ca ON (ca.TorrentID = t.ID)
+ LEFT JOIN deleted_torrents_lossymaster_approved AS lma ON (lma.TorrentID = t.ID)
+ LEFT JOIN deleted_torrents_lossyweb_approved AS lwa ON (lwa.TorrentID = t.ID)
+ LEFT JOIN torrents_logs AS tl ON (tl.TorrentID = t.ID)
+ WHERE t.GroupID = ?
+ GROUP BY t.ID
+ ORDER BY Remastered ASC,
+ (RemasterYear != 0) DESC,
+ RemasterYear ASC,
+ RemasterTitle ASC,
+ RemasterRecordLabel ASC,
+ RemasterCatalogueNumber ASC,
+ Media ASC,
+ Format,
+ Encoding,
+ ID", $GroupID, $GroupID);
+
+ $TorrentList = $DB->to_array('ID', MYSQLI_ASSOC);
+ if (count($TorrentList) === 0 && $ApiCall == false) {
+ header('Location: log.php?search='.(empty($_GET['torrentid']) ? "Group+$GroupID" : "Torrent+$_GET[torrentid]"));
+ die();
+ } elseif (count($TorrentList) === 0 && $ApiCall == true) {
+ return null;
+ }
+ if (in_array(0, $DB->collect('Seeders'))) {
+ $CacheTime = 600;
+ } else {
+ $CacheTime = 3600;
+ }
+ // Store it all in cache
+ if (!$RevisionID) {
+ $Cache->cache_value("torrents_details_$GroupID", array($TorrentDetails, $TorrentList), $CacheTime);
+ }
+ } else { // If we're reading from cache
+ $TorrentDetails = $TorrentCache[0];
+ $TorrentList = $TorrentCache[1];
+ }
+
+ if ($PersonalProperties) {
+ // Fetch all user specific torrent and group properties
+ $TorrentDetails['Flags'] = array('IsSnatched' => false);
+ foreach ($TorrentList as &$Torrent) {
+ Torrents::torrent_properties($Torrent, $TorrentDetails['Flags']);
+ }
+ }
+
+ if ($Return) {
+ return [$TorrentDetails, $TorrentList];
+ }
}
function get_torrent_info($TorrentID, $Return = true, $RevisionID = 0, $PersonalProperties = true, $ApiCall = false) {
- $GroupID = (int)torrentid_to_groupid($TorrentID);
- $GroupInfo = get_group_info($GroupID, $Return, $RevisionID, $PersonalProperties, $ApiCall);
- if ($GroupInfo) {
- foreach ($GroupInfo[1] as &$Torrent) {
- //Remove unneeded entries
- if ($Torrent['ID'] != $TorrentID) {
- unset($GroupInfo[1][$Torrent['ID']]);
- }
- if ($Return) {
- return $GroupInfo;
- }
- }
- } else {
- if ($Return) {
- return null;
- }
- }
+ $GroupID = (int)torrentid_to_groupid($TorrentID);
+ $GroupInfo = get_group_info($GroupID, $Return, $RevisionID, $PersonalProperties, $ApiCall);
+ if ($GroupInfo) {
+ foreach ($GroupInfo[1] as &$Torrent) {
+ //Remove unneeded entries
+ if ($Torrent['ID'] != $TorrentID) {
+ unset($GroupInfo[1][$Torrent['ID']]);
+ }
+ if ($Return) {
+ return $GroupInfo;
+ }
+ }
+ } else {
+ if ($Return) {
+ return null;
+ }
+ }
}
//Check if a givin string can be validated as a torrenthash
function is_valid_torrenthash($Str) {
- //6C19FF4C 6C1DD265 3B25832C 0F6228B2 52D743D5
- $Str = str_replace(' ', '', $Str);
- if (preg_match('/^[0-9a-fA-F]{40}$/', $Str))
- return $Str;
- return false;
+ //6C19FF4C 6C1DD265 3B25832C 0F6228B2 52D743D5
+ $Str = str_replace(' ', '', $Str);
+ if (preg_match('/^[0-9a-fA-F]{40}$/', $Str))
+ return $Str;
+ return false;
}
//Functionality for the API to resolve input into other data.
function torrenthash_to_torrentid($Str) {
- global $Cache, $DB;
- $DB->prepared_query("
- SELECT ID
- FROM torrents
- WHERE info_hash = UNHEX(?)", $Str);
- $TorrentID = (int)array_pop($DB->next_record(MYSQLI_ASSOC));
- if ($TorrentID) {
- return $TorrentID;
- }
- return null;
+ global $Cache, $DB;
+ $DB->prepared_query("
+ SELECT ID
+ FROM torrents
+ WHERE info_hash = UNHEX(?)", $Str);
+ $TorrentID = (int)array_pop($DB->next_record(MYSQLI_ASSOC));
+ if ($TorrentID) {
+ return $TorrentID;
+ }
+ return null;
}
function torrenthash_to_groupid($Str) {
- global $Cache, $DB;
- $DB->query("
- SELECT GroupID
- FROM torrents
- WHERE info_hash = UNHEX(?)", $Str);
- $GroupID = (int)array_pop($DB->next_record(MYSQLI_ASSOC));
- if ($GroupID) {
- return $GroupID;
- }
- return null;
+ global $Cache, $DB;
+ $DB->prepared_query("
+ SELECT GroupID
+ FROM torrents
+ WHERE info_hash = UNHEX(?)", $Str);
+ $GroupID = (int)array_pop($DB->next_record(MYSQLI_ASSOC));
+ if ($GroupID) {
+ return $GroupID;
+ }
+ return null;
}
function torrentid_to_groupid($TorrentID) {
- global $Cache, $DB;
- $DB->query("
- SELECT GroupID
- FROM torrents
- WHERE ID = '".db_string($TorrentID)."'");
- $GroupID = (int)array_pop($DB->next_record(MYSQLI_ASSOC));
- if ($GroupID) {
- return $GroupID;
- }
- return null;
+ global $Cache, $DB;
+ $DB->prepared_query("
+ SELECT GroupID
+ FROM torrents
+ WHERE ID = ?", $TorrentID);
+ $GroupID = (int)array_pop($DB->next_record(MYSQLI_ASSOC));
+ if ($GroupID) {
+ return $GroupID;
+ }
+ return null;
}
//After adjusting / deleting logs, recalculate the score for the torrent.
function set_torrent_logscore($TorrentID) {
- global $DB;
- $DB->query("
- UPDATE torrents
- SET LogScore = (
- SELECT FLOOR(AVG(Score))
- FROM torrents_logs
- WHERE TorrentID = $TorrentID
- )
- WHERE ID = $TorrentID");
+ global $DB;
+ $DB->query("
+ UPDATE torrents
+ SET LogScore = (
+ SELECT FLOOR(AVG(Score))
+ FROM torrents_logs
+ WHERE TorrentID = $TorrentID
+ )
+ WHERE ID = $TorrentID");
}
function get_group_requests($GroupID) {
- if (empty($GroupID) || !is_number($GroupID)) {
- return array();
- }
- global $DB, $Cache;
-
- $Requests = $Cache->get_value("requests_group_$GroupID");
- if ($Requests === false) {
- $DB->query("
- SELECT ID
- FROM requests
- WHERE GroupID = $GroupID
- AND TimeFilled = '0000-00-00 00:00:00'");
- $Requests = $DB->collect('ID');
- $Cache->cache_value("requests_group_$GroupID", $Requests, 0);
- }
- return Requests::get_requests($Requests);
+ if (empty($GroupID) || !is_number($GroupID)) {
+ return [];
+ }
+ global $DB, $Cache;
+
+ $Requests = $Cache->get_value("requests_group_$GroupID");
+ if ($Requests === false) {
+ $DB->query("
+ SELECT ID
+ FROM requests
+ WHERE GroupID = $GroupID
+ AND TimeFilled = '0000-00-00 00:00:00'");
+ $Requests = $DB->collect('ID');
+ $Cache->cache_value("requests_group_$GroupID", $Requests, 0);
+ }
+ return Requests::get_requests($Requests);
}
//Used by both sections/torrents/details.php and sections/reportsv2/report.php
function build_torrents_table($Cache, $DB, $LoggedUser, $GroupID, $GroupName, $GroupCategoryID, $ReleaseType, $TorrentList, $Types) {
- function filelist($Str) {
- return "\n
-
-
-
-
-
-
+
- Please detail all information that needs to be edited for the torrent group. Include all relevant links (discogs, musicbrainz, etc.).
- This will not generate a report, but will create a thread in the Editing forum.
+
+
+
+
+
+
+
+
-
+ Please detail all information that needs to be edited for the torrent group. Include all relevant links (discogs, musicbrainz, etc.).
+ This will not generate a report, but will create a thread in the Editing forum.
- What this form can be used for:
-
-
-
- 'Original Release' information, such as: year, record label, & catalogue number. -
- Group rename/typo correction -
- Group merging -
- etc... -
Do NOT use this form for individual torrents or artists. For individual torrents, use - the torrent report feature. For artists, go to their respective - pages and use that edit request feature.
-
-
+ Edit Details
+ What this form can be used for: + +-
+
- 'Original Release' information, such as: year, record label, & catalogue number. +
- Group rename/typo correction +
- Group merging +
- etc... +
Do NOT use this form for individual torrents or artists. For individual torrents, use + the torrent report feature. For artists, go to their respective + pages and use that edit request feature.
+
+
- Edit Details
-
-
-
-
+
+
+ | This torrent has '.$NumReports.' active '.($NumReports === 1 ? 'report' : 'reports').": | -
$ReportLinks ".time_diff($Report['ReportedTime'], 2, true, true).' for the reason "'.$ReportType['title'].'":
- '.Text::full_format($Report['UserComment']).'- |
-
|
- File Names' . $RegenLink . '
- ' . ($FilePath ? "/$FilePath/" : '') . '
- |
- - Size - | -
| %s | %s |
| %s | %s |
| This torrent has '.$NumReports.' active '.($NumReports === 1 ? 'report' : 'reports').": | +
$ReportLinks ".time_diff($Report['ReportedTime'], 2, true, true).' for the reason "'.$ReportType['title'].'":
+ '.Text::full_format($Report['UserComment']).'+ |
+
|
+ File Names' . $RegenLink . '
+ ' . ($FilePath ? "/$FilePath/" : '') . '
+ |
+ + Size + | +
| %s | %s |
| %s | %s |
-
-
diff --git a/sections/torrents/history.php b/sections/torrents/history.php
index 6deb84c34..c83dfcf23 100644
--- a/sections/torrents/history.php
+++ b/sections/torrents/history.php
@@ -1,27 +1,27 @@
-query("
- SELECT Name
- FROM torrents_group
- WHERE ID = $GroupID");
+ SELECT Name
+ FROM torrents_group
+ WHERE ID = $GroupID");
if (!$DB->has_results()) {
- error(404);
+ error(404);
}
list($Name) = $DB->next_record();
View::show_header("Revision history for $Name");
?>
+
-$i";
- }
- }
- return implode(' | ', $PageLinks);
+ $NumPages = ceil($NumResults / 100);
+ $PageLinks = [];
+ for ($i = 1; $i <= $NumPages; $i++) {
+ if ($i == $CurrentPage) {
+ $PageLinks[] = $i;
+ } else {
+ $PageLinks[] = "$i";
+ }
+ }
+ return implode(' | ', $PageLinks);
}
// This gets used in a few places
$ArtistTypes = array(1 => 'Main', 2 => 'Guest', 3 => 'Remixer', 4 => 'Composer', 5 => 'Conductor', 6 => 'DJ/Compiler', 7 => 'Producer');
if (!empty($_REQUEST['action'])) {
- switch ($_REQUEST['action']) {
- case 'editlog':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/edit_log.php');
- break;
-
- case 'deletelog':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/delete_log.php');
- break;
-
- case 'take_editlog':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/take_edit_log.php');
- break;
-
- case 'rescore_log':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/rescore_log.php');
- break;
-
- case 'viewlog':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/log_ajax.php');
- break;
-
- case 'removelogs':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/remove_logs.php');
- break;
-
- case 'edit':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/edit.php');
- break;
-
- case 'editgroup':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/editgroup.php');
- break;
-
- case 'editgroupid':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/editgroupid.php');
- break;
-
- case 'changecategory':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/takechangecategory.php');
- break;
- case 'grouplog':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/grouplog.php');
- break;
- case 'takeedit':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/takeedit.php');
- break;
-
- case 'newgroup':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/takenewgroup.php');
- break;
-
- case 'peerlist':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/peerlist.php');
- break;
-
- case 'snatchlist':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/snatchlist.php');
- break;
-
- case 'downloadlist':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/downloadlist.php');
- break;
-
- case 'redownload':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/redownload.php');
- break;
-
- case 'revert':
- case 'takegroupedit':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/takegroupedit.php');
- break;
-
- case 'nonwikiedit':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/nonwikiedit.php');
- break;
-
- case 'rename':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/rename.php');
- break;
-
- case 'merge':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/merge.php');
- break;
-
- case 'add_alias':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/add_alias.php');
- break;
-
- case 'delete_alias':
- enforce_login();
- authorize();
- include(SERVER_ROOT.'/sections/torrents/delete_alias.php');
- break;
-
- case 'history':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/history.php');
- break;
-
- case 'delete':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/delete.php');
- break;
-
- case 'takedelete':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/takedelete.php');
- break;
-
- case 'masspm':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/masspm.php');
- break;
-
- case 'reseed':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/reseed.php');
- break;
-
- case 'takemasspm':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/takemasspm.php');
- break;
-
- case 'vote_tag':
- enforce_login();
- authorize();
- include(SERVER_ROOT.'/sections/torrents/vote_tag.php');
- break;
-
- case 'add_tag':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/add_tag.php');
- break;
-
- case 'delete_tag':
- enforce_login();
- authorize();
- include(SERVER_ROOT.'/sections/torrents/delete_tag.php');
- break;
-
- case 'notify':
- enforce_login();
- include(SERVER_ROOT.'/sections/torrents/notify.php');
- break;
-
- case 'manage_artists':
- enforce_login();
- require(SERVER_ROOT.'/sections/torrents/manage_artists.php');
- break;
-
- case 'editrequest':
- enforce_login();
- require(SERVER_ROOT . '/sections/torrents/editrequest.php');
- break;
-
- case 'takeeditrequest':
- enforce_login();
- require(SERVER_ROOT . '/sections/torrents/takeeditrequest.php');
- break;
-
- case 'notify_clear':
- case 'notify_clear_item':
- case 'notify_clear_items':
- case 'notify_clearitem':
- case 'notify_clear_filter':
- case 'notify_cleargroup':
- case 'notify_catchup':
- case 'notify_catchup_filter':
- authorize();
- enforce_login();
- require(SERVER_ROOT.'/sections/torrents/notify_actions.php');
- break;
-
- case 'download':
- require(SERVER_ROOT.'/sections/torrents/download.php');
- break;
-
- case 'regen_filelist':
- if (check_perms('users_mod') && !empty($_GET['torrentid']) && is_number($_GET['torrentid'])) {
- Torrents::regenerate_filelist($_GET['torrentid']);
- header('Location: torrents.php?torrentid='.$_GET['torrentid']);
- die();
- } else {
- error(403);
- }
- break;
- case 'fix_group':
- if ((check_perms('users_mod') || check_perms('torrents_fix_ghosts')) && authorize() && !empty($_GET['groupid']) && is_number($_GET['groupid'])) {
- $DB->query('
- SELECT COUNT(ID)
- FROM torrents
- WHERE GroupID = '.$_GET['groupid']);
- list($Count) = $DB->next_record();
- if ($Count == 0) {
- Torrents::delete_group($_GET['groupid']);
- } else {
- }
- if (!empty($_GET['artistid']) && is_number($_GET['artistid'])) {
- header('Location: artist.php?id='.$_GET['artistid']);
- } else {
- header('Location: torrents.php?id='.$_GET['groupid']);
- }
- } else {
- error(403);
- }
- break;
- case 'add_cover_art':
- include(SERVER_ROOT.'/sections/torrents/add_cover_art.php');
- break;
- case 'remove_cover_art':
- include(SERVER_ROOT.'/sections/torrents/remove_cover_art.php');
- break;
- case 'autocomplete_tags':
- include(SERVER_ROOT.'/sections/torrents/autocomplete_tags.php');
- break;
- default:
- enforce_login();
-
- if (!empty($_GET['id'])) {
- include(SERVER_ROOT.'/sections/torrents/details.php');
- } elseif (isset($_GET['torrentid']) && is_number($_GET['torrentid'])) {
- $DB->query('
- SELECT GroupID
- FROM torrents
- WHERE ID = '.$_GET['torrentid']);
- list($GroupID) = $DB->next_record();
- if ($GroupID) {
- header("Location: torrents.php?id=$GroupID&torrentid=".$_GET['torrentid']);
- }
- } else {
- include(SERVER_ROOT.'/sections/torrents/browse.php');
- }
- break;
- }
+ switch ($_REQUEST['action']) {
+ case 'editlog':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/edit_log.php');
+ break;
+
+ case 'deletelog':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/delete_log.php');
+ break;
+
+ case 'take_editlog':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/take_edit_log.php');
+ break;
+
+ case 'rescore_log':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/rescore_log.php');
+ break;
+
+ case 'viewlog':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/log_ajax.php');
+ break;
+
+ case 'removelogs':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/remove_logs.php');
+ break;
+
+ case 'edit':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/edit.php');
+ break;
+
+ case 'editgroup':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/editgroup.php');
+ break;
+
+ case 'editgroupid':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/editgroupid.php');
+ break;
+
+ case 'changecategory':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/takechangecategory.php');
+ break;
+ case 'grouplog':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/grouplog.php');
+ break;
+ case 'takeedit':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/takeedit.php');
+ break;
+
+ case 'newgroup':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/takenewgroup.php');
+ break;
+
+ case 'peerlist':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/peerlist.php');
+ break;
+
+ case 'snatchlist':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/snatchlist.php');
+ break;
+
+ case 'downloadlist':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/downloadlist.php');
+ break;
+
+ case 'redownload':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/redownload.php');
+ break;
+
+ case 'revert':
+ case 'takegroupedit':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/takegroupedit.php');
+ break;
+
+ case 'nonwikiedit':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/nonwikiedit.php');
+ break;
+
+ case 'rename':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/rename.php');
+ break;
+
+ case 'merge':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/merge.php');
+ break;
+
+ case 'add_alias':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/add_alias.php');
+ break;
+
+ case 'delete_alias':
+ enforce_login();
+ authorize();
+ include(SERVER_ROOT.'/sections/torrents/delete_alias.php');
+ break;
+
+ case 'history':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/history.php');
+ break;
+
+ case 'delete':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/delete.php');
+ break;
+
+ case 'takedelete':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/takedelete.php');
+ break;
+
+ case 'masspm':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/masspm.php');
+ break;
+
+ case 'reseed':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/reseed.php');
+ break;
+
+ case 'takemasspm':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/takemasspm.php');
+ break;
+
+ case 'vote_tag':
+ enforce_login();
+ authorize();
+ include(SERVER_ROOT.'/sections/torrents/vote_tag.php');
+ break;
+
+ case 'add_tag':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/add_tag.php');
+ break;
+
+ case 'delete_tag':
+ enforce_login();
+ authorize();
+ include(SERVER_ROOT.'/sections/torrents/delete_tag.php');
+ break;
+
+ case 'notify':
+ enforce_login();
+ include(SERVER_ROOT.'/sections/torrents/notify.php');
+ break;
+
+ case 'manage_artists':
+ enforce_login();
+ require(SERVER_ROOT.'/sections/torrents/manage_artists.php');
+ break;
+
+ case 'editrequest':
+ enforce_login();
+ require(SERVER_ROOT . '/sections/torrents/editrequest.php');
+ break;
+
+ case 'takeeditrequest':
+ enforce_login();
+ require(SERVER_ROOT . '/sections/torrents/takeeditrequest.php');
+ break;
+
+ case 'notify_clear':
+ case 'notify_clear_item':
+ case 'notify_clear_items':
+ case 'notify_clearitem':
+ case 'notify_clear_filter':
+ case 'notify_cleargroup':
+ case 'notify_catchup':
+ case 'notify_catchup_filter':
+ authorize();
+ enforce_login();
+ require(SERVER_ROOT.'/sections/torrents/notify_actions.php');
+ break;
+
+ case 'download':
+ require(SERVER_ROOT.'/sections/torrents/download.php');
+ break;
+
+ case 'collector':
+ enforce_login();
+ require(SERVER_ROOT.'/sections/torrents/collector.php');
+ break;
+
+ case 'regen_filelist':
+ if (check_perms('users_mod') && !empty($_GET['torrentid']) && is_number($_GET['torrentid'])) {
+ Torrents::regenerate_filelist($_GET['torrentid']);
+ header('Location: torrents.php?torrentid='.$_GET['torrentid']);
+ die();
+ } else {
+ error(403);
+ }
+ break;
+ case 'fix_group':
+ if ((check_perms('users_mod') || check_perms('torrents_fix_ghosts')) && authorize() && !empty($_GET['groupid']) && is_number($_GET['groupid'])) {
+ $DB->query('
+ SELECT COUNT(ID)
+ FROM torrents
+ WHERE GroupID = '.$_GET['groupid']);
+ list($Count) = $DB->next_record();
+ if ($Count == 0) {
+ Torrents::delete_group($_GET['groupid']);
+ } else {
+ }
+ if (!empty($_GET['artistid']) && is_number($_GET['artistid'])) {
+ header('Location: artist.php?id='.$_GET['artistid']);
+ } else {
+ header('Location: torrents.php?id='.$_GET['groupid']);
+ }
+ } else {
+ error(403);
+ }
+ break;
+ case 'add_cover_art':
+ include(SERVER_ROOT.'/sections/torrents/add_cover_art.php');
+ break;
+ case 'remove_cover_art':
+ include(SERVER_ROOT.'/sections/torrents/remove_cover_art.php');
+ break;
+ case 'autocomplete_tags':
+ include(SERVER_ROOT.'/sections/torrents/autocomplete_tags.php');
+ break;
+ default:
+ enforce_login();
+
+ if (!empty($_GET['id'])) {
+ include(SERVER_ROOT.'/sections/torrents/details.php');
+ } elseif (isset($_GET['torrentid']) && is_number($_GET['torrentid'])) {
+ $DB->query('
+ SELECT GroupID
+ FROM torrents
+ WHERE ID = '.$_GET['torrentid']);
+ list($GroupID) = $DB->next_record();
+ if ($GroupID) {
+ header("Location: torrents.php?id=$GroupID&torrentid=".$_GET['torrentid']);
+ }
+ } else {
+ include(SERVER_ROOT.'/sections/torrents/browse.php');
+ }
+ break;
+ }
} else {
- enforce_login();
-
- if (!empty($_GET['id'])) {
- include(SERVER_ROOT.'/sections/torrents/details.php');
- } elseif (isset($_GET['torrentid']) && intval($_GET['torrentid'])) {
- $torrent_id = (int)$_GET['torrentid'];
- $DB->prepared_query('
- SELECT GroupID
- FROM torrents
- WHERE ID = ?
- UNION
- SELECT GroupID
- FROM deleted_torrents
- WHERE ID = ?
- ', $torrent_id, $torrent_id);
- list($GroupID) = $DB->next_record();
- if ($GroupID) {
- header("Location: torrents.php?id=$GroupID&torrentid=".$_GET['torrentid'].'#torrent'.$_GET['torrentid']);
- } else {
- header("Location: log.php?search=Torrent+$_GET[torrentid]");
- }
- } elseif (!empty($_GET['type'])) {
- include(SERVER_ROOT.'/sections/torrents/user.php');
- } elseif (!empty($_GET['groupname']) && !empty($_GET['forward'])) {
- $DB->prepared_query('
- SELECT ID
- FROM torrents_group
- WHERE Name LIKE ?', trim($_GET['groupname']));
- list($GroupID) = $DB->next_record();
- if ($GroupID) {
- header("Location: torrents.php?id=$GroupID");
- } else {
- include(SERVER_ROOT.'/sections/torrents/browse.php');
- }
- } else {
- include(SERVER_ROOT.'/sections/torrents/browse.php');
- }
+ enforce_login();
+
+ if (!empty($_GET['id'])) {
+ include(SERVER_ROOT.'/sections/torrents/details.php');
+ } elseif (isset($_GET['torrentid']) && intval($_GET['torrentid'])) {
+ $torrent_id = (int)$_GET['torrentid'];
+ $DB->prepared_query('
+ SELECT GroupID
+ FROM torrents
+ WHERE ID = ?
+ UNION
+ SELECT GroupID
+ FROM deleted_torrents
+ WHERE ID = ?
+ ', $torrent_id, $torrent_id);
+ list($GroupID) = $DB->next_record();
+ if ($GroupID) {
+ header("Location: torrents.php?id=$GroupID&torrentid=".$_GET['torrentid'].'#torrent'.$_GET['torrentid']);
+ } else {
+ header("Location: log.php?search=Torrent+$_GET[torrentid]");
+ }
+ } elseif (!empty($_GET['type'])) {
+ include(SERVER_ROOT.'/sections/torrents/user.php');
+ } elseif (!empty($_GET['groupname']) && !empty($_GET['forward'])) {
+ $DB->prepared_query('
+ SELECT ID
+ FROM torrents_group
+ WHERE Name LIKE ?', trim($_GET['groupname']));
+ list($GroupID) = $DB->next_record();
+ if ($GroupID) {
+ header("Location: torrents.php?id=$GroupID");
+ } else {
+ include(SERVER_ROOT.'/sections/torrents/browse.php');
+ }
+ } else {
+ include(SERVER_ROOT.'/sections/torrents/browse.php');
+ }
}
diff --git a/sections/torrents/log_ajax.php b/sections/torrents/log_ajax.php
index 6eae2366f..7c8c51d90 100644
--- a/sections/torrents/log_ajax.php
+++ b/sections/torrents/log_ajax.php
@@ -1,76 +1,76 @@
-query("SELECT LogID, Log, Details, Score, `Checksum`, Adjusted, AdjustedBy, AdjustedScore, AdjustedChecksum, AdjustmentReason, AdjustmentDetails FROM torrents_logs WHERE TorrentID = '$TorrentID'");
if($DB->record_count() > 0) {
- ob_start();
- echo '
-
- History for
-| This torrent has '.$DB->record_count().' '.($DB->record_count() > 1 ? 'logs' : 'log').' with a total score of '.$LogScore.' (out of 100): |
| This torrent has '.$DB->record_count().' '.($DB->record_count() > 1 ? 'logs' : 'log').' with a total score of '.$LogScore.' (out of 100): |
| - Remove all logs - |
| "; - if (check_perms('users_mod')) { - echo "Edit Log "; - echo "Delete Log "; - } - if (file_exists(SERVER_ROOT . "/logs/{$TorrentID}_{$Log['LogID']}.log")) { - echo "View Raw Log"; - } + while ($Log = $DB->next_record(MYSQLI_ASSOC, array('AdjustmentDetails'))) { + echo " |
| ";
+ if (check_perms('users_mod')) {
+ echo "Edit Log ";
+ echo "Delete Log ";
+ }
+ if (file_exists(SERVER_ROOT . "/logs/{$TorrentID}_{$Log['LogID']}.log")) {
+ echo "View Raw Log";
+ }
- if (($Log['Adjusted'] === '0' && $Log['Checksum'] === '0') || ($Log['Adjusted'] === '1' && $Log['AdjustedChecksum'] === '0')) {
- echo <<
- Trumpable For:
- - Bad/No Checksum(s) - + if (($Log['Adjusted'] === '0' && $Log['Checksum'] === '0') || ($Log['Adjusted'] === '1' && $Log['AdjustedChecksum'] === '0')) { + echo << + Trumpable For: + + Bad/No Checksum(s) + HTML; - } + } if ($Log['Adjusted'] === '1') { - echo ' Log adjusted by '.Users::format_username($Log['AdjustedBy'])." from score {$Log['Score']} to {$Log['AdjustedScore']}"; - if (!empty($Log['AdjustmentReason'])) { - echo "'; - } + echo ' Log adjusted by '.Users::format_username($Log['AdjustedBy'])." from score {$Log['Score']} to {$Log['AdjustedScore']}"; + if (!empty($Log['AdjustmentReason'])) { + echo "'; + } - $Log['Details'] = (!empty($Log['Details'])) ? explode("\r\n", trim($Log['Details'])) : array(); - if ($Log['Adjusted'] === '1' && $Log['Checksum'] !== $Log['AdjustedChecksum']) { - $Log['Details'][] = 'Bad/No Checksum(s)'; - } - if (!empty($Log['Details'])) { - $Extra = ($Log['Adjusted'] === '1') ? 'Original ' : ''; - echo ' '.$Extra.'Log validation report:'; - } + $Log['Details'] = (!empty($Log['Details'])) ? explode("\r\n", trim($Log['Details'])) : []; + if ($Log['Adjusted'] === '1' && $Log['Checksum'] !== $Log['AdjustedChecksum']) { + $Log['Details'][] = 'Bad/No Checksum(s)'; + } + if (!empty($Log['Details'])) { + $Extra = ($Log['Adjusted'] === '1') ? 'Original ' : ''; + echo ' '.$Extra.'Log validation report:'; + } - echo " "; + echo "".html_entity_decode($Log['Log'])." "; echo '".html_entity_decode($Log['Log'])." |
-
-
+
diff --git a/sections/torrents/merge.php b/sections/torrents/merge.php
index c352f568e..2175e4be1 100644
--- a/sections/torrents/merge.php
+++ b/sections/torrents/merge.php
@@ -1,6 +1,6 @@
-query("
- SELECT CategoryID, Name
- FROM torrents_group
- WHERE ID = '$NewGroupID'");
+ SELECT CategoryID, Name
+ FROM torrents_group
+ WHERE ID = '$NewGroupID'");
if (!$DB->has_results()) {
- error('Target group does not exist.');
+ error('Target group does not exist.');
}
list($CategoryID, $NewName) = $DB->next_record();
if ($Categories[$CategoryID - 1] != 'Music') {
- error('Only music groups can be merged.');
+ error('Only music groups can be merged.');
}
$DB->query("
- SELECT Name
- FROM torrents_group
- WHERE ID = $GroupID");
+ SELECT Name
+ FROM torrents_group
+ WHERE ID = $GroupID");
list($Name) = $DB->next_record();
// Everything is legit, let's just confim they're not retarded
if (empty($_POST['confirm'])) {
- $Artists = Artists::get_artists(array($GroupID, $NewGroupID));
+ $Artists = Artists::get_artists(array($GroupID, $NewGroupID));
- View::show_header();
+ View::show_header();
?>
-
-
-
+ Send PM To All Snatchers Of " - "
-
+
+
Send PM To All Snatchers Of " - "
+
-
-
+
-
- Merge Confirm!
-
-
-
-
+
+ Merge Confirm!
+
+
+
+
+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");
+ // 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'
- WHERE GroupID = '$GroupID'");
- $DB->query("
- UPDATE wiki_torrents
- SET PageID = '$NewGroupID'
- WHERE PageID = '$GroupID'");
+ $DB->query("
+ UPDATE torrents
+ SET GroupID = '$NewGroupID'
+ WHERE GroupID = '$GroupID'");
+ $DB->query("
+ UPDATE wiki_torrents
+ SET PageID = '$NewGroupID'
+ WHERE PageID = '$GroupID'");
- //Comments
- Comments::merge('torrents', $OldGroupID, $NewGroupID);
+ //Comments
+ Comments::merge('torrents', $OldGroupID, $NewGroupID);
- //Collages
- $DB->query("
- SELECT CollageID
- FROM collages_torrents
- WHERE GroupID = '$OldGroupID'"); // Select all collages that contain edited group
- while (list($CollageID) = $DB->next_record()) {
- $DB->query("
- UPDATE IGNORE collages_torrents
- SET GroupID = '$NewGroupID'
- WHERE GroupID = '$OldGroupID'
- AND CollageID = '$CollageID'"); // Change collage group ID to new ID
- $DB->query("
- DELETE FROM collages_torrents
- WHERE GroupID = '$OldGroupID'
- AND CollageID = '$CollageID'");
- $Cache->delete_value("collage_$CollageID");
- }
- $Cache->delete_value("torrent_collages_$NewGroupID");
- $Cache->delete_value("torrent_collages_personal_$NewGroupID");
+ //Collages
+ $DB->query("
+ SELECT CollageID
+ FROM collages_torrents
+ WHERE GroupID = '$OldGroupID'"); // Select all collages that contain edited group
+ while (list($CollageID) = $DB->next_record()) {
+ $DB->query("
+ UPDATE IGNORE collages_torrents
+ SET GroupID = '$NewGroupID'
+ WHERE GroupID = '$OldGroupID'
+ AND CollageID = '$CollageID'"); // Change collage group ID to new ID
+ $DB->query("
+ DELETE FROM collages_torrents
+ WHERE GroupID = '$OldGroupID'
+ AND CollageID = '$CollageID'");
+ $Cache->delete_value("collage_$CollageID");
+ }
+ $Cache->delete_value("torrent_collages_$NewGroupID");
+ $Cache->delete_value("torrent_collages_personal_$NewGroupID");
- // Requests
- $DB->query("
- SELECT ID
- FROM requests
- WHERE GroupID = '$OldGroupID'");
- $Requests = $DB->collect('ID');
- $DB->query("
- UPDATE requests
- SET GroupID = '$NewGroupID'
- WHERE GroupID = '$OldGroupID'");
- foreach ($Requests as $RequestID) {
- $Cache->delete_value("request_$RequestID");
- }
- $Cache->delete_value('requests_group_'.$NewGroupID);
+ // Requests
+ $DB->query("
+ SELECT ID
+ FROM requests
+ WHERE GroupID = '$OldGroupID'");
+ $Requests = $DB->collect('ID');
+ $DB->query("
+ UPDATE requests
+ SET GroupID = '$NewGroupID'
+ WHERE GroupID = '$OldGroupID'");
+ foreach ($Requests as $RequestID) {
+ $Cache->delete_value("request_$RequestID");
+ }
+ $Cache->delete_value('requests_group_'.$NewGroupID);
- Torrents::delete_group($GroupID);
+ Torrents::delete_group($GroupID);
- Torrents::write_group_log($NewGroupID, 0, $LoggedUser['ID'], "Merged Group $GroupID ($Name) to $NewGroupID ($NewName)", 0);
- $DB->query("
- UPDATE group_log
- SET GroupID = $NewGroupID
- WHERE GroupID = $GroupID");
+ Torrents::write_group_log($NewGroupID, 0, $LoggedUser['ID'], "Merged Group $GroupID ($Name) to $NewGroupID ($NewName)", 0);
+ $DB->query("
+ UPDATE group_log
+ SET GroupID = $NewGroupID
+ WHERE GroupID = $GroupID");
- $GroupID = $NewGroupID;
+ $GroupID = $NewGroupID;
- $DB->query("
- SELECT ID
- FROM torrents
- WHERE GroupID = '$OldGroupID'");
- while (list($TorrentID) = $DB->next_record()) {
- $Cache->delete_value("torrent_download_$TorrentID");
- }
- $Cache->delete_value("torrents_details_$GroupID");
- $Cache->delete_value("groups_artists_$GroupID");
- Torrents::update_hash($GroupID);
+ $DB->query("
+ SELECT ID
+ FROM torrents
+ WHERE GroupID = '$OldGroupID'");
+ while (list($TorrentID) = $DB->next_record()) {
+ $Cache->delete_value("torrent_download_$TorrentID");
+ }
+ $Cache->delete_value("torrents_details_$GroupID");
+ $Cache->delete_value("groups_artists_$GroupID");
+ Torrents::update_hash($GroupID);
- header("Location: torrents.php?id=" . $GroupID);
+ header("Location: torrents.php?id=" . $GroupID);
}
?>
diff --git a/sections/torrents/nonwikiedit.php b/sections/torrents/nonwikiedit.php
index 672caec2a..e9da240b4 100644
--- a/sections/torrents/nonwikiedit.php
+++ b/sections/torrents/nonwikiedit.php
@@ -1,41 +1,41 @@
-query("
- SELECT UserID
- FROM torrents
- WHERE GroupID = $GroupID");
- if (!in_array($LoggedUser['ID'], $DB->collect('UserID'))) {
- error(403);
- }
+ $DB->query("
+ SELECT UserID
+ FROM torrents
+ WHERE GroupID = $GroupID");
+ if (!in_array($LoggedUser['ID'], $DB->collect('UserID'))) {
+ error(403);
+ }
}
if (check_perms('torrents_freeleech') && (isset($_POST['freeleech']) xor isset($_POST['neutralleech']) xor isset($_POST['unfreeleech']))) {
- if (isset($_POST['freeleech'])) {
- $Free = 1;
- } elseif (isset($_POST['neutralleech'])) {
- $Free = 2;
- } else {
- $Free = 0;
- }
+ if (isset($_POST['freeleech'])) {
+ $Free = 1;
+ } elseif (isset($_POST['neutralleech'])) {
+ $Free = 2;
+ } else {
+ $Free = 0;
+ }
- if (isset($_POST['freeleechtype']) && in_array($_POST['freeleechtype'], array(0, 1, 2, 3))) {
- $FreeType = $_POST['freeleechtype'];
- } else {
- error(404);
- }
+ if (isset($_POST['freeleechtype']) && in_array($_POST['freeleechtype'], array(0, 1, 2, 3))) {
+ $FreeType = $_POST['freeleechtype'];
+ } else {
+ error(404);
+ }
- Torrents::freeleech_groups($GroupID, $Free, $FreeType);
+ Torrents::freeleech_groups($GroupID, $Free, $FreeType);
}
//Escape fields
@@ -45,33 +45,33 @@
// Get some info for the group log
$DB->query("
- SELECT Year
- FROM torrents_group
- WHERE ID = $GroupID");
+ SELECT Year
+ FROM torrents_group
+ WHERE ID = $GroupID");
list($OldYear) = $DB->next_record();
$DB->query("
- UPDATE torrents_group
- SET
- Year = '$Year',
- RecordLabel = '".$RecordLabel."',
- CatalogueNumber = '".$CatalogueNumber."'
- WHERE ID = $GroupID");
+ UPDATE torrents_group
+ SET
+ Year = '$Year',
+ RecordLabel = '".$RecordLabel."',
+ CatalogueNumber = '".$CatalogueNumber."'
+ WHERE ID = $GroupID");
if ($OldYear != $Year) {
- $DB->query("
- INSERT INTO group_log (GroupID, UserID, Time, Info)
- VALUES ('$GroupID', ".$LoggedUser['ID'].", '".sqltime()."', '".db_string("Year changed from $OldYear to $Year")."')");
+ $DB->query("
+ INSERT INTO group_log (GroupID, UserID, Time, Info)
+ VALUES ('$GroupID', ".$LoggedUser['ID'].", '".sqltime()."', '".db_string("Year changed from $OldYear to $Year")."')");
}
$DB->query("
- SELECT ID
- FROM torrents
- WHERE GroupID = '$GroupID'");
+ SELECT ID
+ FROM torrents
+ WHERE GroupID = '$GroupID'");
while (list($TorrentID) = $DB->next_record()) {
- $Cache->delete_value("torrent_download_$TorrentID");
+ $Cache->delete_value("torrent_download_$TorrentID");
}
Torrents::update_hash($GroupID);
$Cache->delete_value("torrents_details_$GroupID");
diff --git a/sections/torrents/notify.php b/sections/torrents/notify.php
index 7cb256f5b..039f6bd1d 100644
--- a/sections/torrents/notify.php
+++ b/sections/torrents/notify.php
@@ -1,351 +1,358 @@
array('unt' => 'unt.TorrentID'),
- 'size' => array('t' => 't.Size'),
- 'snatches' => array('t' => 't.Snatched'),
- 'seeders' => array('t' => 't.Seeders'),
- 'leechers' => array('t' => 't.Leechers'),
- 'year' => array('tg' => 'tnt.Year'));
+ 'time' => array('unt' => 'unt.TorrentID'),
+ 'size' => array('t' => 't.Size'),
+ 'snatches' => array('t' => 'tls.Snatched'),
+ 'seeders' => array('t' => 'tls.Seeders'),
+ 'leechers' => array('t' => 'tls.Leechers'),
+ 'year' => array('tg' => 'tnt.Year'));
if (empty($_GET['order_by']) || !isset($OrderBys[$_GET['order_by']])) {
- $_GET['order_by'] = 'time';
+ $_GET['order_by'] = 'time';
}
list($OrderTbl, $OrderCol) = each($OrderBys[$_GET['order_by']]);
if (!empty($_GET['order_way']) && $_GET['order_way'] == 'asc') {
- $OrderWay = 'ASC';
+ $OrderWay = 'ASC';
} else {
- $OrderWay = 'DESC';
+ $OrderWay = 'DESC';
}
if (!empty($_GET['filterid']) && is_number($_GET['filterid'])) {
- $FilterID = $_GET['filterid'];
+ $FilterID = $_GET['filterid'];
} else {
- $FilterID = false;
+ $FilterID = false;
}
list($Page, $Limit) = Format::page_limit(NOTIFICATIONS_PER_PAGE);
// The "order by x" links on columns headers
function header_link($SortKey, $DefaultWay = 'desc') {
- global $OrderWay;
- if ($SortKey == $_GET['order_by']) {
- if ($OrderWay == 'DESC') {
- $NewWay = 'asc';
- } else {
- $NewWay = 'desc';
- }
- } else {
- $NewWay = $DefaultWay;
- }
- return "?action=notify&order_way=$NewWay&order_by=$SortKey&".Format::get_url(array('page', 'order_way', 'order_by'));
+ global $OrderWay;
+ if ($SortKey == $_GET['order_by']) {
+ if ($OrderWay == 'DESC') {
+ $NewWay = 'asc';
+ } else {
+ $NewWay = 'desc';
+ }
+ } else {
+ $NewWay = $DefaultWay;
+ }
+ return "?action=notify&order_way=$NewWay&order_by=$SortKey&".Format::get_url(array('page', 'order_way', 'order_by'));
}
//Perhaps this should be a feature at some point
if (check_perms('users_mod') && !empty($_GET['userid']) && is_number($_GET['userid']) && $_GET['userid'] != $LoggedUser['ID']) {
- $UserID = $_GET['userid'];
- $Sneaky = true;
+ $UserID = $_GET['userid'];
+ $Sneaky = true;
} else {
- $Sneaky = false;
- $UserID = $LoggedUser['ID'];
+ $Sneaky = false;
+ $UserID = $LoggedUser['ID'];
}
// Sorting by release year requires joining torrents_group, which is slow. Using a temporary table
// makes it speedy enough as long as there aren't too many records to create
if ($OrderTbl == 'tg') {
- $DB->query("
- SELECT COUNT(*)
- FROM users_notify_torrents AS unt
- JOIN torrents AS t ON t.ID=unt.TorrentID
- WHERE unt.UserID=$UserID".
- ($FilterID
- ? " AND FilterID=$FilterID"
- : ''));
- list($TorrentCount) = $DB->next_record();
- if ($TorrentCount > NOTIFICATIONS_MAX_SLOWSORT) {
- error('Due to performance issues, torrent lists with more than '.number_format(NOTIFICATIONS_MAX_SLOWSORT).' items cannot be ordered by release year.');
- }
+ $DB->query("
+ SELECT COUNT(*)
+ FROM users_notify_torrents AS unt
+ INNER JOIN torrents AS t ON (t.ID=unt.TorrentID)
+ INNER JOIN torrents_leech_stats tls ON (tls.TorrentID = t.ID)
+ WHERE unt.UserID=$UserID".
+ ($FilterID
+ ? " AND FilterID=$FilterID"
+ : ''));
+ list($TorrentCount) = $DB->next_record();
+ if ($TorrentCount > NOTIFICATIONS_MAX_SLOWSORT) {
+ error('Due to performance issues, torrent lists with more than '.number_format(NOTIFICATIONS_MAX_SLOWSORT).' items cannot be ordered by release year.');
+ }
- $DB->query("
- CREATE TEMPORARY TABLE temp_notify_torrents
- (TorrentID int, GroupID int, UnRead tinyint, FilterID int, Year smallint, PRIMARY KEY(GroupID, TorrentID), KEY(Year))
- ENGINE=MyISAM");
- $DB->query("
- INSERT IGNORE INTO temp_notify_torrents (TorrentID, GroupID, UnRead, FilterID)
- SELECT t.ID, t.GroupID, unt.UnRead, unt.FilterID
- FROM users_notify_torrents AS unt
- JOIN torrents AS t ON t.ID=unt.TorrentID
- WHERE unt.UserID=$UserID".
- ($FilterID
- ? " AND unt.FilterID=$FilterID"
- : ''));
- $DB->query("
- UPDATE temp_notify_torrents AS tnt
- JOIN torrents_group AS tg ON tnt.GroupID = tg.ID
- SET tnt.Year = tg.Year");
+ $DB->query("
+ CREATE TEMPORARY TABLE temp_notify_torrents
+ (TorrentID int, GroupID int, UnRead tinyint, FilterID int, Year smallint, PRIMARY KEY(GroupID, TorrentID), KEY(Year))
+ ENGINE=InnoDB");
+ $DB->query("
+ INSERT IGNORE INTO temp_notify_torrents (TorrentID, GroupID, UnRead, FilterID)
+ SELECT t.ID, t.GroupID, unt.UnRead, unt.FilterID
+ FROM users_notify_torrents AS unt
+ INNER JOIN torrents AS t ON t.ID=unt.TorrentID
+ INNER JOIN torrents_leech_stats tls ON (tls.TorrentID = t.ID)
+ WHERE unt.UserID=$UserID".
+ ($FilterID
+ ? " AND unt.FilterID=$FilterID"
+ : ''));
+ $DB->query("
+ UPDATE temp_notify_torrents AS tnt
+ JOIN torrents_group AS tg ON tnt.GroupID = tg.ID
+ SET tnt.Year = tg.Year");
- $DB->query("
- SELECT TorrentID, GroupID, UnRead, FilterID
- FROM temp_notify_torrents AS tnt
- ORDER BY $OrderCol $OrderWay, GroupID $OrderWay
- LIMIT $Limit");
- $Results = $DB->to_array(false, MYSQLI_ASSOC, false);
+ $DB->query("
+ SELECT TorrentID, GroupID, UnRead, FilterID
+ FROM temp_notify_torrents AS tnt
+ ORDER BY $OrderCol $OrderWay, GroupID $OrderWay
+ LIMIT $Limit");
+ $Results = $DB->to_array(false, MYSQLI_ASSOC, false);
} else {
- $DB->query("
- SELECT
- SQL_CALC_FOUND_ROWS
- unt.TorrentID,
- unt.UnRead,
- unt.FilterID,
- t.GroupID
- FROM users_notify_torrents AS unt
- JOIN torrents AS t ON t.ID = unt.TorrentID
- WHERE unt.UserID = $UserID".
- ($FilterID
- ? " AND unt.FilterID = $FilterID"
- : '')."
- ORDER BY $OrderCol $OrderWay
- LIMIT $Limit");
- $Results = $DB->to_array(false, MYSQLI_ASSOC, false);
- $DB->query('SELECT FOUND_ROWS()');
- list($TorrentCount) = $DB->next_record();
+ $DB->query("
+ SELECT
+ SQL_CALC_FOUND_ROWS
+ unt.TorrentID,
+ unt.UnRead,
+ unt.FilterID,
+ t.GroupID
+ FROM users_notify_torrents AS unt
+ JOIN torrents AS t ON t.ID = unt.TorrentID
+ WHERE unt.UserID = $UserID".
+ ($FilterID
+ ? " AND unt.FilterID = $FilterID"
+ : '')."
+ ORDER BY $OrderCol $OrderWay
+ LIMIT $Limit");
+ $Results = $DB->to_array(false, MYSQLI_ASSOC, false);
+ $DB->query('SELECT FOUND_ROWS()');
+ list($TorrentCount) = $DB->next_record();
}
-$GroupIDs = $FilterIDs = $UnReadIDs = array();
+$GroupIDs = $FilterIDs = $UnReadIDs = [];
foreach ($Results as $Torrent) {
- $GroupIDs[$Torrent['GroupID']] = 1;
- $FilterIDs[$Torrent['FilterID']] = 1;
- if ($Torrent['UnRead']) {
- $UnReadIDs[] = $Torrent['TorrentID'];
- }
+ $GroupIDs[$Torrent['GroupID']] = 1;
+ $FilterIDs[$Torrent['FilterID']] = 1;
+ if ($Torrent['UnRead']) {
+ $UnReadIDs[] = $Torrent['TorrentID'];
+ }
}
$Pages = Format::get_pages($Page, $TorrentCount, NOTIFICATIONS_PER_PAGE, 9);
if (!empty($GroupIDs)) {
- $GroupIDs = array_keys($GroupIDs);
- $FilterIDs = array_keys($FilterIDs);
- $TorrentGroups = Torrents::get_groups($GroupIDs);
+ $GroupIDs = array_keys($GroupIDs);
+ $FilterIDs = array_keys($FilterIDs);
+ $TorrentGroups = Torrents::get_groups($GroupIDs);
- // Get the relevant filter labels
- $DB->query('
- SELECT ID, Label, Artists
- FROM users_notify_filters
- WHERE ID IN ('.implode(',', $FilterIDs).')');
- $Filters = $DB->to_array('ID', MYSQLI_ASSOC, array('Artists'));
- foreach ($Filters as &$Filter) {
- $Filter['Artists'] = explode('|', trim($Filter['Artists'], '|'));
- foreach ($Filter['Artists'] as &$FilterArtist) {
- $FilterArtist = mb_strtolower($FilterArtist, 'UTF-8');
- }
- $Filter['Artists'] = array_flip($Filter['Artists']);
- }
- unset($Filter);
+ // Get the relevant filter labels
+ $DB->query('
+ SELECT ID, Label, Artists
+ FROM users_notify_filters
+ WHERE ID IN ('.implode(',', $FilterIDs).')');
+ $Filters = $DB->to_array('ID', MYSQLI_ASSOC, array('Artists'));
+ foreach ($Filters as &$Filter) {
+ $Filter['Artists'] = explode('|', trim($Filter['Artists'], '|'));
+ foreach ($Filter['Artists'] as &$FilterArtist) {
+ $FilterArtist = mb_strtolower($FilterArtist, 'UTF-8');
+ }
+ $Filter['Artists'] = array_flip($Filter['Artists']);
+ }
+ unset($Filter);
- if (!empty($UnReadIDs)) {
- //Clear before header but after query so as to not have the alert bar on this page load
- $DB->query("
- UPDATE users_notify_torrents
- SET UnRead = '0'
- WHERE UserID = ".$LoggedUser['ID'].'
- AND TorrentID IN ('.implode(',', $UnReadIDs).')');
- $Cache->delete_value('notifications_new_'.$LoggedUser['ID']);
- }
+ if (!empty($UnReadIDs)) {
+ //Clear before header but after query so as to not have the alert bar on this page load
+ $DB->query("
+ UPDATE users_notify_torrents
+ SET UnRead = '0'
+ WHERE UserID = ".$LoggedUser['ID'].'
+ AND TorrentID IN ('.implode(',', $UnReadIDs).')');
+ $Cache->delete_value('notifications_new_'.$LoggedUser['ID']);
+ }
}
if ($Sneaky) {
- $UserInfo = Users::user_info($UserID);
- View::show_header($UserInfo['Username'].'\'s notifications', 'notifications');
+ $UserInfo = Users::user_info($UserID);
+ View::show_header($UserInfo['Username'].'\'s notifications', 'notifications');
} else {
- View::show_header('My notifications', 'notifications');
+ View::show_header('My notifications', 'notifications');
}
?>
-
Latest notifications
+Latest notifications
-
- " class="brackets">View all
-
- Clear all old
- Clear selected
- Catch up
-
- Edit filters
+
+ " class="brackets">View all
+
+ Clear all old
+ Clear selected
+ Catch up
+
+ Edit filters
- NOTIFICATIONS_PER_PAGE) { ?>
+ NOTIFICATIONS_PER_PAGE) { ?>
-
+
-
| - No new notifications found! Edit notification filters - | -|||||||
| + No new notifications found! Edit notification filters + | +
Peer List
- 100) { ?> + 100) { ?> - +| User | -Active | -Connectable | -Up (this session) | -% | -Client | -User | +Active | +Connectable | +Up (this session) | +% | +Client | + +next_record()) { ?> -
| - + - | Peer | -Peer + -Yes' : 'No' ?> | -Yes' : 'No' ?> | -- | - | - | Yes' : 'No' ?> | ++ | + | + + |
-
-
diff --git a/sections/torrents/snatchlist.php b/sections/torrents/snatchlist.php
index 2d1298c14..8d27c4587 100644
--- a/sections/torrents/snatchlist.php
+++ b/sections/torrents/snatchlist.php
@@ -1,26 +1,26 @@
query("
- SELECT
- SQL_CALC_FOUND_ROWS
- uid,
- tstamp
- FROM xbt_snatched
- WHERE fid = '$TorrentID'
- ORDER BY tstamp DESC
- LIMIT $Limit");
+ SELECT
+ SQL_CALC_FOUND_ROWS
+ uid,
+ tstamp
+ FROM xbt_snatched
+ WHERE fid = '$TorrentID'
+ ORDER BY tstamp DESC
+ LIMIT $Limit");
$Results = $DB->to_array('uid', MYSQLI_ASSOC);
$DB->query('SELECT FOUND_ROWS()');
@@ -29,40 +29,40 @@
?>
-
-
+ Successfully sent re-seed request
-
+
+
Successfully sent re-seed request
+List of Snatchers
- 100) { ?> + 100) { ?> - +| User | -Time | +||
| User | +Time | -User | -Time | -
| Time | +|||
| - | - + | + - |
-
-prepared_query("
- SELECT UserID, Remastered, RemasterYear, FreeTorrent
- FROM torrents
- WHERE ID = ?", $TorrentID
+ SELECT UserID, Remastered, RemasterYear, FreeTorrent
+ FROM torrents
+ WHERE ID = ?", $TorrentID
);
if (!$DB->has_results()) {
- error(404);
+ error(404);
}
list($UserID, $Remastered, $RemasterYear, $CurFreeLeech) = $DB->fetch_record(MYSQLI_BOTH, false);
if ($LoggedUser['ID'] != $UserID && !check_perms('torrents_edit')) {
- error(403);
+ error(403);
}
if ($Remastered == '1' && !$RemasterYear && !check_perms('edit_unknowns')) {
- error(403);
+ error(403);
}
if ($Properties['UnknownRelease'] && !($Remastered == '1' && !$RemasterYear) && !check_perms('edit_unknowns')) {
- //It's Unknown now, and it wasn't before
- if ($LoggedUser['ID'] != $UserID) {
- //Hax
- die();
- }
+ //It's Unknown now, and it wasn't before
+ if ($LoggedUser['ID'] != $UserID) {
+ //Hax
+ die();
+ }
}
$Validate->SetFields('type', '1', 'number', 'Not a valid type.', array('maxlength' => count($Categories), 'minlength' => 1));
switch ($Type) {
- case 'Music':
- if (!empty($Properties['Remastered']) && !$Properties['UnknownRelease']) {
- $Validate->SetFields('remaster_year', '1', 'number', 'Year of remaster/re-issue must be entered.');
- } else {
- $Validate->SetFields('remaster_year', '0','number', 'Invalid remaster year.');
- }
+ case 'Music':
+ if (!empty($Properties['Remastered']) && !$Properties['UnknownRelease']) {
+ $Validate->SetFields('remaster_year', '1', 'number', 'Year of remaster/re-issue must be entered.');
+ } else {
+ $Validate->SetFields('remaster_year', '0','number', 'Invalid remaster year.');
+ }
- if (!empty($Properties['Remastered']) && !$Properties['UnknownRelease'] && $Properties['RemasterYear'] < 1982 && $Properties['Media'] == 'CD') {
- error('You have selected a year for an album that predates the medium you say it was created on.');
- header("Location: torrents.php?action=edit&id=$TorrentID");
- die();
- }
+ if (!empty($Properties['Remastered']) && !$Properties['UnknownRelease'] && $Properties['RemasterYear'] < 1982 && $Properties['Media'] == 'CD') {
+ error('You have selected a year for an album that predates the medium you say it was created on.');
+ header("Location: torrents.php?action=edit&id=$TorrentID");
+ die();
+ }
- $Validate->SetFields('remaster_title', '0', 'string', 'Remaster title must be between 2 and 80 characters.', array('maxlength' => 80, 'minlength' => 2));
+ $Validate->SetFields('remaster_title', '0', 'string', 'Remaster title must be between 2 and 80 characters.', array('maxlength' => 80, 'minlength' => 2));
- if ($Properties['RemasterTitle'] == 'Original Release') {
- error('"Original Release" is not a valid remaster title.');
- header("Location: torrents.php?action=edit&id=$TorrentID");
- die();
- }
+ if ($Properties['RemasterTitle'] == 'Original Release') {
+ error('"Original Release" is not a valid remaster title.');
+ header("Location: torrents.php?action=edit&id=$TorrentID");
+ die();
+ }
- $Validate->SetFields('remaster_record_label', '0', 'string', 'Remaster record label must be between 2 and 80 characters.', array('maxlength' => 80, 'minlength' => 2));
+ $Validate->SetFields('remaster_record_label', '0', 'string', 'Remaster record label must be between 2 and 80 characters.', array('maxlength' => 80, 'minlength' => 2));
- $Validate->SetFields('remaster_catalogue_number', '0', 'string', 'Remaster catalogue number must be between 2 and 80 characters.', array('maxlength' => 80, 'minlength' => 2));
+ $Validate->SetFields('remaster_catalogue_number', '0', 'string', 'Remaster catalogue number must be between 2 and 80 characters.', array('maxlength' => 80, 'minlength' => 2));
- $Validate->SetFields('format', '1', 'inarray', 'Not a valid format.', array('inarray' => $Formats));
+ $Validate->SetFields('format', '1', 'inarray', 'Not a valid format.', array('inarray' => $Formats));
- $Validate->SetFields('bitrate', '1', 'inarray', 'You must choose a bitrate.', array('inarray' => $Bitrates));
+ $Validate->SetFields('bitrate', '1', 'inarray', 'You must choose a bitrate.', array('inarray' => $Bitrates));
- // Handle 'other' bitrates
- if ($Properties['Encoding'] == 'Other') {
- $Validate->SetFields('other_bitrate', '1', 'text', 'You must enter the other bitrate (max length: 9 characters).', array('maxlength' => 9));
- $enc = trim($_POST['other_bitrate']);
- if (isset($_POST['vbr'])) {
- $enc .= ' (VBR)';
- }
+ // Handle 'other' bitrates
+ if ($Properties['Encoding'] == 'Other') {
+ $Validate->SetFields('other_bitrate', '1', 'text', 'You must enter the other bitrate (max length: 9 characters).', array('maxlength' => 9));
+ $enc = trim($_POST['other_bitrate']);
+ if (isset($_POST['vbr'])) {
+ $enc .= ' (VBR)';
+ }
- $Properties['Encoding'] = $enc;
- $Properties['Bitrate'] = $enc;
- } else {
- $Validate->SetFields('bitrate', '1', 'inarray', 'You must choose a bitrate.', array('inarray' => $Bitrates));
- }
+ $Properties['Encoding'] = $enc;
+ $Properties['Bitrate'] = $enc;
+ } else {
+ $Validate->SetFields('bitrate', '1', 'inarray', 'You must choose a bitrate.', array('inarray' => $Bitrates));
+ }
- $Validate->SetFields('media', '1', 'inarray', 'Not a valid media.', array('inarray' => $Media));
+ $Validate->SetFields('media', '1', 'inarray', 'Not a valid media.', array('inarray' => $Media));
- $Validate->SetFields('release_desc', '0', 'string', 'Invalid release description.', array('maxlength' => 1000000, 'minlength' => 0));
+ $Validate->SetFields('release_desc', '0', 'string', 'Invalid release description.', array('maxlength' => 1000000, 'minlength' => 0));
- break;
+ break;
- case 'Audiobooks':
- case 'Comedy':
- /*$Validate->SetFields('title', '1', 'string', 'Title must be between 2 and 300 characters.', array('maxlength' => 300, 'minlength' => 2));
- ^ this is commented out because there is no title field on these pages*/
- $Validate->SetFields('year', '1', 'number', 'The year of the release must be entered.');
+ case 'Audiobooks':
+ case 'Comedy':
+ /*$Validate->SetFields('title', '1', 'string', 'Title must be between 2 and 300 characters.', array('maxlength' => 300, 'minlength' => 2));
+ ^ this is commented out because there is no title field on these pages*/
+ $Validate->SetFields('year', '1', 'number', 'The year of the release must be entered.');
- $Validate->SetFields('format', '1', 'inarray', 'Not a valid format.', array('inarray' => $Formats));
+ $Validate->SetFields('format', '1', 'inarray', 'Not a valid format.', array('inarray' => $Formats));
- $Validate->SetFields('bitrate', '1', 'inarray', 'You must choose a bitrate.', array('inarray' => $Bitrates));
+ $Validate->SetFields('bitrate', '1', 'inarray', 'You must choose a bitrate.', array('inarray' => $Bitrates));
- // Handle 'other' bitrates
- if ($Properties['Encoding'] == 'Other') {
- $Validate->SetFields('other_bitrate', '1', 'text', 'You must enter the other bitrate (max length: 9 characters).', array('maxlength' => 9));
- $enc = trim($_POST['other_bitrate']);
- if (isset($_POST['vbr'])) {
- $enc .= ' (VBR)';
- }
+ // Handle 'other' bitrates
+ if ($Properties['Encoding'] == 'Other') {
+ $Validate->SetFields('other_bitrate', '1', 'text', 'You must enter the other bitrate (max length: 9 characters).', array('maxlength' => 9));
+ $enc = trim($_POST['other_bitrate']);
+ if (isset($_POST['vbr'])) {
+ $enc .= ' (VBR)';
+ }
- $Properties['Encoding'] = $enc;
- $Properties['Bitrate'] = $enc;
- } else {
- $Validate->SetFields('bitrate', '1', 'inarray', 'You must choose a bitrate.', array('inarray' => $Bitrates));
- }
+ $Properties['Encoding'] = $enc;
+ $Properties['Bitrate'] = $enc;
+ } else {
+ $Validate->SetFields('bitrate', '1', 'inarray', 'You must choose a bitrate.', array('inarray' => $Bitrates));
+ }
- $Validate->SetFields('release_desc', '0', 'string', 'The release description has a minimum length of 10 characters.', array('maxlength' => 1000000, 'minlength' => 10));
+ $Validate->SetFields('release_desc', '0', 'string', 'The release description has a minimum length of 10 characters.', array('maxlength' => 1000000, 'minlength' => 10));
- break;
+ break;
- case 'Applications':
- case 'Comics':
- case 'E-Books':
- case 'E-Learning Videos':
- /*$Validate->SetFields('title', '1', 'string', 'Title must be between 2 and 300 characters.', array('maxlength' => 300, 'minlength' => 2));
- ^ this is commented out because there is no title field on these pages*/
- break;
+ case 'Applications':
+ case 'Comics':
+ case 'E-Books':
+ case 'E-Learning Videos':
+ /*$Validate->SetFields('title', '1', 'string', 'Title must be between 2 and 300 characters.', array('maxlength' => 300, 'minlength' => 2));
+ ^ this is commented out because there is no title field on these pages*/
+ break;
}
$Err = $Validate->ValidateForm($_POST); // Validate the form
if ($Properties['Remastered'] && !$Properties['RemasterYear']) {
- //Unknown Edit!
- if ($LoggedUser['ID'] == $UserID || check_perms('edit_unknowns')) {
- //Fine!
- } else {
- $Err = "You may not edit someone else's upload to unknown release.";
- }
+ //Unknown Edit!
+ if ($LoggedUser['ID'] == $UserID || check_perms('edit_unknowns')) {
+ //Fine!
+ } else {
+ $Err = "You may not edit someone else's upload to unknown release.";
+ }
}
// Strip out Amazon's padding
$AmazonReg = '/(http:\/\/ecx.images-amazon.com\/images\/.+)(\._.*_\.jpg)/i';
-$Matches = array();
+$Matches = [];
if (preg_match($AmazonReg, $Properties['Image'], $Matches)) {
- $Properties['Image'] = $Matches[1].'.jpg';
+ $Properties['Image'] = $Matches[1].'.jpg';
}
ImageTools::blacklisted($Properties['Image']);
if ($Err) { // Show the upload form, with the data the user entered
- if (check_perms('site_debug')) {
- die($Err);
- }
- error($Err);
+ if (check_perms('site_debug')) {
+ die($Err);
+ }
+ error($Err);
}
@@ -229,220 +229,226 @@
//--------------- Make variables ready for database input ----------------------//
// Shorten and escape $Properties for database input
-$T = array();
+$T = [];
foreach ($Properties as $Key => $Value) {
- $T[$Key] = "'".db_string(trim($Value))."'";
- if (!$T[$Key]) {
- $T[$Key] = null;
- }
+ $T[$Key] = "'".db_string(trim($Value))."'";
+ if (!$T[$Key]) {
+ $T[$Key] = null;
+ }
}
//******************************************************************************//
//--------------- Start database stuff -----------------------------------------//
-$DBTorVals = array();
+$DBTorVals = [];
$DB->prepared_query("
- SELECT Media, Format, Encoding, RemasterYear, Remastered, RemasterTitle, RemasterRecordLabel, RemasterCatalogueNumber, Scene, Description
- FROM torrents
- WHERE ID = ?", $TorrentID
+ SELECT Media, Format, Encoding, RemasterYear, Remastered, RemasterTitle, RemasterRecordLabel, RemasterCatalogueNumber, Scene, Description
+ FROM torrents
+ WHERE ID = ?", $TorrentID
);
$DBTorVals = $DB->to_array(false, MYSQLI_ASSOC);
$DBTorVals = $DBTorVals[0];
$LogDetails = '';
foreach ($DBTorVals as $Key => $Value) {
- $Value = "'$Value'";
- if ($Value != $T[$Key]) {
- if (!isset($T[$Key])) {
- continue;
- }
- if ((empty($Value) && empty($T[$Key])) || ($Value == "'0'" && $T[$Key] == "''")) {
- continue;
- }
- if ($LogDetails == '') {
- $LogDetails = "$Key: $Value -> ".$T[$Key];
- } else {
- $LogDetails = "$LogDetails, $Key: $Value -> ".$T[$Key];
- }
- }
+ $Value = "'$Value'";
+ if ($Value != $T[$Key]) {
+ if (!isset($T[$Key])) {
+ continue;
+ }
+ if ((empty($Value) && empty($T[$Key])) || ($Value == "'0'" && $T[$Key] == "''")) {
+ continue;
+ }
+ if ($LogDetails == '') {
+ $LogDetails = "$Key: $Value -> ".$T[$Key];
+ } else {
+ $LogDetails = "$LogDetails, $Key: $Value -> ".$T[$Key];
+ }
+ }
}
$AddedLogs = false;
if (count($_FILES['logfiles']['name']) > 0) {
- ini_set('upload_max_filesize', 1000000);
- $Logchecker = new Logchecker();
- foreach ($_FILES['logfiles']['name'] as $Pos => $File) {
- if (!$_FILES['logfiles']['size'][$Pos]) {
- continue;
- }
-
- $LogPath = $_FILES['logfiles']['tmp_name'][$Pos];
- $FileName = $_FILES['logfiles']['name'][$Pos];
-
- $Logchecker->new_file($LogPath);
- list($Score, $Details, $Checksum, $Text) = $Logchecker->parse();
- $Details = implode("\r\n", $Details);
-
- $DB->prepared_query("INSERT INTO torrents_logs (`TorrentID`, `Log`, `Details`, `Score`, `Checksum`, `FileName`) VALUES (?, ?, ?, ?, ?, ?)",
- $TorrentID, $Text, $Details, $Score, $Checksum, $FileName
- );
- $LogID = $DB->inserted_id();
- if (move_uploaded_file($LogPath, SERVER_ROOT . "/logs/{$TorrentID}_{$LogID}.log") === false) {
- die("Could not copy logfile to the server.");
- }
- $AddedLogs = true;
- }
+ ini_set('upload_max_filesize', 1000000);
+ $Logchecker = new Logchecker();
+ foreach ($_FILES['logfiles']['name'] as $Pos => $File) {
+ if (!$_FILES['logfiles']['size'][$Pos]) {
+ continue;
+ }
+
+ $LogPath = $_FILES['logfiles']['tmp_name'][$Pos];
+ $FileName = $_FILES['logfiles']['name'][$Pos];
+
+ $Logchecker->new_file($LogPath);
+ list($Score, $Details, $Checksum, $Text) = $Logchecker->parse();
+ $Details = implode("\r\n", $Details);
+
+ $DB->prepared_query("INSERT INTO torrents_logs (`TorrentID`, `Log`, `Details`, `Score`, `Checksum`, `FileName`) VALUES (?, ?, ?, ?, ?, ?)",
+ $TorrentID, $Text, $Details, $Score, $Checksum, $FileName
+ );
+ $LogID = $DB->inserted_id();
+ if (move_uploaded_file($LogPath, SERVER_ROOT . "/logs/{$TorrentID}_{$LogID}.log") === false) {
+ die("Could not copy logfile to the server.");
+ }
+ $AddedLogs = true;
+ }
}
// Update info for the torrent
$SQL = "UPDATE torrents AS t";
if ($AddedLogs) {
- $SQL .= "
- LEFT JOIN (
- SELECT
- TorrentID,
- MIN(CASE WHEN Adjusted = '1' THEN AdjustedScore ELSE Score END) AS Score,
- MIN(CASE WHEN Adjusted = '1' THEN AdjustedChecksum ELSE Checksum END) AS Checksum
- FROM torrents_logs
- WHERE TorrentID = {$TorrentID}
- GROUP BY TorrentID
- ) AS tl ON t.ID = tl.TorrentID
+ $SQL .= "
+ LEFT JOIN (
+ SELECT
+ TorrentID,
+ MIN(CASE WHEN Adjusted = '1' THEN AdjustedScore ELSE Score END) AS Score,
+ MIN(CASE WHEN Adjusted = '1' THEN AdjustedChecksum ELSE Checksum END) AS Checksum
+ FROM torrents_logs
+ WHERE TorrentID = {$TorrentID}
+ GROUP BY TorrentID
+ ) AS tl ON t.ID = tl.TorrentID
";
}
$SQL .= "
- SET
- Media = $T[Media],
- Format = $T[Format],
- Encoding = $T[Encoding],
- RemasterYear = $T[RemasterYear],
- Remastered = $T[Remastered],
- RemasterTitle = $T[RemasterTitle],
- RemasterRecordLabel = $T[RemasterRecordLabel],
- RemasterCatalogueNumber = $T[RemasterCatalogueNumber],
- Scene = $T[Scene],";
+ SET
+ Media = $T[Media],
+ Format = $T[Format],
+ Encoding = $T[Encoding],
+ RemasterYear = $T[RemasterYear],
+ Remastered = $T[Remastered],
+ RemasterTitle = $T[RemasterTitle],
+ RemasterRecordLabel = $T[RemasterRecordLabel],
+ RemasterCatalogueNumber = $T[RemasterCatalogueNumber],
+ Scene = $T[Scene],";
if ($AddedLogs) {
- $SQL .= "
- LogScore = CASE WHEN tl.Score IS NULL THEN 100 ELSE tl.Score END,
- LogChecksum = CASE WHEN tl.Checksum IS NULL THEN '1' ELSE tl.Checksum END,
- HasLogDB = '1',";
+ $SQL .= "
+ LogScore = CASE WHEN tl.Score IS NULL THEN 100 ELSE tl.Score END,
+ LogChecksum = CASE WHEN tl.Checksum IS NULL THEN '1' ELSE tl.Checksum END,
+ HasLogDB = '1',";
}
if (check_perms('torrents_freeleech')) {
- $SQL .= "FreeTorrent = $T[FreeLeech],";
- $SQL .= "FreeLeechType = $T[FreeLeechType],";
+ $SQL .= "FreeTorrent = $T[FreeLeech],";
+ $SQL .= "FreeLeechType = $T[FreeLeechType],";
}
if (check_perms('users_mod')) {
- if ($T['Format'] == "'FLAC'" && $T['Media'] == "'CD'") {
- $SQL .= "
- HasLog = $T[HasLog],
- HasCue = $T[HasCue],";
- } else {
- $SQL .= "
- HasLog = '0',
- HasCue = '0',";
- }
-
- $DB->prepared_query('SELECT TorrentID FROM torrents_bad_tags WHERE TorrentID = ?', $TorrentID);
- list($btID) = $DB->fetch_record();
-
- if (!$btID && $Properties['BadTags']) {
- $DB->prepared_query('INSERT INTO torrents_bad_tags (TorrentID, UserID, TimeAdded) VALUES (?, ?, now())',
- $TorrentID, $LoggedUser['ID']
- );
- }
- if ($btID && !$Properties['BadTags']) {
- $DB->prepared_query('DELETE FROM torrents_bad_tags WHERE TorrentID = ?', $TorrentID);
- }
-
- $DB->prepared_query('SELECT TorrentID FROM torrents_bad_folders WHERE TorrentID = ?', $TorrentID);
- list($bfID) = $DB->fetch_record();
-
- if (!$bfID && $Properties['BadFolders']) {
- $DB->prepared_query('INSERT INTO torrents_bad_folders (TorrentID, UserID, TimeAdded) VALUES (?, ?, now())',
- $TorrentID, $LoggedUser['ID']
- );
- }
- if ($bfID && !$Properties['BadFolders']) {
- $DB->prepared_query('DELETE FROM torrents_bad_folders WHERE TorrentID = ?', $TorrentID);
- }
-
- $DB->prepared_query('SELECT TorrentID FROM torrents_bad_files WHERE TorrentID = ?', $TorrentID);
- list($bfiID) = $DB->fetch_record();
-
- if (!$bfiID && $Properties['BadFiles']) {
- $DB->prepared_query('INSERT INTO torrents_bad_files (TorrentID, UserID, TimeAdded) VALUES (?, ?, now())',
- $TorrentID, $LoggedUser['ID']
- );
- }
- if ($bfiID && !$Properties['BadFiles']) {
- $DB->prepared_query('DELETE FROM torrents_bad_files WHERE TorrentID = ?', $TorrentID);
- }
-
- $DB->prepared_query('SELECT TorrentID FROM torrents_missing_lineage WHERE TorrentID = ?', $TorrentID);
- list($mlID) = $DB->fetch_record();
-
- if (!$mlID && $Properties['Lineage']) {
- $DB->prepared_query('INSERT INTO torrents_missing_lineage (TorrentID, UserID, TimeAdded) VALUES (?, ?, now())',
- $TorrentID, $LoggedUser['ID']
- );
- }
- if ($mlID && !$Properties['Lineage']) {
- $DB->prepared_query('DELETE FROM torrents_missing_lineage WHERE TorrentID = ?', $TorrentID);
- }
-
- $DB->prepared_query('SELECT TorrentID FROM torrents_cassette_approved WHERE TorrentID = ?', $TorrentID);
- list($caID) = $DB->fetch_record();
-
- if (!$caID && $Properties['CassetteApproved']) {
- $DB->prepared_query('INSERT INTO torrents_cassette_approved (TorrentID, UserID, TimeAdded) VALUES (?, ?, now())',
- $TorrentID, $LoggedUser['ID']
- );
- }
- if ($caID && !$Properties['CassetteApproved']) {
- $DB->prepared_query('DELETE FROM torrents_cassette_approved WHERE TorrentID = ?', $TorrentID);
- }
-
- $DB->prepared_query('SELECT TorrentID FROM torrents_lossymaster_approved WHERE TorrentID = ?', $TorrentID);
- list($lmaID) = $DB->fetch_record();
-
- if (!$lmaID && $Properties['LossymasterApproved']) {
- $DB->prepared_query('INSERT INTO torrents_lossymaster_approved (TorrentID, UserID, TimeAdded) VALUES (?, ?, now())',
- $TorrentID, $LoggedUser['ID']
- );
- }
- if ($lmaID && !$Properties['LossymasterApproved']) {
- $DB->prepared_query('DELETE FROM torrents_lossymaster_approved WHERE TorrentID = ?', $TorrentID);
- }
-
- $DB->prepared_query('SELECT TorrentID FROM torrents_lossyweb_approved WHERE TorrentID = ?', $TorrentID);
- list($lwID) = $DB->fetch_record();
-
- if (!$lwID && $Properties['LossywebApproved']) {
- $DB->prepared_query('INSERT INTO torrents_lossyweb_approved (TorrentID, UserID, TimeAdded) VALUES (?, ?, now())',
- $TorrentID, $LoggedUser['ID']
- );
- }
- if ($lwID && !$Properties['LossywebApproved']) {
- $DB->prepared_query('DELETE FROM torrents_lossyweb_approved WHERE TorrentID = ?', $TorrentID);
- }
+ if ($T['Format'] == "'FLAC'" && $T['Media'] == "'CD'") {
+ $SQL .= "
+ HasLog = $T[HasLog],
+ HasCue = $T[HasCue],";
+ } else {
+ $SQL .= "
+ HasLog = '0',
+ HasCue = '0',";
+ }
+if (check_perms('site_debug')) {
+ //echo "Torrent was successfully deleted.
+Torrent was successfully deleted.
";
+ //var_dump($T);
+ //echo "$SQL\n";
+ //die();
+}
+
+ $DB->prepared_query('SELECT TorrentID FROM torrents_bad_tags WHERE TorrentID = ?', $TorrentID);
+ list($btID) = $DB->fetch_record();
+
+ if (!$btID && $Properties['BadTags']) {
+ $DB->prepared_query('INSERT INTO torrents_bad_tags (TorrentID, UserID, TimeAdded) VALUES (?, ?, now())',
+ $TorrentID, $LoggedUser['ID']
+ );
+ }
+ if ($btID && !$Properties['BadTags']) {
+ $DB->prepared_query('DELETE FROM torrents_bad_tags WHERE TorrentID = ?', $TorrentID);
+ }
+
+ $DB->prepared_query('SELECT TorrentID FROM torrents_bad_folders WHERE TorrentID = ?', $TorrentID);
+ list($bfID) = $DB->fetch_record();
+
+ if (!$bfID && $Properties['BadFolders']) {
+ $DB->prepared_query('INSERT INTO torrents_bad_folders (TorrentID, UserID, TimeAdded) VALUES (?, ?, now())',
+ $TorrentID, $LoggedUser['ID']
+ );
+ }
+ if ($bfID && !$Properties['BadFolders']) {
+ $DB->prepared_query('DELETE FROM torrents_bad_folders WHERE TorrentID = ?', $TorrentID);
+ }
+
+ $DB->prepared_query('SELECT TorrentID FROM torrents_bad_files WHERE TorrentID = ?', $TorrentID);
+ list($bfiID) = $DB->fetch_record();
+
+ if (!$bfiID && $Properties['BadFiles']) {
+ $DB->prepared_query('INSERT INTO torrents_bad_files (TorrentID, UserID, TimeAdded) VALUES (?, ?, now())',
+ $TorrentID, $LoggedUser['ID']
+ );
+ }
+ if ($bfiID && !$Properties['BadFiles']) {
+ $DB->prepared_query('DELETE FROM torrents_bad_files WHERE TorrentID = ?', $TorrentID);
+ }
+
+ $DB->prepared_query('SELECT TorrentID FROM torrents_missing_lineage WHERE TorrentID = ?', $TorrentID);
+ list($mlID) = $DB->fetch_record();
+
+ if (!$mlID && $Properties['Lineage']) {
+ $DB->prepared_query('INSERT INTO torrents_missing_lineage (TorrentID, UserID, TimeAdded) VALUES (?, ?, now())',
+ $TorrentID, $LoggedUser['ID']
+ );
+ }
+ if ($mlID && !$Properties['Lineage']) {
+ $DB->prepared_query('DELETE FROM torrents_missing_lineage WHERE TorrentID = ?', $TorrentID);
+ }
+
+ $DB->prepared_query('SELECT TorrentID FROM torrents_cassette_approved WHERE TorrentID = ?', $TorrentID);
+ list($caID) = $DB->fetch_record();
+
+ if (!$caID && $Properties['CassetteApproved']) {
+ $DB->prepared_query('INSERT INTO torrents_cassette_approved (TorrentID, UserID, TimeAdded) VALUES (?, ?, now())',
+ $TorrentID, $LoggedUser['ID']
+ );
+ }
+ if ($caID && !$Properties['CassetteApproved']) {
+ $DB->prepared_query('DELETE FROM torrents_cassette_approved WHERE TorrentID = ?', $TorrentID);
+ }
+
+ $DB->prepared_query('SELECT TorrentID FROM torrents_lossymaster_approved WHERE TorrentID = ?', $TorrentID);
+ list($lmaID) = $DB->fetch_record();
+
+ if (!$lmaID && $Properties['LossymasterApproved']) {
+ $DB->prepared_query('INSERT INTO torrents_lossymaster_approved (TorrentID, UserID, TimeAdded) VALUES (?, ?, now())',
+ $TorrentID, $LoggedUser['ID']
+ );
+ }
+ if ($lmaID && !$Properties['LossymasterApproved']) {
+ $DB->prepared_query('DELETE FROM torrents_lossymaster_approved WHERE TorrentID = ?', $TorrentID);
+ }
+
+ $DB->prepared_query('SELECT TorrentID FROM torrents_lossyweb_approved WHERE TorrentID = ?', $TorrentID);
+ list($lwID) = $DB->fetch_record();
+
+ if (!$lwID && $Properties['LossywebApproved']) {
+ $DB->prepared_query('INSERT INTO torrents_lossyweb_approved (TorrentID, UserID, TimeAdded) VALUES (?, ?, now())',
+ $TorrentID, $LoggedUser['ID']
+ );
+ }
+ if ($lwID && !$Properties['LossywebApproved']) {
+ $DB->prepared_query('DELETE FROM torrents_lossyweb_approved WHERE TorrentID = ?', $TorrentID);
+ }
}
$SQL .= "
- Description = $T[TorrentDescription]
- WHERE ID = $TorrentID";
+ Description = $T[TorrentDescription]
+ WHERE ID = $TorrentID";
$DB->query($SQL);
if (check_perms('torrents_freeleech') && $Properties['FreeLeech'] != $CurFreeLeech) {
- Torrents::freeleech_torrents($TorrentID, $Properties['FreeLeech'], $Properties['FreeLeechType']);
+ Torrents::freeleech_torrents($TorrentID, $Properties['FreeLeech'], $Properties['FreeLeechType']);
}
$DB->prepared_query('
- SELECT g.ID, g.Name, t.Time
- FROM torrents_group g
- INNER JOIN torrents t ON (t.GroupID = g.ID)
- WHERE t.ID = ?', $TorrentID
+ SELECT g.ID, g.Name, t.Time
+ FROM torrents_group g
+ INNER JOIN torrents t ON (t.GroupID = g.ID)
+ WHERE t.ID = ?', $TorrentID
);
list($GroupID, $Name, $Time) = $DB->fetch_record();
diff --git a/sections/torrents/takeeditrequest.php b/sections/torrents/takeeditrequest.php
index f37ab78d1..26dce9059 100644
--- a/sections/torrents/takeeditrequest.php
+++ b/sections/torrents/takeeditrequest.php
@@ -3,7 +3,7 @@
authorize();
if (empty($_POST['groupid']) || !is_numeric($_POST['groupid'])) {
- error(403);
+ error(403);
}
$EditForumID = EDITING_FORUM_ID;
@@ -19,23 +19,23 @@
// Group details
list($WikiBody, $WikiImage, $GroupID, $GroupName, $GroupYear,
- $GroupRecordLabel, $GroupCatalogueNumber, $ReleaseType, $GroupCategoryID,
- $GroupTime, $GroupVanityHouse, $TorrentTags, $TorrentTagIDs, $TorrentTagUserIDs,
- $TagPositiveVotes, $TagNegativeVotes, $GroupFlags) = array_values($TorrentDetails);
+ $GroupRecordLabel, $GroupCatalogueNumber, $ReleaseType, $GroupCategoryID,
+ $GroupTime, $GroupVanityHouse, $TorrentTags, $TorrentTagIDs, $TorrentTagUserIDs,
+ $TagPositiveVotes, $TagNegativeVotes, $GroupFlags) = array_values($TorrentDetails);
$Title = $GroupName;
$Artists = Artists::get_artist($GroupID);
if ($Artists) {
- $GroupName = Artists::display_artists($Artists, false, true, false) . $GroupName;
+ $GroupName = Artists::display_artists($Artists, false, true, false) . $GroupName;
}
if ($GroupYear > 0) {
- $GroupName .= ' ['.$GroupYear.']';
+ $GroupName .= ' ['.$GroupYear.']';
}
if ($GroupVanityHouse) {
- $GroupName .= ' [Vanity House]';
+ $GroupName .= ' [Vanity House]';
}
$sqltime = sqltime();
@@ -50,109 +50,109 @@
POST;
$DB->prepared_query("
- INSERT INTO forums_topics
- (Title, AuthorID, ForumID, LastPostTime, LastPostAuthorID, CreatedTime)
- Values
- (?, ?, ?, ?, ?, ?)", $Title, $BotID, $EditForumID, $sqltime, $BotID, $sqltime);
+ INSERT INTO forums_topics
+ (Title, AuthorID, ForumID, LastPostTime, LastPostAuthorID, CreatedTime)
+ Values
+ (?, ?, ?, ?, ?, ?)", $Title, $BotID, $EditForumID, $sqltime, $BotID, $sqltime);
$TopicID = $DB->inserted_id();
$DB->prepared_query("
- INSERT INTO forums_posts
- (TopicID, AuthorID, AddedTime, Body)
- VALUES
- (?, ?, ?, ?)", $TopicID, $BotID, $sqltime, $Body);
+ INSERT INTO forums_posts
+ (TopicID, AuthorID, AddedTime, Body)
+ VALUES
+ (?, ?, ?, ?)", $TopicID, $BotID, $sqltime, $Body);
$PostID = $DB->inserted_id();
$DB->prepared_query("
- UPDATE forums
- SET
- NumPosts = NumPosts + 1,
- NumTopics = NumTopics + 1,
- LastPostID = ?,
- LastPostAuthorID = ?,
- LastPostTopicID = ?,
- LastPostTime = ?
- WHERE ID = ?", $PostID, $BotID, $TopicID, $sqltime, $EditForumID);
+ UPDATE forums
+ SET
+ NumPosts = NumPosts + 1,
+ NumTopics = NumTopics + 1,
+ LastPostID = ?,
+ LastPostAuthorID = ?,
+ LastPostTopicID = ?,
+ LastPostTime = ?
+ WHERE ID = ?", $PostID, $BotID, $TopicID, $sqltime, $EditForumID);
$DB->prepared_query("
- UPDATE forums_topics
- SET
- NumPosts = NumPosts + 1,
- LastPostID = ?,
- LastPostAuthorID = ?,
- LastPostTime = ?
- WHERE ID = ?", $PostID, $BotID, $sqltime, $TopicID);
+ UPDATE forums_topics
+ SET
+ NumPosts = NumPosts + 1,
+ LastPostID = ?,
+ LastPostAuthorID = ?,
+ LastPostTime = ?
+ WHERE ID = ?", $PostID, $BotID, $sqltime, $TopicID);
// if cache exists modify it, if not, then it will be correct when selected next, and we can skip this block
if ($Forum = $Cache->get_value("forums_{$EditForumID}")) {
- list($Forum,,,$Stickies) = $Forum;
-
- // Remove the last thread from the index
- if (count($Forum) == TOPICS_PER_PAGE && $Stickies < TOPICS_PER_PAGE) {
- array_pop($Forum);
- }
-
- if ($Stickies > 0) {
- $Part1 = array_slice($Forum, 0, $Stickies, true); // Stickies
- $Part3 = array_slice($Forum, $Stickies, TOPICS_PER_PAGE - $Stickies - 1, true); // Rest of page
- } else {
- $Part1 = array();
- $Part3 = $Forum;
- }
- $Part2 = array($TopicID => array(
- 'ID' => $TopicID,
- 'Title' => $Title,
- 'AuthorID' => $BotID,
- 'IsLocked' => 0,
- 'IsSticky' => 0,
- 'NumPosts' => 1,
- 'LastPostID' => $PostID,
- 'LastPostTime' => $sqltime,
- 'LastPostAuthorID' => $BotID,
- 'NoPoll' => 1
- )); // Bumped
- $Forum = $Part1 + $Part2 + $Part3;
-
- $Cache->cache_value("forums_{$EditForumID}", array($Forum, '', 0, $Stickies), 0);
-
- // Update the forum root
- $Cache->begin_transaction('forums_list');
- $Cache->update_row($EditForumID, array(
- 'NumPosts' => '+1',
- 'NumTopics' => '+1',
- 'LastPostID' => $PostID,
- 'LastPostAuthorID' => $BotID,
- 'LastPostTopicID' => $TopicID,
- 'LastPostTime' => $sqltime,
- 'Title' => $Title,
- 'IsLocked' => 0,
- 'IsSticky' => 0
- ));
- $Cache->commit_transaction(0);
+ list($Forum,,,$Stickies) = $Forum;
+
+ // Remove the last thread from the index
+ if (count($Forum) == TOPICS_PER_PAGE && $Stickies < TOPICS_PER_PAGE) {
+ array_pop($Forum);
+ }
+
+ if ($Stickies > 0) {
+ $Part1 = array_slice($Forum, 0, $Stickies, true); // Stickies
+ $Part3 = array_slice($Forum, $Stickies, TOPICS_PER_PAGE - $Stickies - 1, true); // Rest of page
+ } else {
+ $Part1 = [];
+ $Part3 = $Forum;
+ }
+ $Part2 = array($TopicID => array(
+ 'ID' => $TopicID,
+ 'Title' => $Title,
+ 'AuthorID' => $BotID,
+ 'IsLocked' => 0,
+ 'IsSticky' => 0,
+ 'NumPosts' => 1,
+ 'LastPostID' => $PostID,
+ 'LastPostTime' => $sqltime,
+ 'LastPostAuthorID' => $BotID,
+ 'NoPoll' => 1
+ )); // Bumped
+ $Forum = $Part1 + $Part2 + $Part3;
+
+ $Cache->cache_value("forums_{$EditForumID}", array($Forum, '', 0, $Stickies), 0);
+
+ // Update the forum root
+ $Cache->begin_transaction('forums_list');
+ $Cache->update_row($EditForumID, array(
+ 'NumPosts' => '+1',
+ 'NumTopics' => '+1',
+ 'LastPostID' => $PostID,
+ 'LastPostAuthorID' => $BotID,
+ 'LastPostTopicID' => $TopicID,
+ 'LastPostTime' => $sqltime,
+ 'Title' => $Title,
+ 'IsLocked' => 0,
+ 'IsSticky' => 0
+ ));
+ $Cache->commit_transaction(0);
}
else {
- // If there's no cache, we have no data, and if there's no data
- $Cache->delete_value('forums_list');
+ // If there's no cache, we have no data, and if there's no data
+ $Cache->delete_value('forums_list');
}
$Cache->begin_transaction("thread_{$TopicID}_catalogue_0");
$Post = [
- 'ID' => $PostID,
- 'AuthorID' => $BotID,
- 'AddedTime' => $sqltime,
- 'Body' => $Body,
- 'EditedUserID' => 0,
- 'EditedTime' => '0000-00-00 00:00:00'
+ 'ID' => $PostID,
+ 'AuthorID' => $BotID,
+ 'AddedTime' => $sqltime,
+ 'Body' => $Body,
+ 'EditedUserID' => 0,
+ 'EditedTime' => '0000-00-00 00:00:00'
];
$Cache->insert('', $Post);
$Cache->commit_transaction(0);
$Cache->begin_transaction("thread_{$TopicID}_info");
$Cache->update_row(false, [
- 'Posts' => '+1',
- 'LastPostAuthorID' => $BotID,
- 'LastPostTime' => $sqltime
+ 'Posts' => '+1',
+ 'LastPostAuthorID' => $BotID,
+ 'LastPostTime' => $sqltime
]);
$Cache->commit_transaction(0);
diff --git a/sections/torrents/takegroupedit.php b/sections/torrents/takegroupedit.php
index f29418c9f..ff5970cd6 100644
--- a/sections/torrents/takegroupedit.php
+++ b/sections/torrents/takegroupedit.php
@@ -1,14 +1,14 @@
-query("
- SELECT VanityHouse
- FROM torrents_group
- WHERE ID = '$GroupID'");
+ SELECT VanityHouse
+ FROM torrents_group
+ WHERE ID = '$GroupID'");
if (!(list($OldVH) = $DB->next_record())) {
- error(404);
+ error(404);
}
if (!empty($_GET['action']) && $_GET['action'] == 'revert') { // if we're reverting to a previous revision
- $RevisionID = $_GET['revisionid'];
- if (!is_number($RevisionID)) {
- error(0);
- }
-
- // to cite from merge: "Everything is legit, let's just confim they're not retarded"
- if (empty($_GET['confirm'])) {
- View::show_header();
+ $RevisionID = $_GET['revisionid'];
+ if (!is_number($RevisionID)) {
+ error(0);
+ }
+
+ // to cite from merge: "Everything is legit, let's just confim they're not retarded"
+ if (empty($_GET['confirm'])) {
+ View::show_header();
?>
-
-
- Revert Confirm!
-
-
-
-
-
-
+
+ Revert Confirm!
+
+
+
+
+
+get_value('torrents_details_'.$GroupID)) && !isset($GroupInfo[0][0])) {
- $GroupCategoryID = $GroupInfo[0]['CategoryID'];
- } else {
- $DB->query("
- SELECT CategoryID
- FROM torrents_group
- WHERE ID = '$GroupID'");
- list($GroupCategoryID) = $DB->next_record();
- }
- if ($GroupCategoryID == 1 && !isset($ReleaseTypes[$ReleaseType]) || $GroupCategoryID != 1 && $ReleaseType) {
- error(403);
- }
-
- // Trickery
- if (!preg_match("/^".IMAGE_REGEX."$/i", $Image)) {
- $Image = '';
- }
- ImageTools::blacklisted($Image);
- $Summary = db_string($_POST['summary']);
+ $Body = $_POST['body'];
+ $Image = $_POST['image'];
+ $ReleaseType = (int)$_POST['releasetype'];
+ if (check_perms('torrents_edit_vanityhouse')) {
+ $VanityHouse = (isset($_POST['vanity_house']) ? 1 : 0);
+ } else {
+ $VanityHouse = $OldVH;
+ }
+
+ if (($GroupInfo = $Cache->get_value('torrents_details_'.$GroupID)) && !isset($GroupInfo[0][0])) {
+ $GroupCategoryID = $GroupInfo[0]['CategoryID'];
+ } else {
+ $DB->query("
+ SELECT CategoryID
+ FROM torrents_group
+ WHERE ID = '$GroupID'");
+ list($GroupCategoryID) = $DB->next_record();
+ }
+ if ($GroupCategoryID == 1 && !isset($ReleaseTypes[$ReleaseType]) || $GroupCategoryID != 1 && $ReleaseType) {
+ error(403);
+ }
+
+ // Trickery
+ if (!preg_match("/^".IMAGE_REGEX."$/i", $Image)) {
+ $Image = '';
+ }
+ ImageTools::blacklisted($Image);
+ $Summary = db_string($_POST['summary']);
}
// Insert revision
if (empty($RevisionID)) { // edit
- $DB->query("
- INSERT INTO wiki_torrents
- (PageID, Body, Image, UserID, Summary, Time)
- VALUES
- ('$GroupID', '".db_string($Body)."', '".db_string($Image)."', '$UserID', '$Summary', '".sqltime()."')");
-
- $DB->query("
- UPDATE torrents_group
- SET ReleaseType = '$ReleaseType'
- WHERE ID = '$GroupID'");
- Torrents::update_hash($GroupID);
+ $DB->query("
+ INSERT INTO wiki_torrents
+ (PageID, Body, Image, UserID, Summary, Time)
+ VALUES
+ ('$GroupID', '".db_string($Body)."', '".db_string($Image)."', '$UserID', '$Summary', '".sqltime()."')");
+
+ $DB->query("
+ UPDATE torrents_group
+ SET ReleaseType = '$ReleaseType'
+ WHERE ID = '$GroupID'");
+ Torrents::update_hash($GroupID);
}
else { // revert
- $DB->query("
- SELECT PageID, Body, Image
- FROM wiki_torrents
- WHERE RevisionID = '$RevisionID'");
- list($PossibleGroupID, $Body, $Image) = $DB->next_record();
- if ($PossibleGroupID != $GroupID) {
- error(404);
- }
-
- $DB->query("
- INSERT INTO wiki_torrents
- (PageID, Body, Image, UserID, Summary, Time)
- SELECT '$GroupID', Body, Image, '$UserID', 'Reverted to revision $RevisionID', '".sqltime()."'
- FROM wiki_artists
- WHERE RevisionID = '$RevisionID'");
+ $DB->query("
+ SELECT PageID, Body, Image
+ FROM wiki_torrents
+ WHERE RevisionID = '$RevisionID'");
+ list($PossibleGroupID, $Body, $Image) = $DB->next_record();
+ if ($PossibleGroupID != $GroupID) {
+ error(404);
+ }
+
+ $DB->query("
+ INSERT INTO wiki_torrents
+ (PageID, Body, Image, UserID, Summary, Time)
+ SELECT '$GroupID', Body, Image, '$UserID', 'Reverted to revision $RevisionID', '".sqltime()."'
+ FROM wiki_artists
+ WHERE RevisionID = '$RevisionID'");
}
$RevisionID = $DB->inserted_id();
@@ -124,85 +124,85 @@
// Update torrents table (technically, we don't need the RevisionID column, but we can use it for a join which is nice and fast)
$DB->query("
- UPDATE torrents_group
- SET
- RevisionID = '$RevisionID',
- ".((isset($VanityHouse)) ? "VanityHouse = '$VanityHouse'," : '')."
- WikiBody = '$Body',
- WikiImage = '$Image'
- WHERE ID='$GroupID'");
+ UPDATE torrents_group
+ SET
+ RevisionID = '$RevisionID',
+ ".((isset($VanityHouse)) ? "VanityHouse = '$VanityHouse'," : '')."
+ WikiBody = '$Body',
+ WikiImage = '$Image'
+ WHERE ID='$GroupID'");
// Log VH changes
if ($OldVH != $VanityHouse && check_perms('torrents_edit_vanityhouse')) {
- $DB->query("
- INSERT INTO group_log
- (GroupID, UserID, Time, Info)
- VALUES
- ('$GroupID',".$LoggedUser['ID'].",'".sqltime()."','".db_string('Vanity House status changed to '.($VanityHouse ? 'true' : 'false'))."')");
+ $DB->query("
+ INSERT INTO group_log
+ (GroupID, UserID, Time, Info)
+ VALUES
+ ('$GroupID',".$LoggedUser['ID'].",'".sqltime()."','".db_string('Vanity House status changed to '.($VanityHouse ? 'true' : 'false'))."')");
}
// There we go, all done!
$Cache->delete_value('torrents_details_'.$GroupID);
$DB->query("
- SELECT CollageID
- FROM collages_torrents
- WHERE GroupID = '$GroupID'");
+ SELECT CollageID
+ FROM collages_torrents
+ WHERE GroupID = '$GroupID'");
if ($DB->has_results()) {
- while (list($CollageID) = $DB->next_record()) {
- $Cache->delete_value('collage_'.$CollageID);
- }
+ while (list($CollageID) = $DB->next_record()) {
+ $Cache->delete_value('collage_'.$CollageID);
+ }
}
//Fix Recent Uploads/Downloads for image change
$DB->query("
- SELECT DISTINCT UserID
- FROM torrents AS t
- LEFT JOIN torrents_group AS tg ON t.GroupID=tg.ID
- WHERE tg.ID = $GroupID");
+ SELECT DISTINCT UserID
+ FROM torrents AS t
+ LEFT JOIN torrents_group AS tg ON t.GroupID=tg.ID
+ WHERE tg.ID = $GroupID");
$UserIDs = $DB->collect('UserID');
foreach ($UserIDs as $UserID) {
- $RecentUploads = $Cache->get_value('recent_uploads_'.$UserID);
- if (is_array($RecentUploads)) {
- foreach ($RecentUploads as $Key => $Recent) {
- if ($Recent['ID'] == $GroupID) {
- if ($Recent['WikiImage'] != $Image) {
- $Recent['WikiImage'] = $Image;
- $Cache->begin_transaction('recent_uploads_'.$UserID);
- $Cache->update_row($Key, $Recent);
- $Cache->commit_transaction(0);
- }
- }
- }
- }
+ $RecentUploads = $Cache->get_value('recent_uploads_'.$UserID);
+ if (is_array($RecentUploads)) {
+ foreach ($RecentUploads as $Key => $Recent) {
+ if ($Recent['ID'] == $GroupID) {
+ if ($Recent['WikiImage'] != $Image) {
+ $Recent['WikiImage'] = $Image;
+ $Cache->begin_transaction('recent_uploads_'.$UserID);
+ $Cache->update_row($Key, $Recent);
+ $Cache->commit_transaction(0);
+ }
+ }
+ }
+ }
}
$DB->query("
- SELECT ID
- FROM torrents
- WHERE GroupID = $GroupID");
+ SELECT ID
+ FROM torrents
+ WHERE GroupID = $GroupID");
if ($DB->has_results()) {
- $TorrentIDs = implode(',', $DB->collect('ID'));
- $DB->query("
- SELECT DISTINCT uid
- FROM xbt_snatched
- WHERE fid IN ($TorrentIDs)");
- $Snatchers = $DB->collect('uid');
- foreach ($Snatchers as $UserID) {
- $RecentSnatches = $Cache->get_value('recent_snatches_'.$UserID);
- if (is_array($RecentSnatches)) {
- foreach ($RecentSnatches as $Key => $Recent) {
- if ($Recent['ID'] == $GroupID) {
- if ($Recent['WikiImage'] != $Image) {
- $Recent['WikiImage'] = $Image;
- $Cache->begin_transaction('recent_snatches_'.$UserID);
- $Cache->update_row($Key, $Recent);
- $Cache->commit_transaction(0);
- }
- }
- }
- }
- }
+ $TorrentIDs = implode(',', $DB->collect('ID'));
+ $DB->query("
+ SELECT DISTINCT uid
+ FROM xbt_snatched
+ WHERE fid IN ($TorrentIDs)");
+ $Snatchers = $DB->collect('uid');
+ foreach ($Snatchers as $UserID) {
+ $RecentSnatches = $Cache->get_value('recent_snatches_'.$UserID);
+ if (is_array($RecentSnatches)) {
+ foreach ($RecentSnatches as $Key => $Recent) {
+ if ($Recent['ID'] == $GroupID) {
+ if ($Recent['WikiImage'] != $Image) {
+ $Recent['WikiImage'] = $Image;
+ $Cache->begin_transaction('recent_snatches_'.$UserID);
+ $Cache->update_row($Key, $Recent);
+ $Cache->commit_transaction(0);
+ }
+ }
+ }
+ }
+ }
}
header("Location: torrents.php?id=$GroupID");
diff --git a/sections/torrents/takemasspm.php b/sections/torrents/takemasspm.php
index 2e2ff4953..8bbe2de1e 100644
--- a/sections/torrents/takemasspm.php
+++ b/sections/torrents/takemasspm.php
@@ -1,9 +1,9 @@
-SetFields('torrentid', '1', 'number', 'Invalid torrent ID.', array('maxlength' => 1000000000, 'minlength' => 1)); // we shouldn't have torrent IDs higher than a billion
@@ -33,26 +33,26 @@
$Err = $Validate->ValidateForm($_POST); // Validate the form
if ($Err) {
- error($Err);
- $Location = (empty($_SERVER['HTTP_REFERER'])) ? "torrents.php?action=masspm&id={$GroupID}&torrentid={$TorrentID}" : $_SERVER['HTTP_REFERER'];
- header("Location: {$Location}");
- die();
+ error($Err);
+ $Location = (empty($_SERVER['HTTP_REFERER'])) ? "torrents.php?action=masspm&id={$GroupID}&torrentid={$TorrentID}" : $_SERVER['HTTP_REFERER'];
+ header("Location: {$Location}");
+ die();
}
//******************************************************************************//
//--------------- Send PMs to users --------------------------------------------//
$DB->query("
- SELECT uid
- FROM xbt_snatched
- WHERE fid = $TorrentID");
+ SELECT uid
+ FROM xbt_snatched
+ WHERE fid = $TorrentID");
if ($DB->has_results()) {
- // Save this because send_pm uses $DB to run its own query... Oops...
- $Snatchers = $DB->to_array();
- foreach ($Snatchers as $UserID) {
- Misc::send_pm($UserID[0], 0, $Subject, $Message);
- }
+ // Save this because send_pm uses $DB to run its own query... Oops...
+ $Snatchers = $DB->to_array();
+ foreach ($Snatchers as $UserID) {
+ Misc::send_pm($UserID[0], 0, $Subject, $Message);
+ }
}
Misc::write_log($LoggedUser['Username']." sent mass notice to snatchers of torrent $TorrentID in group $GroupID");
diff --git a/sections/torrents/takenewgroup.php b/sections/torrents/takenewgroup.php
index 91dda89a3..9ac1a7fe4 100644
--- a/sections/torrents/takenewgroup.php
+++ b/sections/torrents/takenewgroup.php
@@ -1,4 +1,4 @@
-
-
-
- Split Confirm!
-
-
-
-
-
-
+
+ Split Confirm!
+
+
+
+
+
+query("
- SELECT ArtistID, AliasID, Redirect, Name
- FROM artists_alias
- WHERE Name = '$ArtistName'");
- if (!$DB->has_results()) {
- $Redirect = 0;
- $DB->query("
- INSERT INTO artists_group (Name)
- VALUES ('$ArtistName')");
- $ArtistID = $DB->inserted_id();
- $DB->query("
- INSERT INTO artists_alias (ArtistID, Name)
- VALUES ('$ArtistID', '$ArtistName')");
- $AliasID = $DB->inserted_id();
- } else {
- list($ArtistID, $AliasID, $Redirect, $ArtistName) = $DB->next_record();
- if ($Redirect) {
- $AliasID = $Redirect;
- }
- }
+ $DB->query("
+ SELECT ArtistID, AliasID, Redirect, Name
+ FROM artists_alias
+ WHERE Name = '$ArtistName'");
+ if (!$DB->has_results()) {
+ $Redirect = 0;
+ $DB->query("
+ INSERT INTO artists_group (Name)
+ VALUES ('$ArtistName')");
+ $ArtistID = $DB->inserted_id();
+ $DB->query("
+ INSERT INTO artists_alias (ArtistID, Name)
+ VALUES ('$ArtistID', '$ArtistName')");
+ $AliasID = $DB->inserted_id();
+ } else {
+ list($ArtistID, $AliasID, $Redirect, $ArtistName) = $DB->next_record();
+ if ($Redirect) {
+ $AliasID = $Redirect;
+ }
+ }
- $DB->query("
- INSERT INTO torrents_group
- (ArtistID, CategoryID, Name, Year, Time, WikiBody, WikiImage)
- VALUES
- ($ArtistID, '1', '$Title', '$Year', '".sqltime()."', '', '')");
- $GroupID = $DB->inserted_id();
+ $DB->query("
+ INSERT INTO torrents_group
+ (ArtistID, CategoryID, Name, Year, Time, WikiBody, WikiImage)
+ VALUES
+ ($ArtistID, '1', '$Title', '$Year', '".sqltime()."', '', '')");
+ $GroupID = $DB->inserted_id();
- $DB->query("
- INSERT INTO torrents_artists
- (GroupID, ArtistID, AliasID, Importance, UserID)
- VALUES
- ('$GroupID', '$ArtistID', '$AliasID', '1', '$LoggedUser[ID]')");
+ $DB->query("
+ INSERT INTO torrents_artists
+ (GroupID, ArtistID, AliasID, Importance, UserID)
+ VALUES
+ ('$GroupID', '$ArtistID', '$AliasID', '1', '$LoggedUser[ID]')");
- $DB->query("
- UPDATE torrents
- SET GroupID = '$GroupID'
- WHERE ID = '$TorrentID'");
+ $DB->query("
+ UPDATE torrents
+ SET GroupID = '$GroupID'
+ WHERE ID = '$TorrentID'");
- // Delete old group if needed
- $DB->query("
- SELECT ID
- FROM torrents
- WHERE GroupID = '$OldGroupID'");
- if (!$DB->has_results()) {
- Torrents::delete_group($OldGroupID);
- } else {
- Torrents::update_hash($OldGroupID);
- }
+ // Delete old group if needed
+ $DB->query("
+ SELECT ID
+ FROM torrents
+ WHERE GroupID = '$OldGroupID'");
+ if (!$DB->has_results()) {
+ Torrents::delete_group($OldGroupID);
+ } else {
+ Torrents::update_hash($OldGroupID);
+ }
- Torrents::update_hash($GroupID);
+ Torrents::update_hash($GroupID);
- $Cache->delete_value("torrent_download_$TorrentID");
+ $Cache->delete_value("torrent_download_$TorrentID");
- Misc::write_log("Torrent $TorrentID was edited by " . $LoggedUser['Username']);
+ Misc::write_log("Torrent $TorrentID was edited by " . $LoggedUser['Username']);
- header("Location: torrents.php?id=$GroupID");
+ header("Location: torrents.php?id=$GroupID");
}
?>
diff --git a/sections/torrents/user.php b/sections/torrents/user.php
index 790606831..dd2b6bde1 100644
--- a/sections/torrents/user.php
+++ b/sections/torrents/user.php
@@ -7,142 +7,142 @@
// The "order by x" links on columns headers
function header_link($SortKey, $DefaultWay = 'DESC') {
- global $Order, $Way;
- if ($SortKey == $Order) {
- if ($Way == 'DESC') {
- $NewWay = 'ASC';
- } else {
- $NewWay = 'DESC';
- }
- } else {
- $NewWay = $DefaultWay;
- }
-
- return "torrents.php?way=$NewWay&order=$SortKey&" . Format::get_url(array('way','order'));
+ global $Order, $Way;
+ if ($SortKey == $Order) {
+ if ($Way == 'DESC') {
+ $NewWay = 'ASC';
+ } else {
+ $NewWay = 'DESC';
+ }
+ } else {
+ $NewWay = $DefaultWay;
+ }
+
+ return "torrents.php?way=$NewWay&order=$SortKey&" . Format::get_url(array('way','order'));
}
if (!isset($_GET['userid'])) {
- header("Location: torrents.php?type={$_GET['type']}&userid={$LoggedUser['ID']}");
- die();
+ header("Location: torrents.php?type={$_GET['type']}&userid={$LoggedUser['ID']}");
+ die();
}
$UserID = $_GET['userid'];
if (!is_number($UserID)) {
- error(0);
+ error(0);
}
if (!empty($_GET['page']) && is_number($_GET['page']) && $_GET['page'] > 0) {
- $Page = $_GET['page'];
- $Limit = ($Page - 1) * TORRENTS_PER_PAGE.', '.TORRENTS_PER_PAGE;
+ $Page = $_GET['page'];
+ $Limit = ($Page - 1) * TORRENTS_PER_PAGE.', '.TORRENTS_PER_PAGE;
} else {
- $Page = 1;
- $Limit = TORRENTS_PER_PAGE;
+ $Page = 1;
+ $Limit = TORRENTS_PER_PAGE;
}
if (!empty($_GET['order']) && in_array($_GET['order'], $Orders)) {
- $Order = $_GET['order'];
+ $Order = $_GET['order'];
} else {
- $Order = 'Time';
+ $Order = 'Time';
}
if (!empty($_GET['way']) && array_key_exists($_GET['way'], $Ways)) {
- $Way = $_GET['way'];
+ $Way = $_GET['way'];
} else {
- $Way = 'DESC';
+ $Way = 'DESC';
}
-$SearchWhere = array();
+$SearchWhere = [];
if (!empty($_GET['format'])) {
- if (in_array($_GET['format'], $Formats)) {
- $SearchWhere[] = "t.Format = '".db_string($_GET['format'])."'";
- } elseif ($_GET['format'] == 'perfectflac') {
- $_GET['filter'] = 'perfectflac';
- }
+ if (in_array($_GET['format'], $Formats)) {
+ $SearchWhere[] = "t.Format = '".db_string($_GET['format'])."'";
+ } elseif ($_GET['format'] == 'perfectflac') {
+ $_GET['filter'] = 'perfectflac';
+ }
}
if (!empty($_GET['bitrate']) && in_array($_GET['bitrate'], $Bitrates)) {
- $SearchWhere[] = "t.Encoding = '".db_string($_GET['bitrate'])."'";
+ $SearchWhere[] = "t.Encoding = '".db_string($_GET['bitrate'])."'";
}
if (!empty($_GET['media']) && in_array($_GET['media'], $Media)) {
- $SearchWhere[] = "t.Media = '".db_string($_GET['media'])."'";
+ $SearchWhere[] = "t.Media = '".db_string($_GET['media'])."'";
}
if (!empty($_GET['releasetype']) && array_key_exists($_GET['releasetype'], $ReleaseTypes)) {
- $SearchWhere[] = "tg.ReleaseType = '".db_string($_GET['releasetype'])."'";
+ $SearchWhere[] = "tg.ReleaseType = '".db_string($_GET['releasetype'])."'";
}
if (isset($_GET['scene']) && in_array($_GET['scene'], array('1', '0'))) {
- $SearchWhere[] = "t.Scene = '".db_string($_GET['scene'])."'";
+ $SearchWhere[] = "t.Scene = '".db_string($_GET['scene'])."'";
}
if (isset($_GET['vanityhouse']) && in_array($_GET['vanityhouse'], array('1', '0'))) {
- $SearchWhere[] = "tg.VanityHouse = '".db_string($_GET['vanityhouse'])."'";
+ $SearchWhere[] = "tg.VanityHouse = '".db_string($_GET['vanityhouse'])."'";
}
if (isset($_GET['cue']) && in_array($_GET['cue'], array('1', '0'))) {
- $SearchWhere[] = "t.HasCue = '".db_string($_GET['cue'])."'";
+ $SearchWhere[] = "t.HasCue = '".db_string($_GET['cue'])."'";
}
if (isset($_GET['log']) && in_array($_GET['log'], array('1', '0', '100', '-1'))) {
- if ($_GET['log'] === '100') {
- $SearchWhere[] = "t.HasLog = '1'";
- $SearchWhere[] = "t.LogScore = '100'";
- } elseif ($_GET['log'] === '-1') {
- $SearchWhere[] = "t.HasLog = '1'";
- $SearchWhere[] = "t.LogScore < '100'";
- } else {
- $SearchWhere[] = "t.HasLog = '".db_string($_GET['log'])."'";
- }
+ if ($_GET['log'] === '100') {
+ $SearchWhere[] = "t.HasLog = '1'";
+ $SearchWhere[] = "t.LogScore = '100'";
+ } elseif ($_GET['log'] === '-1') {
+ $SearchWhere[] = "t.HasLog = '1'";
+ $SearchWhere[] = "t.LogScore < '100'";
+ } else {
+ $SearchWhere[] = "t.HasLog = '".db_string($_GET['log'])."'";
+ }
}
if (!empty($_GET['categories'])) {
- $Cats = array();
- foreach (array_keys($_GET['categories']) as $Cat) {
- if (!is_number($Cat)) {
- error(0);
- }
- $Cats[] = "tg.CategoryID = '".db_string($Cat)."'";
- }
- $SearchWhere[] = '('.implode(' OR ', $Cats).')';
+ $Cats = [];
+ foreach (array_keys($_GET['categories']) as $Cat) {
+ if (!is_number($Cat)) {
+ error(0);
+ }
+ $Cats[] = "tg.CategoryID = '".db_string($Cat)."'";
+ }
+ $SearchWhere[] = '('.implode(' OR ', $Cats).')';
}
if (!isset($_GET['tags_type'])) {
- $_GET['tags_type'] = '1';
+ $_GET['tags_type'] = '1';
}
if (!empty($_GET['tags'])) {
- $Tags = explode(',', $_GET['tags']);
- $TagList = array();
- foreach ($Tags as $Tag) {
- $Tag = trim(str_replace('.', '_', $Tag));
- if (empty($Tag)) {
- continue;
- }
- if ($Tag[0] == '!') {
- $Tag = ltrim(substr($Tag, 1));
- if (empty($Tag)) {
- continue;
- }
- $TagList[] = "CONCAT(' ', tg.TagList, ' ') NOT LIKE '% ".db_string($Tag)." %'";
- } else {
- $TagList[] = "CONCAT(' ', tg.TagList, ' ') LIKE '% ".db_string($Tag)." %'";
- }
- }
- if (!empty($TagList)) {
- if (isset($_GET['tags_type']) && $_GET['tags_type'] !== '1') {
- $_GET['tags_type'] = '0';
- $SearchWhere[] = '('.implode(' OR ', $TagList).')';
- } else {
- $_GET['tags_type'] = '1';
- $SearchWhere[] = '('.implode(' AND ', $TagList).')';
- }
- }
+ $Tags = explode(',', $_GET['tags']);
+ $TagList = [];
+ foreach ($Tags as $Tag) {
+ $Tag = trim(str_replace('.', '_', $Tag));
+ if (empty($Tag)) {
+ continue;
+ }
+ if ($Tag[0] == '!') {
+ $Tag = ltrim(substr($Tag, 1));
+ if (empty($Tag)) {
+ continue;
+ }
+ $TagList[] = "CONCAT(' ', tg.TagList, ' ') NOT LIKE '% ".db_string($Tag)." %'";
+ } else {
+ $TagList[] = "CONCAT(' ', tg.TagList, ' ') LIKE '% ".db_string($Tag)." %'";
+ }
+ }
+ if (!empty($TagList)) {
+ if (isset($_GET['tags_type']) && $_GET['tags_type'] !== '1') {
+ $_GET['tags_type'] = '0';
+ $SearchWhere[] = '('.implode(' OR ', $TagList).')';
+ } else {
+ $_GET['tags_type'] = '1';
+ $SearchWhere[] = '('.implode(' AND ', $TagList).')';
+ }
+ }
}
$SearchWhere = implode(' AND ', $SearchWhere);
if (!empty($SearchWhere)) {
- $SearchWhere = " AND $SearchWhere";
+ $SearchWhere = " AND $SearchWhere";
}
$User = Users::user_info($UserID);
@@ -150,164 +150,172 @@ function header_link($SortKey, $DefaultWay = 'DESC') {
$UserClass = $Perms['Class'];
switch ($_GET['type']) {
- case 'snatched':
- if (!check_paranoia('snatched', $User['Paranoia'], $UserClass, $UserID)) {
- error(403);
- }
- $Time = 'xs.tstamp';
- $UserField = 'xs.uid';
- $ExtraWhere = '';
- $From = "
- xbt_snatched AS xs
- JOIN torrents AS t ON t.ID = xs.fid";
- break;
- case 'seeding':
- if (!check_paranoia('seeding', $User['Paranoia'], $UserClass, $UserID)) {
- error(403);
- }
- $Time = '(xfu.mtime - xfu.timespent)';
- $UserField = 'xfu.uid';
- $ExtraWhere = '
- AND xfu.active = 1
- AND xfu.Remaining = 0';
- $From = "
- xbt_files_users AS xfu
- JOIN torrents AS t ON t.ID = xfu.fid";
- break;
- case 'leeching':
- if (!check_paranoia('leeching', $User['Paranoia'], $UserClass, $UserID)) {
- error(403);
- }
- $Time = '(xfu.mtime - xfu.timespent)';
- $UserField = 'xfu.uid';
- $ExtraWhere = '
- AND xfu.active = 1
- AND xfu.Remaining > 0';
- $From = "
- xbt_files_users AS xfu
- JOIN torrents AS t ON t.ID = xfu.fid";
- break;
- case 'uploaded':
- if ((empty($_GET['filter']) || $_GET['filter'] !== 'perfectflac') && !check_paranoia('uploads', $User['Paranoia'], $UserClass, $UserID)) {
- error(403);
- }
- $Time = 'unix_timestamp(t.Time)';
- $UserField = 't.UserID';
- $ExtraWhere = '';
- $From = "torrents AS t";
- break;
- case 'downloaded':
- if (!check_perms('site_view_torrent_snatchlist')) {
- error(403);
- }
- $Time = 'unix_timestamp(ud.Time)';
- $UserField = 'ud.UserID';
- $ExtraWhere = '';
- $From = "
- users_downloads AS ud
- JOIN torrents AS t ON t.ID = ud.TorrentID";
- break;
- default:
- error(404);
+ case 'snatched':
+ if (!check_paranoia('snatched', $User['Paranoia'], $UserClass, $UserID)) {
+ error(403);
+ }
+ $Time = 'xs.tstamp';
+ $UserField = 'xs.uid';
+ $ExtraWhere = '';
+ $From = "
+ xbt_snatched AS xs
+ INNER JOIN torrents AS t ON t.ID = xs.fid
+ INNER JOIN torrents_leech_stats tls ON (tls.TorrentID = t.ID)";
+ break;
+ case 'seeding':
+ if (!check_paranoia('seeding', $User['Paranoia'], $UserClass, $UserID)) {
+ error(403);
+ }
+ $Time = '(xfu.mtime - xfu.timespent)';
+ $UserField = 'xfu.uid';
+ $ExtraWhere = '
+ AND xfu.active = 1
+ AND xfu.Remaining = 0';
+ $From = "
+ xbt_files_users AS xfu
+ INNER JOIN torrents AS t ON t.ID = xfu.fid
+ INNER JOIN torrents_leech_stats tls ON (tls.TorrentID = t.ID)";
+ break;
+ case 'leeching':
+ if (!check_paranoia('leeching', $User['Paranoia'], $UserClass, $UserID)) {
+ error(403);
+ }
+ $Time = '(xfu.mtime - xfu.timespent)';
+ $UserField = 'xfu.uid';
+ $ExtraWhere = '
+ AND xfu.active = 1
+ AND xfu.Remaining > 0';
+ $From = "
+ xbt_files_users AS xfu
+ INNER JOIN torrents AS t ON t.ID = xfu.fid
+ INNER JOIN torrents_leech_stats tls ON (tls.TorrentID = t.ID)";
+ break;
+ case 'uploaded':
+ if ((empty($_GET['filter']) || $_GET['filter'] !== 'perfectflac') && !check_paranoia('uploads', $User['Paranoia'], $UserClass, $UserID)) {
+ error(403);
+ }
+ $Time = 'unix_timestamp(t.Time)';
+ $UserField = 't.UserID';
+ $ExtraWhere = '';
+ $From = "torrents AS t
+ INNER JOIN torrents_leech_stats tls ON (tls.TorrentID = t.ID)";
+ break;
+ case 'downloaded':
+ if (!check_perms('site_view_torrent_snatchlist')) {
+ error(403);
+ }
+ $Time = 'unix_timestamp(ud.Time)';
+ $UserField = 'ud.UserID';
+ $ExtraWhere = '';
+ $From = "users_downloads AS ud
+ INNER JOIN torrents AS t ON (t.ID = ud.TorrentID)
+ INNER JOIN torrents_leech_stats tls ON (tls.TorrentID = t.ID)";
+ break;
+ default:
+ error(404);
}
if (!empty($_GET['filter'])) {
- if ($_GET['filter'] === 'perfectflac') {
- if (!check_paranoia('perfectflacs', $User['Paranoia'], $UserClass, $UserID)) {
- error(403);
- }
- $ExtraWhere .= " AND t.Format = 'FLAC'";
- if (empty($_GET['media'])) {
- $ExtraWhere .= "
- AND (
- t.LogScore = 100 OR
- t.Media IN ('Vinyl', 'WEB', 'DVD', 'Soundboard', 'Cassette', 'SACD', 'Blu-ray', 'DAT')
- )";
- } elseif (strtoupper($_GET['media']) === 'CD' && empty($_GET['log'])) {
- $ExtraWhere .= "
- AND t.LogScore = 100";
- }
- } elseif ($_GET['filter'] === 'uniquegroup') {
- if (!check_paranoia('uniquegroups', $User['Paranoia'], $UserClass, $UserID)) {
- error(403);
- }
- $GroupBy = 'tg.ID';
- }
+ if ($_GET['filter'] === 'perfectflac') {
+ if (!check_paranoia('perfectflacs', $User['Paranoia'], $UserClass, $UserID)) {
+ error(403);
+ }
+ $ExtraWhere .= " AND t.Format = 'FLAC'";
+ if (empty($_GET['media'])) {
+ $ExtraWhere .= "
+ AND (
+ t.LogScore = 100 OR
+ t.Media IN ('Vinyl', 'WEB', 'DVD', 'Soundboard', 'Cassette', 'SACD', 'Blu-ray', 'DAT')
+ )";
+ } elseif (strtoupper($_GET['media']) === 'CD' && empty($_GET['log'])) {
+ $ExtraWhere .= "
+ AND t.LogScore = 100";
+ }
+ } elseif ($_GET['filter'] === 'uniquegroup') {
+ if (!check_paranoia('uniquegroups', $User['Paranoia'], $UserClass, $UserID)) {
+ error(403);
+ }
+ $GroupBy = 'tg.ID';
+ }
}
if (empty($GroupBy)) {
- $GroupBy = 't.ID';
+ $GroupBy = 't.ID';
}
if ((empty($_GET['search']) || trim($_GET['search']) === '') && $Order != 'Name') {
- $SQL = "
- SELECT
- SQL_CALC_FOUND_ROWS
- t.GroupID,
- t.ID AS TorrentID,
- $Time AS Time,
- tg.CategoryID
- FROM $From
- JOIN torrents_group AS tg ON tg.ID = t.GroupID
- WHERE $UserField = '$UserID'
- $ExtraWhere
- $SearchWhere
- GROUP BY $GroupBy
- ORDER BY $Order $Way
- LIMIT $Limit";
+ $QueryOrder = $Order;
+ if (in_array($Order, ['Seeders', 'Leechers', 'Snatched'])) {
+ $QueryOrder = "tls.$QueryOrder";
+ }
+ $SQL = "
+ SELECT
+ SQL_CALC_FOUND_ROWS
+ t.GroupID,
+ t.ID AS TorrentID,
+ $Time AS Time,
+ tg.CategoryID
+ FROM $From
+ JOIN torrents_group AS tg ON tg.ID = t.GroupID
+ WHERE $UserField = '$UserID'
+ $ExtraWhere
+ $SearchWhere
+ GROUP BY $GroupBy
+ ORDER BY $QueryOrder $Way
+ LIMIT $Limit";
} else {
- $DB->query("
- CREATE TEMPORARY TABLE temp_sections_torrents_user (
- GroupID int(10) unsigned not null,
- TorrentID int(10) unsigned not null,
- Time int(12) unsigned not null,
- CategoryID int(3) unsigned,
- Seeders int(6) unsigned,
- Leechers int(6) unsigned,
- Snatched int(10) unsigned,
- Name mediumtext,
- Size bigint(12) unsigned,
- PRIMARY KEY (TorrentID)) CHARSET=utf8");
- $DB->query("
- INSERT IGNORE INTO temp_sections_torrents_user
- SELECT
- t.GroupID,
- t.ID AS TorrentID,
- $Time AS Time,
- tg.CategoryID,
- t.Seeders,
- t.Leechers,
- t.Snatched,
- CONCAT_WS(' ', GROUP_CONCAT(aa.Name SEPARATOR ' '), ' ', tg.Name, ' ', tg.Year, ' ') AS Name,
- t.Size
- FROM $From
- JOIN torrents_group AS tg ON tg.ID = t.GroupID
- LEFT JOIN torrents_artists AS ta ON ta.GroupID = tg.ID
- LEFT JOIN artists_alias AS aa ON aa.AliasID = ta.AliasID
- WHERE $UserField = '$UserID'
- $ExtraWhere
- $SearchWhere
- GROUP BY TorrentID, Time");
-
- if (!empty($_GET['search']) && trim($_GET['search']) !== '') {
- $Words = array_unique(explode(' ', db_string($_GET['search'])));
- }
-
- $SQL = "
- SELECT
- SQL_CALC_FOUND_ROWS
- GroupID,
- TorrentID,
- Time,
- CategoryID
- FROM temp_sections_torrents_user";
- if (!empty($Words)) {
- $SQL .= "
- WHERE Name LIKE '%".implode("%' AND Name LIKE '%", $Words)."%'";
- }
- $SQL .= "
- ORDER BY $Order $Way
- LIMIT $Limit";
+ $DB->query("
+ CREATE TEMPORARY TABLE temp_sections_torrents_user (
+ GroupID int(10) unsigned not null,
+ TorrentID int(10) unsigned not null,
+ Time int(12) unsigned not null,
+ CategoryID int(3) unsigned,
+ Seeders int(6) unsigned,
+ Leechers int(6) unsigned,
+ Snatched int(10) unsigned,
+ Name mediumtext,
+ Size bigint(12) unsigned,
+ PRIMARY KEY (TorrentID)) CHARSET=utf8");
+ $DB->query("
+ INSERT IGNORE INTO temp_sections_torrents_user
+ SELECT
+ t.GroupID,
+ t.ID AS TorrentID,
+ $Time AS Time,
+ tg.CategoryID,
+ tls.Seeders,
+ tls.Leechers,
+ tls.Snatched,
+ CONCAT_WS(' ', GROUP_CONCAT(aa.Name SEPARATOR ' '), ' ', tg.Name, ' ', tg.Year, ' ') AS Name,
+ t.Size
+ FROM $From
+ INNER JOIN torrents_group AS tg ON tg.ID = t.GroupID
+ LEFT JOIN torrents_artists AS ta ON ta.GroupID = tg.ID
+ LEFT JOIN artists_alias AS aa ON aa.AliasID = ta.AliasID
+ WHERE $UserField = '$UserID'
+ $ExtraWhere
+ $SearchWhere
+ GROUP BY TorrentID, Time");
+
+ if (!empty($_GET['search']) && trim($_GET['search']) !== '') {
+ $Words = array_unique(explode(' ', db_string($_GET['search'])));
+ }
+
+ $SQL = "
+ SELECT
+ SQL_CALC_FOUND_ROWS
+ GroupID,
+ TorrentID,
+ Time,
+ CategoryID
+ FROM temp_sections_torrents_user";
+ if (!empty($Words)) {
+ $SQL .= "
+ WHERE Name LIKE '%".implode("%' AND Name LIKE '%", $Words)."%'";
+ }
+ $SQL .= "
+ ORDER BY $Order $Way
+ LIMIT $Limit";
}
$DB->query($SQL);
@@ -329,222 +337,224 @@ function header_link($SortKey, $DefaultWay = 'DESC') {
?>
-
-
-
-
+
diff --git a/sections/torrents/vote.php b/sections/torrents/vote.php
index 66ce1a057..96a0a746f 100644
--- a/sections/torrents/vote.php
+++ b/sections/torrents/vote.php
@@ -1,37 +1,37 @@
- 0 ? number_format($UpVotes / $TotalVotes * 100, 1) : '--';
+ $Voted = isset($UserVotes[$GroupID]) ? $UserVotes[$GroupID]['Type'] : false;
+ $Score = Votes::binomial_score($UpVotes, $TotalVotes);
+ $Percentage = $TotalVotes > 0 ? number_format($UpVotes / $TotalVotes * 100, 1) : '--';
?>
- Album Votes
-
- ∧
-
- ∨
-
- Total
-
- Score:
- |
- % positive
-
- >You have upvoted.
- >You have downvoted.
-
- id="vote_message">Upvote - Downvote
-
- id="unvote_message">
- Changed your mind?
-
- Clear your vote
-
-
+ Album Votes
+
+ ∧
+
+ ∨
+
+ Total
+
+ Score:
+ |
+ % positive
+
+ >You have upvoted.
+ >You have downvoted.
+
+ id="vote_message">Upvote - Downvote
+
+ id="unvote_message">
+ Changed your mind?
+
+ Clear your vote
+
+
diff --git a/sections/torrents/vote_ranks.php b/sections/torrents/vote_ranks.php
index 8a6cca9e0..ee50ae45e 100644
--- a/sections/torrents/vote_ranks.php
+++ b/sections/torrents/vote_ranks.php
@@ -1,39 +1,39 @@
-'overall',
- 'decade'=>check_perms('site_advanced_top10') ? 'for the '.$GroupDecade.'s' : 'for the '.$GroupDecade.'s',
- 'year'=>check_perms('site_advanced_top10') ? 'for '.$GroupYear.'' : "for $GroupYear");
+ $Rankings = Votes::get_ranking($GroupID, $GroupYear);
+ $LIs = '';
+ // Display information for the return categories of get_ranking()
+ $GroupDecade = $GroupYear - ($GroupYear % 10);
+ $names = array('overall'=>'overall',
+ 'decade'=>check_perms('site_advanced_top10') ? 'for the '.$GroupDecade.'s' : 'for the '.$GroupDecade.'s',
+ 'year'=>check_perms('site_advanced_top10') ? 'for '.$GroupYear.'' : "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';
- }
+ 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 .= "No. $Rank $text ";
- }
- }
+ $LIs .= "No. $Rank $text ";
+ }
+ }
- if ($LIs != '') {
+ if ($LIs != '') {
?>
-
- Favorites
-
-
-
-
-
-
-
+ Favorites
+
+
+
+
+
+
+
diff --git a/sections/torrents/vote_tag.php b/sections/torrents/vote_tag.php
index 5f22f0ff4..7ac9c7e0a 100644
--- a/sections/torrents/vote_tag.php
+++ b/sections/torrents/vote_tag.php
@@ -1,41 +1,41 @@
-query("
- SELECT TagID
- FROM torrents_tags_votes
- WHERE TagID = '$TagID'
- AND GroupID = '$GroupID'
- AND UserID = '$UserID'
- AND Way = '$Way'");
+ SELECT TagID
+ FROM torrents_tags_votes
+ WHERE TagID = '$TagID'
+ AND GroupID = '$GroupID'
+ AND UserID = '$UserID'
+ AND Way = '$Way'");
if (!$DB->has_results()) {
- if ($Way == 'down') {
- $Change = 'NegativeVotes = NegativeVotes + 1';
- } else {
- $Change = 'PositiveVotes = PositiveVotes + 2';
- }
- $DB->query("
- UPDATE torrents_tags
- SET $Change
- WHERE TagID = '$TagID'
- AND GroupID = '$GroupID'");
- $DB->query("
- INSERT INTO torrents_tags_votes
- (GroupID, TagID, UserID, Way)
- VALUES
- ('$GroupID', '$TagID', '$UserID', '$Way')");
- $Cache->delete_value("torrents_details_$GroupID"); // Delete torrent group cache
+ if ($Way == 'down') {
+ $Change = 'NegativeVotes = NegativeVotes + 1';
+ } else {
+ $Change = 'PositiveVotes = PositiveVotes + 2';
+ }
+ $DB->query("
+ UPDATE torrents_tags
+ SET $Change
+ WHERE TagID = '$TagID'
+ AND GroupID = '$GroupID'");
+ $DB->query("
+ INSERT INTO torrents_tags_votes
+ (GroupID, TagID, UserID, Way)
+ VALUES
+ ('$GroupID', '$TagID', '$UserID', '$Way')");
+ $Cache->delete_value("torrents_details_$GroupID"); // Delete torrent group cache
}
$Location = (empty($_SERVER['HTTP_REFERER'])) ? "torrents.php?id={$GroupID}" : $_SERVER['HTTP_REFERER'];
-header("Location: {$Location}");
\ No newline at end of file
+header("Location: {$Location}");
diff --git a/sections/torrents/voter_picks.php b/sections/torrents/voter_picks.php
index 5dfbcc259..a3488c980 100644
--- a/sections/torrents/voter_picks.php
+++ b/sections/torrents/voter_picks.php
@@ -1,64 +1,65 @@
-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);
- }
+ $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 = array();
- 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;
- }
- }
+ $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);
+ arsort($GroupScores);
+ $Top10 = array_slice($GroupScores, 0, 10, true);
+ $Cache->cache_value('similar_albums_'.$GroupID, $Top10, 0.5 * 3600);
}
if (count($Top10) > 0) {
?>
- | ↑ People who like this album also liked... (Show) | -
| ↑ People who like this album also liked... (Show) | +
-
-
+
+
+
+
+
+ (New!)
+
+
+
+
+
' : '')?>
-head();
switch ($UploadForm) {
- case 'Music':
- $TorrentForm->music_form($GenreTags);
- break;
+ case 'Music':
+ $TorrentForm->music_form($GenreTags);
+ break;
- case 'Audiobooks':
- case 'Comedy':
- $TorrentForm->audiobook_form();
- break;
+ case 'Audiobooks':
+ case 'Comedy':
+ $TorrentForm->audiobook_form();
+ break;
- case 'Applications':
- case 'Comics':
- case 'E-Books':
- case 'E-Learning Videos':
- $TorrentForm->simple_form($Properties['CategoryID']);
- break;
- default:
- $TorrentForm->music_form($GenreTags);
+ case 'Applications':
+ case 'Comics':
+ case 'E-Books':
+ case 'E-Learning Videos':
+ $TorrentForm->simple_form($Properties['CategoryID']);
+ break;
+ default:
+ $TorrentForm->music_form($GenreTags);
}
$TorrentForm->foot();
?>
SetFields('type', '1', 'inarray', 'Please select a valid type.', array('inarray' => array_keys($Categories)));
switch ($Type) {
- case 'Music':
- if (!$_POST['groupid']) {
- $Validate->SetFields('title',
- '1','string','Title must be between 1 and 200 characters.', array('maxlength'=>200, 'minlength'=>1));
-
- $Validate->SetFields('year',
- '1','number','The year of the original release must be entered.', array('length'=>40));
-
- $Validate->SetFields('releasetype',
- '1','inarray','Please select a valid release type.', array('inarray'=>array_keys($ReleaseTypes)));
-
- $Validate->SetFields('tags',
- '1','string','You must enter at least one tag. Maximum length is 200 characters.', array('maxlength'=>200, 'minlength'=>2));
-
- $Validate->SetFields('record_label',
- '0','string','Record label must be between 2 and 80 characters.', array('maxlength'=>80, 'minlength'=>2));
-
- $Validate->SetFields('catalogue_number',
- '0','string','Catalogue Number must be between 2 and 80 characters.', array('maxlength'=>80, 'minlength'=>2));
-
- $Validate->SetFields('album_desc',
- '1','string','The album description has a minimum length of 10 characters.', array('maxlength'=>1000000, 'minlength'=>10));
-
- if ($Properties['Media'] == 'CD' && !$Properties['Remastered']) {
- $Validate->SetFields('year', '1', 'number', 'You have selected a year for an album that predates the media you say it was created on.', array('minlength'=>1982));
- }
- }
-
- if ($Properties['Remastered'] && !$Properties['UnknownRelease']) {
- $Validate->SetFields('remaster_year',
- '1','number','Year of remaster/re-issue must be entered.');
- } else {
- $Validate->SetFields('remaster_year',
- '0','number','Invalid remaster year.');
- }
-
- if ($Properties['Media'] == 'CD' && $Properties['Remastered']) {
- $Validate->SetFields('remaster_year', '1', 'number', 'You have selected a year for an album that predates the media you say it was created on.', array('minlength'=>1982));
- }
-
- $Validate->SetFields('remaster_title',
- '0','string','Remaster title must be between 2 and 80 characters.', array('maxlength'=>80, 'minlength'=>2));
- if ($Properties['RemasterTitle'] == 'Original Release') {
- $Validate->SetFields('remaster_title', '0', 'string', '"Orginal Release" is not a valid remaster title.');
- }
-
- $Validate->SetFields('remaster_record_label',
- '0','string','Remaster record label must be between 2 and 80 characters.', array('maxlength'=>80, 'minlength'=>2));
-
- $Validate->SetFields('remaster_catalogue_number',
- '0','string','Remaster catalogue number must be between 2 and 80 characters.', array('maxlength'=>80, 'minlength'=>2));
-
- $Validate->SetFields('format',
- '1','inarray','Please select a valid format.', array('inarray'=>$Formats));
-
- // Handle 'other' bitrates
- if ($Properties['Encoding'] == 'Other') {
- if ($Properties['Format'] == 'FLAC') {
- $Validate->SetFields('bitrate',
- '1','string','FLAC bitrate must be lossless.', array('regex'=>'/Lossless/'));
- }
-
- $Validate->SetFields('other_bitrate',
- '1','string','You must enter the other bitrate (max length: 9 characters).', array('maxlength'=>9));
- $enc = trim($_POST['other_bitrate']);
- if (isset($_POST['vbr'])) {
- $enc.= ' (VBR)';
- }
-
- $Properties['Encoding'] = $enc;
- $Properties['Bitrate'] = $enc;
- } else {
- $Validate->SetFields('bitrate',
- '1','inarray','You must choose a bitrate.', array('inarray'=>$Bitrates));
- }
-
- $Validate->SetFields('media',
- '1','inarray','Please select a valid media.', array('inarray'=>$Media));
-
- $Validate->SetFields('image',
- '0','link','The image URL you entered was invalid.', array('maxlength'=>255, 'minlength'=>12));
-
- $Validate->SetFields('release_desc',
- '0','string','The release description has a minimum length of 10 characters.', array('maxlength'=>1000000, 'minlength'=>10));
-
- $Validate->SetFields('groupid', '0', 'number', 'Group ID was not numeric');
-
- break;
-
- case 'Audiobooks':
- case 'Comedy':
- $Validate->SetFields('title',
- '1','string','Title must be between 2 and 200 characters.', array('maxlength'=>200, 'minlength'=>2));
-
- $Validate->SetFields('year',
- '1','number','The year of the release must be entered.');
-
- $Validate->SetFields('format',
- '1','inarray','Please select a valid format.', array('inarray'=>$Formats));
-
- if ($Properties['Encoding'] == 'Other') {
- $Validate->SetFields('other_bitrate',
- '1','string','You must enter the other bitrate (max length: 9 characters).', array('maxlength'=>9));
- $enc = trim($_POST['other_bitrate']);
- if (isset($_POST['vbr'])) {
- $enc.= ' (VBR)';
- }
-
- $Properties['Encoding'] = $enc;
- $Properties['Bitrate'] = $enc;
- } else {
- $Validate->SetFields('bitrate',
- '1','inarray','You must choose a bitrate.', array('inarray'=>$Bitrates));
- }
-
- $Validate->SetFields('album_desc',
- '1','string','You must enter a proper audiobook description.', array('maxlength'=>1000000, 'minlength'=>10));
-
- $Validate->SetFields('tags',
- '1','string','You must enter at least one tag. Maximum length is 200 characters.', array('maxlength'=>200, 'minlength'=>2));
-
- $Validate->SetFields('release_desc',
- '0','string','The release description has a minimum length of 10 characters.', array('maxlength'=>1000000, 'minlength'=>10));
-
- $Validate->SetFields('image',
- '0','link','The image URL you entered was invalid.', array('maxlength'=>255, 'minlength'=>12));
- break;
-
- case 'Applications':
- case 'Comics':
- case 'E-Books':
- case 'E-Learning Videos':
- $Validate->SetFields('title',
- '1','string','Title must be between 2 and 200 characters.', array('maxlength'=>200, 'minlength'=>2));
-
- $Validate->SetFields('tags',
- '1','string','You must enter at least one tag. Maximum length is 200 characters.', array('maxlength'=>200, 'minlength'=>2));
-
- $Validate->SetFields('release_desc',
- '0','string','The release description has a minimum length of 10 characters.', array('maxlength'=>1000000, 'minlength'=>10));
-
- $Validate->SetFields('image',
- '0','link','The image URL you entered was invalid.', array('maxlength'=>255, 'minlength'=>12));
- break;
+ case 'Music':
+ if (!$_POST['groupid']) {
+ $Validate->SetFields('title',
+ '1','string','Title must be between 1 and 200 characters.', array('maxlength'=>200, 'minlength'=>1));
+
+ $Validate->SetFields('year',
+ '1','number','The year of the original release must be entered.', array('length'=>40));
+
+ $Validate->SetFields('releasetype',
+ '1','inarray','Please select a valid release type.', array('inarray'=>array_keys($ReleaseTypes)));
+
+ $Validate->SetFields('tags',
+ '1','string','You must enter at least one tag. Maximum length is 200 characters.', array('maxlength'=>200, 'minlength'=>2));
+
+ $Validate->SetFields('record_label',
+ '0','string','Record label must be between 2 and 80 characters.', array('maxlength'=>80, 'minlength'=>2));
+
+ $Validate->SetFields('catalogue_number',
+ '0','string','Catalogue Number must be between 2 and 80 characters.', array('maxlength'=>80, 'minlength'=>2));
+
+ $Validate->SetFields('album_desc',
+ '1','string','The album description has a minimum length of 10 characters.', array('maxlength'=>1000000, 'minlength'=>10));
+
+ if ($Properties['Media'] == 'CD' && !$Properties['Remastered']) {
+ $Validate->SetFields('year', '1', 'number', 'You have selected a year for an album that predates the media you say it was created on.', array('minlength'=>1982));
+ }
+ }
+
+ if ($Properties['Remastered'] && !$Properties['UnknownRelease']) {
+ $Validate->SetFields('remaster_year',
+ '1','number','Year of remaster/re-issue must be entered.');
+ } else {
+ $Validate->SetFields('remaster_year',
+ '0','number','Invalid remaster year.');
+ }
+
+ if ($Properties['Media'] == 'CD' && $Properties['Remastered']) {
+ $Validate->SetFields('remaster_year', '1', 'number', 'You have selected a year for an album that predates the media you say it was created on.', array('minlength'=>1982));
+ }
+
+ $Validate->SetFields('remaster_title',
+ '0','string','Remaster title must be between 2 and 80 characters.', array('maxlength'=>80, 'minlength'=>2));
+ if ($Properties['RemasterTitle'] == 'Original Release') {
+ $Validate->SetFields('remaster_title', '0', 'string', '"Orginal Release" is not a valid remaster title.');
+ }
+
+ $Validate->SetFields('remaster_record_label',
+ '0','string','Remaster record label must be between 2 and 80 characters.', array('maxlength'=>80, 'minlength'=>2));
+
+ $Validate->SetFields('remaster_catalogue_number',
+ '0','string','Remaster catalogue number must be between 2 and 80 characters.', array('maxlength'=>80, 'minlength'=>2));
+
+ $Validate->SetFields('format',
+ '1','inarray','Please select a valid format.', array('inarray'=>$Formats));
+
+ // Handle 'other' bitrates
+ if ($Properties['Encoding'] == 'Other') {
+ if ($Properties['Format'] == 'FLAC') {
+ $Validate->SetFields('bitrate',
+ '1','string','FLAC bitrate must be lossless.', array('regex'=>'/Lossless/'));
+ }
+
+ $Validate->SetFields('other_bitrate',
+ '1','string','You must enter the other bitrate (max length: 9 characters).', array('maxlength'=>9));
+ $enc = trim($_POST['other_bitrate']);
+ if (isset($_POST['vbr'])) {
+ $enc.= ' (VBR)';
+ }
+
+ $Properties['Encoding'] = $enc;
+ $Properties['Bitrate'] = $enc;
+ } else {
+ $Validate->SetFields('bitrate',
+ '1','inarray','You must choose a bitrate.', array('inarray'=>$Bitrates));
+ }
+
+ $Validate->SetFields('media',
+ '1','inarray','Please select a valid media.', array('inarray'=>$Media));
+
+ $Validate->SetFields('image',
+ '0','link','The image URL you entered was invalid.', array('maxlength'=>255, 'minlength'=>12));
+
+ $Validate->SetFields('release_desc',
+ '0','string','The release description has a minimum length of 10 characters.', array('maxlength'=>1000000, 'minlength'=>10));
+
+ $Validate->SetFields('groupid', '0', 'number', 'Group ID was not numeric');
+
+ break;
+
+ case 'Audiobooks':
+ case 'Comedy':
+ $Validate->SetFields('title',
+ '1','string','Title must be between 2 and 200 characters.', array('maxlength'=>200, 'minlength'=>2));
+
+ $Validate->SetFields('year',
+ '1','number','The year of the release must be entered.');
+
+ $Validate->SetFields('format',
+ '1','inarray','Please select a valid format.', array('inarray'=>$Formats));
+
+ if ($Properties['Encoding'] == 'Other') {
+ $Validate->SetFields('other_bitrate',
+ '1','string','You must enter the other bitrate (max length: 9 characters).', array('maxlength'=>9));
+ $enc = trim($_POST['other_bitrate']);
+ if (isset($_POST['vbr'])) {
+ $enc.= ' (VBR)';
+ }
+
+ $Properties['Encoding'] = $enc;
+ $Properties['Bitrate'] = $enc;
+ } else {
+ $Validate->SetFields('bitrate',
+ '1','inarray','You must choose a bitrate.', array('inarray'=>$Bitrates));
+ }
+
+ $Validate->SetFields('album_desc',
+ '1','string','You must enter a proper audiobook description.', array('maxlength'=>1000000, 'minlength'=>10));
+
+ $Validate->SetFields('tags',
+ '1','string','You must enter at least one tag. Maximum length is 200 characters.', array('maxlength'=>200, 'minlength'=>2));
+
+ $Validate->SetFields('release_desc',
+ '0','string','The release description has a minimum length of 10 characters.', array('maxlength'=>1000000, 'minlength'=>10));
+
+ $Validate->SetFields('image',
+ '0','link','The image URL you entered was invalid.', array('maxlength'=>255, 'minlength'=>12));
+ break;
+
+ case 'Applications':
+ case 'Comics':
+ case 'E-Books':
+ case 'E-Learning Videos':
+ $Validate->SetFields('title',
+ '1','string','Title must be between 2 and 200 characters.', array('maxlength'=>200, 'minlength'=>2));
+
+ $Validate->SetFields('tags',
+ '1','string','You must enter at least one tag. Maximum length is 200 characters.', array('maxlength'=>200, 'minlength'=>2));
+
+ $Validate->SetFields('release_desc',
+ '0','string','The release description has a minimum length of 10 characters.', array('maxlength'=>1000000, 'minlength'=>10));
+
+ $Validate->SetFields('image',
+ '0','link','The image URL you entered was invalid.', array('maxlength'=>255, 'minlength'=>12));
+ break;
}
$Validate->SetFields('rules',
- '1','require','Your torrent must abide by the rules.');
+ '1','require','Your torrent must abide by the rules.');
$Err = $Validate->ValidateForm($_POST); // Validate the form
@@ -252,15 +252,15 @@
$TorrentName = $File['tmp_name'];
if (!is_uploaded_file($TorrentName) || !filesize($TorrentName)) {
- $Err = 'No torrent file uploaded, or file is empty.';
+ $Err = 'No torrent file uploaded, or file is empty.';
} elseif (substr(strtolower($File['name']), strlen($File['name']) - strlen('.torrent')) !== '.torrent') {
- $Err = "You seem to have put something other than a torrent file into the upload field. (".$File['name'].").";
+ $Err = "You seem to have put something other than a torrent file into the upload field. (".$File['name'].").";
}
if ($Type == 'Music') {
//extra torrent files
- $ExtraTorrents = array();
- $DupeNames = array();
+ $ExtraTorrents = [];
+ $DupeNames = [];
$DupeNames[] = $_FILES['file_input']['name'];
if (isset($_POST['extra_format']) && isset($_POST['extra_bitrate'])) {
@@ -304,59 +304,59 @@
//Multiple artists!
$LogName = '';
if (empty($Properties['GroupID']) && empty($ArtistForm) && $Type == 'Music') {
- $MainArtistCount = 0;
- $ArtistNames = array();
- $ArtistForm = array(
- 1 => array(),
- 2 => array(),
- 3 => array(),
- 4 => array(),
- 5 => array(),
- 6 => array()
- );
- for ($i = 0, $il = count($Artists); $i < $il; $i++) {
- if (trim($Artists[$i]) != '') {
- if (!in_array($Artists[$i], $ArtistNames)) {
- $ArtistForm[$Importance[$i]][] = array('name' => Artists::normalise_artist_name($Artists[$i]));
- if ($Importance[$i] == 1) {
- $MainArtistCount++;
- }
- $ArtistNames[] = trim($Artists[$i]);
- }
- }
- }
- if ($MainArtistCount < 1) {
- $Err = 'Please enter at least one main artist';
- $ArtistForm = array();
- }
- $LogName .= Artists::display_artists($ArtistForm, false, true, false);
+ $MainArtistCount = 0;
+ $ArtistNames = [];
+ $ArtistForm = array(
+ 1 => [],
+ 2 => [],
+ 3 => [],
+ 4 => [],
+ 5 => [],
+ 6 => []
+ );
+ for ($i = 0, $il = count($Artists); $i < $il; $i++) {
+ if (trim($Artists[$i]) != '') {
+ if (!in_array($Artists[$i], $ArtistNames)) {
+ $ArtistForm[$Importance[$i]][] = array('name' => Artists::normalise_artist_name($Artists[$i]));
+ if ($Importance[$i] == 1) {
+ $MainArtistCount++;
+ }
+ $ArtistNames[] = trim($Artists[$i]);
+ }
+ }
+ }
+ if ($MainArtistCount < 1) {
+ $Err = 'Please enter at least one main artist';
+ $ArtistForm = [];
+ }
+ $LogName .= Artists::display_artists($ArtistForm, false, true, false);
}
if ($Err) { // Show the upload form, with the data the user entered
- $UploadForm = $Type;
- include(SERVER_ROOT.'/sections/upload/upload.php');
- die();
+ $UploadForm = $Type;
+ include(SERVER_ROOT.'/sections/upload/upload.php');
+ die();
}
if (!empty($Properties['GroupID']) && empty($ArtistForm) && $Type == 'Music') {
- $DB->prepared_query("
- SELECT ta.ArtistID, aa.Name, ta.Importance
- FROM torrents_artists AS ta
- JOIN artists_alias AS aa ON ta.AliasID = aa.AliasID
- WHERE ta.GroupID = ?
- ORDER BY ta.Importance ASC, aa.Name ASC;", $Properties['GroupID']);
- while (list($ArtistID, $ArtistName, $ArtistImportance) = $DB->next_record(MYSQLI_BOTH, false)) {
- $ArtistForm[$ArtistImportance][] = array('id' => $ArtistID, 'name' => display_str($ArtistName));
- $ArtistsUnescaped[$ArtistImportance][] = array('name' => $ArtistName);
- }
- $LogName .= Artists::display_artists($ArtistsUnescaped, false, true, false);
+ $DB->prepared_query("
+ SELECT ta.ArtistID, aa.Name, ta.Importance
+ FROM torrents_artists AS ta
+ JOIN artists_alias AS aa ON ta.AliasID = aa.AliasID
+ WHERE ta.GroupID = ?
+ ORDER BY ta.Importance ASC, aa.Name ASC;", $Properties['GroupID']);
+ while (list($ArtistID, $ArtistName, $ArtistImportance) = $DB->next_record(MYSQLI_BOTH, false)) {
+ $ArtistForm[$ArtistImportance][] = array('id' => $ArtistID, 'name' => display_str($ArtistName));
+ $ArtistsUnescaped[$ArtistImportance][] = array('name' => $ArtistName);
+ }
+ $LogName .= Artists::display_artists($ArtistsUnescaped, false, true, false);
}
// Strip out Amazon's padding
$AmazonReg = '/(http:\/\/ecx.images-amazon.com\/images\/.+)(\._.*_\.jpg)/i';
-$Matches = array();
+$Matches = [];
if (preg_match($RegX, $Properties['Image'], $Matches)) {
- $Properties['Image'] = $Matches[1].'.jpg';
+ $Properties['Image'] = $Matches[1].'.jpg';
}
ImageTools::blacklisted($Properties['Image']);
@@ -364,12 +364,12 @@
//--------------- Make variables ready for database input ----------------------//
// Shorten and escape $Properties for database input
-$T = array();
+$T = [];
foreach ($Properties as $Key => $Value) {
- $T[$Key] = "'".db_string(trim($Value))."'";
- if (!$T[$Key]) {
- $T[$Key] = null;
- }
+ $T[$Key] = "'".db_string(trim($Value))."'";
+ if (!$T[$Key]) {
+ $T[$Key] = null;
+ }
}
@@ -378,33 +378,33 @@
$Tor = new BencodeTorrent($TorrentName, true);
$PublicTorrent = $Tor->make_private(); // The torrent is now private.
-$UnsourcedTorrent = $Tor->set_source(); // The source is now APL
+$UnsourcedTorrent = $Tor->set_source(); // The source is now OPS
$TorEnc = db_string($Tor->encode());
$InfoHash = pack('H*', $Tor->info_hash());
$DB->prepared_query('
- SELECT ID
- FROM torrents
- WHERE info_hash = ?', $InfoHash);
+ SELECT ID
+ FROM torrents
+ WHERE info_hash = ?', $InfoHash);
if ($DB->has_results()) {
- list($ID) = $DB->next_record();
- $DB->prepared_query('
- SELECT TorrentID
- FROM torrents_files
- WHERE TorrentID = ?', $ID);
- if ($DB->has_results()) {
- $Err = 'The exact same torrent file already exists on the site!';
- } else {
- // A lost torrent
- $DB->query("
- INSERT INTO torrents_files (TorrentID, File)
- VALUES ($ID, '$TorEnc')");
- $Err = 'Thank you for fixing this torrent';
- }
+ list($ID) = $DB->next_record();
+ $DB->prepared_query('
+ SELECT TorrentID
+ FROM torrents_files
+ WHERE TorrentID = ?', $ID);
+ if ($DB->has_results()) {
+ $Err = 'The exact same torrent file already exists on the site!';
+ } else {
+ // A lost torrent
+ $DB->query("
+ INSERT INTO torrents_files (TorrentID, File)
+ VALUES ($ID, '$TorEnc')");
+ $Err = 'Thank you for fixing this torrent';
+ }
}
if (isset($Tor->Dec['encrypted_files'])) {
- $Err = 'This torrent contains an encrypted file list which is not supported here.';
+ $Err = 'This torrent contains an encrypted file list which is not supported here.';
}
// File list and size
@@ -412,114 +412,114 @@
$NumFiles = count($FileList);
$HasLog = 0;
$HasCue = 0;
-$TmpFileList = array();
-$TooLongPaths = array();
+$TmpFileList = [];
+$TooLongPaths = [];
$DirName = (isset($Tor->Dec['info']['files']) ? Format::make_utf8($Tor->get_name()) : '');
$IgnoredLogFileNames = array('audiochecker.log', 'sox.log');
check_name($DirName); // check the folder name against the blacklist
foreach ($FileList as $File) {
- list($Size, $Name) = $File;
- // add +log to encoding
- if ($T['Media'] == "'CD'" && $T['Encoding'] == "'Lossless'" && !in_array(strtolower($Name), $IgnoredLogFileNames) && preg_match('/\.log$/i', $Name)) {
- $HasLog = 1;
- }
- // add +cue to encoding
- if ($T['Encoding'] == "'Lossless'" && preg_match('/\.cue$/i', $Name)) {
- $HasCue = 1;
- }
- // Check file name and extension against blacklist/whitelist
- check_file($Type, $Name);
- // Make sure the filename is not too long
- if (mb_strlen($Name, 'UTF-8') + mb_strlen($DirName, 'UTF-8') + 1 > MAX_FILENAME_LENGTH) {
- $TooLongPaths[] = "$DirName/$Name";
- }
- // Add file info to array
- $TmpFileList[] = Torrents::filelist_format_file($File);
+ list($Size, $Name) = $File;
+ // add +log to encoding
+ if ($T['Media'] == "'CD'" && $T['Encoding'] == "'Lossless'" && !in_array(strtolower($Name), $IgnoredLogFileNames) && preg_match('/\.log$/i', $Name)) {
+ $HasLog = 1;
+ }
+ // add +cue to encoding
+ if ($T['Encoding'] == "'Lossless'" && preg_match('/\.cue$/i', $Name)) {
+ $HasCue = 1;
+ }
+ // Check file name and extension against blacklist/whitelist
+ check_file($Type, $Name);
+ // Make sure the filename is not too long
+ if (mb_strlen($Name, 'UTF-8') + mb_strlen($DirName, 'UTF-8') + 1 > MAX_FILENAME_LENGTH) {
+ $TooLongPaths[] = "$DirName/$Name";
+ }
+ // Add file info to array
+ $TmpFileList[] = Torrents::filelist_format_file($File);
}
if (count($TooLongPaths) > 0) {
- $Names = implode(' Do Not Upload List
-' : '' ?>Last updated: ' : '' ?>
-The following releases are currently forbidden from being uploaded to the site. Do not upload them unless your torrent meets a condition specified in the comment. - - Show - -
-| Name | -Comment | -
| Name | +Comment | +
| - - - (New!) - - | -- |
', $TooLongPaths); - $Err = "The torrent contained one or more files with too long a name:
$Names"; + $Names = implode('
', $TooLongPaths); + $Err = "The torrent contained one or more files with too long a name:
$Names"; } $FilePath = db_string($DirName); $FileString = db_string(implode("\n", $TmpFileList)); $Debug->set_flag('upload: torrent decoded'); if ($Type == 'Music') { - $ExtraTorrentsInsert = array(); - foreach ($ExtraTorrents as $ExtraTorrent) { - $Name = $ExtraTorrent['Name']; - $ExtraTorrentsInsert[$Name] = $ExtraTorrent; - $ThisInsert =& $ExtraTorrentsInsert[$Name]; - $ExtraTor = new BencodeTorrent($Name, true); - if (isset($ExtraTor->Dec['encrypted_files'])) { - $Err = 'At least one of the torrents contain an encrypted file list which is not supported here'; - break; - } - if (!$ExtraTor->is_private()) { - $ExtraTor->make_private(); // The torrent is now private. - $PublicTorrent = true; - } - - if ($ExtraTor->set_source()) { - $UnsourcedTorrent = true; - } - - // File list and size - list($ExtraTotalSize, $ExtraFileList) = $ExtraTor->file_list(); - $ExtraDirName = isset($ExtraTor->Dec['info']['files']) ? Format::make_utf8($ExtraTor->get_name()) : ''; - - $ExtraTmpFileList = array(); - foreach ($ExtraFileList as $ExtraFile) { - list($ExtraSize, $ExtraName) = $ExtraFile; - - check_file($Type, $ExtraName); - - // Make sure the file name is not too long - if (mb_strlen($ExtraName, 'UTF-8') + mb_strlen($ExtraDirName, 'UTF-8') + 1 > MAX_FILENAME_LENGTH) { - $Err = "The torrent contained one or more files with too long of a name:
$ExtraDirName/$ExtraName"; - break; - } - // Add file and size to array - $ExtraTmpFileList[] = Torrents::filelist_format_file($ExtraFile); - } - - // To be stored in the database - $ThisInsert['FilePath'] = db_string($ExtraDirName); - $ThisInsert['FileString'] = db_string(implode("\n", $ExtraTmpFileList)); - $ThisInsert['InfoHash'] = pack('H*', $ExtraTor->info_hash()); - $ThisInsert['NumFiles'] = count($ExtraFileList); - $ThisInsert['TorEnc'] = db_string($ExtraTor->encode()); - $ThisInsert['TotalSize'] = $ExtraTotalSize; - - $Debug->set_flag('upload: torrent decoded'); - $DB->query(" - SELECT ID - FROM torrents - WHERE info_hash = '" . db_string($ThisInsert['InfoHash']) . "'"); - if ($DB->has_results()) { - list($ExtraID) = $DB->next_record(); - $DB->prepared_query(' - SELECT TorrentID - FROM torrents_files - WHERE TorrentID = ?', $ExtraID); - if ($DB->has_results()) { - $Err = "The exact same torrent file already exists on the site!"; - } else { - //One of the lost torrents. - $DB->query(" - INSERT INTO torrents_files (TorrentID, File) - VALUES ($ExtraID, '$ThisInsert[TorEnc]')"); - $Err = "Thank you for fixing this torrent."; - } - } - } - unset($ThisInsert); + $ExtraTorrentsInsert = []; + foreach ($ExtraTorrents as $ExtraTorrent) { + $Name = $ExtraTorrent['Name']; + $ExtraTorrentsInsert[$Name] = $ExtraTorrent; + $ThisInsert =& $ExtraTorrentsInsert[$Name]; + $ExtraTor = new BencodeTorrent($Name, true); + if (isset($ExtraTor->Dec['encrypted_files'])) { + $Err = 'At least one of the torrents contain an encrypted file list which is not supported here'; + break; + } + if (!$ExtraTor->is_private()) { + $ExtraTor->make_private(); // The torrent is now private. + $PublicTorrent = true; + } + + if ($ExtraTor->set_source()) { + $UnsourcedTorrent = true; + } + + // File list and size + list($ExtraTotalSize, $ExtraFileList) = $ExtraTor->file_list(); + $ExtraDirName = isset($ExtraTor->Dec['info']['files']) ? Format::make_utf8($ExtraTor->get_name()) : ''; + + $ExtraTmpFileList = []; + foreach ($ExtraFileList as $ExtraFile) { + list($ExtraSize, $ExtraName) = $ExtraFile; + + check_file($Type, $ExtraName); + + // Make sure the file name is not too long + if (mb_strlen($ExtraName, 'UTF-8') + mb_strlen($ExtraDirName, 'UTF-8') + 1 > MAX_FILENAME_LENGTH) { + $Err = "The torrent contained one or more files with too long of a name:
$ExtraDirName/$ExtraName"; + break; + } + // Add file and size to array + $ExtraTmpFileList[] = Torrents::filelist_format_file($ExtraFile); + } + + // To be stored in the database + $ThisInsert['FilePath'] = db_string($ExtraDirName); + $ThisInsert['FileString'] = db_string(implode("\n", $ExtraTmpFileList)); + $ThisInsert['InfoHash'] = pack('H*', $ExtraTor->info_hash()); + $ThisInsert['NumFiles'] = count($ExtraFileList); + $ThisInsert['TorEnc'] = db_string($ExtraTor->encode()); + $ThisInsert['TotalSize'] = $ExtraTotalSize; + + $Debug->set_flag('upload: torrent decoded'); + $DB->query(" + SELECT ID + FROM torrents + WHERE info_hash = '" . db_string($ThisInsert['InfoHash']) . "'"); + if ($DB->has_results()) { + list($ExtraID) = $DB->next_record(); + $DB->prepared_query(' + SELECT TorrentID + FROM torrents_files + WHERE TorrentID = ?', $ExtraID); + if ($DB->has_results()) { + $Err = "The exact same torrent file already exists on the site!"; + } else { + //One of the lost torrents. + $DB->query(" + INSERT INTO torrents_files (TorrentID, File) + VALUES ($ExtraID, '$ThisInsert[TorEnc]')"); + $Err = "Thank you for fixing this torrent."; + } + } + } + unset($ThisInsert); } if (!empty($Err)) { // Show the upload form, with the data the user entered - $UploadForm = $Type; - include(SERVER_ROOT.'/sections/upload/upload.php'); - die(); + $UploadForm = $Type; + include(SERVER_ROOT.'/sections/upload/upload.php'); + die(); } //******************************************************************************// @@ -529,100 +529,100 @@ // Trickery if (!preg_match('/^'.IMAGE_REGEX.'$/i', $Properties['Image'])) { - $Properties['Image'] = ''; - $T['Image'] = "''"; + $Properties['Image'] = ''; + $T['Image'] = "''"; } if ($Type == 'Music') { - // Does it belong in a group? - if ($Properties['GroupID']) { - $DB->query(" - SELECT - ID, - WikiImage, - WikiBody, - RevisionID, - Name, - Year, - ReleaseType, - TagList - FROM torrents_group - WHERE id = ".$Properties['GroupID']); - if ($DB->has_results()) { - // Don't escape tg.Name. It's written directly to the log table - list($GroupID, $WikiImage, $WikiBody, $RevisionID, $Properties['Title'], $Properties['Year'], $Properties['ReleaseType'], $Properties['TagList']) = $DB->next_record(MYSQLI_NUM, array(4)); - $Properties['TagList'] = str_replace(array(' ', '.', '_'), array(', ', '.', '.'), $Properties['TagList']); - if (!$Properties['Image'] && $WikiImage) { - $Properties['Image'] = $WikiImage; - $T['Image'] = "'".db_string($WikiImage)."'"; - } - if (strlen($WikiBody) > strlen($Body)) { - $Body = $WikiBody; - if (!$Properties['Image'] || $Properties['Image'] == $WikiImage) { - $NoRevision = true; - } - } - $Properties['Artist'] = Artists::display_artists(Artists::get_artist($GroupID), false, false); - } - } - if (!$GroupID) { - foreach ($ArtistForm as $Importance => $Artists) { - foreach ($Artists as $Num => $Artist) { - $DB->query(" - SELECT - tg.id, - tg.WikiImage, - tg.WikiBody, - tg.RevisionID - FROM torrents_group AS tg - LEFT JOIN torrents_artists AS ta ON ta.GroupID = tg.ID - LEFT JOIN artists_group AS ag ON ta.ArtistID = ag.ArtistID - WHERE ag.Name = '".db_string($Artist['name'])."' - AND tg.Name = ".$T['Title']." - AND tg.ReleaseType = ".$T['ReleaseType']." - AND tg.Year = ".$T['Year']); - - if ($DB->has_results()) { - list($GroupID, $WikiImage, $WikiBody, $RevisionID) = $DB->next_record(); - if (!$Properties['Image'] && $WikiImage) { - $Properties['Image'] = $WikiImage; - $T['Image'] = "'".db_string($WikiImage)."'"; - } - if (strlen($WikiBody) > strlen($Body)) { - $Body = $WikiBody; - if (!$Properties['Image'] || $Properties['Image'] == $WikiImage) { - $NoRevision = true; - } - } - $ArtistForm = Artists::get_artist($GroupID); - //This torrent belongs in a group - break; - - } else { - // The album hasn't been uploaded. Try to get the artist IDs - $DB->query(" - SELECT - ArtistID, - AliasID, - Name, - Redirect - FROM artists_alias - WHERE Name = '".db_string($Artist['name'])."'"); - if ($DB->has_results()) { - while (list($ArtistID, $AliasID, $AliasName, $Redirect) = $DB->next_record(MYSQLI_NUM, false)) { - if (!strcasecmp($Artist['name'], $AliasName)) { - if ($Redirect) { - $AliasID = $Redirect; - } - $ArtistForm[$Importance][$Num] = array('id' => $ArtistID, 'aliasid' => $AliasID, 'name' => $AliasName); - break; - } - } - } - } - } - } - } + // Does it belong in a group? + if ($Properties['GroupID']) { + $DB->query(" + SELECT + ID, + WikiImage, + WikiBody, + RevisionID, + Name, + Year, + ReleaseType, + TagList + FROM torrents_group + WHERE id = ".$Properties['GroupID']); + if ($DB->has_results()) { + // Don't escape tg.Name. It's written directly to the log table + list($GroupID, $WikiImage, $WikiBody, $RevisionID, $Properties['Title'], $Properties['Year'], $Properties['ReleaseType'], $Properties['TagList']) = $DB->next_record(MYSQLI_NUM, array(4)); + $Properties['TagList'] = str_replace(array(' ', '.', '_'), array(', ', '.', '.'), $Properties['TagList']); + if (!$Properties['Image'] && $WikiImage) { + $Properties['Image'] = $WikiImage; + $T['Image'] = "'".db_string($WikiImage)."'"; + } + if (strlen($WikiBody) > strlen($Body)) { + $Body = $WikiBody; + if (!$Properties['Image'] || $Properties['Image'] == $WikiImage) { + $NoRevision = true; + } + } + $Properties['Artist'] = Artists::display_artists(Artists::get_artist($GroupID), false, false); + } + } + if (!$GroupID) { + foreach ($ArtistForm as $Importance => $Artists) { + foreach ($Artists as $Num => $Artist) { + $DB->query(" + SELECT + tg.id, + tg.WikiImage, + tg.WikiBody, + tg.RevisionID + FROM torrents_group AS tg + LEFT JOIN torrents_artists AS ta ON ta.GroupID = tg.ID + LEFT JOIN artists_group AS ag ON ta.ArtistID = ag.ArtistID + WHERE ag.Name = '".db_string($Artist['name'])."' + AND tg.Name = ".$T['Title']." + AND tg.ReleaseType = ".$T['ReleaseType']." + AND tg.Year = ".$T['Year']); + + if ($DB->has_results()) { + list($GroupID, $WikiImage, $WikiBody, $RevisionID) = $DB->next_record(); + if (!$Properties['Image'] && $WikiImage) { + $Properties['Image'] = $WikiImage; + $T['Image'] = "'".db_string($WikiImage)."'"; + } + if (strlen($WikiBody) > strlen($Body)) { + $Body = $WikiBody; + if (!$Properties['Image'] || $Properties['Image'] == $WikiImage) { + $NoRevision = true; + } + } + $ArtistForm = Artists::get_artist($GroupID); + //This torrent belongs in a group + break; + + } else { + // The album hasn't been uploaded. Try to get the artist IDs + $DB->query(" + SELECT + ArtistID, + AliasID, + Name, + Redirect + FROM artists_alias + WHERE Name = '".db_string($Artist['name'])."'"); + if ($DB->has_results()) { + while (list($ArtistID, $AliasID, $AliasName, $Redirect) = $DB->next_record(MYSQLI_NUM, false)) { + if (!strcasecmp($Artist['name'], $AliasName)) { + if ($Redirect) { + $AliasID = $Redirect; + } + $ArtistForm[$Importance][$Num] = array('id' => $ArtistID, 'aliasid' => $AliasID, 'name' => $AliasName); + break; + } + } + } + } + } + } + } } //Needs to be here as it isn't set for add format until now @@ -633,116 +633,116 @@ //----- Start inserts if (!$GroupID && $Type == 'Music') { - //array to store which artists we have added already, to prevent adding an artist twice - $ArtistsAdded = array(); - foreach ($ArtistForm as $Importance => $Artists) { - foreach ($Artists as $Num => $Artist) { - if (!$Artist['id']) { - if (isset($ArtistsAdded[strtolower($Artist['name'])])) { - $ArtistForm[$Importance][$Num] = $ArtistsAdded[strtolower($Artist['name'])]; - } else { - // Create artist - $DB->query(" - INSERT INTO artists_group (Name) - VALUES ('".db_string($Artist['name'])."')"); - $ArtistID = $DB->inserted_id(); - - $Cache->increment('stats_artist_count'); - - $DB->query(" - INSERT INTO artists_alias (ArtistID, Name) - VALUES ($ArtistID, '".db_string($Artist['name'])."')"); - $AliasID = $DB->inserted_id(); - - $ArtistForm[$Importance][$Num] = array('id' => $ArtistID, 'aliasid' => $AliasID, 'name' => $Artist['name']); - $ArtistsAdded[strtolower($Artist['name'])] = $ArtistForm[$Importance][$Num]; - } - } - } - } - unset($ArtistsAdded); + //array to store which artists we have added already, to prevent adding an artist twice + $ArtistsAdded = []; + foreach ($ArtistForm as $Importance => $Artists) { + foreach ($Artists as $Num => $Artist) { + if (!$Artist['id']) { + if (isset($ArtistsAdded[strtolower($Artist['name'])])) { + $ArtistForm[$Importance][$Num] = $ArtistsAdded[strtolower($Artist['name'])]; + } else { + // Create artist + $DB->query(" + INSERT INTO artists_group (Name) + VALUES ('".db_string($Artist['name'])."')"); + $ArtistID = $DB->inserted_id(); + + $Cache->increment('stats_artist_count'); + + $DB->query(" + INSERT INTO artists_alias (ArtistID, Name) + VALUES ($ArtistID, '".db_string($Artist['name'])."')"); + $AliasID = $DB->inserted_id(); + + $ArtistForm[$Importance][$Num] = array('id' => $ArtistID, 'aliasid' => $AliasID, 'name' => $Artist['name']); + $ArtistsAdded[strtolower($Artist['name'])] = $ArtistForm[$Importance][$Num]; + } + } + } + } + unset($ArtistsAdded); } if (!$GroupID) { - // Create torrent group - $DB->query(" - INSERT INTO torrents_group - (ArtistID, CategoryID, Name, Year, RecordLabel, CatalogueNumber, Time, WikiBody, WikiImage, ReleaseType, VanityHouse) - VALUES - (0, $TypeID, ".$T['Title'].", $T[Year], $T[RecordLabel], $T[CatalogueNumber], '".sqltime()."', '".db_string($Body)."', $T[Image], $T[ReleaseType], $T[VanityHouse])"); - $GroupID = $DB->inserted_id(); - if ($Type == 'Music') { - foreach ($ArtistForm as $Importance => $Artists) { - foreach ($Artists as $Num => $Artist) { - $DB->query(" - INSERT IGNORE INTO torrents_artists (GroupID, ArtistID, AliasID, UserID, Importance) - VALUES ($GroupID, ".$Artist['id'].', '.$Artist['aliasid'].', '.$LoggedUser['ID'].", '$Importance')"); - $Cache->increment('stats_album_count'); - } - } - } - $Cache->increment('stats_group_count'); + // Create torrent group + $DB->query(" + INSERT INTO torrents_group + (ArtistID, CategoryID, Name, Year, RecordLabel, CatalogueNumber, Time, WikiBody, WikiImage, ReleaseType, VanityHouse) + VALUES + (0, $TypeID, ".$T['Title'].", $T[Year], $T[RecordLabel], $T[CatalogueNumber], '".sqltime()."', '".db_string($Body)."', $T[Image], $T[ReleaseType], $T[VanityHouse])"); + $GroupID = $DB->inserted_id(); + if ($Type == 'Music') { + foreach ($ArtistForm as $Importance => $Artists) { + foreach ($Artists as $Num => $Artist) { + $DB->query(" + INSERT IGNORE INTO torrents_artists (GroupID, ArtistID, AliasID, UserID, Importance) + VALUES ($GroupID, ".$Artist['id'].', '.$Artist['aliasid'].', '.$LoggedUser['ID'].", '$Importance')"); + $Cache->increment('stats_album_count'); + } + } + } + $Cache->increment('stats_group_count'); } else { - $DB->query(" - UPDATE torrents_group - SET Time = '".sqltime()."' - WHERE ID = $GroupID"); - $Cache->delete_value("torrent_group_$GroupID"); - $Cache->delete_value("torrents_details_$GroupID"); - $Cache->delete_value("detail_files_$GroupID"); - if ($Type == 'Music') { - $DB->query(" - SELECT ReleaseType - FROM torrents_group - WHERE ID = '$GroupID'"); - list($Properties['ReleaseType']) = $DB->next_record(); - } + $DB->query(" + UPDATE torrents_group + SET Time = '".sqltime()."' + WHERE ID = $GroupID"); + $Cache->delete_value("torrent_group_$GroupID"); + $Cache->delete_value("torrents_details_$GroupID"); + $Cache->delete_value("detail_files_$GroupID"); + if ($Type == 'Music') { + $DB->query(" + SELECT ReleaseType + FROM torrents_group + WHERE ID = '$GroupID'"); + list($Properties['ReleaseType']) = $DB->next_record(); + } } // Description if (!$NoRevision) { - $DB->query(" - INSERT INTO wiki_torrents - (PageID, Body, UserID, Summary, Time, Image) - VALUES - ($GroupID, $T[GroupDescription], $LoggedUser[ID], 'Uploaded new torrent', '".sqltime()."', $T[Image])"); - $RevisionID = $DB->inserted_id(); - - // Revision ID - $DB->query(" - UPDATE torrents_group - SET RevisionID = '$RevisionID' - WHERE ID = $GroupID"); + $DB->query(" + INSERT INTO wiki_torrents + (PageID, Body, UserID, Summary, Time, Image) + VALUES + ($GroupID, $T[GroupDescription], $LoggedUser[ID], 'Uploaded new torrent', '".sqltime()."', $T[Image])"); + $RevisionID = $DB->inserted_id(); + + // Revision ID + $DB->query(" + UPDATE torrents_group + SET RevisionID = '$RevisionID' + WHERE ID = $GroupID"); } // Tags $Tags = explode(',', $Properties['TagList']); if (!$Properties['GroupID']) { - foreach ($Tags as $Tag) { - $Tag = Misc::sanitize_tag($Tag); - if (!empty($Tag)) { - $Tag = Misc::get_alias_tag($Tag); - $DB->query(" - INSERT INTO tags - (Name, UserID) - VALUES - ('$Tag', $LoggedUser[ID]) - ON DUPLICATE KEY UPDATE - Uses = Uses + 1; - "); - $TagID = $DB->inserted_id(); - - $DB->query(" - INSERT INTO torrents_tags - (TagID, GroupID, UserID, PositiveVotes) - VALUES - ($TagID, $GroupID, $LoggedUser[ID], 10) - ON DUPLICATE KEY UPDATE - PositiveVotes = PositiveVotes + 1; - "); - } - } + foreach ($Tags as $Tag) { + $Tag = Misc::sanitize_tag($Tag); + if (!empty($Tag)) { + $Tag = Misc::get_alias_tag($Tag); + $DB->query(" + INSERT INTO tags + (Name, UserID) + VALUES + ('$Tag', $LoggedUser[ID]) + ON DUPLICATE KEY UPDATE + Uses = Uses + 1; + "); + $TagID = $DB->inserted_id(); + + $DB->query(" + INSERT INTO torrents_tags + (TagID, GroupID, UserID, PositiveVotes) + VALUES + ($TagID, $GroupID, $LoggedUser[ID], 10) + ON DUPLICATE KEY UPDATE + PositiveVotes = PositiveVotes + 1; + "); + } + } } //******************************************************************************// @@ -750,27 +750,27 @@ $LogScore = 100; $LogChecksum = 1; $LogInDB = 0; -$LogScores = array(); +$LogScores = []; $Logchecker = new Logchecker(); if ($HasLog) { - ini_set('upload_max_filesize', 1000000); - foreach ($_FILES['logfiles']['name'] as $Pos => $File) { - if (!$_FILES['logfiles']['size'][$Pos]) { - continue; - } - - $LogPath = $_FILES['logfiles']['tmp_name'][$Pos]; - $FileName = $_FILES['logfiles']['name'][$Pos]; - - $Logchecker->new_file($LogPath); - list($Score, $Details, $Checksum, $Text) = $Logchecker->parse(); - - $LogScore = min($Score, $LogScore); - $LogChecksum = min(intval($Checksum), $LogChecksum); - $Details = implode("\r\n", $Details); - $LogScores[$Pos] = array($Score, $Details, $Checksum, $Text, $FileName); - $LogInDB = 1; - } + ini_set('upload_max_filesize', 1000000); + foreach ($_FILES['logfiles']['name'] as $Pos => $File) { + if (!$_FILES['logfiles']['size'][$Pos]) { + continue; + } + + $LogPath = $_FILES['logfiles']['tmp_name'][$Pos]; + $FileName = $_FILES['logfiles']['name'][$Pos]; + + $Logchecker->new_file($LogPath); + list($Score, $Details, $Checksum, $Text) = $Logchecker->parse(); + + $LogScore = min($Score, $LogScore); + $LogChecksum = min(intval($Checksum), $LogChecksum); + $Details = implode("\r\n", $Details); + $LogScores[$Pos] = array($Score, $Details, $Checksum, $Text, $FileName); + $LogInDB = 1; + } } // Use this section to control freeleeches @@ -778,20 +778,24 @@ $T['FreeLeechType'] = 0; // Torrent $DB->query(" - INSERT INTO torrents - (GroupID, UserID, Media, Format, Encoding, - Remastered, RemasterYear, RemasterTitle, RemasterRecordLabel, RemasterCatalogueNumber, - Scene, HasLog, HasCue, HasLogDB, LogScore, LogChecksum, info_hash, FileCount, FileList, - FilePath, Size, Time, Description, FreeTorrent, FreeLeechType) - VALUES - ($GroupID, $LoggedUser[ID], $T[Media], $T[Format], $T[Encoding], - $T[Remastered], $T[RemasterYear], $T[RemasterTitle], $T[RemasterRecordLabel], $T[RemasterCatalogueNumber], - $T[Scene], '$HasLog', '$HasCue', '$LogInDB', '$LogScore', '$LogChecksum','".db_string($InfoHash)."', $NumFiles, '$FileString', - '$FilePath', $TotalSize, '".sqltime()."', $T[TorrentDescription], '$T[FreeLeech]', '$T[FreeLeechType]')"); + INSERT INTO torrents + (GroupID, UserID, Media, Format, Encoding, + Remastered, RemasterYear, RemasterTitle, RemasterRecordLabel, RemasterCatalogueNumber, + Scene, HasLog, HasCue, HasLogDB, LogScore, LogChecksum, info_hash, FileCount, FileList, + FilePath, Size, Time, Description, FreeTorrent, FreeLeechType) + VALUES + ($GroupID, $LoggedUser[ID], $T[Media], $T[Format], $T[Encoding], + $T[Remastered], $T[RemasterYear], $T[RemasterTitle], $T[RemasterRecordLabel], $T[RemasterCatalogueNumber], + $T[Scene], '$HasLog', '$HasCue', '$LogInDB', '$LogScore', '$LogChecksum','".db_string($InfoHash)."', $NumFiles, '$FileString', + '$FilePath', $TotalSize, '".sqltime()."', $T[TorrentDescription], '$T[FreeLeech]', '$T[FreeLeechType]')"); $Cache->increment('stats_torrent_count'); $TorrentID = $DB->inserted_id(); +$DB->prepared_query(" + INSERT INTO torrents_leech_stats (TorrentID) + VALUES (?)", $TorrentID); + Tracker::update_tracker('add_torrent', array('id' => $TorrentID, 'info_hash' => rawurlencode($InfoHash), 'freetorrent' => $T['FreeLeech'])); $Debug->set_flag('upload: ocelot updated'); @@ -803,20 +807,20 @@ //--------------- Write Log DB -------------------------------------------// foreach ($LogScores as $Pos => $Log) { - list($Score, $Details, $Checksum, $Text, $FileName) = $Log; - $DB->query("INSERT INTO torrents_logs (`TorrentID`, `Log`, `Details`, `Score`, `Checksum`, `FileName`) VALUES ($TorrentID, '".db_string($Text)."', '".db_string($Details)."', $Score, '".enum_boolean($Checksum)."', '".db_string($FileName)."')"); //set log scores - $LogID = $DB->inserted_id(); - if (move_uploaded_file($_FILES['logfiles']['tmp_name'][$Pos], SERVER_ROOT . "/logs/{$TorrentID}_{$LogID}.log") === false) { - die("Could not copy logfile to the server."); - } + list($Score, $Details, $Checksum, $Text, $FileName) = $Log; + $DB->query("INSERT INTO torrents_logs (`TorrentID`, `Log`, `Details`, `Score`, `Checksum`, `FileName`) VALUES ($TorrentID, '".db_string($Text)."', '".db_string($Details)."', $Score, '".enum_boolean($Checksum)."', '".db_string($FileName)."')"); //set log scores + $LogID = $DB->inserted_id(); + if (move_uploaded_file($_FILES['logfiles']['tmp_name'][$Pos], SERVER_ROOT . "/logs/{$TorrentID}_{$LogID}.log") === false) { + die("Could not copy logfile to the server."); + } } //******************************************************************************// //--------------- Write torrent file -------------------------------------------// $DB->query(" - INSERT INTO torrents_files (TorrentID, File) - VALUES ($TorrentID, '$TorEnc')"); + INSERT INTO torrents_files (TorrentID, File) + VALUES ($TorrentID, '$TorEnc')"); Misc::write_log("Torrent $TorrentID ($LogName) (".number_format($TotalSize / (1024 * 1024), 2).' MB) was uploaded by ' . $LoggedUser['Username']); Torrents::write_group_log($GroupID, $TorrentID, $LoggedUser['ID'], 'uploaded ('.number_format($TotalSize / (1024 * 1024), 2).' MB)', 0); @@ -833,29 +837,29 @@ $Announce = ''; if ($Type == 'Music') { - $Announce .= Artists::display_artists($ArtistForm, false); + $Announce .= Artists::display_artists($ArtistForm, false); } $Announce .= trim($Properties['Title']).' '; $Details = ""; if ($Type == 'Music') { - $Announce .= '['.trim($Properties['Year']).']'; - if (($Type == 'Music') && ($Properties['ReleaseType'] > 0)) { - $Announce .= ' ['.$ReleaseTypes[$Properties['ReleaseType']].']'; - } - $Details .= trim($Properties['Format']).' / '.trim($Properties['Bitrate']); - if ($HasLog == 1) { + $Announce .= '['.trim($Properties['Year']).']'; + if (($Type == 'Music') && ($Properties['ReleaseType'] > 0)) { + $Announce .= ' ['.$ReleaseTypes[$Properties['ReleaseType']].']'; + } + $Details .= trim($Properties['Format']).' / '.trim($Properties['Bitrate']); + if ($HasLog == 1) { $Details .= ' / Log'.($LogInDB ? " ({$LogScore}%)" : ""); - } - if ($HasCue == 1) { + } + if ($HasCue == 1) { $Details .= ' / Cue'; - } - $Details .= ' / '.trim($Properties['Media']); - if ($Properties['Scene'] == '1') { + } + $Details .= ' / '.trim($Properties['Media']); + if ($Properties['Scene'] == '1') { $Details .= ' / Scene'; - } - if ($T['FreeLeech'] == '1') { + } + if ($T['FreeLeech'] == '1') { $Details .= ' / Freeleech!'; - } + } } $Title = $Announce; @@ -880,115 +884,119 @@ //--------------- Upload Extra torrents ----------------------------------------// foreach ($ExtraTorrentsInsert as $ExtraTorrent) { - $BonusPoints += $Bonus->getTorrentValue($ExtraTorrent['Format'], $Properties['Media'], $ExtraTorrent['Encoding']); - - $ExtraHasLog = 0; - $ExtraHasCue = 0; - $LogScore = 0; - // Torrent - $DB->query(" - INSERT INTO torrents - (GroupID, UserID, Media, Format, Encoding, - Remastered, RemasterYear, RemasterTitle, RemasterRecordLabel, RemasterCatalogueNumber, - HasLog, HasCue, info_hash, FileCount, FileList, FilePath, Size, Time, - Description, LogScore, FreeTorrent, FreeLeechType) - VALUES - ($GroupID, $LoggedUser[ID], $T[Media], '$ExtraTorrent[Format]', '$ExtraTorrent[Encoding]', - $T[Remastered], $T[RemasterYear], $T[RemasterTitle], $T[RemasterRecordLabel], $T[RemasterCatalogueNumber], - $ExtraHasLog, $ExtraHasCue, '".db_string($ExtraTorrent['InfoHash'])."', $ExtraTorrent[NumFiles], - '$ExtraTorrent[FileString]', '$ExtraTorrent[FilePath]', $ExtraTorrent[TotalSize], '".sqltime()."', - '$ExtraTorrent[TorrentDescription]', $LogScore, '$T[FreeLeech]', '$T[FreeLeechType]')"); - - $Cache->increment('stats_torrent_count'); - $ExtraTorrentID = $DB->inserted_id(); - - Tracker::update_tracker('add_torrent', array('id' => $ExtraTorrentID, 'info_hash' => rawurlencode($ExtraTorrent['InfoHash']), 'freetorrent' => $T['FreeLeech'])); - - //******************************************************************************// - //--------------- Write torrent file -------------------------------------------// - - $DB->query(" - INSERT INTO torrents_files - (TorrentID, File) - VALUES - ($ExtraTorrentID, '$ExtraTorrent[TorEnc]')"); - - Misc::write_log("Torrent $ExtraTorrentID ($LogName) (" . number_format($ExtraTorrent['TotalSize'] / (1024 * 1024), 2) . ' MB) was uploaded by ' . $LoggedUser['Username']); - Torrents::write_group_log($GroupID, $ExtraTorrentID, $LoggedUser['ID'], 'uploaded (' . number_format($ExtraTorrent['TotalSize'] / (1024 * 1024), 2) . ' MB)', 0); - - Torrents::update_hash($GroupID); - - // IRC - $Announce = ''; - $Announce .= Artists::display_artists($ArtistForm, false); - $Announce .= trim($Properties['Title']) . ' '; - $Announce .= '[' . trim($Properties['Year']) . ']'; - if (($Properties['ReleaseType'] > 0)) { - $Announce .= ' [' . $ReleaseTypes[$Properties['ReleaseType']] . ']'; - } - $Announce .= ' - '; - $Announce .= trim(str_replace("'", '', $ExtraTorrent['Format'])) . ' / ' . trim(str_replace("'", '', $ExtraTorrent['Encoding'])); - $Announce .= ' / ' . trim($Properties['Media']); - if ($T['FreeLeech'] == '1') { - $Announce .= ' / Freeleech!'; - } - - $AnnounceSSL = $Announce . ' - ' . site_url() . "torrents.php?id=$GroupID / " . site_url() . "torrents.php?action=download&id=$ExtraTorrentID"; - $Announce .= ' - ' . site_url() . "torrents.php?id=$GroupID / " . site_url() . "torrents.php?action=download&id=$ExtraTorrentID"; - - $AnnounceSSL .= ' - ' . trim($Properties['TagList']); - $Announce .= ' - ' . trim($Properties['TagList']); - - // ENT_QUOTES is needed to decode single quotes/apostrophes - //send_irc('PRIVMSG #' . NONSSL_SITE_URL . '-announce :' . html_entity_decode($Announce, ENT_QUOTES)); - //send_irc('PRIVMSG #' . SSL_SITE_URL . '-announce-ssl :' . html_entity_decode($AnnounceSSL, ENT_QUOTES)); + $BonusPoints += $Bonus->getTorrentValue($ExtraTorrent['Format'], $Properties['Media'], $ExtraTorrent['Encoding']); + + $ExtraHasLog = 0; + $ExtraHasCue = 0; + $LogScore = 0; + // Torrent + $DB->query(" + INSERT INTO torrents + (GroupID, UserID, Media, Format, Encoding, + Remastered, RemasterYear, RemasterTitle, RemasterRecordLabel, RemasterCatalogueNumber, + HasLog, HasCue, info_hash, FileCount, FileList, FilePath, Size, Time, + Description, LogScore, FreeTorrent, FreeLeechType) + VALUES + ($GroupID, $LoggedUser[ID], $T[Media], '$ExtraTorrent[Format]', '$ExtraTorrent[Encoding]', + $T[Remastered], $T[RemasterYear], $T[RemasterTitle], $T[RemasterRecordLabel], $T[RemasterCatalogueNumber], + $ExtraHasLog, $ExtraHasCue, '".db_string($ExtraTorrent['InfoHash'])."', $ExtraTorrent[NumFiles], + '$ExtraTorrent[FileString]', '$ExtraTorrent[FilePath]', $ExtraTorrent[TotalSize], '".sqltime()."', + '$ExtraTorrent[TorrentDescription]', $LogScore, '$T[FreeLeech]', '$T[FreeLeechType]')"); + + $Cache->increment('stats_torrent_count'); + $ExtraTorrentID = $DB->inserted_id(); + + $DB->prepared_query(" + INSERT INTO torrents_leech_stats (TorrentID) + VALUES (?)", $ExtraTorrentID); + + Tracker::update_tracker('add_torrent', array('id' => $ExtraTorrentID, 'info_hash' => rawurlencode($ExtraTorrent['InfoHash']), 'freetorrent' => $T['FreeLeech'])); + + //******************************************************************************// + //--------------- Write torrent file -------------------------------------------// + + $DB->query(" + INSERT INTO torrents_files + (TorrentID, File) + VALUES + ($ExtraTorrentID, '$ExtraTorrent[TorEnc]')"); + + Misc::write_log("Torrent $ExtraTorrentID ($LogName) (" . number_format($ExtraTorrent['TotalSize'] / (1024 * 1024), 2) . ' MB) was uploaded by ' . $LoggedUser['Username']); + Torrents::write_group_log($GroupID, $ExtraTorrentID, $LoggedUser['ID'], 'uploaded (' . number_format($ExtraTorrent['TotalSize'] / (1024 * 1024), 2) . ' MB)', 0); + + Torrents::update_hash($GroupID); + + // IRC + $Announce = ''; + $Announce .= Artists::display_artists($ArtistForm, false); + $Announce .= trim($Properties['Title']) . ' '; + $Announce .= '[' . trim($Properties['Year']) . ']'; + if (($Properties['ReleaseType'] > 0)) { + $Announce .= ' [' . $ReleaseTypes[$Properties['ReleaseType']] . ']'; + } + $Announce .= ' - '; + $Announce .= trim(str_replace("'", '', $ExtraTorrent['Format'])) . ' / ' . trim(str_replace("'", '', $ExtraTorrent['Encoding'])); + $Announce .= ' / ' . trim($Properties['Media']); + if ($T['FreeLeech'] == '1') { + $Announce .= ' / Freeleech!'; + } + + $AnnounceSSL = $Announce . ' - ' . site_url() . "torrents.php?id=$GroupID / " . site_url() . "torrents.php?action=download&id=$ExtraTorrentID"; + $Announce .= ' - ' . site_url() . "torrents.php?id=$GroupID / " . site_url() . "torrents.php?action=download&id=$ExtraTorrentID"; + + $AnnounceSSL .= ' - ' . trim($Properties['TagList']); + $Announce .= ' - ' . trim($Properties['TagList']); + + // ENT_QUOTES is needed to decode single quotes/apostrophes + //send_irc('PRIVMSG #' . NONSSL_SITE_URL . '-announce :' . html_entity_decode($Announce, ENT_QUOTES)); + //send_irc('PRIVMSG #' . SSL_SITE_URL . '-announce-ssl :' . html_entity_decode($AnnounceSSL, ENT_QUOTES)); } //******************************************************************************// //--------------- Give Bonus Points -------------------------------------------// if (G::$LoggedUser['DisablePoints'] == 0) { - $DB->prepared_query('UPDATE users_main SET BonusPoints = BonusPoints + ? WHERE ID = ?', - $BonusPoints, $LoggedUser['ID'] - ); - $Cache->delete_value('user_stats_'.$LoggedUser['ID']); + $DB->prepared_query('UPDATE users_main SET BonusPoints = BonusPoints + ? WHERE ID = ?', + $BonusPoints, $LoggedUser['ID'] + ); + $Cache->delete_value('user_stats_'.$LoggedUser['ID']); } //******************************************************************************// //--------------- Stupid Recent Uploads ----------------------------------------// if (trim($Properties['Image']) != '') { - $RecentUploads = $Cache->get_value("recent_uploads_$UserID"); - if (is_array($RecentUploads)) { - do { - foreach ($RecentUploads as $Item) { - if ($Item['ID'] == $GroupID) { - break 2; - } - } - - // Only reached if no matching GroupIDs in the cache already. - if (count($RecentUploads) === 5) { - array_pop($RecentUploads); - } - array_unshift($RecentUploads, array( - 'ID' => $GroupID, - 'Name' => trim($Properties['Title']), - 'Artist' => Artists::display_artists($ArtistForm, false, true), - 'WikiImage' => trim($Properties['Image']))); - $Cache->cache_value("recent_uploads_$UserID", $RecentUploads, 0); - } while (0); - } + $RecentUploads = $Cache->get_value("recent_uploads_$UserID"); + if (is_array($RecentUploads)) { + do { + foreach ($RecentUploads as $Item) { + if ($Item['ID'] == $GroupID) { + break 2; + } + } + + // Only reached if no matching GroupIDs in the cache already. + if (count($RecentUploads) === 5) { + array_pop($RecentUploads); + } + array_unshift($RecentUploads, array( + 'ID' => $GroupID, + 'Name' => trim($Properties['Title']), + 'Artist' => Artists::display_artists($ArtistForm, false, true), + 'WikiImage' => trim($Properties['Image']))); + $Cache->cache_value("recent_uploads_$UserID", $RecentUploads, 0); + } while (0); + } } //******************************************************************************// //--------------- Contest ------------------------------------------------------// if ($Properties['LibraryImage'] != '') { - $DB->query(" - INSERT INTO reportsv2 - (ReporterID, TorrentID, Type, UserComment, Status, ReportedTime, Track, Image, ExtraID, Link) - VALUES - (0, $TorrentID, 'library', '".db_string(($Properties['MultiDisc'] ? 'Multi-disc' : ''))."', 'New', '".sqltime()."', '', '".db_string($Properties['LibraryImage'])."', '', '')"); + $DB->query(" + INSERT INTO reportsv2 + (ReporterID, TorrentID, Type, UserComment, Status, ReportedTime, Track, Image, ExtraID, Link) + VALUES + (0, $TorrentID, 'library', '".db_string(($Properties['MultiDisc'] ? 'Multi-disc' : ''))."', 'New', '".sqltime()."', '', '".db_string($Properties['LibraryImage'])."', '', '')"); } //******************************************************************************// @@ -999,65 +1007,65 @@ */ if ($PublicTorrent || $UnsourcedTorrent) { - View::show_header('Warning'); + View::show_header('Warning'); ?> -
Warning
-Your torrent has been uploaded; however, you must download your torrent from here because:
--
-Warning
+
- You didn't make your torrent using the "private" option -You didn't make your torrent using the "private" option + -
- The "source" flag was not set to APL -The "source" flag was not set to OPS + -
Your torrent has been uploaded; however, you must download your torrent from here because:
+-
+
-
-
Please note that if you lose your 2FA key and all of your backup keys, the staff cannot help you - retrieve your account. Ensure you keep your backup keys in a safe place.
+Please note that if you lose your 2FA key and all of your backup keys, the staff cannot help you + retrieve your account. Ensure you keep your backup keys in a safe place.
-
-
+
diff --git a/sections/user/2fa/password_confirm.php b/sections/user/2fa/password_confirm.php
index 03517d0e3..95a2975ad 100644
--- a/sections/user/2fa/password_confirm.php
+++ b/sections/user/2fa/password_confirm.php
@@ -1,44 +1,44 @@
-
Two-factor authentication has now been enabled on your account. Please note down the following recovery keys, they are the only way you will be able to recover your account if you lose your hardware device.
+Two-factor authentication has now been enabled on your account. Please note down the following recovery keys, they are the only way you will be able to recover your account if you lose your hardware device.
--
-
-
-
-
-
+
+
+
+
-
Please note that if you lose your 2FA key and all of your backup keys, the staff cannot help you - retrieve your account. Ensure you keep your backup keys in a safe place.
+Please note that if you lose your 2FA key and all of your backup keys, the staff cannot help you + retrieve your account. Ensure you keep your backup keys in a safe place.
-
Please note that if you lose your 2FA key and all of your backup keys, the staff cannot help you retrieve your account. Ensure you keep your backup keys in a safe place.
+Please note that if you lose your 2FA key and all of your backup keys, the staff cannot help you retrieve your account. Ensure you keep your backup keys in a safe place.
-We've generated a secure secret that only you and me should know. Please import it into your phone, either by - scanning the QR key, or copying in the small text below that. We recommend using the Authy app which you can get - from the App Store or Play Store. You can - use the Google - Authenticator app, however. Tap the next button once you've done that.
+We've generated a secure secret that only you and me should know. Please import it into your phone, either by + scanning the QR key, or copying in the small text below that. We recommend using the Authy app which you can get + from the App Store or Play Store. You can + use the Google + Authenticator app, however. Tap the next button once you've done that.
-
-
+
diff --git a/sections/user/2fa/step2.php b/sections/user/2fa/step2.php
index 6388a60e4..da3dd2420 100644
--- a/sections/user/2fa/step2.php
+++ b/sections/user/2fa/step2.php
@@ -1,42 +1,42 @@
-
)->setText('otpauth://totp/' . SITE_NAME . '?secret=' . $_SESSION['private_key'])
- ->setSize(300)
- ->setPadding(10)
- ->setLabel($_SESSION['private_key'])
- ->setErrorCorrection('high')
- ->setForegroundColor(['r' => 0, 'g' => 0, 'b' => 0, 'a' => 0])
- ->setBackgroundColor(['r' => 255, 'g' => 255, 'b' => 255, 'a' => 0])
- ->get('png')
- );
- ?>)
+ )->setText('otpauth://totp/' . SITE_NAME . '?secret=' . $_SESSION['private_key'])
+ ->setSize(300)
+ ->setPadding(10)
+ ->setLabel($_SESSION['private_key'])
+ ->setErrorCorrection('high')
+ ->setForegroundColor(['r' => 0, 'g' => 0, 'b' => 0, 'a' => 0])
+ ->setBackgroundColor(['r' => 255, 'g' => 255, 'b' => 255, 'a' => 0])
+ ->get('png')
+ );
+ ?>)
-
-
+
diff --git a/sections/user/advancedsearch.php b/sections/user/advancedsearch.php
index 8c3b31248..e21ce3cf0 100644
--- a/sections/user/advancedsearch.php
+++ b/sections/user/advancedsearch.php
@@ -5,23 +5,23 @@
}
if (!empty($_GET['search'])) {
- if (preg_match('/^'.IP_REGEX.'$/', $_GET['search'])) {
- $_GET['ip'] = $_GET['search'];
- } elseif (preg_match('/^'.EMAIL_REGEX.'$/i', $_GET['search'])) {
- $_GET['email'] = $_GET['search'];
- } elseif (preg_match(USERNAME_REGEX,$_GET['search'])) {
- $DB->query("
- SELECT ID
- FROM users_main
- WHERE Username = '".db_string($_GET['search'])."'");
- if (list($ID) = $DB->next_record()) {
- header("Location: user.php?id=$ID");
- die();
- }
- $_GET['username'] = $_GET['search'];
- } else {
- $_GET['comment'] = $_GET['search'];
- }
+ if (preg_match('/^'.IP_REGEX.'$/', $_GET['search'])) {
+ $_GET['ip'] = $_GET['search'];
+ } elseif (preg_match('/^'.EMAIL_REGEX.'$/i', $_GET['search'])) {
+ $_GET['email'] = $_GET['search'];
+ } elseif (preg_match(USERNAME_REGEX,$_GET['search'])) {
+ $DB->query("
+ SELECT ID
+ FROM users_main
+ WHERE Username = '".db_string($_GET['search'])."'");
+ if (list($ID) = $DB->next_record()) {
+ header("Location: user.php?id=$ID");
+ die();
+ }
+ $_GET['username'] = $_GET['search'];
+ } else {
+ $_GET['comment'] = $_GET['search'];
+ }
}
foreach (array('ip', 'email', 'username', 'comment') as $field) {
@@ -33,93 +33,93 @@
define('USERS_PER_PAGE', 30);
function wrap($String, $ForceMatch = '', $IPSearch = false) {
- if (!$ForceMatch) {
- global $Match;
- } else {
- $Match = $ForceMatch;
- }
- if ($Match == ' REGEXP ') {
- if (strpos($String, '\'') !== false || preg_match('/^.*\\\\$/i', $String)) {
- error('Regex contains illegal characters.');
- }
- } else {
- $String = db_string($String);
- }
- if ($Match == ' LIKE ') {
- // Fuzzy search
- // Stick in wildcards at beginning and end of string unless string starts or ends with |
- if (($String[0] != '|') && !$IPSearch) {
- $String = "%$String";
- } elseif ($String[0] == '|') {
- $String = substr($String, 1, strlen($String));
- }
-
- if (substr($String, -1, 1) != '|') {
- $String = "$String%";
- } else {
- $String = substr($String, 0, -1);
- }
- }
- $String = "'$String'";
- return $String;
+ if (!$ForceMatch) {
+ global $Match;
+ } else {
+ $Match = $ForceMatch;
+ }
+ if ($Match == ' REGEXP ') {
+ if (strpos($String, '\'') !== false || preg_match('/^.*\\\\$/i', $String)) {
+ error('Regex contains illegal characters.');
+ }
+ } else {
+ $String = db_string($String);
+ }
+ if ($Match == ' LIKE ') {
+ // Fuzzy search
+ // Stick in wildcards at beginning and end of string unless string starts or ends with |
+ if (($String[0] != '|') && !$IPSearch) {
+ $String = "%$String";
+ } elseif ($String[0] == '|') {
+ $String = substr($String, 1, strlen($String));
+ }
+
+ if (substr($String, -1, 1) != '|') {
+ $String = "$String%";
+ } else {
+ $String = substr($String, 0, -1);
+ }
+ }
+ $String = "'$String'";
+ return $String;
}
function date_compare($Field, $Operand, $Date1, $Date2 = '') {
- $Date1 = db_string($Date1);
- $Date2 = db_string($Date2);
- $Return = array();
-
- switch ($Operand) {
- case 'on':
- $Return [] = " $Field >= '$Date1 00:00:00' ";
- $Return [] = " $Field <= '$Date1 23:59:59' ";
- break;
- case 'before':
- $Return [] = " $Field < '$Date1 00:00:00' ";
- break;
- case 'after':
- $Return [] = " $Field > '$Date1 23:59:59' ";
- break;
- case 'between':
- $Return [] = " $Field >= '$Date1 00:00:00' ";
- $Return [] = " $Field <= '$Date2 00:00:00' ";
- break;
- }
-
- return $Return;
+ $Date1 = db_string($Date1);
+ $Date2 = db_string($Date2);
+ $Return = [];
+
+ switch ($Operand) {
+ case 'on':
+ $Return [] = " $Field >= '$Date1 00:00:00' ";
+ $Return [] = " $Field <= '$Date1 23:59:59' ";
+ break;
+ case 'before':
+ $Return [] = " $Field < '$Date1 00:00:00' ";
+ break;
+ case 'after':
+ $Return [] = " $Field > '$Date1 23:59:59' ";
+ break;
+ case 'between':
+ $Return [] = " $Field >= '$Date1 00:00:00' ";
+ $Return [] = " $Field <= '$Date2 00:00:00' ";
+ break;
+ }
+
+ return $Return;
}
function num_compare($Field, $Operand, $Num1, $Num2 = '') {
- if ($Num1 != 0) {
- $Num1 = db_string($Num1);
- }
- if ($Num2 != 0) {
- $Num2 = db_string($Num2);
- }
-
- $Return = array();
-
- switch ($Operand) {
- case 'equal':
- $Return [] = " $Field = '$Num1' ";
- break;
- case 'above':
- $Return [] = " $Field > '$Num1' ";
- break;
- case 'below':
- $Return [] = " $Field < '$Num1' ";
- break;
- case 'between':
- $Return [] = " $Field > '$Num1' ";
- $Return [] = " $Field < '$Num2' ";
- break;
- default:
- print_r($Return);
- die();
- }
- return $Return;
+ if ($Num1 != 0) {
+ $Num1 = db_string($Num1);
+ }
+ if ($Num2 != 0) {
+ $Num2 = db_string($Num2);
+ }
+
+ $Return = [];
+
+ switch ($Operand) {
+ case 'equal':
+ $Return [] = " $Field = '$Num1' ";
+ break;
+ case 'above':
+ $Return [] = " $Field > '$Num1' ";
+ break;
+ case 'below':
+ $Return [] = " $Field < '$Num1' ";
+ break;
+ case 'between':
+ $Return [] = " $Field > '$Num1' ";
+ $Return [] = " $Field < '$Num2' ";
+ break;
+ default:
+ print_r($Return);
+ die();
+ }
+ return $Return;
}
// Arrays, regexes, and all that fun stuff we can use for validation, form generation, etc
@@ -136,779 +136,787 @@ function num_compare($Field, $Operand, $Num1, $Num2 = '') {
$disabled_ip_checked = true;
if (count($_GET)) {
- if (!empty($_GET['email_history']) || !empty($_GET['disabled_id']) || !empty($_GET['ip_history'])) {
- if (empty($_GET['email_history'])) {
- $email_history_checked = false;
- }
- if (empty($_GET['disabled_ip'])) {
- $disabled_ip_checked = false;
- }
- if (empty($_GET['ip_history'])) {
- $ip_history_checked = false;
- }
- }
- $DateRegex = array('regex' => '/\d{4}-\d{2}-\d{2}/');
-
- $ClassIDs = array();
- $SecClassIDs = array();
- foreach ($Classes as $ClassID => $Value) {
- if ($Value['Secondary']) {
- $SecClassIDs[] = $ClassID;
- } else {
- $ClassIDs[] = $ClassID;
- }
- }
-
- $Val->SetFields('comment', '0', 'string', 'Comment is too long.', array('maxlength' => 512));
- $Val->SetFields('disabled_invites', '0', 'inarray', 'Invalid disabled_invites field', $YesNo);
-
-
- $Val->SetFields('joined', '0', 'inarray', 'Invalid joined field', $DateChoices);
- $Val->SetFields('join1', '0', 'regex', 'Invalid join1 field', $DateRegex);
- $Val->SetFields('join2', '0', 'regex', 'Invalid join2 field', $DateRegex);
-
- $Val->SetFields('lastactive', '0', 'inarray', 'Invalid lastactive field', $DateChoices);
- $Val->SetFields('lastactive1', '0', 'regex', 'Invalid lastactive1 field', $DateRegex);
- $Val->SetFields('lastactive2', '0', 'regex', 'Invalid lastactive2 field', $DateRegex);
-
- $Val->SetFields('ratio', '0', 'inarray', 'Invalid ratio field', $NumberChoices);
- $Val->SetFields('uploaded', '0', 'inarray', 'Invalid uploaded field', $NumberChoices);
- $Val->SetFields('downloaded', '0', 'inarray', 'Invalid downloaded field', $NumberChoices);
- //$Val->SetFields('snatched', '0', 'inarray', 'Invalid snatched field', $NumberChoices);
-
- $Val->SetFields('matchtype', '0', 'inarray', 'Invalid matchtype field', array('inarray' => array('strict', 'fuzzy', 'regex')));
-
- $Val->SetFields('lockedaccount', '0', 'inarray', 'Invalid locked account field', array('inarray' => array('any', 'locked', 'unlocked')));
-
- $Val->SetFields('enabled', '0', 'inarray', 'Invalid enabled field', array('inarray' => array('', 0, 1, 2)));
- $Val->SetFields('class', '0', 'inarray', 'Invalid class', array('inarray' => $ClassIDs));
- $Val->SetFields('secclass', '0', 'inarray', 'Invalid class', array('inarray' => $SecClassIDs));
- $Val->SetFields('donor', '0', 'inarray', 'Invalid donor field', $YesNo);
- $Val->SetFields('warned', '0', 'inarray', 'Invalid warned field', $YesNo);
- $Val->SetFields('disabled_uploads', '0', 'inarray', 'Invalid disabled_uploads field', $YesNo);
-
- $Val->SetFields('order', '0', 'inarray', 'Invalid ordering', $OrderVals);
- $Val->SetFields('way', '0', 'inarray', 'Invalid way', $WayVals);
-
- $Val->SetFields('passkey', '0', 'string', 'Invalid passkey', array('maxlength' => 32));
- $Val->SetFields('avatar', '0', 'string', 'Avatar URL too long', array('maxlength' => 512));
- $Val->SetFields('stylesheet', '0', 'inarray', 'Invalid stylesheet', array_unique(array_keys($Stylesheets)));
- $Val->SetFields('cc', '0', 'inarray', 'Invalid Country Code', array('maxlength' => 2));
-
- $Err = $Val->ValidateForm($_GET);
-
- if (!$Err) {
- // Passed validation. Let's rock.
- $RunQuery = false; // if we should run the search
-
- if (isset($_GET['matchtype']) && $_GET['matchtype'] == 'strict') {
- $Match = ' = ';
- } elseif (isset($_GET['matchtype']) && $_GET['matchtype'] == 'regex') {
- $Match = ' REGEXP ';
- } else {
- $Match = ' LIKE ';
- }
-
- $OrderTable = array(
- 'Username' => 'um1.Username',
- 'Joined' => 'ui1.JoinDate',
- 'Email' => 'um1.Email',
- 'IP' => 'um1.IP',
- 'Last Seen' => 'um1.LastAccess',
- 'Uploaded' => 'um1.Uploaded',
- 'Downloaded' => 'um1.Downloaded',
- 'Ratio' => '(um1.Uploaded / um1.Downloaded)',
- 'Invites' => 'um1.Invites',
- 'Snatches' => 'Snatches');
-
- $WayTable = array('Ascending'=>'ASC', 'Descending'=>'DESC');
-
- $Where = array();
- $Having = array();
- $Join = array();
- $Group = array();
- $Distinct = '';
- $Order = '';
-
-
- $SQL = '
- SQL_CALC_FOUND_ROWS
- um1.ID,
- um1.Username,
- um1.Uploaded,
- um1.Downloaded,';
- if ($_GET['snatched'] == 'off') {
- $SQL .= "'X' AS Snatches,";
- } else {
- $SQL .= "
- (
- SELECT COUNT(xs.uid)
- FROM xbt_snatched AS xs
- WHERE xs.uid = um1.ID
- ) AS Snatches,";
- }
- if ($_GET['invitees'] == 'off') {
- $SQL .= "'X' AS Invitees,";
- } else {
- $SQL .= "
- (
- SELECT COUNT(ui2.UserID)
- FROM users_info AS ui2
- WHERE um1.ID = ui2.Inviter
- ) AS Invitees,";
- }
- $SQL .= '
- um1.PermissionID,
- um1.Email,
- um1.Enabled,
- um1.IP,
- um1.Invites,
- ui1.DisableInvites,
- ui1.Warned,
- ui1.Donor,
- ui1.JoinDate,
- um1.LastAccess
- FROM users_main AS um1
- JOIN users_info AS ui1 ON ui1.UserID = um1.ID ';
-
-
- if (!empty($_GET['username'])) {
- $Where[] = 'um1.Username'.$Match.wrap($_GET['username']);
- }
-
- if (!empty($_GET['email'])) {
- if (isset($_GET['email_history'])) {
- $Distinct = 'DISTINCT ';
- $Join['he'] = ' JOIN users_history_emails AS he ON he.UserID = um1.ID ';
- $Where[] = ' he.Email '.$Match.wrap($_GET['email']);
- } else {
- $Where[] = 'um1.Email'.$Match.wrap($_GET['email']);
- }
- }
-
- if (!empty($_GET['email_cnt']) && is_number($_GET['email_cnt'])) {
- $Query = "
- SELECT UserID
- FROM users_history_emails
- GROUP BY UserID
- HAVING COUNT(DISTINCT Email) ";
- if ($_GET['emails_opt'] === 'equal') {
- $operator = '=';
- }
- if ($_GET['emails_opt'] === 'above') {
- $operator = '>';
- }
- if ($_GET['emails_opt'] === 'below') {
- $operator = '<';
- }
- $Query .= $operator.' '.$_GET['email_cnt'];
- $DB->query($Query);
- $Users = implode(',', $DB->collect('UserID'));
- if (!empty($Users)) {
- $Where[] = "um1.ID IN ($Users)";
- }
- }
-
-
- if (!empty($_GET['ip'])) {
- if (isset($_GET['ip_history'])) {
- $Distinct = 'DISTINCT ';
- $Join['hi'] = ' JOIN users_history_ips AS hi ON hi.UserID = um1.ID ';
- $Where[] = ' hi.IP '.$Match.wrap($_GET['ip'], '', true);
- } else {
- $Where[] = 'um1.IP'.$Match.wrap($_GET['ip'], '', true);
- }
- }
-
- if ($_GET['lockedaccount'] != '' && $_GET['lockedaccount'] != 'any') {
- $Join['la'] = '';
-
- if ($_GET['lockedaccount'] == 'unlocked') {
- $Join['la'] .= ' LEFT';
- $Where[] = ' la.UserID IS NULL';
- }
-
- $Join['la'] .= ' JOIN locked_accounts AS la ON la.UserID = um1.ID ';
- }
-
-
-
- if (!empty($_GET['cc'])) {
- if ($_GET['cc_op'] == 'equal') {
- $Where[] = "um1.ipcc = '".db_string($_GET['cc'])."'";
- } else {
- $Where[] = "um1.ipcc != '".db_string($_GET['cc'])."'";
- }
- }
-
- if (!empty($_GET['tracker_ip'])) {
- $Distinct = 'DISTINCT ';
- $Join['xfu'] = ' JOIN xbt_files_users AS xfu ON um1.ID = xfu.uid ';
- $Where[] = ' xfu.ip '.$Match.wrap($_GET['tracker_ip'], '', true);
- }
-
-// if (!empty($_GET['tracker_ip'])) {
-// $Distinct = 'DISTINCT ';
-// $Join['xs'] = ' JOIN xbt_snatched AS xs ON um1.ID = xs.uid ';
-// $Where[] = ' xs.IP '.$Match.wrap($_GET['ip']);
-// }
-
- if (!empty($_GET['comment'])) {
- $Where[] = 'ui1.AdminComment'.$Match.wrap($_GET['comment']);
- }
-
- if (!empty($_GET['lastfm'])) {
- $Distinct = 'DISTINCT ';
- $Join['lastfm'] = ' JOIN lastfm_users AS lfm ON lfm.ID = um1.ID ';
- $Where[] = ' lfm.Username'.$Match.wrap($_GET['lastfm']);
- }
-
-
- if (strlen($_GET['invites1'])) {
- $Invites1 = round($_GET['invites1']);
- $Invites2 = round($_GET['invites2']);
- $Where[] = implode(' AND ', num_compare('Invites', $_GET['invites'], $Invites1, $Invites2));
- }
-
- if (strlen($_GET['invitees1']) && $_GET['invitees'] != 'off') {
- $Invitees1 = round($_GET['invitees1']);
- $Invitees2 = round($_GET['invitees2']);
- $Having[] = implode(' AND ', num_compare('Invitees', $_GET['invitees'], $Invitees1, $Invitees2));
- }
-
- if ($_GET['disabled_invites'] == 'yes') {
- $Where[] = 'ui1.DisableInvites = \'1\'';
- } elseif ($_GET['disabled_invites'] == 'no') {
- $Where[] = 'ui1.DisableInvites = \'0\'';
- }
-
- if ($_GET['disabled_uploads'] == 'yes') {
- $Where[] = 'ui1.DisableUpload = \'1\'';
- } elseif ($_GET['disabled_uploads'] == 'no') {
- $Where[] = 'ui1.DisableUpload = \'0\'';
- }
-
- if ($_GET['join1']) {
- $Where[] = implode(' AND ', date_compare('ui1.JoinDate', $_GET['joined'], $_GET['join1'], $_GET['join2']));
- }
-
- if ($_GET['lastactive1']) {
- $Where[] = implode(' AND ', date_compare('um1.LastAccess', $_GET['lastactive'], $_GET['lastactive1'], $_GET['lastactive2']));
- }
-
- if ($_GET['ratio1']) {
- $Decimals = strlen(array_pop(explode('.', $_GET['ratio1'])));
- if (!$Decimals) {
- $Decimals = 0;
- }
- $Where[] = implode(' AND ', num_compare("ROUND(Uploaded/Downloaded,$Decimals)", $_GET['ratio'], $_GET['ratio1'], $_GET['ratio2']));
- }
-
- if (strlen($_GET['uploaded1'])) {
- $Upload1 = round($_GET['uploaded1']);
- $Upload2 = round($_GET['uploaded2']);
- if ($_GET['uploaded'] != 'buffer') {
- $Where[] = implode(' AND ', num_compare('ROUND(Uploaded / 1024 / 1024 / 1024)', $_GET['uploaded'], $Upload1, $Upload2));
- } else {
- $Where[] = implode(' AND ', num_compare('ROUND((Uploaded / 1024 / 1024 / 1024) - (Downloaded / 1024 / 1024 / 1023))', 'between', $Upload1 * 0.9, $Upload1 * 1.1));
- }
- }
-
- if (strlen($_GET['downloaded1'])) {
- $Download1 = round($_GET['downloaded1']);
- $Download2 = round($_GET['downloaded2']);
- $Where[] = implode(' AND ', num_compare('ROUND(Downloaded / 1024 / 1024 / 1024)', $_GET['downloaded'], $Download1, $Download2));
- }
-
- if (strlen($_GET['snatched1'])) {
- $Snatched1 = round($_GET['snatched1']);
- $Snatched2 = round($_GET['snatched2']);
- $Having[] = implode(' AND ', num_compare('Snatches', $_GET['snatched'], $Snatched1, $Snatched2));
- }
-
- if ($_GET['enabled'] != '') {
- $Where[] = 'um1.Enabled = '.wrap($_GET['enabled'], '=');
- }
-
- if ($_GET['class'] != '') {
- $Where[] = 'um1.PermissionID = '.wrap($_GET['class'], '=');
- }
-
- if ($_GET['secclass'] != '') {
- $Join['ul'] = ' JOIN users_levels AS ul ON um1.ID = ul.UserID ';
- $Where[] = 'ul.PermissionID = '.wrap($_GET['secclass'], '=');
- }
-
- if ($_GET['donor'] == 'yes') {
- $Where[] = 'ui1.Donor = \'1\'';
- } elseif ($_GET['donor'] == 'no') {
- $Where[] = 'ui1.Donor = \'0\'';
- }
-
- if ($_GET['warned'] == 'yes') {
- $Where[] = 'ui1.Warned != \'0000-00-00 00:00:00\'';
- } elseif ($_GET['warned'] == 'no') {
- $Where[] = 'ui1.Warned = \'0000-00-00 00:00:00\'';
- }
-
- if ($_GET['disabled_ip']) {
- $Distinct = 'DISTINCT ';
- if ($_GET['ip_history']) {
- if (!isset($Join['hi'])) {
- $Join['hi'] = ' JOIN users_history_ips AS hi ON hi.UserID = um1.ID ';
- }
- $Join['hi2'] = ' JOIN users_history_ips AS hi2 ON hi2.IP = hi.IP ';
- $Join['um2'] = ' JOIN users_main AS um2 ON um2.ID = hi2.UserID AND um2.Enabled = \'2\' ';
- } else {
- $Join['um2'] = ' JOIN users_main AS um2 ON um2.IP = um1.IP AND um2.Enabled = \'2\' ';
- }
- }
-
- if (!empty($_GET['passkey'])) {
- $Where[] = 'um1.torrent_pass'.$Match.wrap($_GET['passkey']);
- }
-
- if (!empty($_GET['avatar'])) {
- $Where[] = 'ui1.Avatar'.$Match.wrap($_GET['avatar']);
- }
-
- if ($_GET['stylesheet'] != '') {
- $Where[] = 'ui1.StyleID = '.wrap($_GET['stylesheet'], '=');
- }
-
- if ($OrderTable[$_GET['order']] && $WayTable[$_GET['way']]) {
- $Order = ' ORDER BY '.$OrderTable[$_GET['order']].' '.$WayTable[$_GET['way']].' ';
- }
-
- //---------- Finish generating the search string
-
- $SQL = 'SELECT '.$Distinct.$SQL;
- $SQL .= implode(' ', $Join);
-
- if (count($Where)) {
- $SQL .= ' WHERE '.implode(' AND ', $Where);
- }
-
- if (count($Group)) {
- $SQL .= " GROUP BY " . implode(' ,', $Group);
- }
-
- if (count($Having)) {
- $SQL .= ' HAVING '.implode(' AND ', $Having);
- }
-
- $SQL .= $Order;
-
- if (count($Where) > 0 || count($Join) > 0 || count($Having) > 0) {
- $RunQuery = true;
- }
-
- list($Page, $Limit) = Format::page_limit(USERS_PER_PAGE);
- $SQL .= " LIMIT $Limit";
- } else {
- error($Err);
- }
+ if (!empty($_GET['email_history']) || !empty($_GET['disabled_id']) || !empty($_GET['ip_history'])) {
+ if (empty($_GET['email_history'])) {
+ $email_history_checked = false;
+ }
+ if (empty($_GET['disabled_ip'])) {
+ $disabled_ip_checked = false;
+ }
+ if (empty($_GET['ip_history'])) {
+ $ip_history_checked = false;
+ }
+ }
+ $DateRegex = array('regex' => '/\d{4}-\d{2}-\d{2}/');
+
+ $ClassIDs = [];
+ $SecClassIDs = [];
+ foreach ($Classes as $ClassID => $Value) {
+ if ($Value['Secondary']) {
+ $SecClassIDs[] = $ClassID;
+ } else {
+ $ClassIDs[] = $ClassID;
+ }
+ }
+
+ $Val->SetFields('comment', '0', 'string', 'Comment is too long.', array('maxlength' => 512));
+ $Val->SetFields('disabled_invites', '0', 'inarray', 'Invalid disabled_invites field', $YesNo);
+
+
+ $Val->SetFields('joined', '0', 'inarray', 'Invalid joined field', $DateChoices);
+ $Val->SetFields('join1', '0', 'regex', 'Invalid join1 field', $DateRegex);
+ $Val->SetFields('join2', '0', 'regex', 'Invalid join2 field', $DateRegex);
+
+ $Val->SetFields('lastactive', '0', 'inarray', 'Invalid lastactive field', $DateChoices);
+ $Val->SetFields('lastactive1', '0', 'regex', 'Invalid lastactive1 field', $DateRegex);
+ $Val->SetFields('lastactive2', '0', 'regex', 'Invalid lastactive2 field', $DateRegex);
+
+ $Val->SetFields('ratio', '0', 'inarray', 'Invalid ratio field', $NumberChoices);
+ $Val->SetFields('uploaded', '0', 'inarray', 'Invalid uploaded field', $NumberChoices);
+ $Val->SetFields('downloaded', '0', 'inarray', 'Invalid downloaded field', $NumberChoices);
+ //$Val->SetFields('snatched', '0', 'inarray', 'Invalid snatched field', $NumberChoices);
+
+ $Val->SetFields('matchtype', '0', 'inarray', 'Invalid matchtype field', array('inarray' => array('strict', 'fuzzy', 'regex')));
+
+ $Val->SetFields('lockedaccount', '0', 'inarray', 'Invalid locked account field', array('inarray' => array('any', 'locked', 'unlocked')));
+
+ $Val->SetFields('enabled', '0', 'inarray', 'Invalid enabled field', array('inarray' => array('', 0, 1, 2)));
+ $Val->SetFields('class', '0', 'inarray', 'Invalid class', array('inarray' => $ClassIDs));
+ $Val->SetFields('secclass', '0', 'inarray', 'Invalid class', array('inarray' => $SecClassIDs));
+ $Val->SetFields('donor', '0', 'inarray', 'Invalid donor field', $YesNo);
+ $Val->SetFields('warned', '0', 'inarray', 'Invalid warned field', $YesNo);
+ $Val->SetFields('disabled_uploads', '0', 'inarray', 'Invalid disabled_uploads field', $YesNo);
+
+ $Val->SetFields('order', '0', 'inarray', 'Invalid ordering', $OrderVals);
+ $Val->SetFields('way', '0', 'inarray', 'Invalid way', $WayVals);
+
+ $Val->SetFields('passkey', '0', 'string', 'Invalid passkey', array('maxlength' => 32));
+ $Val->SetFields('avatar', '0', 'string', 'Avatar URL too long', array('maxlength' => 512));
+ $Val->SetFields('stylesheet', '0', 'inarray', 'Invalid stylesheet', array_unique(array_keys($Stylesheets)));
+ $Val->SetFields('cc', '0', 'inarray', 'Invalid Country Code', array('maxlength' => 2));
+
+ $Err = $Val->ValidateForm($_GET);
+
+ if (!$Err) {
+ // Passed validation. Let's rock.
+ $RunQuery = false; // if we should run the search
+
+ if (isset($_GET['matchtype']) && $_GET['matchtype'] == 'strict') {
+ $Match = ' = ';
+ } elseif (isset($_GET['matchtype']) && $_GET['matchtype'] == 'regex') {
+ $Match = ' REGEXP ';
+ } else {
+ $Match = ' LIKE ';
+ }
+
+ $OrderTable = array(
+ 'Username' => 'um1.Username',
+ 'Joined' => 'ui1.JoinDate',
+ 'Email' => 'um1.Email',
+ 'IP' => 'um1.IP',
+ 'Last Seen' => 'um1.LastAccess',
+ 'Uploaded' => 'uls1.Uploaded',
+ 'Downloaded' => 'uls1.Downloaded',
+ 'Ratio' => '(um1.Uploaded / um1.Downloaded)',
+ 'Invites' => 'um1.Invites',
+ 'Snatches' => 'Snatches');
+
+ $WayTable = array('Ascending'=>'ASC', 'Descending'=>'DESC');
+
+ $Where = [];
+ $Having = [];
+ $Join = [];
+ $Group = [];
+ $Distinct = '';
+ $Order = '';
+
+
+ $SQL = '
+ SQL_CALC_FOUND_ROWS
+ um1.ID,
+ um1.Username,
+ uls1.Uploaded,
+ uls1.Downloaded,';
+ if ($_GET['snatched'] == 'off') {
+ $SQL .= "'X' AS Snatches,";
+ } else {
+ $SQL .= "
+ (
+ SELECT COUNT(xs.uid)
+ FROM xbt_snatched AS xs
+ WHERE xs.uid = um1.ID
+ ) AS Snatches,";
+ }
+ if ($_GET['invitees'] == 'off') {
+ $SQL .= "'X' AS Invitees,";
+ } else {
+ $SQL .= "
+ (
+ SELECT COUNT(ui2.UserID)
+ FROM users_info AS ui2
+ WHERE um1.ID = ui2.Inviter
+ ) AS Invitees,";
+ }
+ $SQL .= '
+ um1.PermissionID,
+ um1.Email,
+ um1.Enabled,
+ um1.IP,
+ um1.Invites,
+ ui1.DisableInvites,
+ ui1.Warned,
+ ui1.Donor,
+ ui1.JoinDate,
+ um1.LastAccess
+ FROM users_main AS um1
+ INNER JOIN users_leech_stats AS uls1 ON (uls1.UserID = um1.ID)
+ INNER JOIN users_info AS ui1 ON (ui1.UserID = um1.ID) ';
+
+
+ if (!empty($_GET['username'])) {
+ $Where[] = 'um1.Username'.$Match.wrap($_GET['username']);
+ }
+
+ if (!empty($_GET['email'])) {
+ if (isset($_GET['email_history'])) {
+ $Distinct = 'DISTINCT ';
+ $Join['he'] = ' JOIN users_history_emails AS he ON he.UserID = um1.ID ';
+ $Where[] = ' he.Email '.$Match.wrap($_GET['email']);
+ } else {
+ $Where[] = 'um1.Email'.$Match.wrap($_GET['email']);
+ }
+ }
+
+ if (!empty($_GET['email_cnt']) && is_number($_GET['email_cnt'])) {
+ $Query = "
+ SELECT UserID
+ FROM users_history_emails
+ GROUP BY UserID
+ HAVING COUNT(DISTINCT Email) ";
+ if ($_GET['emails_opt'] === 'equal') {
+ $operator = '=';
+ }
+ if ($_GET['emails_opt'] === 'above') {
+ $operator = '>';
+ }
+ if ($_GET['emails_opt'] === 'below') {
+ $operator = '<';
+ }
+ $Query .= $operator.' '.$_GET['email_cnt'];
+ $DB->query($Query);
+ $Users = implode(',', $DB->collect('UserID'));
+ if (!empty($Users)) {
+ $Where[] = "um1.ID IN ($Users)";
+ }
+ }
+
+
+ if (!empty($_GET['ip'])) {
+ if (isset($_GET['ip_history'])) {
+ $Distinct = 'DISTINCT ';
+ $Join['hi'] = ' JOIN users_history_ips AS hi ON hi.UserID = um1.ID ';
+ $Where[] = ' hi.IP '.$Match.wrap($_GET['ip'], '', true);
+ } else {
+ $Where[] = 'um1.IP'.$Match.wrap($_GET['ip'], '', true);
+ }
+ }
+
+ if ($_GET['lockedaccount'] != '' && $_GET['lockedaccount'] != 'any') {
+ $Join['la'] = '';
+
+ if ($_GET['lockedaccount'] == 'unlocked') {
+ $Join['la'] .= ' LEFT';
+ $Where[] = ' la.UserID IS NULL';
+ }
+
+ $Join['la'] .= ' JOIN locked_accounts AS la ON la.UserID = um1.ID ';
+ }
+
+
+
+ if (!empty($_GET['cc'])) {
+ if ($_GET['cc_op'] == 'equal') {
+ $Where[] = "um1.ipcc = '".db_string($_GET['cc'])."'";
+ } else {
+ $Where[] = "um1.ipcc != '".db_string($_GET['cc'])."'";
+ }
+ }
+
+ if (!empty($_GET['tracker_ip'])) {
+ $Distinct = 'DISTINCT ';
+ $Join['xfu'] = ' JOIN xbt_files_users AS xfu ON um1.ID = xfu.uid ';
+ $Where[] = ' xfu.ip '.$Match.wrap($_GET['tracker_ip'], '', true);
+ }
+
+// if (!empty($_GET['tracker_ip'])) {
+// $Distinct = 'DISTINCT ';
+// $Join['xs'] = ' JOIN xbt_snatched AS xs ON um1.ID = xs.uid ';
+// $Where[] = ' xs.IP '.$Match.wrap($_GET['ip']);
+// }
+
+ if (!empty($_GET['comment'])) {
+ $Where[] = 'ui1.AdminComment'.$Match.wrap($_GET['comment']);
+ }
+
+ if (!empty($_GET['lastfm'])) {
+ $Distinct = 'DISTINCT ';
+ $Join['lastfm'] = ' JOIN lastfm_users AS lfm ON lfm.ID = um1.ID ';
+ $Where[] = ' lfm.Username'.$Match.wrap($_GET['lastfm']);
+ }
+
+
+ if (strlen($_GET['invites1'])) {
+ $Invites1 = round($_GET['invites1']);
+ $Invites2 = round($_GET['invites2']);
+ $Where[] = implode(' AND ', num_compare('Invites', $_GET['invites'], $Invites1, $Invites2));
+ }
+
+ if (strlen($_GET['invitees1']) && $_GET['invitees'] != 'off') {
+ $Invitees1 = round($_GET['invitees1']);
+ $Invitees2 = round($_GET['invitees2']);
+ $Having[] = implode(' AND ', num_compare('Invitees', $_GET['invitees'], $Invitees1, $Invitees2));
+ }
+
+ if ($_GET['disabled_invites'] == 'yes') {
+ $Where[] = 'ui1.DisableInvites = \'1\'';
+ } elseif ($_GET['disabled_invites'] == 'no') {
+ $Where[] = 'ui1.DisableInvites = \'0\'';
+ }
+
+ if ($_GET['disabled_uploads'] == 'yes') {
+ $Where[] = 'ui1.DisableUpload = \'1\'';
+ } elseif ($_GET['disabled_uploads'] == 'no') {
+ $Where[] = 'ui1.DisableUpload = \'0\'';
+ }
+
+ if ($_GET['join1']) {
+ $Where[] = implode(' AND ', date_compare('ui1.JoinDate', $_GET['joined'], $_GET['join1'], $_GET['join2']));
+ }
+
+ if ($_GET['lastactive1']) {
+ $Where[] = implode(' AND ', date_compare('um1.LastAccess', $_GET['lastactive'], $_GET['lastactive1'], $_GET['lastactive2']));
+ }
+
+ if ($_GET['ratio1']) {
+ $Decimals = strlen(array_pop(explode('.', $_GET['ratio1'])));
+ if (!$Decimals) {
+ $Decimals = 0;
+ }
+ $Where[] = implode(' AND ', num_compare("ROUND(uls1.Uploaded/uls1.Downloaded,$Decimals)", $_GET['ratio'], $_GET['ratio1'], $_GET['ratio2']));
+ }
+
+ if (strlen($_GET['uploaded1'])) {
+ $Upload1 = round($_GET['uploaded1']);
+ $Upload2 = round($_GET['uploaded2']);
+ if ($_GET['uploaded'] != 'buffer') {
+ $Where[] = implode(' AND ', num_compare('ROUND(uls1.Uploaded / 1024 / 1024 / 1024)', $_GET['uploaded'], $Upload1, $Upload2));
+ } else {
+ $Where[] = implode(' AND ', num_compare('ROUND((uls1.Uploaded / 1024 / 1024 / 1024) - (Downloaded / 1024 / 1024 / 1023))', 'between', $Upload1 * 0.9, $Upload1 * 1.1));
+ }
+ }
+
+ if (strlen($_GET['downloaded1'])) {
+ $Download1 = round($_GET['downloaded1']);
+ $Download2 = round($_GET['downloaded2']);
+ $Where[] = implode(' AND ', num_compare('ROUND(Downloaded / 1024 / 1024 / 1024)', $_GET['downloaded'], $Download1, $Download2));
+ }
+
+ if (strlen($_GET['snatched1'])) {
+ $Snatched1 = round($_GET['snatched1']);
+ $Snatched2 = round($_GET['snatched2']);
+ $Having[] = implode(' AND ', num_compare('Snatches', $_GET['snatched'], $Snatched1, $Snatched2));
+ }
+
+ if ($_GET['enabled'] != '') {
+ $Where[] = 'um1.Enabled = '.wrap($_GET['enabled'], '=');
+ }
+
+ if ($_GET['class'] != '') {
+ $Where[] = 'um1.PermissionID = '.wrap($_GET['class'], '=');
+ }
+
+ if ($_GET['secclass'] != '') {
+ $Join['ul'] = ' JOIN users_levels AS ul ON um1.ID = ul.UserID ';
+ $Where[] = 'ul.PermissionID = '.wrap($_GET['secclass'], '=');
+ }
+
+ if ($_GET['donor'] == 'yes') {
+ $Where[] = 'ui1.Donor = \'1\'';
+ } elseif ($_GET['donor'] == 'no') {
+ $Where[] = 'ui1.Donor = \'0\'';
+ }
+
+ if ($_GET['warned'] == 'yes') {
+ $Where[] = 'ui1.Warned != \'0000-00-00 00:00:00\'';
+ } elseif ($_GET['warned'] == 'no') {
+ $Where[] = 'ui1.Warned = \'0000-00-00 00:00:00\'';
+ }
+
+ if ($_GET['disabled_ip']) {
+ $Distinct = 'DISTINCT ';
+ if ($_GET['ip_history']) {
+ if (!isset($Join['hi'])) {
+ $Join['hi'] = ' JOIN users_history_ips AS hi ON hi.UserID = um1.ID ';
+ }
+ $Join['hi2'] = ' JOIN users_history_ips AS hi2 ON hi2.IP = hi.IP ';
+ $Join['um2'] = ' JOIN users_main AS um2 ON um2.ID = hi2.UserID AND um2.Enabled = \'2\' ';
+ } else {
+ $Join['um2'] = ' JOIN users_main AS um2 ON um2.IP = um1.IP AND um2.Enabled = \'2\' ';
+ }
+ }
+
+ if (!empty($_GET['passkey'])) {
+ $Where[] = 'um1.torrent_pass'.$Match.wrap($_GET['passkey']);
+ }
+
+ if (!empty($_GET['avatar'])) {
+ $Where[] = 'ui1.Avatar'.$Match.wrap($_GET['avatar']);
+ }
+
+ if ($_GET['stylesheet'] != '') {
+ $Where[] = 'ui1.StyleID = '.wrap($_GET['stylesheet'], '=');
+ }
+
+ if ($OrderTable[$_GET['order']] && $WayTable[$_GET['way']]) {
+ $Order = ' ORDER BY '.$OrderTable[$_GET['order']].' '.$WayTable[$_GET['way']].' ';
+ }
+
+ //---------- Finish generating the search string
+
+ $SQL = 'SELECT '.$Distinct.$SQL;
+ $SQL .= implode(' ', $Join);
+
+ if (count($Where)) {
+ $SQL .= ' WHERE '.implode(' AND ', $Where);
+ }
+
+ if (count($Group)) {
+ $SQL .= " GROUP BY " . implode(' ,', $Group);
+ }
+
+ if (count($Having)) {
+ $SQL .= ' HAVING '.implode(' AND ', $Having);
+ }
+
+ $SQL .= $Order;
+
+ if (count($Where) > 0 || count($Join) > 0 || count($Having) > 0) {
+ $RunQuery = true;
+ }
+
+ list($Page, $Limit) = Format::page_limit(USERS_PER_PAGE);
+ $SQL .= " LIMIT $Limit";
+ } else {
+ error($Err);
+ }
}
View::show_header('User search');
?>
Please note that if you lose your 2FA key and all of your backup keys, the staff cannot help you - retrieve your account. Ensure you keep your backup keys in a safe place.
+Please note that if you lose your 2FA key and all of your backup keys, the staff cannot help you + retrieve your account. Ensure you keep your backup keys in a safe place.
-
-query($SQL);
- $DB->query('SELECT FOUND_ROWS()');
- list($NumResults) = $DB->next_record();
- $DB->set_query_id($Results);
+ $Results = $DB->query($SQL);
+ $DB->query('SELECT FOUND_ROWS()');
+ list($NumResults) = $DB->next_record();
+ $DB->set_query_id($Results);
} else {
- $DB->query('SET @nothing = 0');
- $NumResults = 0;
+ $DB->query('SET @nothing = 0');
+ $NumResults = 0;
}
?>
-
-
-
+
+
results
-| Username | -Ratio | -IP address | -Joined | -Last seen | -Upload | -Download | -Downloads | -Snatched | -Invites | - -Invitees | - -
| Username | +Ratio | +IP address | +Joined | +Last seen | +Upload | +Download | +Downloads | +Snatched | +Invites | + +Invitees | + +|
| - | - | () | -- | - | - | - | -query(" - SELECT COUNT(ud.UserID) - FROM users_downloads AS ud - JOIN torrents AS t ON t.ID = ud.TorrentID - WHERE ud.UserID = $UserID"); - list($Downloads) = $DB->next_record(); - $DB->set_query_id($Results); + | ||||
| + | + | () | ++ | + | + | + | +query(" + SELECT COUNT(ud.UserID) + FROM users_downloads AS ud + JOIN torrents AS t ON t.ID = ud.TorrentID + WHERE ud.UserID = $UserID"); + list($Downloads) = $DB->next_record(); + $DB->set_query_id($Results); ?> - | - | - | - - | - - | + | + + | + + + - |
-
+
+
+
+
+
diff --git a/sections/user/connchecker.php b/sections/user/connchecker.php
index b3e38a92b..7581331a4 100644
--- a/sections/user/connchecker.php
+++ b/sections/user/connchecker.php
@@ -1,11 +1,11 @@
-
Community
- -
-
- Forum threads: View -
- Forum posts: View - -
- >Torrent comments: - - View - - -
- >Artist comments: - - View - - -
- >Collage comments: - - View - - -
- >Request comments: - - View - - - -
- >Collages started: - - View - - - -
- >Collages contributed to: - - View - - - +
- Forum threads: View +
- Forum posts: View + +
- >Torrent comments: + + View + + +
- >Artist comments: + + View + + +
- >Collage comments: + + View + + +
- >Request comments: + + View + + + +
- >Collages started: + + View + + + +
- >Collages contributed to: + + View + + + -
- Requests filled: - -
- Requests filled: collected - -
- Requests filled: for - -
-
-
- Requests filled: + +
- Requests filled: collected + +
- Requests filled: for + +
-
+
- Requests created: -
- Requests voted: - -
- Requests created: spent -
- Requests voted: spent - -
- Requests created: for -
- Requests voted: for - -
-
-
-
-
- >Uploaded: - - View - - Download - +
- Requests created: +
- Requests voted: + +
- Requests created: spent +
- Requests voted: spent + +
- Requests created: for +
- Requests voted: for + +
-
+
-
+
- >Uploaded: + + View + + Download + - - -
- >Unique groups: - - View - - - -
- >"Perfect" FLACs: - - View - - - + +
- >Unique groups: + + View + + + +
- >"Perfect" FLACs: + + View + + + -
- >Seeding:
- Show stats
-
-
- >Leeching: - Show stats - - View ->Leeching: + Show stats + + View + - (Disabled) - - - -
- >Snatched: - Show stats - - > - - View - - Download - - -(Disabled) + + + +
- >Snatched: + Show stats + + > + + View + + Download + + + -
- Downloaded: - Show stats - - View - -prepared_query(" - SELECT COUNT(UserID) - FROM users_info - WHERE Inviter = ?", $UserID); - list($Invited) = $DB->next_record(); +
- Downloaded: + Show stats + + View + +prepared_query(" + SELECT COUNT(UserID) + FROM users_info + WHERE Inviter = ?", $UserID); + list($Invited) = $DB->next_record(); ?> -
- Invited: -Invited: + -
Community
+ -
+
-
-
-
-
+
diff --git a/sections/user/delete_invite.php b/sections/user/delete_invite.php
index ec0854d52..601f7d103 100644
--- a/sections/user/delete_invite.php
+++ b/sections/user/delete_invite.php
@@ -1,36 +1,36 @@
-query("
- SELECT InviterID
- FROM invites
- WHERE InviteKey = '$InviteKey'");
+ SELECT InviterID
+ FROM invites
+ WHERE InviteKey = '$InviteKey'");
list($UserID) = $DB->next_record();
if (!$DB->has_results() || $UserID != $LoggedUser['ID']) {
- error(404);
+ error(404);
}
$DB->query("
- DELETE FROM invites
- WHERE InviteKey = '$InviteKey'");
+ DELETE FROM invites
+ WHERE InviteKey = '$InviteKey'");
if (!check_perms('site_send_unlimited_invites')) {
- $DB->query("
- SELECT Invites
- FROM users_main
- WHERE ID = $UserID
- LIMIT 1");
- list($Invites) = $DB->next_record();
- if ($Invites < 10) {
- $DB->query("
- UPDATE users_main
- SET Invites = Invites + 1
- WHERE ID = '$UserID'");
- $Cache->begin_transaction("user_info_heavy_$UserID");
- $Cache->update_row(false, array('Invites' => '+1'));
- $Cache->commit_transaction(0);
- }
+ $DB->query("
+ SELECT Invites
+ FROM users_main
+ WHERE ID = $UserID
+ LIMIT 1");
+ list($Invites) = $DB->next_record();
+ if ($Invites < 10) {
+ $DB->query("
+ UPDATE users_main
+ SET Invites = Invites + 1
+ WHERE ID = '$UserID'");
+ $Cache->begin_transaction("user_info_heavy_$UserID");
+ $Cache->update_row(false, array('Invites' => '+1'));
+ $Cache->commit_transaction(0);
+ }
}
header('Location: user.php?action=invite');
?>
diff --git a/sections/user/donor_stats.php b/sections/user/donor_stats.php
index fe3e3d2ed..83196ac6a 100644
--- a/sections/user/donor_stats.php
+++ b/sections/user/donor_stats.php
@@ -1,18 +1,18 @@
-
- This page has been disabled because the results have been inaccurate. Try a smarter and more reliable service, like http://www.canyouseeme.org.
+
+
+ This page has been disabled because the results have been inaccurate. Try a smarter and more reliable service, like http://www.canyouseeme.org.
-
-
+ Donor Statistics
- -
-
- - Total donor points: - -
- - Current donor rank: - -
- - Last donated: - -
Donor Statistics
+ -
+
- + Total donor points: + +
- + Current donor rank: + +
- + Last donated: + +
-
-
+
diff --git a/sections/user/index.php b/sections/user/index.php
index 6cded3677..44a2efcf2 100644
--- a/sections/user/index.php
+++ b/sections/user/index.php
@@ -1,4 +1,4 @@
-query("DELETE FROM users_notify_filters WHERE ID='".db_string($_GET['id'])."' AND UserID='$LoggedUser[ID]'");
- $ArtistNotifications = $Cache->get_value('notify_artists_'.$LoggedUser['ID']);
- if (is_array($ArtistNotifications) && $ArtistNotifications['ID'] == $_GET['id']) {
- $Cache->delete_value('notify_artists_'.$LoggedUser['ID']);
- }
- }
- $Cache->delete_value('notify_filters_'.$LoggedUser['ID']);
- header('Location: user.php?action=notify');
- break;
- case 'search':// User search
- if (check_perms('admin_advanced_user_search') && check_perms('users_view_ips') && check_perms('users_view_email')) {
- include(SERVER_ROOT.'/sections/user/advancedsearch.php');
- }
- else {
- include(SERVER_ROOT.'/sections/user/search.php');
- }
- break;
- case 'edit':
- if (isset($_REQUEST['userid'])) {
- include(SERVER_ROOT.'/sections/user/edit.php');
- }
- else {
- header("Location: user.php?action=edit&userid={$LoggedUser['ID']}");
- }
- break;
- case '2fa':
- include(SERVER_ROOT . '/classes/google_authenticator.class.php');
- include(SERVER_ROOT . '/classes/qr.class.php');
+ case 'notify':
+ include(SERVER_ROOT.'/sections/user/notify_edit.php');
+ break;
+ case 'notify_handle':
+ include(SERVER_ROOT.'/sections/user/notify_handle.php');
+ break;
+ case 'notify_delete':
+ authorize();
+ if ($_GET['id'] && is_number($_GET['id'])) {
+ $DB->query("DELETE FROM users_notify_filters WHERE ID='".db_string($_GET['id'])."' AND UserID='$LoggedUser[ID]'");
+ $ArtistNotifications = $Cache->get_value('notify_artists_'.$LoggedUser['ID']);
+ if (is_array($ArtistNotifications) && $ArtistNotifications['ID'] == $_GET['id']) {
+ $Cache->delete_value('notify_artists_'.$LoggedUser['ID']);
+ }
+ }
+ $Cache->delete_value('notify_filters_'.$LoggedUser['ID']);
+ header('Location: user.php?action=notify');
+ break;
+ case 'search':// User search
+ if (check_perms('admin_advanced_user_search') && check_perms('users_view_ips') && check_perms('users_view_email')) {
+ include(SERVER_ROOT.'/sections/user/advancedsearch.php');
+ }
+ else {
+ include(SERVER_ROOT.'/sections/user/search.php');
+ }
+ break;
+ case 'edit':
+ if (isset($_REQUEST['userid'])) {
+ include(SERVER_ROOT.'/sections/user/edit.php');
+ }
+ else {
+ header("Location: user.php?action=edit&userid={$LoggedUser['ID']}");
+ }
+ break;
+ case '2fa':
+ include(SERVER_ROOT . '/classes/google_authenticator.class.php');
+ include(SERVER_ROOT . '/classes/qr.class.php');
- if (session_status() === PHP_SESSION_NONE) {
- session_start();
- }
+ if (session_status() === PHP_SESSION_NONE) {
+ session_start();
+ }
- if (empty($_GET['do'])) {
- // we didn't get a required "do", we'll just let the 404 handler deal with the request.
- error(404);
- }
+ if (empty($_GET['do'])) {
+ // we didn't get a required "do", we'll just let the 404 handler deal with the request.
+ error(404);
+ }
- $UserID = $_REQUEST['userid'];
+ $UserID = $_REQUEST['userid'];
- if (!is_number($UserID)) {
- error(404);
- }
+ if (!is_number($UserID)) {
+ error(404);
+ }
- $DB->query("SELECT m.PassHash, m.Secret, m.2FA_Key, p.Level FROM users_main AS m LEFT JOIN permissions AS p ON p.ID = PermissionID WHERE m.ID = '" . db_string($UserID) . "'");
+ $DB->query("SELECT m.PassHash, m.Secret, m.2FA_Key, p.Level FROM users_main AS m LEFT JOIN permissions AS p ON p.ID = PermissionID WHERE m.ID = '" . db_string($UserID) . "'");
- list($PassHash, $Secret, $TFAKey, $Level) = $DB->next_record(MYSQLI_NUM);
+ list($PassHash, $Secret, $TFAKey, $Level) = $DB->next_record(MYSQLI_NUM);
- if ($UserID != $LoggedUser['ID'] && !check_perms('users_mod')) {
- error(403);
- }
+ if ($UserID != $LoggedUser['ID'] && !check_perms('users_mod')) {
+ error(403);
+ }
- switch($_GET['do']) {
- case 'enable':
- if ($TFAKey) {
- // 2fa is already enabled...
- error(404);
- }
+ switch($_GET['do']) {
+ case 'enable':
+ if ($TFAKey) {
+ // 2fa is already enabled...
+ error(404);
+ }
- if (empty($_SESSION['private_key'])) {
- $_SESSION['private_key'] = (new PHPGangsta_GoogleAuthenticator())->createSecret();
- }
+ if (empty($_SESSION['private_key'])) {
+ $_SESSION['private_key'] = (new PHPGangsta_GoogleAuthenticator())->createSecret();
+ }
- include(SERVER_ROOT.'/sections/user/2fa/step1.php');
- break;
+ include(SERVER_ROOT.'/sections/user/2fa/step1.php');
+ break;
- case 'enable2':
- if ($TFAKey) {
- // 2fa is already enabled...
- error(404);
- }
+ case 'enable2':
+ if ($TFAKey) {
+ // 2fa is already enabled...
+ error(404);
+ }
- if (empty($_SESSION['private_key'])) {
- header('Location: user.php?action=2fa&do=enable&userid=' . G::$LoggedUser['ID']);
- exit;
- }
+ if (empty($_SESSION['private_key'])) {
+ header('Location: user.php?action=2fa&do=enable&userid=' . G::$LoggedUser['ID']);
+ exit;
+ }
- if (empty($_POST['2fa'])) {
- include(SERVER_ROOT.'/sections/user/2fa/step2.php');
- } else {
- $works = (new PHPGangsta_GoogleAuthenticator())->verifyCode($_SESSION['private_key'], $_POST['2fa'], 2);
+ if (empty($_POST['2fa'])) {
+ include(SERVER_ROOT.'/sections/user/2fa/step2.php');
+ } else {
+ $works = (new PHPGangsta_GoogleAuthenticator())->verifyCode($_SESSION['private_key'], $_POST['2fa'], 2);
- if (!$works) {
- // user got their token wrong...
- header('Location: user.php?action=2fa&do=enable&invalid&userid=' . $LoggedUser['ID']);
- } else {
- // user got their token right!
- $key = $DB->escape_str($_SESSION['private_key']);
+ if (!$works) {
+ // user got their token wrong...
+ header('Location: user.php?action=2fa&do=enable&invalid&userid=' . $LoggedUser['ID']);
+ } else {
+ // user got their token right!
+ $key = $DB->escape_str($_SESSION['private_key']);
- $recovery = [];
+ $recovery = [];
- for ($i = 0; $i < 6; $i++) {
- $recovery[] = strtoupper(bin2hex(openssl_random_pseudo_bytes(16)));
- }
+ for ($i = 0; $i < 6; $i++) {
+ $recovery[] = strtoupper(bin2hex(openssl_random_pseudo_bytes(16)));
+ }
- $recovery = serialize($recovery);
+ $recovery = serialize($recovery);
- $DB->query("UPDATE users_main SET 2FA_Key = '{$key}', Recovery = '{$recovery}' WHERE ID = '{$UserID}'");
- header('Location: user.php?action=2fa&do=complete&userid=' . $LoggedUser['ID']);
- }
- }
- break;
+ $DB->query("UPDATE users_main SET 2FA_Key = '{$key}', Recovery = '{$recovery}' WHERE ID = '{$UserID}'");
+ header('Location: user.php?action=2fa&do=complete&userid=' . $LoggedUser['ID']);
+ }
+ }
+ break;
- case 'complete':
- // user should only ever see this page once.
- if (empty($_SESSION['private_key'])) {
- error(404);
- }
+ case 'complete':
+ // user should only ever see this page once.
+ if (empty($_SESSION['private_key'])) {
+ error(404);
+ }
- include(SERVER_ROOT.'/sections/user/2fa/complete.php');
- unset($_SESSION['private_key']);
- break;
+ include(SERVER_ROOT.'/sections/user/2fa/complete.php');
+ unset($_SESSION['private_key']);
+ break;
- case 'disable':
- if (!$TFAKey) {
- // 2fa isn't enabled...
- error(404);
- }
+ case 'disable':
+ if (!$TFAKey) {
+ // 2fa isn't enabled...
+ error(404);
+ }
- if (empty($_POST['password']) && !check_perms('users_mod')) {
- include(SERVER_ROOT.'/sections/user/2fa/password_confirm.php');
- } else {
- if (check_perms('users_edit_password') || Users::check_password($_POST['password'], $PassHash)) {
- $DB->query("UPDATE users_main SET 2FA_Key = '', Recovery = '' WHERE ID = '{$UserID}'");
- if (isset($_GET['page']) && $_GET['page'] === 'user') {
- $action = '';
- $ID = $UserID;
- }
- else {
- $action = 'action=edit&';
- $ID = $LoggedUser['ID'];
- }
- header('Location: user.php?' . $action . 'userid=' . $ID);
- }
- else {
- header('Location: user.php?action=2fa&do=disable&invalid&userid=' . $LoggedUser['ID']);
- exit;
- }
- }
- break;
- }
- break;
- case 'take_edit':
- include(SERVER_ROOT.'/sections/user/take_edit.php');
- break;
- case 'invitetree':
- include(SERVER_ROOT.'/sections/user/invitetree.php');
- break;
- case 'invite':
- include(SERVER_ROOT.'/sections/user/invite.php');
- break;
- case 'take_invite':
- include(SERVER_ROOT.'/sections/user/take_invite.php');
- break;
- case 'delete_invite':
- include(SERVER_ROOT.'/sections/user/delete_invite.php');
- break;
- case 'stats':
- include(SERVER_ROOT.'/sections/user/user_stats.php');
- break;
- case 'sessions':
- include(SERVER_ROOT.'/sections/user/sessions.php');
- break;
- case 'connchecker':
- include(SERVER_ROOT.'/sections/user/connchecker.php');
- break;
- case 'permissions':
- include(SERVER_ROOT.'/sections/user/permissions.php');
- break;
- case 'similar':
- include(SERVER_ROOT.'/sections/user/similar.php');
- break;
- case 'moderate':
- include(SERVER_ROOT.'/sections/user/takemoderate.php');
- break;
- case 'clearcache':
- if (!check_perms('admin_clear_cache') || !check_perms('users_override_paranoia')) {
- error(403);
- }
- $UserID = $_REQUEST['id'];
- $Cache->delete_value('user_info_'.$UserID);
- $Cache->delete_value('user_info_heavy_'.$UserID);
- $Cache->delete_value('subscriptions_user_new_'.$UserID);
- $Cache->delete_value('staff_pm_new_'.$UserID);
- $Cache->delete_value('inbox_new_'.$UserID);
- $Cache->delete_value('notifications_new_'.$UserID);
- $Cache->delete_value('collage_subs_user_new_'.$UserID);
- include(SERVER_ROOT.'/sections/user/user.php');
- break;
+ if (empty($_POST['password']) && !check_perms('users_mod')) {
+ include(SERVER_ROOT.'/sections/user/2fa/password_confirm.php');
+ } else {
+ if (check_perms('users_edit_password') || Users::check_password($_POST['password'], $PassHash)) {
+ $DB->query("UPDATE users_main SET 2FA_Key = '', Recovery = '' WHERE ID = '{$UserID}'");
+ if (isset($_GET['page']) && $_GET['page'] === 'user') {
+ $action = '';
+ $ID = $UserID;
+ }
+ else {
+ $action = 'action=edit&';
+ $ID = $LoggedUser['ID'];
+ }
+ header('Location: user.php?' . $action . 'userid=' . $ID);
+ }
+ else {
+ header('Location: user.php?action=2fa&do=disable&invalid&userid=' . $LoggedUser['ID']);
+ exit;
+ }
+ }
+ break;
+ }
+ break;
+ case 'take_edit':
+ include(SERVER_ROOT.'/sections/user/take_edit.php');
+ break;
+ case 'invitetree':
+ include(SERVER_ROOT.'/sections/user/invitetree.php');
+ break;
+ case 'invite':
+ include(SERVER_ROOT.'/sections/user/invite.php');
+ break;
+ case 'take_invite':
+ include(SERVER_ROOT.'/sections/user/take_invite.php');
+ break;
+ case 'delete_invite':
+ include(SERVER_ROOT.'/sections/user/delete_invite.php');
+ break;
+ case 'stats':
+ include(SERVER_ROOT.'/sections/user/user_stats.php');
+ break;
+ case 'sessions':
+ include(SERVER_ROOT.'/sections/user/sessions.php');
+ break;
+ case 'connchecker':
+ include(SERVER_ROOT.'/sections/user/connchecker.php');
+ break;
+ case 'permissions':
+ include(SERVER_ROOT.'/sections/user/permissions.php');
+ break;
+ case 'similar':
+ include(SERVER_ROOT.'/sections/user/similar.php');
+ break;
+ case 'moderate':
+ include(SERVER_ROOT.'/sections/user/takemoderate.php');
+ break;
+ case 'clearcache':
+ if (!check_perms('admin_clear_cache') || !check_perms('users_override_paranoia')) {
+ error(403);
+ }
+ $UserID = $_REQUEST['id'];
+ $Cache->delete_value('user_info_'.$UserID);
+ $Cache->delete_value('user_info_heavy_'.$UserID);
+ $Cache->delete_value('subscriptions_user_new_'.$UserID);
+ $Cache->delete_value('staff_pm_new_'.$UserID);
+ $Cache->delete_value('inbox_new_'.$UserID);
+ $Cache->delete_value('notifications_new_'.$UserID);
+ $Cache->delete_value('collage_subs_user_new_'.$UserID);
+ include(SERVER_ROOT.'/sections/user/user.php');
+ break;
- // Provide public methods for Last.fm data gets.
- case 'lastfm_compare':
- if (isset($_GET['username'])) {
- echo LastFM::compare_user_with($_GET['username']);
- }
- break;
- case 'lastfm_last_played_track':
- if (isset($_GET['username'])) {
- echo LastFM::get_last_played_track($_GET['username']);
- }
- break;
- case 'lastfm_top_artists':
- if (isset($_GET['username'])) {
- echo LastFM::get_top_artists($_GET['username']);
- }
- break;
- case 'lastfm_top_albums':
- if (isset($_GET['username'])) {
- echo LastFM::get_top_albums($_GET['username']);
- }
- break;
- case 'lastfm_top_tracks':
- if (isset($_GET['username'])) {
- echo LastFM::get_top_tracks($_GET['username']);
- }
- break;
- case 'lastfm_clear_cache':
- if (isset($_GET['username']) && isset($_GET['uid'])) {
- echo LastFM::clear_cache($_GET['username'],$_GET['uid']);
- }
- break;
- case 'take_donate':
- break;
- case 'take_update_rank':
- break;
- default:
- if (isset($_REQUEST['id'])) {
- include(SERVER_ROOT.'/sections/user/user.php');
- } else {
- header("Location: user.php?id={$LoggedUser['ID']}");
- }
+ // Provide public methods for Last.fm data gets.
+ case 'lastfm_compare':
+ if (isset($_GET['username'])) {
+ echo LastFM::compare_user_with($_GET['username']);
+ }
+ break;
+ case 'lastfm_last_played_track':
+ if (isset($_GET['username'])) {
+ echo LastFM::get_last_played_track($_GET['username']);
+ }
+ break;
+ case 'lastfm_top_artists':
+ if (isset($_GET['username'])) {
+ echo LastFM::get_top_artists($_GET['username']);
+ }
+ break;
+ case 'lastfm_top_albums':
+ if (isset($_GET['username'])) {
+ echo LastFM::get_top_albums($_GET['username']);
+ }
+ break;
+ case 'lastfm_top_tracks':
+ if (isset($_GET['username'])) {
+ echo LastFM::get_top_tracks($_GET['username']);
+ }
+ break;
+ case 'lastfm_clear_cache':
+ if (isset($_GET['username']) && isset($_GET['uid'])) {
+ echo LastFM::clear_cache($_GET['username'],$_GET['uid']);
+ }
+ break;
+ case 'take_donate':
+ break;
+ case 'take_update_rank':
+ break;
+ default:
+ if (isset($_REQUEST['id'])) {
+ include(SERVER_ROOT.'/sections/user/user.php');
+ } else {
+ header("Location: user.php?id={$LoggedUser['ID']}");
+ }
}
?>
diff --git a/sections/user/invite.php b/sections/user/invite.php
index c41099284..dcb682f2d 100644
--- a/sections/user/invite.php
+++ b/sections/user/invite.php
@@ -1,97 +1,89 @@
-get_value('stats_user_count')) {
- $DB->query("
- SELECT COUNT(ID)
- FROM users_main
- WHERE Enabled = '1'");
- list($UserCount) = $DB->next_record();
- $Cache->cache_value('stats_user_count', $UserCount, 0);
- }
-
- $UserID = $LoggedUser['ID'];
- $Sneaky = false;
+ $UserCount = Users::get_enabled_users_count();
+ $UserID = $LoggedUser['ID'];
+ $Sneaky = false;
}
list($UserID, $Username, $PermissionID) = array_values(Users::user_info($UserID));
-
$DB->query("
- SELECT InviteKey, Email, Expires
- FROM invites
- WHERE InviterID = '$UserID'
- ORDER BY Expires");
-$Pending = $DB->to_array();
+ SELECT InviteKey, Email, Expires
+ FROM invites
+ WHERE InviterID = '$UserID'
+ ORDER BY Expires");
+$Pending = $DB->to_array();
-$OrderWays = array('username', 'email', 'joined', 'lastseen', 'uploaded', 'downloaded', 'ratio');
+$OrderWays = array('username', 'email', 'joined', 'lastseen', 'uploaded', 'downloaded', 'ratio');
if (empty($_GET['order'])) {
- $CurrentOrder = 'id';
- $CurrentSort = 'asc';
- $NewSort = 'desc';
+ $CurrentOrder = 'id';
+ $CurrentSort = 'asc';
+ $NewSort = 'desc';
} else {
- if (in_array($_GET['order'], $OrderWays)) {
- $CurrentOrder = $_GET['order'];
- if ($_GET['sort'] == 'asc' || $_GET['sort'] == 'desc') {
- $CurrentSort = $_GET['sort'];
- $NewSort = ($_GET['sort'] == 'asc' ? 'desc' : 'asc');
- } else {
- error(404);
- }
- } else {
- error(404);
- }
+ if (in_array($_GET['order'], $OrderWays)) {
+ $CurrentOrder = $_GET['order'];
+ if ($_GET['sort'] == 'asc' || $_GET['sort'] == 'desc') {
+ $CurrentSort = $_GET['sort'];
+ $NewSort = ($_GET['sort'] == 'asc' ? 'desc' : 'asc');
+ } else {
+ error(404);
+ }
+ } else {
+ error(404);
+ }
}
switch ($CurrentOrder) {
- case 'username':
- $OrderBy = "um.Username";
- break;
- case 'email':
- $OrderBy = "um.Email";
- break;
- case 'joined':
- $OrderBy = "ui.JoinDate";
- break;
- case 'lastseen':
- $OrderBy = "um.LastAccess";
- break;
- case 'uploaded':
- $OrderBy = "um.Uploaded";
- break;
- case 'downloaded':
- $OrderBy = "um.Downloaded";
- break;
- case 'ratio':
- $OrderBy = "(um.Uploaded / um.Downloaded)";
- break;
- default:
- $OrderBy = "um.ID";
- break;
+ case 'username':
+ $OrderBy = "um.Username";
+ break;
+ case 'email':
+ $OrderBy = "um.Email";
+ break;
+ case 'joined':
+ $OrderBy = "ui.JoinDate";
+ break;
+ case 'lastseen':
+ $OrderBy = "um.LastAccess";
+ break;
+ case 'uploaded':
+ $OrderBy = "uls.Uploaded";
+ break;
+ case 'downloaded':
+ $OrderBy = "uls.Downloaded";
+ break;
+ case 'ratio':
+ $OrderBy = "(uls.Uploaded / uls.Downloaded)";
+ break;
+ default:
+ $OrderBy = "um.ID";
+ break;
}
$CurrentURL = Format::get_url(array('action', 'order', 'sort'));
$DB->query("
- SELECT
- ID,
- Email,
- Uploaded,
- Downloaded,
- JoinDate,
- LastAccess
- FROM users_main AS um
- LEFT JOIN users_info AS ui ON ui.UserID = um.ID
- WHERE ui.Inviter = '$UserID'
- ORDER BY $OrderBy $CurrentSort");
+ SELECT
+ um.ID,
+ um.Email,
+ uls.Uploaded,
+ uls.Downloaded,
+ ui.JoinDate,
+ um.LastAccess
+ FROM users_main AS um
+ INNER JOIN users_leech_stats AS uls ON (uls.UserID = um.ID)
+ INNER JOIN users_info AS ui ON (ui.UserID = um.ID)
+ WHERE ui.Inviter = '$UserID'
+ ORDER BY $OrderBy $CurrentSort");
$Invited = $DB->to_array();
@@ -99,141 +91,146 @@
?>
-
-
> Settings
-
-
+= USER_LIMIT && !check_perms('site_can_invite_always')) { ?>
+
-
-= USER_LIMIT && !check_perms('site_can_invite_always')) { ?>
- > Invites
-
- Invite tree
-
-
-
-
+ Because the user limit has been reached you are unable to send invites at this time.
-> Invites
+
+ Invite tree
+
+
+
+query("
- SELECT can_leech
- FROM users_main
- WHERE ID = $UserID");
+ SELECT can_leech
+ FROM users_main
+ WHERE ID = $UserID");
list($CanLeech) = $DB->next_record();
- if (!$Sneaky
- && !$LoggedUser['RatioWatch']
- && $CanLeech
- && empty($LoggedUser['DisableInvites'])
- && ($LoggedUser['Invites'] > 0 || check_perms('site_send_unlimited_invites'))
- && ($UserCount <= USER_LIMIT || USER_LIMIT == 0 || check_perms('site_can_invite_always'))
- ) { ?>
- Because the user limit has been reached you are unable to send invites at this time.
+
-
- Please note that selling, trading, or publicly giving away our invitations — or responding to public invite requests — is strictly forbidden, and may result in you and your entire invite tree being banned.
-Do not send an invite to anyone who has previously had an account. Please direct them to on if they wish to reactivate their account.
-Remember that you are responsible for ALL invitees, and your account and/or privileges may be disabled due to your invitees' actions. You should know and trust the person you're inviting. If you aren't familiar enough with the user to trust them, do not invite them.
-Do not send an invite if you have not read or do not understand the information above.
-
-
-
-
- 0 || check_perms('site_send_unlimited_invites'))
+ && ($UserCount <= USER_LIMIT || USER_LIMIT == 0 || check_perms('site_can_invite_always'))
+ ) { ?>
+
+
+ Please note that selling, trading, or publicly giving away our invitations — or responding to public invite requests — is strictly forbidden, and may result in you and your entire invite tree being banned.
+Do not send an invite to anyone who has previously had an account. Please direct them to on if they wish to reactivate their account.
+Remember that you are responsible for ALL invitees, and your account and/or privileges may be disabled due to your invitees' actions. You should know and trust the person you're inviting. If you aren't familiar enough with the user to trust them, do not invite them.
+Do not send an invite if you have not read or do not understand the information above.
+
+
+
+
+
-
- Your invites have been disabled. Please read this article for more information.
-
-
+ Your invites have been disabled. Please read this article for more information.
+
+
-
- You may not send invites while on Ratio Watch or while your leeching privileges are disabled. Please read this article for more information.
-
-
+ You may not send invites while on Ratio Watch or while your leeching privileges are disabled. Please read this article for more information.
+
+
- Pending invites
-
-
- Invite link
+ Delete invite
+
+
+
+
+
- | Email address | -Expires in | -Invite link | -Delete invite | -
| Email address | +Expires in | +Invite link | +Delete invite | +
| - | - | Invite link | -Delete invite | -
Invitee list
-
-
-
+
+
+
+
-
+get_value('stats_user_count')) {
- $DB->query("
- SELECT COUNT(ID)
- FROM users_main
- WHERE Enabled = '1'");
- list($UserCount) = $DB->next_record();
- $Cache->cache_value('stats_user_count', $UserCount, 0);
- }
-
- $UserID = $LoggedUser['ID'];
- $Sneaky = false;
+ $UserCount = Users::get_enabled_users_count();
+ $UserID = $LoggedUser['ID'];
+ $Sneaky = false;
}
list($UserID, $Username, $PermissionID) = array_values(Users::user_info($UserID));
@@ -28,11 +20,12 @@
View::show_header($Username.' > Invites > Tree');
?>
-
+query("
- SELECT 1
- FROM users_main
- WHERE ID IN ($UserID, $TargetID)");
- if ($DB->record_count() !== 2) {
- error(403);
- }
+ $DB->query("
+ SELECT 1
+ FROM users_main
+ WHERE ID IN ($UserID, $TargetID)");
+ if ($DB->record_count() !== 2) {
+ error(403);
+ }
- $DB->query("
- SELECT GroupID
- FROM users_dupes
- WHERE UserID = $TargetID");
- list($TargetGroupID) = $DB->next_record();
- $DB->query("
- SELECT u.GroupID, d.Comments
- FROM users_dupes AS u
- JOIN dupe_groups AS d ON d.ID = u.GroupID
- WHERE UserID = $UserID");
- list($UserGroupID, $Comments) = $DB->next_record();
+ $DB->query("
+ SELECT GroupID
+ FROM users_dupes
+ WHERE UserID = $TargetID");
+ list($TargetGroupID) = $DB->next_record();
+ $DB->query("
+ SELECT u.GroupID, d.Comments
+ FROM users_dupes AS u
+ JOIN dupe_groups AS d ON d.ID = u.GroupID
+ WHERE UserID = $UserID");
+ list($UserGroupID, $Comments) = $DB->next_record();
- $UserInfo = Users::user_info($UserID);
- $TargetInfo = Users::user_info($TargetID);
- if (!$UserInfo || !$TargetInfo) {
- return;
- }
+ $UserInfo = Users::user_info($UserID);
+ $TargetInfo = Users::user_info($TargetID);
+ if (!$UserInfo || !$TargetInfo) {
+ return;
+ }
- if ($TargetGroupID) {
- if ($TargetGroupID == $UserGroupID) {
- return;
- }
- if ($UserGroupID) {
- $DB->query("
- UPDATE users_dupes
- SET GroupID = $TargetGroupID
- WHERE GroupID = $UserGroupID");
- $DB->query("
- UPDATE dupe_groups
- SET Comments = CONCAT('".db_string($Comments)."\n\n',Comments)
- WHERE ID = $TargetGroupID");
- $DB->query("DELETE FROM dupe_groups WHERE ID = $UserGroupID");
- $GroupID = $UserGroupID;
- } else {
- $DB->query("INSERT INTO users_dupes (UserID, GroupID) VALUES ($UserID, $TargetGroupID)");
- $GroupID = $TargetGroupID;
- }
- } elseif ($UserGroupID) {
- $DB->query("INSERT INTO users_dupes (UserID, GroupID) VALUES ($TargetID, $UserGroupID)");
- $GroupID = $UserGroupID;
- } else {
- $DB->query("INSERT INTO dupe_groups () VALUES ()");
- $GroupID = $DB->inserted_id();
- $DB->query("INSERT INTO users_dupes (UserID, GroupID) VALUES ($TargetID, $GroupID)");
- $DB->query("INSERT INTO users_dupes (UserID, GroupID) VALUES ($UserID, $GroupID)");
- }
+ if ($TargetGroupID) {
+ if ($TargetGroupID == $UserGroupID) {
+ return;
+ }
+ if ($UserGroupID) {
+ $DB->query("
+ UPDATE users_dupes
+ SET GroupID = $TargetGroupID
+ WHERE GroupID = $UserGroupID");
+ $DB->query("
+ UPDATE dupe_groups
+ SET Comments = CONCAT('".db_string($Comments)."\n\n',Comments)
+ WHERE ID = $TargetGroupID");
+ $DB->query("DELETE FROM dupe_groups WHERE ID = $UserGroupID");
+ $GroupID = $UserGroupID;
+ } else {
+ $DB->query("INSERT INTO users_dupes (UserID, GroupID) VALUES ($UserID, $TargetGroupID)");
+ $GroupID = $TargetGroupID;
+ }
+ } elseif ($UserGroupID) {
+ $DB->query("INSERT INTO users_dupes (UserID, GroupID) VALUES ($TargetID, $UserGroupID)");
+ $GroupID = $UserGroupID;
+ } else {
+ $DB->query("INSERT INTO dupe_groups () VALUES ()");
+ $GroupID = $DB->inserted_id();
+ $DB->query("INSERT INTO users_dupes (UserID, GroupID) VALUES ($TargetID, $GroupID)");
+ $DB->query("INSERT INTO users_dupes (UserID, GroupID) VALUES ($UserID, $GroupID)");
+ }
- if (!$IgnoreComments) {
- $AdminComment = sqltime()." - Linked accounts updated: [user]".$UserInfo['Username']."[/user] and [user]".$TargetInfo['Username']."[/user] linked by ".$LoggedUser['Username'];
- $DB->query("
- UPDATE users_info AS i
- JOIN users_dupes AS d ON d.UserID = i.UserID
- SET i.AdminComment = CONCAT('".db_string($AdminComment)."\n\n', i.AdminComment)
- WHERE d.GroupID = $GroupID");
- }
+ if (!$IgnoreComments) {
+ $AdminComment = sqltime()." - Linked accounts updated: [user]".$UserInfo['Username']."[/user] and [user]".$TargetInfo['Username']."[/user] linked by ".$LoggedUser['Username'];
+ $DB->query("
+ UPDATE users_info AS i
+ JOIN users_dupes AS d ON d.UserID = i.UserID
+ SET i.AdminComment = CONCAT('".db_string($AdminComment)."\n\n', i.AdminComment)
+ WHERE d.GroupID = $GroupID");
+ }
}
function unlink_user($UserID) {
- global $DB, $LoggedUser;
+ global $DB, $LoggedUser;
- authorize();
- if (!check_perms('users_mod')) {
- error(403);
- }
+ authorize();
+ if (!check_perms('users_mod')) {
+ error(403);
+ }
- if (!is_number($UserID)) {
- error(403);
- }
- $UserInfo = Users::user_info($UserID);
- if ($UserInfo === false) {
- return;
- }
- $AdminComment = sqltime()." - Linked accounts updated: [user]".$UserInfo['Username']."[/user] unlinked by ".$LoggedUser['Username'];
- $DB->query("
- UPDATE users_info AS i
- JOIN users_dupes AS d1 ON d1.UserID = i.UserID
- JOIN users_dupes AS d2 ON d2.GroupID = d1.GroupID
- SET i.AdminComment = CONCAT('".db_string($AdminComment)."\n\n', i.AdminComment)
- WHERE d2.UserID = $UserID");
- $DB->query("DELETE FROM users_dupes WHERE UserID = '$UserID'");
- $DB->query("
- DELETE g.*
- FROM dupe_groups AS g
- LEFT JOIN users_dupes AS u ON u.GroupID = g.ID
- WHERE u.GroupID IS NULL");
+ if (!is_number($UserID)) {
+ error(403);
+ }
+ $UserInfo = Users::user_info($UserID);
+ if ($UserInfo === false) {
+ return;
+ }
+ $AdminComment = sqltime()." - Linked accounts updated: [user]".$UserInfo['Username']."[/user] unlinked by ".$LoggedUser['Username'];
+ $DB->query("
+ UPDATE users_info AS i
+ JOIN users_dupes AS d1 ON d1.UserID = i.UserID
+ JOIN users_dupes AS d2 ON d2.GroupID = d1.GroupID
+ SET i.AdminComment = CONCAT('".db_string($AdminComment)."\n\n', i.AdminComment)
+ WHERE d2.UserID = $UserID");
+ $DB->query("DELETE FROM users_dupes WHERE UserID = '$UserID'");
+ $DB->query("
+ DELETE g.*
+ FROM dupe_groups AS g
+ LEFT JOIN users_dupes AS u ON u.GroupID = g.ID
+ WHERE u.GroupID IS NULL");
}
function delete_dupegroup($GroupID) {
- global $DB;
+ global $DB;
- authorize();
- if (!check_perms('users_mod')) {
- error(403);
- }
+ authorize();
+ if (!check_perms('users_mod')) {
+ error(403);
+ }
- if (!is_number($GroupID)) {
- error(403);
- }
+ if (!is_number($GroupID)) {
+ error(403);
+ }
- $DB->query("DELETE FROM dupe_groups WHERE ID = '$GroupID'");
+ $DB->query("DELETE FROM dupe_groups WHERE ID = '$GroupID'");
}
function dupe_comments($GroupID, $Comments, $IgnoreComments) {
- global $DB, $LoggedUser;
+ global $DB, $LoggedUser;
- authorize();
- if (!check_perms('users_mod')) {
- error(403);
- }
+ authorize();
+ if (!check_perms('users_mod')) {
+ error(403);
+ }
- if (!is_number($GroupID)) {
- error(403);
- }
+ if (!is_number($GroupID)) {
+ error(403);
+ }
- $DB->query("
- SELECT SHA1(Comments) AS CommentHash
- FROM dupe_groups
- WHERE ID = $GroupID");
- list($OldCommentHash) = $DB->next_record();
- if ($OldCommentHash != sha1($Comments)) {
- if (!$IgnoreComments) {
- $AdminComment = sqltime()." - Linked accounts updated: Comments updated by ".$LoggedUser['Username'];
- }
- if ($_POST['form_comment_hash'] == $OldCommentHash) {
- $DB->query("
- UPDATE dupe_groups
- SET Comments = '".db_string($Comments)."'
- WHERE ID = '$GroupID'");
- } else {
- $DB->query("
- UPDATE dupe_groups
- SET Comments = CONCAT('".db_string($Comments)."\n\n',Comments)
- WHERE ID = '$GroupID'");
- }
+ $DB->query("
+ SELECT SHA1(Comments) AS CommentHash
+ FROM dupe_groups
+ WHERE ID = $GroupID");
+ list($OldCommentHash) = $DB->next_record();
+ if ($OldCommentHash != sha1($Comments)) {
+ if (!$IgnoreComments) {
+ $AdminComment = sqltime()." - Linked accounts updated: Comments updated by ".$LoggedUser['Username'];
+ }
+ if ($_POST['form_comment_hash'] == $OldCommentHash) {
+ $DB->query("
+ UPDATE dupe_groups
+ SET Comments = '".db_string($Comments)."'
+ WHERE ID = '$GroupID'");
+ } else {
+ $DB->query("
+ UPDATE dupe_groups
+ SET Comments = CONCAT('".db_string($Comments)."\n\n',Comments)
+ WHERE ID = '$GroupID'");
+ }
- if (!$IgnoreComments) {
- $DB->query("
- UPDATE users_info AS i
- JOIN users_dupes AS d ON d.UserID = i.UserID
- SET i.AdminComment = CONCAT('".db_string($AdminComment)."\n\n', i.AdminComment)
- WHERE d.GroupID = $GroupID");
- }
- }
+ if (!$IgnoreComments) {
+ $DB->query("
+ UPDATE users_info AS i
+ JOIN users_dupes AS d ON d.UserID = i.UserID
+ SET i.AdminComment = CONCAT('".db_string($AdminComment)."\n\n', i.AdminComment)
+ WHERE d.GroupID = $GroupID");
+ }
+ }
}
function user_dupes_table($UserID) {
- global $DB, $LoggedUser;
+ global $DB, $LoggedUser;
- if (!check_perms('users_mod')) {
- error(403);
- }
- if (!is_number($UserID)) {
- error(403);
- }
- $DB->query("
- SELECT d.ID, d.Comments, SHA1(d.Comments) AS CommentHash
- FROM dupe_groups AS d
- JOIN users_dupes AS u ON u.GroupID = d.ID
- WHERE u.UserID = $UserID");
- if (list($GroupID, $Comments, $CommentHash) = $DB->next_record()) {
- $DB->query("
- SELECT m.ID
- FROM users_main AS m
- JOIN users_dupes AS d ON m.ID = d.UserID
- WHERE d.GroupID = $GroupID
- ORDER BY m.ID ASC");
- $DupeCount = $DB->record_count();
- $Dupes = $DB->to_array();
- } else {
- $DupeCount = 0;
- $Dupes = array();
- }
+ if (!check_perms('users_mod')) {
+ error(403);
+ }
+ if (!is_number($UserID)) {
+ error(403);
+ }
+ $DB->query("
+ SELECT d.ID, d.Comments, SHA1(d.Comments) AS CommentHash
+ FROM dupe_groups AS d
+ JOIN users_dupes AS u ON u.GroupID = d.ID
+ WHERE u.UserID = $UserID");
+ if (list($GroupID, $Comments, $CommentHash) = $DB->next_record()) {
+ $DB->query("
+ SELECT m.ID
+ FROM users_main AS m
+ JOIN users_dupes AS d ON m.ID = d.UserID
+ WHERE d.GroupID = $GroupID
+ ORDER BY m.ID ASC");
+ $DupeCount = $DB->record_count();
+ $Dupes = $DB->to_array();
+ } else {
+ $DupeCount = 0;
+ $Dupes = [];
+ }
?>
-
+
diff --git a/sections/user/manage_linked.php b/sections/user/manage_linked.php
index dddd13a66..4802862fe 100644
--- a/sections/user/manage_linked.php
+++ b/sections/user/manage_linked.php
@@ -1,45 +1,45 @@
-query("
- SELECT ID
- FROM users_main
- WHERE Username LIKE '".db_string($Target)."'");
- if (list($TargetID) = $DB->next_record()) {
- link_users($UserID, $TargetID, (isset($_REQUEST['ignore_comments'])) ? true : false);
- } else {
- error("User '$Target' not found.");
- }
- }
+ case 'update':
+ if ($_REQUEST['target']) {
+ $Target = $_REQUEST['target'];
+ $DB->query("
+ SELECT ID
+ FROM users_main
+ WHERE Username LIKE '".db_string($Target)."'");
+ if (list($TargetID) = $DB->next_record()) {
+ link_users($UserID, $TargetID, (isset($_REQUEST['ignore_comments'])) ? true : false);
+ } else {
+ error("User '$Target' not found.");
+ }
+ }
- $DB->query("
- SELECT GroupID
- FROM users_dupes
- WHERE UserID = '$UserID'");
- list($GroupID) = $DB->next_record();
+ $DB->query("
+ SELECT GroupID
+ FROM users_dupes
+ WHERE UserID = '$UserID'");
+ list($GroupID) = $DB->next_record();
- if ($_REQUEST['dupecomments'] && $GroupID) {
- dupe_comments($GroupID, $_REQUEST['dupecomments'], (isset($_REQUEST['ignore_comments'])) ? true : false);
- }
- break;
+ if ($_REQUEST['dupecomments'] && $GroupID) {
+ dupe_comments($GroupID, $_REQUEST['dupecomments'], (isset($_REQUEST['ignore_comments'])) ? true : false);
+ }
+ break;
- default:
- error(403);
+ default:
+ error(403);
}
echo '\o/';
header("Location: user.php?id=$UserID");
diff --git a/sections/user/notify_edit.php b/sections/user/notify_edit.php
index 66e7fed89..dbd8c8f29 100644
--- a/sections/user/notify_edit.php
+++ b/sections/user/notify_edit.php
@@ -1,216 +1,222 @@
-
| Username | -Joined | -Last Seen | -Uploaded | -Downloaded | -Ratio | -
| Username | +Joined | +Last Seen | +Uploaded | +Downloaded | +Ratio | +|
| - | - | - | - | - | - | - |
-
+query("
- SELECT
- ID,
- Label,
- Artists,
- ExcludeVA,
- NewGroupsOnly,
- Tags,
- NotTags,
- ReleaseTypes,
- Categories,
- Formats,
- Encodings,
- Media,
- FromYear,
- ToYear,
- Users
- FROM users_notify_filters
- WHERE UserID=$LoggedUser[ID]");
+ SELECT
+ ID,
+ Label,
+ Artists,
+ ExcludeVA,
+ NewGroupsOnly,
+ Tags,
+ NotTags,
+ ReleaseTypes,
+ Categories,
+ Formats,
+ Encodings,
+ Media,
+ FromYear,
+ ToYear,
+ Users
+ FROM users_notify_filters
+ WHERE UserID=$LoggedUser[ID]");
$NumFilters = $DB->record_count();
$Notifications = $DB->to_array();
$Notifications[] = array(
- 'ID' => false,
- 'Label' => '',
- 'Artists' => '',
- 'ExcludeVA' => false,
- 'NewGroupsOnly' => true,
- 'Tags' => '',
- 'NotTags' => '',
- 'ReleaseTypes' => '',
- 'Categories' => '',
- 'Formats' => '',
- 'Encodings' => '',
- 'Media' => '',
- 'FromYear' => '',
- 'ToYear' => '',
- 'Users' => ''
+ 'ID' => false,
+ 'Label' => '',
+ 'Artists' => '',
+ 'ExcludeVA' => false,
+ 'NewGroupsOnly' => true,
+ 'Tags' => '',
+ 'NotTags' => '',
+ 'ReleaseTypes' => '',
+ 'Categories' => '',
+ 'Formats' => '',
+ 'Encodings' => '',
+ 'Media' => '',
+ 'FromYear' => '',
+ 'ToYear' => '',
+ 'Users' => ''
);
$i = 0;
foreach ($Notifications as $N) { // $N stands for Notifications
- $i++;
- $NewFilter = $N['ID'] === false;
- $N['Artists'] = implode(', ', explode('|', substr($N['Artists'], 1, -1)));
- $N['Tags'] = implode(', ', explode('|', substr($N['Tags'], 1, -1)));
- $N['NotTags'] = implode(', ', explode('|', substr($N['NotTags'], 1, -1)));
- $N['ReleaseTypes'] = explode('|', substr($N['ReleaseTypes'], 1, -1));
- $N['Categories'] = explode('|', substr($N['Categories'], 1, -1));
- $N['Formats'] = explode('|', substr($N['Formats'], 1, -1));
- $N['Encodings'] = explode('|', substr($N['Encodings'], 1, -1));
- $N['Media'] = explode('|', substr($N['Media'], 1, -1));
- $N['Users'] = explode('|', substr($N['Users'], 1, -1));
+ $i++;
+ $NewFilter = $N['ID'] === false;
+ $N['Artists'] = implode(', ', explode('|', substr($N['Artists'], 1, -1)));
+ $N['Tags'] = implode(', ', explode('|', substr($N['Tags'], 1, -1)));
+ $N['NotTags'] = implode(', ', explode('|', substr($N['NotTags'], 1, -1)));
+ $N['ReleaseTypes'] = explode('|', substr($N['ReleaseTypes'], 1, -1));
+ $N['Categories'] = explode('|', substr($N['Categories'], 1, -1));
+ $N['Formats'] = explode('|', substr($N['Formats'], 1, -1));
+ $N['Encodings'] = explode('|', substr($N['Encodings'], 1, -1));
+ $N['Media'] = explode('|', substr($N['Media'], 1, -1));
+ $N['Users'] = explode('|', substr($N['Users'], 1, -1));
- $Usernames = '';
- foreach ($N['Users'] as $UserID) {
- $UserInfo = Users::user_info($UserID);
- $Usernames .= $UserInfo['Username'] . ', ';
- }
- $Usernames = rtrim($Usernames, ', ');
+ $Usernames = '';
+ foreach ($N['Users'] as $UserID) {
+ $UserInfo = Users::user_info($UserID);
+ $Usernames .= $UserInfo['Username'] . ', ';
+ }
+ $Usernames = rtrim($Usernames, ', ');
- if ($N['FromYear'] == 0) {
- $N['FromYear'] = '';
- }
- if ($N['ToYear'] == 0) {
- $N['ToYear'] = '';
- }
- if ($NewFilter && $NumFilters > 0) {
+ if ($N['FromYear'] == 0) {
+ $N['FromYear'] = '';
+ }
+ if ($N['ToYear'] == 0) {
+ $N['ToYear'] = '';
+ }
+ if ($NewFilter && $NumFilters > 0) {
?>
-
-
-
+ Notify me of all new torrents with...
- -Notify me of all new torrents with...
+ +-
Create a new notification filter
- 0) { ?> -
- 
-
- Delete
- Show
-
-
-
+
-
+
diff --git a/sections/user/notify_handle.php b/sections/user/notify_handle.php
index a3f93becd..1e6db461f 100644
--- a/sections/user/notify_handle.php
+++ b/sections/user/notify_handle.php
@@ -1,6 +1,6 @@
- 0) {
- $ArtistList = '|'.implode('|', $ParsedArtists).'|';
- $HasFilter = true;
- }
+ $Artists = explode(',', $_POST['artists'.$FormID]);
+ $ParsedArtists = [];
+ foreach ($Artists as $Artist) {
+ if (trim($Artist) != '') {
+ $ParsedArtists[] = db_string(trim($Artist));
+ }
+ }
+ if (count($ParsedArtists) > 0) {
+ $ArtistList = '|'.implode('|', $ParsedArtists).'|';
+ $HasFilter = true;
+ }
}
if ($_POST['excludeva'.$FormID]) {
- $ExcludeVA = '1';
- $HasFilter = true;
+ $ExcludeVA = '1';
+ $HasFilter = true;
} else {
- $ExcludeVA = '0';
+ $ExcludeVA = '0';
}
if ($_POST['newgroupsonly'.$FormID]) {
- $NewGroupsOnly = '1';
- $HasFilter = true;
+ $NewGroupsOnly = '1';
+ $HasFilter = true;
} else {
- $NewGroupsOnly = '0';
+ $NewGroupsOnly = '0';
}
if ($_POST['tags'.$FormID]) {
- $TagList = '|';
- $Tags = explode(',', $_POST['tags'.$FormID]);
- foreach ($Tags as $Tag) {
- $TagList.=db_string(trim($Tag)).'|';
- }
- $HasFilter = true;
+ $TagList = '|';
+ $Tags = explode(',', $_POST['tags'.$FormID]);
+ foreach ($Tags as $Tag) {
+ $TagList.=db_string(trim($Tag)).'|';
+ }
+ $HasFilter = true;
}
if ($_POST['nottags'.$FormID]) {
- $NotTagList = '|';
- $Tags = explode(',', $_POST['nottags'.$FormID]);
- foreach ($Tags as $Tag) {
- $NotTagList.=db_string(trim($Tag)).'|';
- }
- $HasFilter = true;
+ $NotTagList = '|';
+ $Tags = explode(',', $_POST['nottags'.$FormID]);
+ foreach ($Tags as $Tag) {
+ $NotTagList.=db_string(trim($Tag)).'|';
+ }
+ $HasFilter = true;
}
if ($_POST['categories'.$FormID]) {
- $CategoryList = '|';
- foreach ($_POST['categories'.$FormID] as $Category) {
- $CategoryList.=db_string(trim($Category)).'|';
- }
- $HasFilter = true;
+ $CategoryList = '|';
+ foreach ($_POST['categories'.$FormID] as $Category) {
+ $CategoryList.=db_string(trim($Category)).'|';
+ }
+ $HasFilter = true;
}
if ($_POST['releasetypes'.$FormID]) {
- $ReleaseTypeList = '|';
- foreach ($_POST['releasetypes'.$FormID] as $ReleaseType) {
- $ReleaseTypeList.=db_string(trim($ReleaseType)).'|';
- }
- $HasFilter = true;
+ $ReleaseTypeList = '|';
+ foreach ($_POST['releasetypes'.$FormID] as $ReleaseType) {
+ $ReleaseTypeList.=db_string(trim($ReleaseType)).'|';
+ }
+ $HasFilter = true;
}
if ($_POST['formats'.$FormID]) {
- $FormatList = '|';
- foreach ($_POST['formats'.$FormID] as $Format) {
- $FormatList.=db_string(trim($Format)).'|';
- }
- $HasFilter = true;
+ $FormatList = '|';
+ foreach ($_POST['formats'.$FormID] as $Format) {
+ $FormatList.=db_string(trim($Format)).'|';
+ }
+ $HasFilter = true;
}
if ($_POST['bitrates'.$FormID]) {
- $EncodingList = '|';
- foreach ($_POST['bitrates'.$FormID] as $Bitrate) {
- $EncodingList.=db_string(trim($Bitrate)).'|';
- }
- $HasFilter = true;
+ $EncodingList = '|';
+ foreach ($_POST['bitrates'.$FormID] as $Bitrate) {
+ $EncodingList.=db_string(trim($Bitrate)).'|';
+ }
+ $HasFilter = true;
}
if ($_POST['media'.$FormID]) {
- $MediaList = '|';
- foreach ($_POST['media'.$FormID] as $Medium) {
- $MediaList.=db_string(trim($Medium)).'|';
- }
- $HasFilter = true;
+ $MediaList = '|';
+ foreach ($_POST['media'.$FormID] as $Medium) {
+ $MediaList.=db_string(trim($Medium)).'|';
+ }
+ $HasFilter = true;
}
if ($_POST['fromyear'.$FormID] && is_number($_POST['fromyear'.$FormID])) {
- $FromYear = trim($_POST['fromyear'.$FormID]);
- $HasFilter = true;
- if ($_POST['toyear'.$FormID] && is_number($_POST['toyear'.$FormID])) {
- $ToYear = trim($_POST['toyear'.$FormID]);
- } else {
- $ToYear = date('Y') + 3;
- }
+ $FromYear = trim($_POST['fromyear'.$FormID]);
+ $HasFilter = true;
+ if ($_POST['toyear'.$FormID] && is_number($_POST['toyear'.$FormID])) {
+ $ToYear = trim($_POST['toyear'.$FormID]);
+ } else {
+ $ToYear = date('Y') + 3;
+ }
}
if ($_POST['users'.$FormID]) {
- $Usernames = explode(',', $_POST['users'.$FormID]);
- $EscapedUsernames = array();
- foreach ($Usernames as $Username) {
- $EscapedUsernames[] = db_string(trim($Username));;
- }
-
- $DB->query("
- SELECT ID, Paranoia
- FROM users_main
- WHERE Username IN ('" . implode("', '", $EscapedUsernames) . "')
- AND ID != $LoggedUser[ID]");
- while (list($UserID, $Paranoia) = $DB->next_record()) {
- $Paranoia = unserialize($Paranoia);
- if (!in_array('notifications', $Paranoia)) {
- $Users .= '|' . $UserID . '|';
- $HasFilter = true;
- }
- }
+ $Usernames = explode(',', $_POST['users'.$FormID]);
+ $EscapedUsernames = [];
+ foreach ($Usernames as $Username) {
+ $EscapedUsernames[] = db_string(trim($Username));;
+ }
+
+ $DB->query("
+ SELECT ID, Paranoia
+ FROM users_main
+ WHERE Username IN ('" . implode("', '", $EscapedUsernames) . "')
+ AND ID != $LoggedUser[ID]");
+ while (list($UserID, $Paranoia) = $DB->next_record()) {
+ $Paranoia = unserialize($Paranoia);
+ if (!in_array('notifications', $Paranoia)) {
+ $Users .= '|' . $UserID . '|';
+ $HasFilter = true;
+ }
+ }
}
if (!$HasFilter) {
- $Err = 'You must add at least one criterion to filter by';
+ $Err = 'You must add at least one criterion to filter by';
} elseif (!$_POST['label'.$FormID] && !$_POST['id'.$FormID]) {
- $Err = 'You must add a label for the filter set';
+ $Err = 'You must add a label for the filter set';
}
if ($Err) {
- error($Err);
- header('Location: user.php?action=notify');
- die();
+ error($Err);
+ header('Location: user.php?action=notify');
+ die();
}
$ArtistList = str_replace('||', '|', $ArtistList);
@@ -159,35 +159,35 @@
$Users = str_replace('||', '|', $Users);
if ($_POST['id'.$FormID] && is_number($_POST['id'.$FormID])) {
- $DB->query("
- UPDATE users_notify_filters
- SET
- Artists='$ArtistList',
- ExcludeVA='$ExcludeVA',
- NewGroupsOnly='$NewGroupsOnly',
- Tags='$TagList',
- NotTags='$NotTagList',
- ReleaseTypes='$ReleaseTypeList',
- Categories='$CategoryList',
- Formats='$FormatList',
- Encodings='$EncodingList',
- Media='$MediaList',
- FromYear='$FromYear',
- ToYear='$ToYear',
- Users ='$Users'
- WHERE ID='".$_POST['id'.$FormID]."'
- AND UserID='$LoggedUser[ID]'");
+ $DB->query("
+ UPDATE users_notify_filters
+ SET
+ Artists='$ArtistList',
+ ExcludeVA='$ExcludeVA',
+ NewGroupsOnly='$NewGroupsOnly',
+ Tags='$TagList',
+ NotTags='$NotTagList',
+ ReleaseTypes='$ReleaseTypeList',
+ Categories='$CategoryList',
+ Formats='$FormatList',
+ Encodings='$EncodingList',
+ Media='$MediaList',
+ FromYear='$FromYear',
+ ToYear='$ToYear',
+ Users ='$Users'
+ WHERE ID='".$_POST['id'.$FormID]."'
+ AND UserID='$LoggedUser[ID]'");
} else {
- $DB->query("
- INSERT INTO users_notify_filters
- (UserID, Label, Artists, ExcludeVA, NewGroupsOnly, Tags, NotTags, ReleaseTypes, Categories, Formats, Encodings, Media, FromYear, ToYear, Users)
- VALUES
- ('$LoggedUser[ID]','".db_string($_POST['label'.$FormID])."','$ArtistList','$ExcludeVA','$NewGroupsOnly','$TagList', '$NotTagList', '$ReleaseTypeList','$CategoryList','$FormatList','$EncodingList','$MediaList', '$FromYear', '$ToYear', '$Users')");
+ $DB->query("
+ INSERT INTO users_notify_filters
+ (UserID, Label, Artists, ExcludeVA, NewGroupsOnly, Tags, NotTags, ReleaseTypes, Categories, Formats, Encodings, Media, FromYear, ToYear, Users)
+ VALUES
+ ('$LoggedUser[ID]','".db_string($_POST['label'.$FormID])."','$ArtistList','$ExcludeVA','$NewGroupsOnly','$TagList', '$NotTagList', '$ReleaseTypeList','$CategoryList','$FormatList','$EncodingList','$MediaList', '$FromYear', '$ToYear', '$Users')");
}
$Cache->delete_value('notify_filters_'.$LoggedUser['ID']);
if (($Notify = $Cache->get_value('notify_artists_'.$LoggedUser['ID'])) !== false && $Notify['ID'] == $_POST['id'.$FormID]) {
- $Cache->delete_value('notify_artists_'.$LoggedUser['ID']);
+ $Cache->delete_value('notify_artists_'.$LoggedUser['ID']);
}
header('Location: user.php?action=notify');
?>
diff --git a/sections/user/permissions.php b/sections/user/permissions.php
index 3ef27f2f9..2716fb3ca 100644
--- a/sections/user/permissions.php
+++ b/sections/user/permissions.php
@@ -1,18 +1,18 @@
-query("SELECT p.Level
+$DB->query("SELECT p.Level
FROM permissions p
JOIN users_main AS um ON um.PermissionID = p.ID
WHERE um.ID = '" . $_REQUEST['userid'] . "'");
list($UserClass) = $DB->next_record();
if (!check_perms('admin_manage_permissions', $UserClass)) {
- error(403);
+ error(403);
}
include(SERVER_ROOT."/classes/permissions_form.php");
@@ -20,94 +20,94 @@
list($UserID, $Username, $PermissionID) = array_values(Users::user_info($_REQUEST['userid']));
$DB->query("
- SELECT CustomPermissions
- FROM users_main
- WHERE ID = '$UserID'");
+ SELECT CustomPermissions
+ FROM users_main
+ WHERE ID = '$UserID'");
list($Customs) = $DB->next_record(MYSQLI_NUM, false);
-$Defaults = Permissions::get_permissions_for_user($UserID, array());
+$Defaults = Permissions::get_permissions_for_user($UserID, []);
-$Delta = array();
+$Delta = [];
if (isset($_POST['action'])) {
- authorize();
+ authorize();
- foreach ($PermissionsArray as $Perm => $Explaination) {
- $Setting = isset($_POST["perm_$Perm"]) ? 1 : 0;
- $Default = isset($Defaults[$Perm]) ? 1 : 0;
- if ($Setting != $Default) {
- $Delta[$Perm] = $Setting;
- }
- }
- if (!is_number($_POST['maxcollages']) && !empty($_POST['maxcollages'])) {
- error("Please enter a valid number of extra personal collages");
- }
- $Delta['MaxCollages'] = $_POST['maxcollages'];
+ foreach ($PermissionsArray as $Perm => $Explaination) {
+ $Setting = isset($_POST["perm_$Perm"]) ? 1 : 0;
+ $Default = isset($Defaults[$Perm]) ? 1 : 0;
+ if ($Setting != $Default) {
+ $Delta[$Perm] = $Setting;
+ }
+ }
+ if (!is_number($_POST['maxcollages']) && !empty($_POST['maxcollages'])) {
+ error("Please enter a valid number of extra personal collages");
+ }
+ $Delta['MaxCollages'] = $_POST['maxcollages'];
- $Cache->begin_transaction("user_info_heavy_$UserID");
- $Cache->update_row(false, array('CustomPermissions' => $Delta));
- $Cache->commit_transaction(0);
- $DB->query("
- UPDATE users_main
- SET CustomPermissions = '".db_string(serialize($Delta))."'
- WHERE ID = '$UserID'");
+ $Cache->begin_transaction("user_info_heavy_$UserID");
+ $Cache->update_row(false, array('CustomPermissions' => $Delta));
+ $Cache->commit_transaction(0);
+ $DB->query("
+ UPDATE users_main
+ SET CustomPermissions = '".db_string(serialize($Delta))."'
+ WHERE ID = '$UserID'");
} elseif (!empty($Customs)) {
- $Delta = unserialize($Customs);
+ $Delta = unserialize($Customs);
}
$Permissions = array_merge($Defaults, $Delta);
$MaxCollages = $Customs['MaxCollages'] + $Delta['MaxCollages'];
function display_perm($Key, $Title) {
- global $Defaults, $Permissions;
- $Perm = "$Title"; - echo "$Perm\n"; + global $Defaults, $Permissions; + $Perm = "$Title
"; + echo "$Perm\n"; } View::show_header("$Username > Permissions"); ?>
-
Before using permissions, please understand that it allows you to both add and remove access to specific features. If you think that to add access to a feature, you need to uncheck everything else, YOU ARE WRONG. The check boxes on the left, which are grayed out, are the standard permissions granted by their class (and donor/artist status). Any changes you make to the right side will overwrite this. It's not complicated, and if you screw up, click the "Defaults" link at the top. It will reset the user to their respective features granted by class, then you can select or deselect the one or two things you want to change. DO NOT DESELECT EVERYTHING. If you need further clarification, ask a developer before using this tool.
+Before using permissions, please understand that it allows you to both add and remove access to specific features. If you think that to add access to a feature, you need to uncheck everything else, YOU ARE WRONG. The check boxes on the left, which are grayed out, are the standard permissions granted by their class (and donor/artist status). Any changes you make to the right side will overwrite this. It's not complicated, and if you screw up, click the "Defaults" link at the top. It will reset the user to their respective features granted by class, then you can select or deselect the one or two things you want to change. DO NOT DESELECT EVERYTHING. If you need further clarification, ask a developer before using this tool.
- + diff --git a/sections/user/search.php b/sections/user/search.php index ecda01b9e..d38bc3915 100644 --- a/sections/user/search.php +++ b/sections/user/search.php @@ -5,95 +5,95 @@ if (!empty($_GET['search'])) { - $_GET['username'] = $_GET['search']; + $_GET['username'] = $_GET['search']; } define('USERS_PER_PAGE', 30); if (isset($_GET['username'])) { - $_GET['username'] = trim($_GET['username']); - // form submitted - $Val->SetFields('username', '1', 'username', 'Please enter a username.'); - $Err = $Val->ValidateForm($_GET); + $_GET['username'] = trim($_GET['username']); + // form submitted + $Val->SetFields('username', '1', 'username', 'Please enter a username.'); + $Err = $Val->ValidateForm($_GET); - if (!$Err) { - // Passed validation. Let's rock. - list($Page, $Limit) = Format::page_limit(USERS_PER_PAGE); - if ($Page > 10) { - $Page = 10; - $Limit = sprintf("%d, %d", ($Page - 1) * USERS_PER_PAGE, USERS_PER_PAGE); - } - $DB->prepared_query(" - SELECT - SQL_CALC_FOUND_ROWS - ID, - Username, - Enabled, - PermissionID, - Donor, - Warned - FROM users_main AS um - JOIN users_info AS ui ON ui.UserID = um.ID - WHERE Username = ? - ORDER BY Username - LIMIT $Limit", $_GET['username']); - $Results = $DB->to_array(); - $DB->query('SELECT FOUND_ROWS()'); - list($NumResults) = $DB->next_record(); - if ($NumResults > 300) { - $NumResults = 300; - } - elseif (intval($NumResults) === 1) { - list($UserID, $Username, $Enabled, $PermissionID, $Donor, $Warned) = $Results[0]; - header("Location: user.php?id={$UserID}"); + if (!$Err) { + // Passed validation. Let's rock. + list($Page, $Limit) = Format::page_limit(USERS_PER_PAGE); + if ($Page > 10) { + $Page = 10; + $Limit = sprintf("%d, %d", ($Page - 1) * USERS_PER_PAGE, USERS_PER_PAGE); } - } + $DB->prepared_query(" + SELECT + SQL_CALC_FOUND_ROWS + ID, + Username, + Enabled, + PermissionID, + Donor, + Warned + FROM users_main AS um + JOIN users_info AS ui ON ui.UserID = um.ID + WHERE Username = ? + ORDER BY Username + LIMIT $Limit", $_GET['username']); + $Results = $DB->to_array(); + $DB->query('SELECT FOUND_ROWS()'); + list($NumResults) = $DB->next_record(); + if ($NumResults > 300) { + $NumResults = 300; + } + elseif (intval($NumResults) === 1) { + list($UserID, $Username, $Enabled, $PermissionID, $Donor, $Warned) = $Results[0]; + header("Location: user.php?id={$UserID}"); + } + } } View::show_header('User search'); ?>
-
-
-
+
diff --git a/sections/user/sessions.php b/sections/user/sessions.php
index ce5389a31..6129a24aa 100644
--- a/sections/user/sessions.php
+++ b/sections/user/sessions.php
@@ -1,49 +1,49 @@
-query("
- DELETE FROM users_sessions
- WHERE UserID = '$UserID'
- AND SessionID != '$SessionID'");
- $Cache->delete_value("users_sessions_$UserID");
+ $DB->query("
+ DELETE FROM users_sessions
+ WHERE UserID = '$UserID'
+ AND SessionID != '$SessionID'");
+ $Cache->delete_value("users_sessions_$UserID");
}
if (isset($_POST['session'])) {
- authorize();
+ authorize();
- $DB->query("
- DELETE FROM users_sessions
- WHERE UserID = '$UserID'
- AND SessionID = '".db_string($_POST['session'])."'");
- $Cache->delete_value("users_sessions_$UserID");
+ $DB->query("
+ DELETE FROM users_sessions
+ WHERE UserID = '$UserID'
+ AND SessionID = '".db_string($_POST['session'])."'");
+ $Cache->delete_value("users_sessions_$UserID");
}
$UserSessions = $Cache->get_value('users_sessions_'.$UserID);
if (!is_array($UserSessions)) {
- $DB->query("
- SELECT
- SessionID,
- Browser,
- OperatingSystem,
- IP,
- LastUpdate
- FROM users_sessions
- WHERE UserID = '$UserID'
- ORDER BY LastUpdate DESC");
- $UserSessions = $DB->to_array('SessionID', MYSQLI_ASSOC);
- $Cache->cache_value("users_sessions_$UserID", $UserSessions, 0);
+ $DB->query("
+ SELECT
+ SessionID,
+ Browser,
+ OperatingSystem,
+ IP,
+ LastUpdate
+ FROM users_sessions
+ WHERE UserID = '$UserID'
+ ORDER BY LastUpdate DESC");
+ $UserSessions = $DB->to_array('SessionID', MYSQLI_ASSOC);
+ $Cache->cache_value("users_sessions_$UserID", $UserSessions, 0);
}
list($UserID, $Username) = array_values(Users::user_info($UserID));
@@ -51,50 +51,51 @@
?>
-
-
-
-
-
- Search results
--
-
-
+
+
+
+
+ | Username | -Primary class | -
| Username | +Primary class | +
| - | - |
-
-
+
+
+
> Sessions
-
-
- Note: Clearing cookies can result in ghost sessions which are automatically removed after 30 days.
-
-
-
+
+
+
+
+
+
+
| IP address | -Browser | -Platform | -Last activity | -- - | -
| IP address | +Browser | +Platform | +Last activity | ++ + | +
| - | - | - | - | - - | -
-
-
+
-
-
-
-
-
+
+
+
+
- Send message
-query("
- SELECT FriendID
- FROM friends
- WHERE UserID = '$LoggedUser[ID]'
- AND FriendID = '$UserID'");
- if (!$DB->has_results()) {
-?>
- Add to friends
-
- Report user
-" class="brackets">Send message
+query("
+ SELECT FriendID
+ FROM friends
+ WHERE UserID = '$LoggedUser[ID]'
+ AND FriendID = '$UserID'");
+ if (!$DB->has_results()) {
+?>
+ Add to friends
+
+ Report user
+
- Settings
-" class="brackets">Settings
+
- Invites
-" class="brackets">Invites
+
- Permissions
-" class="brackets">Permissions
+
- Sessions
- Generate Copy-Paste
-" class="brackets">Sessions
+ Generate Copy-Paste
+
- Reports
-" class="brackets">Reports
+
- FL tokens
-" class="brackets">FL tokens
+
- Stats
-" class="brackets">Stats
+
- Clear cache
-" class="brackets">Clear cache
+
- Jump to staff tools
-Jump to staff tools
+
-
+
-
-
-
+
+ Freeleech Tokens Given
- -
- 0) {
- $s = $FL_OTHER_tokens > 1 ? 's' : '';
-?>
-
- You gave token to . Your generosity is most appreciated! - -
- You attempted to give some tokens to but something didn't work out. - No points were spent. - -
Give Freeleech Tokens
-
-
- Freeleech Tokens Given
+ -
+ 0) {
+ $s = $FL_OTHER_tokens > 1 ? 's' : '';
+?>
+
- You gave token to . Your generosity is most appreciated! + +
- You attempted to give some tokens to but something didn't work out. + No points were spent. + +
Give Freeleech Tokens
+
+
+
+
-
-
+query("
- SELECT
- COUNT(DISTINCT r.ID),
- SUM(rv.Bounty)
- FROM requests AS r
- LEFT JOIN requests_votes AS rv ON r.ID = rv.RequestID
- WHERE r.FillerID = $UserID");
- list($RequestsFilled, $TotalBounty) = $DB->next_record();
+ $DB->query("
+ SELECT
+ COUNT(DISTINCT r.ID),
+ SUM(rv.Bounty)
+ FROM requests AS r
+ LEFT JOIN requests_votes AS rv ON r.ID = rv.RequestID
+ WHERE r.FillerID = $UserID");
+ list($RequestsFilled, $TotalBounty) = $DB->next_record();
} else {
- $RequestsFilled = $TotalBounty = 0;
+ $RequestsFilled = $TotalBounty = 0;
}
if (check_paranoia_here('requestsvoted_count') || check_paranoia_here('requestsvoted_bounty')) {
- $DB->query("
- SELECT COUNT(RequestID), SUM(Bounty)
- FROM requests_votes
- WHERE UserID = $UserID");
- list($RequestsVoted, $TotalSpent) = $DB->next_record();
- $DB->query("
- SELECT COUNT(r.ID), SUM(rv.Bounty)
- FROM requests AS r
- LEFT JOIN requests_votes AS rv ON rv.RequestID = r.ID AND rv.UserID = r.UserID
- WHERE r.UserID = $UserID");
- list($RequestsCreated, $RequestsCreatedSpent) = $DB->next_record();
+ $DB->query("
+ SELECT COUNT(RequestID), SUM(Bounty)
+ FROM requests_votes
+ WHERE UserID = $UserID");
+ list($RequestsVoted, $TotalSpent) = $DB->next_record();
+ $DB->query("
+ SELECT COUNT(r.ID), SUM(rv.Bounty)
+ FROM requests AS r
+ LEFT JOIN requests_votes AS rv ON rv.RequestID = r.ID AND rv.UserID = r.UserID
+ WHERE r.UserID = $UserID");
+ list($RequestsCreated, $RequestsCreatedSpent) = $DB->next_record();
} else {
- $RequestsVoted = $TotalSpent = $RequestsCreated = $RequestsCreatedSpent = 0;
+ $RequestsVoted = $TotalSpent = $RequestsCreated = $RequestsCreatedSpent = 0;
}
if (check_paranoia_here('uploads+')) {
- $DB->query("
- SELECT COUNT(ID)
- FROM torrents
- WHERE UserID = '$UserID'");
- list($Uploads) = $DB->next_record();
+ $DB->query("
+ SELECT COUNT(ID)
+ FROM torrents
+ WHERE UserID = '$UserID'");
+ list($Uploads) = $DB->next_record();
} else {
- $Uploads = 0;
+ $Uploads = 0;
}
if (check_paranoia_here('artistsadded')) {
- $DB->query("
- SELECT COUNT(ArtistID)
- FROM torrents_artists
- WHERE UserID = $UserID");
- list($ArtistsAdded) = $DB->next_record();
+ $DB->query("
+ SELECT COUNT(ArtistID)
+ FROM torrents_artists
+ WHERE UserID = $UserID");
+ list($ArtistsAdded) = $DB->next_record();
} else {
- $ArtistsAdded = 0;
+ $ArtistsAdded = 0;
}
//Do the ranks
@@ -467,1079 +481,1079 @@ function check_paranoia_here($Setting) {
$ArtistsRank = UserRank::get_rank('artists', $ArtistsAdded);
if ($Downloaded == 0) {
- $Ratio = 1;
+ $Ratio = 1;
} elseif ($Uploaded == 0) {
- $Ratio = 0.5;
+ $Ratio = 0.5;
} else {
- $Ratio = round($Uploaded / $Downloaded, 2);
+ $Ratio = round($Uploaded / $Downloaded, 2);
}
$OverallRank = UserRank::overall_score($UploadedRank, $DownloadedRank, $UploadsRank, $RequestRank, $PostRank, $BountyRank, $ArtistsRank, $Ratio);
?>
- Statistics
- -
-
- Joined: - -
- Uploaded: - -
- Downloaded: - -
- Buffer: - -
- Joined: + +
- >Last seen: + +
- Uploaded: + +
- Downloaded: + +
- Buffer: + +
- >Ratio: + +
- >Required Ratio: + +
- >Bonus Points: History', $UserID); + $text = 'Points Per Hour'; + } else if ($OwnProfile) { + printf(' History', $UserID); + $text = 'Points Per Hour'; + } else { + $text = 'Points Per Hour'; + } ?> -
- >: -
+
->Warning expires in:
+
+ Statistics
+ -
+
-
-prepared_query("
- SELECT IRCKey
- FROM users_main
- WHERE ID = ?", $UserID);
- list($IRCKey) = $DB->next_record();
- }
- if (check_perms('users_mod', $Class) || check_perms('users_view_ips', $Class) || check_perms('users_view_keys', $Class)) {
- $DB->query("
- SELECT COUNT(*)
- FROM users_history_passwords
- WHERE UserID = '$UserID'");
- list($PasswordChanges) = $DB->next_record();
- if (check_perms('users_view_keys', $Class)) {
- $DB->query("
- SELECT COUNT(*)
- FROM users_history_passkeys
- WHERE UserID = '$UserID'");
- list($PasskeyChanges) = $DB->next_record();
- }
- if (check_perms('users_view_ips', $Class)) {
- $DB->query("
- SELECT COUNT(DISTINCT IP)
- FROM users_history_ips
- WHERE UserID = '$UserID'");
- list($IPChanges) = $DB->next_record();
- $DB->query("
- SELECT COUNT(DISTINCT IP)
- FROM xbt_snatched
- WHERE uid = '$UserID'
- AND IP != ''");
- list($TrackerIPs) = $DB->next_record();
- }
- if (check_perms('users_view_email', $Class)) {
- $DB->query("
- SELECT COUNT(*)
- FROM users_history_emails
- WHERE UserID = '$UserID'");
- list($EmailChanges) = $DB->next_record();
- }
-?>
- Percentile Rankings (hover for values)
- -
-
-
- Data uploaded: - -
- Data downloaded: - -
- Torrents uploaded: - -
- Requests filled: - -
- Bounty spent: - -
- Posts made: - -
- Artists added: - -
- Overall rank: - -
-
-
- History
- -
-
-
- Emails: View Legacy view - -
- IPs: View View users - -
- Tracker IPs: View - -
- Passkeys: View - -
- Passwords: View -
- Stats: N/A View - -
-
+prepared_query("
+ SELECT IRCKey
+ FROM users_main
+ WHERE ID = ?", $UserID);
+ list($IRCKey) = $DB->next_record();
+ }
+ if (check_perms('users_mod', $Class) || check_perms('users_view_ips', $Class) || check_perms('users_view_keys', $Class)) {
+ $DB->query("
+ SELECT COUNT(*)
+ FROM users_history_passwords
+ WHERE UserID = '$UserID'");
+ list($PasswordChanges) = $DB->next_record();
+ if (check_perms('users_view_keys', $Class)) {
+ $DB->query("
+ SELECT COUNT(*)
+ FROM users_history_passkeys
+ WHERE UserID = '$UserID'");
+ list($PasskeyChanges) = $DB->next_record();
+ }
+ if (check_perms('users_view_ips', $Class)) {
+ $DB->query("
+ SELECT COUNT(DISTINCT IP)
+ FROM users_history_ips
+ WHERE UserID = '$UserID'");
+ list($IPChanges) = $DB->next_record();
+ $DB->query("
+ SELECT COUNT(DISTINCT IP)
+ FROM xbt_snatched
+ WHERE uid = '$UserID'
+ AND IP != ''");
+ list($TrackerIPs) = $DB->next_record();
+ }
+ if (check_perms('users_view_email', $Class)) {
+ $DB->query("
+ SELECT COUNT(*)
+ FROM users_history_emails
+ WHERE UserID = '$UserID'");
+ list($EmailChanges) = $DB->next_record();
+ }
+?>
+ Personal
- -
-
- Class: - +
- Data uploaded: + +
- Data downloaded: + +
- Torrents uploaded: + +
- Requests filled: + +
- Bounty spent: + +
- Posts made: + +
- Artists added: + +
- Overall rank: + +
Percentile Rankings (hover for values)
+ -
+
+
+
+
+ History
+ -
+
+
- Emails: View Legacy view + +
- IPs: View View users + +
- Tracker IPs: View + +
- Passkeys: View + +
- Passwords: View +
- Stats: N/A View + +
+
-IRC Key:
+
+
+
+
-
- Personal
+ -
+
- Class: + -
-
-
-
- $Val) {
- ?>
-
-
-
-
+ - Paranoia level: - -
- Email: - - S - - -Paranoia level: + +
- Email: + + S + + + -
- IP: -
- Host: -IP: +
- Host: + -
- Passkey: View -Passkey: View +Nobody'; - } else { - $Invited = "$InviterName"; - } + if (!$InviterID) { + $Invited = 'Nobody'; + } else { + $Invited = "$InviterName"; + } ?> -
- Invited by: -
- Invites: query(" - SELECT COUNT(InviterID) - FROM invites - WHERE InviterID = '$UserID'"); - list($Pending) = $DB->next_record(); - if ($DisableInvites) { - echo 'X'; - } else { - echo number_format($Invites); - } - echo " ($Pending)" - ?> -Invited by: +
- Invites: query(" + SELECT COUNT(InviterID) + FROM invites + WHERE InviterID = '$UserID'"); + list($Pending) = $DB->next_record(); + if ($DisableInvites) { + echo 'X'; + } else { + echo number_format($Invites); + } + echo " ($Pending)" + ?> + -
- Roles applied for: View -Roles applied for: View +query(' - SELECT SupportFor - FROM users_info - WHERE UserID = '.$LoggedUser['ID']); - list($SupportFor) = $DB->next_record(); + $DB->query(' + SELECT SupportFor + FROM users_info + WHERE UserID = '.$LoggedUser['ID']); + list($SupportFor) = $DB->next_record(); } if ($Override = check_perms('users_mod') || $OwnProfile || !empty($SupportFor)) { ?> -
- Password age: -query("SELECT MAX(uhp.ChangeTime), ui.JoinDate + FROM users_info ui + LEFT JOIN users_history_passwords uhp ON uhp.UserID = $UserID + WHERE ui.UserID = $UserID"); + list($PasswordHistory, $JoinDate) = G::$DB->next_record(); + $Age = (empty($PasswordHistory)) ? time_diff($JoinDate) : time_diff($PasswordHistory); + $PasswordAge = substr($Age, 0, strpos($Age, " ago")); +?> +
- Password age: + -
- IRC Key: - -
-
+ $Val) {
+ ?>
+
+
+
-
+
-
+
diff --git a/sections/user/user_stats.php b/sections/user/user_stats.php
index f942ee42d..894bd5add 100644
--- a/sections/user/user_stats.php
+++ b/sections/user/user_stats.php
@@ -1,45 +1,45 @@
get_value("user_statgraphs_$UserID");
if ($Charts == false) {
- $Charts = [
- ['Name' => 'Daily', 'Interval' => 1, 'Count' => 24],
- ['Name' => 'Monthly', 'Interval' => 24, 'Count' => 30],
- ['Name' => 'Yearly', 'Interval' => 24 * 7, 'Count' => 52]
- ];
- $Stats = ['Uploaded', 'Downloaded', 'BonusPoints', 'Torrents', 'PerfectFLACs'];
- $Query = "
- SELECT Time, Uploaded, Downloaded, BonusPoints, Torrents, PerfectFLACs
- FROM users_stats_%s
- WHERE UserID = ?
- ORDER BY Time DESC
- LIMIT %d";
+ $Charts = [
+ ['Name' => 'Daily', 'Interval' => 1, 'Count' => 24],
+ ['Name' => 'Monthly', 'Interval' => 24, 'Count' => 30],
+ ['Name' => 'Yearly', 'Interval' => 24 * 7, 'Count' => 52]
+ ];
+ $Stats = ['Uploaded', 'Downloaded', 'BonusPoints', 'Torrents', 'PerfectFLACs'];
+ $Query = "
+ SELECT Time, Uploaded, Downloaded, BonusPoints, Torrents, PerfectFLACs
+ FROM users_stats_%s
+ WHERE UserID = ?
+ ORDER BY Time DESC
+ LIMIT %d";
- foreach ($Charts as &$Chart) {
- $Chart['name'] = strtolower($Chart['Name']);
- $DB->prepared_query(sprintf($Query, $Chart['name'], $Chart['Count']), $UserID);
- $Chart['Stats'] = $DB->has_results() ? array_reverse($DB->to_array(false, MYSQLI_ASSOC)) : [];
- $Chart['Start'] = count($Chart['Stats']) > 0 ? $Chart['Stats'][0]['Time'] : NULL;
+ foreach ($Charts as &$Chart) {
+ $Chart['name'] = strtolower($Chart['Name']);
+ $DB->prepared_query(sprintf($Query, $Chart['name'], $Chart['Count']), $UserID);
+ $Chart['Stats'] = $DB->has_results() ? array_reverse($DB->to_array(false, MYSQLI_ASSOC)) : [];
+ $Chart['Start'] = count($Chart['Stats']) > 0 ? $Chart['Stats'][0]['Time'] : NULL;
- foreach ($Stats as $Stat) {
- $Chart[$Stat] = array_map(function($a) use ($Stat) { return sprintf("[%d, %s]", strtotime($a['Time']) * 1000, $a[$Stat]); }, $Chart['Stats']);
- }
- $Chart['Buffer'] = array_map(function($a) { return sprintf("[%d, %s]", strtotime($a['Time']) * 1000, $a['Uploaded'] - $a['Downloaded']); }, $Chart['Stats']);
- unset($Chart['Stats']);
- unset($Chart);
- }
- $Cache->cache_value("user_statgraphs_$UserID", $Charts, 3600);
+ foreach ($Stats as $Stat) {
+ $Chart[$Stat] = array_map(function($a) use ($Stat) { return sprintf("[%d, %s]", strtotime($a['Time']) * 1000, $a[$Stat]); }, $Chart['Stats']);
+ }
+ $Chart['Buffer'] = array_map(function($a) { return sprintf("[%d, %s]", strtotime($a['Time']) * 1000, $a['Uploaded'] - $a['Downloaded']); }, $Chart['Stats']);
+ unset($Chart['Stats']);
+ unset($Chart);
+ }
+ $Cache->cache_value("user_statgraphs_$UserID", $Charts, 3600);
}
View::show_header('User Stats');
@@ -52,87 +52,89 @@
document.addEventListener('DOMContentLoaded', function() {
1) {
+ if (count($Chart['Downloaded']) > 1) {
?>
- InitialiseChart('-stats', 'Stats', , , true, [
- {
- name: 'Downloaded',
- data: []
- },{
- name: 'Uploaded',
- data: []
- },{
- name: 'Buffer',
- data: []
- }]);
+ InitialiseChart('-stats', 'Stats', , , true, [
+ {
+ name: 'Downloaded',
+ data: []
+ },{
+ name: 'Uploaded',
+ data: []
+ },{
+ name: 'Buffer',
+ data: []
+ }]);
- InitialiseChart('-bp', 'Bonus Points', , , false, [
- {
- name: 'Bonus Points',
- data: []
- }]);
+ InitialiseChart('-bp', 'Bonus Points', , , false, [
+ {
+ name: 'Bonus Points',
+ data: []
+ }]);
- InitialiseChart('-upload', 'Uploads', , , false, [
- {
- name: 'Torrents',
- data: []
- },{
- name: 'Perfect FLACs',
- data: []
- }]);
+ InitialiseChart('-upload', 'Uploads', , , false, [
+ {
+ name: 'Torrents',
+ data: []
+ },{
+ name: 'Perfect FLACs',
+ data: []
+ }]);
});
+ $Uploaded
- ) {
-?>
-
-
-collect('ID'));
+ foreach ($RecentSnatches as $Key => $SnatchInfo) {
+ $RecentSnatches[$Key]['Artist'] = Artists::display_artists($Artists[$SnatchInfo['ID']], false, true);
+ }
+ $Cache->cache_value("recent_snatches_$UserID", $RecentSnatches, 0); //inf cache
+ }
+ if (!empty($RecentSnatches)) {
+?>
+
+
+get_value("recent_uploads_$UserID");
- if ($RecentUploads === false) {
- $DB->query("
- SELECT
- g.ID,
- g.Name,
- g.WikiImage
- FROM torrents_group AS g
- INNER JOIN torrents AS t ON t.GroupID = g.ID
- WHERE t.UserID = '$UserID'
- AND g.CategoryID = '1'
- AND g.WikiImage != ''
- GROUP BY g.ID
- ORDER BY t.Time DESC
- LIMIT 5");
- $RecentUploads = $DB->to_array();
- $Artists = Artists::get_artists($DB->collect('ID'));
- foreach ($RecentUploads as $Key => $UploadInfo) {
- $RecentUploads[$Key]['Artist'] = Artists::display_artists($Artists[$UploadInfo['ID']], false, true);
- }
- $Cache->cache_value("recent_uploads_$UserID", $RecentUploads, 0); //inf cache
- }
- if (!empty($RecentUploads)) {
-?>
-
-
-get_value("recent_uploads_$UserID");
+ if ($RecentUploads === false) {
+ $DB->query("
+ SELECT
+ g.ID,
+ g.Name,
+ g.WikiImage
+ FROM torrents_group AS g
+ INNER JOIN torrents AS t ON t.GroupID = g.ID
+ WHERE t.UserID = '$UserID'
+ AND g.CategoryID = '1'
+ AND g.WikiImage != ''
+ GROUP BY g.ID
+ ORDER BY t.Time DESC
+ LIMIT 5");
+ $RecentUploads = $DB->to_array();
+ $Artists = Artists::get_artists($DB->collect('ID'));
+ foreach ($RecentUploads as $Key => $UploadInfo) {
+ $RecentUploads[$Key]['Artist'] = Artists::display_artists($Artists[$UploadInfo['ID']], false, true);
+ }
+ $Cache->cache_value("recent_uploads_$UserID", $RecentUploads, 0); //inf cache
+ }
+ if (!empty($RecentUploads)) {
+?>
+
+
+query("
- SELECT ID, Name
- FROM collages
- WHERE UserID = '$UserID'
- AND CategoryID = '0'
- AND Deleted = '0'
- ORDER BY Featured DESC,
- Name ASC");
+ SELECT ID, Name
+ FROM collages
+ WHERE UserID = '$UserID'
+ AND CategoryID = '0'
+ AND Deleted = '0'
+ ORDER BY Featured DESC,
+ Name ASC");
$Collages = $DB->to_array(false, MYSQLI_NUM, false);
$FirstCol = true;
foreach ($Collages as $CollageInfo) {
- list($CollageID, $CName) = $CollageInfo;
- $DB->query("
- SELECT ct.GroupID,
- tg.WikiImage,
- tg.CategoryID
- FROM collages_torrents AS ct
- JOIN torrents_group AS tg ON tg.ID = ct.GroupID
- WHERE ct.CollageID = '$CollageID'
- ORDER BY ct.Sort
- LIMIT 5");
- $Collage = $DB->to_array(false, MYSQLI_ASSOC, false);
-?>
-
-
+
-
-
-
+
+ 0) {
- include(SERVER_ROOT.'/classes/invite_tree.class.php');
- $Tree = new INVITE_TREE($UserID, array('visible' => false));
-?>
-
+
-
- $Uploaded
+ ) {
+?>
+ Ratio watch
- This user is currently on ratio watch and must upload in the next , or their leeching privileges will be revoked. Amount downloaded while on ratio watch:
-
+
+
-
+get_value("recent_snatches_$UserID");
- if ($RecentSnatches === false) {
- $DB->query("
- SELECT
- g.ID,
- g.Name,
- g.WikiImage
- FROM xbt_snatched AS s
- INNER JOIN torrents AS t ON t.ID = s.fid
- INNER JOIN torrents_group AS g ON t.GroupID = g.ID
- WHERE s.uid = '$UserID'
- AND t.UserID != '$UserID'
- AND g.CategoryID = '1'
- AND g.WikiImage != ''
- GROUP BY g.ID
- ORDER BY s.tstamp DESC
- LIMIT 5");
- $RecentSnatches = $DB->to_array();
+ $RecentSnatches = $Cache->get_value("recent_snatches_$UserID");
+ if ($RecentSnatches === false) {
+ $DB->query("
+ SELECT
+ g.ID,
+ g.Name,
+ g.WikiImage
+ FROM xbt_snatched AS s
+ INNER JOIN torrents AS t ON t.ID = s.fid
+ INNER JOIN torrents_group AS g ON t.GroupID = g.ID
+ WHERE s.uid = '$UserID'
+ AND t.UserID != '$UserID'
+ AND g.CategoryID = '1'
+ AND g.WikiImage != ''
+ GROUP BY g.ID
+ ORDER BY s.tstamp DESC
+ LIMIT 5");
+ $RecentSnatches = $DB->to_array();
- $Artists = Artists::get_artists($DB->collect('ID'));
- foreach ($RecentSnatches as $Key => $SnatchInfo) {
- $RecentSnatches[$Key]['Artist'] = Artists::display_artists($Artists[$SnatchInfo['ID']], false, true);
- }
- $Cache->cache_value("recent_snatches_$UserID", $RecentSnatches, 0); //inf cache
- }
- if (!empty($RecentSnatches)) {
-?>
- Ratio watch
+ This user is currently on ratio watch and must upload in the next , or their leeching privileges will be revoked. Amount downloaded while on ratio watch:
+ | - Recent Snatches - | -||||
|
-
- |
-
- ||||
| + Recent Snatches + | +||||
|
+
+ |
+
+ ||||
| - Recent Uploads - | -||||
|
-
- |
-
- ||||
| + Recent Uploads + | +||||
|
+
+ |
+
+ ||||
| - - - See full - - - - - | -
-
- false));
+?>
+
- Invite Tree View
-
-
-make_tree(); ?>
-
-
+
+select('id, votes, bounty')
- ->from('requests, requests_delta')
- ->where('userid', $UserID)
- ->where('torrentid', 0)
- ->order_by('votes', 'desc')
- ->order_by('bounty', 'desc')
- ->limit(0, 100, 100) // Limit to 100 requests
- ->query();
- if ($SphQLResult->has_results()) {
- $SphRequests = $SphQLResult->to_array('id', MYSQLI_ASSOC);
-?>
-
+ Invite Tree View
+
+
+make_tree(); ?>
+
+
-
+query("
- SELECT
- SQL_CALC_FOUND_ROWS
- spc.ID,
- spc.Subject,
- spc.Status,
- spc.Level,
- spc.AssignedToUser,
- spc.Date,
- COUNT(spm.ID) AS Resplies,
- spc.ResolverID
- FROM staff_pm_conversations AS spc
- JOIN staff_pm_messages spm ON spm.ConvID = spc.ID
- WHERE spc.UserID = $UserID
- AND (spc.Level <= $UserLevel OR spc.AssignedToUser = '".$LoggedUser['ID']."')
- GROUP BY spc.ID
- ORDER BY spc.Date DESC");
- if ($DB->has_results()) {
- $StaffPMs = $DB->to_array();
-?>
-
- Requests View
-
-
+
-
+query("
- SELECT Comment
- FROM users_warnings_forums
- WHERE UserID = '$UserID'");
- list($ForumWarnings) = $DB->next_record();
- if ($DB->has_results()) {
+ $DB->query("
+ SELECT Comment
+ FROM users_warnings_forums
+ WHERE UserID = '$UserID'");
+ list($ForumWarnings) = $DB->next_record();
+ if ($DB->has_results()) {
?>
- Staff PMs View
-
-
+
-
-
-
+
- Forum warnings
-
-
-
+ Forum warnings
+
+
+
-
-
+
-
-
-
-
+
+
+
+
- Send message
- Report user
-" class="brackets">Send message
+ Report user
+
- Reports
-" class="brackets">Reports
+
- FL tokens
-" class="brackets">FL tokens
+
- Stats
-" class="brackets">Stats
+
-
+
-
-
+
query("
- INSERT INTO forums_last_read_topics (UserID, TopicID, PostID)
- SELECT '$LoggedUser[ID]', ID, LastPostID
- FROM forums_topics
- WHERE ID IN (".implode(',', $UserSubscriptions).')
- ON DUPLICATE KEY UPDATE
- PostID = LastPostID');
+ $DB->query("
+ INSERT INTO forums_last_read_topics (UserID, TopicID, PostID)
+ SELECT '$LoggedUser[ID]', ID, LastPostID
+ FROM forums_topics
+ WHERE ID IN (".implode(',', $UserSubscriptions).')
+ ON DUPLICATE KEY UPDATE
+ PostID = LastPostID');
}
$DB->query("
- INSERT INTO users_comments_last_read (UserID, Page, PageID, PostID)
- SELECT $LoggedUser[ID], t.Page, t.PageID, t.LastPostID
- FROM (
- SELECT
- s.Page,
- s.PageID,
- IFNULL(c.ID, 0) AS LastPostID
- FROM users_subscriptions_comments AS s
- LEFT JOIN comments AS c ON c.Page = s.Page
- AND c.ID = (
- SELECT MAX(ID)
- FROM comments
- WHERE Page = s.Page
- AND PageID = s.PageID
- )
- ) AS t
- ON DUPLICATE KEY UPDATE
- PostID = LastPostID");
+ INSERT INTO users_comments_last_read (UserID, Page, PageID, PostID)
+ SELECT $LoggedUser[ID], t.Page, t.PageID, t.LastPostID
+ FROM (
+ SELECT
+ s.Page,
+ s.PageID,
+ IFNULL(c.ID, 0) AS LastPostID
+ FROM users_subscriptions_comments AS s
+ LEFT JOIN comments AS c ON c.Page = s.Page
+ AND c.ID = (
+ SELECT MAX(ID)
+ FROM comments
+ WHERE Page = s.Page
+ AND PageID = s.PageID
+ )
+ ) AS t
+ ON DUPLICATE KEY UPDATE
+ PostID = LastPostID");
$Cache->delete_value('subscriptions_user_new_'.$LoggedUser['ID']);
header('Location: userhistory.php?action=subscriptions');
?>
diff --git a/sections/userhistory/catchup_collages.php b/sections/userhistory/catchup_collages.php
index 7d0101c8d..dd445c05e 100644
--- a/sections/userhistory/catchup_collages.php
+++ b/sections/userhistory/catchup_collages.php
@@ -1,9 +1,9 @@
-query("UPDATE users_collage_subs SET LastVisit = NOW() WHERE UserID = ".$LoggedUser['ID'].$Where);
diff --git a/sections/userhistory/collage_subscribe.php b/sections/userhistory/collage_subscribe.php
index 11b22c301..c34b40253 100644
--- a/sections/userhistory/collage_subscribe.php
+++ b/sections/userhistory/collage_subscribe.php
@@ -1,37 +1,37 @@
-get_value('collage_subs_user_'.$LoggedUser['ID'])) {
- $DB->query('
- SELECT CollageID
- FROM users_collage_subs
- WHERE UserID = '.db_string($LoggedUser['ID']));
- $UserSubscriptions = $DB->collect(0);
- $Cache->cache_value('collage_subs_user_'.$LoggedUser['ID'], $UserSubscriptions, 0);
+ $DB->query('
+ SELECT CollageID
+ FROM users_collage_subs
+ WHERE UserID = '.db_string($LoggedUser['ID']));
+ $UserSubscriptions = $DB->collect(0);
+ $Cache->cache_value('collage_subs_user_'.$LoggedUser['ID'], $UserSubscriptions, 0);
}
if (($Key = array_search($CollageID, $UserSubscriptions)) !== false) {
- $DB->query('
- DELETE FROM users_collage_subs
- WHERE UserID = '.db_string($LoggedUser['ID'])."
- AND CollageID = $CollageID");
- unset($UserSubscriptions[$Key]);
- Collages::decrease_subscriptions($CollageID);
+ $DB->query('
+ DELETE FROM users_collage_subs
+ WHERE UserID = '.db_string($LoggedUser['ID'])."
+ AND CollageID = $CollageID");
+ unset($UserSubscriptions[$Key]);
+ Collages::decrease_subscriptions($CollageID);
} else {
- $DB->query("
- INSERT IGNORE INTO users_collage_subs
- (UserID, CollageID, LastVisit)
- VALUES
- ($LoggedUser[ID], $CollageID, NOW())");
- array_push($UserSubscriptions, $CollageID);
- Collages::increase_subscriptions($CollageID);
+ $DB->query("
+ INSERT IGNORE INTO users_collage_subs
+ (UserID, CollageID, LastVisit)
+ VALUES
+ ($LoggedUser[ID], $CollageID, NOW())");
+ array_push($UserSubscriptions, $CollageID);
+ Collages::increase_subscriptions($CollageID);
}
$Cache->replace_value('collage_subs_user_'.$LoggedUser['ID'], $UserSubscriptions, 0);
$Cache->delete_value('collage_subs_user_new_'.$LoggedUser['ID']);
diff --git a/sections/userhistory/comments_subscribe.php b/sections/userhistory/comments_subscribe.php
index 4e4e5ba3c..4a8b216d7 100644
--- a/sections/userhistory/comments_subscribe.php
+++ b/sections/userhistory/comments_subscribe.php
@@ -1,9 +1,9 @@
-prepared_query("
- SELECT ui.JoinDate
- FROM users_main AS um
- JOIN users_info AS ui ON um.ID = ui.UserID
- WHERE um.ID = ?", $UserID);
+ SELECT ui.JoinDate
+ FROM users_main AS um
+ JOIN users_info AS ui ON um.ID = ui.UserID
+ WHERE um.ID = ?", $UserID);
list($Joined) = $DB->next_record();
echo "Joined: " . $Joined . "";
//Get Emails from the DB.
$DB->prepared_query("
- SELECT
- u.Email,
- ? AS Time,
- u.IP,
- c.Code
- FROM users_main AS u
- LEFT JOIN geoip_country AS c ON INET_ATON(u.IP) BETWEEN c.StartIP AND c.EndIP
- WHERE u.ID = ?
- UNION
- SELECT
- h.Email,
- h.Time,
- h.IP,
- c.Code
- FROM users_history_emails AS h
- LEFT JOIN geoip_country AS c ON INET_ATON(h.IP) BETWEEN c.StartIP AND c.EndIP
- WHERE UserID = ? "
- /*AND Time != '0000-00-00 00:00:00'*/."
- ORDER BY Time DESC", sqltime(), $UserID, $UserID);
+ SELECT
+ u.Email,
+ ? AS Time,
+ u.IP,
+ c.Code
+ FROM users_main AS u
+ LEFT JOIN geoip_country AS c ON INET_ATON(u.IP) BETWEEN c.StartIP AND c.EndIP
+ WHERE u.ID = ?
+ UNION
+ SELECT
+ h.Email,
+ h.Time,
+ h.IP,
+ c.Code
+ FROM users_history_emails AS h
+ LEFT JOIN geoip_country AS c ON INET_ATON(h.IP) BETWEEN c.StartIP AND c.EndIP
+ WHERE UserID = ? "
+ /*AND Time != '0000-00-00 00:00:00'*/."
+ ORDER BY Time DESC", sqltime(), $UserID, $UserID);
$History = $DB->to_array();
//Display the emails.
echo "Emails:";
foreach ($History as $Key => $Values) {
- if ($Values['Time'] != "0000-00-00 00:00:00"){
- echo $Values['Email'] . " | Set from IP: " . $Values['IP'] . "";
- }
+ if ($Values['Time'] != "0000-00-00 00:00:00"){
+ echo $Values['Email'] . " | Set from IP: " . $Values['IP'] . "";
+ }
}
//Get IPs from the DB and do some stuff to them so we can use it.
$DB->prepared_query("
- SELECT
- SQL_CALC_FOUND_ROWS
- IP,
- StartTime,
- EndTime
- FROM users_history_ips
- WHERE UserID = ?
- ORDER BY StartTime DESC", $UserID);
+ SELECT
+ SQL_CALC_FOUND_ROWS
+ IP,
+ StartTime,
+ EndTime
+ FROM users_history_ips
+ WHERE UserID = ?
+ ORDER BY StartTime DESC", $UserID);
if ($DB->has_results()) {
- $Results = $DB->to_array(false, MYSQLI_ASSOC);
+ $Results = $DB->to_array(false, MYSQLI_ASSOC);
} else {
- $Results = array();
+ $Results = [];
}
//Display the results.
echo "Site IP's:";
foreach ($Results as $Index => $Result) {
$IP = $Result['IP'];
- $StartTime = $Result['StartTime'];
- $EndTime = $Result['EndTime'];
- if (!$Result['EndTime']) {
- $EndTime = sqltime();
+ $StartTime = $Result['StartTime'];
+ $EndTime = $Result['EndTime'];
+ if (!$Result['EndTime']) {
+ $EndTime = sqltime();
}
echo $IP . " | Start: " . $StartTime . " | End: " . $EndTime . "";
}
//Get Tracker IPs from the DB
$TrackerIps = $DB->prepared_query("
- SELECT IP, fid, tstamp
- FROM xbt_snatched
- WHERE uid = ?
- AND IP != ''
- ORDER BY tstamp DESC", $UserID);
-
+ SELECT IP, fid, tstamp
+ FROM xbt_snatched
+ WHERE uid = ?
+ AND IP != ''
+ ORDER BY tstamp DESC", $UserID);
+
//Display Tracker IPs
echo "Tracker IPs:";
$Results = $DB->to_array();
foreach ($Results as $Index => $Result) {
- $IP = $Result['IP'];
- $TorrentID = $Result['fid'];
- $Time = $Result['tstamp'];
- echo $IP . " | TorrentID: " . $TorrentID . " | Time: " . date('Y-m-d g:i:s', $Time) . "";
+ $IP = $Result['IP'];
+ $TorrentID = $Result['fid'];
+ $Time = $Result['tstamp'];
+ echo $IP . " | TorrentID: " . $TorrentID . " | Time: " . date('Y-m-d g:i:s', $Time) . "";
}
-?>
\ No newline at end of file
+?>
diff --git a/sections/userhistory/email_history.php b/sections/userhistory/email_history.php
index 52d2d1e18..eae71205d 100644
--- a/sections/userhistory/email_history.php
+++ b/sections/userhistory/email_history.php
@@ -1,4 +1,4 @@
-query("
- SELECT ui.JoinDate, p.Level AS Class
- FROM users_main AS um
- JOIN users_info AS ui ON um.ID = ui.UserID
- JOIN permissions AS p ON p.ID = um.PermissionID
- WHERE um.ID = $UserID");
+ SELECT ui.JoinDate, p.Level AS Class
+ FROM users_main AS um
+ JOIN users_info AS ui ON um.ID = ui.UserID
+ JOIN permissions AS p ON p.ID = um.PermissionID
+ WHERE um.ID = $UserID");
list($Joined, $Class) = $DB->next_record();
if (!check_perms('users_view_email', $Class)) {
- error(403);
+ error(403);
}
$UsersOnly = $_GET['usersonly'];
$DB->query("
- SELECT Username
- FROM users_main
- WHERE ID = $UserID");
+ SELECT Username
+ FROM users_main
+ WHERE ID = $UserID");
list($Username)= $DB->next_record();
View::show_header("Email history for $Username");
if ($UsersOnly == 1) {
- $DB->query("
- SELECT
- u.Email,
- '".sqltime()."' AS Time,
- u.IP,
- c.Code
- FROM users_main AS u
- LEFT JOIN users_main AS u2 ON u2.Email = u.Email AND u2.ID != '$UserID'
- LEFT JOIN geoip_country AS c ON INET_ATON(u.IP) BETWEEN c.StartIP AND c.EndIP
- WHERE u.ID = '$UserID'
- AND u2.ID > 0
- UNION
- SELECT
- h.Email,
- h.Time,
- h.IP,
- c.Code
- FROM users_history_emails AS h
- LEFT JOIN users_history_emails AS h2 ON h2.email = h.email and h2.UserID != '$UserID'
- LEFT JOIN geoip_country AS c ON INET_ATON(h.IP) BETWEEN c.StartIP AND c.EndIP
- WHERE h.UserID = '$UserID'
- AND h2.UserID > 0"
- /*AND Time != '0000-00-00 00:00:00'*/."
- ORDER BY Time DESC");
+ $DB->query("
+ SELECT
+ u.Email,
+ '".sqltime()."' AS Time,
+ u.IP,
+ c.Code
+ FROM users_main AS u
+ LEFT JOIN users_main AS u2 ON u2.Email = u.Email AND u2.ID != '$UserID'
+ LEFT JOIN geoip_country AS c ON INET_ATON(u.IP) BETWEEN c.StartIP AND c.EndIP
+ WHERE u.ID = '$UserID'
+ AND u2.ID > 0
+ UNION
+ SELECT
+ h.Email,
+ h.Time,
+ h.IP,
+ c.Code
+ FROM users_history_emails AS h
+ LEFT JOIN users_history_emails AS h2 ON h2.email = h.email and h2.UserID != '$UserID'
+ LEFT JOIN geoip_country AS c ON INET_ATON(h.IP) BETWEEN c.StartIP AND c.EndIP
+ WHERE h.UserID = '$UserID'
+ AND h2.UserID > 0"
+ /*AND Time != '0000-00-00 00:00:00'*/."
+ ORDER BY Time DESC");
} else {
- $DB->query("
- SELECT
- u.Email,
- '".sqltime()."' AS Time,
- u.IP,
- c.Code
- FROM users_main AS u
- LEFT JOIN geoip_country AS c ON INET_ATON(u.IP) BETWEEN c.StartIP AND c.EndIP
- WHERE u.ID = '$UserID'
- UNION
- SELECT
- h.Email,
- h.Time,
- h.IP,
- c.Code
- FROM users_history_emails AS h
- LEFT JOIN geoip_country AS c ON INET_ATON(h.IP) BETWEEN c.StartIP AND c.EndIP
- WHERE UserID = '$UserID' "
- /*AND Time != '0000-00-00 00:00:00'*/."
- ORDER BY Time DESC");
+ $DB->query("
+ SELECT
+ u.Email,
+ '".sqltime()."' AS Time,
+ u.IP,
+ c.Code
+ FROM users_main AS u
+ LEFT JOIN geoip_country AS c ON INET_ATON(u.IP) BETWEEN c.StartIP AND c.EndIP
+ WHERE u.ID = '$UserID'
+ UNION
+ SELECT
+ h.Email,
+ h.Time,
+ h.IP,
+ c.Code
+ FROM users_history_emails AS h
+ LEFT JOIN geoip_country AS c ON INET_ATON(h.IP) BETWEEN c.StartIP AND c.EndIP
+ WHERE UserID = '$UserID' "
+ /*AND Time != '0000-00-00 00:00:00'*/."
+ ORDER BY Time DESC");
}
$History = $DB->to_array();
?>
- Stats
-
-
+
+ Stats
+
+
1) { ?>
-
-
- -
- - - No stats available. + +
+ +
+ + + No stats available. -
+ - -
- - - No stats available. + +
+ +
+ + + No stats available. -
| Set | -IP H | - +Set | +IP H | + -User | -User + -||
| - | - | () S | -query(" - SELECT - ue.UserID, - um.Username, - ue.Time, - ue.IP - FROM users_history_emails AS ue, users_main AS um - WHERE ue.Email = '".db_string($Values['Email'])."' - AND ue.UserID != $UserID - AND um.ID = ue.UserID"); - while (list($UserID2, $Time, $IP) = $DB->next_record()) { ?> -||||
| - | - | -query(" - SELECT Enabled - FROM users_main - WHERE ID = $UserID2"); - list($Enabled) = $DB->next_record(); - $DB->set_query_id($ueQuery); + | ||||
| + | + | () S | +query(" + SELECT + ue.UserID, + um.Username, + ue.Time, + ue.IP + FROM users_history_emails AS ue, users_main AS um + WHERE ue.Email = '".db_string($Values['Email'])."' + AND ue.UserID != $UserID + AND um.ID = ue.UserID"); + while (list($UserID2, $Time, $IP) = $DB->next_record()) { ?> +||||
| + | + | +query(" + SELECT Enabled + FROM users_main + WHERE ID = $UserID2"); + list($Enabled) = $DB->next_record(); + $DB->set_query_id($ueQuery); ?> - | - |
-
-
-
-
+
+
-
+
diff --git a/sections/userhistory/index.php b/sections/userhistory/index.php
index e767c4168..e4d171576 100644
--- a/sections/userhistory/index.php
+++ b/sections/userhistory/index.php
@@ -1,4 +1,4 @@
-
diff --git a/sections/userhistory/ip_history.php b/sections/userhistory/ip_history.php
index ea01a9a36..d4b26adce 100644
--- a/sections/userhistory/ip_history.php
+++ b/sections/userhistory/ip_history.php
@@ -14,311 +14,316 @@
$UserID = $_GET['userid'];
if (!is_number($UserID)) {
- error(404);
+ error(404);
}
$UserInfo = Users::user_info($UserID);
if (!check_perms('users_view_ips', $UserInfo['Class'])) {
- error(403);
+ error(403);
}
$UsersOnly = !empty($_GET['usersonly']);
if (!empty($_GET['ip']) && trim($_GET['ip']) != '') {
- $SearchIP = db_string(str_replace("*", "%", trim($_GET['ip'])));
- $SearchIPQuery = "AND IP LIKE '$SearchIP'";
+ $SearchIP = db_string(str_replace("*", "%", trim($_GET['ip'])));
+ $SearchIPQuery = "AND IP LIKE '$SearchIP'";
} else {
- $SearchIPQuery = "";
+ $SearchIPQuery = "";
}
View::show_header("IP address history for $UserInfo[Username]");
?>
-query("
- SELECT DISTINCT IP
- FROM users_history_ips
- WHERE UserID = '$UserID'
- $SearchIPQuery");
+ $DB->query("
+ SELECT DISTINCT IP
+ FROM users_history_ips
+ WHERE UserID = '$UserID'
+ $SearchIPQuery");
- if ($DB->has_results()) {
- $UserIPs = db_array($DB->collect('IP'), array(), true);
- $DB->query("
- SELECT DISTINCT IP
- FROM users_history_ips
- WHERE UserID != '$UserID'
- AND IP IN (" . implode(',', $UserIPs) . ")");
- unset($UserIPs);
+ if ($DB->has_results()) {
+ $UserIPs = db_array($DB->collect('IP'), [], true);
+ $DB->query("
+ SELECT DISTINCT IP
+ FROM users_history_ips
+ WHERE UserID != '$UserID'
+ AND IP IN (" . implode(',', $UserIPs) . ")");
+ unset($UserIPs);
- if ($DB->has_results()) {
- $OtherIPs = db_array($DB->collect('IP'), array(), true);
- $QueryID = $DB->query("
- SELECT
- SQL_CALC_FOUND_ROWS
- IP,
- StartTime,
- EndTime
- FROM users_history_ips
- WHERE UserID = '$UserID'
- AND IP IN (" . implode(',', $OtherIPs) . ")
- ORDER BY StartTime DESC
- LIMIT $Limit");
- unset($OtherIPs);
- }
- }
+ if ($DB->has_results()) {
+ $OtherIPs = db_array($DB->collect('IP'), [], true);
+ $QueryID = $DB->query("
+ SELECT
+ SQL_CALC_FOUND_ROWS
+ IP,
+ StartTime,
+ EndTime
+ FROM users_history_ips
+ WHERE UserID = '$UserID'
+ AND IP IN (" . implode(',', $OtherIPs) . ")
+ ORDER BY StartTime DESC
+ LIMIT $Limit");
+ unset($OtherIPs);
+ }
+ }
} else {
- $QueryID = $DB->query("
- SELECT
- SQL_CALC_FOUND_ROWS
- IP,
- StartTime,
- EndTime
- FROM users_history_ips
- WHERE UserID = '$UserID'
- $SearchIPQuery
- ORDER BY StartTime DESC
- LIMIT $Limit");
+ $QueryID = $DB->query("
+ SELECT
+ SQL_CALC_FOUND_ROWS
+ IP,
+ StartTime,
+ EndTime
+ FROM users_history_ips
+ WHERE UserID = '$UserID'
+ $SearchIPQuery
+ ORDER BY StartTime DESC
+ LIMIT $Limit");
}
if (isset($QueryID)) {
- $DB->query('SELECT FOUND_ROWS()');
- list($NumResults) = $DB->next_record();
- $DB->set_query_id($QueryID);
- $Results = $DB->to_array(false, MYSQLI_ASSOC);
- $IPMatches = $IPMatchesUser = $IPMatchesIgnored = array();
+ $DB->query('SELECT FOUND_ROWS()');
+ list($NumResults) = $DB->next_record();
+ $DB->set_query_id($QueryID);
+ $Results = $DB->to_array(false, MYSQLI_ASSOC);
+ $IPMatches = $IPMatchesUser = $IPMatchesIgnored = [];
} else {
- $NumResults = 0;
- $Results = array();
+ $NumResults = 0;
+ $Results = [];
}
if (!empty($Results)) {
- $IPs = db_array($DB->collect('IP'), array(), true);
- $DB->query("
- SELECT
- UserID,
- IP,
- StartTime,
- EndTime
- FROM users_history_ips
- WHERE IP IN (" . implode(',', $IPs) . ")
- AND UserID != '$UserID'
- AND UserID != 0
- ORDER BY StartTime DESC");
- unset($IPs);
+ $IPs = db_array($DB->collect('IP'), [], true);
+ $DB->query("
+ SELECT
+ UserID,
+ IP,
+ StartTime,
+ EndTime
+ FROM users_history_ips
+ WHERE IP IN (" . implode(',', $IPs) . ")
+ AND UserID != '$UserID'
+ AND UserID != 0
+ ORDER BY StartTime DESC");
+ unset($IPs);
- while ($Match = $DB->next_record(MYSQLI_ASSOC)) {
- $OtherIP = $Match['IP'];
- $OtherUserID = $Match['UserID'];
- if (!isset($IPMatchesUser[$OtherIP][$OtherUserID])) {
- $IPMatchesUser[$OtherIP][$OtherUserID] = 0;
- }
- if ($IPMatchesUser[$OtherIP][$OtherUserID] < 500) {
- $IPMatches[$OtherIP][] = $Match;
- } else {
- if (!isset($IPMatchesIgnored[$OtherIP][$OtherUserID])) {
- $IPMatchesIgnored[$OtherIP][$OtherUserID] = 0;
- }
- $IPMatchesIgnored[$OtherIP][$OtherUserID]++;
- }
- $IPMatchesUser[$OtherIP][$OtherUserID]++;
- }
+ while ($Match = $DB->next_record(MYSQLI_ASSOC)) {
+ $OtherIP = $Match['IP'];
+ $OtherUserID = $Match['UserID'];
+ if (!isset($IPMatchesUser[$OtherIP][$OtherUserID])) {
+ $IPMatchesUser[$OtherIP][$OtherUserID] = 0;
+ }
+ if ($IPMatchesUser[$OtherIP][$OtherUserID] < 500) {
+ $IPMatches[$OtherIP][] = $Match;
+ } else {
+ if (!isset($IPMatchesIgnored[$OtherIP][$OtherUserID])) {
+ $IPMatchesIgnored[$OtherIP][$OtherUserID] = 0;
+ }
+ $IPMatchesIgnored[$OtherIP][$OtherUserID]++;
+ }
+ $IPMatchesUser[$OtherIP][$OtherUserID]++;
+ }
}
$Pages = Format::get_pages($Page, $NumResults, IPS_PER_PAGE, 9);
?>
-
| Current email | -Start | -End | -Current IP H | -Set from IP | -
| - | - | - |
-
- ()
- S
- WI
- - - |
-
-
- ()
- S
- WI
- - - |
-
| Current email | +Start | +End | +Current IP H | +Set from IP | +
| + | + | + |
+
+ ()
+ S
+ WI
+ + + |
+
+
+ ()
+ S
+ WI
+ + + |
+
| - | - | - | - |
-
- ()
- S
- WI
- - - |
- + | + | + | + |
+
+ ()
+ S
+ WI
+ + + |
+
+
-
| Old emails | -Start | -End | -Elapsed | -Set from IP | -Old emails | +Start | +End | +Elapsed | +Set from IP | + + - -"> ++ | + | + | + |
+
+ ()
+ S
+ WI
+ + + |
+
+
-
| 0) ? ' ('.$MatchCount.')' : '')?> | -- | - | - |
-
- ()
- S
- WI
- - - |
-
| 0) ? ' ('.$MatchCount.')' : '')?> | ++ | + | + |
+
+ ()
+ S
+ WI
+ + + |
+
| Invite email | -Start | -End | -Age of account | -Registration IP address | -Invite email | +Start | +End | +Age of account | +Registration IP address | + + - - ++ | + | + | + |
+
+ ()
+ S
+ WI
+ + + |
+
+
-
| 0) ? ' ('.$MatchCount.')' : '')?> | -Never | -- | - |
-
- ()
- S
- WI
- - - |
- 0) ? ' ('.$MatchCount.')' : '')?> | +Never | ++ | + |
+
+ ()
+ S
+ WI
+ + + |
+
+
-
-
-
+
diff --git a/sections/userhistory/quote_notifications.php b/sections/userhistory/quote_notifications.php
index 61450f43a..548b29907 100644
--- a/sections/userhistory/quote_notifications.php
+++ b/sections/userhistory/quote_notifications.php
@@ -1,66 +1,66 @@
query("UPDATE users_notify_quoted SET UnRead = '0' WHERE UserID = '$LoggedUser[ID]'");
- $Cache->delete_value('notify_quoted_' . $LoggedUser['ID']);
- header('Location: userhistory.php?action=quote_notifications');
- die();
+ $DB->query("UPDATE users_notify_quoted SET UnRead = '0' WHERE UserID = '$LoggedUser[ID]'");
+ $Cache->delete_value('notify_quoted_' . $LoggedUser['ID']);
+ header('Location: userhistory.php?action=quote_notifications');
+ die();
}
if (isset($LoggedUser['PostsPerPage'])) {
- $PerPage = $LoggedUser['PostsPerPage'];
+ $PerPage = $LoggedUser['PostsPerPage'];
} else {
- $PerPage = POSTS_PER_PAGE;
+ $PerPage = POSTS_PER_PAGE;
}
list($Page, $Limit) = Format::page_limit($PerPage);
// Get $Limit last quote notifications
// We deal with the information about torrents and requests later on...
$sql = "
- SELECT
- SQL_CALC_FOUND_ROWS
- q.Page,
- q.PageID,
- q.PostID,
- q.QuoterID,
- q.Date,
- q.UnRead,
- f.ID as ForumID,
- f.Name as ForumName,
- t.Title as ForumTitle,
- a.Name as ArtistName,
- c.Name as CollageName
- FROM users_notify_quoted AS q
- LEFT JOIN forums_topics AS t ON t.ID = q.PageID
- LEFT JOIN forums AS f ON f.ID = t.ForumID
- LEFT JOIN artists_group AS a ON a.ArtistID = q.PageID
- LEFT JOIN collages AS c ON c.ID = q.PageID
- WHERE q.UserID = $LoggedUser[ID]
- AND (q.Page != 'forums' OR " . Forums::user_forums_sql() . ")
- AND (q.Page != 'collages' OR c.Deleted = '0')
- $UnreadSQL
- ORDER BY q.Date DESC
- LIMIT $Limit";
+ SELECT
+ SQL_CALC_FOUND_ROWS
+ q.Page,
+ q.PageID,
+ q.PostID,
+ q.QuoterID,
+ q.Date,
+ q.UnRead,
+ f.ID as ForumID,
+ f.Name as ForumName,
+ t.Title as ForumTitle,
+ a.Name as ArtistName,
+ c.Name as CollageName
+ FROM users_notify_quoted AS q
+ LEFT JOIN forums_topics AS t ON t.ID = q.PageID
+ LEFT JOIN forums AS f ON f.ID = t.ForumID
+ LEFT JOIN artists_group AS a ON a.ArtistID = q.PageID
+ LEFT JOIN collages AS c ON c.ID = q.PageID
+ WHERE q.UserID = $LoggedUser[ID]
+ AND (q.Page != 'forums' OR " . Forums::user_forums_sql() . ")
+ AND (q.Page != 'collages' OR c.Deleted = '0')
+ $UnreadSQL
+ ORDER BY q.Date DESC
+ LIMIT $Limit";
$DB->query($sql);
$Results = $DB->to_array(false, MYSQLI_ASSOC, false);
$DB->query('SELECT FOUND_ROWS()');
list($NumResults) = $DB->next_record();
-$TorrentGroups = $Requests = array();
+$TorrentGroups = $Requests = [];
foreach ($Results as $Result) {
- if ($Result['Page'] == 'torrents') {
- $TorrentGroups[] = $Result['PageID'];
- } elseif ($Result['Page'] == 'requests') {
- $Requests[] = $Result['PageID'];
- }
+ if ($Result['Page'] == 'torrents') {
+ $TorrentGroups[] = $Result['PageID'];
+ } elseif ($Result['Page'] == 'requests') {
+ $Requests[] = $Result['PageID'];
+ }
}
$TorrentGroups = Torrents::get_groups($TorrentGroups, true, true, false);
@@ -70,100 +70,100 @@
View::show_header('Quote Notifications');
?>
-
-
+
+
+
+
-
-
-
-query("
- SELECT um.Username,
- p.Level AS Class
- FROM users_main AS um
- LEFT JOIN permissions AS p ON p.ID = um.PermissionID
- WHERE um.ID = $UserID");
+ SELECT um.Username,
+ p.Level AS Class
+ FROM users_main AS um
+ LEFT JOIN permissions AS p ON p.ID = um.PermissionID
+ WHERE um.ID = $UserID");
list($Username, $Class) = $DB->next_record();
if (!check_perms('users_view_ips', $Class)) {
- error(403);
+ error(403);
}
$UsersOnly = $_GET['usersonly'];
@@ -39,19 +39,19 @@
?>
-query("
- SELECT IP, fid, tstamp
- FROM xbt_snatched
- WHERE uid = $UserID
- AND IP != ''
- ORDER BY tstamp DESC
- LIMIT $Limit");
+ SELECT IP, fid, tstamp
+ FROM xbt_snatched
+ WHERE uid = $UserID
+ AND IP != ''
+ ORDER BY tstamp DESC
+ LIMIT $Limit");
$DB->query('SELECT FOUND_ROWS()');
list($NumResults) = $DB->next_record();
@@ -61,39 +61,39 @@ function ShowIPs(rowname) {
?>
IP address history for
-
-
+
- IP address history for
+
+
- View all IP addresses
-
- View IP addresses with users
-
-
-
-
-
- | IP address search | -
| IP address search | +
| - - |
| IP address | -Started Toggle | -Ended | -Ended | -Elapsed | -
| IP address | +Started Toggle | +Ended | +Ended | +Elapsed | +
| - ()> + |
+ ()
- [Banned]
-[Banned]
+
- Ban
-" href="#" onclick="Ban('', ''); this.onclick = null; return false;" class="brackets">Ban
+
- - - + + - () -).gtoggle(); return false;">() + - () -" onclick="$('.otherusers' + ).gshow();">() + - (0) - - |
- - - - | -- - - | -- | + + + | ++ + + | ++ + 10); + foreach ($OtherUsers as $OtherUser) { + if (!$OtherUser['EndTime']) { + $OtherUser['EndTime'] = sqltime(); + } ?> - - $MatchCount) { + + $MatchCount) { ?> - -"> + | » matches skipped for | + + -
-
-
+
+
+
+
-
-
-
-
+
-
-
+
diff --git a/sections/userhistory/password_history.php b/sections/userhistory/password_history.php
index 662636818..61137710f 100644
--- a/sections/userhistory/password_history.php
+++ b/sections/userhistory/password_history.php
@@ -1,4 +1,4 @@
-query("
- SELECT
- um.Username,
- p.Level AS Class
- FROM users_main AS um
- LEFT JOIN permissions AS p ON p.ID = um.PermissionID
- WHERE um.ID = $UserID");
+ SELECT
+ um.Username,
+ p.Level AS Class
+ FROM users_main AS um
+ LEFT JOIN permissions AS p ON p.ID = um.PermissionID
+ WHERE um.ID = $UserID");
list($Username, $Class) = $DB->next_record();
if (!check_perms('users_view_keys', $Class)) {
- error(403);
+ error(403);
}
View::show_header("Password reset history for $Username");
$DB->query("
- SELECT
- ChangeTime,
- ChangerIP
- FROM users_history_passwords
- WHERE UserID = $UserID
- ORDER BY ChangeTime DESC");
+ SELECT
+ ChangeTime,
+ ChangerIP
+ FROM users_history_passwords
+ WHERE UserID = $UserID
+ ORDER BY ChangeTime DESC");
?>
-
-
+
diff --git a/sections/userhistory/post_history.php b/sections/userhistory/post_history.php
index 621bf22c2..ff6d73e72 100644
--- a/sections/userhistory/post_history.php
+++ b/sections/userhistory/post_history.php
@@ -4,18 +4,18 @@
*/
if (!empty($LoggedUser['DisableForums'])) {
- error(403);
+ error(403);
}
$UserID = empty($_GET['userid']) ? $LoggedUser['ID'] : $_GET['userid'];
if (!is_number($UserID)) {
- error(0);
+ error(0);
}
if (isset($LoggedUser['PostsPerPage'])) {
- $PerPage = $LoggedUser['PostsPerPage'];
+ $PerPage = $LoggedUser['PostsPerPage'];
} else {
- $PerPage = POSTS_PER_PAGE;
+ $PerPage = POSTS_PER_PAGE;
}
list($Page, $Limit) = Format::page_limit($PerPage);
@@ -29,265 +29,265 @@
$ShowUnread = ($ViewingOwn && (!isset($_GET['showunread']) || !!$_GET['showunread']));
$ShowGrouped = ($ViewingOwn && (!isset($_GET['group']) || !!$_GET['group']));
if ($ShowGrouped) {
- $sql = '
- SELECT
- SQL_CALC_FOUND_ROWS
- MAX(p.ID) AS ID
- FROM forums_posts AS p
- LEFT JOIN forums_topics AS t ON t.ID = p.TopicID';
- if ($ShowUnread) {
- $sql .= '
- LEFT JOIN forums_last_read_topics AS l ON l.TopicID = t.ID AND l.UserID = '.$LoggedUser['ID'];
- }
- $sql .= "
- LEFT JOIN forums AS f ON f.ID = t.ForumID
- WHERE p.AuthorID = $UserID
- AND " . Forums::user_forums_sql();
- if ($ShowUnread) {
- $sql .= '
- AND ((t.IsLocked = \'0\' OR t.IsSticky = \'1\')
- AND (l.PostID < t.LastPostID OR l.PostID IS NULL))';
- }
- $sql .= "
- GROUP BY t.ID
- ORDER BY p.ID DESC
- LIMIT $Limit";
- $PostIDs = $DB->query($sql);
- $DB->query('SELECT FOUND_ROWS()');
- list($Results) = $DB->next_record();
+ $sql = '
+ SELECT
+ SQL_CALC_FOUND_ROWS
+ MAX(p.ID) AS ID
+ FROM forums_posts AS p
+ LEFT JOIN forums_topics AS t ON t.ID = p.TopicID';
+ if ($ShowUnread) {
+ $sql .= '
+ LEFT JOIN forums_last_read_topics AS l ON l.TopicID = t.ID AND l.UserID = '.$LoggedUser['ID'];
+ }
+ $sql .= "
+ LEFT JOIN forums AS f ON f.ID = t.ForumID
+ WHERE p.AuthorID = $UserID
+ AND " . Forums::user_forums_sql();
+ if ($ShowUnread) {
+ $sql .= '
+ AND ((t.IsLocked = \'0\' OR t.IsSticky = \'1\')
+ AND (l.PostID < t.LastPostID OR l.PostID IS NULL))';
+ }
+ $sql .= "
+ GROUP BY t.ID
+ ORDER BY p.ID DESC
+ LIMIT $Limit";
+ $PostIDs = $DB->query($sql);
+ $DB->query('SELECT FOUND_ROWS()');
+ list($Results) = $DB->next_record();
- if ($Results > $PerPage * ($Page - 1)) {
- $DB->set_query_id($PostIDs);
- $PostIDs = $DB->collect('ID');
- $sql = "
- SELECT
- p.ID,
- p.AddedTime,
- p.Body,
- p.EditedUserID,
- p.EditedTime,
- ed.Username,
- p.TopicID,
- t.Title,
- t.LastPostID,
- l.PostID AS LastRead,
- t.IsLocked,
- t.IsSticky
- FROM forums_posts AS p
- LEFT JOIN users_main AS um ON um.ID = p.AuthorID
- LEFT JOIN users_info AS ui ON ui.UserID = p.AuthorID
- LEFT JOIN users_main AS ed ON ed.ID = p.EditedUserID
- JOIN forums_topics AS t ON t.ID = p.TopicID
- JOIN forums AS f ON f.ID = t.ForumID
- LEFT JOIN forums_last_read_topics AS l ON l.UserID = $UserID
- AND l.TopicID = t.ID
- WHERE p.ID IN (".implode(',', $PostIDs).')
- ORDER BY p.ID DESC';
- $Posts = $DB->query($sql);
- }
+ if ($Results > $PerPage * ($Page - 1)) {
+ $DB->set_query_id($PostIDs);
+ $PostIDs = $DB->collect('ID');
+ $sql = "
+ SELECT
+ p.ID,
+ p.AddedTime,
+ p.Body,
+ p.EditedUserID,
+ p.EditedTime,
+ ed.Username,
+ p.TopicID,
+ t.Title,
+ t.LastPostID,
+ l.PostID AS LastRead,
+ t.IsLocked,
+ t.IsSticky
+ FROM forums_posts AS p
+ LEFT JOIN users_main AS um ON um.ID = p.AuthorID
+ LEFT JOIN users_info AS ui ON ui.UserID = p.AuthorID
+ LEFT JOIN users_main AS ed ON ed.ID = p.EditedUserID
+ JOIN forums_topics AS t ON t.ID = p.TopicID
+ JOIN forums AS f ON f.ID = t.ForumID
+ LEFT JOIN forums_last_read_topics AS l ON l.UserID = $UserID
+ AND l.TopicID = t.ID
+ WHERE p.ID IN (".implode(',', $PostIDs).')
+ ORDER BY p.ID DESC';
+ $Posts = $DB->query($sql);
+ }
} else {
- $sql = '
- SELECT
- SQL_CALC_FOUND_ROWS';
- if ($ShowGrouped) {
- $sql .= '
- *
- FROM (
- SELECT';
- }
- $sql .= '
- p.ID,
- p.AddedTime,
- p.Body,
- p.EditedUserID,
- p.EditedTime,
- ed.Username,
- p.TopicID,
- t.Title,
- t.LastPostID,';
- if ($UserID == $LoggedUser['ID']) {
- $sql .= '
- l.PostID AS LastRead,';
- }
- $sql .= "
- t.IsLocked,
- t.IsSticky
- FROM forums_posts AS p
- LEFT JOIN users_main AS um ON um.ID = p.AuthorID
- LEFT JOIN users_info AS ui ON ui.UserID = p.AuthorID
- LEFT JOIN users_main AS ed ON ed.ID = p.EditedUserID
- JOIN forums_topics AS t ON t.ID = p.TopicID
- JOIN forums AS f ON f.ID = t.ForumID
- LEFT JOIN forums_last_read_topics AS l ON l.UserID = $UserID AND l.TopicID = t.ID
- WHERE p.AuthorID = $UserID
- AND " . Forums::user_forums_sql();
+ $sql = '
+ SELECT
+ SQL_CALC_FOUND_ROWS';
+ if ($ShowGrouped) {
+ $sql .= '
+ *
+ FROM (
+ SELECT';
+ }
+ $sql .= '
+ p.ID,
+ p.AddedTime,
+ p.Body,
+ p.EditedUserID,
+ p.EditedTime,
+ ed.Username,
+ p.TopicID,
+ t.Title,
+ t.LastPostID,';
+ if ($UserID == $LoggedUser['ID']) {
+ $sql .= '
+ l.PostID AS LastRead,';
+ }
+ $sql .= "
+ t.IsLocked,
+ t.IsSticky
+ FROM forums_posts AS p
+ LEFT JOIN users_main AS um ON um.ID = p.AuthorID
+ LEFT JOIN users_info AS ui ON ui.UserID = p.AuthorID
+ LEFT JOIN users_main AS ed ON ed.ID = p.EditedUserID
+ JOIN forums_topics AS t ON t.ID = p.TopicID
+ JOIN forums AS f ON f.ID = t.ForumID
+ LEFT JOIN forums_last_read_topics AS l ON l.UserID = $UserID AND l.TopicID = t.ID
+ WHERE p.AuthorID = $UserID
+ AND " . Forums::user_forums_sql();
- if ($ShowUnread) {
- $sql .= '
- AND ( (t.IsLocked = \'0\' OR t.IsSticky = \'1\')
- AND (l.PostID < t.LastPostID OR l.PostID IS NULL)
- ) ';
- }
+ if ($ShowUnread) {
+ $sql .= '
+ AND ( (t.IsLocked = \'0\' OR t.IsSticky = \'1\')
+ AND (l.PostID < t.LastPostID OR l.PostID IS NULL)
+ ) ';
+ }
- $sql .= '
- ORDER BY p.ID DESC';
+ $sql .= '
+ ORDER BY p.ID DESC';
- if ($ShowGrouped) {
- $sql .= '
- ) AS sub
- GROUP BY TopicID
- ORDER BY ID DESC';
- }
+ if ($ShowGrouped) {
+ $sql .= '
+ ) AS sub
+ GROUP BY TopicID
+ ORDER BY ID DESC';
+ }
- $sql .= " LIMIT $Limit";
- $Posts = $DB->query($sql);
+ $sql .= " LIMIT $Limit";
+ $Posts = $DB->query($sql);
- $DB->query('SELECT FOUND_ROWS()');
- list($Results) = $DB->next_record();
+ $DB->query('SELECT FOUND_ROWS()');
+ list($Results) = $DB->next_record();
- $DB->set_query_id($Posts);
+ $DB->set_query_id($Posts);
}
?>
-
-
-
+
+
+
| IP address | -Torrent | -Time | -
| IP address | +Torrent | +Time | +
|
- () - WI - |
- - | - |
+ () + WI + |
+ + | + + |
-
+
-
diff --git a/sections/userhistory/passkey_history.php b/sections/userhistory/passkey_history.php
index a79e554a3..2d2c23e7b 100644
--- a/sections/userhistory/passkey_history.php
+++ b/sections/userhistory/passkey_history.php
@@ -1,4 +1,4 @@
-query("
- SELECT
- um.Username,
- p.Level AS Class
- FROM users_main AS um
- LEFT JOIN permissions AS p ON p.ID = um.PermissionID
- WHERE um.ID = $UserID");
+ SELECT
+ um.Username,
+ p.Level AS Class
+ FROM users_main AS um
+ LEFT JOIN permissions AS p ON p.ID = um.PermissionID
+ WHERE um.ID = $UserID");
list($Username, $Class) = $DB->next_record();
if (!check_perms('users_view_keys', $Class)) {
- error(403);
+ error(403);
}
View::show_header("PassKey history for $Username");
$DB->query("
- SELECT
- OldPassKey,
- NewPassKey,
- ChangeTime,
- ChangerIP
- FROM users_history_passkeys
- WHERE UserID = $UserID
- ORDER BY ChangeTime DESC");
+ SELECT
+ OldPassKey,
+ NewPassKey,
+ ChangeTime,
+ ChangerIP
+ FROM users_history_passkeys
+ WHERE UserID = $UserID
+ ORDER BY ChangeTime DESC");
?>
| Old | -New | -Changed | -IP H | -
| - | - | - | S |
-
| Old | +New | +Changed | +IP H | +
| + | + | + | S |
+
| Changed | -IP H | -
| - | S |
-
| Changed | +IP H | +
| + | S |
+
-
+get_query_id();
+ while (list($PostID, $AddedTime, $Body, $EditedUserID, $EditedTime, $EditedUsername, $TopicID, $ThreadTitle, $LastPostID, $LastRead, $Locked, $Sticky) = $DB->next_record()) {
?>
-
-
-$Username";
- }
- elseif ($ShowUnread) {
- echo "Unread post history for $Username";
- }
- else {
- echo "Post history for $Username";
- }
+
+
-
-$Username";
- }
- elseif ($ShowUnread) {
- echo "Unread post history for $Username";
- }
- else {
- echo "Post history for $Username";
- }
+
+
+$Username";
+ }
+ elseif ($ShowUnread) {
+ echo "Unread post history for $Username";
+ }
+ else {
+ echo "Post history for $Username";
+ }
?>
-
-
-
-
+
+
+
- Show all posts
-
- Show all posts (grouped)
-
- Only display posts with unread replies (grouped)
-
- Show all posts
-
- Only display posts with unread replies (grouped)
-
- Only display posts with unread replies
-
+ Show all posts
+
+ Show all posts (grouped)
+
+ Only display posts with unread replies (grouped)
+
+ Show all posts
+
+ Only display posts with unread replies (grouped)
+
+ Only display posts with unread replies
+
- Go to subscriptions
-Go to subscriptions
+
- Search
-" class="brackets">Search
+
-
-
-
+
+
-
- No topics
-
-
+ No topics
+
+$Username"; + } + elseif ($ShowUnread) { + echo "Unread post history for $Username"; + } + else { + echo "Post history for $Username"; + } ?> -
-
-
- +
-
+ - +
+
+ - Show all posts - - Show all posts (grouped) - - Only display posts with unread replies (grouped) - - Show all posts - - Only display posts with unread replies (grouped) - - Only display posts with unread replies - + Show all posts + + Show all posts (grouped) + + Only display posts with unread replies (grouped) + + Show all posts + + Only display posts with unread replies (grouped) + + Only display posts with unread replies + - Go to subscriptions -Go to subscriptions + - Search -" class="brackets">Search + -
- + - Show all posts - - Show all posts (grouped) - - Only display posts with unread replies (grouped) - - Show all posts - - Only display posts with unread replies (grouped) - - Only display posts with unread replies - + Show all posts + + Show all posts (grouped) + + Only display posts with unread replies (grouped) + + Show all posts + + Only display posts with unread replies (grouped) + + Only display posts with unread replies + - Go to subscriptions -Go to subscriptions + - Search -" class="brackets">Search + -
-
+
-
-get_query_id();
- while (list($PostID, $AddedTime, $Body, $EditedUserID, $EditedTime, $EditedUsername, $TopicID, $ThreadTitle, $LastPostID, $LastRead, $Locked, $Sticky) = $DB->next_record()) {
+
-
-
- in
-
- (New!)
-" id="post">
+ |
+
+
+ in
+
+ (New!)
+
-
-
-
-
-
-
+
+
+
+
+
-
-
+
-
-
- Subscribe
-
-
- ↑
-
- |
- |
+
| - - | - -- + | +
+
-
-
+
-
- +
+
+
-
-
- - Quote notifications - -
- -No quotes.
-
- - +
+ Quote notifications + +
+ +No quotes.
+
+ +' . display_str($Result['ForumName']) . ' > ' . - '' . Format::cut_string($Result['ForumTitle'], 75) . ''; - $JumpLink = 'forums.php?action=viewthread&threadid=' . $Result['PageID'] . '&postid=' . $Result['PostID'] . '#post' . $Result['PostID']; - break; - case 'artist': - $Links = 'Artist: ' . display_str($Result['ArtistName']) . ''; - $JumpLink = 'artist.php?id=' . $Result['PageID'] . '&postid=' . $Result['PostID'] . '#post' . $Result['PostID']; - break; - case 'collages': - $Links = 'Collage: ' . display_str($Result['CollageName']) . ''; - $JumpLink = 'collages.php?action=comments&collageid=' . $Result['PageID'] . '&postid=' . $Result['PostID'] . '#post' . $Result['PostID']; - break; - case 'requests': - if (!isset($Requests[$Result['PageID']])) { - // Deleted request - continue 2; - } - $Request = $Requests[$Result['PageID']]; - $CategoryName = $Categories[$Request['CategoryID'] - 1]; - $Links = 'Request: '; - if ($CategoryName == 'Music') { - $Links .= Artists::display_artists(Requests::get_artists($Result['PageID'])) . '' . $Request['Title'] . " [" . $Request['Year'] . "]"; - } elseif ($CategoryName == "Audiobooks" || $CategoryName == "Comedy") { - $Links .= '' . $Request['Title'] . " [" . $Request['Year'] . "]"; - } else { - $Links .= '' . $Request['Title'] . ""; - } - $JumpLink = 'requests.php?action=view&id=' . $Result['PageID'] . '&postid=' . $Result['PostID'] . '#post' . $Result['PostID']; - break; - case 'torrents': - if (!isset($TorrentGroups[$Result['PageID']])) { - // Deleted or moved torrent group - continue 2; - } - $GroupInfo = $TorrentGroups[$Result['PageID']]; - $Links = 'Torrent: ' . Artists::display_artists($GroupInfo['ExtendedArtists']) . '' . $GroupInfo['Name'] . ''; - if ($GroupInfo['Year'] > 0) { - $Links .= " [" . $GroupInfo['Year'] . "]"; - } - if ($GroupInfo['ReleaseType'] > 0) { - $Links .= " [" . $ReleaseTypes[$GroupInfo['ReleaseType']] . "]"; - } - $JumpLink = 'torrents.php?id=' . $GroupInfo['ID'] . '&postid=' . $Result['PostID'] . '#post' . $Result['PostID']; - break; - default: - continue 2; - } + switch ($Result['Page']) { + case 'forums': + $Links = 'Forums: ' . display_str($Result['ForumName']) . ' > ' . + '' . Format::cut_string($Result['ForumTitle'], 75) . ''; + $JumpLink = 'forums.php?action=viewthread&threadid=' . $Result['PageID'] . '&postid=' . $Result['PostID'] . '#post' . $Result['PostID']; + break; + case 'artist': + $Links = 'Artist: ' . display_str($Result['ArtistName']) . ''; + $JumpLink = 'artist.php?id=' . $Result['PageID'] . '&postid=' . $Result['PostID'] . '#post' . $Result['PostID']; + break; + case 'collages': + $Links = 'Collage: ' . display_str($Result['CollageName']) . ''; + $JumpLink = 'collages.php?action=comments&collageid=' . $Result['PageID'] . '&postid=' . $Result['PostID'] . '#post' . $Result['PostID']; + break; + case 'requests': + if (!isset($Requests[$Result['PageID']])) { + // Deleted request + continue 2; + } + $Request = $Requests[$Result['PageID']]; + $CategoryName = $Categories[$Request['CategoryID'] - 1]; + $Links = 'Request: '; + if ($CategoryName == 'Music') { + $Links .= Artists::display_artists(Requests::get_artists($Result['PageID'])) . '' . $Request['Title'] . " [" . $Request['Year'] . "]"; + } elseif ($CategoryName == "Audiobooks" || $CategoryName == "Comedy") { + $Links .= '' . $Request['Title'] . " [" . $Request['Year'] . "]"; + } else { + $Links .= '' . $Request['Title'] . ""; + } + $JumpLink = 'requests.php?action=view&id=' . $Result['PageID'] . '&postid=' . $Result['PostID'] . '#post' . $Result['PostID']; + break; + case 'torrents': + if (!isset($TorrentGroups[$Result['PageID']])) { + // Deleted or moved torrent group + continue 2; + } + $GroupInfo = $TorrentGroups[$Result['PageID']]; + $Links = 'Torrent: ' . Artists::display_artists($GroupInfo['ExtendedArtists']) . '' . $GroupInfo['Name'] . ''; + if ($GroupInfo['Year'] > 0) { + $Links .= " [" . $GroupInfo['Year'] . "]"; + } + if ($GroupInfo['ReleaseType'] > 0) { + $Links .= " [" . $ReleaseTypes[$GroupInfo['ReleaseType']] . "]"; + } + $JumpLink = 'torrents.php?id=' . $GroupInfo['ID'] . '&postid=' . $Result['PostID'] . '#post' . $Result['PostID']; + break; + default: + continue 2; + } ?> -
| - - - > Quoted by - (New!)' : '')?> - - - - - - ↑ - - | -
| + + + > Quoted by + (New!)' : '')?> + + + + + + ↑ + + | +
-
+
-
-
+ Subscribed collages
+
+
-" class="brackets">Catch up
+ Subscribed collages
- -
- No subscribed collages
-
-
+ No subscribed collages
+
+query("
- SELECT GroupID
- FROM collages_torrents
- WHERE CollageID = $CollageID
- AND AddedOn > '" . db_string($LastVisit) . "'
- ORDER BY AddedOn");
- $NewTorrentCount = $DB->record_count();
+ list($CollageID, $CollageName, $CollageSize, $LastVisit) = $Collage;
+ $RS = $DB->query("
+ SELECT GroupID
+ FROM collages_torrents
+ WHERE CollageID = $CollageID
+ AND AddedOn > '" . db_string($LastVisit) . "'
+ ORDER BY AddedOn");
+ $NewTorrentCount = $DB->record_count();
- $GroupIDs = $DB->collect('GroupID', false);
- if (count($GroupIDs) > 0) {
- $TorrentList = Torrents::get_groups($GroupIDs);
- } else {
- $TorrentList = array();
- }
+ $GroupIDs = $DB->collect('GroupID', false);
+ if (count($GroupIDs) > 0) {
+ $TorrentList = Torrents::get_groups($GroupIDs);
+ } else {
+ $TorrentList = [];
+ }
- $Artists = Artists::get_artists($GroupIDs);
- $Number = 0;
+ $Artists = Artists::get_artists($GroupIDs);
+ $Number = 0;
- foreach ($GroupIDs as $GroupID) {
- if (!isset($TorrentList[$GroupID])) {
- continue;
- }
- $Group = $TorrentList[$GroupID];
- extract(Torrents::array_group($Group));
+ foreach ($GroupIDs as $GroupID) {
+ if (!isset($TorrentList[$GroupID])) {
+ continue;
+ }
+ $Group = $TorrentList[$GroupID];
+ extract(Torrents::array_group($Group));
- $DisplayName = '';
+ $DisplayName = '';
- $TorrentTags = new Tags($TagList);
+ $TorrentTags = new Tags($TagList);
- if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4]) || !empty($ExtendedArtists[5]) || !empty($ExtendedArtists[6])) {
- unset($ExtendedArtists[2]);
- unset($ExtendedArtists[3]);
- $DisplayName .= Artists::display_artists($ExtendedArtists);
- } elseif (count($Artists) > 0) {
- $DisplayName .= Artists::display_artists(array('1' => $Artists));
- }
- $DisplayName .= "$GroupName";
- if ($GroupYear > 0) {
- $DisplayName = "$DisplayName [$GroupYear]";
- }
- if ($GroupVanityHouse) {
- $DisplayName .= ' [VH]';
- }
+ if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4]) || !empty($ExtendedArtists[5]) || !empty($ExtendedArtists[6])) {
+ unset($ExtendedArtists[2]);
+ unset($ExtendedArtists[3]);
+ $DisplayName .= Artists::display_artists($ExtendedArtists);
+ } elseif (count($Artists) > 0) {
+ $DisplayName .= Artists::display_artists(array('1' => $Artists));
+ }
+ $DisplayName .= "$GroupName";
+ if ($GroupYear > 0) {
+ $DisplayName = "$DisplayName [$GroupYear]";
+ }
+ if ($GroupVanityHouse) {
+ $DisplayName .= ' [VH]';
+ }
- $SnatchedGroupClass = $GroupFlags['IsSnatched'] ? ' snatched_group' : '';
+ $SnatchedGroupClass = $GroupFlags['IsSnatched'] ? ' snatched_group' : '';
- // Start an output buffer, so we can store this output in $TorrentTable
- ob_start();
- if (count($Torrents) > 1 || $GroupCategoryID == 1) {
+ // Start an output buffer, so we can store this output in $TorrentTable
+ ob_start();
+ if (count($Torrents) > 1 || $GroupCategoryID == 1) {
?>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
- | - - ( new torrent) - - - Catch up Unsubscribe - - | -
- Report -