From ddbdda3a437e82ced4c18ce18cf81fb9b4841986 Mon Sep 17 00:00:00 2001 From: Git Date: Thu, 18 Jul 2013 08:00:51 +0000 Subject: [PATCH] Empty commit --- classes/users.class.php | 9 ++++++--- irc_raw.php | 2 +- sections/better/better.php | 2 +- sections/chat/index.php | 2 +- sections/collages/new.php | 2 +- sections/login/disabled.php | 4 ++-- sections/reportsv2/array.php | 4 +++- sections/rules/upload.php | 6 +++--- sections/staffblog/index.php | 21 +++++++++++---------- 9 files changed, 29 insertions(+), 23 deletions(-) diff --git a/classes/users.class.php b/classes/users.class.php index 9e82aa8f..dc7e77d5 100644 --- a/classes/users.class.php +++ b/classes/users.class.php @@ -297,7 +297,7 @@ public static function release_order(&$SiteOptions, $Default = false) { $Defaults = !empty($SiteOptions['HideTypes']); } else { $Sort =& $SiteOptions['SortHide']; - $MissingTypes = array_diff_key($ReleaseTypes, $Sort); + $MissingTypes = array_diff_key($RT, $Sort); if (!empty($MissingTypes)) { foreach (array_keys($MissingTypes) as $Missing) { $Sort[$Missing] = 0; @@ -309,11 +309,14 @@ public static function release_order(&$SiteOptions, $Default = false) { if (isset($Defaults)) { $Checked = ($Defaults && isset($SiteOptions['HideTypes'][$Key]) ? ' checked="checked"' : ''); } else { + if (!isset($RT[$Key])) { + continue; + } $Checked = ($Val ? ' checked="checked"' : ''); - $Val = (isset($RT[$Key]) ? $RT[$Key] : 'Error'); + $Val = $RT[$Key]; } - $ID = "$Key_" . (int) !!$Checked; + $ID = $Key . '_' . (int) !!$Checked; // The HTML is indented this far for proper indentation in the generated HTML // on user.php?action=edit diff --git a/irc_raw.php b/irc_raw.php index dffae686..8d0c5f0a 100644 --- a/irc_raw.php +++ b/irc_raw.php @@ -3,7 +3,7 @@ die('CLI Only.'); } -define('SERVER', 'irc.what.cd'); +define('SERVER', BOT_SERVER); define('PORT', 6667); define('NICK', 'RawBot'); define('WATCH', '#raw-input'); diff --git a/sections/better/better.php b/sections/better/better.php index 84245bbd..726cc0fa 100644 --- a/sections/better/better.php +++ b/sections/better/better.php @@ -5,7 +5,7 @@

Pursuit of Perfection

-

Here at What.CD, we believe that there's always room for improvement. To aid our effort in the pursuit of perfection, we've put together a few simple lists that can help you build ratio and help us improve our overall quality. Most lists feature 100 torrents at a time and update every 15 minutes.

+

Here at , we believe that there's always room for improvement. To aid our effort in the pursuit of perfection, we've put together a few simple lists that can help you build ratio and help us improve our overall quality. Most lists feature 100 torrents at a time and update every 15 minutes.

Lists

diff --git a/sections/chat/index.php b/sections/chat/index.php index d254f266..bab9dabc 100644 --- a/sections/chat/index.php +++ b/sections/chat/index.php @@ -41,7 +41,7 @@ $nick = $LoggedUser['Username']; $nick = preg_replace('/[^a-zA-Z0-9\[\]\\`\^\{\}\|_]/', '', $nick); if (strlen($nick) == 0) { - $nick = 'WhatGuest????'; + $nick = SITE_NAME.'Guest????'; } else { if (is_numeric(substr($nick, 0, 1))) { $nick = '_' . $nick; diff --git a/sections/collages/new.php b/sections/collages/new.php index a75a0155..c0d7f519 100644 --- a/sections/collages/new.php +++ b/sections/collages/new.php @@ -64,7 +64,7 @@
  • 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, Top 10, etc.).
  • Personal - You can put whatever you want here. It is your own personal collage.
    • diff --git a/sections/login/disabled.php b/sections/login/disabled.php index d5fe7405..9ad9a7e5 100644 --- a/sections/login/disabled.php +++ b/sections/login/disabled.php @@ -42,7 +42,7 @@ function toggle_visibility(id) { $Nick = $_POST['username']; $Nick = preg_replace('/[^a-zA-Z0-9\[\]\\`\^\{\}\|_]/', '', $Nick); if (strlen($Nick) == 0) { - $Nick = 'WhatGuest????'; + $Nick = SITE_NAME.'Guest????'; } else { if (is_numeric(substr($Nick, 0, 1))) { $Nick = '_' . $Nick; @@ -59,7 +59,7 @@ function toggle_visibility(id) {
    - + diff --git a/sections/reportsv2/array.php b/sections/reportsv2/array.php index 914e6e95..0619bcd2 100644 --- a/sections/reportsv2/array.php +++ b/sections/reportsv2/array.php @@ -889,8 +889,10 @@ 'upload' => '0', 'warn' => '1', 'delete' => '1', - 'pm' => '[rule]3.3[/rule]. 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' => '[rule]3.3[/rule]. No radio talk shows or podcasts are allowed. 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.' + ) ) ), diff --git a/sections/rules/upload.php b/sections/rules/upload.php index 7e750299..6b5f75cc 100644 --- a/sections/rules/upload.php +++ b/sections/rules/upload.php @@ -166,7 +166,7 @@
  • ↑_ 2.1.11. Music ripped from the radio (Satellite or FM), television, the web, or podcasts are not allowed. See this wiki for the difference between web rips and the WEB category.
  • ↑_ 2.1.12. 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 2.6.3).
  • ↑_ 2.1.13. Tape (VHS, Video-8, etc.) music sources are not allowed, except for cassette rips and certain soundboards. See 2.6 for further information.
    • -
  • ↑_ 2.1.14. The WEB media category is for digital downloads only. Digital downloads released only on the internet from internet sources cannot be given the CD media label on the upload page. This includes downloads from the iTunes Store, LiveDownloads, Beatport, Amazon.com, Rhapsody, and other web stores. Scene releases with no source information must be labeled as WEB. Freely available music with no source information must also be labeled as WEB. If possible, indicate the source of your files (e.g., the specific web store) in the torrent description. You are responsible for determining whether the downloaded files conform to What.CD's rules for music quality. Note: Do not confuse WEB-sourced files with web rips (see this wiki). WEB media torrents are not always web rips (meaning transcodes). Please check the spectrals before assuming that they are web rips.
    • +
  • ↑_ 2.1.14. The WEB media category is for digital downloads only. Digital downloads released only on the internet from internet sources cannot be given the CD media label on the upload page. This includes downloads from the iTunes Store, LiveDownloads, Beatport, Amazon.com, Rhapsody, and other web stores. Scene releases with no source information must be labeled as WEB. Freely available music with no source information must also be labeled as WEB. If possible, indicate the source of your files (e.g., the specific web store) in the torrent description. You are responsible for determining whether the downloaded files conform to 's rules for music quality. Note: Do not confuse WEB-sourced files with web rips (see this wiki). WEB media torrents are not always web rips (meaning transcodes). Please check the spectrals before assuming that they are web rips.
  • ↑_ 2.1.15. WEB uploads must be uploaded at the bit depths and sampling rates they were sold at. WEB uploads of the same audio with different sampling rates or bit depths may coexist if that is how they are sold or distributed. This means that if, for example, an album is sold with a bit depth of 24 bits and a sampling rate of 88.2 kHz, it must be uploaded directly with no modifications to the audio stream. An existing WEB upload of the same material with a bit depth of 24 and a sampling rate of 96 kHz may coexist with the new 24/88.2 upload but does not trump it. See 2.1.6.2 for more information.
  • ↑_ 2.1.16. User-made compilations are not allowed.
      @@ -241,7 +241,7 @@
  • ↑_ 2.2.10.2. A FLAC torrent without a log (or with a log from a non-EAC or non-XLD ripping tool like dBpoweramp or Rubyripper) may be trumped by a FLAC torrent with a log from an approved ripping tool that scores either 100% or <100% because of non-audio deductions. For example, an EAC log that scores 50% (because of CRC mismatches or other audio deductions) cannot trump a Rubyripper log. See this wiki for more information on approved ripping tools. Also, see this wiki for setting up EAC and this wiki for ripping with EAC. See this wiki for ripping with XLD. Please make sure the log file has the ".log" extension so that it can display properly on the torrent page.
    • -
  • ↑_ 2.2.10.3. A FLAC upload with an EAC or XLD rip log that scores 100% on the log checker replaces one with a lower score. No log scoring less than 100% can trump an already existing one that scores under 100%. For example, a FLAC+log rip that scores 50% in the log checker cannot be trumped by a FLAC+log rip that scores 80%. What.CD recommends this guide for EAC, and this guide for XLD. See this wiki for more information on the site log checker. 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 this wiki.
    • +
  • ↑_ 2.2.10.3. A FLAC upload with an EAC or XLD rip log that scores 100% on the log checker replaces one with a lower score. No log scoring less than 100% can trump an already existing one that scores under 100%. For example, a FLAC+log rip that scores 50% in the log checker cannot be trumped by a FLAC+log rip that scores 80%. recommends this guide for EAC, and this guide for XLD. See this wiki for more information on the site log checker. 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 this wiki.
  • ↑_ 2.2.10.4. A FLAC upload with only non-audio deductions in the log (see this wiki) may replace a FLAC upload with a log that scores 0% or contains audio deductions. For example, a range rip that has AccurateRip scores of two or higher and assorted non-audio deductions (e.g., burst mode, audio cache, pre-gaps, C2 pointers, etc.) can trump a log that has audio deductions for mismatching CRCs.
  • ↑_ 2.2.10.5. XLD and EAC logs in languages other than English require a manual log checker score adjustment by staff. The current log checker cannot parse non-English logs made by EAC and XLD. However, a special exception is made for foreign-language logs since the rip quality is equivalent to English logs. Please report your torrent with the "RP" button and select "Log Rescore Request" for the reason of the report so staff can score your torrent manually. Do not translate the log yourself (see 2.2.10.9).
  • ↑_ 2.2.10.6. Range rips of hidden tracks or regular range rips (acceptable under strict conditions) require manual score adjustment. @@ -525,7 +525,7 @@
  • ↑_ 3.2. No music is permitted in these two categories. They are for spoken word only. See this wiki for more information. For example, if a comedy artist performs a stand-up routine that is recorded on CD, this would be classified as a Comedy album. If this same artist sings some funny songs on an album, this would be classified as a Comedy album. If this same artist produces a music CD with no hint of comedic material (e.g., spoken word tracks), this would be classified as a music album (see 2.1).
    • -
  • ↑_ 3.3. 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.
    • +
  • ↑_ 3.3. No radio talk shows or podcasts are allowed. is primarily a music site, and those recordings do not belong in any torrent category.
  • ↑_ 3.4. Comedy and audiobooks must not be freely available. Free audiobooks and comedy releases from official sources may not be uploaded. Exceptions: Uploads that are at a different bitrate from those freely available are allowed. If a comedy album in 96 kbps CBR MP3 is freely available, you may still upload a V8 (VBR) or higher bitrate torrent of the freely available torrent if it does not already exist on the site.
  • ↑_ 3.5. Releases must be unarchived and consist of a single release. Comedy and audiobook releases should not be archived in a file (e.g., .zip or .rar). The torrent must consist of a directory containing the audio files. Only one release per torrent is allowed. You may not bundle multiple audiobooks or comedy releases into one torrent. See 1.2.7 and 2.1.20.
  • ↑_ 3.6. All comedy and audiobook releases must have an average bitrate of at least 32 kbps. However, higher bitrates are preferred over this minimum requirement. diff --git a/sections/staffblog/index.php b/sections/staffblog/index.php index 64c2ca24..4044d637 100644 --- a/sections/staffblog/index.php +++ b/sections/staffblog/index.php @@ -81,7 +81,7 @@ } View::show_header('Staff Blog','bbcode'); ?> -
    +
    @@ -95,18 +95,20 @@ -

    Title

    - />
    -

    Body

    -
    -

    -
    +
    +

    Title

    + /> +
    +
    +

    Body

    +
    +
    +
    -
    -
    +
    - posted by @@ -145,7 +147,6 @@ full_format($Body)?>
    -