From d07f2a1a67399216d913f748a8590909003b8b68 Mon Sep 17 00:00:00 2001 From: Git Date: Tue, 24 Jan 2012 08:00:19 +0000 Subject: [PATCH] Empty commit --- classes/script_start.php | 8 +++++ gazelle.sql | 14 ++++++++ sections/reportsv2/takeresolve.php | 3 ++ sections/requests/requests.php | 6 ---- sections/torrents/add_alias.php | 1 + sections/torrents/delete_alias.php | 1 + sections/torrents/details.php | 1 + sections/torrents/editgroupid.php | 2 ++ sections/torrents/grouplog.php | 53 ++++++++++++++++++++++++++++++ sections/torrents/merge.php | 10 ++++-- sections/torrents/rename.php | 1 + sections/torrents/takedelete.php | 1 + sections/torrents/takeedit.php | 1 + sections/upload/upload_handle.php | 1 + sections/user/takemoderate.php | 15 +++++++-- sections/user/user.php | 11 ++++--- 16 files changed, 113 insertions(+), 16 deletions(-) create mode 100644 sections/torrents/grouplog.php diff --git a/classes/script_start.php b/classes/script_start.php index 737f1fd3..346ebd89 100644 --- a/classes/script_start.php +++ b/classes/script_start.php @@ -1067,6 +1067,12 @@ function make_class_string($ClassID) { return $Classes[$ClassID]['Name']; } +//Write to the group log +function write_group_log($GroupID, $TorrentID, $UserID, $Message, $Hidden) { + global $DB,$Time; + $DB->query("INSERT INTO group_log (GroupID, TorrentID, UserID, Info, Time, Hidden) VALUES (".$GroupID.", ".$TorrentID.", ".$UserID.", '".db_string($Message)."', '".sqltime()."', ".$Hidden.")"); +} + // Write a message to the system log function write_log($Message) { global $DB,$Time; @@ -1161,6 +1167,7 @@ function delete_group($GroupID) { global $DB, $Cache; write_log("Group ".$GroupID." automatically deleted (No torrents have this group)."); + //$DB->query("DELETE FROM group_log WHERE GroupID = ".$GroupID); //Never call this unless you're certain the group is no longer used by any torrents $DB->query("SELECT CategoryID FROM torrents_group WHERE ID='$GroupID'"); @@ -2167,6 +2174,7 @@ function freeleech_torrents($TorrentIDs, $FreeNeutral = 1, $FreeLeechType = 0) { update_tracker('update_torrent', array('info_hash' => rawurlencode($InfoHash), 'freetorrent' => $FreeNeutral)); $Cache->delete_value('torrent_download_'.$TorrentID); write_log($LoggedUser['Username']." marked torrent ".$TorrentID." freeleech type ".$FreeLeechType."!"); + write_group_log($GroupID, $TorrentID, $LoggedUser['UserID'], "marked as freeleech type ".$FreeLeechType."!", 0); } foreach($GroupIDs as $GroupID) { diff --git a/gazelle.sql b/gazelle.sql index 2dbdebe5..d35228df 100644 --- a/gazelle.sql +++ b/gazelle.sql @@ -323,6 +323,20 @@ CREATE TABLE `geoip_country` ( PRIMARY KEY (`StartIP`,`EndIP`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; +CREATE TABLE `group_log` ( + `ID` int(10) NOT NULL AUTO_INCREMENT, + `GroupID` int(10) NOT NULL, + `TorrentID` int(10) NOT NULL, + `UserID` int(10) NOT NULL DEFAULT '0', + `Info` mediumtext, + `Time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `Hidden` tinyint(4) NOT NULL DEFAULT '0', + PRIMARY KEY (`ID`), + KEY `GroupID` (`GroupID`), + KEY `TorrentID` (`TorrentID`), + KEY `UserID` (`UserID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + CREATE TABLE `invite_tree` ( `UserID` int(10) NOT NULL DEFAULT '0', `InviterID` int(10) NOT NULL DEFAULT '0', diff --git a/sections/reportsv2/takeresolve.php b/sections/reportsv2/takeresolve.php index 86432f22..28fc1f24 100644 --- a/sections/reportsv2/takeresolve.php +++ b/sections/reportsv2/takeresolve.php @@ -178,8 +178,11 @@ if(isset($Escaped['log_message']) && $Escaped['log_message'] != "") { $Log .= " ( ".$Escaped['log_message']." )"; } + $DB->query("SELECT GroupID FROM torrents WHERE ID = ".$TorrentID); + list($GroupID) = $DB->next_record(); delete_torrent($TorrentID); write_log($Log); + write_group_log($GroupID, $TorrentID, $LoggedUser['ID'], "deleted torrent", 0); } else { $Log = "No log message (Torrent wasn't deleted)"; } diff --git a/sections/requests/requests.php b/sections/requests/requests.php index 4daccaf2..b6a66aa5 100644 --- a/sections/requests/requests.php +++ b/sections/requests/requests.php @@ -23,9 +23,6 @@ case 'created': $Title = 'My requests'; $SS->set_filter('userid', array($LoggedUser['ID'])); - if(empty($_GET['show_filled'])) { - $SS->set_filter('torrentid', array(0)); - } break; case 'voted': if(!empty($_GET['userid'])) { @@ -40,9 +37,6 @@ $Title = "Requests I've voted on"; $SS->set_filter('voter', array($LoggedUser['ID'])); } - if(empty($_GET['show_filled']) && $Submitted) { - $SS->set_filter('torrentid', array(0)); - } break; case 'filled': if(empty($_GET['userid']) || !is_number($_GET['userid'])) { diff --git a/sections/torrents/add_alias.php b/sections/torrents/add_alias.php index 6afe2896..506ded3c 100644 --- a/sections/torrents/add_alias.php +++ b/sections/torrents/add_alias.php @@ -60,6 +60,7 @@ NumArtists=VALUES(NumArtists);"); write_log("Artist ".$ArtistID." (".$ArtistName.") was added to the group ".$GroupID." (".$GroupName.") by user ".$LoggedUser['ID']." (".$LoggedUser['Username'].")"); + write_group_log($GroupID, 0, $LoggedUser['ID'], "added artist ".$ArtistName, 0); } else { list($OldAliasID) = $DB->next_record(); if($OldAliasID == 0) { diff --git a/sections/torrents/delete_alias.php b/sections/torrents/delete_alias.php index 3e6a503d..0c5eef06 100644 --- a/sections/torrents/delete_alias.php +++ b/sections/torrents/delete_alias.php @@ -49,6 +49,7 @@ $Cache->delete_value('torrents_details_'.$GroupID); // Delete torrent group cache $Cache->delete_value('groups_artists_'.$GroupID); // Delete group artist cache write_log("Artist ".$ArtistID." (".$ArtistName.") was removed from the group ".$GroupID." (".$GroupName.") by user ".$LoggedUser['ID']." (".$LoggedUser['Username'].")"); +write_group_log($GroupID, 0, $LoggedUser['ID'], "removed artist ".$ArtistName, 0); update_hash($GroupID); diff --git a/sections/torrents/details.php b/sections/torrents/details.php index fd0a0f5d..e3b5ebd1 100644 --- a/sections/torrents/details.php +++ b/sections/torrents/details.php @@ -105,6 +105,7 @@ function compare($X, $Y){ if(check_perms('site_submit_requests')) { ?> [Request format] + [View log]
diff --git a/sections/torrents/editgroupid.php b/sections/torrents/editgroupid.php index 23092db1..7e9f5fc7 100644 --- a/sections/torrents/editgroupid.php +++ b/sections/torrents/editgroupid.php @@ -84,6 +84,8 @@ } write_log("Torrent $TorrentID was edited by " . $LoggedUser['Username']); // TODO: this is probably broken + 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); diff --git a/sections/torrents/grouplog.php b/sections/torrents/grouplog.php new file mode 100644 index 00000000..011f5d1a --- /dev/null +++ b/sections/torrents/grouplog.php @@ -0,0 +1,53 @@ + + +
+

