From ba33634e1940376502985e193b89f34d7f80cc63 Mon Sep 17 00:00:00 2001 From: Git Date: Fri, 19 Apr 2013 08:00:55 +0000 Subject: [PATCH] Empty commit --- api.php | 57 +++-- classes/class_irc.php | 4 +- classes/class_mysql.php | 34 +-- classes/class_tools.php | 64 +++--- classes/class_users.php | 44 ++-- classes/permissions_form.php | 16 +- classes/sphinxapi.php | 14 +- design/privateheader.php | 2 +- sections/ajax/artist.php | 90 ++++---- sections/ajax/browse.php | 38 ++-- sections/ajax/index.php | 7 +- sections/ajax/info.php | 25 +-- sections/ajax/request.php | 9 +- sections/ajax/send_recommendation.php | 51 +++-- sections/ajax/top10/torrents.php | 30 +-- sections/ajax/torrentgroup.php | 18 +- sections/artist/artist.php | 5 +- sections/better/single.php | 27 ++- sections/blog/index.php | 75 +++---- sections/collages/add_torrent.php | 2 +- sections/collages/browse.php | 117 +++++----- sections/collages/collage.php | 55 +++-- sections/collages/index.php | 60 +++-- sections/collages/new.php | 38 ++-- sections/collages/new_handle.php | 22 +- sections/comments/artistcomments.php | 53 ++--- sections/comments/post.php | 44 ++-- sections/comments/torrentcomments.php | 97 ++++---- sections/donate/donate.php | 12 +- sections/donate/donate_gpal.php | 8 +- sections/donate/ipn.php | 2 +- sections/feeds/index.php | 4 +- sections/forums/forum.php | 138 ++++++------ sections/forums/index.php | 77 +++---- sections/forums/mod_thread.php | 275 ++++++++++++----------- sections/forums/newthread.php | 44 ++-- sections/forums/search.php | 140 ++++++------ sections/forums/take_new_thread.php | 90 ++++---- sections/friends/add.php | 8 +- sections/friends/comment.php | 9 +- sections/friends/friends.php | 41 ++-- sections/friends/index.php | 8 +- sections/friends/remove.php | 8 +- sections/image/index.php | 8 +- sections/index/private.php | 141 ++++++------ sections/login/index.php | 2 +- sections/reports/report.php | 62 +++--- sections/reportsv2/array.php | 142 ++++++------ sections/reportsv2/header.php | 4 +- sections/reportsv2/report.php | 130 ++++++----- sections/reportsv2/takereport.php | 54 ++--- sections/reportsv2/takeresolve.php | 8 +- sections/requests/new_edit.php | 99 +++++---- sections/requests/request.php | 4 +- sections/requests/takenew_edit.php | 256 +++++++++++----------- sections/schedule/index.php | 2 +- sections/tools/index.php | 12 +- sections/tools/managers/tag_aliases.php | 4 +- sections/tools/misc/tags.php | 265 ++++++++++++++++++++++ sections/tools/tools.php | 4 +- sections/top10/torrents.php | 61 ++++-- sections/top10/votes.php | 8 +- sections/torrents/browse.php | 6 +- sections/torrents/browse2.php | 55 ++++- sections/torrents/details.php | 4 +- sections/torrents/functions.php | 248 +++++++++++---------- sections/torrents/nonwikiedit.php | 2 +- sections/torrents/reseed.php | 20 +- sections/torrents/user.php | 280 +++++++++++++----------- sections/user/edit.php | 2 +- sections/user/takeinvite.php | 4 +- sections/user/takemoderate.php | 16 +- sections/userhistory/email_history.php | 44 ++-- static/functions/artist_cloud.js | 88 ++++---- static/functions/detect_mobile.js | 109 +++++---- static/functions/global.js | 70 +++--- static/functions/torrent.js | 38 ++-- 77 files changed, 2361 insertions(+), 1853 deletions(-) create mode 100644 sections/tools/misc/tags.php diff --git a/api.php b/api.php index 45985bca..cc262a96 100644 --- a/api.php +++ b/api.php @@ -1,10 +1,10 @@ ", '€','‚','ƒ','„','…','†','‡','ˆ','‰','Š','‹','Œ','Ž','‘','’','“','”','•','–','—','˜','™','š','›','œ','ž','Ÿ' ); - $With=array( + $With = array( ''','"','<','>', '€','‚','ƒ','„','…','†','‡','ˆ','‰','Š','‹','Œ','Ž','‘','’','“','”','•','–','—','˜','™','š','›','œ','ž','Ÿ' ); - $Str=str_replace($Replace,$With,$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); + } } } @@ -101,7 +112,7 @@ function is_utf8($Str) { function display_array($Array, $Escape = array()) { foreach ($Array as $Key => $Val) { - if((!is_array($Escape) && $Escape == true) || !in_array($Key, $Escape)) { + if ((!is_array($Escape) && $Escape == true) || !in_array($Key, $Escape)) { $Array[$Key] = display_str($Val); } } @@ -113,4 +124,4 @@ function display_array($Array, $Escape = array()) { header('Content-type: text/xml'); echo ''; require(SERVER_ROOT.'/sections/api/index.php'); -?> \ No newline at end of file +?> diff --git a/classes/class_irc.php b/classes/class_irc.php index 9aaa506e..dc57705f 100644 --- a/classes/class_irc.php +++ b/classes/class_irc.php @@ -3,7 +3,7 @@ class IRC_DB extends DB_MYSQL { function halt($Msg) { global $Bot; global $DB; - $Bot->send_to($Bot->get_channel(),'The database is currently unavailable try again later'); + $Bot->send_to($Bot->get_channel(),'The database is currently unavailable; try again later.'); } } @@ -69,7 +69,7 @@ public function post_connect() { $this->listen(); } - public function disconnect() { + public function disconnect() { socket_close($this->ListenSocket); $this->State = 0; //Drones dead } diff --git a/classes/class_mysql.php b/classes/class_mysql.php index 4d2a2abf..ac330b5d 100644 --- a/classes/class_mysql.php +++ b/classes/class_mysql.php @@ -113,7 +113,7 @@ } //Handles escaping -function db_string($String,$DisableWildcards=false) { +function db_string($String, $DisableWildcards = false) { global $DB; //Escape $String = $DB->escape_str($String); @@ -167,12 +167,12 @@ function __construct($Database = SQLDB, $User = SQLLOGIN, $Pass = SQLPASS, $Serv function halt($Msg) { global $LoggedUser, $Cache, $Debug, $argv; - $DBError='MySQL: '.strval($Msg).' SQL error: '.strval($this->Errno).' ('.strval($this->Error).')'; + $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); + $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')) { @@ -195,24 +195,24 @@ function connect() { } } - function query($Query,$AutoHandle=1) { - global $LoggedUser, $Debug; - $QueryStartTime=microtime(true); + function query($Query, $AutoHandle = 1) { + global $LoggedUser, $Debug; + $QueryStartTime = microtime(true); $this->connect(); - //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 = mysqli_query($this->LinkID,$Query); + // 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 = mysqli_query($this->LinkID, $Query); if (!in_array(mysqli_errno($this->LinkID), array(1213, 1205))) { break; } - $Debug->analysis('Non-Fatal Deadlock:',$Query,3600*24); + $Debug->analysis('Non-Fatal Deadlock:', $Query, 3600 * 24); trigger_error("Database deadlock, attempt $i"); - sleep($i*rand(2, 5)); // Wait longer as attempts increase + sleep($i * rand(2, 5)); // Wait longer as attempts increase } - $QueryEndTime=microtime(true); - $this->Queries[]=array(display_str($Query),($QueryEndTime-$QueryStartTime)*1000); - $this->Time+=($QueryEndTime-$QueryStartTime)*1000; + $QueryEndTime = microtime(true); + $this->Queries[] = array(display_str($Query), ($QueryEndTime - $QueryStartTime) * 1000); + $this->Time += ($QueryEndTime-$QueryStartTime) * 1000; if (!$this->QueryID) { $this->Errno = mysqli_errno($this->LinkID); @@ -229,12 +229,14 @@ function query($Query,$AutoHandle=1) { /* if ($QueryType == 'DELETE' || $QueryType == 'UPDATE') { if ($this->affected_rows() > 50) { - $Debug->analysis($this->affected_rows().' rows altered:',$Query,3600*24); + $Debug->analysis($this->affected_rows().' rows altered:', $Query, 3600 * 24); } } */ $this->Row = 0; - if ($AutoHandle) { return $this->QueryID; } + if ($AutoHandle) { + return $this->QueryID; + } } function query_unb($Query) { diff --git a/classes/class_tools.php b/classes/class_tools.php index 4800a832..e4e75900 100644 --- a/classes/class_tools.php +++ b/classes/class_tools.php @@ -5,27 +5,27 @@ class Tools { * * @param string $IP */ - public static function site_ban_ip($IP) { - global $DB, $Cache, $Debug; - $A = substr($IP, 0, strcspn($IP, '.')); - $IPNum = Tools::ip_to_unsigned($IP); - $IPBans = $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); - $DB->query($SQL); - $IPBans = $DB->to_array(0, MYSQLI_NUM); - $Cache->cache_value('ip_bans_'.$A, $IPBans, 0); - } - $Debug->log_var($IPBans, 'IP bans for class '.$A); - foreach ($IPBans as $Index => $IPBan) { - list ($ID, $FromIP, $ToIP) = $IPBan; - if ($IPNum >= $FromIP && $IPNum <= $ToIP) { - return true; + public static function site_ban_ip($IP) { + global $DB, $Cache, $Debug; + $A = substr($IP, 0, strcspn($IP, '.')); + $IPNum = Tools::ip_to_unsigned($IP); + $IPBans = $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); + $DB->query($SQL); + $IPBans = $DB->to_array(0, MYSQLI_NUM); + $Cache->cache_value('ip_bans_'.$A, $IPBans, 0); } + $Debug->log_var($IPBans, 'IP bans for class '.$A); + 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. @@ -34,7 +34,7 @@ public static function site_ban_ip($IP) { * @return string the long it represents. */ public static function ip_to_unsigned($IP) { - return sprintf("%u", ip2long($IP)); + return sprintf('%u', ip2long($IP)); } /** @@ -71,13 +71,12 @@ public static function geoip($IP) { * @param $IP the IP to get the hostname for * @return hostname fetched */ - public static function get_host_by_ip($IP) - { + public static function get_host_by_ip($IP) { $testar = explode('.',$IP); - if (count($testar)!=4) { + if (count($testar) != 4) { return $IP; } - for ($i=0;$i<4;++$i) { + for ($i = 0; $i < 4; ++$i) { if (!is_numeric($testar[$i])) { return $IP; } @@ -206,19 +205,21 @@ public static function disable_users($UserIDs, $AdminComment, $BanReason = 1) { public static function warn_user($UserID, $Duration, $Reason) { global $LoggedUser, $DB, $Cache, $Time; - $DB->query("SELECT Warned FROM users_info - WHERE UserID=".$UserID." - AND Warned <> '0000-00-00 00:00:00'"); + $DB->query(" + SELECT Warned + FROM users_info + WHERE UserID=".$UserID." + AND Warned <> '0000-00-00 00:00:00'"); if ($DB->record_count() > 0) { //User was already warned, appending new warning to old. list($OldDate) = $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."."); + '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 '.$LoggedUser['Username']."\nReason: $Reason\n\n"; + $AdminComment = date('Y-m-d').' - Warning (Clash) extended to expire at '.$NewExpDate.' by '.$LoggedUser['Username']."\nReason: $Reason\n\n"; $DB->query('UPDATE users_info SET Warned=\''.db_string($NewExpDate).'\', @@ -233,7 +234,7 @@ public static function warn_user($UserID, $Duration, $Reason) { $Cache->update_row(false, array('Warned' => $WarnTime)); $Cache->commit_transaction(0); - $AdminComment = date("Y-m-d").' - Warned until '.$WarnTime.' by '.$LoggedUser['Username']."\nReason: $Reason\n\n"; + $AdminComment = date('Y-m-d').' - Warned until '.$WarnTime.' by '.$LoggedUser['Username']."\nReason: $Reason\n\n"; $DB->query('UPDATE users_info SET Warned=\''.db_string($WarnTime).'\', @@ -254,6 +255,5 @@ public static function update_user_notes($UserID, $AdminComment) { AdminComment=CONCAT(\''.db_string($AdminComment).'\',AdminComment) WHERE UserID=\''.db_string($UserID).'\''); } - } ?> diff --git a/classes/class_users.php b/classes/class_users.php index 700a172e..340e66df 100644 --- a/classes/class_users.php +++ b/classes/class_users.php @@ -534,7 +534,7 @@ public static function get_bookmarks ($UserID) } /** - * Generate HTML for a user's avatar or just return the avatar url + * Generate HTML for a user's avatar or just return the avatar URL * @param unknown $Avatar * @param unknown $Username * @param unknown $Setting @@ -544,62 +544,62 @@ public static function get_bookmarks ($UserID) */ public static function show_avatar($Avatar, $Username, $Setting, $Size=150, $ReturnHTML = True) { global $LoggedUser; - //case 1 is avatars disabled - switch($Setting) { + // case 1 is avatars disabled + switch ($Setting) { case 0: if (!empty($Avatar)) { - $ToReturn = $ReturnHTML ? "$Username avatar" : $Avatar; + $ToReturn = $ReturnHTML ? "\"$Username" : $Avatar; } else { - $URL = STATIC_SERVER."common/avatars/default.png"; - $ToReturn = $ReturnHTML ? "Default Avatar" : $URL; + $URL = STATIC_SERVER.'common/avatars/default.png'; + $ToReturn = $ReturnHTML ? "\"Default" : $URL; } break; case 2: $ShowAvatar = True; case 3: - switch($LoggedUser['Identicons']) { + switch ($LoggedUser['Identicons']) { case 0: - $Type = "identicon"; + $Type = 'identicon'; break; case 1: - $Type = "monsterid"; + $Type = 'monsterid'; break; case 2: - $Type = "wavatar"; + $Type = 'wavatar'; break; case 3: - $Type = "retro"; + $Type = 'retro'; break; case 4: - $Type = "1"; + $Type = '1'; $Robot = True; break; case 5: - $Type = "2"; + $Type = '2'; $Robot = True; break; case 6: - $Type = "3"; + $Type = '3'; $Robot = True; break; default: - $Type = "identicon"; + $Type = 'identicon'; } - $Rating = "pg"; + $Rating = 'pg'; if (!$Robot) { - $URL = "https://secure.gravatar.com/avatar/".md5(strtolower(trim($Username)))."?s=$Size&d=$Type&r=$Rating"; + $URL = 'https://secure.gravatar.com/avatar/'.md5(strtolower(trim($Username)))."?s=$Size&d=$Type&r=$Rating"; } else { - $URL = "https://static1.robohash.org/".md5($Username)."?set=set".$Type."&size=".$Size."x".$Size; + $URL = 'https://robohash.org/'.md5($Username).'?set=set'.$Type.'&size='.$Size.'x'.$Size; } if ($ShowAvatar == True && !empty($Avatar)) { - $ToReturn = $ReturnHTML ? "$Username avatar" : $Avatar; + $ToReturn = $ReturnHTML ? "\"$Username" : $Avatar; } else { - $ToReturn = $ReturnHTML ? "Default Avatar" : $URL; + $ToReturn = $ReturnHTML ? "\"Default" : $URL; } break; default: - $URL = STATIC_SERVER."common/avatars/default.png"; - $ToReturn = $ReturnHTML ? "Default Avatar" : $URL; + $URL = STATIC_SERVER.'common/avatars/default.png'; + $ToReturn = $ReturnHTML ? "\"Default" : $URL; } return $ToReturn; } diff --git a/classes/permissions_form.php b/classes/permissions_form.php index 5159b8c5..5a6e545d 100644 --- a/classes/permissions_form.php +++ b/classes/permissions_form.php @@ -7,7 +7,7 @@ ** user custom permissions form. ** ********************************************************************************/ - $PermissionsArray = array( +$PermissionsArray = array( 'site_leech' => 'Can leech (Does this work?).', 'site_upload' => 'Upload torrent access.', 'site_vote' => 'Request vote access.', @@ -55,7 +55,7 @@ 'users_edit_watch_hours' => 'Can edit contrib watch hours.', 'users_edit_reset_keys' => 'Can reset passkey/authkey.', 'users_edit_profiles' => 'Can edit anyone\'s profile.', - 'users_view_friends' => 'Can view anyone\'s friends.', + 'users_view_friends' => 'Can view anyone\'s friends.', 'users_reset_own_keys' => 'Can reset own passkey/authkey.', 'users_edit_password' => 'Can change passwords.', 'users_promote_below' => 'Can promote users to below current level.', @@ -103,17 +103,17 @@ 'admin_login_watch' => 'Can manage login watch.', 'admin_manage_wiki' => 'Can manage wiki access.', 'admin_update_geoip' => 'Can update geoIP data.', - 'site_collages_recover' => 'Can recover \'deleted\' collages.', - 'torrents_add_artist' => 'Can add artists to any group.', - 'edit_unknowns' => 'Can edit unknown release information.', - 'forums_polls_create' => 'Can create polls in the forums.', - 'forums_polls_moderate' => 'Can feature and close polls.', + 'site_collages_recover' => 'Can recover \'deleted\' collages.', + 'torrents_add_artist' => 'Can add artists to any group.', + 'edit_unknowns' => 'Can edit unknown release information.', + 'forums_polls_create' => 'Can create polls in the forums.', + 'forums_polls_moderate' => 'Can feature and close polls.', 'project_team' => 'Is part of the project team.', 'torrents_edit_vanityhouse' => 'Can mark groups as part of Vanity House.', 'artist_edit_vanityhouse' => 'Can mark artists as part of Vanity House.', 'site_tag_aliases_read' => 'Can view the list of tag aliases.' - ); +); function permissions_form(){ ?>
diff --git a/classes/sphinxapi.php b/classes/sphinxapi.php index a9b5063e..60da68a0 100644 --- a/classes/sphinxapi.php +++ b/classes/sphinxapi.php @@ -539,13 +539,13 @@ function _Send ( $handle, $data, $length ) /// enter mbstring workaround mode function _MBPush () { - $this->_mbenc = ""; + $this->_mbenc = ''; if ( ini_get ( "mbstring.func_overload" ) & 2 ) { $this->_mbenc = mb_internal_encoding(); mb_internal_encoding ( "latin1" ); } - } + } /// leave mbstring workaround mode function _MBPop () @@ -931,17 +931,17 @@ function ResetFilters () /// clear groupby settings (for multi-queries) function ResetGroupBy () { - $this->_groupby = ""; + $this->_groupby = ''; $this->_groupfunc = SPH_GROUPBY_DAY; $this->_groupsort = "@group desc"; - $this->_groupdistinct= ""; + $this->_groupdistinct= ''; } /// clear all attribute value overrides (for multi-queries) function ResetOverrides () - { - $this->_overrides = array (); - } + { + $this->_overrides = array (); + } ////////////////////////////////////////////////////////////////////////////// diff --git a/design/privateheader.php b/design/privateheader.php index 9457b017..3d92778c 100644 --- a/design/privateheader.php +++ b/design/privateheader.php @@ -79,7 +79,7 @@ ?> + if ($Script == 'jquery') { ?> diff --git a/sections/ajax/artist.php b/sections/ajax/artist.php index 1d89b4be..3ff9ed88 100644 --- a/sections/ajax/artist.php +++ b/sections/ajax/artist.php @@ -4,14 +4,14 @@ function compare($X, $Y){ return($Y['count'] - $X['count']); } - // Bookmarks::has_bookmarked() +// Bookmarks::has_bookmarked() include(SERVER_ROOT.'/sections/requests/functions.php'); include(SERVER_ROOT.'/classes/class_text.php'); // Text formatting class $Text = new TEXT; $ArtistID = $_GET['id']; -if(!is_number($ArtistID)) { +if (!is_number($ArtistID)) { print json_encode(array('status' => 'failure')); die(); } @@ -29,7 +29,7 @@ function compare($X, $Y){ } } -if(!empty($_GET['revisionid'])) { // if they're viewing an old revision +if (!empty($_GET['revisionid'])) { // if they're viewing an old revision $RevisionID=$_GET['revisionid']; if (!is_number($RevisionID)) { error(0); @@ -39,7 +39,7 @@ function compare($X, $Y){ $Data = $Cache->get_value('artist_'.$ArtistID); $RevisionID = false; } -if($Data) { +if ($Data) { if (!is_array($Data)) { $Data = unserialize($Data); } @@ -47,28 +47,30 @@ function compare($X, $Y){ } else { if ($RevisionID) { - $sql = "SELECT - a.Name, - wiki.Image, - wiki.body, - a.VanityHouse + $sql = " + SELECT + a.Name, + wiki.Image, + wiki.body, + a.VanityHouse FROM wiki_artists AS wiki - LEFT JOIN artists_group AS a ON wiki.RevisionID=a.RevisionID + LEFT JOIN artists_group AS a ON wiki.RevisionID=a.RevisionID WHERE wiki.RevisionID='$RevisionID' "; } else { - $sql = "SELECT - a.Name, - wiki.Image, - wiki.body, - a.VanityHouse + $sql = " + SELECT + a.Name, + wiki.Image, + wiki.body, + a.VanityHouse FROM artists_group AS a - LEFT JOIN wiki_artists AS wiki ON wiki.RevisionID=a.RevisionID + LEFT JOIN wiki_artists AS wiki ON wiki.RevisionID=a.RevisionID WHERE a.ArtistID='$ArtistID' "; } $sql .= " GROUP BY a.ArtistID"; $DB->query($sql); - if($DB->record_count() == 0) { + if ($DB->record_count() == 0) { print json_encode(array('status' => 'failure')); } @@ -78,7 +80,8 @@ function compare($X, $Y){ // Requests $Requests = $Cache->get_value('artists_requests_'.$ArtistID); if (!is_array($Requests)) { - $DB->query("SELECT + $DB->query(" + SELECT r.ID, r.CategoryID, r.Title, @@ -94,7 +97,7 @@ function compare($X, $Y){ GROUP BY r.ID ORDER BY Votes DESC"); - if($DB->record_count() > 0) { + if ($DB->record_count() > 0) { $Requests = $DB->to_array(); } else { $Requests = array(); @@ -104,12 +107,13 @@ function compare($X, $Y){ $NumRequests = count($Requests); if (($Importances = $Cache->get_value('artist_groups_'.$ArtistID)) === false) { - $DB->query("SELECT + $DB->query(" + SELECT DISTINCTROW ta.GroupID, ta.Importance, tg.VanityHouse, tg.Year - FROM torrents_artists AS ta + FROM torrents_artists AS ta JOIN torrents_group AS tg ON tg.ID=ta.GroupID - WHERE ta.ArtistID='$ArtistID' - ORDER BY tg.Year DESC, tg.Name DESC"); + WHERE ta.ArtistID='$ArtistID' + ORDER BY tg.Year DESC, tg.Name DESC"); $GroupIDs = $DB->collect('GroupID'); $Importances = $DB->to_array(false, MYSQLI_BOTH, false); $Cache->cache_value('artist_groups_'.$ArtistID, $Importances, 0); @@ -129,38 +133,38 @@ function compare($X, $Y){ //Get list of used release types $UsedReleases = array(); -foreach($TorrentList as $GroupID=>$Group) { - if($Importances[$GroupID]['Importance'] == '2') { +foreach ($TorrentList as $GroupID=>$Group) { + if ($Importances[$GroupID]['Importance'] == '2') { $TorrentList[$GroupID]['ReleaseType'] = 1024; $GuestAlbums = true; } - if($Importances[$GroupID]['Importance'] == '3') { + if ($Importances[$GroupID]['Importance'] == '3') { $TorrentList[$GroupID]['ReleaseType'] = 1023; $RemixerAlbums = true; } - if($Importances[$GroupID]['Importance'] == '4') { + if ($Importances[$GroupID]['Importance'] == '4') { $TorrentList[$GroupID]['ReleaseType'] = 1022; $ComposerAlbums = true; } - if($Importances[$GroupID]['Importance'] == '7') { + if ($Importances[$GroupID]['Importance'] == '7') { $TorrentList[$GroupID]['ReleaseType'] = 1021; $ProducerAlbums = true; } - if(!in_array($TorrentList[$GroupID]['ReleaseType'], $UsedReleases)) { + if (!in_array($TorrentList[$GroupID]['ReleaseType'], $UsedReleases)) { $UsedReleases[] = $TorrentList[$GroupID]['ReleaseType']; } } -if(!empty($GuestAlbums)) { +if (!empty($GuestAlbums)) { $ReleaseTypes[1024] = "Guest Appearance"; } -if(!empty($RemixerAlbums)) { +if (!empty($RemixerAlbums)) { $ReleaseTypes[1023] = "Remixed By"; } -if(!empty($ComposerAlbums)) { +if (!empty($ComposerAlbums)) { $ReleaseTypes[1022] = "Composition"; } -if(!empty($ProducerAlbums)) { +if (!empty($ProducerAlbums)) { $ReleaseTypes[1021] = "Produced By"; } @@ -176,8 +180,8 @@ function compare($X, $Y){ $TagList = explode(' ',str_replace('_','.',$TagList)); // $Tags array is for the sidebar on the right - foreach($TagList as $Tag) { - if(!isset($Tags[$Tag])) { + foreach ($TagList as $Tag) { + if (!isset($Tags[$Tag])) { $Tags[$Tag] = array('name'=>$Tag, 'count'=>1); } else { $Tags[$Tag]['count']++; @@ -231,17 +235,17 @@ function compare($X, $Y){ } $JsonSimilar = array(); -if(empty($SimilarArray)) { +if (empty($SimilarArray)) { $DB->query(" SELECT - s2.ArtistID, - a.Name, - ass.Score, - ass.SimilarID + 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 + 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 diff --git a/sections/ajax/browse.php b/sections/ajax/browse.php index d4dacb04..45a64c5c 100644 --- a/sections/ajax/browse.php +++ b/sections/ajax/browse.php @@ -351,7 +351,7 @@ function header_link($SortKey,$DefaultWay = 'desc') { $SphQL->where('logscore', 100); $SphQLTor->where('logscore', 100); $Filtered = true; - } elseif ($_GET['haslog'] < 0) { + } elseif ($_GET['haslog'] < 0) { // Exclude torrents with log score equal to 100 $SphQL->where('logscore', 100, true); $SphQL->where('haslog', 1); @@ -561,31 +561,31 @@ function header_link($SortKey,$DefaultWay = 'desc') { } $TagList = explode(' ',str_replace('_','.',$GroupInfo['TagList'])); - $JsonArtists = array(); + $JsonArtists = array(); if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4]) || !empty($ExtendedArtists[5]) || !empty($ExtendedArtists[6])) { unset($ExtendedArtists[2]); unset($ExtendedArtists[3]); $DisplayName = Artists::display_artists($ExtendedArtists, false, false, true); - foreach ($ExtendedArtists[1] as $Artist) { - $JsonArtists[] = array( - 'id' => (int) $Artist['id'], - 'name' => $Artist['name'], - 'aliasid' => (int) $Artist['id'] - ); - } + foreach ($ExtendedArtists[1] as $Artist) { + $JsonArtists[] = array( + 'id' => (int) $Artist['id'], + 'name' => $Artist['name'], + 'aliasid' => (int) $Artist['id'] + ); + } } elseif (!empty($Artists)) { $DisplayName = Artists::display_artists(array(1=>$Artists), false, false, true); - foreach ($Artists as $Artist) { - $JsonArtists[] = array( - 'id' => (int) $Artist['id'], - 'name' => $Artist['name'], - 'aliasid' => (int) $Artist['id'] - ); - } + foreach ($Artists as $Artist) { + $JsonArtists[] = array( + 'id' => (int) $Artist['id'], + 'name' => $Artist['name'], + 'aliasid' => (int) $Artist['id'] + ); + } } else { - $DisplayName=''; + $DisplayName = ''; } - if ($GroupResults && (count($Torrents)>1 || isset($GroupedCategories[$CategoryID-1]))) { + if ($GroupResults && (count($Torrents) > 1 || isset($GroupedCategories[$CategoryID-1]))) { // These torrents are in a group $LastRemasterYear = '-'; $LastRemasterTitle = ''; @@ -702,7 +702,7 @@ function header_link($SortKey,$DefaultWay = 'desc') { 'status' => 'success', 'response' => array( 'currentPage' => intval($Page), - 'pages' => ceil($TorrentCount/TORRENTS_PER_PAGE), + 'pages' => ceil($TorrentCount / TORRENTS_PER_PAGE), 'results' => $JsonGroups ) ) diff --git a/sections/ajax/index.php b/sections/ajax/index.php index dcf0334d..e9ca5722 100644 --- a/sections/ajax/index.php +++ b/sections/ajax/index.php @@ -29,8 +29,8 @@ 'status' => 'failure', 'response' => 'Rate limit exceeded.' ) - ); - + ); + die(); } else { $Cache->increment_value('ajax_requests_'.$UserID); @@ -146,8 +146,7 @@ print json_encode(array('status' => 'failure')); } -function pullmediainfo($Array) -{ +function pullmediainfo($Array) { $NewArray = array(); foreach ($Array as $Item) { $NewArray[] = array( diff --git a/sections/ajax/info.php b/sections/ajax/info.php index 45a4d78c..1db211bc 100644 --- a/sections/ajax/info.php +++ b/sections/ajax/info.php @@ -1,7 +1,6 @@ cache_value('news_latest_id', $CurrentNews, 0); } - $NewMessages = $Cache->get_value('inbox_new_' . $LoggedUser['ID']); if ($NewMessages === false) { $DB->query("SELECT COUNT(UnRead) FROM pm_conversations_users WHERE UserID='" . $LoggedUser['ID'] . "' AND UnRead = '1' AND InInbox = '1'"); @@ -36,7 +34,7 @@ if ($NewNotifications === false) { $DB->query("SELECT COUNT(UserID) FROM users_notify_torrents WHERE UserID='$LoggedUser[ID]' AND UnRead='1'"); list($NewNotifications) = $DB->next_record(); - /* if($NewNotifications && !check_perms('site_torrents_notify')) { + /* if ($NewNotifications && !check_perms('site_torrents_notify')) { $DB->query("DELETE FROM users_notify_torrents WHERE UserID='$LoggedUser[ID]'"); $DB->query("DELETE FROM users_notify_filters WHERE UserID='$LoggedUser[ID]'"); } */ @@ -78,16 +76,17 @@ $RestrictedForums = implode("','", array_keys($LoggedUser['CustomForums'], 0)); $PermittedForums = implode("','", array_keys($LoggedUser['CustomForums'], 1)); } - $DB->query("SELECT COUNT(s.TopicID) - FROM users_subscriptions AS s - JOIN forums_last_read_topics AS l ON s.UserID = l.UserID AND s.TopicID = l.TopicID - JOIN forums_topics AS t ON l.TopicID = t.ID - JOIN forums AS f ON t.ForumID = f.ID - WHERE (f.MinClassRead <= " . $LoggedUser['Class'] . " OR f.ID IN ('$PermittedForums')) - AND l.PostID < t.LastPostID - AND s.UserID = " . $LoggedUser['ID'] . + $DB->query(" + SELECT COUNT(s.TopicID) + FROM users_subscriptions AS s + JOIN forums_last_read_topics AS l ON s.UserID = l.UserID AND s.TopicID = l.TopicID + JOIN forums_topics AS t ON l.TopicID = t.ID + JOIN forums AS f ON t.ForumID = f.ID + WHERE (f.MinClassRead <= " . $LoggedUser['Class'] . " OR f.ID IN ('$PermittedForums')) + AND l.PostID < t.LastPostID + AND s.UserID = " . $LoggedUser['ID'] . (!empty($RestrictedForums) ? " - AND f.ID NOT IN ('" . $RestrictedForums . "')" : "")); + AND f.ID NOT IN ('" . $RestrictedForums . "')" : '')); list($NewSubscriptions) = $DB->next_record(); $Cache->cache_value('subscriptions_user_new_' . $LoggedUser['ID'], $NewSubscriptions, 0); } diff --git a/sections/ajax/request.php b/sections/ajax/request.php index 5199196f..17dbd88c 100644 --- a/sections/ajax/request.php +++ b/sections/ajax/request.php @@ -1,11 +1,10 @@ (int) $User['UserID'], diff --git a/sections/ajax/send_recommendation.php b/sections/ajax/send_recommendation.php index edfab92f..2ad3d609 100644 --- a/sections/ajax/send_recommendation.php +++ b/sections/ajax/send_recommendation.php @@ -4,50 +4,53 @@ $ID = (int) $_POST['id']; $Note = $_POST['note']; -if(empty($FriendID) || empty($Type) || empty($ID)) { +if (empty($FriendID) || empty($Type) || empty($ID)) { echo json_encode(array("status" => "error", "response" => "Error.")); die(); } // Make sure the recipient is on your friends list and not some random dude. -$DB->query("SELECT - f.FriendID, u.Username - FROM friends AS f - RIGHT JOIN users_enable_recommendations AS r - ON r.ID = f.FriendID AND r.Enable = 1 - RIGHT JOIN users_main AS u - ON u.ID = f.FriendID - WHERE f.UserID = '$LoggedUser[ID]' AND f.FriendID = '$FriendID'"); +$DB->query(" + SELECT + f.FriendID, + u.Username + FROM friends AS f + RIGHT JOIN users_enable_recommendations AS r + ON r.ID = f.FriendID AND r.Enable = 1 + RIGHT JOIN users_main AS u + ON u.ID = f.FriendID + WHERE f.UserID = '$LoggedUser[ID]' + AND f.FriendID = '$FriendID'"); -if($DB->record_count() == 0) { +if ($DB->record_count() == 0) { echo json_encode(array("status" => "error", "response" => "Not on friend list.")); die(); } $Type = strtolower($Type); -$Link = ""; +$Link = ''; // "a" vs "an", english language is so confusing. // http://en.wikipedia.org/wiki/English_articles#Distinction_between_a_and_an -$Article = "a"; -switch($Type) { +$Article = 'a'; +switch ($Type) { case 'torrent': - $Link = "torrents.php?id=".$ID; - $DB->query("SELECT Name FROM torrents_group WHERE ID = '$ID'"); + $Link = "torrents.php?id=".$ID; + $DB->query("SELECT Name FROM torrents_group WHERE ID = '$ID'"); break; case 'artist': $Article = "an"; $Link = "artist.php?id=".$ID; - $DB->query("SELECT Name FROM artists_group WHERE ArtistID = '$ID'"); - break; - case 'collage': - $Link = "collages.php?id=".$ID; - $DB->query("SELECT Name FROM collages WHERE ID = '$ID'"); - break; + $DB->query("SELECT Name FROM artists_group WHERE ArtistID = '$ID'"); + break; + case 'collage': + $Link = "collages.php?id=".$ID; + $DB->query("SELECT Name FROM collages WHERE ID = '$ID'"); + break; } list($Name) = $DB->next_record(); $Subject = $LoggedUser['Username'] . " recommended you $Article " . $Type . "!"; -$Body = $LoggedUser['Username'] . " recommended you the ".$Type." [url=https://".NONSSL_SITE_URL."/".$Link."]".$Name."[/url]."; -if(!empty($Note)) { - $Body = $Body . "\n\n". $Note; +$Body = $LoggedUser['Username'] . " recommended you the ".$Type." [url=https://".SSL_SITE_URL."/$Link]$Name".'[/url].'; +if (!empty($Note)) { + $Body = $Body . "\n\n". $Note; } Misc::send_pm($FriendID, $LoggedUser['ID'], $Subject, $Body); diff --git a/sections/ajax/top10/torrents.php b/sections/ajax/top10/torrents.php index 4812f590..f2f4b4fc 100644 --- a/sections/ajax/top10/torrents.php +++ b/sections/ajax/top10/torrents.php @@ -1,8 +1,8 @@ 'failure')); @@ -45,7 +45,7 @@ $OuterResults = array(); -if($Details == 'all' || $Details == 'day') { +if ($Details == 'all' || $Details == 'day') { if (!$TopTorrentsActiveLastDay = $Cache->get_value('top10tor_day_'.$Limit.$WhereSum)) { if ($Cache->get_query_lock('top10')) { $DayAgo = time_minus(86400); @@ -65,7 +65,7 @@ } $OuterResults[] = generate_torrent_json('Most Active Torrents Uploaded in the Past Day', 'day', $TopTorrentsActiveLastDay, $Limit); } -if($Details == 'all' || $Details == 'week') { +if ($Details == 'all' || $Details == 'week') { if (!$TopTorrentsActiveLastWeek = $Cache->get_value('top10tor_week_'.$Limit.$WhereSum)) { if ($Cache->get_query_lock('top10')) { $WeekAgo = time_minus(604800); @@ -86,7 +86,7 @@ $OuterResults[] = generate_torrent_json('Most Active Torrents Uploaded in the Past Week', 'week', $TopTorrentsActiveLastWeek, $Limit); } -if($Details == 'all' || $Details == 'overall') { +if ($Details == 'all' || $Details == 'overall') { if (!$TopTorrentsActiveAllTime = $Cache->get_value('top10tor_overall_'.$Limit.$WhereSum)) { if ($Cache->get_query_lock('top10')) { // IMPORTANT NOTE - we use WHERE t.Seeders>500 in order to speed up this query. You should remove it! @@ -107,7 +107,7 @@ $OuterResults[] = generate_torrent_json('Most Active Torrents of All Time', 'overall', $TopTorrentsActiveAllTime, $Limit); } -if(($Details == 'all' || $Details == 'snatched') && empty($Where)) { +if (($Details == 'all' || $Details == 'snatched') && empty($Where)) { if (!$TopTorrentsSnatched = $Cache->get_value('top10tor_snatched_'.$Limit.$WhereSum)) { if ($Cache->get_query_lock('top10')) { $Query = $BaseQuery; @@ -125,7 +125,7 @@ $OuterResults[] = generate_torrent_json('Most Snatched Torrents', 'snatched', $TopTorrentsSnatched, $Limit); } -if(($Details == 'all' || $Details == 'data') && empty($Where)) { +if (($Details == 'all' || $Details == 'data') && empty($Where)) { if (!$TopTorrentsTransferred = $Cache->get_value('top10tor_data_'.$Limit.$WhereSum)) { if ($Cache->get_query_lock('top10')) { // IMPORTANT NOTE - we use WHERE t.Snatched>100 in order to speed up this query. You should remove it! @@ -145,7 +145,7 @@ $OuterResults[] = generate_torrent_json('Most Data Transferred Torrents', 'data', $TopTorrentsTransferred, $Limit); } -if(($Details == 'all' || $Details == 'seeded') && empty($Where)) { +if (($Details == 'all' || $Details == 'seeded') && empty($Where)) { if (!$TopTorrentsSeeded = $Cache->get_value('top10tor_seeded_'.$Limit.$WhereSum)) { if ($Cache->get_query_lock('top10')) { $Query = $BaseQuery." @@ -166,9 +166,9 @@ json_encode( array( 'status' => 'success', - 'response' => $OuterResults - ) - ); + 'response' => $OuterResults + ) + ); function generate_torrent_json($Caption, $Tag, $Details, $Limit) { @@ -191,13 +191,13 @@ function generate_torrent_json($Caption, $Tag, $Details, $Limit) { $Artist = Artists::display_artists(Artists::get_artist($GroupID), false, true); $TruncArtist = substr($Artist, 0, strlen($Artist)-3); - $TagList=array(); + $TagList = array(); - if($TorrentTags!='') { - $TorrentTags=explode(' ',$TorrentTags); + if ($TorrentTags != '') { + $TorrentTags = explode(' ',$TorrentTags); foreach ($TorrentTags as $TagKey => $TagName) { $TagName = str_replace('_','.',$TagName); - $TagList[]=$TagName; + $TagList[] = $TagName; } } diff --git a/sections/ajax/torrentgroup.php b/sections/ajax/torrentgroup.php index 95be7ccd..f825ebfe 100644 --- a/sections/ajax/torrentgroup.php +++ b/sections/ajax/torrentgroup.php @@ -1,6 +1,5 @@ $ArtistForm[4] == null ? array() : pullmediainfo($ArtistForm[4]), 'dj' => $ArtistForm[6] == null ? array() : pullmediainfo($ArtistForm[6]), @@ -33,8 +34,7 @@ 'remixedBy' => $ArtistForm[3] == null ? array() : pullmediainfo($ArtistForm[3]), 'producer' => $ArtistForm[7] == null ? array() : pullmediainfo($ArtistForm[7]) ); -} -else { +} else { $JsonMusicInfo = NULL; } @@ -51,7 +51,7 @@ 'categoryName' => $CategoryName, 'time' => $TorrentDetails['Time'], 'vanityHouse' => $TorrentDetails['VanityHouse'] == 1, - 'isBookmarked' => Bookmarks::has_bookmarked('torrent', $GroupID), + 'isBookmarked' => Bookmarks::has_bookmarked('torrent', $GroupID), 'musicInfo' => $JsonMusicInfo ); @@ -86,7 +86,7 @@ 'snatched' => (int) $Torrent['Snatched'], 'freeTorrent' => $Torrent['FreeTorrent'] == 1, 'time' => $Torrent['Time'], - 'description' => $Torrent['Description'], + 'description' => $Torrent['Description'], 'fileList' => $FileList, 'filePath' => $Torrent['FilePath'], 'userId' => (int) $Torrent['UserID'], diff --git a/sections/artist/artist.php b/sections/artist/artist.php index f30c3df7..05ecd4c7 100644 --- a/sections/artist/artist.php +++ b/sections/artist/artist.php @@ -6,7 +6,7 @@ function compare($X, $Y) { return($Y['count'] - $X['count']); } - // Bookmarks::has_bookmarked() +// Bookmarks::has_bookmarked() include(SERVER_ROOT.'/classes/class_text.php'); // Text formatting class $Text = new TEXT; @@ -501,8 +501,7 @@ function compare($X, $Y) { - + diff --git a/sections/better/single.php b/sections/better/single.php index d89dc495..4d1842c6 100644 --- a/sections/better/single.php +++ b/sections/better/single.php @@ -1,13 +1,14 @@ get_value('better_single_groupids')) === false) { +if (($GroupIDs = $Cache->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"); + 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"); $GroupIDs = $DB->to_array('GroupID'); $Cache->cache_value('better_single_groupids', $GroupIDs, 30*60); @@ -41,11 +42,15 @@ $FlacID = $GroupIDs[$GroupID]['TorrentID']; $DisplayName.=''.$GroupName.''; - if($GroupYear>0) { $DisplayName.=" [".$GroupYear."]"; } - if($ReleaseType>0) { $DisplayName.=" [".$ReleaseTypes[$ReleaseType]."]"; } + if ($GroupYear > 0) { + $DisplayName.=" [$GroupYear]"; + } + if ($ReleaseType > 0) { + $DisplayName.=" [".$ReleaseTypes[$ReleaseType]."]"; + } $ExtraInfo = Torrents::torrent_info($Torrents[$FlacID]); - if($ExtraInfo) { + if ($ExtraInfo) { $DisplayName.=' - '.$ExtraInfo; } ?> diff --git a/sections/blog/index.php b/sections/blog/index.php index abd75b96..01e58296 100644 --- a/sections/blog/index.php +++ b/sections/blog/index.php @@ -6,11 +6,11 @@ require(SERVER_ROOT.'/classes/class_text.php'); $Text = new TEXT; -if(check_perms('admin_manage_blog')) { - if(!empty($_REQUEST['action'])) { - switch($_REQUEST['action']) { +if (check_perms('admin_manage_blog')) { + if (!empty($_REQUEST['action'])) { + switch ($_REQUEST['action']) { case 'deadthread' : - if(is_number($_GET['id'])){ + if (is_number($_GET['id'])){ $DB->query("UPDATE blog SET ThreadID=NULL WHERE ID=".$_GET['id']); $Cache->delete_value('blog'); $Cache->delete_value('feed_blog'); @@ -19,7 +19,7 @@ break; case 'takeeditblog': authorize(); - if(is_number($_POST['blogid']) && is_number($_POST['thread'])){ + if (is_number($_POST['blogid']) && is_number($_POST['thread'])){ $DB->query("UPDATE blog SET Title='".db_string($_POST['title'])."', Body='".db_string($_POST['body'])."', ThreadID=".$_POST['thread']." WHERE ID='".db_string($_POST['blogid'])."'"); $Cache->delete_value('blog'); $Cache->delete_value('feed_blog'); @@ -27,14 +27,14 @@ header('Location: blog.php'); break; case 'editblog': - if(is_number($_GET['id'])){ + if (is_number($_GET['id'])){ $BlogID = $_GET['id']; $DB->query("SELECT Title, Body, ThreadID FROM blog WHERE ID=$BlogID"); list($Title, $Body, $ThreadID) = $DB->next_record(); } break; case 'deleteblog': - if(is_number($_GET['id'])){ + if (is_number($_GET['id'])){ authorize(); $DB->query("DELETE FROM blog WHERE ID='".db_string($_GET['id'])."'"); $Cache->delete_value('blog'); @@ -48,31 +48,31 @@ $Title = db_string($_POST['title']); $Body = db_string($_POST['body']); $ThreadID = $_POST['thread']; - if($ThreadID && is_number($ThreadID)) { + if ($ThreadID && is_number($ThreadID)) { $DB->query("SELECT ForumID FROM forums_topics WHERE ID=".$ThreadID); - if($DB->record_count() < 1) { + if ($DB->record_count() < 1) { error("No such thread exists!"); header('Location: blog.php'); } } else { $ThreadID = Misc::create_thread(ANNOUNCEMENT_FORUM_ID, $LoggedUser[ID], $Title, $Body); - if($ThreadID < 1) { + if ($ThreadID < 1) { error(0); } } $DB->query("INSERT INTO blog (UserID, Title, Body, Time, ThreadID, Important) - VALUES ('".$LoggedUser['ID']."', - '".db_string($_POST['title'])."', - '".db_string($_POST['body'])."', - '".sqltime()."', - ".$ThreadID.", - '".(($_POST['important']=='1')?'1':'0')."')"); + VALUES ('".$LoggedUser['ID']."', + '".db_string($_POST['title'])."', + '".db_string($_POST['body'])."', + '".sqltime()."', + $ThreadID, + '".(($_POST['important'] == '1') ? '1' : '0')."')"); $Cache->delete_value('blog'); - if ($_POST['important']=='1') { + if ($_POST['important'] == '1') { $Cache->delete_value('blog_latest_id'); } - if(isset($_POST['subscribe'])) { + if (isset($_POST['subscribe'])) { $DB->query("INSERT IGNORE INTO users_subscriptions VALUES ('$LoggedUser[ID]', $ThreadID)"); $Cache->delete_value('subscriptions_user_'.$LoggedUser['ID']); } @@ -91,19 +91,19 @@
- + - +

Title

- />
+ />

Body

-
- />
+
+ />

Thread ID

- /> + /> (Leave blank to create thread automatically)

- tabindex="2" /> + tabindex="2" />
@@ -120,13 +120,14 @@ get_value('blog')) { $DB->query("SELECT - b.ID, - um.Username, - b.Title, - b.Body, - b.Time, - b.ThreadID - FROM blog AS b LEFT JOIN users_main AS um ON b.UserID=um.ID + b.ID, + um.Username, + 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(); @@ -147,19 +148,19 @@
- posted by - + - Edit Delete - +
full_format($Body)?> - +

Discuss this post here - + Remove link -
diff --git a/sections/collages/add_torrent.php b/sections/collages/add_torrent.php index 2189f996..3d9a72ac 100644 --- a/sections/collages/add_torrent.php +++ b/sections/collages/add_torrent.php @@ -117,7 +117,7 @@ function AddTorrent($CollageID, $GroupID) { $Matches = array(); if (preg_match($URLRegex, $URL, $Matches)) { $GroupIDs[] = $Matches[3]; - $GroupID = $Matches[3]; + $GroupID = $Matches[3]; } else { $Err = "One of the entered URLs ($URL) does not correspond to a torrent on the site."; break; diff --git a/sections/collages/browse.php b/sections/collages/browse.php index e07942d3..356eb68a 100644 --- a/sections/collages/browse.php +++ b/sections/collages/browse.php @@ -13,33 +13,35 @@ $WayTable = array('Ascending'=>'ASC', 'Descending'=>'DESC'); // Are we searching in bodies, or just names? -if(!empty($_GET['type'])) { +if (!empty($_GET['type'])) { $Type = $_GET['type']; - if(!in_array($Type, array('c.name', 'description'))) { + if (!in_array($Type, array('c.name', 'description'))) { $Type = 'c.name'; } } else { $Type = 'c.name'; } -if(!empty($_GET['search'])) { +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); } -if(!empty($_GET['tags'])) { +if (!empty($_GET['tags'])) { $Tags = explode(',',db_string(trim($_GET['tags']))); - foreach($Tags as $ID=>$Tag) { + foreach ($Tags as $ID=>$Tag) { $Tags[$ID] = Misc::sanitize_tag($Tag); } } -if(!empty($_GET['cats'])) { +if (!empty($_GET['cats'])) { $Categories = $_GET['cats']; - foreach($Categories as $Cat=>$Accept) { - if(empty($CollageCats[$Cat]) || !$Accept) { unset($Categories[$Cat]); } + foreach ($Categories as $Cat=>$Accept) { + if (empty($CollageCats[$Cat]) || !$Accept) { + unset($Categories[$Cat]); + } } $Categories = array_keys($Categories); } else { @@ -47,13 +49,13 @@ } // Ordering -if(!empty($_GET['order_by']) && !empty($OrderTable[$_GET['order_by']])) { +if (!empty($_GET['order_by']) && !empty($OrderTable[$_GET['order_by']])) { $Order = $OrderTable[$_GET['order_by']]; } else { $Order = 'ID'; } -if(!empty($_GET['order_way']) && !empty($WayTable[$_GET['order_way']])) { +if (!empty($_GET['order_way']) && !empty($WayTable[$_GET['order_way']])) { $Way = $WayTable[$_GET['order_way']]; } else { $Way = 'DESC'; @@ -85,7 +87,7 @@ -if(!empty($Search)) { +if (!empty($Search)) { $SQL .= " AND $Type LIKE '%"; $SQL .= implode("%' AND $Type LIKE '%", $Words); $SQL .= "%'"; @@ -97,7 +99,7 @@ $_GET['tags_type'] = 1; } -if(!empty($Tags)) { +if (!empty($Tags)) { $SQL.= " AND (TagList LIKE '%"; if ($_GET['tags_type'] == 0) { $SQL .= implode("%' OR TagList LIKE '%", $Tags); @@ -107,9 +109,9 @@ $SQL .= "%')"; } -if(!empty($_GET['userid'])) { +if (!empty($_GET['userid'])) { $UserID = $_GET['userid']; - if(!is_number($UserID)) { + if (!is_number($UserID)) { error(404); } $User = Users::user_info($UserID); @@ -117,11 +119,13 @@ $UserClass = $Perms['Class']; $UserLink = ''.$User['Username'].''; - if(!empty($_GET['contrib'])) { - if (!check_paranoia('collagecontribs', $User['Paranoia'], $UserClass, $UserID)) { error(403); } + 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)) { + if (empty($CollageIDs)) { $SQL .= " AND 0"; } else { $SQL .= " AND c.ID IN(".db_string(implode(',', $CollageIDs)).")"; @@ -133,7 +137,7 @@ $Categories[] = 0; } -if(!empty($Categories)) { +if (!empty($Categories)) { $SQL.=" AND CategoryID IN(".db_string(implode(',',$Categories)).")"; } @@ -180,8 +184,8 @@ Categories: -$Cat) { ?> - /> +$Cat) { ?> + />    @@ -189,21 +193,21 @@ Search in: - /> Names   - /> Descriptions + /> Names   + /> Descriptions Order by: @@ -218,64 +222,62 @@
- + 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) { ?> + 1) { ?> Personal collages - + Subscribed collages - + Bookmarked collages + if (check_perms('site_collages_recover')) { ?> Recover collage -
- + Collages you started Collages you contributed to - + 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.

- +
- + @@ -299,7 +301,7 @@ - +
Category - + Remove bookmark @@ -308,7 +310,8 @@
diff --git a/sections/collages/collage.php b/sections/collages/collage.php index aa8f95fa..efe3ad63 100644 --- a/sections/collages/collage.php +++ b/sections/collages/collage.php @@ -7,7 +7,7 @@ function compare($X, $Y){ return($Y['count'] - $X['count']); } - // Bookmarks::has_bookmarked() +// Bookmarks::has_bookmarked() include(SERVER_ROOT.'/classes/class_text.php'); // Text formatting class $Text = new TEXT; @@ -30,8 +30,8 @@ function compare($X, $Y){ $DB->query("SELECT Name, Description, UserID, Deleted, CategoryID, Locked, MaxGroups, MaxGroupsPerUser FROM collages WHERE ID='$CollageID'"); if ($DB->record_count() > 0) { list($Name, $Description, $CreatorID, $Deleted, $CollageCategoryID, $Locked, $MaxGroups, $MaxGroupsPerUser) = $DB->next_record(); - $TorrentList=''; - $CollageList=''; + $TorrentList = ''; + $CollageList = ''; } else { $Deleted = '1'; } @@ -258,7 +258,7 @@ function compare($X, $Y){ - > + > 0) { - $DisplayName = $DisplayName. ' ['. $GroupYear .']'; + $DisplayName = $DisplayName. " [$GroupYear]"; } ?>
  • @@ -296,7 +296,7 @@ function compare($X, $Y){
    • 0 && $NumGroups >= $MaxGroups) || ($MaxGroupsPerUser > 0 && $NumGroupsByUser >= $MaxGroupsPerUser))) { @@ -331,18 +331,18 @@ function compare($X, $Y){

    List of collages - + New collage - +

    - + - + Edit description - + Locked - Remove bookmark @@ -350,20 +350,19 @@ function compare($X, $Y){ Bookmark - + + if (check_perms('site_collages_manage') && !$Locked) { ?> Manage torrents - + Report collage - + Delete - +
    - + -
    +
    Category
    @@ -395,20 +394,20 @@ function compare($X, $Y){ X -
    +
    @@ -28,8 +29,8 @@ Name - - 's personal collage + name="name" size="60" id="namebox" value="" /> + @@ -39,27 +40,30 @@ $CatName) { ?> - -$CatName) : ?> + +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')) { ?> +if (($CollageCount < $LoggedUser['Permissions']['MaxCollages']) && check_perms('site_collages_personal')) { ?> - +
    • Theme - A collage containing releases that all relate to a certain theme (e.g. "Searching for the Perfect Beat", "Concept Albums", "Funky Groove", etc.).
    • Genre introduction - A subjective introduction to a genre composed by our own users.
      • -
    • Discography - A collage containing all the releases of an artist. Useful for keeping track of side-projects.
      • +
    • Discography - A collage containing all the releases of an artist, which can be useful for keeping track of side projects.
    • Label - A collage containing all the releases of a particular record label.
    • Staff picks - A listing of recommendations picked by the staff on special occasions.
      • -
    • Charts - Contains all the releases that comprise a certain type of chart (e.g. Billboard Top 100, Pitchfork Top 100, What.cd Top 10, etc.).
      • +
    • Charts - Contains all the releases that comprise a certain type of chart (e.g. Billboard Top 100, Pitchfork Top 100, What.CD Top 10, etc.).
      • -
    • Personal - You can put whatever you want here. It's your own personal collage.
      • - + if (($CollageCount < $LoggedUser['Permissions']['MaxCollages']) && check_perms('site_collages_personal')) { ?> +
    • Personal - You can put whatever you want here. It is your own personal collage.
      • +
    diff --git a/sections/collages/new_handle.php b/sections/collages/new_handle.php index a01768a3..42157fbd 100644 --- a/sections/collages/new_handle.php +++ b/sections/collages/new_handle.php @@ -35,11 +35,11 @@ } } -if(!$Err) { +if (!$Err) { $DB->query("SELECT ID,Deleted FROM collages WHERE Name='$P[name]'"); - if($DB->record_count()) { + if ($DB->record_count()) { list($ID, $Deleted) = $DB->next_record(); - if($Deleted) { + if ($Deleted) { $Err = "That collection already exists but needs to be recovered; please contact the staff team!"; } else { $Err = "That collection already exists: $ID."; @@ -47,25 +47,25 @@ } } -if(!$Err) { - if(empty($CollageCats[$P['category']])) { +if (!$Err) { + if (empty($CollageCats[$P['category']])) { $Err = 'Please select a category'; } } -if($Err) { +if ($Err) { //error($Err); - $Err = urlencode($Err); - $Name = urlencode($_POST['name']); - $Category = urlencode($_POST['category']); - $Tags = urlencode($_POST['tags']); + $Err = urlencode($Err); + $Name = urlencode($_POST['name']); + $Category = urlencode($_POST['category']); + $Tags = urlencode($_POST['tags']); $Description = urlencode($_POST['description']); header("Location: collages.php?action=new&err=$Err&name=$Name&cat=$Category&tags=$Tags&descr=$Description"); die(); } $TagList = explode(',',$_POST['tags']); -foreach($TagList as $ID=>$Tag) { +foreach ($TagList as $ID=>$Tag) { $TagList[$ID] = Misc::sanitize_tag($Tag); } $TagList = implode(' ',$TagList); diff --git a/sections/comments/artistcomments.php b/sections/comments/artistcomments.php index 69126b32..7dd5a3a0 100644 --- a/sections/comments/artistcomments.php +++ b/sections/comments/artistcomments.php @@ -2,30 +2,26 @@ $OtherLink = ''; -$Title = 'Artist comments made by '.($Self?'you':$Username); -$Header = 'Artist comments left by '.($Self?'you':Users::format_username($UserID, false, false, false)).''; +$Title = 'Artist comments made by '.($Self ? 'you' : $Username); +$Header = 'Artist comments left by '.($Self ? 'you' : Users::format_username($UserID, false, false, false)).''; -$Comments = $DB->query("SELECT - SQL_CALC_FOUND_ROWS - ac.AuthorID, - a.ArtistID, - a.Name, - ac.ID, - ac.Body, - ac.AddedTime, - ac.EditedTime, - ac.EditedUserID as EditorID - - FROM artists_group as a - JOIN artist_comments as ac ON ac.ArtistID = a.ArtistID - - WHERE ac.AuthorId = $UserID - - GROUP BY ac.ID - - ORDER BY ac.AddedTime DESC - - LIMIT $Limit; +$Comments = $DB->query(" + SELECT + SQL_CALC_FOUND_ROWS + ac.AuthorID, + a.ArtistID, + a.Name, + ac.ID, + ac.Body, + ac.AddedTime, + ac.EditedTime, + ac.EditedUserID as EditorID + FROM artists_group as a + JOIN artist_comments as ac ON ac.ArtistID = a.ArtistID + WHERE ac.AuthorId = $UserID + GROUP BY ac.ID + ORDER BY ac.AddedTime DESC + LIMIT $Limit; "); $DB->query("SELECT FOUND_ROWS()"); @@ -53,16 +49,15 @@
    next_record()) { - $permalink = "artist.php?id=$ArtistID&postid=$PostID#post$PostID"; - $postheader = " on " . "$ArtistName"; +while (list($UserID, $ArtistID, $ArtistName, $PostID, $Body, $AddedTime, $EditedTime, $EditorID) = $DB->next_record()) { + $permalink = "artist.php?id=$ArtistID&postid=$PostID#post$PostID"; + $postheader = ' on ' . "$ArtistName"; - comment_body($UserID, $PostID, $postheader, $permalink, $Body, $EditorID, $AddedTime, $EditedTime); + comment_body($UserID, $PostID, $postheader, $permalink, $Body, $EditorID, $AddedTime, $EditedTime); } /* end while loop*/ ?>
    " . Users::format_username($UserID, true, true, true, true, false) . " " + global $Text,$HeavyInfo; + $UserInfo = Users::user_info($UserID); + $postheader = 'by ' . Users::format_username($UserID, true, true, true, true, false) . ' ' . time_diff($AddedTime) . $postheader; ?> - ' id="post"> +
    - + - - + - - - -
    - # - +
    + # +
    - - ' width='150' alt="'s avatar" /> - + + + + <?=$UserInfo['Username']?>'s avatar + Default avatar - + + + full_format($Body) ?> - -

    - Last edited by - - + +

    + Last edited by + +
    diff --git a/sections/comments/torrentcomments.php b/sections/comments/torrentcomments.php index 07e1bb71..581994fc 100644 --- a/sections/comments/torrentcomments.php +++ b/sections/comments/torrentcomments.php @@ -1,59 +1,53 @@ Request comments Artist comments
    '; -if($MyTorrents) { - $Conditions = "WHERE t.UserID = $UserID AND tc.AuthorID != t.UserID AND tc.AddedTime > t.Time"; - $Title = 'Comments left on your torrents'; - $Header = 'Comments left on your uploads'; - if($Self) { - $OtherLink .= 'Display comments you have made'; - } -} -else { - $Conditions = "WHERE tc.AuthorID = $UserID"; - $Title = 'Comments made by '.($Self?'you':$Username); - $Header = 'Torrent comments left by '.($Self?'you':Users::format_username($UserID, false, false, false)).''; - if($Self) { - $OtherLink .= 'Display comments left on your uploads'; - } +if ($MyTorrents) { + $Conditions = "WHERE t.UserID = $UserID AND tc.AuthorID != t.UserID AND tc.AddedTime > t.Time"; + $Title = 'Comments left on your torrents'; + $Header = 'Comments left on your uploads'; + if ($Self) { + $OtherLink .= 'Display comments you have made'; + } +} else { + $Conditions = "WHERE tc.AuthorID = $UserID"; + $Title = 'Comments made by '.($Self?'you':$Username); + $Header = 'Torrent comments left by '.($Self?'you':Users::format_username($UserID, false, false, false)).''; + if ($Self) { + $OtherLink .= 'Display comments left on your uploads'; + } } $Comments = $DB->query("SELECT - SQL_CALC_FOUND_ROWS - tc.AuthorID, - t.ID, - t.GroupID, - tg.Name, - tc.ID, - tc.Body, - tc.AddedTime, - tc.EditedTime, - tc.EditedUserID as EditorID - - FROM torrents as t - JOIN torrents_comments as tc ON tc.GroupID = t.GroupID - JOIN torrents_group as tg ON t.GroupID = tg.ID - - $Conditions - - GROUP BY tc.ID - - ORDER BY tc.AddedTime DESC - - LIMIT $Limit; + SQL_CALC_FOUND_ROWS + tc.AuthorID, + t.ID, + t.GroupID, + tg.Name, + tc.ID, + tc.Body, + tc.AddedTime, + tc.EditedTime, + tc.EditedUserID as EditorID + FROM torrents as t + JOIN torrents_comments as tc ON tc.GroupID = t.GroupID + JOIN torrents_group as tg ON t.GroupID = tg.ID + $Conditions + GROUP BY tc.ID + ORDER BY tc.AddedTime DESC + LIMIT $Limit; "); $DB->query("SELECT FOUND_ROWS()"); @@ -81,17 +75,16 @@
    next_record()) { + $permalink = "torrents.php?id=$GroupID&postid=$PostID#post$PostID"; + $postheader = ' on ' . Artists::display_artists($Artists[$GroupID]) . " $Title"; -while(list($UserID, $TorrentID, $GroupID, $Title, $PostID, $Body, $AddedTime, $EditedTime, $EditorID) = $DB->next_record()) { - $permalink = "torrents.php?id=$GroupID&postid=$PostID#post$PostID"; - $postheader = " on " . Artists::display_artists($Artists[$GroupID]) . " $Title"; - - comment_body($UserID, $PostID, $postheader, $permalink, $Body, $EditorID, $AddedTime, $EditedTime); + comment_body($UserID, $PostID, $postheader, $permalink, $Body, $EditorID, $AddedTime, $EditedTime); } /* end while loop*/ ?>

    Donate

    -
    +

    We accept donations to cover the costs associated with running the site and tracker. These costs come from the rental and purchase of the hardware the site runs on (servers, components, etc.), in addition to operating expenses (bandwidth, power, etc.).

    Because we do not have any advertisements or sponsorships and this service is provided free of charge, we are entirely reliant upon user donations. If you are financially able, please consider making a donation to help us pay the bills!

    We currently only accept one payment method: PayPal. Because of the fees they charge, there is a minimum donation amount of (Please note, this is only a minimum amount and we greatly appreciate any extra you can afford.).

    @@ -55,9 +55,9 @@ - - - + + + @@ -71,7 +71,7 @@

    What you will receive for a 5€ or 0.5 BTC minimum donation

    -
    +
      @@ -92,7 +92,7 @@

      Please be aware that by making a donation you aren't purchasing donor status or invites. You are helping us pay the bills and cover the costs of running the site. We are doing our best to give our love back to donors, but sometimes it might take more than 48 hours. Feel free to contact us by sending us a Staff PM regarding any matter. We will answer as quickly as possible.

    What you will not receive

    -
    +
    • 2 more invitations; these are one time only.
      • diff --git a/sections/donate/donate_gpal.php b/sections/donate/donate_gpal.php index f6a17ac5..456d8246 100644 --- a/sections/donate/donate_gpal.php +++ b/sections/donate/donate_gpal.php @@ -47,7 +47,7 @@

      Donate

      -
      +

      We accept donations to cover the costs associated with running the site and tracker. These costs come from the rental and purchase of the hardware the site runs on (servers, components, etc.), in addition to operating expenses (bandwidth, power, etc.).

      Because we do not have any advertisements or sponsorships and this service is provided free of charge, we are entirely reliant upon user donations. If you are financially able, please consider making a donation to help us pay the bills!

      We currently only accept one payment method: PayPal. Because of the fees they charge, there is a minimum donation amount of (Please note, this is only a minimum amount and we greatly appreciate any extra you can afford.).

      @@ -56,9 +56,9 @@ - - - + + + diff --git a/sections/donate/ipn.php b/sections/donate/ipn.php index 9d03a8db..101f98b3 100644 --- a/sections/donate/ipn.php +++ b/sections/donate/ipn.php @@ -63,7 +63,7 @@ Misc::send_pm($_POST['custom'], 0, 'Thank you for your donation', 'Your donation from '.$_POST['payer_email'].' of '.$_POST['mc_gross'].' '.PAYPAL_CURRENCY.' has been successfully processed. Unfortunately however this donation was less than the specified minimum donation of '.PAYPAL_MINIMUM.' '.PAYPAL_CURRENCY.' and while we are grateful, no special privileges have been awarded to you.'); } else { //Failed pending donation - $Message = "User http://".NONSSL_SITE_URL."/user.php?id=".$_POST['custom']." had donation of ".$TotalDonated." ".PAYPAL_CURRENCY." at ".$DonationTime." UTC from ".$_POST['payer_email']." returned."; + $Message = "User https://".SSL_SITE_URL."/user.php?id=".$_POST['custom']." had donation of ".$TotalDonated." ".PAYPAL_CURRENCY." at ".$DonationTime." UTC from ".$_POST['payer_email']." returned."; $DB->query('SELECT SUM(Amount), MIN(Time) FROM donations WHERE UserID=\''.$_POST['custom'].'\';'); list($TotalDonated,$DonationTime) = $DB->next_record(); if ($TotalDonated+$_POST['mc_gross'] == 0) { diff --git a/sections/feeds/index.php b/sections/feeds/index.php index c84ff8b3..495ac56a 100644 --- a/sections/feeds/index.php +++ b/sections/feeds/index.php @@ -22,7 +22,7 @@ $User = (int)$_GET['user']; -if(!$Enabled = $Cache->get_value('enabled_'.$User)){ +if (!$Enabled = $Cache->get_value('enabled_'.$User)) { require(SERVER_ROOT.'/classes/class_mysql.php'); $DB=NEW DB_MYSQL; //Load the database wrapper $DB->query("SELECT Enabled FROM users_main WHERE ID='$User'"); @@ -40,7 +40,7 @@ } $Feed->open_feed(); -switch($_GET['feed']) { +switch ($_GET['feed']) { case 'feed_news': include(SERVER_ROOT.'/classes/class_text.php'); $Text = new TEXT; diff --git a/sections/forums/forum.php b/sections/forums/forum.php index bfae7bfb..aed8f128 100644 --- a/sections/forums/forum.php +++ b/sections/forums/forum.php @@ -12,7 +12,7 @@ // Check for lame SQL injection attempts $ForumID = $_GET['forumid']; -if(!is_number($ForumID)) { +if (!is_number($ForumID)) { error(0); } @@ -28,27 +28,28 @@ // Caching anything beyond the first page of any given forum is just wasting ram // users are more likely to search then to browse to page 2 -if($Page==1) { +if ($Page == 1) { list($Forum,,,$Stickies) = $Cache->get_value('forums_'.$ForumID); } -if(!isset($Forum) || !is_array($Forum)) { - $DB->query("SELECT - t.ID, - t.Title, - t.AuthorID, - t.IsLocked, - t.IsSticky, - t.NumPosts, - t.LastPostID, - t.LastPostTime, - t.LastPostAuthorID +if (!isset($Forum) || !is_array($Forum)) { + $DB->query(" + SELECT + t.ID, + t.Title, + t.AuthorID, + t.IsLocked, + t.IsSticky, + t.NumPosts, + t.LastPostID, + t.LastPostTime, + t.LastPostAuthorID FROM forums_topics AS t WHERE t.ForumID = '$ForumID' ORDER BY t.IsSticky DESC, t.LastPostTime DESC LIMIT $Limit"); // Can be cached until someone makes a new post $Forum = $DB->to_array('ID',MYSQLI_ASSOC, false); - if($Page==1) { + 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); @@ -56,16 +57,22 @@ } -if(!isset($Forums[$ForumID])) { error(404); } +if (!isset($Forums[$ForumID])) { + 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($LoggedUser['CustomForums'][$ForumID] != 1 && $Forums[$ForumID]['MinClassRead'] > $LoggedUser['Class']) { error(403); } +if ($LoggedUser['CustomForums'][$ForumID] != 1 && $Forums[$ForumID]['MinClassRead'] > $LoggedUser['Class']) { + error(403); +} // Start printing View::show_header('Forums > '. $Forums[$ForumID]['Name']); @@ -73,10 +80,10 @@

      Forums >

      - + New thread - Search this forum + Search this forum @@ -406,9 +416,9 @@
      full_format($Title)?> - + - Edit - +
      full_format($Body)?>
      @@ -432,13 +442,14 @@ function contest() { global $DB, $Cache, $LoggedUser; list($Contest, $TotalPoints) = $Cache->get_value('contest'); - if(!$Contest) { - $DB->query("SELECT - UserID, - SUM(Points), - Username + if (!$Contest) { + $DB->query(" + SELECT + UserID, + SUM(Points), + Username FROM users_points AS up - JOIN users_main AS um ON um.ID=up.UserID + JOIN users_main AS um ON um.ID=up.UserID GROUP BY UserID ORDER BY SUM(Points) DESC LIMIT 20"); @@ -455,7 +466,7 @@ function contest() {
      Quality time scoreboard
      -
        +
          query("UPDATE users_info diff --git a/sections/reports/report.php b/sections/reports/report.php index a7835df4..b3d4e581 100644 --- a/sections/reports/report.php +++ b/sections/reports/report.php @@ -15,7 +15,7 @@ $ID = $_GET['id']; switch ($Short) { - case "user" : + case 'user' : $DB->query("SELECT Username FROM users_main WHERE ID=".$ID); if ($DB->record_count() < 1) { error(404); @@ -23,19 +23,19 @@ list($Username) = $DB->next_record(); break; - case "request_update" : + case 'request_update' : $NoReason = true; $DB->query("SELECT Title, Description, TorrentID, CategoryID, Year FROM requests WHERE ID=".$ID); if ($DB->record_count() < 1) { error(404); } list($Name, $Desc, $Filled, $CategoryID, $Year) = $DB->next_record(); - if ($Filled || ($CategoryID != 0 && ($Categories[$CategoryID-1] != "Music" || $Year != 0))) { + if ($Filled || ($CategoryID != 0 && ($Categories[$CategoryID-1] != 'Music' || $Year != 0))) { error(403); } break; - case "request" : + case 'request' : $DB->query("SELECT Title, Description, TorrentID FROM requests WHERE ID=".$ID); if ($DB->record_count() < 1) { error(404); @@ -43,7 +43,7 @@ list($Name, $Desc, $Filled) = $DB->next_record(); break; - case "collage" : + case 'collage' : $DB->query("SELECT Name, Description FROM collages WHERE ID=".$ID); if ($DB->record_count() < 1) { error(404); @@ -51,7 +51,7 @@ list($Name, $Desc) = $DB->next_record(); break; - case "thread" : + case 'thread' : $DB->query("SELECT ft.Title, ft.ForumID, um.Username FROM forums_topics AS ft JOIN users_main AS um ON um.ID=ft.AuthorID WHERE ft.ID=".$ID); if ($DB->record_count() < 1) { error(404); @@ -66,15 +66,15 @@ } break; - case "post" : - $DB->query("SELECT fp.Body, fp.TopicID, um.Username FROM forums_posts AS fp JOIN users_main AS um ON um.ID=fp.AuthorID WHERE fp.ID=".$ID); + case 'post' : + $DB->query('SELECT fp.Body, fp.TopicID, um.Username FROM forums_posts AS fp JOIN users_main AS um ON um.ID=fp.AuthorID WHERE fp.ID='.$ID); if ($DB->record_count() < 1) { error(404); } list($Body, $TopicID, $Username) = $DB->next_record(); - $DB->query("SELECT ForumID FROM forums_topics WHERE ID = ".$TopicID); + $DB->query('SELECT ForumID FROM forums_topics WHERE ID = '.$TopicID); list($ForumID) = $DB->next_record(); - $DB->query("SELECT MinClassRead FROM forums WHERE ID = ".$ForumID); + $DB->query('SELECT MinClassRead FROM forums WHERE ID = '.$ForumID); list($MinClassRead) = $DB->next_record(); if (!empty($LoggedUser['DisableForums']) || ($MinClassRead > $LoggedUser['EffectiveClass'] && (!isset($LoggedUser['CustomForums'][$ForumID]) || $LoggedUser['CustomForums'][$ForumID] == 0)) || @@ -83,17 +83,17 @@ } break; - case "requests_comment" : - case "torrents_comment" : - case "artist_comment": - case "collages_comment" : + case 'requests_comment' : + case 'torrents_comment' : + case 'artist_comment': + case 'collages_comment' : $Table = $Short.'s'; - if ($Short == "collages_comment") { - $Column = "UserID"; + if ($Short == 'collages_comment') { + $Column = 'UserID'; } else { - $Column = "AuthorID"; + $Column = 'AuthorID'; } - $DB->query("SELECT ".$Short.".Body, um.Username FROM ".$Table." AS ".$Short." JOIN users_main AS um ON um.ID=".$Short.".".$Column." WHERE ".$Short.".ID=".$ID); + $DB->query('SELECT '.$Short.".Body, um.Username FROM ".$Table." AS ".$Short." JOIN users_main AS um ON um.ID=".$Short.".".$Column." WHERE ".$Short.".ID=".$ID); if ($DB->record_count() < 1) { error(404); } @@ -126,12 +126,12 @@ switch ($Short) { - case "user" : + case 'user' : ?>

          You are reporting the user

          You are reporting the request:

          @@ -163,13 +163,13 @@ - +
          Release TypeRelease type @@ -207,7 +207,7 @@

          You are reporting the collage:

          @@ -222,7 +222,7 @@

          You are reporting the thread:

          @@ -237,7 +237,7 @@

          You are reporting the post:

          @@ -252,10 +252,10 @@

          You are reporting the :

          diff --git a/sections/reportsv2/array.php b/sections/reportsv2/array.php index a34d6a00..047b6ef7 100644 --- a/sections/reportsv2/array.php +++ b/sections/reportsv2/array.php @@ -32,7 +32,7 @@ 'upload' => '0', 'warn' => '0', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#h2.2]2.2[/url]. Your torrent was reported because it was a duplicate of another torrent.' + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#h2.2]2.2[/url]. Your torrent was reported because it was a duplicate of another torrent.' ) ), 'banned' => array( @@ -48,7 +48,7 @@ 'upload' => '0', 'warn' => '4', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#h1.2]1.2[/url]. You have uploaded material that is currently forbidden. Items on the Do Not Upload list (at the top of the [url=http://'.NONSSL_SITE_URL.'/upload.php]upload page[/url]) and in the [url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#h1.2]Specifically Banned[/url] portion of the uploading rules cannot be uploaded to the site. Do not upload them unless your torrent meets a condition specified in the comments of the DNU list. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#h1.2]1.2[/url]. You have uploaded material that is currently forbidden. Items on the Do Not Upload list (at the top of the [url=https://'.SSL_SITE_URL.'/upload.php]upload page[/url]) and in the [url=https://'.SSL_SITE_URL.'/rules.php?p=upload#h1.2]Specifically Banned[/url] portion of the uploading rules cannot be uploaded to the site. Do not upload them unless your torrent meets a condition specified in the comments of the DNU list. Your torrent was reported because it contained material from the DNU list or from the Specifically Banned section of the rules.' ) ), @@ -106,7 +106,7 @@ 'upload' => '0', 'warn' => '0', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#h2.2]2.2[/url]. Your torrent was reported because it was trumped by another torrent.' + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#h2.2]2.2[/url]. Your torrent was reported because it was trumped by another torrent.' ) ), 'private_trump' => array( @@ -146,7 +146,7 @@ 'upload' => '0', 'warn' => '0', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.3.16]2.3.16[/url]. Properly tag your music files. Certain meta tags (e.g., ID3, Vorbis) are required on all music uploads. Make sure to use the appropriate tag format for your files (e.g., no ID3 tags for FLAC - see [url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.2.10.8]2.2.10.8[/url]). ID3v2 tags for files are highly recommended over ID3v1. ID3 are recommended for AC3 torrents but are not mandatory because the format does not natively support file metadata tagging (for AC3, the file names become the vehicle for correctly labeling media files). Torrents uploaded with both good ID3v1 tags and blank ID3v2 tags (a dual set of tags) are trumpable by torrents with either just good ID3v1 tags or good ID3v2 tags (a single set of tags). If you upload an album missing one or more of the required tags, then another user may add the tags, re-upload, and report your torrent for deletion. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.3.16]2.3.16[/url]. Properly tag your music files. Certain meta tags (e.g., ID3, Vorbis) are required on all music uploads. Make sure to use the appropriate tag format for your files (e.g., no ID3 tags for FLAC - see [url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.2.10.8]2.2.10.8[/url]). ID3v2 tags for files are highly recommended over ID3v1. ID3 are recommended for AC3 torrents but are not mandatory because the format does not natively support file metadata tagging (for AC3, the file names become the vehicle for correctly labeling media files). Torrents uploaded with both good ID3v1 tags and blank ID3v2 tags (a dual set of tags) are trumpable by torrents with either just good ID3v1 tags or good ID3v2 tags (a single set of tags). If you upload an album missing one or more of the required tags, then another user may add the tags, re-upload, and report your torrent for deletion. Your torrent was reported because it was trumped by another torrent with improved metadata tags.' ) ), @@ -166,7 +166,7 @@ 'upload' => '0', 'warn' => '0', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.5.5]2.5.5[/url]. Vinyl rips may be trumped by better-sounding rips of the same bit depth, regardless of lineage information (see [url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.3.9]2.3.9[/url]). + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.5.5]2.5.5[/url]. Vinyl rips may be trumped by better-sounding rips of the same bit depth, regardless of lineage information (see [url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.3.9]2.3.9[/url]). Your torrent was reported as it was trumped by a better-sounding vinyl rip.' ) ), @@ -185,8 +185,8 @@ 'upload' => '0', 'warn' => '0', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.3.2]2.3.2[/url]. Name your directories with meaningful titles, such as "Artist - Album (Year) - Format." The minimum acceptable is "Album" although it is preferable to include more information. If the directory name does not include this minimum then another user can rename the directory, re-upload, and report your torrent for deletion. In addition, torrent folders that are named using the scene convention will be trumpable if the Scene label is absent from the torrent. -[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.3.3]2.3.3[/url]. Avoid creating unnecessary nested folders (such as an extra folder for the actual album) inside your properly named directory. A torrent with unnecessary nested folders is trumpable by a torrent with such folders removed. For single disc albums, all audio files must be included in the main torrent folder. For multi-disc albums, the main torrent folder may include one sub-folder that holds the audio file contents for each disc in the box set, i.e., the main torrent folder is "Adele - 19 (2008) - FLAC" while appropriate sub-folders may include "19 (Disc 1of2)" or "19" and "Live From The Hotel Cafe (Disc 2of2)" or "Acoustic Set Live From The Hotel Cafe, Los Angeles." Additional folders are unnecessary because they do nothing to improve the organization of the torrent. If you are uncertain about what to do for other cases, PM a staff member for guidance. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.3.2]2.3.2[/url]. Name your directories with meaningful titles, such as "Artist - Album (Year) - Format." The minimum acceptable is "Album" although it is preferable to include more information. If the directory name does not include this minimum then another user can rename the directory, re-upload, and report your torrent for deletion. In addition, torrent folders that are named using the scene convention will be trumpable if the Scene label is absent from the torrent. +[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.3.3]2.3.3[/url]. Avoid creating unnecessary nested folders (such as an extra folder for the actual album) inside your properly named directory. A torrent with unnecessary nested folders is trumpable by a torrent with such folders removed. For single disc albums, all audio files must be included in the main torrent folder. For multi-disc albums, the main torrent folder may include one sub-folder that holds the audio file contents for each disc in the box set, i.e., the main torrent folder is "Adele - 19 (2008) - FLAC" while appropriate sub-folders may include "19 (Disc 1of2)" or "19" and "Live From The Hotel Cafe (Disc 2of2)" or "Acoustic Set Live From The Hotel Cafe, Los Angeles." Additional folders are unnecessary because they do nothing to improve the organization of the torrent. If you are uncertain about what to do for other cases, PM a staff member for guidance. Your torrent was reported because it was trumped by another torrent with an improved folder name and directory structure.' ) ), @@ -205,7 +205,7 @@ 'upload' => '0', 'warn' => '0', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.3.11]2.3.11[/url]. File names must accurately reflect the song titles. You may not have file names like 01track.mp3, 02track.mp3, etc. Torrents containing files that are named with incorrect song titles can be trumped by properly labeled torrents. Also, torrents that are sourced from the scene but do not have the Scene label must comply with site naming rules (no release group names in the file names, no advertisements in the file names, etc.). If all the letters in the track titles are capitalized, the torrent is trumpable. If you upload an album with improper file names, then another user may fix the file names, re-upload, and report yours for deletion. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.3.11]2.3.11[/url]. File names must accurately reflect the song titles. You may not have file names like 01track.mp3, 02track.mp3, etc. Torrents containing files that are named with incorrect song titles can be trumped by properly labeled torrents. Also, torrents that are sourced from the scene but do not have the Scene label must comply with site naming rules (no release group names in the file names, no advertisements in the file names, etc.). If all the letters in the track titles are capitalized, the torrent is trumpable. If you upload an album with improper file names, then another user may fix the file names, re-upload, and report yours for deletion. Your torrent was reported because it was trumped by another torrent with improved file names.' ) ), @@ -225,8 +225,8 @@ 'upload' => '0', 'warn' => '1', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.1.19]2.1.19[/url]. All music torrents must represent a complete release, and may not be missing tracks (or discs in the case of a multi-disc release). -[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.1.19.2]2.1.19.2[/url]. A single track (e.g., one MP3 file) cannot be uploaded on its own unless it is an officially released single. If a specific track can only be found on an album, the entire album must be uploaded in the torrent. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.1.19]2.1.19[/url]. All music torrents must represent a complete release, and may not be missing tracks (or discs in the case of a multi-disc release). +[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.1.19.2]2.1.19.2[/url]. A single track (e.g., one MP3 file) cannot be uploaded on its own unless it is an officially released single. If a specific track can only be found on an album, the entire album must be uploaded in the torrent. Your torrent was reported because it was missing tracks.' ) ), @@ -245,8 +245,8 @@ 'upload' => '0', 'warn' => '1', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.1.19]2.1.19[/url]. All music torrents must represent a complete release, and may not be missing tracks (or discs in the case of a multi-disc release). -[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.1.19.1]2.1.19.1[/url]. If an album is released as a multi-disc set (or box set) of CDs or vinyl discs, then it must be uploaded as a single torrent. Preferably, each individual CD rip in a multi-disc set should be organized in its own folder (see [url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.3.12]2.3.12[/url]). + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.1.19]2.1.19[/url]. All music torrents must represent a complete release, and may not be missing tracks (or discs in the case of a multi-disc release). +[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.1.19.1]2.1.19.1[/url]. If an album is released as a multi-disc set (or box set) of CDs or vinyl discs, then it must be uploaded as a single torrent. Preferably, each individual CD rip in a multi-disc set should be organized in its own folder (see [url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.3.12]2.3.12[/url]). Your torrent was reported because it was missing discs.' ) ), @@ -266,7 +266,7 @@ 'upload' => '0', 'warn' => '1', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.1.19.3]2.1.19.3[/url]. Bonus discs may be uploaded separately in accordance with [url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#h2.4]2.4[/url]. Please note that individual bonus tracks cannot be uploaded without the rest of the album. Bonus tracks are not bonus discs. Enhanced audio CDs with data or video tracks must be uploaded without the non-audio tracks. If you want to share the videos or data, you may host the files off-site with a file sharing service and include the link to that service in your torrent description. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.1.19.3]2.1.19.3[/url]. Bonus discs may be uploaded separately in accordance with [url=https://'.SSL_SITE_URL.'/rules.php?p=upload#h2.4]2.4[/url]. Please note that individual bonus tracks cannot be uploaded without the rest of the album. Bonus tracks are not bonus discs. Enhanced audio CDs with data or video tracks must be uploaded without the non-audio tracks. If you want to share the videos or data, you may host the files off-site with a file sharing service and include the link to that service in your torrent description. Your torrent was reported because it contained only bonus tracks without the full album.' ) ), @@ -286,7 +286,7 @@ 'upload' => '0', 'warn' => '2', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.1.2]2.1.2[/url]. No transcodes or re-encodes of lossy releases are acceptable here. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.1.2]2.1.2[/url]. No transcodes or re-encodes of lossy releases are acceptable here. Your torrent was reported because it contained transcoded audio files.' ) ), @@ -304,8 +304,8 @@ 'upload' => '0', 'warn' => '2', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.1.3]2.1.3[/url]. Music releases must have an average bitrate of at least 192 kbps regardless of the format. Exceptions: The following VBR encodes may go under the 192 kbps limit: LAME V2 (VBR), V1 (VBR), V0 (VBR), APS (VBR), APX (VBR), MP3 192 (VBR), and AAC ~192 (VBR) to AAC ~256 (VBR) releases. -Your torrent was reported because it contained one of more audio files that did not meet the minimum bitrate requirement.' + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.1.3]2.1.3[/url]. Music releases must have an average bitrate of at least 192 kbps regardless of the format. Exceptions: The following VBR encodes may go under the 192 kbps limit: LAME V2 (VBR), V1 (VBR), V0 (VBR), APS (VBR), APX (VBR), MP3 192 (VBR), and AAC ~192 (VBR) to AAC ~256 (VBR) releases. +Your torrent was reported because it contained one or more audio files that did not meet the minimum bitrate requirement.' ) ), 'mutt' => array( @@ -322,7 +322,7 @@ 'upload' => '0', 'warn' => '2', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.1.6]2.1.6[/url]. All music torrents must be encoded with a single encoder using the same settings. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.1.6]2.1.6[/url]. All music torrents must be encoded with a single encoder using the same settings. Your torrent was reported because it contained one or more audio files that were encoded by different audio encoders or with different encoder settings.' ) ), @@ -342,8 +342,8 @@ 'upload' => '0', 'warn' => '1', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.1.5]2.1.5[/url]. Albums must not be ripped or uploaded as a single track. -[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.1.5.1]2.1.5.1[/url]. If the tracks on the original CD were separate, you must rip them to separate files. Any unsplit FLAC rips lacking a cue sheet will be deleted outright. Any unsplit FLAC rip that includes a cue sheet will be trumpable by a properly split FLAC torrent. CDs with single tracks can be uploaded without prior splitting. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.1.5]2.1.5[/url]. Albums must not be ripped or uploaded as a single track. +[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.1.5.1]2.1.5.1[/url]. If the tracks on the original CD were separate, you must rip them to separate files. Any unsplit FLAC rips lacking a cue sheet will be deleted outright. Any unsplit FLAC rip that includes a cue sheet will be trumpable by a properly split FLAC torrent. CDs with single tracks can be uploaded without prior splitting. Your torrent was reported because it contained a single-track rip instead of a rip consisting of separate audio files.' ) ), @@ -362,9 +362,9 @@ 'upload' => '0', 'warn' => '0', 'delete' => '0', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.3.16]2.3.16[/url]. Properly tag your music files. -The Uploading Rules require that all uploads be properly tagged. Your torrent has been marked as having poor tags. It is now listed on [url=http://'.NONSSL_SITE_URL.'/better.php]Better.php[/url] and is eligible for trumping. You are of course free to fix this torrent yourself. Add or fix the required tags and upload the replacement torrent to the site. Then, report (RP) the older torrent using the category "Tag Trump" and indicate in the report comments that you have fixed the tags. Be sure to provide a link (PL) to the new replacement torrent. -Your torrent has been labeled as having bad tags and is now eligible for trumping through the [url=http://'.NONSSL_SITE_URL.'/better.php]Better.php[/url] listing.' + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.3.16]2.3.16[/url]. Properly tag your music files. +The Uploading Rules require that all uploads be properly tagged. Your torrent has been marked as having poor tags. It is now listed on [url=https://'.SSL_SITE_URL.'/better.php]Better.php[/url] and is eligible for trumping. You are of course free to fix this torrent yourself. Add or fix the required tags and upload the replacement torrent to the site. Then, report (RP) the older torrent using the category "Tag Trump" and indicate in the report comments that you have fixed the tags. Be sure to provide a link (PL) to the new replacement torrent. +Your torrent has been labeled as having bad tags and is now eligible for trumping through the [url=https://'.SSL_SITE_URL.'/better.php]Better.php[/url] listing.' ) ), 'folders_bad' => array( @@ -380,9 +380,9 @@ 'upload' => '0', 'warn' => '0', 'delete' => '0', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.3.2]2.3.2[/url]. Name your directories with meaningful titles, such as "Artist - Album (Year) - Format." -The Uploading Rules require that all uploads contain torrent directories with meaningful names. Your torrent has been marked as having a poorly named torrent directory. It is now listed on [url=http://'.NONSSL_SITE_URL.'/better.php]Better.php[/url] and is eligible for trumping. You are of course free to fix this torrent yourself. Add or fix the folder/directory name(s) and upload the replacement torrent to the site. Then, report (RP) the older torrent using the category "Folder Trump" and indicate in the report comments that you have fixed the directory name(s). Be sure to provide a link (PL) to the new replacement torrent. -Your torrent has been labeled as having a bad folder name (or directory structure) and is now eligible for trumping through the [url=http://'.NONSSL_SITE_URL.'/better.php]Better.php[/url] listing.' + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.3.2]2.3.2[/url]. Name your directories with meaningful titles, such as "Artist - Album (Year) - Format." +The Uploading Rules require that all uploads contain torrent directories with meaningful names. Your torrent has been marked as having a poorly named torrent directory. It is now listed on [url=https://'.SSL_SITE_URL.'/better.php]Better.php[/url] and is eligible for trumping. You are of course free to fix this torrent yourself. Add or fix the folder/directory name(s) and upload the replacement torrent to the site. Then, report (RP) the older torrent using the category "Folder Trump" and indicate in the report comments that you have fixed the directory name(s). Be sure to provide a link (PL) to the new replacement torrent. +Your torrent has been labeled as having a bad folder name (or directory structure) and is now eligible for trumping through the [url=https://'.SSL_SITE_URL.'/better.php]Better.php[/url] listing.' ) ), 'wrong_format' => array( @@ -398,7 +398,7 @@ 'upload' => '0', 'warn' => '0', 'delete' => '0', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.1.4]2.1.4[/url]. Bitrates must accurately reflect encoder presets or the average bitrate of the audio files. You are responsible for supplying correct format and bitrate information on the upload page. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.1.4]2.1.4[/url]. Bitrates must accurately reflect encoder presets or the average bitrate of the audio files. You are responsible for supplying correct format and bitrate information on the upload page. Your torrent has now been labeled using the appropriate format and bitrate.' ) ), @@ -432,7 +432,7 @@ 'upload' => '0', 'warn' => '1', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.1.1]2.1.1[/url]. The only formats allowed for music are: + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.1.1]2.1.1[/url]. The only formats allowed for music are: Lossy: MP3, AAC, AC3, DTS Lossless: FLAC Your torrent was reported because it contained a disallowed format.' @@ -454,7 +454,7 @@ 'upload' => '0', 'warn' => '0', 'delete' => '0', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.1.4]2.1.4[/url]. Bitrates must accurately reflect encoder presets or the average bitrate of the audio files. You are responsible for supplying correct format and bitrate information on the upload page. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.1.4]2.1.4[/url]. Bitrates must accurately reflect encoder presets or the average bitrate of the audio files. You are responsible for supplying correct format and bitrate information on the upload page. Your torrent was reported because the bitrates of one or more audio files had been misrepresented.' ) ), @@ -472,7 +472,7 @@ 'upload' => '0', 'warn' => '1', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.1.11]2.1.11[/url]. Music ripped from the radio (Satellite or FM), television, the web, or podcasts are not allowed. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.1.11]2.1.11[/url]. Music ripped from the radio (Satellite or FM), television, the web, or podcasts are not allowed. The only allowable media formats are CD, DVD, Vinyl, Soundboard, SACD, DAT, Cassette, WEB, and Blu-ray.' ) ), @@ -490,7 +490,7 @@ 'upload' => '0', 'warn' => '1', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.1.20]2.1.20[/url]. User made discographies may not be uploaded. Multi-album torrents are not allowed on the site under any circumstances. That means no discographies, Pitchfork compilations, etc. If releases (e.g., CD singles) were never released as a bundled set, do not upload them together. Live Soundboard material should be uploaded as one torrent per night, per show, or per venue. Including more than one show in a torrent results in a multi-album torrent. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.1.20]2.1.20[/url]. User made discographies may not be uploaded. Multi-album torrents are not allowed on the site under any circumstances. That means no discographies, Pitchfork compilations, etc. If releases (e.g., CD singles) were never released as a bundled set, do not upload them together. Live Soundboard material should be uploaded as one torrent per night, per show, or per venue. Including more than one show in a torrent results in a multi-album torrent. Your torrent was reported because it consisted of a discography.' ) ), @@ -508,8 +508,8 @@ 'upload' => '0', 'warn' => '1', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.1.16]2.1.16[/url]. User-made compilations are not allowed. -[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.1.16.1]2.1.16.1[/url]. These are defined as compilations made by the uploader or anyone else who does not officially represent the artist or the label. Compilations must be reasonably official. User-made and unofficial multichannel mixes are also not allowed. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.1.16]2.1.16[/url]. User-made compilations are not allowed. +[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.1.16.1]2.1.16.1[/url]. These are defined as compilations made by the uploader or anyone else who does not officially represent the artist or the label. Compilations must be reasonably official. User-made and unofficial multichannel mixes are also not allowed. Your torrent was reported because it was a user compilation.' ) ), @@ -526,7 +526,7 @@ 'upload' => '0', 'warn' => '0', 'delete' => '0', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.3.9]2.3.9[/url]. All lossless analog rips should include clear information about source lineage. All lossless SACD digital layer analog rips and vinyl rips must include clear information about recording equipment used (see [url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#h2.8]2.8[/url]). If you used a USB turntable for a vinyl rip, clearly indicate this in your lineage information. Also include all intermediate steps up to lossless encoding, such as the program used for mastering, sound card used, etc. Lossless analog rips missing rip information can be trumped by better documented lossless analog rips of equal or better quality. In order to trump a lossless analog rip without a lineage, this lineage must be included as a .txt or .log file within the new torrent. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.3.9]2.3.9[/url]. All lossless analog rips should include clear information about source lineage. All lossless SACD digital layer analog rips and vinyl rips must include clear information about recording equipment used (see [url=https://'.SSL_SITE_URL.'/rules.php?p=upload#h2.8]2.8[/url]). If you used a USB turntable for a vinyl rip, clearly indicate this in your lineage information. Also include all intermediate steps up to lossless encoding, such as the program used for mastering, sound card used, etc. Lossless analog rips missing rip information can be trumped by better documented lossless analog rips of equal or better quality. In order to trump a lossless analog rip without a lineage, this lineage must be included as a .txt or .log file within the new torrent. Your torrent is now eligible for trumping by a better-sounding rip with complete lineage information.' ) ), @@ -544,9 +544,9 @@ 'upload' => '0', 'warn' => '4', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.2.10.9]2.2.10.9[/url]. No log editing is permitted. -[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.2.10.9.1]2.2.10.9.1[/url]. Forging log data is a serious misrepresentation of quality, and will result in a warning and the loss of your uploading privileges when the edited log is found. We recommend that you do not open the rip log file for any reason. However, if you must open the rip log, do not edit anything in the file for any reason. If you discover that one of your software settings is incorrect in the ripping software preferences, you must rip the CD again with the proper settings. Do not consolidate logs under any circumstances. If you must re-rip specific tracks or an entire disc and the rip results happen to have the new log appended to the original, leave them as is. Do not remove any part of either log, and never copy/paste parts of a new log over an old log. -Your torrent was reported because it contained an edited log (either edited by you or someone else). For questions about your uploading privileges, you must PM the staff member who handled this log case.' + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.2.10.9]2.2.10.9[/url]. No log editing is permitted. +[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.2.10.9.1]2.2.10.9.1[/url]. Forging log data is a serious misrepresentation of quality, and will result in a warning and the loss of your uploading privileges when the edited log is found. We recommend that you do not open the rip log file for any reason. However, if you must open the rip log, do not edit anything in the file for any reason. If you discover that one of your software settings is incorrect in the ripping software preferences, you must rip the CD again with the proper settings. Do not consolidate logs under any circumstances. If you must re-rip specific tracks or an entire disc and the rip results happen to have the new log appended to the original, leave them as is. Do not remove any part of either log, and never copy/paste parts of a new log over an old log. +Your torrent was reported because it contained an edited log (either edited by you or someone else). For questions about your uploading privileges, you must PM the staff member who handled this log case.' ) ), 'audience' => array( @@ -563,7 +563,7 @@ 'upload' => '0', 'warn' => '1', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.1.12]2.1.12[/url]. No unofficial audience recordings may be uploaded. These include but are not limited to AUD (Audience), IEM (In Ear Monitor), ALD (Assistive Listening Device), Mini-Disc, and Matrix-sourced recordings (see [url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.6.3]2.6.3[/url]). + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.1.12]2.1.12[/url]. No unofficial audience recordings may be uploaded. These include but are not limited to AUD (Audience), IEM (In Ear Monitor), ALD (Assistive Listening Device), Mini-Disc, and Matrix-sourced recordings (see [url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.6.3]2.6.3[/url]). Your torrent was reported because it was sourced from an audience recording.' ) ), @@ -580,10 +580,10 @@ 'upload' => '0', 'warn' => '0', 'delete' => '0', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.3.11]2.3.11[/url]. File names must accurately reflect the song titles. You may not have file names like 01track.mp3, 02track.mp3, etc. Torrents containing files that are named with incorrect song titles can be trumped by properly labeled torrents. Also, torrents that are sourced from the scene but do not have the Scene label must comply with site naming rules (no release group names in the file names, no advertisements in the file names, etc.). If all the letters in the track titles are capitalized, the torrent is trumpable. -[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.3.13]2.3.13[/url]. Track numbers are required in file names (e.g., "01 - TrackName.mp3"). If a torrent without track numbers in the file names is uploaded, then a torrent with the track numbers in the file names can take its place. When formatted properly, file names will sort in order by track number or playing order. Also see [url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.3.14]2.3.14[/url]. -The Uploading Rules require that all uploads contain audio tracks with accurate file names. Your torrent has been marked as having incorrect or incomplete file names. It is now listed on [url=http://'.NONSSL_SITE_URL.'/better.php]Better.php[/url] and is eligible for trumping. You are of course free to fix this torrent yourself. Add or fix the file names and upload the replacement torrent to the site. Then, report (RP) the older torrent using the category "Bad File Names Trump" and indicate in the report comments that you have fixed the file names. Be sure to provide a link (PL) to the new replacement torrent. -Your torrent has been labeled as having bad file names and is now eligible for trumping through the [url=http://'.NONSSL_SITE_URL.'/better.php]Better.php[/url] listing.' + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.3.11]2.3.11[/url]. File names must accurately reflect the song titles. You may not have file names like 01track.mp3, 02track.mp3, etc. Torrents containing files that are named with incorrect song titles can be trumped by properly labeled torrents. Also, torrents that are sourced from the scene but do not have the Scene label must comply with site naming rules (no release group names in the file names, no advertisements in the file names, etc.). If all the letters in the track titles are capitalized, the torrent is trumpable. +[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.3.13]2.3.13[/url]. Track numbers are required in file names (e.g., "01 - TrackName.mp3"). If a torrent without track numbers in the file names is uploaded, then a torrent with the track numbers in the file names can take its place. When formatted properly, file names will sort in order by track number or playing order. Also see [url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.3.14]2.3.14[/url]. +The Uploading Rules require that all uploads contain audio tracks with accurate file names. Your torrent has been marked as having incorrect or incomplete file names. It is now listed on [url=https://'.SSL_SITE_URL.'/better.php]better.php[/url] and is eligible for trumping. You are of course free to fix this torrent yourself. Add or fix the file names and upload the replacement torrent to the site. Then, report (RP) the older torrent using the category "Bad File Names Trump" and indicate in the report comments that you have fixed the file names. Be sure to provide a link (PL) to the new replacement torrent. +Your torrent has been labeled as having bad file names and is now eligible for trumping through the [url=https://'.SSL_SITE_URL.'/better.php]better.php[/url] listing.' ) ), 'cassette' => array( @@ -591,7 +591,7 @@ 'reason' => '17', 'title' => 'Unapproved Cassette', 'report_messages' => array( - "If the album was never released other than on cassette, please include a source." + 'If the album was never released other than on cassette, please include a source.' ), 'report_fields' => array( 'link' => '0' @@ -600,10 +600,10 @@ 'upload' => '0', 'warn' => '1', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.10.1]2.10.1[/url]. Cassettes are allowed under strict conditions. -[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.10.1.1]2.10.1.1[/url]. Releases available only on cassette may be uploaded under special strict conditions (see [url=http://'.NONSSL_SITE_URL.'/wiki.php?action=article&id=593]this wiki[/url] for information on cassette ripping). Cassette-sourced uploads must be approved by staff first (see [url=http://'.NONSSL_SITE_URL.'/wiki.php?action=article&id=681]this wiki[/url] for details on the approval process). This also applies to soundboard releases where a tape generation can be found in the lineage (either the tape is not in the first generation or there are multiple tape generations). See [url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.6.6]2.6.6[/url] for more information. -[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.10.1.2]2.10.1.2[/url]. You must contact a moderator privately for approval before uploading. Include proof in the form of discography information from a reputable source as well as the spectrals for 2 songs in your message. -Your torrent was reported because it contains an unapproved cassette rip.' + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.10.1]2.10.1[/url]. Cassettes are allowed under strict conditions. +[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.10.1.1]2.10.1.1[/url]. Releases available only on cassette may be uploaded under special strict conditions (see [url=https://'.SSL_SITE_URL.'/wiki.php?action=article&id=593]this wiki[/url] for information on cassette ripping). +[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.10.1.2]2.10.1.2[/url]. Rips must be made from official cassette sources. Bootlegs are often from unofficial sources and may be deleted if they do not meet high quality audio standards (see rule [rule]2.10.8[/rule]). +When uploading new cassette-sourced torrents, be sure to include in the release description evidence of its uniqueness in the form of discography information from a reputable source as well as pictures of the cassette you ripped.' ) ), 'skips' => array( @@ -611,8 +611,8 @@ 'reason' => '13', 'title' => 'Skips / Encode Errors', 'report_messages' => array( - "Please tell us which track(s) we should check.", - "Telling us where precisely in the song the skip/encode error can be heard will help us deal with your torrent." + 'Please tell us which track(s) we should check.', + 'Telling us where precisely in the song the skip/encode error can be heard will help us deal with your torrent.' ), 'report_fields' => array( 'track' => '2' @@ -621,7 +621,7 @@ 'upload' => '0', 'warn' => '0', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.1.8]2.1.8[/url]. Music not sourced from vinyl must not contain pops, clicks, or skips. They will be deleted for rip/encode errors if reported. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.1.8]2.1.8[/url]. Music not sourced from vinyl must not contain pops, clicks, or skips. They will be deleted for rip/encode errors if reported. Your torrent was reported because one or more tracks contain encoding errors.' ) ), @@ -639,10 +639,10 @@ 'upload' => '0', 'warn' => '0', 'delete' => '0', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.2.10.3]2.2.10.3[/url]. A FLAC upload with an EAC or XLD rip log that scores 100% on the log checker replaces one with a lower score... . Note: A FLAC upload with a log that scores 95% for not defeating the audio cache may be rescored to 100% following the procedure outlined in [url=http://'.NONSSL_SITE_URL.'/wiki.php?action=article&id=219]this wiki[/url]. -[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.2.10.5]2.2.10.5[/url]. XLD and EAC logs in languages other than English require a manual log checker score adjustment by staff. -[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.2.10.6.2]2.2.10.6.2[/url]. If you created a CD range rip that has matching CRCs for test and copy, and where every track has an AccurateRip score of 2 or more, then you may submit your torrent for manual score adjustment. -[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.2.10.9.2]2.2.10.9.2[/url]. If you find that an appended log has not been scored properly, please report the torrent and use the log rescore option. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.2.10.3]2.2.10.3[/url]. A FLAC upload with an EAC or XLD rip log that scores 100% on the log checker replaces one with a lower score... . Note: A FLAC upload with a log that scores 95% for not defeating the audio cache may be rescored to 100% following the procedure outlined in [url=https://'.SSL_SITE_URL.'/wiki.php?action=article&id=219]this wiki[/url]. +[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.2.10.5]2.2.10.5[/url]. XLD and EAC logs in languages other than English require a manual log checker score adjustment by staff. +[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.2.10.6.2]2.2.10.6.2[/url]. If you created a CD range rip that has matching CRCs for test and copy, and where every track has an AccurateRip score of 2 or more, then you may submit your torrent for manual score adjustment. +[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.2.10.9.2]2.2.10.9.2[/url]. If you find that an appended log has not been scored properly, please report the torrent and use the log rescore option. Your torrent has now been properly scored by the staff.' ) ) @@ -662,7 +662,7 @@ 'upload' => '0', 'warn' => '1', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r4.1.2]4.1.2[/url]. All applications must come with a crack, keygen, or other method of ensuring that downloaders can install them easily. App torrents with keygens, cracks, or patches that do not work or torrents missing clear installation instructions will be deleted if reported. No exceptions. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r4.1.2]4.1.2[/url]. All applications must come with a crack, keygen, or other method of ensuring that downloaders can install them easily. App torrents with keygens, cracks, or patches that do not work or torrents missing clear installation instructions will be deleted if reported. No exceptions. Your torrent was reported because it was missing an installation method.' ) ), @@ -680,8 +680,8 @@ 'upload' => '0', 'warn' => '4', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r1.2.5]1.2.5[/url]. Games of any kind. No games of any kind for PC, Mac, Linux, mobile devices, or any other platform are allowed. -[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r4.1.7]4.1.7[/url]. Games of any kind are prohibited (see [url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r1.2.5]1.2.5[/url]). + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r1.2.5]1.2.5[/url]. Games of any kind. No games of any kind for PC, Mac, Linux, mobile devices, or any other platform are allowed. +[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r4.1.7]4.1.7[/url]. Games of any kind are prohibited (see [url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r1.2.5]1.2.5[/url]). Your torrent was reported because it contained a game disc rip.' ) ), @@ -699,7 +699,7 @@ 'upload' => '0', 'warn' => '1', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r4.1.3]4.1.3[/url]. App releases must not be freely available tools. Application releases cannot be freely downloaded anywhere from any official source. Nor may you upload open source applications where the source code is available for free. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r4.1.3]4.1.3[/url]. App releases must not be freely available tools. Application releases cannot be freely downloaded anywhere from any official source. Nor may you upload open source applications where the source code is available for free. Your torrent was reported because it contained a freely available application.' ) ), @@ -717,7 +717,7 @@ 'upload' => '0', 'warn' => '1', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r4.1.4]4.1.4[/url]. Release descriptions for applications must contain good information about the application. You should either have a small description of the program (either taken from its web site or from an NFO file) or a link to the information -- but ideally both. Torrents missing this information will be deleted when reported. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r4.1.4]4.1.4[/url]. Release descriptions for applications must contain good information about the application. You should either have a small description of the program (either taken from its web site or from an NFO file) or a link to the information -- but ideally both. Torrents missing this information will be deleted when reported. Your torrent was reported because it lacked adequate release information.' ) ), @@ -735,8 +735,8 @@ 'upload' => '0', 'warn' => '1', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.1.18]2.1.18[/url]. Sound Sample Packs must be uploaded as applications. -[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r4.1.9]4.1.9[/url]. Sound sample packs, template collections, and font collections are allowed if they are official releases, not freely available, and unarchived. Sound sample packs, template collections, and font collections must be official compilations and they must not be uploaded as an archive. The files contained inside the torrent must not be archived so that users can see what the pack contains. That means if sound sample packs are in WAV format, they must be uploaded as WAV. If the font collection, template collection, or sound sample pack was originally released as an archive, you must unpack the files before uploading them in a torrent. None of the contents in these packs and collections may be freely available. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.1.18]2.1.18[/url]. Sound Sample Packs must be uploaded as applications. +[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r4.1.9]4.1.9[/url]. Sound sample packs, template collections, and font collections are allowed if they are official releases, not freely available, and unarchived. Sound sample packs, template collections, and font collections must be official compilations and they must not be uploaded as an archive. The files contained inside the torrent must not be archived so that users can see what the pack contains. That means if sound sample packs are in WAV format, they must be uploaded as WAV. If the font collection, template collection, or sound sample pack was originally released as an archive, you must unpack the files before uploading them in a torrent. None of the contents in these packs and collections may be freely available. Your torrent was reported because it was an archived collection.' ) ), @@ -754,7 +754,7 @@ 'upload' => '0', 'warn' => '1', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r4.1.11]4.1.11[/url]. Collections of cracks, keygens or serials are not allowed. The crack, keygen, or serial for an application must be in a torrent with its corresponding application. It cannot be uploaded separately from the application. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r4.1.11]4.1.11[/url]. Collections of cracks, keygens or serials are not allowed. The crack, keygen, or serial for an application must be in a torrent with its corresponding application. It cannot be uploaded separately from the application. Your torrent was reported because it contained a collection of serials, keygens, or cracks.' ) ), @@ -772,7 +772,7 @@ 'upload' => '0', 'warn' => '1', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r4.1.12]4.1.12[/url]. Torrents containing hacking or cracking tools are prohibited. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r4.1.12]4.1.12[/url]. Torrents containing hacking or cracking tools are prohibited. Your torrent was reported because it contained a hacking tool.' ) ), @@ -781,7 +781,7 @@ 'reason' => '-1', 'title' => 'Contains Virus', 'report_messages' => array( - 'Please include as much information as possible to verify the report. Please also double check that your virus scanner is not incorrectly identifying a keygen or crack as a virus.', + 'Please include as much information as possible to verify the report. Please also double check that your virus scanner is not incorrectly identifying a keygen or crack as a virus.', ), 'report_fields' => array( 'link' => '0' @@ -790,7 +790,7 @@ 'upload' => '0', 'warn' => '1', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r4.1.14]4.1.14[/url]. All applications must be complete. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r4.1.14]4.1.14[/url]. All applications must be complete. The torrent was determined to be infected with a virus or trojan. In the future, please scan all potential uploads with an antivirus program such as AVG, Avast, or MS Security Essentials. Your torrent was reported because it contained a virus or trojan.' ) @@ -809,7 +809,7 @@ 'upload' => '0', 'warn' => '0', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r4.1.14]4.1.14[/url]. All applications must be complete. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r4.1.14]4.1.14[/url]. All applications must be complete. This program was determined to be not fully functional. Your torrent was reported because it contained a program that did not work or no longer works.' ) @@ -829,7 +829,7 @@ 'upload' => '0', 'warn' => '0', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r6.5]6.5[/url]. Collections/packs of ebooks are prohibited, even if each title is somehow related to other ebook titles in some way. All ebooks must be uploaded individually and cannot be archived (users must be able to see the ebook format in the torrent). + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r6.5]6.5[/url]. Collections/packs of ebooks are prohibited, even if each title is somehow related to other ebook titles in some way. All ebooks must be uploaded individually and cannot be archived (users must be able to see the ebook format in the torrent). Your torrent was reported because it contained a collection or pack of ebooks.' ) ) @@ -850,7 +850,7 @@ 'upload' => '0', 'warn' => '0', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r2.1.8]2.1.8[/url]. Music not sourced from vinyl must not contain pops, clicks, or skips. They will be deleted for rip/encode errors if reported. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r2.1.8]2.1.8[/url]. Music not sourced from vinyl must not contain pops, clicks, or skips. They will be deleted for rip/encode errors if reported. Your torrent was reported because one or more audiobook tracks contain encoding errors.' ) ) @@ -870,7 +870,7 @@ 'upload' => '0', 'warn' => '1', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r7.3]7.3[/url]. Tutorials on how to use musical instruments, vocal training, producing music, or otherwise learning the theory and practice of music are the only allowed topics. No material outside of these topics is allowed. For example, instruction videos about Kung Fu training, dance lessons, beer brewing, or photography are not permitted here. What is considered allowable under these topics is ultimately at the discretion of the staff. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r7.3]7.3[/url]. Tutorials on how to use musical instruments, vocal training, producing music, or otherwise learning the theory and practice of music are the only allowed topics. No material outside of these topics is allowed. For example, instruction videos about Kung Fu training, dance lessons, beer brewing, or photography are not permitted here. What is considered allowable under these topics is ultimately at the discretion of the staff. Your torrent was reported because it contained a video that has no relevance to the allowed music-related topics on the site.' ) ) @@ -890,7 +890,7 @@ 'upload' => '0', 'warn' => '1', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r3.3]3.3[/url]. No radio talk shows or podcasts are allowed. What.CD is primarily a music site, and those recordings do not belong in any torrent category. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r3.3]3.3[/url]. No radio talk shows or podcasts are allowed. What.CD is primarily a music site, and those recordings do not belong in any torrent category. Your torrent was reported because it contained audio files sourced from a talk show or podcast.' ) ) @@ -910,7 +910,7 @@ 'upload' => '0', 'warn' => '', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r5.2.3]5.2.3[/url]. Collections may not span more than one comic title. You may not include multiple, different comic titles in a single collection, e.g., "The Amazing Spider-Man #1" and "The Incredible Hulk #1." + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r5.2.3]5.2.3[/url]. Collections may not span more than one comic title. You may not include multiple, different comic titles in a single collection, e.g., "The Amazing Spider-Man #1" and "The Incredible Hulk #1." Your torrent was reported because it contained comics from multiple unrelated series.' ) ), @@ -928,7 +928,7 @@ 'upload' => '0', 'warn' => '', 'delete' => '1', - 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#r5.2.6]5.2.6[/url]. Torrents spanning multiple volumes are too large and must be uploaded as separate volumes. + 'pm' => '[url=https://'.SSL_SITE_URL.'/rules.php?p=upload#r5.2.6]5.2.6[/url]. Torrents spanning multiple volumes are too large and must be uploaded as separate volumes. Your torrent was reported because it contained multiple comic volumes.' ) ) diff --git a/sections/reportsv2/header.php b/sections/reportsv2/header.php index 66944dd1..96a53783 100644 --- a/sections/reportsv2/header.php +++ b/sections/reportsv2/header.php @@ -8,6 +8,6 @@ | New | New (un-auto) | Mine - | Old - | Search + | Old + | Search diff --git a/sections/reportsv2/report.php b/sections/reportsv2/report.php index 963c2551..90d74d84 100644 --- a/sections/reportsv2/report.php +++ b/sections/reportsv2/report.php @@ -15,50 +15,50 @@ error(404); } } else { - $TorrentID = $_GET['id']; - $DB->query("SELECT tg.CategoryID, t.GroupID FROM torrents_group AS tg LEFT JOIN torrents AS t ON t.GroupID=tg.ID WHERE t.ID=" . $_GET['id']); - list($CategoryID, $GroupID) = $DB->next_record(); - $Artists = Artists::get_artist($GroupID); - $TorrentCache = get_group_info($GroupID, true, $RevisionID); - $GroupDetails = $TorrentCache[0]; - $TorrentList = $TorrentCache[1]; - //Resolve the torrentlist to the one specific torrent being reported - foreach ($TorrentList as &$Torrent) { - //Remove unneeded entries - if ($Torrent["ID"] != $TorrentID) - unset($TorrentList[$Torrent["ID"]]); - } - // Group details - list($WikiBody, $WikiImage, $GroupID, $GroupName, $GroupYear, - $GroupRecordLabel, $GroupCatalogueNumber, $ReleaseType, $GroupCategoryID, - $GroupTime, $GroupVanityHouse, $TorrentTags, $TorrentTagIDs, $TorrentTagUserIDs, - $TagPositiveVotes, $TagNegativeVotes, $GroupFlags) = array_values($GroupDetails); + $TorrentID = $_GET['id']; + $DB->query("SELECT tg.CategoryID, t.GroupID FROM torrents_group AS tg LEFT JOIN torrents AS t ON t.GroupID=tg.ID WHERE t.ID=" . $_GET['id']); + list($CategoryID, $GroupID) = $DB->next_record(); + $Artists = Artists::get_artist($GroupID); + $TorrentCache = get_group_info($GroupID, true, $RevisionID); + $GroupDetails = $TorrentCache[0]; + $TorrentList = $TorrentCache[1]; + // Resolve the torrentlist to the one specific torrent being reported + foreach ($TorrentList as &$Torrent) { + // Remove unneeded entries + if ($Torrent['ID'] != $TorrentID) + unset($TorrentList[$Torrent['ID']]); + } + // Group details + list($WikiBody, $WikiImage, $GroupID, $GroupName, $GroupYear, + $GroupRecordLabel, $GroupCatalogueNumber, $ReleaseType, $GroupCategoryID, + $GroupTime, $GroupVanityHouse, $TorrentTags, $TorrentTagIDs, $TorrentTagUserIDs, + $TagPositiveVotes, $TagNegativeVotes, $GroupFlags) = array_values($GroupDetails); - $DisplayName = $GroupName; - $AltName = $GroupName; // Goes in the alt text of the image - $Title = $GroupName; // goes in - $WikiBody = $Text->full_format($WikiBody); + $DisplayName = $GroupName; + $AltName = $GroupName; // Goes in the alt text of the image + $Title = $GroupName; // goes in <title> + $WikiBody = $Text->full_format($WikiBody); - //Get the artist name, group name etc. - $Artists = Artists::get_artist($GroupID); - if ($Artists) { - $DisplayName = '<span dir="ltr">' . Artists::display_artists($Artists, true) . '<a href="torrents.php?torrentid=' . $TorrentID . '">' .$DisplayName . '</a></span>'; - $AltName = display_str(Artists::display_artists($Artists, false)) . $AltName; - $Title = $AltName; - } - if ($GroupYear > 0) { - $DisplayName.=' [' . $GroupYear . ']'; - $AltName.=' [' . $GroupYear . ']'; - $Title.= ' [' . $GroupYear . ']'; - } - if ($GroupVanityHouse) { - $DisplayName.=' [Vanity House]'; - $AltName.=' [Vanity House]'; - } - if ($GroupCategoryID == 1) { - $DisplayName.=' [' . $ReleaseTypes[$ReleaseType] . ']'; - $AltName.=' [' . $ReleaseTypes[$ReleaseType] . ']'; - } + //Get the artist name, group name etc. + $Artists = Artists::get_artist($GroupID); + if ($Artists) { + $DisplayName = '<span dir="ltr">' . Artists::display_artists($Artists, true) . '<a href="torrents.php?torrentid=' . $TorrentID . '">' .$DisplayName . '</a></span>'; + $AltName = display_str(Artists::display_artists($Artists, false)) . $AltName; + $Title = $AltName; + } + if ($GroupYear > 0) { + $DisplayName.= " [$GroupYear]"; + $AltName.= " [$GroupYear]"; + $Title.= " [$GroupYear]"; + } + if ($GroupVanityHouse) { + $DisplayName.=' [Vanity House]'; + $AltName.=' [Vanity House]'; + } + if ($GroupCategoryID == 1) { + $DisplayName.=' [' . $ReleaseTypes[$ReleaseType] . ']'; + $AltName.=' [' . $ReleaseTypes[$ReleaseType] . ']'; + } } View::show_header('Report', 'reportsv2,jquery,browse,torrent,bbcode,recommend'); @@ -68,12 +68,11 @@ <div class="header"> <h2>Report a torrent</h2> </div> - <div class="header"> <h3><?=$DisplayName?></h3> </div> <div class="thin"> - <table class="torrent_table details<?=$GroupFlags['IsSnatched'] ? ' snatched' : ''?>" id="torrent_details"> + <table class="torrent_table details<?=$GroupFlags['IsSnatched'] ? ' snatched' : '' ?>" id="torrent_details"> <tr class="colhead_dark"> <td width="80%"><strong>Reported torrent</strong></td> <td><strong>Size</strong></td> @@ -97,30 +96,30 @@ <h3>Report information</h3> <div class="box pad"> - <table class="layout"> - <tr> - <td class="label">Reason:</td> - <td> - <select id="type" name="type" onchange="ChangeReportType()"> - <? + <table class="layout"> + <tr> + <td class="label">Reason:</td> + <td> + <select id="type" name="type" onchange="ChangeReportType()"> +<? if (!empty($Types[$CategoryID])) { - $TypeList = $Types['master'] + $Types[$CategoryID]; - $Priorities = array(); - foreach ($TypeList as $Key => $Value) { - $Priorities[$Key] = $Value['priority']; - } - array_multisort($Priorities, SORT_ASC, $TypeList); + $TypeList = $Types['master'] + $Types[$CategoryID]; + $Priorities = array(); + foreach ($TypeList as $Key => $Value) { + $Priorities[$Key] = $Value['priority']; + } + array_multisort($Priorities, SORT_ASC, $TypeList); } else { - $TypeList = $Types['master']; + $TypeList = $Types['master']; } foreach ($TypeList as $Type => $Data) { - ?> - <option value="<?= $Type ?>"><?= $Data['title'] ?></option> - <? } ?> - </select> - </td> - </tr> - </table> + ?> + <option value="<?= $Type ?>"><?= $Data['title'] ?></option> +<? } ?> + </select> + </td> + </tr> + </table> <p>Fields that contain lists of values (for example, listing more than one track number) should be separated by a space.</p> <br /> <p><strong>Following the below report type specific guidelines will help the moderators deal with your report in a timely fashion. </strong></p> @@ -141,11 +140,10 @@ <script type="text/javascript">ChangeReportType();</script> </div> - </div> <input type="submit" value="Submit report" /> </form> </div> <? View::show_footer(); -?> \ No newline at end of file +?> diff --git a/sections/reportsv2/takereport.php b/sections/reportsv2/takereport.php index dc2c7cf3..78fd1833 100644 --- a/sections/reportsv2/takereport.php +++ b/sections/reportsv2/takereport.php @@ -13,24 +13,24 @@ authorize(); -if(!is_number($_POST['torrentid'])) { +if (!is_number($_POST['torrentid'])) { error(404); } else { $TorrentID = $_POST['torrentid']; } -if(!is_number($_POST['categoryid'])) { +if (!is_number($_POST['categoryid'])) { error(404); } else { $CategoryID = $_POST['categoryid']; } -if(!isset($_POST['type'])) { +if (!isset($_POST['type'])) { error(404); } else if (array_key_exists($_POST['type'], $Types[$CategoryID])) { $Type = $_POST['type']; $ReportType = $Types[$CategoryID][$Type]; -} else if(array_key_exists($_POST['type'],$Types['master'])) { +} else if (array_key_exists($_POST['type'],$Types['master'])) { $Type = $_POST['type']; $ReportType = $Types['master'][$Type]; } else { @@ -39,78 +39,78 @@ } -foreach($ReportType['report_fields'] as $Field => $Value) { - if($Value == '1') { - if(empty($_POST[$Field])) { +foreach ($ReportType['report_fields'] as $Field => $Value) { + if ($Value == '1') { + if (empty($_POST[$Field])) { $Err = "You are missing a required field (".$Field.") for a ".$ReportType['title']." report."; } } } -if(!empty($_POST['sitelink'])) { - if(preg_match_all('/((https?:\/\/)?([a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]+)*\.)?'.NONSSL_SITE_URL.'\/torrents.php\?(id=[0-9]+\&)?torrentid=([0-9]+))/is', $_POST['sitelink'], $Matches)) { +if (!empty($_POST['sitelink'])) { + if (preg_match_all('/((https?:\/\/)?([a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]+)*\.)?'.SSL_SITE_URL.'\/torrents.php\?(id=[0-9]+\&)?torrentid=([0-9]+))/is', $_POST['sitelink'], $Matches)) { $ExtraIDs = implode(' ', $Matches[6]); - if(in_array($TorrentID, $Matches[6])) { + if (in_array($TorrentID, $Matches[6])) { $Err = "The extra permalinks you gave included the link to the torrent you're reporting!"; } } else { - $Err = "Permalink was incorrect, should look like http://".NONSSL_SITE_URL."/torrents.php?torrentid=12345"; + $Err = "The permalink was incorrect. It should look like https://".SSL_SITE_URL."/torrents.php?torrentid=12345"; } } else { - $ExtraIDs = ""; + $ExtraIDs = ''; } -if(!empty($_POST['link'])) { +if (!empty($_POST['link'])) { //resource_type://domain:port/filepathname?query_string#anchor // http:// www .foo.com /bar - if(preg_match_all('/(https?:\/\/)?[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]+)*(:[0-9]{2,5})?(\/(\S)+)?/is', $_POST['link'], $Matches)) { + if (preg_match_all('/(https?:\/\/)?[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]+)*(:[0-9]{2,5})?(\/(\S)+)?/is', $_POST['link'], $Matches)) { $Links = implode(' ', $Matches[0]); } else { $Err = "The extra links you provided weren't links..."; } } else { - $Links = ""; + $Links = ''; } -if(!empty($_POST['image'])) { - if(preg_match("/^(".IMAGE_REGEX.")( ".IMAGE_REGEX.")*$/is", trim($_POST['image']), $Matches)) { +if (!empty($_POST['image'])) { + if (preg_match("/^(".IMAGE_REGEX.")( ".IMAGE_REGEX.")*$/is", trim($_POST['image']), $Matches)) { $Images = $Matches[0]; } else { $Err = "The extra image links you provided weren't links to images..."; } } else { - $Images = ""; + $Images = ''; } -if(!empty($_POST['track'])) { - if(preg_match('/([0-9]+( [0-9]+)*)|All/is', $_POST['track'], $Matches)) { +if (!empty($_POST['track'])) { + if (preg_match('/([0-9]+( [0-9]+)*)|All/is', $_POST['track'], $Matches)) { $Tracks = $Matches[0]; } else { - $Err = "Tracks should be given in a space separated list of numbers (no other characters)"; + $Err = 'Tracks should be given in a space separated list of numbers (no other characters)'; } } else { - $Tracks = ""; + $Tracks = ''; } -if(!empty($_POST['extra'])) { +if (!empty($_POST['extra'])) { $Extra = db_string($_POST['extra']); } else { - $Err = "As useful as blank reports are, could you be a tiny bit more helpful? (Leave a comment)"; + $Err = 'As useful as blank reports are, could you be a tiny bit more helpful? (Leave a comment)'; } $DB->query("SELECT ID FROM torrents WHERE ID=".$TorrentID); -if($DB->record_count() < 1) { +if ($DB->record_count() < 1) { $Err = "A torrent with that ID doesn't exist!"; } -if(!empty($Err)) { +if (!empty($Err)) { error($Err); include(SERVER_ROOT.'/sections/reportsv2/report.php'); die(); } $DB->query("SELECT ID FROM reportsv2 WHERE TorrentID=".$TorrentID." AND ReporterID=".db_string($LoggedUser['ID'])." AND ReportedTime > '".time_minus(3)."'"); -if($DB->record_count() > 0) { +if ($DB->record_count() > 0) { header('Location: torrents.php?torrentid='.$TorrentID); die(); } diff --git a/sections/reportsv2/takeresolve.php b/sections/reportsv2/takeresolve.php index ffa82ebe..6b2e39c7 100644 --- a/sections/reportsv2/takeresolve.php +++ b/sections/reportsv2/takeresolve.php @@ -215,7 +215,7 @@ Tools::warn_user($UploaderID, $WarnLength, $Reason); } else { //This is a bitch for people that don't warn but do other things, it makes me sad. - $AdminComment = ""; + $AdminComment = ''; if($Upload) { //They removed upload $AdminComment .= "Upload privileges removed by ".$LoggedUser['Username']; @@ -237,9 +237,9 @@ //PM if($Escaped['uploader_pm'] || $Warning > 0 || isset($Escaped['delete']) || $SendPM) { if(isset($Escaped['delete'])) { - $PM = "[url=http://".NONSSL_SITE_URL."/torrents.php?torrentid=".$TorrentID."]Your above torrent[/url] was reported and has been deleted.\n\n"; + $PM = '[url=https://'.SSL_SITE_URL."/torrents.php?torrentid=".$TorrentID."]Your above torrent[/url] was reported and has been deleted.\n\n"; } else { - $PM = "[url=http://".NONSSL_SITE_URL."/torrents.php?torrentid=".$TorrentID."]Your above torrent[/url] was reported but not deleted.\n\n"; + $PM = '[url=https://'.SSL_SITE_URL."/torrents.php?torrentid=".$TorrentID."]Your above torrent[/url] was reported but not deleted.\n\n"; } $Preset = $ResolveType['resolve_options']['pm']; @@ -249,7 +249,7 @@ } if($Warning > 0) { - $PM .= "\nThis has resulted in a [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&id=218]".$Warning." week warning.[/url]\n"; + $PM .= "\nThis has resulted in a [url=https://".SSL_SITE_URL."/wiki.php?action=article&id=218]".$Warning." week warning.[/url]\n"; } if($Upload) { diff --git a/sections/requests/new_edit.php b/sections/requests/new_edit.php index 6cf2ecca..96383c52 100644 --- a/sections/requests/new_edit.php +++ b/sections/requests/new_edit.php @@ -7,39 +7,39 @@ */ -$NewRequest = ($_GET['action'] == "new" ? true : false); +$NewRequest = ($_GET['action'] == 'new' ? true : false); -if(!$NewRequest) { +if (!$NewRequest) { $RequestID = $_GET['id']; - if(!is_number($RequestID)) { + if (!is_number($RequestID)) { error(404); } } -if($NewRequest && ($LoggedUser['BytesUploaded'] < 250*1024*1024 || !check_perms('site_submit_requests'))) { +if ($NewRequest && ($LoggedUser['BytesUploaded'] < 250 * 1024 * 1024 || !check_perms('site_submit_requests'))) { error('You do not have enough uploaded to make a request.'); } -if(!$NewRequest) { - if(empty($ReturnEdit)) { +if (!$NewRequest) { + if (empty($ReturnEdit)) { $Request = Requests::get_requests(array($RequestID)); $Request = $Request['matches'][$RequestID]; - if(empty($Request)) { + if (empty($Request)) { error(404); } list($RequestID, $RequestorID, $RequestorName, $TimeAdded, $LastVote, $CategoryID, $Title, $Year, $Image, $Description, $CatalogueNumber, $RecordLabel, - $ReleaseType, $BitrateList, $FormatList, $MediaList, $LogCue, $FillerID, $FillerName, $TorrentID, $TimeFilled, $GroupID, $OCLC) = $Request; + $ReleaseType, $BitrateList, $FormatList, $MediaList, $LogCue, $FillerID, $FillerName, $TorrentID, $TimeFilled, $GroupID, $OCLC) = $Request; $VoteArray = get_votes_array($RequestID); $VoteCount = count($VoteArray['Voters']); - $NeedCue = (strpos($LogCue, "Cue") !== false); - $NeedLog = (strpos($LogCue, "Log") !== false); - if($NeedLog) { - if(strpos($LogCue, "%")) { - preg_match("/\d+/", $LogCue, $Matches); + $NeedCue = (strpos($LogCue, 'Cue') !== false); + $NeedLog = (strpos($LogCue, 'Log') !== false); + if ($NeedLog) { + if (strpos($LogCue, '%')) { + preg_match('/\d+/', $LogCue, $Matches); $MinLogScore = (int) $Matches[0]; } } @@ -47,29 +47,29 @@ $IsFilled = !empty($TorrentID); $CategoryName = $Categories[$CategoryID - 1]; - $ProjectCanEdit = (check_perms('project_team') && !$IsFilled && (($CategoryID == 0) || ($CategoryName == "Music" && $Year == 0))); + $ProjectCanEdit = (check_perms('project_team') && !$IsFilled && (($CategoryID == 0) || ($CategoryName == 'Music' && $Year == 0))); $CanEdit = ((!$IsFilled && $LoggedUser['ID'] == $RequestorID && $VoteCount < 2) || $ProjectCanEdit || check_perms('site_moderate_requests')); - if(!$CanEdit) { + if (!$CanEdit) { error(403); } - if($CategoryName == "Music") { + if ($CategoryName == 'Music') { $ArtistForm = get_request_artists($RequestID); $BitrateArray = array(); - if($BitrateList == "Any") { + if ($BitrateList == 'Any') { $BitrateArray = array_keys($Bitrates); } else { $BitrateArray = array_keys(array_intersect($Bitrates,explode('|', $BitrateList))); } $FormatArray = array(); - if($FormatList == "Any") { + if ($FormatList == 'Any') { $FormatArray = array_keys($Formats); } else { foreach ($Formats as $Key => $Val) { - if(strpos($FormatList, $Val) !== false) { + if (strpos($FormatList, $Val) !== false) { $FormatArray[] = $Key; } } @@ -77,12 +77,12 @@ $MediaArray = array(); - if($MediaList == "Any") { + if ($MediaList == 'Any') { $MediaArray = array_keys($Media); } else { $MediaTemp = explode('|', $MediaList); foreach ($Media as $Key => $Val) { - if(in_array($Val, $MediaTemp)) { + if (in_array($Val, $MediaTemp)) { $MediaArray[] = $Key; } } @@ -93,7 +93,7 @@ } } -if($NewRequest && !empty($_GET['artistid']) && is_number($_GET['artistid'])) { +if ($NewRequest && !empty($_GET['artistid']) && is_number($_GET['artistid'])) { $DB->query("SELECT Name FROM artists_group WHERE artistid = ".$_GET['artistid']." LIMIT 1"); list($ArtistName) = $DB->next_record(); $ArtistForm = array( @@ -101,7 +101,7 @@ 2 => array(), 3 => array() ); -} elseif($NewRequest && !empty($_GET['groupid']) && is_number($_GET['groupid'])) { +} elseif ($NewRequest && !empty($_GET['groupid']) && is_number($_GET['groupid'])) { $ArtistForm = Artists::get_artist($_GET['groupid']); $DB->query("SELECT tg.Name, tg.Year, @@ -113,7 +113,7 @@ JOIN torrents_tags AS tt ON tt.GroupID=tg.ID JOIN tags AS t ON t.ID=tt.TagID WHERE tg.ID = ".$_GET['groupid']); - if(list($Title, $Year, $ReleaseType, $Image, $Tags, $CategoryID) = $DB->next_record()) { + if (list($Title, $Year, $ReleaseType, $Image, $Tags, $CategoryID) = $DB->next_record()) { $GroupID = trim($_REQUEST['groupid']); } } @@ -128,7 +128,7 @@ <div class="box pad"> <form action="" method="post" id="request_form" onsubmit="Calculate();"> <div> -<? if(!$NewRequest) { ?> +<? if (!$NewRequest) { ?> <input type="hidden" name="requestid" value="<?=$RequestID?>" /> <? } ?> <input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" /> @@ -139,7 +139,7 @@ <tr> <td colspan="2" class="center">Please make sure your request follows <a href="rules.php?p=requests">the request rules!</a></td> </tr> -<? if($NewRequest || $CanEdit) { ?> +<? if ($NewRequest || $CanEdit) { ?> <tr> <td class="label"> Type @@ -158,7 +158,7 @@ <p id="vawarning" class="hidden">Please use the multiple artists feature rather than adding "Various Artists" as an artist; read <a href="wiki.php?action=article&id=369">this</a> for more information.</p> <? - if(!empty($ArtistForm)) { + if (!empty($ArtistForm)) { $First = true; foreach($ArtistForm as $Importance => $ArtistNames) { foreach($ArtistNames as $Artist) { @@ -173,7 +173,7 @@ <option value="3"<?=($Importance == '3' ? ' selected="selected"' : '')?>>Remixer</option> <option value="3"<?=($Importance == '7' ? ' selected="selected"' : '')?>>Producer</option> </select> - <?if($First) { ?><a href="#" onclick="AddArtistField();return false;" class="brackets">+</a> <a href="#" onclick="RemoveArtistField();return false;" class="brackets">−</a> <? } $First = false;?> + <? if ($First) { ?><a href="#" onclick="AddArtistField();return false;" class="brackets">+</a> <a href="#" onclick="RemoveArtistField();return false;" class="brackets">−</a><? } $First = false; ?> <br /> <? } } @@ -193,7 +193,6 @@ ?> </td> </tr> - <tr> <td class="label">Title</td> <td> @@ -225,7 +224,7 @@ <input type="text" name="year" size="5" value="<?=(!empty($Year) ? display_str($Year) : '')?>" /> </td> </tr> -<? if($NewRequest || $CanEdit) { ?> +<? if ($NewRequest || $CanEdit) { ?> <tr id="image_tr"> <td class="label">Image</td> <td> @@ -238,7 +237,7 @@ <td> <? $GenreTags = $Cache->get_value('genre_tags'); - if(!$GenreTags) { + if (!$GenreTags) { $DB->query('SELECT Name FROM tags WHERE TagType=\'genre\' ORDER BY Name'); $GenreTags = $DB->collect('Name'); $Cache->cache_value('genre_tags', $GenreTags, 3600*6); @@ -246,7 +245,7 @@ ?> <select id="genre_tags" name="genre_tags" onchange="add_tag();return false;" > <option>---</option> -<? foreach(Misc::display_array($GenreTags) as $Genre){ ?> +<? foreach (Misc::display_array($GenreTags) as $Genre){ ?> <option value="<?=$Genre ?>"><?=$Genre ?></option> <? } ?> </select> @@ -257,12 +256,12 @@ 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 "<strong class="important_text_alt">drum.and.bass</strong>" tag, instead of an unofficial "<strong class="important_text">dnb</strong>" tag.). </td> </tr> -<? if($NewRequest || $CanEdit) { ?> +<? if ($NewRequest || $CanEdit) { ?> <tr id="releasetypes_tr"> <td class="label">Release type</td> <td> <select id="releasetype" name="releasetype"> - <option value='0'>---</option> + <option value="0">---</option> <? foreach ($ReleaseTypes as $Key => $Val) { //echo '<h1>'.$ReleaseType.'</h1>'; die(); @@ -279,10 +278,12 @@ <input type="checkbox" name="all_formats" id="toggle_formats" onchange="Toggle('formats', <?=($NewRequest ? 1 : 0)?>);"<?=(!empty($FormatArray) && (count($FormatArray) == count($Formats)) ? ' checked="checked"' : '')?> /><label for="toggle_formats"> All</label> <span style="float: right;"><strong>NB: You cannot require a log or cue unless FLAC is an allowed format</strong></span> <? foreach ($Formats as $Key => $Val) { - if($Key % 8 == 0) echo "<br />";?> - <input type="checkbox" name="formats[]" value="<?=$Key?>" onchange="ToggleLogCue(); if(!this.checked) { $('#toggle_formats').raw().checked = false; }" id="format_<?=$Key?>" + if ($Key % 8 == 0) { + echo '<br />'; + } ?> + <input type="checkbox" name="formats[]" value="<?=$Key?>" onchange="ToggleLogCue(); if (!this.checked) { $('#toggle_formats').raw().checked = false; }" id="format_<?=$Key?>" <?=(!empty($FormatArray) && in_array($Key, $FormatArray) ? ' checked="checked"' : '')?> /><label for="format_<?=$Key?>"> <?=$Val?></label> -<? }?> +<? } ?> </td> </tr> <tr id="bitrates_tr"> @@ -290,11 +291,13 @@ <td> <input type="checkbox" name="all_bitrates" id="toggle_bitrates" onchange="Toggle('bitrates', <?=($NewRequest ? 1 : 0)?>);"<?=(!empty($BitrateArray) && (count($BitrateArray) == count($Bitrates)) ? ' checked="checked"' : '')?> /><label for="toggle_bitrates"> All</label> <? foreach ($Bitrates as $Key => $Val) { - if($Key % 8 == 0) echo "<br />";?> + if ($Key % 8 == 0) { + echo '<br />'; + } ?> <input type="checkbox" name="bitrates[]" value="<?=$Key?>" id="bitrate_<?=$Key?>" <?=(!empty($BitrateArray) && in_array($Key, $BitrateArray) ? ' checked="checked" ' : '')?> - onchange="if(!this.checked) { $('#toggle_bitrates').raw().checked = false; }" /><label for="bitrate_<?=$Key?>"> <?=$Val?></label> -<? }?> + onchange="if (!this.checked) { $('#toggle_bitrates').raw().checked = false; }" /><label for="bitrate_<?=$Key?>"> <?=$Val?></label> +<? } ?> </td> </tr> <tr id="media_tr"> @@ -302,11 +305,13 @@ <td> <input type="checkbox" name="all_media" id="toggle_media" onchange="Toggle('media', <?=($NewRequest ? 1 : 0)?>);"<?=(!empty($MediaArray) && (count($MediaArray) == count($Media)) ? ' checked="checked"' : '')?> /><label for="toggle_media"> All</label> <? foreach ($Media as $Key => $Val) { - if($Key % 8 == 0) echo "<br />";?> + if ($Key % 8 == 0) { + echo '<br />'; + } ?> <input type="checkbox" name="media[]" value="<?=$Key?>" id="media_<?=$Key?>" <?=(!empty($MediaArray) && in_array($Key, $MediaArray) ? ' checked="checked" ' : '')?> - onchange="if(!this.checked) { $('#toggle_media').raw().checked = false; }" /><label for="media_<?=$Key?>"> <?=$Val?></label> -<? }?> + onchange="if (!this.checked) { $('#toggle_media').raw().checked = false; }" /><label for="media_<?=$Key?>"> <?=$Val?></label> +<? } ?> </td> </tr> <tr id="logcue_tr" class="hidden"> @@ -326,11 +331,11 @@ <textarea name="description" cols="70" rows="7"><?=(!empty($Description) ? $Description : '')?></textarea> <br /> </td> </tr> -<? if(check_perms('site_moderate_requests')) { ?> +<? if (check_perms('site_moderate_requests')) { ?> <tr> <td class="label">Torrent group</td> <td> - https://what.cd/torrents.php?id=<input type="text" name="groupid" value="<?=$GroupID?>" size="15" /><br /> + https://<?=SSL_SITE_URL?>/torrents.php?id=<input type="text" name="groupid" value="<?=$GroupID?>" size="15" /><br /> If this request matches a torrent group <span style="font-weight: bold;">already existing</span> on the site, please indicate that here. </td> </tr> @@ -339,7 +344,7 @@ <tr> <td class="label">Torrent group</td> <td> - <a href="torrents.php?id=<?=$GroupID?>">https://what.cd/torrents.php?id=<?=$GroupID?></a><br /> + <a href="torrents.php?id=<?=$GroupID?>">https://<?=SSL_SITE_URL?>/torrents.php?id=<?=$GroupID?></a><br /> This request <?=($NewRequest?'will be':'is')?> associated with the above torrent group. <? if (!$NewRequest) { ?> If this is incorrect, please <a href="reports.php?action=report&type=request&id=<?=$RequestID?>">report this request</a> so that staff can fix it. @@ -348,7 +353,7 @@ </td> </tr> <? } - if($NewRequest) { ?> + if ($NewRequest) { ?> <tr id="voting"> <td class="label">Bounty (MB)</td> <td> diff --git a/sections/requests/request.php b/sections/requests/request.php index d22bed5d..0ca9ebca 100644 --- a/sections/requests/request.php +++ b/sections/requests/request.php @@ -4,7 +4,7 @@ * This is the page that displays the request to the end user after being created. */ - // Bookmarks::has_bookmarked() +// Bookmarks::has_bookmarked() include(SERVER_ROOT.'/classes/class_text.php'); $Text = new TEXT; @@ -237,7 +237,7 @@ <table class="layout"> <? $VoteMax = ($VoteCount < 5 ? $VoteCount : 5); $ViewerVote = false; - for($i = 0; $i < $VoteMax; $i++) { + for ($i = 0; $i < $VoteMax; $i++) { $User = array_shift($RequestVotes['Voters']); $Boldify = false; if ($User['UserID'] == $LoggedUser['ID']) { diff --git a/sections/requests/takenew_edit.php b/sections/requests/takenew_edit.php index 0d13b3d5..34084078 100644 --- a/sections/requests/takenew_edit.php +++ b/sections/requests/takenew_edit.php @@ -5,34 +5,34 @@ authorize(); -if($_POST['action'] != "takenew" && $_POST['action'] != "takeedit") { +if ($_POST['action'] != 'takenew' && $_POST['action'] != 'takeedit') { error(0); } -$NewRequest = ($_POST['action'] == "takenew"); +$NewRequest = ($_POST['action'] == 'takenew'); -if(!$NewRequest) { +if (!$NewRequest) { $ReturnEdit = true; } -if($NewRequest) { - if(!check_perms('site_submit_requests') || $LoggedUser['BytesUploaded'] < 250*1024*1024){ +if ($NewRequest) { + if (!check_perms('site_submit_requests') || $LoggedUser['BytesUploaded'] < 250 * 1024 * 1024) { error(403); } } else { $RequestID = $_POST['requestid']; - if(!is_number($RequestID)) { + if (!is_number($RequestID)) { error(0); } $Request = Requests::get_requests(array($RequestID)); $Request = $Request['matches'][$RequestID]; - if(empty($Request)) { + if (empty($Request)) { error(404); } list($RequestID, $RequestorID, $RequestorName, $TimeAdded, $LastVote, $CategoryID, $Title, $Year, $Image, $Description, $CatalogueNumber, $RecordLabel, - $ReleaseType, $BitrateList, $FormatList, $MediaList, $LogCue, $FillerID, $FillerName, $TorrentID, $TimeFilled, $GroupID, $OCLC) = $Request; + $ReleaseType, $BitrateList, $FormatList, $MediaList, $LogCue, $FillerID, $FillerName, $TorrentID, $TimeFilled, $GroupID, $OCLC) = $Request; $VoteArray = get_votes_array($RequestID); $VoteCount = count($VoteArray['Voters']); @@ -40,132 +40,132 @@ $CategoryName = $Categories[$CategoryID - 1]; - $ProjectCanEdit = (check_perms('project_team') && !$IsFilled && (($CategoryID == 0) || ($CategoryName == "Music" && $Year == 0))); + $ProjectCanEdit = (check_perms('project_team') && !$IsFilled && (($CategoryID == 0) || ($CategoryName == 'Music' && $Year == 0))); $CanEdit = ((!$IsFilled && $LoggedUser['ID'] == $RequestorID && $VoteCount < 2) || $ProjectCanEdit || check_perms('site_moderate_requests')); - if(!$CanEdit) { + if (!$CanEdit) { error(403); } } // Validate -if(empty($_POST['type'])) { +if (empty($_POST['type'])) { error(0); } $CategoryName = $_POST['type']; $CategoryID = (array_search($CategoryName, $Categories) + 1); -if(empty($CategoryID)) { +if (empty($CategoryID)) { error(0); } -if(empty($_POST['title'])) { - $Err = "You forgot to enter the title!"; +if (empty($_POST['title'])) { + $Err = 'You forgot to enter the title!'; } else { $Title = trim($_POST['title']); } -if(empty($_POST['tags'])) { - $Err = "You forgot to enter any tags!"; +if (empty($_POST['tags'])) { + $Err = 'You forgot to enter any tags!'; } else { $Tags = trim($_POST['tags']); } -if($NewRequest) { - if(empty($_POST['amount'])) { - $Err = "You forgot to enter any bounty!"; +if ($NewRequest) { + if (empty($_POST['amount'])) { + $Err = 'You forgot to enter any bounty!'; } else { $Bounty = trim($_POST['amount']); - if(!is_number($Bounty)) { - $Err = "Your entered bounty is not a number"; - } elseif($Bounty < 100*1024*1024) { - $Err = "Minumum bounty is 100MB"; + if (!is_number($Bounty)) { + $Err = 'Your entered bounty is not a number'; + } elseif ($Bounty < 100 * 1024 * 1024) { + $Err = 'Minumum bounty is 100 MB.'; } $Bytes = $Bounty; //From MB to B } } -if(empty($_POST['image'])) { - $Image = ""; +if (empty($_POST['image'])) { + $Image = ''; } else { - ImageTools::blacklisted($_POST['image']); - if(preg_match("/".IMAGE_REGEX."/", trim($_POST['image'])) > 0) { + ImageTools::blacklisted($_POST['image']); + if (preg_match('/'.IMAGE_REGEX.'/', trim($_POST['image'])) > 0) { $Image = trim($_POST['image']); } else { - $Err = display_str($_POST['image'])." does not appear to be a valid link to an image."; + $Err = display_str($_POST['image']).' does not appear to be a valid link to an image.'; } } -if(empty($_POST['description'])) { - $Err = "You forgot to enter any description!"; +if (empty($_POST['description'])) { + $Err = 'You forgot to enter a description.'; } else { $Description = trim($_POST['description']); } -if($CategoryName == "Music") { - if(empty($_POST['artists'])) { - $Err = "You didn't enter any artists"; +if ($CategoryName == "Music") { + if (empty($_POST['artists'])) { + $Err = 'You did not enter any artists.'; } else { $Artists = $_POST['artists']; $Importance = $_POST['importance']; } - if(!is_number($_POST['releasetype']) || !array_key_exists($_POST['releasetype'], $ReleaseTypes)) { - $Err = "Please pick a release type"; + if (!is_number($_POST['releasetype']) || !array_key_exists($_POST['releasetype'], $ReleaseTypes)) { + $Err = 'Please pick a release type'; } $ReleaseType = $_POST['releasetype']; - if(empty($_POST['all_formats']) && count($_POST['formats']) != count($Formats)) { + if (empty($_POST['all_formats']) && count($_POST['formats']) != count($Formats)) { $FormatArray = $_POST['formats']; - if(count($FormatArray) < 1) { - $Err = "You must require at least one format"; + if (count($FormatArray) < 1) { + $Err = 'You must require at least one format'; } } else { $AllFormats = true; } - if(empty($_POST['all_bitrates']) && count($_POST['bitrates']) != count($Bitrates)) { + if (empty($_POST['all_bitrates']) && count($_POST['bitrates']) != count($Bitrates)) { $BitrateArray = $_POST['bitrates']; - if(count($BitrateArray) < 1) { - $Err = "You must require at least one bitrate"; + if (count($BitrateArray) < 1) { + $Err = 'You must require at least one bitrate'; } } else { $AllBitrates = true; } - if(empty($_POST['all_media']) && count($_POST['media']) != count($Media)) { + if (empty($_POST['all_media']) && count($_POST['media']) != count($Media)) { $MediaArray = $_POST['media']; - if(count($MediaArray) < 1) { - $Err = "You must require at least one type of media"; + if (count($MediaArray) < 1) { + $Err = 'You must require at least one medium.'; } } else { $AllMedia = true; } //$Bitrates[1] = FLAC - if(!empty($FormatArray) && in_array(1, $FormatArray)) { + if (!empty($FormatArray) && in_array(1, $FormatArray)) { $NeedLog = empty($_POST['needlog']) ? false : true; - if($NeedLog) { - if($_POST['minlogscore']) { + if ($NeedLog) { + if ($_POST['minlogscore']) { $MinLogScore = trim($_POST['minlogscore']); } else { $MinLogScore = 0; } - if(!is_number($MinLogScore)) { - $Err = "You've entered a minimum log score that isn't a number"; + if (!is_number($MinLogScore)) { + $Err = 'You have entered a minimum log score that is not a number.'; } } $NeedCue = empty($_POST['needcue']) ? false : true; //FLAC was picked, require either Lossless or 24 bit Lossless - if(!$AllBitrates && !in_array(8, $BitrateArray) && !in_array(9, $BitrateArray)) { - $Err = "You selected FLAC as a format but no possible bitrate to fill it (Lossless or 24 bit Lossless)"; + if (!$AllBitrates && !in_array(8, $BitrateArray) && !in_array(9, $BitrateArray)) { + $Err = 'You selected FLAC as a format but no possible bitrate to fill it (Lossless or 24bit Lossless)'; } if (($NeedCue || $NeedLog)) { if (!(empty($_POST['all_media']) && $MediaArray[0] == 0)) { - $Err = "Only CD is allowed as media for FLAC Log/Cue Requests."; + $Err = 'Only CD is allowed as media for FLAC + log/cue requests.'; } } } else { @@ -177,47 +177,47 @@ // GroupID if (!empty($_POST['groupid'])) { $GroupID = trim($_POST['groupid']); - $URLRegex = '/^https?:\/\/(www\.|ssl\.)?'.NONSSL_SITE_URL.'\/torrents\.php\?(page=[0-9]+&)?id=([0-9]+)/i'; + $URLRegex = '/^https?:\/\/(www\.|ssl\.)?'.SSL_SITE_URL.'\/torrents\.php\?(page=[0-9]+&)?id=([0-9]+)/i'; if (preg_match($URLRegex, $GroupID, $Matches)) { $GroupID = $Matches[3]; } if (is_number($GroupID)) { $DB->query("SELECT 1 FROM torrents_group WHERE ID = '$GroupID' AND CategoryID = 1"); if ($DB->record_count() == 0) { - $Err = "Torrent Group, if entered, must correspond to a music group on the site."; + $Err = 'The torrent group, if entered, must correspond to a music torrent group on the site.'; } } else { - $Err = "Torrent Group, if entered, must correspond to a music group on the site."; + $Err = 'The torrent group, if entered, must correspond to a music torrent group on the site.'; } } elseif ($_POST['groupid'] == '0') { $GroupID = 0; } //Not required - if(!empty($_POST['editioninfo'])) { + if (!empty($_POST['editioninfo'])) { $EditionInfo = trim($_POST['editioninfo']); } else { - $EditionInfo = ""; + $EditionInfo = ''; } - if(!empty($_POST['cataloguenumber'])) { + if (!empty($_POST['cataloguenumber'])) { $CatalogueNumber = trim($_POST['cataloguenumber']); } else { - $CatalogueNumber = ""; + $CatalogueNumber = ''; } - if(!empty($_POST['recordlabel'])) { + if (!empty($_POST['recordlabel'])) { $RecordLabel = trim($_POST['recordlabel']); } else { - $RecordLabel = ""; + $RecordLabel = ''; } } -if($CategoryName == "Music" || $CategoryName == "Audiobooks" || $CategoryName == "Comedy") { - if(empty($_POST['year'])) { - $Err = "You forgot to enter the year!"; +if ($CategoryName == 'Music' || $CategoryName == 'Audiobooks' || $CategoryName == 'Comedy') { + if (empty($_POST['year'])) { + $Err = 'You forgot to enter the year!'; } else { $Year = trim($_POST['year']); - if(!is_number($Year)) { - $Err = "Your entered year is not a number"; + if (!is_number($Year)) { + $Err = 'Your entered year is not a number.'; } } } @@ -226,12 +226,12 @@ if (!empty($_POST['oclc'])) { $OCLC = trim($_POST['oclc']); } else { - $OCLC = ""; + $OCLC = ''; } //For refilling on error -if($CategoryName == "Music") { +if ($CategoryName == 'Music') { $MainArtistCount = 0; $ArtistNames = array(); $ArtistForm = array( @@ -239,105 +239,105 @@ 2 => array(), 3 => array() ); - for($i = 0, $il = count($Artists); $i < $il; $i++) { - if(trim($Artists[$i]) != "") { - if(!in_array($Artists[$i], $ArtistNames)) { + for ($i = 0, $il = count($Artists); $i < $il; $i++) { + if (trim($Artists[$i]) != '') { + if (!in_array($Artists[$i], $ArtistNames)) { $ArtistForm[$Importance[$i]][] = array('name' => trim($Artists[$i])); - if(in_array($Importance[$i], array(1,4,5,6))) { + if (in_array($Importance[$i], array(1,4,5,6))) { $MainArtistCount++; } $ArtistNames[] = trim($Artists[$i]); } } } - if($MainArtistCount < 1) { - $Err = "Please enter at least one main artist, conductor, composer, or DJ"; + if ($MainArtistCount < 1) { + $Err = 'Please enter at least one main artist, conductor, composer, or DJ.'; } - if(!isset($ArtistNames[0])) { + if (!isset($ArtistNames[0])) { unset($ArtistForm); } } -if(!empty($Err)) { +if (!empty($Err)) { error($Err); - $Div = $_POST['unit'] == 'mb' ? 1024*1024 : 1024*1024*1024; + $Div = $_POST['unit'] == 'mb' ? 1024 * 1024 : 1024 * 1024 * 1024; $Bounty /= $Div; include(SERVER_ROOT.'/sections/requests/new_edit.php'); die(); } //Databasify the input -if($CategoryName == "Music") { - if(empty($AllBitrates)) { - foreach($BitrateArray as $Index => $MasterIndex) { - if(array_key_exists($Index, $Bitrates)) { +if ($CategoryName == 'Music') { + if (empty($AllBitrates)) { + foreach ($BitrateArray as $Index => $MasterIndex) { + if (array_key_exists($Index, $Bitrates)) { $BitrateArray[$Index] = $Bitrates[$MasterIndex]; } else { //Hax error(0); } } - $BitrateList = implode("|", $BitrateArray); + $BitrateList = implode('|', $BitrateArray); } else { - $BitrateList = "Any"; + $BitrateList = 'Any'; } - if(empty($AllFormats)) { - foreach($FormatArray as $Index => $MasterIndex) { - if(array_key_exists($Index, $Formats)) { + if (empty($AllFormats)) { + foreach ($FormatArray as $Index => $MasterIndex) { + if (array_key_exists($Index, $Formats)) { $FormatArray[$Index] = $Formats[$MasterIndex]; } else { //Hax error(0); } } - $FormatList = implode("|", $FormatArray); + $FormatList = implode('|', $FormatArray); } else { - $FormatList = "Any"; + $FormatList = 'Any'; } - if(empty($AllMedia)) { - foreach($MediaArray as $Index => $MasterIndex) { - if(array_key_exists($Index, $Media)) { + if (empty($AllMedia)) { + foreach ($MediaArray as $Index => $MasterIndex) { + if (array_key_exists($Index, $Media)) { $MediaArray[$Index] = $Media[$MasterIndex]; } else { //Hax error(0); } } - $MediaList = implode("|", $MediaArray); + $MediaList = implode('|', $MediaArray); } else { - $MediaList = "Any"; + $MediaList = 'Any'; } - $LogCue = ""; - if($NeedLog) { - $LogCue .= "Log"; - if($MinLogScore > 0) { - if($MinLogScore >= 100) { - $LogCue .= " (100%)"; + $LogCue = ''; + if ($NeedLog) { + $LogCue .= 'Log'; + if ($MinLogScore > 0) { + if ($MinLogScore >= 100) { + $LogCue .= ' (100%)'; } else { - $LogCue .= " (>= ".$MinLogScore."%)"; + $LogCue .= ' (>= '.$MinLogScore.'%)'; } } } - if($NeedCue) { - if($LogCue != "") { - $LogCue .= " + Cue"; + if ($NeedCue) { + if ($LogCue != '') { + $LogCue .= ' + Cue'; } else { - $LogCue = "Cue"; + $LogCue = 'Cue'; } } } //Query time! -if($CategoryName == "Music") { - if($NewRequest) { - $DB->query("INSERT INTO requests ( +if ($CategoryName == 'Music') { + if ($NewRequest) { + $DB->query('INSERT INTO requests ( UserID, TimeAdded, LastVote, CategoryID, Title, Year, Image, Description, RecordLabel, CatalogueNumber, ReleaseType, BitrateList, FormatList, MediaList, LogCue, Visible, GroupID, OCLC) VALUES - (".$LoggedUser['ID'].", '".sqltime()."', '".sqltime()."', ".$CategoryID.", '".db_string($Title)."', ".$Year.", '".db_string($Image)."', '".db_string($Description)."','".db_string($RecordLabel)."', + ('.$LoggedUser['ID'].", '".sqltime()."', '".sqltime()."', ".$CategoryID.", '".db_string($Title)."', ".$Year.", '".db_string($Image)."', '".db_string($Description)."','".db_string($RecordLabel)."', '".db_string($CatalogueNumber)."', ".$ReleaseType.", '".$BitrateList."','".$FormatList."', '".$MediaList."', '".$LogCue."', '1', '$GroupID', '".db_string($OCLC)."')"); $RequestID = $DB->inserted_id(); @@ -363,7 +363,7 @@ //I almost didn't think of this, we need to be able to delete artists / tags $DB->query("SELECT ArtistID FROM requests_artists WHERE RequestID = ".$RequestID); $RequestArtists = $DB->to_array(); - foreach($RequestArtists as $RequestArtist) { + foreach ($RequestArtists as $RequestArtist) { $Cache->delete_value('artists_requests_'.$RequestArtist); } $DB->query("DELETE FROM requests_artists WHERE RequestID = ".$RequestID); @@ -383,8 +383,8 @@ */ - foreach($ArtistForm as $Importance => $Artists) { - foreach($Artists as $Num => $Artist) { + foreach ($ArtistForm as $Importance => $Artists) { + foreach ($Artists as $Num => $Artist) { //1. See if each artist given already exists and if it does, grab the ID. $DB->query(" SELECT @@ -395,16 +395,16 @@ FROM artists_alias AS aa WHERE aa.Name = '".db_string($Artist['name'])."'"); - while(list($ArtistID, $AliasID, $AliasName, $Redirect) = $DB->next_record(MYSQLI_NUM, false)) { - if(!strcasecmp($Artist['name'], $AliasName)) { - if($Redirect) { + 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; } } - if(!$ArtistID) { + if (!$ArtistID) { //2. For each artist that didn't exist, create an artist. $DB->query("INSERT INTO artists_group (Name) VALUES ('".db_string($Artist['name'])."')"); $ArtistID = $DB->inserted_id(); @@ -421,8 +421,8 @@ //3. Create a row in the requests_artists table for each artist, based on the ID. - foreach($ArtistForm as $Importance => $Artists) { - foreach($Artists as $Num => $Artist) { + foreach ($ArtistForm as $Importance => $Artists) { + foreach ($Artists as $Num => $Artist) { $DB->query("INSERT IGNORE INTO requests_artists (RequestID, ArtistID, AliasID, Importance) VALUES (".$RequestID.", ".$Artist['id'].", ".$Artist['aliasid'].", '".$Importance."')"); $Cache->increment('stats_album_count'); $Cache->delete_value('artists_requests_'.$Artist['id']); @@ -433,11 +433,11 @@ } else { //Not a music request anymore, delete music only fields. - if(!$NewRequest) { + if (!$NewRequest) { $DB->query("SELECT ArtistID FROM requests_artists WHERE RequestID = ".$RequestID); $OldArtists = $DB->collect('ArtistID'); - foreach($OldArtists as $ArtistID) { - if(empty($ArtistID)) { continue; } + foreach ($OldArtists as $ArtistID) { + if (empty($ArtistID)) { continue; } //Get a count of how many groups or requests use the artist ID $DB->query("SELECT COUNT(ag.ArtistID) FROM artists_group as ag @@ -451,7 +451,7 @@ WHERE ta.ArtistID IS NOT NULL AND ag.ArtistID = '$ArtistID'"); list($GroupCount) = $DB->next_record(); - if(($ReqCount + $GroupCount) == 0) { + if (($ReqCount + $GroupCount) == 0) { //The only group to use this artist Artists::delete_artist($ArtistID); } else { @@ -462,9 +462,9 @@ $DB->query("DELETE FROM requests_artists WHERE RequestID = ".$RequestID); } - if($CategoryName == "Audiobooks" || $CategoryName == "Comedy") { + if ($CategoryName == 'Audiobooks' || $CategoryName == 'Comedy') { //These types require a year field. - if($NewRequest) { + if ($NewRequest) { $DB->query("INSERT INTO requests ( UserID, TimeAdded, LastVote, CategoryID, Title, Year, Image, Description, Visible, OCLC) VALUES @@ -483,7 +483,7 @@ WHERE ID = ".$RequestID); } } else { - if($NewRequest) { + if ($NewRequest) { $DB->query("INSERT INTO requests ( UserID, TimeAdded, LastVote, CategoryID, Title, Image, Description, Visible, OCLC) VALUES @@ -504,12 +504,12 @@ } //Tags -if(!$NewRequest) { +if (!$NewRequest) { $DB->query("DELETE FROM requests_tags WHERE RequestID = ".$RequestID); } $Tags = array_unique(explode(',', $Tags)); -foreach($Tags as $Index => $Tag) { +foreach ($Tags as $Index => $Tag) { $Tag = Misc::sanitize_tag($Tag); $Tag = Misc::get_alias_tag($Tag); $Tags[$Index] = $Tag; //For announce @@ -527,7 +527,7 @@ (".$TagID.", ".$RequestID.")"); } -if($NewRequest) { +if ($NewRequest) { //Remove the bounty and create the vote $DB->query("INSERT INTO requests_votes (RequestID, UserID, Bounty) @@ -539,7 +539,7 @@ - if($CategoryName == "Music") { + if ($CategoryName == "Music") { $Announce = "'".$Title."' - ".Artists::display_artists($ArtistForm, false, false)." https://".SSL_SITE_URL."/requests.php?action=view&id=".$RequestID." - ".implode(" ", $Tags); } else { $Announce = "'".$Title."' - https://".SSL_SITE_URL."/requests.php?action=view&id=".$RequestID." - ".implode(" ", $Tags); diff --git a/sections/schedule/index.php b/sections/schedule/index.php index e16138c7..d96bb341 100644 --- a/sections/schedule/index.php +++ b/sections/schedule/index.php @@ -618,7 +618,7 @@ function next_hour() { AND ul.UserID IS NULL GROUP BY um.ID"); while (list($Username, $Email) = $DB->next_record()) { - $Body = "Hi $Username, \n\nIt has been almost 4 months since you used your account at http://".NONSSL_SITE_URL.". This is an automated email to inform you that your account will be disabled in 10 days if you do not sign in. "; + $Body = "Hi $Username, \n\nIt has been almost 4 months since you used your account at https://".SSL_SITE_URL.". This is an automated email to inform you that your account will be disabled in 10 days if you do not sign in. "; Misc::send_email($Email, 'Your '.SITE_NAME.' account is about to be disabled', $Body); } $DB->query("SELECT um.ID diff --git a/sections/tools/index.php b/sections/tools/index.php index 600f2349..f33d69ed 100644 --- a/sections/tools/index.php +++ b/sections/tools/index.php @@ -1,17 +1,17 @@ <? /***************************************************************** - Tools switch center + Tools switch center - This page acts as a switch for the tools pages. + This page acts as a switch for the tools pages. - TODO! - -Unify all the code standards and file names (tool_list.php,tool_add.php,tool_alter.php) + TODO! + -Unify all the code standards and file names (tool_list.php,tool_add.php,tool_alter.php) *****************************************************************/ if (isset($argv[1])) { - if ($argv[1] == "cli_sandbox") { - include("misc/cli_sandbox.php"); + if ($argv[1] == 'cli_sandbox') { + include('misc/cli_sandbox.php'); die(); } diff --git a/sections/tools/managers/tag_aliases.php b/sections/tools/managers/tag_aliases.php index a7498355..cb14a66b 100644 --- a/sections/tools/managers/tag_aliases.php +++ b/sections/tools/managers/tag_aliases.php @@ -5,7 +5,7 @@ View::show_header('Tag Aliases'); -$orderby = ($_GET['order']) == "badtags" ? "BadTag" : "AliasTag"; +$orderby = ($_GET['order']) == 'badtags' ? 'BadTag' : 'AliasTag'; if (check_perms('users_mod')) { if (isset($_POST['newalias'])) { @@ -56,7 +56,7 @@ </td> <? if (check_perms('users_mod')) { ?> <td> - <input type="submit" value="Add Alias" /> + <input type="submit" value="Add alias" /> </td> <? } ?> </form> diff --git a/sections/tools/misc/tags.php b/sections/tools/misc/tags.php new file mode 100644 index 00000000..93d861f3 --- /dev/null +++ b/sections/tools/misc/tags.php @@ -0,0 +1,265 @@ +<? +View::show_header('Batch Tag Editor','validate'); +if (!check_perms('users_mod')) { + error(403); +} + +// validation functions +$Val->SetFields('tag',true,'string','Enter a single tag to search for.',array('maxlength'=>'200','minlength'=>'2')); +$Val->SetFields('replace',true,'string','Enter a single replacement tag.',array('maxlength'=>'200','minlength'=>'2')); + +echo $Val->GenerateJS('tagform'); + +// some constants to make programmers' lives easier +define('MODE_RENAME',0); +define('MODE_MERGE',1); + +?> +<div class="thin"> + <h3>Merge/Rename Tags</h3> + <form action="tools.php" method="get" name="tagform" id="tagform" onsubmit="return formVal();"> + <input type="hidden" name="action" value="edit_tags" /> + <table> + <tr> + <td class="label"> + Tag: + </td> + <td> + <input type="text" name="tag" id="tag" /> + </td> + <td class="label"> + Rename to/merge with tag: + </td> + <td> + <input type="text" name="replace" id="replace" /> + </td> + <td class="label"> + <input type="checkbox" name="list" id="list" checked="checked" /> <label for="list">List affected rows</label> + </td> + </tr> + <tr> + <td class="center" colspan="5"> + <input type="submit" value="Rename/Merge Tags" /> + </td> + </tr> + </table> + </form> +<br /> +<? +if (isset($_GET['tag']) || isset($_GET['replace'])) { + + // validate input + $Err = $Val->ValidateForm($_GET); + if ($Err) { + echo ' <div class="box pad center"> + <strong>Error:</strong> '.$Err.' + </div>'; + } else { + $Tag = Misc::sanitize_tag($_GET['tag']); + $Replacement = Misc::sanitize_tag($_GET['replace']); + + // trying to merge tag with itself would create big problems + if ($Tag == $Replacement) { + echo " <div class=\"box pad center\"> + <strong>Error:</strong> Cannot merge tag $Tag with itself (doh). + </div> + </div>"; + View::show_footer(); + exit; + } + + // 1) make sure tag exists + $DB->query("SELECT ID + FROM tags + WHERE Name = '".$Tag."' + LIMIT 1;"); + if ($DB->record_count() == 0) { + echo " <div class=\"box pad center\"> + <strong>Error:</strong> No such tag found: $Tag + </div> + </div>"; + View::show_footer(); + exit; + } + list($TagID) = $DB->next_record(); + + // 2) check if replacement exists + $DB->query("SELECT ID + FROM tags + WHERE Name = '".$Replacement."' + LIMIT 1;"); + if ($DB->record_count() == 0 ) { + $Mode = MODE_RENAME; + } else { + $Mode = MODE_MERGE; + } + list($ReplacementID) = $DB->next_record(); + + if ($_GET['list']) { + $AffectedTorrents = array(); + // 3) get a list of affected torrents + $DB->query("SELECT + tg.ID, + ag.ArtistID, + ag.Name, + tg.Name + FROM torrents_group AS tg + LEFT JOIN artists_group AS ag ON ag.ArtistID=tg.ArtistID + JOIN torrents_tags AS t ON t.GroupID=tg.ID + WHERE t.TagID=$TagID;"); + while (list($TorrentID,$ArtistID,$ArtistName,$TorrentName) = $DB->next_record()) { + $Row = ($ArtistName ? "<a href=\"artist.php?id=$ArtistID\">$ArtistName</a> - " : ''); + $Row.= "<a href='torrents.php?id=$TorrentID'>".display_str($TorrentName)."</a>"; + $AffectedTorrents[] = $Row; + } + + // 4) get a list of affected requests + $DB->query("SELECT + ra.RequestID, + ag.ArtistID, + ag.Name, + r.Title + FROM requests AS r + LEFT JOIN requests_artists AS ra ON r.ID=ra.RequestID + LEFT JOIN artists_group AS ag ON ag.ArtistID=ra.ArtistID + JOIN requests_tags AS t ON t.RequestID=r.ID + WHERE t.TagID=$TagID;"); + while (list($RequestID,$ArtistID,$ArtistName,$RequestName) = $DB->next_record()) { + $Row = ($ArtistName ? "<a href=\"artist.php?id=$ArtistID\">$ArtistName</a> - " : ''); + $Row.= "<a href='requests.php?action=viewrequest&id=$RequestID'>".display_str($RequestName)."</a>"; + $AffectedRequests[] = $Row; + } + } + + $TotalAffected = 0; + if ($Mode == MODE_RENAME) { + // EASY! just rename the tag + // 5) rename the tag + $DB->query("UPDATE tags + SET Name = '".$Replacement."' + WHERE ID = $TagID + LIMIT 1;"); + $TotalAffected = $DB->affected_rows(); + } else { + // HARD! merge two tags together and update usage + // 5) remove dupe tags from torrents + // (torrents that have both "old tag" and "replacement tag" set) + $DB->query("SELECT GroupID FROM torrents_tags WHERE TagID=$ReplacementID;"); + if ($DB->record_count() > 0 ) { + $Query = "DELETE + FROM torrents_tags + WHERE TagID=$TagID + AND GroupID IN ("; + while (list($GroupID) = $DB->next_record()) { + $Query.= $GroupID.','; + } + $Query = substr($Query,0,-1).");"; + $DB->query($Query); + $TotalAffected = $DB->affected_rows(); + } + + // 6) replace old tag in torrents + $DB->query("UPDATE torrents_tags + SET TagID=$ReplacementID + WHERE TagID=$TagID;"); + $UsageChange = $DB->affected_rows(); + + // 7) remove dupe tags from artists + $DB->query("SELECT ArtistID FROM artists_tags WHERE TagID=$ReplacementID;"); + if ($DB->record_count() > 0 ) { + $Query = "DELETE + FROM artists_tags + WHERE TagID=$TagID + AND ArtistID IN ("; + while (list($ArtistID) = $DB->next_record()) { + $Query.= $ArtistID.','; + } + $Query = substr($Query,0,-1).");"; + $DB->query($Query); + $TotalAffected += $DB->affected_rows(); + } + + // 8) replace old tag in artists + $DB->query("UPDATE artists_tags + SET TagID=$ReplacementID + WHERE TagID=$TagID;"); + $UsageChange += $DB->affected_rows(); + + // 9) remove dupe tags from requests + $DB->query("SELECT RequestID FROM requests_tags WHERE TagID=$ReplacementID;"); + if ($DB->record_count() > 0) { + $Query = "DELETE + FROM requests_tags + WHERE TagID=$TagID + AND RequestID IN ("; + while (list($RequestID) = $DB->next_record()) { + $Query.= $RequestID.','; + } + $Query = substr($Query,0,-1).");"; + $DB->query($Query); + $TotalAffected += $DB->affected_rows(); + } + + // 10) replace old tag in requests + $DB->query("UPDATE requests_tags + SET TagID=$ReplacementID + WHERE TagID=$TagID;"); + $UsageChange += $DB->affected_rows(); + $TotalAffected += $UsageChange; + + // 11) finally, remove old tag completely + $DB->query("DELETE + FROM tags + WHERE ID=$TagID + LIMIT 1"); + + // 12) update usage count for replacement tag + $DB->query("UPDATE tags + SET Uses=Uses+$UsageChange + WHERE ID=$ReplacementID + LIMIT 1"); + + } // if ($Mode == MODE_MERGE) + + echo '<div class="box pad center"><strong>Success!</strong> Affected entries: '.number_format($TotalAffected).'</div>'; + + if ($_GET['list']) { +?> + <br> + <table> + <tr class="colhead"> + <td> + Affected torrent groups + </td> + </tr> +<? + if (count($AffectedTorrents)) { + foreach ($AffectedTorrents as $Row) { + echo "<tr><td>$Row</td></tr>"; + } + } +?> + <tr class="colhead"> + <td> + Affected requests + </td> + </tr> +<? + if (count($AffectedRequests)) { + foreach ($AffectedRequests as $Row) { + echo "<tr><td>$Row</td></tr>"; + } + } +?> + </table> +<? + } + + } // if (!$Err) + +} // if ( isset($_GET['tag']) || isset($_GET['replace']) ) + +echo '</div>'; + +View::show_footer(); +?> diff --git a/sections/tools/tools.php b/sections/tools/tools.php index a961e916..043bcda1 100644 --- a/sections/tools/tools.php +++ b/sections/tools/tools.php @@ -69,8 +69,10 @@ <div class="permission_container"> <table class="layout"> <tr class="colhead"><td>Misc</td></tr> - <? if (check_perms('users_mod')) { ?> + <tr><td><a href="tools.php?action=edit_tags">Batch tag editor</a></td></tr> +<? } + if (check_perms('users_mod')) { ?> <tr><td><a href="tools.php?action=manipulate_tree">Manipulate tree</a></td></tr> <? } if (check_perms('admin_update_geoip')) { ?> diff --git a/sections/top10/torrents.php b/sections/top10/torrents.php index 0fd1bd3d..28277ac7 100644 --- a/sections/top10/torrents.php +++ b/sections/top10/torrents.php @@ -1,5 +1,5 @@ <? - // Bookmarks::has_bookmarked() +// Bookmarks::has_bookmarked() $Where = array(); @@ -445,24 +445,52 @@ function generate_torrent_table($Caption, $Tag, $Details, $Limit) { } // append extra info to torrent title - $ExtraInfo=''; - $AddExtra=''; - if ($Format) { $ExtraInfo.=$Format; $AddExtra=' / '; } - if ($Encoding) { $ExtraInfo.=$AddExtra.$Encoding; $AddExtra=' / '; } + $ExtraInfo = ''; + $AddExtra = ''; + if ($Format) { + $ExtraInfo.=$Format; + $AddExtra=' / '; + } + if ($Encoding) { + $ExtraInfo.=$AddExtra.$Encoding; + $AddExtra=' / '; + } // "FLAC / Lossless / Log (100%) / Cue / CD"; - if ($HasLog) { $ExtraInfo.=$AddExtra."Log (".$LogScore."%)"; $AddExtra=' / '; } - if ($HasCue) { $ExtraInfo.=$AddExtra."Cue"; $AddExtra=' / '; } - if ($Media) { $ExtraInfo.=$AddExtra.$Media; $AddExtra=' / '; } - if ($Scene) { $ExtraInfo.=$AddExtra.'Scene'; $AddExtra=' / '; } - if ($Year>0) { $ExtraInfo.=$AddExtra.$Year; $AddExtra=' '; } - if ($RemasterTitle) { $ExtraInfo.=$AddExtra.$RemasterTitle; } - if ($IsSnatched) { if ($GroupCategoryID == 1) { $ExtraInfo .= ' / '; } $ExtraInfo.= Format::torrent_label('Snatched!'); } - if ($ExtraInfo!='') { + if ($HasLog) { + $ExtraInfo.=$AddExtra.'Log ('.$LogScore.'%)'; + $AddExtra = ' / '; + } + if ($HasCue) { + $ExtraInfo.=$AddExtra.'Cue'; + $AddExtra = ' / '; + } + if ($Media) { + $ExtraInfo.=$AddExtra.$Media; + $AddExtra = ' / '; + } + if ($Scene) { + $ExtraInfo.=$AddExtra.'Scene'; + $AddExtra = ' / '; + } + if ($Year > 0) { + $ExtraInfo.=$AddExtra.$Year; + $AddExtra = ' '; + } + if ($RemasterTitle) { + $ExtraInfo.=$AddExtra.$RemasterTitle; + } + if ($IsSnatched) { + if ($GroupCategoryID == 1) { + $ExtraInfo .= ' / '; + } + $ExtraInfo.= Format::torrent_label('Snatched!'); + } + if ($ExtraInfo != '') { $ExtraInfo = "- [$ExtraInfo]"; } $TorrentTags = new Tags($TagsList); - + //Get report info, use the cache if available, if not, add to it. $Reported = false; $Reports = get_reports($TorrentID); @@ -473,7 +501,7 @@ function generate_torrent_table($Caption, $Tag, $Details, $Limit) { // print row ?> <tr class="torrent row<?=$Highlight . ($IsBookmarked ? ' bookmarked' : '') . ($IsSnatched ? ' snatched_torrent' : '')?>"> - <td style="padding:8px;text-align:center;"><strong><?=$Rank?></strong></td> + <td style="padding: 8px; text-align: center;"><strong><?=$Rank?></strong></td> <td class="center cats_col"><div title="<?=$TorrentTags->title()?>" class="<?=Format::css_category($GroupCategoryID)?> <?=$TorrentTags->css_name()?>"></div></td> <td class="big_info"> <? if ($LoggedUser['CoverArt']) : ?> @@ -485,7 +513,7 @@ function generate_torrent_table($Caption, $Tag, $Details, $Limit) { <span><a href="torrents.php?action=download&id=<?=$TorrentID?>&authkey=<?=$LoggedUser['AuthKey']?>&torrent_pass=<?=$LoggedUser['torrent_pass']?>" title="Download" class="brackets">DL</a></span> - <strong><?=$DisplayName?></strong> <?=$ExtraInfo?><?if($Reported){?> - <strong class="torrent_label tl_reported" title="Reported">Reported</strong><?}?> + <strong><?=$DisplayName?></strong> <?=$ExtraInfo?><? if ($Reported) { ?> - <strong class="torrent_label tl_reported" title="Reported">Reported</strong><? } ?> <span class="bookmark" style="float: right;"> <? if ($IsBookmarked) { @@ -496,7 +524,6 @@ function generate_torrent_table($Caption, $Tag, $Details, $Limit) { <? } ?> </span> <div class="tags"><?=$TorrentTags->format()?></div> - </div> </td> <td style="text-align: right;" class="nobr"><?=Format::get_size($Size)?></td> diff --git a/sections/top10/votes.php b/sections/top10/votes.php index 3366b8d8..de9a460e 100644 --- a/sections/top10/votes.php +++ b/sections/top10/votes.php @@ -61,14 +61,14 @@ $DB->query($Query); $Results = $DB->collect('GroupID'); - $Data = $DB->to_array('GroupID'); + $Data = $DB->to_array('GroupID'); $Groups = Torrents::get_groups($Results); $TopVotes = array(); foreach ($Results as $GroupID) { $TopVotes[$GroupID] = $Groups['matches'][$GroupID]; - $TopVotes[$GroupID]['Ups'] = $Data[$GroupID]['Ups']; + $TopVotes[$GroupID]['Ups'] = $Data[$GroupID]['Ups']; $TopVotes[$GroupID]['Total'] = $Data[$GroupID]['Total']; $TopVotes[$GroupID]['Score'] = $Data[$GroupID]['Score']; } @@ -159,7 +159,7 @@ $NumGroups = 0; foreach ($TopVotes as $GroupID => $Group) { extract(Torrents::array_group($Group)); - $Ups = $Group['Ups']; + $Ups = $Group['Ups']; $Total = $Group['Total']; $Score = $Group['Score']; @@ -186,7 +186,7 @@ $DisplayName = $DisplayName. " [$GroupYear]"; } if ($GroupVanityHouse) { - $DisplayName .= ' [<abbr title="This is a vanity house release">VH</abbr>]'; + $DisplayName .= ' [<abbr title="This is a Vanity House release">VH</abbr>]'; } // Start an output buffer, so we can store this output in $TorrentTable ob_start(); diff --git a/sections/torrents/browse.php b/sections/torrents/browse.php index 559aaee1..6f20e45d 100644 --- a/sections/torrents/browse.php +++ b/sections/torrents/browse.php @@ -23,7 +23,7 @@ define('EXPLAIN_HACK',false); -if (EXPLAIN_HACK){ +if (EXPLAIN_HACK) { $SCFR = ''; } else { $SCFR = 'SQL_CALC_FOUND_ROWS'; @@ -31,7 +31,7 @@ // Function to build a SQL WHERE to search for a string // Offers exact searching, fulltext searching, and negative searching -function build_search($SearchStr,$Field,$Exact=false,$SQLWhere='',$FullText=0,&$FilterString='') { +function build_search($SearchStr, $Field, $Exact=false, $SQLWhere='', $FullText=0, &$FilterString='') { if ($SQLWhere != '') { $AddWhere = false; } else { @@ -645,7 +645,7 @@ function header_link($SortKey,$DefaultWay = 'DESC') { } } - // List of pages +// List of pages $Pages = Format::get_pages($Page,$TorrentCount,TORRENTS_PER_PAGE); // Gets tacked onto torrent download URLs diff --git a/sections/torrents/browse2.php b/sections/torrents/browse2.php index b70e861b..d3b3797d 100644 --- a/sections/torrents/browse2.php +++ b/sections/torrents/browse2.php @@ -305,7 +305,48 @@ function header_link($SortKey,$DefaultWay="desc") { // Tag list if (!empty($SearchWords['taglist'])) { + global $Cache, $DB; + //Get tag aliases. + $TagAliases = $Cache->get_value('tag_aliases_search'); + if (!$TagAliases) { + $DB->query("SELECT ID,BadTag,AliasTag FROM tag_aliases ORDER BY BadTag"); + $TagAliases = $DB->to_array(); + //Unify tag aliases to be in_this_format as tags not in.this.format + array_walk_recursive($TagAliases, create_function('&$val', '$val = preg_replace("/\./","_", $val);')); + //Clean up the array for smaller cache size + foreach ($TagAliases as &$TagAlias) { + foreach (array_keys($TagAlias) as $Key) { + if (is_numeric($Key)) { + unset($TagAlias[$Key]); + } + } + } + $Cache->cache_value('tag_aliases_search', $TagAliases, 3600 * 24 * 7); // cache for 7 days + } + //Get tags $Tags = $SearchWords['taglist']; + //Replace bad tags with tag aliases + //In other news oh God I'm going to hell for all this preg_replace, but they're kept in two separate formats + for ($i = 0; $i < sizeof($Tags['include']) ; $i++) { + foreach ($TagAliases as $TagAlias) { + if ($Tags['include'][$i] === $TagAlias['BadTag']) { + $Tags['include'][$i] = $TagAlias['AliasTag']; + break; + } + } + } + for ($i = 0; $i < sizeof($Tags['exclude']) ; $i++) { + foreach ($TagAliases as $TagAlias) { + if (preg_replace('/^!/', '', $Tags['exclude'][$i]) === $TagAlias['BadTag']) { + $Tags['exclude'][$i] = '!'.$TagAlias['AliasTag']; + break; + } + } + } + //Only keep unique entries after unifying tag standard + $Tags['include'] = array_unique($Tags['include']); + $Tags['exclude'] = array_unique($Tags['exclude']); + $TagListString = implode(", ", array_merge($Tags['include'], $Tags['exclude'])); if (!$EnableNegation && !empty($Tags['exclude'])) { $Tags['include'] = array_merge($Tags['include'], $Tags['exclude']); unset($Tags['exclude']); @@ -389,12 +430,12 @@ function header_link($SortKey,$DefaultWay="desc") { } } -if (isset($_GET['haslog']) && $_GET['haslog']!=='') { +if (isset($_GET['haslog']) && $_GET['haslog'] !== '') { if ($_GET['haslog'] == 100) { $SphQL->where('logscore', 100); $SphQLTor->where('logscore', 100); $Filtered = true; - } elseif ($_GET['haslog'] < 0) { + } elseif ($_GET['haslog'] < 0) { // Exclude torrents with log score equal to 100 $SphQL->where('logscore', 100, true); $SphQL->where('haslog', 1); @@ -712,7 +753,7 @@ function header_link($SortKey,$DefaultWay="desc") { <tr id="tagfilter"> <td class="label">Tags (comma-separated):</td> <td colspan="3" class="ft_taglist"> - <input type="text" size="40" id="tags" name="taglist" class="inputtext smaller" title="Use !tag to exclude tag" value="<?=str_replace('_','.',Format::form('taglist', true))?>" />  + <input type="text" size="40" id="tags" name="taglist" class="inputtext smaller" title="Use !tag to exclude tag" value="<?=str_replace('_','.',display_str($TagListString)) /* Use aliased tags, not actual query string. */ ?>" />  <input type="radio" name="tags_type" id="tags_type0" value="0"<?Format::selected('tags_type',0,'checked')?> /><label for="tags_type0"> Any</label>   <input type="radio" name="tags_type" id="tags_type1" value="1"<?Format::selected('tags_type',1,'checked')?> /><label for="tags_type1"> All</label> </td> @@ -933,14 +974,14 @@ function header_link($SortKey,$DefaultWay="desc") { } $SnatchedGroupClass = $GroupInfo['Flags']['IsSnatched'] ? ' snatched_group' : ''; - if ($GroupResults && (count($Torrents)>1 || isset($GroupedCategories[$CategoryID-1]))) { + if ($GroupResults && (count($Torrents) > 1 || isset($GroupedCategories[$CategoryID - 1]))) { // These torrents are in a group $DisplayName .= '<a href="torrents.php?id='.$GroupID.'" title="View Torrent" dir="ltr">'.$GroupName.'</a>'; if ($GroupYear > 0) { $DisplayName .= " [$GroupYear]"; } if ($GroupVanityHouse) { - $DisplayName .= ' [<abbr title="This is a vanity house release">VH</abbr>]'; + $DisplayName .= ' [<abbr title="This is a Vanity House release">VH</abbr>]'; } $DisplayName .= ' ['.$ReleaseTypes[$ReleaseType].']'; ?> @@ -997,7 +1038,7 @@ function header_link($SortKey,$DefaultWay="desc") { if (!isset($TorrentIDs[$TorrentID])) { continue; } - + //Get report info for each torrent, use the cache if available, if not, add to it. $Reported = false; $Reports = get_reports($TorrentID); @@ -1040,7 +1081,7 @@ function header_link($SortKey,$DefaultWay="desc") { <? } ?> | <a href="reportsv2.php?action=report&id=<?=$TorrentID?>" title="Report">RP</a> ] </span> - » <a href="torrents.php?id=<?=$GroupID?>&torrentid=<?=$TorrentID?>"><?=Torrents::torrent_info($Data)?><?if($Reported){?> / <strong class="torrent_label tl_reported" title="Reported">Reported</strong><?}?></a> + » <a href="torrents.php?id=<?=$GroupID?>&torrentid=<?=$TorrentID?>"><?=Torrents::torrent_info($Data)?><? if ($Reported) { ?> / <strong class="torrent_label tl_reported" title="Reported">Reported</strong><? } ?></a> </td> <td><?=$Data['FileCount']?></td> <td class="nobr"><?=time_diff($Data['Time'], 1)?></td> diff --git a/sections/torrents/details.php b/sections/torrents/details.php index 3062d2a3..9437abc7 100644 --- a/sections/torrents/details.php +++ b/sections/torrents/details.php @@ -5,9 +5,9 @@ function compare($X, $Y) { header('Access-Control-Allow-Origin: *'); define('MAX_PERS_COLLAGES', 3); // How many personal collages should be shown by default -define('MAX_COLLAGES', 5); // How many normal collages should be shown by default +define('MAX_COLLAGES', 5); // How many normal collages should be shown by default - // Bookmarks::has_bookmarked() +// Bookmarks::has_bookmarked() include(SERVER_ROOT.'/classes/class_text.php'); $Text = NEW TEXT; diff --git a/sections/torrents/functions.php b/sections/torrents/functions.php index a956b914..57e6282d 100644 --- a/sections/torrents/functions.php +++ b/sections/torrents/functions.php @@ -182,17 +182,17 @@ function get_reports($TorrentID){ global $Cache, $DB; $Reports = $Cache->get_value('reports_torrent_' . $TorrentID); if ($Reports === false) { - $DB->query("SELECT r.ID, + $DB->query("SELECT r.ID, r.ReporterID, r.Type, r.UserComment, r.ReportedTime FROM reportsv2 AS r WHERE TorrentID = $TorrentID - AND Type != 'edited' - AND Status != 'Resolved'"); - $Reports = $DB->to_array(); - $Cache->cache_value('reports_torrent_' . $TorrentID, $Reports, 0); + AND Type != 'edited' + AND Status != 'Resolved'"); + $Reports = $DB->to_array(); + $Cache->cache_value('reports_torrent_' . $TorrentID, $Reports, 0); } return $Reports; } @@ -200,17 +200,17 @@ function get_reports($TorrentID){ //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, $Text, $Username, $ReportedTimes) { - function filelist($Str) { - return "</td><td>" . Format::get_size($Str[1]) . "</td></tr>"; - } + function filelist($Str) { + return '</td><td>' . Format::get_size($Str[1]) . '</td></tr>'; + } - $LastRemasterYear = '-'; - $LastRemasterTitle = ''; - $LastRemasterRecordLabel = ''; - $LastRemasterCatalogueNumber = ''; + $LastRemasterYear = '-'; + $LastRemasterTitle = ''; + $LastRemasterRecordLabel = ''; + $LastRemasterCatalogueNumber = ''; - $EditionID = 0; - foreach ($TorrentList as $Torrent) { + $EditionID = 0; + foreach ($TorrentList as $Torrent) { //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.LogScore, t.FileCount, t.Size, t.Seeders, t.Leechers, @@ -227,14 +227,14 @@ function filelist($Str) { $LogInDB, $HasFile, $PersonalFL, $IsSnatched) = array_values($Torrent); if ($Remastered && !$RemasterYear) { - $FirstUnknown = !isset($FirstUnknown); + $FirstUnknown = !isset($FirstUnknown); } $Reported = false; unset($ReportedTimes); $Reports = $Cache->get_value('reports_torrent_' . $TorrentID); if ($Reports === false) { - $DB->query("SELECT r.ID, + $DB->query("SELECT r.ID, r.ReporterID, r.Type, r.UserComment, @@ -243,32 +243,32 @@ function filelist($Str) { WHERE TorrentID = $TorrentID AND Type != 'edited' AND Status != 'Resolved'"); - $Reports = $DB->to_array(); - $Cache->cache_value('reports_torrent_' . $TorrentID, $Reports, 0); + $Reports = $DB->to_array(); + $Cache->cache_value('reports_torrent_' . $TorrentID, $Reports, 0); } if (count($Reports) > 0) { - $Reported = true; - include(SERVER_ROOT . '/sections/reportsv2/array.php'); - $ReportInfo = '<table><tr class="colhead_dark" style="font-weight: bold;"><td>This torrent has ' . count($Reports) . ' active ' . (count($Reports) > 1 ? "reports" : "report") . ':</td></tr>'; + $Reported = true; + include(SERVER_ROOT . '/sections/reportsv2/array.php'); + $ReportInfo = '<table><tr class="colhead_dark" style="font-weight: bold;"><td>This torrent has ' . count($Reports) . ' active ' . (count($Reports) > 1 ? "reports" : "report") . ':</td></tr>'; - foreach ($Reports as $Report) { + foreach ($Reports as $Report) { list($ReportID, $ReporterID, $ReportType, $ReportReason, $ReportedTime) = $Report; $Reporter = Users::user_info($ReporterID); $ReporterName = $Reporter['Username']; if (array_key_exists($ReportType, $Types[$GroupCategoryID])) { - $ReportType = $Types[$GroupCategoryID][$ReportType]; + $ReportType = $Types[$GroupCategoryID][$ReportType]; } else if (array_key_exists($ReportType, $Types['master'])) { - $ReportType = $Types['master'][$ReportType]; + $ReportType = $Types['master'][$ReportType]; } else { - //There was a type but it wasn't an option! - $ReportType = $Types['master']['other']; + //There was a type but it wasn't an option! + $ReportType = $Types['master']['other']; } - $ReportInfo .= "<tr><td>" . (check_perms('admin_reports') ? "<a href='user.php?id=$ReporterID'>$ReporterName</a> <a href='reportsv2.php?view=report&id=$ReportID'>reported it</a> " : "Someone reported it ") . time_diff($ReportedTime, 2, true, true) . " for the reason '" . $ReportType['title'] . "':"; - $ReportInfo .= "<blockquote>" . $Text->full_format($ReportReason) . "</blockquote></td></tr>"; - } - $ReportInfo .= "</table>"; + $ReportInfo .= '<tr><td>' . (check_perms('admin_reports') ? "<a href=\"user.php?id=$ReporterID\">$ReporterName</a> <a href=\"reportsv2.php?view=report&id=$ReportID\">reported it</a> " : 'Someone reported it ') . time_diff($ReportedTime, 2, true, true) . ' for the reason "' . $ReportType['title'] . '":'; + $ReportInfo .= '<blockquote>' . $Text->full_format($ReportReason) . '</blockquote></td></tr>'; + } + $ReportInfo .= '</table>'; } $CanEdit = (check_perms('torrents_edit') || (($UserID == $LoggedUser['ID'] && !$LoggedUser['DisableWiki']) && !($Remastered && !$RemasterYear))); @@ -276,29 +276,32 @@ function filelist($Str) { $RegenLink = check_perms('users_mod') ? ' <a href="torrents.php?action=regen_filelist&torrentid=' . $TorrentID . '" class="brackets">Regenerate</a>' : ''; $FileTable = ' <table class="filelist_table"> - <tr class="colhead_dark"><td> - <div class="filelist_title" style="float: left;">File Name' . $RegenLink . '</div> - <div class="filelist_path" style="float: right;">' . ($FilePath ? "/$FilePath/" : '') . '</div> - </td><td> - <strong>Size</strong> - </td></tr>'; + <tr class="colhead_dark"> + <td> + <div class="filelist_title" style="float: left;">File name' . $RegenLink . '</div> + <div class="filelist_path" style="float: right;">' . ($FilePath ? "/$FilePath/" : '') . '</div> + </td> + <td> + <strong>Size</strong> + </td> + </tr>'; if (substr($FileList, -3) == '}}}') { // Old style - $FileListSplit = explode('|||', $FileList); - foreach ($FileListSplit as $File) { + $FileListSplit = explode('|||', $FileList); + foreach ($FileListSplit as $File) { $NameEnd = strrpos($File, '{{{'); $Name = substr($File, 0, $NameEnd); if ($Spaces = strspn($Name, ' ')) { - $Name = str_replace(' ', ' ', substr($Name, 0, $Spaces)) . substr($Name, $Spaces); + $Name = str_replace(' ', ' ', substr($Name, 0, $Spaces)) . substr($Name, $Spaces); } $FileSize = substr($File, $NameEnd + 3, -3); $FileTable .= sprintf("\n<tr><td>%s</td><td>%s</td></tr>", $Name, Format::get_size($FileSize)); - } + } } else { - $FileListSplit = explode("\n", $FileList); - foreach ($FileListSplit as $File) { + $FileListSplit = explode("\n", $FileList); + foreach ($FileListSplit as $File) { $FileInfo = Torrents::filelist_get_file($File); $FileTable .= sprintf("\n<tr><td>%s</td><td>%s</td></tr>", $FileInfo['name'], Format::get_size($FileInfo['size'])); - } + } } $FileTable .= ' </table>'; @@ -309,75 +312,75 @@ function filelist($Str) { $TorrentUploader = $Username; // Save this for "Uploaded by:" below // similar to Torrents::torrent_info() if ($Format) { - $ExtraInfo.=display_str($Format); - $AddExtra = ' / '; + $ExtraInfo.=display_str($Format); + $AddExtra = ' / '; } if ($Encoding) { - $ExtraInfo.=$AddExtra . display_str($Encoding); - $AddExtra = ' / '; + $ExtraInfo.=$AddExtra . display_str($Encoding); + $AddExtra = ' / '; } if ($HasLog) { - $ExtraInfo.=$AddExtra . 'Log'; - $AddExtra = ' / '; + $ExtraInfo.=$AddExtra . 'Log'; + $AddExtra = ' / '; } if ($HasLog && $LogInDB) { - $ExtraInfo.=' (' . (int) $LogScore . '%)'; + $ExtraInfo.=' (' . (int) $LogScore . '%)'; } if ($HasCue) { - $ExtraInfo.=$AddExtra . 'Cue'; - $AddExtra = ' / '; + $ExtraInfo.=$AddExtra . 'Cue'; + $AddExtra = ' / '; } if ($Scene) { - $ExtraInfo.=$AddExtra . 'Scene'; - $AddExtra = ' / '; + $ExtraInfo.=$AddExtra . 'Scene'; + $AddExtra = ' / '; } if (!$ExtraInfo) { - $ExtraInfo = $GroupName; - $AddExtra = ' / '; + $ExtraInfo = $GroupName; + $AddExtra = ' / '; } if ($IsSnatched) { - $ExtraInfo.=$AddExtra . Format::torrent_label('Snatched!'); - $AddExtra = ' / '; + $ExtraInfo.=$AddExtra . Format::torrent_label('Snatched!'); + $AddExtra = ' / '; } if ($FreeTorrent == '1') { - $ExtraInfo.=$AddExtra . Format::torrent_label('Freeleech!'); - $AddExtra = ' / '; + $ExtraInfo.=$AddExtra . Format::torrent_label('Freeleech!'); + $AddExtra = ' / '; } if ($FreeTorrent == '2') { - $ExtraInfo.=$AddExtra . Format::torrent_label('Neutral Leech!'); - $AddExtra = ' / '; + $ExtraInfo.=$AddExtra . Format::torrent_label('Neutral Leech!'); + $AddExtra = ' / '; } if ($PersonalFL) { - $ExtraInfo.=$AddExtra . Format::torrent_label('Personal Freeleech!'); - $AddExtra = ' / '; + $ExtraInfo.=$AddExtra . Format::torrent_label('Personal Freeleech!'); + $AddExtra = ' / '; } if ($Reported) { - $ExtraInfo.=$AddExtra . Format::torrent_label('Reported'); - $AddExtra = ' / '; + $ExtraInfo.=$AddExtra . Format::torrent_label('Reported'); + $AddExtra = ' / '; } if (!empty($BadTags)) { - $ExtraInfo.=$AddExtra . Format::torrent_label('Bad Tags'); - $AddExtra = ' / '; + $ExtraInfo.=$AddExtra . Format::torrent_label('Bad Tags'); + $AddExtra = ' / '; } if (!empty($BadFolders)) { - $ExtraInfo.=$AddExtra . Format::torrent_label('Bad Folders'); - $AddExtra = ' / '; + $ExtraInfo.=$AddExtra . Format::torrent_label('Bad Folders'); + $AddExtra = ' / '; } if (!empty($CassetteApproved)) { - $ExtraInfo.=$AddExtra . Format::torrent_label('Cassette Approved'); - $AddExtra = ' / '; + $ExtraInfo.=$AddExtra . Format::torrent_label('Cassette Approved'); + $AddExtra = ' / '; } if (!empty($LossymasterApproved)) { - $ExtraInfo.=$AddExtra . Format::torrent_label('Lossy Master Approved'); - $AddExtra = ' / '; + $ExtraInfo.=$AddExtra . Format::torrent_label('Lossy Master Approved'); + $AddExtra = ' / '; } if (!empty($LossywebApproved)) { - $ExtraInfo.=$AddExtra . Format::torrent_label('Lossy WEB Approved'); - $AddExtra = ' / '; + $ExtraInfo.=$AddExtra . Format::torrent_label('Lossy WEB Approved'); + $AddExtra = ' / '; } if (!empty($BadFiles)) { - $ExtraInfo.=$AddExtra . Format::torrent_label('Bad File Names'); - $AddExtra = ' / '; + $ExtraInfo.=$AddExtra . Format::torrent_label('Bad File Names'); + $AddExtra = ' / '; } if ($GroupCategoryID == 1 @@ -388,34 +391,32 @@ function filelist($Str) { || $FirstUnknown || $Media != $LastMedia)) { - $EditionID++; + $EditionID++; ?> - <tr class="releases_<?= $ReleaseType ?> groupid_<?= $GroupID ?> edition group_torrent"> - <td colspan="5" class="edition_info"><strong><a href="#" onclick="toggle_edition(<?= $GroupID ?>, <?= $EditionID ?>, this, event)" title="Collapse this edition. Hold "Ctrl" while clicking to collapse all editions in this torrent group.">−</a> <?= Torrents::edition_string($Torrent, $TorrentDetails) ?></strong></td> - </tr> - <? + <tr class="releases_<?= $ReleaseType ?> groupid_<?= $GroupID ?> edition group_torrent"> + <td colspan="5" class="edition_info"><strong><a href="#" onclick="toggle_edition(<?= $GroupID ?>, <?= $EditionID ?>, this, event)" title="Collapse this edition. Hold "Ctrl" while clicking to collapse all editions in this torrent group.">−</a> <?= Torrents::edition_string($Torrent, $TorrentDetails) ?></strong></td> + </tr> +<? } $LastRemasterTitle = $RemasterTitle; $LastRemasterYear = $RemasterYear; $LastRemasterRecordLabel = $RemasterRecordLabel; $LastRemasterCatalogueNumber = $RemasterCatalogueNumber; $LastMedia = $Media; - ?> - + ?> <tr class="torrent_row releases_<?= $ReleaseType ?> groupid_<?= $GroupID ?> edition_<?= $EditionID ?> group_torrent<?= $IsSnatched ? ' snatched_torrent' : '' ?>" style="font-weight: normal;" id="torrent<?= $TorrentID ?>"> <td> <span>[ <a href="torrents.php?action=download&id=<?= $TorrentID ?>&authkey=<?= $LoggedUser['AuthKey'] ?>&torrent_pass=<?= $LoggedUser['torrent_pass'] ?>" title="Download"><?= $HasFile ? 'DL' : 'Missing' ?></a> - <? if (Torrents::can_use_token($Torrent)) { ?> - | <a href="torrents.php?action=download&id=<?= $TorrentID ?>&authkey=<?= $LoggedUser['AuthKey'] ?>&torrent_pass=<?= $LoggedUser['torrent_pass'] ?>&usetoken=1" title="Use a FL Token" onclick="return confirm('Are you sure you want to use a freeleech token here?');">FL</a> - <? } ?> +<? if (Torrents::can_use_token($Torrent)) { ?> + | <a href="torrents.php?action=download&id=<?= $TorrentID ?>&authkey=<?= $LoggedUser['AuthKey'] ?>&torrent_pass=<?= $LoggedUser['torrent_pass'] ?>&usetoken=1" title="Use a FL Token" onclick="return confirm('Are you sure you want to use a freeleech token here?');">FL</a> +<? } ?> | <a href="reportsv2.php?action=report&id=<?= $TorrentID ?>" title="Report">RP</a> - <? if ($CanEdit) { ?> - | <a href="torrents.php?action=edit&id=<?= $TorrentID ?>" title="Edit">ED</a> - <? } ?> - <? if (check_perms('torrents_delete') || $UserID == $LoggedUser['ID']) { ?> - | <a href="torrents.php?action=delete&torrentid=<?= $TorrentID ?>" title="Remove">RM</a> - <? } ?> - +<? if ($CanEdit) { ?> + | <a href="torrents.php?action=edit&id=<?= $TorrentID ?>" title="Edit">ED</a> +<? } + if (check_perms('torrents_delete') || $UserID == $LoggedUser['ID']) { ?> + | <a href="torrents.php?action=delete&torrentid=<?= $TorrentID ?>" title="Remove">RM</a> +<? } ?> | <a href="torrents.php?torrentid=<?= $TorrentID ?>" title="Permalink">PL</a> ]</span> » <a href="#" onclick="$('#torrent_<?= $TorrentID ?>').toggle(); return false;"><?= $ExtraInfo; ?></a> @@ -425,53 +426,50 @@ function filelist($Str) { <td><?= number_format($Seeders) ?></td> <td><?= number_format($Leechers) ?></td> </tr> - <tr class="releases_<?= $ReleaseType ?> groupid_<?= $GroupID ?> edition_<?= $EditionID ?> torrentdetails pad <? if (!isset($_GET['torrentid']) || $_GET['torrentid'] != $TorrentID) { ?>hidden<? } ?>" id="torrent_<?= $TorrentID; ?>"> + <tr class="releases_<?= $ReleaseType ?> groupid_<?= $GroupID ?> edition_<?= $EditionID ?> torrentdetails pad<? if (!isset($_GET['torrentid']) || $_GET['torrentid'] != $TorrentID) { ?> hidden<? } ?>" id="torrent_<?= $TorrentID; ?>"> <td colspan="5"> <blockquote> Uploaded by <?= Users::format_username($UserID, false, false, false) ?> <?= time_diff($TorrentTime); ?> - <? if ($Seeders == 0) { ?> - <? if ($LastActive != '0000-00-00 00:00:00' && time() - strtotime($LastActive) >= 1209600) { ?> - <br /><strong>Last active: <?= time_diff($LastActive); ?></strong> - <? } else { ?> +<? if ($Seeders == 0) { + if ($LastActive != '0000-00-00 00:00:00' && time() - strtotime($LastActive) >= 1209600) { ?> + <br /><strong>Last active: <?= time_diff($LastActive); ?></strong> +<? } else { ?> <br />Last active: <?= time_diff($LastActive); ?> - <? } ?> - <? if ($LastActive != '0000-00-00 00:00:00' && time() - strtotime($LastActive) >= 345678 && time() - strtotime($LastReseedRequest) >= 864000) { ?> +<? } + if ($LastActive != '0000-00-00 00:00:00' && time() - strtotime($LastActive) >= 345678 && time() - strtotime($LastReseedRequest) >= 864000) { ?> <br /><a href="torrents.php?action=reseed&torrentid=<?= $TorrentID ?>&groupid=<?= $GroupID ?>" class="brackets">Request re-seed</a> - <? } ?> - - <? } ?> - +<? } + } ?> </blockquote> - <? if (check_perms('site_moderate_requests')) { ?> - <div class="linkbox"> - <a href="torrents.php?action=masspm&id=<?= $GroupID ?>&torrentid=<?= $TorrentID ?>" class="brackets">Mass PM snatchers</a> - </div> - <? } ?> +<? if (check_perms('site_moderate_requests')) { ?> + <div class="linkbox"> + <a href="torrents.php?action=masspm&id=<?= $GroupID ?>&torrentid=<?= $TorrentID ?>" class="brackets">Mass PM snatchers</a> + </div> +<? } ?> <div class="linkbox"> <a href="#" class="brackets" onclick="show_peers('<?= $TorrentID ?>', 0);return false;">View peer list</a> - <? if (check_perms('site_view_torrent_snatchlist')) { ?> - <a href="#" class="brackets" onclick="show_downloads('<?= $TorrentID ?>', 0);return false;" title="View the list of users that have clicked the "DL" button.">View download list</a> - <a href="#" class="brackets" onclick="show_snatches('<?= $TorrentID ?>', 0);return false;" title="View the list of users that have reported a snatch to the tracker.">View snatch list</a> - <? } ?> +<? if (check_perms('site_view_torrent_snatchlist')) { ?> + <a href="#" class="brackets" onclick="show_downloads('<?= $TorrentID ?>', 0);return false;" title="View the list of users that have clicked the "DL" button.">View download list</a> + <a href="#" class="brackets" onclick="show_snatches('<?= $TorrentID ?>', 0);return false;" title="View the list of users that have reported a snatch to the tracker.">View snatch list</a> +<? } ?> <a href="#" class="brackets" onclick="show_files('<?= $TorrentID ?>');return false;">View file list</a> - <? if ($Reported) { ?> - <a href="#" class="brackets" onclick="show_reported('<?= $TorrentID ?>');return false;">View report information</a> - <? } ?> +<? if ($Reported) { ?> + <a href="#" class="brackets" onclick="show_reported('<?= $TorrentID ?>');return false;">View report information</a> +<? } ?> </div> <div id="peers_<?= $TorrentID ?>" class="hidden"></div> <div id="downloads_<?= $TorrentID ?>" class="hidden"></div> <div id="snatches_<?= $TorrentID ?>" class="hidden"></div> <div id="files_<?= $TorrentID ?>" class="hidden"><?= $FileTable ?></div> - <? if ($Reported) { ?> - <div id="reported_<?= $TorrentID ?>" class="hidden"><?= $ReportInfo ?></div> - <? } ?> - <? +<? if ($Reported) { ?> + <div id="reported_<?= $TorrentID ?>" class="hidden"><?= $ReportInfo ?></div> +<? } if (!empty($Description)) { - echo '<blockquote>' . $Text->full_format($Description) . '</blockquote>'; + echo '<blockquote>' . $Text->full_format($Description) . '</blockquote>'; } ?> </td> </tr> - <? - } +<? + } } diff --git a/sections/torrents/nonwikiedit.php b/sections/torrents/nonwikiedit.php index b8704e9f..28fe34a4 100644 --- a/sections/torrents/nonwikiedit.php +++ b/sections/torrents/nonwikiedit.php @@ -58,7 +58,7 @@ } $DB->query("SELECT ID FROM torrents WHERE GroupID='$GroupID'"); -while(list($TorrentID) = $DB->next_record()) { +while (list($TorrentID) = $DB->next_record()) { $Cache->delete_value('torrent_download_'.$TorrentID); } Torrents::update_hash($GroupID); diff --git a/sections/torrents/reseed.php b/sections/torrents/reseed.php index 847f724a..060a3d02 100644 --- a/sections/torrents/reseed.php +++ b/sections/torrents/reseed.php @@ -2,13 +2,19 @@ $GroupID = $_GET['groupid']; $TorrentID = $_GET['torrentid']; -if(!is_number($GroupID) || !is_number($TorrentID)) { error(0); } +if (!is_number($GroupID) || !is_number($TorrentID)) { + error(0); +} $DB->query("SELECT last_action, LastReseedRequest, UserID, Time FROM torrents WHERE ID='$TorrentID'"); list($LastActive, $LastReseedRequest, $UploaderID, $UploadedTime) = $DB->next_record(); -if(time()-strtotime($LastReseedRequest)<864000) { error("There was already a re-seed request for this torrent within the past 10 days."); } -if ($LastActive == '0000-00-00 00:00:00' || time() - strtotime($LastActive) < 345678) { error(403); } +if (time() - strtotime($LastReseedRequest) < 864000) { + error('There was already a re-seed request for this torrent within the past 10 days.'); +} +if ($LastActive == '0000-00-00 00:00:00' || time() - strtotime($LastActive) < 345678) { + error(403); +} $DB->query("UPDATE torrents SET LastReseedRequest=NOW() WHERE ID='$TorrentID'"); @@ -27,14 +33,16 @@ $UserID = $User['uid']; $DB->query("SELECT UserID FROM top_snatchers WHERE UserID='$UserID'"); - if($DB->record_count()>0) { continue; } + if ($DB->record_count() > 0) { + continue; + } $UserInfo = Users::user_info($UserID); $Username = $UserInfo['Username']; $TimeStamp = $User['tstamp']; $Request = "Hi $Username, -The user [url=http://".SITE_URL."/user.php?id=$LoggedUser[ID]]$LoggedUser[Username][/url] has requested a re-seed for the torrent [url=http://".SITE_URL."/torrents.php?id=$GroupID&torrentid=$TorrentID]".$Name."[/url], which you snatched on ".date('M d Y', $TimeStamp).". The torrent is now un-seeded, and we need your help to resurrect it! +The user [url=https://".SSL_SITE_URL."/user.php?id=$LoggedUser[ID]]$LoggedUser[Username][/url] has requested a re-seed for the torrent [url=https://".SSL_SITE_URL."/torrents.php?id=$GroupID&torrentid=$TorrentID]".$Name."[/url], which you snatched on ".date('M d Y', $TimeStamp).". The torrent is now un-seeded, and we need your help to resurrect it! The exact process for re-seeding a torrent is slightly different for each client, but the concept is the same. The idea is to download the .torrent file and open it in your client, and point your client to the location where the data files are, then initiate a hash check. @@ -49,7 +57,7 @@ $Request = "Hi $Username, -The user [url=http://".SITE_URL."/user.php?id=$LoggedUser[ID]]$LoggedUser[Username][/url] has requested a re-seed for the torrent [url=http://".SITE_URL."/torrents.php?id=$GroupID&torrentid=$TorrentID]".$Name."[/url], which you uploaded on ".date('M d Y', strtotime($UploadedTime)).". The torrent is now un-seeded, and we need your help to resurrect it! +The user [url=https://".SSL_SITE_URL."/user.php?id=$LoggedUser[ID]]$LoggedUser[Username][/url] has requested a re-seed for the torrent [url=https://".SSL_SITE_URL."/torrents.php?id=$GroupID&torrentid=$TorrentID]".$Name."[/url], which you uploaded on ".date('M d Y', strtotime($UploadedTime)).". The torrent is now un-seeded, and we need your help to resurrect it! The exact process for re-seeding a torrent is slightly different for each client, but the concept is the same. The idea is to download the .torrent file and open it in your client, and point your client to the location where the data files are, then initiate a hash check. diff --git a/sections/torrents/user.php b/sections/torrents/user.php index 32fe990c..bd76654b 100644 --- a/sections/torrents/user.php +++ b/sections/torrents/user.php @@ -8,19 +8,25 @@ // 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; } + 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')); } $UserID = $_GET['userid']; -if(!is_number($UserID)) { error(0); } +if (!is_number($UserID)) { + error(0); +} - -if(!empty($_GET['page']) && is_number($_GET['page']) && $_GET['page'] > 0) { +if (!empty($_GET['page']) && is_number($_GET['page']) && $_GET['page'] > 0) { $Page = $_GET['page']; $Limit = ($Page-1)*TORRENTS_PER_PAGE.', '.TORRENTS_PER_PAGE; } else { @@ -28,53 +34,53 @@ function header_link($SortKey,$DefaultWay="DESC") { $Limit = TORRENTS_PER_PAGE; } -if(!empty($_GET['order']) && in_array($_GET['order'], $Orders)) { +if (!empty($_GET['order']) && in_array($_GET['order'], $Orders)) { $Order = $_GET['order']; } else { $Order = 'Time'; } -if(!empty($_GET['way']) && array_key_exists($_GET['way'], $Ways)) { +if (!empty($_GET['way']) && array_key_exists($_GET['way'], $Ways)) { $Way = $_GET['way']; } else { $Way = 'DESC'; } $SearchWhere = array(); -if(!empty($_GET['format'])) { - if(in_array($_GET['format'], $Formats)) { +if (!empty($_GET['format'])) { + if (in_array($_GET['format'], $Formats)) { $SearchWhere[]="t.Format='".db_string($_GET['format'])."'"; - } elseif($_GET['format'] == 'perfectflac') { + } elseif ($_GET['format'] == 'perfectflac') { $_GET['filter'] = 'perfectflac'; } } -if(!empty($_GET['bitrate']) && in_array($_GET['bitrate'], $Bitrates)) { +if (!empty($_GET['bitrate']) && in_array($_GET['bitrate'], $Bitrates)) { $SearchWhere[]="t.Encoding='".db_string($_GET['bitrate'])."'"; } -if(!empty($_GET['media']) && in_array($_GET['media'], $Media)) { +if (!empty($_GET['media']) && in_array($_GET['media'], $Media)) { $SearchWhere[]="t.Media='".db_string($_GET['media'])."'"; } -if(!empty($_GET['releasetype']) && array_key_exists($_GET['releasetype'], $ReleaseTypes)) { +if (!empty($_GET['releasetype']) && array_key_exists($_GET['releasetype'], $ReleaseTypes)) { $SearchWhere[]="tg.ReleaseType='".db_string($_GET['releasetype'])."'"; } -if(isset($_GET['scene']) && in_array($_GET['scene'], array('1','0'))) { +if (isset($_GET['scene']) && in_array($_GET['scene'], array('1','0'))) { $SearchWhere[]="t.Scene='".db_string($_GET['scene'])."'"; } -if(isset($_GET['vanityhouse']) && in_array($_GET['vanityhouse'], array('1','0'))) { +if (isset($_GET['vanityhouse']) && in_array($_GET['vanityhouse'], array('1','0'))) { $SearchWhere[]="tg.VanityHouse='".db_string($_GET['vanityhouse'])."'"; } -if(isset($_GET['cue']) && in_array($_GET['cue'], array('1','0'))) { +if (isset($_GET['cue']) && in_array($_GET['cue'], array('1','0'))) { $SearchWhere[]="t.HasCue='".db_string($_GET['cue'])."'"; } -if(isset($_GET['log']) && in_array($_GET['log'], array('1','0', '100', '-1'))) { - if($_GET['log'] == '100') { +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') { @@ -85,10 +91,10 @@ function header_link($SortKey,$DefaultWay="DESC") { } } -if(!empty($_GET['categories'])) { +if (!empty($_GET['categories'])) { $Cats = array(); - foreach(array_keys($_GET['categories']) as $Cat) { - if(!is_number($Cat)) { + foreach (array_keys($_GET['categories']) as $Cat) { + if (!is_number($Cat)) { error(0); } $Cats[]="tg.CategoryID='".db_string($Cat)."'"; @@ -96,26 +102,30 @@ function header_link($SortKey,$DefaultWay="DESC") { $SearchWhere[]='('.implode(' OR ', $Cats).')'; } -if(!isset($_GET['tags_type'])) { +if (!isset($_GET['tags_type'])) { $_GET['tags_type'] = '1'; } -if(!empty($_GET['tags'])) { +if (!empty($_GET['tags'])) { $Tags = explode(',',$_GET['tags']); $TagList = array(); - foreach($Tags as $Tag) { + foreach ($Tags as $Tag) { $Tag = trim(str_replace('.','_',$Tag)); - if(empty($Tag)) { continue; } - if($Tag[0] == '!') { + if (empty($Tag)) { + continue; + } + if ($Tag[0] == '!') { $Tag = ltrim(substr($Tag,1)); - if(empty($Tag)) { continue; } + 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) { + if (!empty($TagList)) { + if (isset($_GET['tags_type']) && $_GET['tags_type'] != 1) { $_GET['tags_type'] = '0'; $SearchWhere[]='('.implode(' OR ', $TagList).')'; } else { @@ -126,7 +136,7 @@ function header_link($SortKey,$DefaultWay="DESC") { } $SearchWhere = implode(' AND ', $SearchWhere); -if(!empty($SearchWhere)) { +if (!empty($SearchWhere)) { $SearchWhere = ' AND '.$SearchWhere; } @@ -134,16 +144,20 @@ function header_link($SortKey,$DefaultWay="DESC") { $Perms = Permissions::get_permissions($User['PermissionID']); $UserClass = $Perms['Class']; -switch($_GET['type']) { +switch ($_GET['type']) { case 'snatched': - if(!check_paranoia('snatched', $User['Paranoia'], $UserClass, $UserID)) { error(403); } + 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); } + 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'; @@ -156,21 +170,27 @@ function header_link($SortKey,$DefaultWay="DESC") { $From = "torrents AS t"; break; case 'leeching': - if(!check_paranoia('leeching', $User['Paranoia'], $UserClass, $UserID)) { error(403); } + 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); } + 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); } + if (!check_perms('site_view_torrent_snatchlist')) { + error(403); + } $Time = 'unix_timestamp(ud.Time)'; $UserField = 'ud.UserID'; $ExtraWhere = ''; @@ -180,72 +200,84 @@ function header_link($SortKey,$DefaultWay="DESC") { error(404); } -if(!empty($_GET['filter'])) { - if($_GET['filter'] == "perfectflac") { - if (!check_paranoia('perfectflacs', $User['Paranoia'], $UserClass, $UserID)) { error(403); } +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'])) { + if (empty($_GET['media'])) { $ExtraWhere .= " AND ( t.LogScore = 100 OR t.Media IN ('Vinyl','WEB','DVD','Soundboard','Casette','SACD','Blu-ray','DAT') )"; - } elseif(strtoupper($_GET['media']) == 'CD' && empty($_GET['log'])) { + } 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"; + } elseif ($_GET['filter'] == 'uniquegroup') { + if (!check_paranoia('uniquegroups', $User['Paranoia'], $UserClass, $UserID)) { + error(403); + } + $GroupBy = 'tg.ID'; } } -if(empty($GroupBy)) { - $GroupBy = "t.ID"; +if (empty($GroupBy)) { + $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 +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 + JOIN torrents_group AS tg ON tg.ID=t.GroupID WHERE $UserField='$UserID' $ExtraWhere $SearchWhere GROUP BY ".$GroupBy." ORDER BY $Order $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, + $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"); + $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']) != '') { + 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)) { + if (!empty($Words)) { $SQL .= " WHERE Name LIKE '%".implode("%' AND Name LIKE '%", $Words)."%'"; } @@ -291,27 +323,27 @@ function header_link($SortKey,$DefaultWay="DESC") { <td class="nobr" colspan="3"> <select id="bitrate" name="bitrate" class="ft_bitrate"> <option value="">Bitrate</option> -<? foreach($Bitrates as $BitrateName) { ?> - <option value="<?=display_str($BitrateName); ?>" <?Format::selected('bitrate', $BitrateName)?>><?=display_str($BitrateName); ?></option> +<? foreach ($Bitrates as $BitrateName) { ?> + <option value="<?=display_str($BitrateName); ?>"<?Format::selected('bitrate', $BitrateName)?>><?=display_str($BitrateName); ?></option> <? } ?> </select> <select name="format" class="ft_format"> <option value="">Format</option> -<? foreach($Formats as $FormatName) { ?> - <option value="<?=display_str($FormatName); ?>" <?Format::selected('format', $FormatName)?>><?=display_str($FormatName); ?></option> +<? foreach ($Formats as $FormatName) { ?> + <option value="<?=display_str($FormatName); ?>"<?Format::selected('format', $FormatName)?>><?=display_str($FormatName); ?></option> <? } ?> - <option value="perfectflac" <?Format::selected('filter', 'perfectflac')?>>Perfect FLACs</option> + <option value="perfectflac"<?Format::selected('filter', 'perfectflac')?>>Perfect FLACs</option> </select> <select name="media" class="ft_media"> <option value="">Media</option> -<? foreach($Media as $MediaName) { ?> - <option value="<?=display_str($MediaName); ?>" <?Format::selected('media',$MediaName)?>><?=display_str($MediaName); ?></option> +<? foreach ($Media as $MediaName) { ?> + <option value="<?=display_str($MediaName); ?>"<?Format::selected('media',$MediaName)?>><?=display_str($MediaName); ?></option> <? } ?> </select> <select name="releasetype" class="ft_releasetype"> <option value="">Release type</option> -<? foreach($ReleaseTypes as $ID=>$Type) { ?> - <option value="<?=display_str($ID); ?>" <?Format::selected('releasetype',$ID)?>><?=display_str($Type); ?></option> +<? foreach ($ReleaseTypes as $ID=>$Type) { ?> + <option value="<?=display_str($ID); ?>"<?Format::selected('releasetype',$ID)?>><?=display_str($Type); ?></option> <? } ?> </select> </td> @@ -320,26 +352,26 @@ function header_link($SortKey,$DefaultWay="DESC") { <td class="label"><strong>Misc:</strong></td> <td class="nobr" colspan="3"> <select name="log" class="ft_haslog"> - <option value="">Has Log</option> - <option value="1" <?Format::selected('log','1')?>>Yes</option> - <option value="0" <?Format::selected('log','0')?>>No</option> - <option value="100" <?Format::selected('log','100')?>>100% only</option> - <option value="-1" <?Format::selected('log','-1')?>><100%/Unscored</option> + <option value="">Has log</option> + <option value="1"<?Format::selected('log','1')?>>Yes</option> + <option value="0"<?Format::selected('log','0')?>>No</option> + <option value="100"<?Format::selected('log','100')?>>100% only</option> + <option value="-1"<?Format::selected('log','-1')?>><100%/unscored</option> </select> <select name="cue" class="ft_hascue"> - <option value="">Has Cue</option> - <option value="1" <?Format::selected('cue',1)?>>Yes</option> - <option value="0" <?Format::selected('cue',0)?>>No</option> + <option value="">Has cue</option> + <option value="1"<?Format::selected('cue',1)?>>Yes</option> + <option value="0"<?Format::selected('cue',0)?>>No</option> </select> <select name="scene" class="ft_scene"> <option value="">Scene</option> - <option value="1" <?Format::selected('scene',1)?>>Yes</option> - <option value="0" <?Format::selected('scene',0)?>>No</option> + <option value="1"<?Format::selected('scene',1)?>>Yes</option> + <option value="0"<?Format::selected('scene',0)?>>No</option> </select> <select name="vanityhouse" class="ft_vanityhouse"> <option value="">Vanity House</option> - <option value="1" <?Format::selected('vanityhouse',1)?>>Yes</option> - <option value="0" <?Format::selected('vanityhouse',0)?>>No</option> + <option value="1"<?Format::selected('vanityhouse',1)?>>Yes</option> + <option value="0"<?Format::selected('vanityhouse',0)?>>No</option> </select> </td> </tr> @@ -347,8 +379,8 @@ function header_link($SortKey,$DefaultWay="DESC") { <td class="label"><strong>Tags:</strong></td> <td> <input type="text" name="tags" size="60" title="Use !tag to exclude tag" value="<?Format::form('tags')?>" />  - <input type="radio" name="tags_type" id="tags_type0" value="0" <?Format::selected('tags_type',0,'checked')?> /><label for="tags_type0"> Any</label>   - <input type="radio" name="tags_type" id="tags_type1" value="1" <?Format::selected('tags_type',1,'checked')?> /><label for="tags_type1"> All</label> + <input type="radio" name="tags_type" id="tags_type0" value="0"<?Format::selected('tags_type',0,'checked')?> /><label for="tags_type0"> Any</label>   + <input type="radio" name="tags_type" id="tags_type1" value="1"<?Format::selected('tags_type',1,'checked')?> /><label for="tags_type1"> All</label> </td> </tr> @@ -356,14 +388,14 @@ function header_link($SortKey,$DefaultWay="DESC") { <td class="label"><strong>Order by</strong></td> <td> <select name="order" class="ft_order_by"> -<? foreach($Orders as $OrderText) { ?> - <option value="<?=$OrderText?>" <?Format::selected('order', $OrderText)?>><?=$OrderText?></option> -<? }?> +<? foreach ($Orders as $OrderText) { ?> + <option value="<?=$OrderText?>"<?Format::selected('order', $OrderText)?>><?=$OrderText?></option> +<? } ?> </select>  <select name="way" class="ft_order_way"> -<? foreach($Ways as $WayKey=>$WayText) { ?> - <option value="<?=$WayKey?>" <?Format::selected('way', $WayKey)?>><?=$WayText?></option> -<? }?> +<? foreach ($Ways as $WayKey=>$WayText) { ?> + <option value="<?=$WayKey?>"<?Format::selected('way', $WayKey)?>><?=$WayText?></option> +<? } ?> </select> </td> </tr> @@ -371,11 +403,11 @@ function header_link($SortKey,$DefaultWay="DESC") { <table class="layout cat_list"> <? -$x=0; +$x = 0; reset($Categories); -foreach($Categories as $CatKey => $CatName) { - if($x%7==0) { - if($x > 0) { +foreach ($Categories as $CatKey => $CatName) { + if ($x % 7 == 0) { + if ($x > 0) { ?> </tr> <? } ?> @@ -385,8 +417,8 @@ function header_link($SortKey,$DefaultWay="DESC") { $x++; ?> <td> - <input type="checkbox" name="categories[<?=($CatKey+1)?>]" id="cat_<?=($CatKey+1)?>" value="1"<? if(isset($_GET['categories'][$CatKey+1])) { ?> checked="checked"<? } ?> /> - <label for="cat_<?=($CatKey+1)?>"><?=$CatName?></label> + <input type="checkbox" name="categories[<?=($CatKey+1)?>]" id="cat_<?=($CatKey+1)?>" value="1"<? if (isset($_GET['categories'][$CatKey + 1])) { ?> checked="checked"<? } ?> /> + <label for="cat_<?=($CatKey + 1)?>"><?=$CatName?></label> </td> <? } @@ -398,7 +430,7 @@ function header_link($SortKey,$DefaultWay="DESC") { </div> </form> </div> -<? if(count($GroupIDs) == 0) { ?> +<? if (count($GroupIDs) == 0) { ?> <div class="center"> Nothing found! </div> @@ -422,7 +454,7 @@ function header_link($SortKey,$DefaultWay="DESC") { </tr> <? $Results = $Results['matches']; - foreach($TorrentsInfo as $TorrentID => $Info) { + foreach ($TorrentsInfo as $TorrentID => $Info) { list($GroupID, , $Time) = array_values($Info); extract(Torrents::array_group($Results[$GroupID])); @@ -435,17 +467,21 @@ function header_link($SortKey,$DefaultWay="DESC") { unset($ExtendedArtists[2]); unset($ExtendedArtists[3]); $DisplayName = Artists::display_artists($ExtendedArtists); - } elseif(!empty($Artists)) { + } elseif (!empty($Artists)) { $DisplayName = Artists::display_artists(array(1=>$Artists)); } else { - $DisplayName=''; + $DisplayName = ''; } $DisplayName.='<a href="torrents.php?id='.$GroupID.'&torrentid='.$TorrentID.'" title="View Torrent" dir="ltr">'.$GroupName.'</a>'; - if($GroupYear>0) { $DisplayName.=" [".$GroupYear."]"; } - if($GroupVanityHouse) { $DisplayName .= ' [<abbr title="This is a vanity house release">VH</abbr>]'; } + if ($GroupYear > 0) { + $DisplayName.=" [$GroupYear]"; + } + if ($GroupVanityHouse) { + $DisplayName .= ' [<abbr title="This is a Vanity House release">VH</abbr>]'; + } $ExtraInfo = Torrents::torrent_info($Torrent); - if($ExtraInfo) { + if ($ExtraInfo) { $DisplayName.=' - '.$ExtraInfo; } ?> @@ -471,7 +507,7 @@ function header_link($SortKey,$DefaultWay="DESC") { <td class="nobr"><?=time_diff($Time,1)?></td> <td class="nobr"><?=Format::get_size($Torrent['Size'])?></td> <td><?=number_format($Torrent['Snatched'])?></td> - <td<?=($Torrent['Seeders']==0)?' class="r00"':''?>><?=number_format($Torrent['Seeders'])?></td> + <td<?=($Torrent['Seeders'] == 0) ? ' class="r00"' : ''?>><?=number_format($Torrent['Seeders'])?></td> <td><?=number_format($Torrent['Leechers'])?></td> </tr> <? } ?> diff --git a/sections/user/edit.php b/sections/user/edit.php index f2d754e7..752235d1 100644 --- a/sections/user/edit.php +++ b/sections/user/edit.php @@ -156,7 +156,7 @@ function checked($Checked) { </td> </tr> <tr> - <td class="label"><strong>Sort/Hide release types</strong></td> + <td class="label"><strong>Sort/hide release types</strong></td> <td> <noscript>Please enable JavaScript to use these options.</noscript> <a href="#" id="toggle_sortable" class="brackets">Expand</a> diff --git a/sections/user/takeinvite.php b/sections/user/takeinvite.php index 8d2d520d..df9e3b93 100644 --- a/sections/user/takeinvite.php +++ b/sections/user/takeinvite.php @@ -26,7 +26,7 @@ $Email = $_POST['email']; $Username = $LoggedUser['Username']; $SiteName = SITE_NAME; -$SiteURL = NONSSL_SITE_URL; +$SiteURL = SSL_SITE_URL; $InviteExpires = time_plus(60*60*24*3); // 3 days //MultiInvite @@ -61,7 +61,7 @@ To confirm your invite, click on the following link: -http://$SiteURL/register.php?invite=$InviteKey +https://$SiteURL/register.php?invite=$InviteKey After you register, you will be able to use your account. Please take note that if you do not use this invite in the next 3 days, it will expire. We urge you to read the RULES and the wiki immediately after you join. diff --git a/sections/user/takemoderate.php b/sections/user/takemoderate.php index 4d9c4155..874e222b 100644 --- a/sections/user/takemoderate.php +++ b/sections/user/takemoderate.php @@ -351,17 +351,17 @@ } if ($Uploaded != $Cur['Uploaded'] && $Uploaded != $_POST['OldUploaded'] && (check_perms('users_edit_ratio') - || (check_perms('users_edit_own_ratio') && $UserID == $LoggedUser['ID']))) { - $UpdateSet[] = "Uploaded='".$Uploaded."'"; - $EditSummary[] = "uploaded changed from ".Format::get_size($Cur['Uploaded'])." to ".Format::get_size($Uploaded); - $Cache->delete_value('users_stats_'.$UserID); + || (check_perms('users_edit_own_ratio') && $UserID == $LoggedUser['ID']))) { + $UpdateSet[] = "Uploaded='".$Uploaded."'"; + $EditSummary[] = "uploaded changed from ".Format::get_size($Cur['Uploaded'])." to ".Format::get_size($Uploaded); + $Cache->delete_value('users_stats_'.$UserID); } if ($Downloaded != $Cur['Downloaded'] && $Downloaded != $_POST['OldDownloaded'] && (check_perms('users_edit_ratio') - || (check_perms('users_edit_own_ratio') && $UserID == $LoggedUser['ID']))) { - $UpdateSet[] = "Downloaded='".$Downloaded."'"; - $EditSummary[] = "downloaded changed from ".Format::get_size($Cur['Downloaded'])." to ".Format::get_size($Downloaded); - $Cache->delete_value('users_stats_'.$UserID); + || (check_perms('users_edit_own_ratio') && $UserID == $LoggedUser['ID']))) { + $UpdateSet[] = "Downloaded='".$Downloaded."'"; + $EditSummary[] = "downloaded changed from ".Format::get_size($Cur['Downloaded'])." to ".Format::get_size($Downloaded); + $Cache->delete_value('users_stats_'.$UserID); } if ($FLTokens != $Cur['FLTokens'] && (check_perms('users_edit_ratio') || (check_perms('users_edit_own_ratio') && $UserID == $LoggedUser['ID']))) { diff --git a/sections/userhistory/email_history.php b/sections/userhistory/email_history.php index 0291c6a6..ebbd077f 100644 --- a/sections/userhistory/email_history.php +++ b/sections/userhistory/email_history.php @@ -12,12 +12,14 @@ $UserID = $_GET['userid']; -if (!is_number($UserID)) { error(404); } +if (!is_number($UserID)) { + error(404); +} $DB->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"); list($Joined, $Class) = $DB->next_record(); -if(!check_perms('users_view_email', $Class)) { +if (!check_perms('users_view_email', $Class)) { error(403); } @@ -29,23 +31,23 @@ if ($UsersOnly == 1) { $DB->query("SELECT - u.Email, - '".sqltime()."' AS Time, - u.IP, - c.Code - FROM users_main AS u + 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 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'*/." + 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 @@ -54,7 +56,7 @@ 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 + 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, @@ -62,7 +64,7 @@ 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 + 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"); } @@ -84,7 +86,7 @@ ?> </tr> <? -foreach($History as $Key => $Values){ +foreach ($History as $Key => $Values){ if (isset($History[$Key+1])) { $Values['Time'] = $History[$Key+1]['Time']; } else { @@ -104,7 +106,7 @@ <td /> <td><?=time_diff($Time)?></td> <td><?=display_str($IP)?></td> -<? $UserURL = "http://".NONSSL_SITE_URL."/user.php?id=$UserID2"; +<? $UserURL = "https://".SSL_SITE_URL."/user.php?id=$UserID2"; $DB->query("SELECT Enabled FROM users_main WHERE ID = ".$UserID2); list($Enabled)=$DB->next_record(); $DB->set_query_id($ueQuery); diff --git a/static/functions/artist_cloud.js b/static/functions/artist_cloud.js index 9e5db00b..c8a92e6a 100644 --- a/static/functions/artist_cloud.js +++ b/static/functions/artist_cloud.js @@ -3,11 +3,11 @@ var LIMIT = 10; var artistId, artistName; var artistTags; - $(document).ready(function() { +$(document).ready(function() { initArtistCloud(); - }); +}); function initArtistCloud() { - $("#currentArtist").text(); + $("#currentArtist").text(); artistTags = $("#artistTags").find('ul'); artistName = $("#content").find("h2:first").text(); @@ -20,16 +20,16 @@ function initArtistCloud() { function loadArtists() { $.getJSON('ajax.php?action=similar_artists&id='+artistId+'&limit='+LIMIT, function(data) { var first = true; - var ratio; + var ratio; $.each(data, function(key, val) { - if(first) { + if (first) { ratio = val['score'] / 300; first = false; } var score = val['score'] / ratio; score = score <= 150 ? 150 : score; addArtist(val['id'], val['name'], score); - }); + }); createCloud(); }); @@ -37,31 +37,29 @@ function loadArtists() { } function addArtist(id, name, score) { - var item = $('<li><a style="color:#007DC6;" data-weight="' + score + '">' + name + '</a></li>'); + var item = $('<li><a style="color:#007DC6;" data-weight="' + score + '">' + name + '</a></li>'); - - $(item).click(function(e) { - e.preventDefault(); + $(item).click(function(e) { + e.preventDefault(); reinit(id, name); - }); + }); artistTags.append(item); - } function addArtistMain(name) { - var item = $('<li><a style="color:#007DC6;" data-weight="350">' + name + '</a></li>'); + var item = $('<li><a style="color: #007DC6;" data-weight="350">' + name + '</a></li>'); $("#currentArtist").attr('href', 'artist.php?id=' + artistId); $("#currentArtist").text(artistName); $(item).click(function(e) { - e.preventDefault(); + e.preventDefault(); reinit(artistId, name); - }); + }); - artistTags.append(item); + artistTags.append(item); } function reinit(id, name) { @@ -73,38 +71,34 @@ function reinit(id, name) { } function createCloud() { - if(!$('#similarArtistsCanvas').tagcanvas({ - - // textFont: 'Impact,"Arial Black",sans-serif', - wheelZoom: false, - freezeActive: true, - weightSize:0.15, - interval:20, - textFont: null, - textColour: null, - textHeight: 25, - outlineColour:'#f96', - outlineThickness:4, - maxSpeed:0.04, - minBrightness:0.1, - depth:0.92, - pulsateTo:0.2, - pulsateTime:0.75, - initial:[0.1,-0.1], - decel:0.98, - reverse:true, - shadow:'#ccf', - shadowBlur:3, - weight : true, - weightFrom:'data-weight' - - },'artistTags')) { - // something went wrong, hide the canvas container - $('#flip_view_2').hide(); - } + if (!$('#similarArtistsCanvas').tagcanvas({ + // textFont: 'Impact,"Arial Black",sans-serif', + wheelZoom: false, + freezeActive: true, + weightSize: 0.15, + interval: 20, + textFont: null, + textColour: null, + textHeight: 25, + outlineColour: '#f96', + outlineThickness: 4, + maxSpeed: 0.04, + minBrightness: 0.1, + depth: 0.92, + pulsateTo: 0.2, + pulsateTime: 0.75, + initial: [0.1,-0.1], + decel: 0.98, + reverse: true, + shadow: '#ccf', + shadowBlur: 3, + weight : true, + weightFrom: 'data-weight' + },'artistTags')) { + // something went wrong, hide the canvas container + $('#flip_view_2').hide(); + } } - } ) ( jQuery ); - diff --git a/static/functions/detect_mobile.js b/static/functions/detect_mobile.js index cc83cd01..5164e2b7 100644 --- a/static/functions/detect_mobile.js +++ b/static/functions/detect_mobile.js @@ -4,77 +4,68 @@ var MOBILE_SITE_URL = "https://m.what.cd/"; var ANDROID_APP_URL = "http://bit.ly/git_wa_stable"; var isMobile = { - Android: function() { - return navigator.userAgent.match(/Android/i) ? true : false; - }, - BlackBerry: function() { - return navigator.userAgent.match(/BlackBerry/i) ? true : false; - }, - iOS: function() { - return navigator.userAgent.match(/iPhone|iPad|iPod/i) ? true : false; - }, - Windows: function() { - return navigator.userAgent.match(/IEMobile/i) ? true : false; - }, - Any: function() { - return (isMobile.Android() || isMobile.BlackBerry() || isMobile.iOS() || isMobile.Windows()); - }, - NotAndroid: function() { + Android: function() { + return navigator.userAgent.match(/Android/i) ? true : false; + }, + BlackBerry: function() { + return navigator.userAgent.match(/BlackBerry/i) ? true : false; + }, + iOS: function() { + return navigator.userAgent.match(/iPhone|iPad|iPod/i) ? true : false; + }, + Windows: function() { + return navigator.userAgent.match(/IEMobile/i) ? true : false; + }, + Any: function() { + return (isMobile.Android() || isMobile.BlackBerry() || isMobile.iOS() || isMobile.Windows()); + }, + NotAndroid: function() { return (isMobile.BlackBerry() || isMobile.iOS() || isMobile.Windows()); - } + } }; -if(isMobile.Android()) { - if(!hasCookie(ANDROID_COOKIE_NAME)) { +if (isMobile.Android()) { + if (!hasCookie(ANDROID_COOKIE_NAME)) { setCookie(ANDROID_COOKIE_NAME, true, 365); - var result=confirm("An Android App is available for What.CD, would you like to download it?"); - if (result==true) { - window.location = ANDROID_APP_URL; - } + var result = confirm("An Android App is available for What.CD, would you like to download it?"); + if (result == true) { + window.location = ANDROID_APP_URL; + } } -} - -else if(isMobile.NotAndroid()) { - if(!hasCookie(OTHER_COOKIE_NAME)) { - setCookie(OTHER_COOKIE_NAME, true, 365); - var result=confirm("A mobile version of What.CD is available, would you like to use it?"); - if (result==true) { +} else if (isMobile.NotAndroid()) { + if (!hasCookie(OTHER_COOKIE_NAME)) { + setCookie(OTHER_COOKIE_NAME, true, 365); + var result = confirm("A mobile version of What.CD is available, would you like to use it?"); + if (result == true) { window.location = MOBILE_SITE_URL; - } + } } } -function setCookie(c_name,value,exdays) -{ -var exdate=new Date(); -exdate.setDate(exdate.getDate() + exdays); -var c_value=escape(value) + ((exdays==null) ? "" : "; expires="+exdate.toUTCString()); -document.cookie=c_name + "=" + c_value; +function setCookie(c_name,value,exdays) { + var exdate = new Date(); + exdate.setDate(exdate.getDate() + exdays); + var c_value = escape(value) + ((exdays == null) ? "" : "; expires=" + exdate.toUTCString()); + document.cookie = c_name + "=" + c_value; } -function getCookie(c_name) -{ -var i,x,y,ARRcookies=document.cookie.split(";"); -for (i=0;i<ARRcookies.length;i++) -{ - x=ARRcookies[i].substr(0,ARRcookies[i].indexOf("=")); - y=ARRcookies[i].substr(ARRcookies[i].indexOf("=")+1); - x=x.replace(/^\s+|\s+$/g,""); - if (x==c_name) - { - return unescape(y); - } - } +function getCookie(c_name) { + var i,x,y,ARRcookies=document.cookie.split(";"); + for (i = 0; i < ARRcookies.length; i++) { + x = ARRcookies[i].substr(0,ARRcookies[i].indexOf("=")); + y = ARRcookies[i].substr(ARRcookies[i].indexOf("=")+1); + x = x.replace(/^\s+|\s+$/g,""); + if (x == c_name) { + return unescape(y); + } + } } - -function hasCookie(c_name) -{ -var checked=getCookie(c_name); - if (checked != null) - { - return true; - } - return false; +function hasCookie(c_name) { + var checked=getCookie(c_name); + if (checked != null) { + return true; + } + return false; } diff --git a/static/functions/global.js b/static/functions/global.js index dae8093f..417fd1a4 100644 --- a/static/functions/global.js +++ b/static/functions/global.js @@ -1,7 +1,11 @@ function toggleChecks(formElem,masterElem) { - if (masterElem.checked) { checked=true; } else { checked=false; } - for(s=0; s<$('#'+formElem).raw().elements.length; s++) { - if ($('#'+formElem).raw().elements[s].type=="checkbox") { + if (masterElem.checked) { + checked = true; + } else { + checked = false; + } + for (s = 0; s < $('#'+formElem).raw().elements.length; s++) { + if ($('#'+formElem).raw().elements[s].type == "checkbox") { $('#'+formElem).raw().elements[s].checked=checked; } } @@ -10,23 +14,23 @@ function toggleChecks(formElem,masterElem) { //Lightbox stuff /* - * If loading from a thumbnail the lightbox is shown first with a "loading" screen - * while the full size image loads, then the html of the lightbox is replaced with the image. + * If loading from a thumbnail, the lightbox is shown first with a "loading" screen + * while the full size image loads, then the HTML of the lightbox is replaced with the image. */ var lightbox = { init: function (image, size) { - if(typeof(image)=='string') { + if (typeof(image) == 'string') { $('#lightbox').show().listen('click',lightbox.unbox).raw().innerHTML = - '<p size="7" style="color:gray;font-size:50px">Loading...<p>'; - $('#curtain').show().listen('click',lightbox.unbox); - var src = image; - image = new Image(); + '<p size="7" style="color: gray; font-size: 50px;">Loading...<p>'; + $('#curtain').show().listen('click',lightbox.unbox); + var src = image; + image = new Image(); image.onload = function() { lightbox.box_async(image); } - image.src = src; - } + image.src = src; + } if (image.naturalWidth === undefined) { var tmp = document.createElement('img'); tmp.style.visibility = 'hidden'; @@ -40,23 +44,23 @@ var lightbox = { }, box: function (image) { var hasA = false; - if(image.parentNode != null && image.parentNode.tagName.toUpperCase() == 'A') { + if (image.parentNode != null && image.parentNode.tagName.toUpperCase() == 'A') { hasA = true; } - if(!hasA) { + if (!hasA) { $('#lightbox').show().listen('click',lightbox.unbox).raw().innerHTML = '<img src="' + image.src + '" />'; $('#curtain').show().listen('click',lightbox.unbox); } }, box_async: function (image) { - var hasA = false; - if(image.parentNode != null && image.parentNode.tagName.toUpperCase() == 'A') { - hasA = true; - } - if(!hasA) { - $('#lightbox').raw().innerHTML = '<img src="' + image.src + '" />'; - } - }, + var hasA = false; + if (image.parentNode != null && image.parentNode.tagName.toUpperCase() == 'A') { + hasA = true; + } + if (!hasA) { + $('#lightbox').raw().innerHTML = '<img src="' + image.src + '" />'; + } + }, unbox: function (data) { $('#curtain').hide(); $('#lightbox').hide().raw().innerHTML = ''; @@ -81,14 +85,14 @@ function caps_check(e) { */ function hexify(str) { - str = str.replace(/rgb\(|\)/g, "").split(","); - str[0] = parseInt(str[0], 10).toString(16).toLowerCase(); - str[1] = parseInt(str[1], 10).toString(16).toLowerCase(); - str[2] = parseInt(str[2], 10).toString(16).toLowerCase(); - str[0] = (str[0].length == 1) ? '0' + str[0] : str[0]; - str[1] = (str[1].length == 1) ? '0' + str[1] : str[1]; - str[2] = (str[2].length == 1) ? '0' + str[2] : str[2]; - return (str.join("")); + str = str.replace(/rgb\(|\)/g, "").split(","); + str[0] = parseInt(str[0], 10).toString(16).toLowerCase(); + str[1] = parseInt(str[1], 10).toString(16).toLowerCase(); + str[2] = parseInt(str[2], 10).toString(16).toLowerCase(); + str[0] = (str[0].length == 1) ? '0' + str[0] : str[0]; + str[1] = (str[1].length == 1) ? '0' + str[1] : str[1]; + str[2] = (str[2].length == 1) ? '0' + str[2] : str[2]; + return (str.join("")); } function resize(id) { @@ -106,9 +110,9 @@ function add_selection() { var listitem = document.createElement("li"); listitem.id = 'list' + selected.value; listitem.innerHTML = ' <input type="hidden" name="list[]" value="'+selected.value+'" /> ' + -' <span style="float:left;">'+selected.innerHTML+'</span>' + -' <a href="#" onclick="remove_selection(\''+selected.value+'\');return false;" style="float:right;" class="brackets">X</a>' + -' <br style="clear:all;" />'; +' <span style="float: left;">'+selected.innerHTML+'</span>' + +' <a href="#" onclick="remove_selection(\''+selected.value+'\');return false;" style="float: right;" class="brackets">X</a>' + +' <br style="clear: all;" />'; $('#list').raw().appendChild(listitem); $('#opt' + selected.value).raw().disabled = true; } diff --git a/static/functions/torrent.js b/static/functions/torrent.js index c7981d28..2e309436 100644 --- a/static/functions/torrent.js +++ b/static/functions/torrent.js @@ -1,9 +1,9 @@ function ChangeCategory(catid) { - if(catid == 1) { + if (catid == 1) { $('#split_releasetype').show(); $('#split_artist').show(); $('#split_year').show(); - } else if(catid == 4 || catid == 6) { + } else if (catid == 4 || catid == 6) { $('#split_releasetype').hide(); $('#split_year').show(); $('#split_artist').hide(); @@ -16,15 +16,15 @@ function ChangeCategory(catid) { function ArtistManager() { var GroupID = window.location.search.match(/[?&]id=(\d+)/); - if(typeof GroupID == 'undefined') { + if (typeof GroupID == 'undefined') { return; } else { GroupID = GroupID[1]; } var ArtistList; - if(!(ArtistList = $('#artist_list').raw())) { + if (!(ArtistList = $('#artist_list').raw())) { return false; - } else if($('#artistmanager').raw()) { + } else if ($('#artistmanager').raw()) { $('#artistmanager').toggle(); $('#artist_list').toggle(); } else { @@ -58,7 +58,7 @@ function ArtistManager() { importance = 7; break; } - if(elArtistList.children[i].children[0].tagName.toUpperCase() == 'A') { + if (elArtistList.children[i].children[0].tagName.toUpperCase() == 'A') { var ArtistID = elArtistList.children[i].children[0].href.match(/[?&]id=(\d+)/)[1]; var elBox = document.createElement('input'); elBox.type = 'checkbox'; @@ -67,7 +67,7 @@ function ArtistManager() { elBox.value = importance+';'+ArtistID; elBox.onclick = function(e) { SelectArtist(e,this); }; elArtistList.children[i].insertBefore(elBox, elArtistList.children[i].children[0]); - if(importance == 1 || importance == 4 || importance == 6) { + if (importance == 1 || importance == 4 || importance == 6) { MainArtistCount++; } } @@ -161,11 +161,11 @@ function ArtistManager() { } function SelectArtist(e,obj) { - if(window.event) { + if (window.event) { e = window.event; } EndBox = Number(obj.id.substr(17)); - if(!e.shiftKey || typeof StartBox == 'undefined') { + if (!e.shiftKey || typeof StartBox == 'undefined') { StartBox = Number(obj.id.substr(17)); } Dir = (EndBox > StartBox ? 1 : -1); @@ -181,19 +181,19 @@ function ArtistManagerSubmit() { var Selection = new Array(); var MainSelectionCount = 0; for(var i = 0, boxes = $('[name="artistmanager_box"]'); boxes.raw(i); i++) { - if(boxes.raw(i).checked) { + if (boxes.raw(i).checked) { Selection.push(boxes.raw(i).value); - if(boxes.raw(i).value.substr(0,1) == '1') { + if (boxes.raw(i).value.substr(0,1) == '1') { MainSelectionCount++; } } } - if(Selection.length == 0 || ($('#manager_action').raw().value == 'delete' && !confirm('Are you sure you want to delete '+Selection.length+' artists from this group?'))) { + if (Selection.length == 0 || ($('#manager_action').raw().value == 'delete' && !confirm('Are you sure you want to delete '+Selection.length+' artists from this group?'))) { return; } $('#artists_selection').raw().value = Selection.join(','); - if((($('#artists_importance').raw().value != 1 && $('#artists_importance').raw().value != 4 && $('#artists_importance').raw().value != 6) || $('#manager_action').raw().value == 'delete') && MainSelectionCount == MainArtistCount) { - if(!$('.error_message').raw()) { + if ((($('#artists_importance').raw().value != 1 && $('#artists_importance').raw().value != 4 && $('#artists_importance').raw().value != 6) || $('#manager_action').raw().value == 'delete') && MainSelectionCount == MainArtistCount) { + if (!$('.error_message').raw()) { error_message('All groups need to have at least one main artist, composer, or DJ.'); } $('.error_message').raw().scrollIntoView(); @@ -209,16 +209,16 @@ function ArtistManagerDelete() { } function Vote(amount, requestid) { - if(typeof amount == 'undefined') { + if (typeof amount == 'undefined') { amount = parseInt($('#amount').raw().value); } - if(amount == 0) { + if (amount == 0) { amount = 20 * 1024 * 1024; } var index; var votecount; - if(!requestid) { + if (!requestid) { requestid = $('#requestid').raw().value; votecount = $('#votecount').raw(); index = false; @@ -229,7 +229,7 @@ function Vote(amount, requestid) { } ajax.get('requests.php?action=takevote&id=' + requestid + '&auth=' + authkey + '&amount=' + amount, function (response) { - if(response == 'bankrupt') { + if (response == 'bankrupt') { error_message("You do not have sufficient upload credit to add " + get_size(amount) + " to this request"); return; } else if (response == 'dupesuccess') { @@ -238,7 +238,7 @@ function Vote(amount, requestid) { votecount.innerHTML = (parseInt(votecount.innerHTML)) + 1; } - if($('#total_bounty').results() > 0) { + if ($('#total_bounty').results() > 0) { totalBounty = parseInt($('#total_bounty').raw().value); totalBounty += (amount * (1 - $('#request_tax').raw().value)); $('#total_bounty').raw().value = totalBounty;