diff --git a/classes/class_torrent_form.php b/classes/class_torrent_form.php index 075abaec..58da1ef3 100644 --- a/classes/class_torrent_form.php +++ b/classes/class_torrent_form.php @@ -573,8 +573,8 @@ function show() { Lossy web approved: /> - -NewTorrent) { ?> +NewTorrent) { ?> Tags: @@ -588,19 +588,7 @@ function show() { Disabled?> />
- 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 to the left of the text box. 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 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". -

- Only tag information on the album itself—NOT THE INDIVIDUAL RELEASE. Tags such as "v0", "eac", "vinyl", "from.oink", 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 to the left of the text box. If you are in any doubt about whether or not a tag is acceptable, do not add it. + diff --git a/classes/rules.class.php b/classes/rules.class.php new file mode 100644 index 00000000..874fd967 --- /dev/null +++ b/classes/rules.class.php @@ -0,0 +1,53 @@ + + + + +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'"); + $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); } @@ -735,7 +736,7 @@ function compare($X, $Y) { ?> - + IRC Rules - Please read these carefully!
- +
diff --git a/sections/collages/artist_collage.php b/sections/collages/artist_collage.php index 1ca1cc83..a85436db 100644 --- a/sections/collages/artist_collage.php +++ b/sections/collages/artist_collage.php @@ -1,16 +1,17 @@ query("SELECT - ca.ArtistID, - ag.Name, - aw.Image, - um.ID AS UserID, - um.Username - 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 - LEFT JOIN users_main AS um ON um.ID=ca.UserID - WHERE ca.CollageID='$CollageID' - ORDER BY ca.Sort"); +$DB->query(" + SELECT + ca.ArtistID, + ag.Name, + aw.Image, + um.ID AS UserID, + um.Username + 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 + 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); @@ -24,7 +25,7 @@ $NumArtistsByUser = 0; $Users = array(); -foreach($Artists as $Artist) { +foreach ($Artists as $Artist) { $UserID = $Artist['UserID']; $Username = $Artist['Username']; $NumArtists++; @@ -54,11 +55,11 @@ ?>
  • - - <?=$Artist['Name']?> - - - + + <?=$Artist['Name']?> + + +
    • query("UPDATE users_collage_subs SET LastVisit=NOW() WHERE UserID = ".$LoggedUser['ID']." AND CollageID=$CollageID"); -if($CollageCategoryID == array_search(ARTIST_COLLAGE, $CollageCats)) { +if ($CollageCategoryID == array_search(ARTIST_COLLAGE, $CollageCats)) { include(SERVER_ROOT.'/sections/collages/artist_collage.php'); } else { include(SERVER_ROOT.'/sections/collages/torrent_collage.php'); diff --git a/sections/collages/manage_artists.php b/sections/collages/manage_artists.php index 9986d081..64369c8b 100644 --- a/sections/collages/manage_artists.php +++ b/sections/collages/manage_artists.php @@ -9,21 +9,22 @@ if ($CategoryID == 0 && $UserID != $LoggedUser['ID'] && !check_perms('site_collages_delete')) { error(403); } -if($CategoryID != array_search(ARTIST_COLLAGE, $CollageCats)) { +if ($CategoryID != array_search(ARTIST_COLLAGE, $CollageCats)) { error(403); } -$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"); +$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"); $Artists = $DB->to_array('ArtistID', MYSQLI_ASSOC); @@ -64,7 +65,7 @@
    - + diff --git a/sections/collages/manage_artists_handle.php b/sections/collages/manage_artists_handle.php index 2ba5b979..30d615d6 100644 --- a/sections/collages/manage_artists_handle.php +++ b/sections/collages/manage_artists_handle.php @@ -12,7 +12,7 @@ if ($CategoryID == 0 && $UserID != $LoggedUser['ID'] && !check_perms('site_collages_delete')) { error(403); } -if($CategoryID != array_search(ARTIST_COLLAGE, $CollageCats)) { +if ($CategoryID != array_search(ARTIST_COLLAGE, $CollageCats)) { error(403); } @@ -52,7 +52,11 @@ if (!is_number($Sort)) { error(404); } - $DB->query("UPDATE collages_artists SET Sort='$Sort' WHERE CollageID='$CollageID' AND ArtistID='$ArtistID'"); + $DB->query(" + UPDATE collages_artists + SET Sort='$Sort' + WHERE CollageID='$CollageID' + AND ArtistID='$ArtistID'"); } $Cache->delete_value('collage_'.$CollageID); diff --git a/sections/collages/torrent_collage.php b/sections/collages/torrent_collage.php index daae53f6..33acf607 100644 --- a/sections/collages/torrent_collage.php +++ b/sections/collages/torrent_collage.php @@ -1,16 +1,17 @@ query("SELECT - ct.GroupID, - tg.WikiImage, - tg.CategoryID, - um.ID, - um.Username - 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"); +$DB->query(" + SELECT + ct.GroupID, + tg.WikiImage, + tg.CategoryID, + um.ID, + um.Username + 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); diff --git a/sections/reportsv2/views.php b/sections/reportsv2/views.php index e02d05bd..a8a9133b 100644 --- a/sections/reportsv2/views.php +++ b/sections/reportsv2/views.php @@ -223,14 +223,16 @@
    ↑ This artists is in collage1) ? 's' : '')?>↑ This artists is in collage 1) ? 's' : '')?> # artists
    Order## Artist User Tweak
    - + + - + +
    Staff memberCurrent count
    Current count
    's reports
    diff --git a/sections/rules/chat.php b/sections/rules/chat.php index 65a28415..824a1aff 100644 --- a/sections/rules/chat.php +++ b/sections/rules/chat.php @@ -89,53 +89,7 @@

    IRC Rules

    - +
    diff --git a/sections/rules/tag.php b/sections/rules/tag.php index b4872763..403e0d57 100644 --- a/sections/rules/tag.php +++ b/sections/rules/tag.php @@ -8,20 +8,7 @@

    Tagging rules

    - +
    diff --git a/sections/torrents/add_tag.php b/sections/torrents/add_tag.php index fec22279..f9474752 100644 --- a/sections/torrents/add_tag.php +++ b/sections/torrents/add_tag.php @@ -12,7 +12,7 @@ } //Delete cached tag used for undos -if(isset($_POST['undo'])) { +if (isset($_POST['undo'])) { $Cache->delete_value('deleted_tags_'.$GroupID.'_'.$LoggedUser['ID']); } @@ -23,29 +23,44 @@ if (!empty($TagName)) { $TagName = Misc::get_alias_tag($TagName); // Check DB for tag matching name - $DB->query("SELECT t.ID FROM tags AS t WHERE t.Name LIKE '".$TagName."'"); + $DB->query(" + SELECT t.ID + FROM tags AS t + WHERE t.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.")"); + $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'"); + $DB->query(" + SELECT TagID + FROM torrents_tags_votes + WHERE GroupID='$GroupID' + AND TagID='$TagID' + AND UserID='$UserID'"); if ($DB->record_count() != 0) { // User has already voted on this tag, and is trying hax to make the rating go up header('Location: '.$_SERVER['HTTP_REFERER']); die(); } } - $DB->query("INSERT INTO torrents_tags - (TagID, GroupID, PositiveVotes, UserID) VALUES - ('$TagID', '$GroupID', '3', '$UserID') + $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')."')"); } } diff --git a/sections/torrents/details.php b/sections/torrents/details.php index 46eb2057..342ef835 100644 --- a/sections/torrents/details.php +++ b/sections/torrents/details.php @@ -313,9 +313,9 @@ function compare($X, $Y) {
    Tags - get_value('deleted_tags_'.$GroupID.'_'.$LoggedUser['ID']); - if(!empty($DeletedTag)) { ?> + if (!empty($DeletedTag)) { ?> @@ -325,7 +325,7 @@ function compare($X, $Y) { Undo Delete - +
    0) { diff --git a/sections/upload/upload_handle.php b/sections/upload/upload_handle.php index df70e6c6..0f128333 100644 --- a/sections/upload/upload_handle.php +++ b/sections/upload/upload_handle.php @@ -952,7 +952,7 @@ if (!is_array($Paranoia)) { $Paranoia = array(); } -if(!in_array('notifications', $Paranoia)) { +if (!in_array('notifications', $Paranoia)) { $SQL.=" AND (Users LIKE '%|".$LoggedUser['ID']."|%' OR Users = '') "; } diff --git a/sections/userhistory/collage_subscribe.php b/sections/userhistory/collage_subscribe.php index 340ced7e..34b2fb41 100644 --- a/sections/userhistory/collage_subscribe.php +++ b/sections/userhistory/collage_subscribe.php @@ -25,4 +25,3 @@ } $Cache->replace_value('collage_subs_user_'.$LoggedUser['ID'], $UserSubscriptions, 0); $Cache->delete_value('collage_subs_user_new_'.$LoggedUser['ID']); - diff --git a/static/styles/proton/style.css b/static/styles/proton/style.css index 4e97c653..215d02a3 100644 --- a/static/styles/proton/style.css +++ b/static/styles/proton/style.css @@ -346,6 +346,10 @@ ul#userinfo_stats li a { color: #626262; } +.blend:hover a { + color: white; +} + .blend a { color: #575757; }