History for Group

+ + + + + + + + +query("SELECT TorrentID, UserID, Info, Time FROM group_log WHERE GroupID = ".$GroupID." ORDER BY Time DESC"); + + while (list($TorrentID, $UserID, $Info, $Time) = $DB->next_record()) + { +?> + + +query("SELECT Media, Format, Encoding FROM torrents WHERE ID=".$TorrentID); + list($Media, $Format, $Encoding) = $DB->next_record(); + if ($Media == "") { ?> + + + + + + + +
DateTorrentUserInfo
(Deleted) (//) +query("SELECT Username FROM users_main WHERE ID = ".$UserID); + list($Username) = $DB->next_record(); + $DB->set_query_id($Log); +?> +
+
+ diff --git a/sections/torrents/merge.php b/sections/torrents/merge.php index 24f1bb52..0898f6a4 100644 --- a/sections/torrents/merge.php +++ b/sections/torrents/merge.php @@ -18,11 +18,12 @@ if($Categories[$CategoryID-1] != 'Music') { error('Only music groups can be merged.'); } + +$DB->query("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'])) { - $DB->query("SELECT Name FROM torrents_group WHERE ID = ".$GroupID); - list($Name) = $DB->next_record(); - $Artists = get_artists(array($GroupID, $NewGroupID)); show_header(); @@ -54,6 +55,9 @@ $DB->query("UPDATE torrents_comments SET GroupID='$NewGroupID' WHERE GroupID='$GroupID'"); delete_group($GroupID); + + 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; diff --git a/sections/torrents/rename.php b/sections/torrents/rename.php index 20fdfe01..dac544dc 100644 --- a/sections/torrents/rename.php +++ b/sections/torrents/rename.php @@ -27,5 +27,6 @@ update_hash($GroupID); write_log("Torrent Group ".$GroupID." (".$OldName.") was renamed to '".$NewName."' by ".$LoggedUser['Username']); +write_group_log($GroupID, 0, $LoggedUser['ID'], "renamed to ".$NewName." from ".$OldName, 0); header('Location: torrents.php?id='.$GroupID); diff --git a/sections/torrents/takedelete.php b/sections/torrents/takedelete.php index d71b0611..9667ad37 100644 --- a/sections/torrents/takedelete.php +++ b/sections/torrents/takedelete.php @@ -40,6 +40,7 @@ $InfoHash = unpack("H*", $InfoHash); delete_torrent($TorrentID, $GroupID); write_log('Torrent '.$TorrentID.' ('.$Name.') ('.number_format($Size/(1024*1024), 2).' MB) ('.strtoupper($InfoHash[1]).') was deleted by '.$LoggedUser['Username'].': ' .$_POST['reason'].' '.$_POST['extra']); +write_group_log($GroupID, $TorrentID, $LoggedUser['ID'], "deleted torrent (".number_format($Size/(1024*1024), 2)."' MB, ".strtoupper($InfoHash[1]).") for reason: ".$_POST['reason']." ".$_POST['extra'], 0); show_header('Torrent deleted'); ?> diff --git a/sections/torrents/takeedit.php b/sections/torrents/takeedit.php index 5b80cb78..35936481 100644 --- a/sections/torrents/takeedit.php +++ b/sections/torrents/takeedit.php @@ -395,6 +395,7 @@ list($Name) = $DB->next_record(); write_log("Torrent $TorrentID ($Name) in group $GroupID was edited by ".$LoggedUser['Username']." (".$LogDetails.")"); // TODO: this is probably broken +write_group_log($GroupID, $TorrentID, $LoggedUser['ID'], $LogDetails, 0); $Cache->delete_value('torrents_details_'.$GroupID); $Cache->delete_value('torrent_download_'.$TorrentID); diff --git a/sections/upload/upload_handle.php b/sections/upload/upload_handle.php index ca633aef..4ff42c22 100644 --- a/sections/upload/upload_handle.php +++ b/sections/upload/upload_handle.php @@ -649,6 +649,7 @@ $DB->query("INSERT INTO torrents_files (TorrentID, File) VALUES ($TorrentID, '".db_string($Tor->dump_data())."')"); write_log("Torrent $TorrentID ($LogName) (".number_format($TotalSize/(1024*1024), 2)." MB) was uploaded by " . $LoggedUser['Username']); +write_group_log($GroupID, $TorrentID, $LoggedUser['ID'], "uploaded (".number_format($TotalSize/(1024*1024), 2)." MB)", 0); update_hash($GroupID); diff --git a/sections/user/takemoderate.php b/sections/user/takemoderate.php index 23edb731..fbe3e25f 100644 --- a/sections/user/takemoderate.php +++ b/sections/user/takemoderate.php @@ -208,7 +208,7 @@ $Cache->delete_value('users_sessions_'.$UserID); - $DB->query("DELETE FROM users_sessions WHERE UserID="'$UserID'"); + $DB->query("DELETE FROM users_sessions WHERE UserID='$UserID'"); } } @@ -404,7 +404,7 @@ if ($DisableLeech!=$Cur['can_leech'] && check_perms('users_disable_any')) { $UpdateSet[]="can_leech='$DisableLeech'"; - $EditSummary[]="leeching status changed"; + $EditSummary[]="leeching status changed (".translateLeechStatus($Cur['can_leech'])." -> ".translateLeechStatus($DisableLeech).")"; $HeavyUpdates['DisableLeech']=$DisableLeech; $HeavyUpdates['CanLeech']=$DisableLeech; if (!empty($UserReason)) { @@ -675,4 +675,15 @@ function translateUserStatus($status) { return $status; } } + +function translateLeechStatus($status) { + switch ($status) { + case 0: + return "Disabled"; + case 1: + return "Enabled"; + default: + return $status; + } +} ?> diff --git a/sections/user/user.php b/sections/user/user.php index 111fce4d..1a26b42e 100644 --- a/sections/user/user.php +++ b/sections/user/user.php @@ -231,14 +231,15 @@ function check_paranoia_here($Setting) { if (check_paranoia_here('requestsfilled_count') || check_paranoia_here('requestsfilled_bounty')) { $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; +} + +if (check_paranoia_here('requestsvoted_count') || check_paranoia_here('requestsvoted_bounty')) { $DB->query("SELECT COUNT(rv.RequestID), SUM(rv.Bounty) FROM requests_votes AS rv WHERE rv.UserID = ".$UserID); list($RequestsVoted, $TotalSpent) = $DB->next_record(); - - $DB->query("SELECT COUNT(ID) FROM torrents WHERE UserID='$UserID'"); - list($Uploads) = $DB->next_record(); } else { - $RequestsVoted = 0; - $TotalSpent = 0; + $RequestsVoted = $TotalSpent = 0; } if(check_paranoia_here('uploads+')) {