diff --git a/classes/class_time.php b/classes/class_time.php index f955ef16..8032cd3a 100644 --- a/classes/class_time.php +++ b/classes/class_time.php @@ -1,6 +1,6 @@ by default but can optionally return the raw time + difference in text (e.g. "16 hours and 28 minutes", "1 day, 18 hours"). + */ if(!is_number($TimeStamp)) { // Assume that $TimeStamp is SQL timestamp if($TimeStamp == '0000-00-00 00:00:00') { return 'Never'; } $TimeStamp = strtotime($TimeStamp); @@ -20,28 +24,28 @@ function time_diff($TimeStamp,$Levels=2,$Span=true, $Lowercase=false) { if($TimeStamp == 0) { return 'Never'; } $Time = time()-$TimeStamp; - //If the time is negative, then we know that it expires in the future + // If the time is negative, then it expires in the future. if($Time < 0) { $Time = -$Time; $HideAgo = true; } - $Years=floor($Time/31556926); // seconds in a year + $Years=floor($Time/31556926); // seconds in one year $Remain = $Time - $Years*31556926; - $Months = floor($Remain/2629744); // seconds in a month + $Months = floor($Remain/2629744); // seconds in one month $Remain = $Remain - $Months*2629744; - $Weeks = floor($Remain/604800); // seconds in a week + $Weeks = floor($Remain/604800); // seconds in one week $Remain = $Remain - $Weeks*604800; - $Days = floor($Remain/86400); // seconds in a day + $Days = floor($Remain/86400); // seconds in one day $Remain = $Remain - $Days*86400; - $Hours=floor($Remain/3600); + $Hours=floor($Remain/3600); // seconds in one hour $Remain = $Remain - $Hours*3600; - $Minutes=floor($Remain/60); + $Minutes=floor($Remain/60); // seconds in one minute $Remain = $Remain - $Minutes*60; $Seconds=$Remain; diff --git a/classes/permissions_form.php b/classes/permissions_form.php index e8573e9f..6b93e736 100644 --- a/classes/permissions_form.php +++ b/classes/permissions_form.php @@ -35,14 +35,14 @@ 'site_forums_double_post' => 'Can double post in the forums.', 'site_view_flow' => 'Can view stats and data pools.', 'site_view_full_log' => 'Can view old log entries.', - 'site_view_torrent_snatchlist' => 'Can view torrent snatchlists.', + 'site_view_torrent_snatchlist' => 'Can view torrent snatch lists.', 'site_recommend_own' => 'Can recommend own torrents.', 'site_manage_recommendations' => 'Recommendations management access.', 'site_delete_tag' => 'Can delete tags.', 'site_disable_ip_history' => 'Disable IP history.', 'zip_downloader' => 'Download multiple torrents at once.', 'site_debug' => 'Developer access.', - 'site_proxy_images' => 'Image proxy & Anti-Canary.', + 'site_proxy_images' => 'Image proxy & anti-canary.', 'site_search_many' => 'Can go past low limit of search results.', 'users_edit_usernames' => 'Can edit usernames.', @@ -83,8 +83,8 @@ 'torrents_search_fast' => 'Rapid search (for scripts).', 'torrents_hide_dnu' => 'Hide the Do Not Upload list by default.', 'torrents_fix_ghosts' => 'Can fix "ghost" groups on artist pages.', - 'admin_manage_news' => 'Can manage news.', - 'admin_manage_blog' => 'Can manage blog.', + 'admin_manage_news' => 'Can manage site news.', + 'admin_manage_blog' => 'Can manage the site blog.', 'admin_manage_polls' => 'Can manage polls.', 'admin_manage_forums' => 'Can manage forums (add/edit/delete).', 'admin_manage_fls' => 'Can manage FLS.', @@ -100,7 +100,7 @@ 'admin_schedule' => 'Can run the site schedule.', 'admin_login_watch' => 'Can manage login watch.', 'admin_manage_wiki' => 'Can manage wiki access.', - 'admin_update_geoip' => 'Can update geoip data.', + '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.', @@ -108,7 +108,7 @@ '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.' + 'artist_edit_vanityhouse' => 'Can mark artists as part of Vanity House.' ); @@ -149,7 +149,7 @@ function permissions_form(){ ?> - + @@ -224,7 +224,7 @@ function permissions_form(){ ?> - + @@ -239,8 +239,8 @@ function permissions_form(){ ?> - - + + @@ -256,7 +256,7 @@ function permissions_form(){ ?> - + diff --git a/sections/artist/artist.php b/sections/artist/artist.php index 48a5594c..183db10c 100644 --- a/sections/artist/artist.php +++ b/sections/artist/artist.php @@ -703,7 +703,7 @@ function compare($X, $Y){ ?>
  • - > +
    [-] [+] @@ -849,13 +849,14 @@ function compare($X, $Y){
    - 0 ?> diff --git a/sections/collages/collage.php b/sections/collages/collage.php index 782a889b..bec93fac 100644 --- a/sections/collages/collage.php +++ b/sections/collages/collage.php @@ -390,7 +390,7 @@ function compare($X, $Y){ if (check_perms('site_collages_manage') && !$Locked) { ?> [Manage torrents] - [Report Collage] + [Report collage] [Delete] diff --git a/sections/collages/new_handle.php b/sections/collages/new_handle.php index d8ce2fb4..b2f945ad 100644 --- a/sections/collages/new_handle.php +++ b/sections/collages/new_handle.php @@ -40,7 +40,7 @@ if($DB->record_count()) { list($ID, $Deleted) = $DB->next_record(); if($Deleted) { - $Err = 'That collection already exists but needs to be recovered, please contact the staff team!'; + $Err = "That collection already exists but needs to be recovered; please contact the staff team!"; } else { $Err = "That collection already exists: $ID."; } diff --git a/sections/forums/forum.php b/sections/forums/forum.php index 4254071d..3839c122 100644 --- a/sections/forums/forum.php +++ b/sections/forums/forum.php @@ -70,9 +70,9 @@

    Forums >

    - [New Thread] + [New thread] - [Search this Forum] + [Search this forum]
  • - http:///reportsv2.php?view=torrent&id=1 + https:///reportsv2.php?view=torrent&id=1

    • @@ -123,7 +123,7 @@ Reports of torrents within the group with ID = 1
  • - http:///reportsv2.php?view=group&id=1 + https:///reportsv2.php?view=group&id=1

    • @@ -133,7 +133,7 @@ The report with ID = 1
  • - http:///reportsv2.php?view=report&id=1 + https:///reportsv2.php?view=report&id=1

    • @@ -143,7 +143,7 @@ Reports created by
  • - http:///reportsv2.php?view=reporter&id= + https:///reportsv2.php?view=reporter&id=

    • @@ -153,7 +153,7 @@ Reports for torrents uploaded by
  • - http:///reportsv2.php?view=uploader&id= + https:///reportsv2.php?view=uploader&id=

    • @@ -163,7 +163,7 @@ Reports for torrents resolved by
  • - http:///reportsv2.php?view=resolver&id= + https:///reportsv2.php?view=resolver&id=


    • @@ -187,7 +187,7 @@ Staff member Current count - Tasted + Tasted count 's reports - + - + ↑_ 2.1.6. All music torrents must be encoded with a single encoder using the same settings.
  • ↑_ 2.1.7. Use only the allowed container formats for audio files. Use .m4a and .mp4 for AAC, and .flac for FLAC only. All other formats should not be encapsulated in random containers (e.g., FLAC must not be in an Ogg container, MP3 must not be in an .m4a container, and so forth). Exceptions: DTS CD-sourced audio rips, although contained in WAV, should have the .dts extension (see 2.7).
  • ↑_ 2.1.8. Music not sourced from vinyl must not contain pops, clicks, or skips. They will be deleted for rip/encode errors if reported. Music sourced from vinyl must follow the rules found here.
    • -
  • ↑_ 2.1.9. Freely available music is allowed. Uploaded music may be freely available on the web (come from official sources such as record labels, band web sites, or the Internet Archive). Uploads can come from other torrent sites, but you are responsible for determining the audio quality of the music (i.e., that it is not transcoded, that it does not contain an edited log, that it is not a user compilation, etc.). Users are highly encouraged to provide a link to the source of their upload when uploading freely available music. However, this is not required and the lack of such a link to further information is not grounds for reporting a torrent. All freely available music must conform to both quality rules and formatting rules. This means it must be tagged correctly, not be a transcode, have separate tracks, and so forth. Freely available music uploads should have the "WEB" media format if no other source media (e.g., CD, DVD, etc.) can be established for the files.
    • +
  • ↑_ 2.1.9. Freely available music is allowed. Uploaded music may be freely available on the web (come from official sources such as record labels, band web sites, or the Internet Archive). Uploads can come from other torrent sites, but you are responsible for determining the audio quality of the music (e.g., that it is not transcoded, that it does not contain an edited log, that it is not a user compilation, etc.). Users are highly encouraged to provide a link to the source of their upload when uploading freely available music. However, this is not required and the lack of such a link to further information is not grounds for reporting a torrent. All freely available music must conform to both quality rules and formatting rules. This means it must be tagged correctly, not be a transcode, have separate tracks, and so forth. Freely available music uploads should have the "WEB" media format if no other source media (e.g., CD, DVD, etc.) can be established for the files.
  • ↑_ 2.1.10. Clearly label water-marked or voice-over releases. Watermarks or voice-overs must be clearly indicated in the torrent description. The torrent will be deleted for quality misrepresentation if this information is not noted.
  • ↑_ 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).
    • @@ -230,7 +230,7 @@
  • ↑_ 2.1.24. Lossy AAC torrents may only be uploaded when they represent exclusive content not currently available in any other format (e.g., an iTunes WEB exclusive release).
    • -
  • ↑_ 2.1.25. No HDCD content may be uploaded to the site. There are inherent problems with ripping this format, and other forms of high-resolution audio are both more prevalent and preferred at this time (i.e., vinyl, SACD, Blu-ray, etc.). Any CD bearing the HDCD logo can still be ripped using the usual methods for ripping normal audio CDs. See this wiki for more details on the media format.
    • +
  • ↑_ 2.1.25. No HDCD content may be uploaded to the site. There are inherent problems with ripping this format, and other forms of high-resolution audio are both more prevalent and preferred at this time (e.g., vinyl, SACD, Blu-ray, etc.). Any CD bearing the HDCD logo can still be ripped using the usual methods for ripping normal audio CDs. See this wiki for more details on the media format.
  • ↑_ 2.1.26. Downsampling of digital sources is allowed for certain media types. Downsampling of CD sources is strictly prohibited. Downsampling of WEB sources is allowed for audio files sampled at 96 kHz and above. If the WEB source is already sampled at a rate of either 44.1 kHz or 48 kHz you may not downsample the audio files any further. Downsampling of SACD, DVD, or Blu-ray sources is allowed in certain cases. See 2.8.5, 2.7.3, and 2.9.5 for more information.
    • @@ -319,7 +319,7 @@
  • ↑_ 2.2.11.6. Lossy torrents with release information trump unknown release torrents if they share the same tracklist and running order, with one exception. If it can be established that a lossy Unknown Release torrent is a transcode of an Unknown Release FLAC, and the Unknown Release FLAC is moved into an edition whose release information is known as per 2.2.11.5, then all lossy transcodes of it are moved with it and are treated as any other lossy torrents already present in the edition as per 2.2.11.2.
  • ↑_ 2.2.11.7. Bonus disc-only uploads can coexist with the complete set in accordance with the trumping rules. A bonus disc-only release can be trumped by an upload containing the "full" original album + bonus discs, in the same format, in accordance with the usual trumping rules (see 2.4 for the rules specific to bonus materials).
  • ↑_ 2.2.11.8. Unknown Release torrents may be trumped by seemingly identical torrents whose Edition Information can be verified. Torrents marked as "Unknown Release" are eligible to be trumped by rips sourced from the same medium, with the same track listing and running order, whose source Edition Information is provided and can be verified.
    • -
  • ↑_ 2.2.11.9. Only one lossless and two 24-bit lossless vinyl rips are allowed per edition. A poor sounding lossless rip may be trumped by a better sounding lossless rip, regardless of lineage information. The same quality trump can occur for 24-bit lossless rips. To trump an older torrent for a better sounding version, you need to report it with clear information about how your rip sounds better than the other one (i.e., specific tracks where the audio is appreciably improved, specific time points that demonstrate the improvement, etc.). Rips of extremely poor quality may be deleted outright if reported. All quality trumps/deletions of this nature are at the discretion of the moderator involved. See 2.5.
    • +
  • ↑_ 2.2.11.9. Only one lossless and two 24-bit lossless vinyl rips are allowed per edition. A poor sounding lossless rip may be trumped by a better sounding lossless rip, regardless of lineage information. The same quality trump can occur for 24-bit lossless rips. To trump an older torrent for a better sounding version, you need to report it with clear information about how your rip sounds better than the other one (e.g., specific tracks where the audio is appreciably improved, specific time points that demonstrate the improvement, etc.). Rips of extremely poor quality may be deleted outright if reported. All quality trumps/deletions of this nature are at the discretion of the moderator involved. See 2.5.
    • @@ -329,7 +329,7 @@