From e89055f09f2f0def18e47aae847ea6a7b7a173e9 Mon Sep 17 00:00:00 2001 From: Git Date: Tue, 15 Jan 2013 08:00:37 +0000 Subject: [PATCH] Empty commit --- classes/class_text.php | 12 ++-- classes/class_text2.php | 8 +-- classes/class_text3.php | 4 +- classes/class_torrent_form.php | 34 +++++------ sections/collages/browse.php | 26 ++++---- sections/forums/poll_vote.php | 2 +- sections/forums/thread.php | 2 +- sections/reports/reports.php | 72 +++++++++++------------ sections/reports/stats.php | 12 ++-- sections/reportsv2/reports.php | 6 +- sections/requests/new_edit.php | 2 +- sections/requests/request.php | 2 +- sections/requests/requests.php | 2 +- sections/rules/ratio.php | 58 +++++++++--------- sections/rules/upload.php | 2 +- sections/tools/managers/eb.php | 2 +- sections/tools/managers/official_tags.php | 2 +- sections/tools/managers/tag_aliases.php | 2 +- sections/top10/tags.php | 8 +-- sections/top10/torrents.php | 14 ++--- sections/top10/users.php | 8 +-- sections/top10/votes.php | 12 ++-- sections/torrents/browse.php | 2 +- sections/torrents/details.php | 2 +- sections/user/advancedsearch.php | 2 +- sections/user/edit.php | 42 ++++++------- sections/user/invite.php | 2 +- sections/user/user.php | 9 ++- sections/userhistory/ip_history.php | 2 +- static/functions/comments.js | 2 +- static/functions/multiformat_uploader.js | 4 +- 31 files changed, 181 insertions(+), 178 deletions(-) diff --git a/classes/class_text.php b/classes/class_text.php index 1df1fc8a..030b6253 100644 --- a/classes/class_text.php +++ b/classes/class_text.php @@ -18,10 +18,10 @@ class TEXT { ':frown:' => 'frown.gif', '<3' => 'heart.gif', ':unsure:' => 'hmm.gif', - //':\\' => 'hmm.gif', + //':\\' => 'hmm.gif', ':whatlove:' => 'ilu.gif', ':lol:' => 'laughing.gif', - ':loveflac:' => 'loveflac.gif', + ':loveflac:' => 'loveflac.gif', ':flaclove:' => 'loveflac.gif', ':ninja:' => 'ninja.gif', ':no:' => 'no.gif', @@ -58,7 +58,7 @@ class TEXT { private $Levels = 0; /** - * Used to detect and disable parsing (eg TOC) within quotes + * Used to detect and disable parsing (e.g. TOC) within quotes * @var int $InQuotes */ private $InQuotes = 0; @@ -99,7 +99,7 @@ public function __construct ($TOC = false) { } /** - * Output BB Code as xHTML + * Output BBCode as XHTML * @param string $Str BBCode text * @param bool $OutputTOC Ouput TOC near (above) text * @param int $Min See {@link parse_toc} @@ -225,7 +225,7 @@ public function local_url ($Str) { 4) Move the pointer past the end of the tag 5) Find out where the tag closes (beginning of [/tag]) 5a) Different for different types of tag. Some tags don't close, others are weird like [*] - 5b) If it's a normal tag, it may have versions of itself nested inside - eg: + 5b) If it's a normal tag, it may have versions of itself nested inside - e.g.: [quote=bob]* [quote=joe]I am a redneck!**[/quote] Me too! @@ -303,7 +303,7 @@ private function parse ($Str) { // 5) Find out where the tag closes (beginning of [/tag]) - // Unfortunately, BBCode doesn't have nice standards like xhtml + // Unfortunately, BBCode doesn't have nice standards like XHTML // [*], [img=...], and http:// follow different formats // Thus, we have to handle these before we handle the majority of tags diff --git a/classes/class_text2.php b/classes/class_text2.php index 46f79f29..2416cef2 100644 --- a/classes/class_text2.php +++ b/classes/class_text2.php @@ -11,13 +11,13 @@ class TEXT_2 { ':-|' => 'blank.gif', ':blush:' => 'blush.gif', ':cool:' => 'cool.gif', - ':'(' => 'crying.gif', - ':crying:' => 'crying.gif', + ':'(' => 'crying.gif', + ':crying:' => 'crying.gif', '>.>' => 'eyesright.gif', ':frown:' => 'frown.gif', '<3' => 'heart.gif', ':unsure:' => 'hmm.gif', - ':\\' => 'hmm.gif', + ':\\' => 'hmm.gif', ':whatlove:' => 'ilu.gif', ':lol:' => 'laughing.gif', ':loveflac:' => 'loveflac.gif', @@ -168,7 +168,7 @@ function local_url($Str) { 4) Move the pointer past the end of the tag 5) Find out where the tag closes (beginning of [/tag]) 5a) Different for different types of tag. Some tags don't close, others are weird like [*] - 5b) If it's a normal tag, it may have versions of itself nested inside - eg: + 5b) If it's a normal tag, it may have versions of itself nested inside - e.g.: [quote=bob]* [quote=joe]I am a redneck!**[/quote] Me too! diff --git a/classes/class_text3.php b/classes/class_text3.php index 2f6e0692..4ad84d92 100644 --- a/classes/class_text3.php +++ b/classes/class_text3.php @@ -62,7 +62,7 @@ function full_format($Str) { //Inline links $Str = preg_replace('/(?'?http', '=[inlineurl]http'=>'=http')); $Str = preg_replace('/\=\=\=\=([^=].*)\=\=\=\=/i', '[inlinesize=3]$1[/inlinesize]', $Str); $Str = preg_replace('/\=\=\=([^=].*)\=\=\=/i', '[inlinesize=5]$1[/inlinesize]', $Str); @@ -160,7 +160,7 @@ function local_url($Str) { 4) Move the pointer past the end of the tag 5) Find out where the tag closes (beginning of [/tag]) 5a) Different for different types of tag. Some tags don't close, others are weird like [*] - 5b) If it's a normal tag, it may have versions of itself nested inside - eg: + 5b) If it's a normal tag, it may have versions of itself nested inside - e.g.: [quote=bob]* [quote=joe]I am a redneck!**[/quote] Me too! diff --git a/classes/class_torrent_form.php b/classes/class_torrent_form.php index 308f77bc..790b1eb7 100644 --- a/classes/class_torrent_form.php +++ b/classes/class_torrent_form.php @@ -190,7 +190,7 @@ function music_form($GenreTags) { NewTorrent) { ?> - + - + - + - + - + - - - - - - + + + + + + - +
;"> + +
+ +
+ + - - - + + + -
Artist(s)Artist(s): - + @@ -297,11 +297,11 @@ function show() {
Record Label (Optional):Record label (optional): Disabled?> />
Catalogue Number (Optional):Catalogue number (optional): Disabled?> /> Please double check the record label and catalogue number when using MusicBrainz. See this guide for more details. @@ -309,7 +309,7 @@ function show() {
- Release Type: + Release type:
Edition Information:Edition information: onclick="Remaster();NewTorrent) {?> CheckYear();" /> Check this box if this torrent is a different release to the original, for example a limited or country specific edition or a release that includes additional bonus tracks or is a bonus disc. @@ -364,7 +364,7 @@ function show() { - + @@ -376,14 +376,14 @@ function show() {

Title of the release (e.g. 'Deluxe Edition' or 'Remastered').

- + - + @@ -419,7 +419,7 @@ function show() { - + @@ -470,7 +470,7 @@ function show() { } ?> NewTorrent) { ?> - + @@ -608,7 +608,7 @@ function show() { - + - +
Year (Required):Year (required): />
Record Label:Record label: />

This is for the record label of the release (It may differ from the original).
Catalogue Number:Catalogue number: />

This is for the catalogue number of the release.
BitrateBitrate:
Multi Format UploaderMulti-format uploader:
Disabled?>/>
Album Description:Album description: Disabled)); ?>

Contains background information such as album history and maybe a review.

@@ -616,7 +616,7 @@ function show() {
Release Description (optional):Release description (optional):

Contains information like encoder settings or details of the ripping process. Do not paste the ripping log here.

@@ -625,7 +625,7 @@ function show() {
Release Description (optional):Release description (optional):

Contains information like encoder settings. For analog rips, this frequently contains lineage information.

diff --git a/sections/collages/browse.php b/sections/collages/browse.php index cf1c4735..1d076ebc 100644 --- a/sections/collages/browse.php +++ b/sections/collages/browse.php @@ -221,7 +221,7 @@
- [New collage] + [New collage] next_record(); ?> - [Personal collage] + [Personal collage] 1) { ?> - [Personal collages] + [Personal collages] - [Subscribed collages] + [Subscribed collages] - [Bookmarked collages] + [Bookmarked collages] - [Recover collage] + [Recover collage] - [Collages you started] - [Collages you contributed to] + [Collages you started] + [Collages you contributed to] - [Torrents] - [Artists] - [Collages] - [Requests] + [Torrents] + [Artists] + [Collages] + [Requests]

"> - [Remove bookmark] + [Remove bookmark] Please select an option.
-
+ diff --git a/sections/forums/thread.php b/sections/forums/thread.php index 6759f35b..f4755bbb 100644 --- a/sections/forums/thread.php +++ b/sections/forums/thread.php @@ -334,7 +334,7 @@ //User has not voted ?>
- + diff --git a/sections/reports/reports.php b/sections/reports/reports.php index 192be74d..1c1e9f3a 100644 --- a/sections/reports/reports.php +++ b/sections/reports/reports.php @@ -201,55 +201,55 @@ break; } ?> - -
full_format($Reason)?>
+ +
full_format($Reason)?>
- Claimed by [Unclaim] + Claimed by [Unclaim] - Claimed by + Claimed by - Claim - -    - Toggle Notes + [Claim] + +    + [Toggle Notes] -
;"> - -
- -
-
- - - - - )" name="submit" value="Resolve"/> -
+ + + + + )" name="submit" value="Resolve" /> + +
- - -
+ + +
set_query_id($Reports); } ?> -
+
-
+
to_array(); ?> - Reports resolved in the last 24h + Reports resolved in the last 24 hours @@ -34,7 +34,7 @@ ?> - +
@@ -57,7 +57,7 @@ ?> - + @@ -80,7 +80,7 @@ ?> - + @@ -103,7 +103,7 @@ ?> - + @@ -131,7 +131,7 @@ - + diff --git a/sections/reportsv2/reports.php b/sections/reportsv2/reports.php index efbfe984..cf57a26b 100644 --- a/sections/reportsv2/reports.php +++ b/sections/reportsv2/reports.php @@ -1,6 +1,6 @@ - +//]]>

New reports, auto assigned!

diff --git a/sections/requests/new_edit.php b/sections/requests/new_edit.php index 96399967..750ac772 100644 --- a/sections/requests/new_edit.php +++ b/sections/requests/new_edit.php @@ -367,7 +367,7 @@ - If you add the entered 100.00 MB of bounty, your new stats will be:
+ If you add the entered 100.00 MB of bounty, your new stats will be:
Uploaded: Ratio: diff --git a/sections/requests/request.php b/sections/requests/request.php index 1ca6f690..163fda52 100644 --- a/sections/requests/request.php +++ b/sections/requests/request.php @@ -407,7 +407,7 @@ - If you add the entered 0.00 MB of bounty, your new stats will be:
+ If you add the entered 0.00 MB of bounty, your new stats will be:
Uploaded: Ratio: diff --git a/sections/requests/requests.php b/sections/requests/requests.php index 00fc35f4..7a100796 100644 --- a/sections/requests/requests.php +++ b/sections/requests/requests.php @@ -610,7 +610,7 @@ -
+ diff --git a/sections/rules/ratio.php b/sections/rules/ratio.php index 3fd54c81..9db564d3 100644 --- a/sections/rules/ratio.php +++ b/sections/rules/ratio.php @@ -7,8 +7,8 @@

Ratio Rules

-
- Ratio System Overview:
+
+ Ratio System Overview:
-
-
- Required Ratio Overview:
+
+
+ Required Ratio Overview:
-
-
+
+
-
Required Ratio Table

+
Required Ratio Table

@@ -98,9 +98,9 @@
Amount Downloaded
-
-
- Required Ratio Calculation:
+
+
+ Required Ratio Calculation:
  • 1: Determine the maximum and minimum possible values of your required ratio. Using the table above, determine your amount downloaded bracket from the first column. Next, locate the values in the adjacent columns. The second column lists the maximum required ratio for each bracket, and the third column lists the minimum required ratio for each @@ -111,14 +111,14 @@ differently, the calculation performed by the system looks like this:
-
-
+
+
-
-
+
+
  • In this formula, snatched is the number of non-deleted unique snatches you have made. If you snatch a torrent twice, it only counts once. If a snatched torrent is deleted from the site, it is not counted at all. @@ -131,9 +131,9 @@ most amount downloaded brackets have a minimum required ratio (100% seeded) greater than zero, and the value returned by the above calculation is zero when seeding equals snatched.
-
-
- Required Ratio Details:
+
+
+ Required Ratio Details:
  • If you stop seeding for one week, your required ratio will become the maximum required ratio (0% seeded) for your amount downloaded bracket. Once you have resumed seeding for a 72 hour period, your required ratio will decrease according to the above calculations. @@ -146,9 +146,9 @@ other. This means that users with download totals greater than or equal to 100 GB have a minimum required ratio (100% seeded) of 0.60 from that point forward.
-
-
- Required Ratio Example:
+
+
+ Required Ratio Example:
  • In this example, Rippy has downloaded 25 GB. Rippy falls into the 20-30 GB amount downloaded bracket in the table above. Rippy's maximum required ratio (0% seeded) is 0.30, and his minimum required ratio (100% seeded) is 0.05. @@ -162,9 +162,9 @@ last week. In this case, the system would not be counting all 45 torrents as seeded.
-
-
- Ratio Watch Overview:
+
+
+ Ratio Watch Overview:
  • Everyone gets to download their first 5 GB before ratio watch eligibility begins.
  • If you've downloaded more than 5 GB and your ratio does not meet or surpass your required ratio, you will be put on ratio watch and have two weeks to raise your @@ -176,9 +176,9 @@
  • The ratio watch system is automated and cannot be interrupted by staff.
-
-
- Leaving Ratio Watch:
+
+
+ Leaving Ratio Watch:
  • To leave ratio watch, you must either raise your ratio by uploading more, or lower your required ratio by seeding more. Your ratio must be equal to or above your required ratio in order for ratio watch to end. @@ -191,8 +191,8 @@
  • Leeching privileges will be restored once your ratio has become greater than or equal to your required ratio.
-
-
+
+
diff --git a/sections/rules/upload.php b/sections/rules/upload.php index 2a802458..223d1796 100644 --- a/sections/rules/upload.php +++ b/sections/rules/upload.php @@ -45,7 +45,7 @@
- + Example: The search term FLAC returns all rules containing FLAC. The search term FLAC+trump returns all rules containing both FLAC and trump. diff --git a/sections/tools/managers/eb.php b/sections/tools/managers/eb.php index bce8d352..b568d820 100644 --- a/sections/tools/managers/eb.php +++ b/sections/tools/managers/eb.php @@ -68,7 +68,7 @@

diff --git a/sections/tools/managers/official_tags.php b/sections/tools/managers/official_tags.php index 50834300..b735f3c5 100644 --- a/sections/tools/managers/official_tags.php +++ b/sections/tools/managers/official_tags.php @@ -38,7 +38,7 @@
-
+ diff --git a/sections/tools/managers/tag_aliases.php b/sections/tools/managers/tag_aliases.php index 32328185..1fc79a1c 100644 --- a/sections/tools/managers/tag_aliases.php +++ b/sections/tools/managers/tag_aliases.php @@ -60,7 +60,7 @@ while (list($ID, $BadTag, $AliasTag) = $DB -> next_record()) { ?> - + diff --git a/sections/top10/tags.php b/sections/top10/tags.php index 3bfed737..0f329099 100644 --- a/sections/top10/tags.php +++ b/sections/top10/tags.php @@ -16,10 +16,10 @@

Top 10 Tags

- [Torrents] - [Users] - [Tags] - [Favorites] + [Torrents] + [Users] + [Tags] + [Favorites]
diff --git a/sections/top10/torrents.php b/sections/top10/torrents.php index 99261df6..d4cffdfa 100644 --- a/sections/top10/torrents.php +++ b/sections/top10/torrents.php @@ -54,10 +54,10 @@

Top Torrents

- [Torrents] - [Users] - [Tags] - [Favorites] + [Torrents] + [Users] + [Tags] + [Favorites]
Tags (comma-separated):   - >   - > + />   + /> @@ -125,7 +125,7 @@ ?>
- [ Freeleech in Top 10] + [ Freeleech in Top 10]

Top 10 Users

- [Torrents] - [Users] - [Tags] - [Favorites] + [Torrents] + [Users] + [Tags] + [Favorites]

Top Voted Groups

- [Torrents] - [Users] - [Tags] - [Favorites] + [Torrents] + [Users] + [Tags] + [Favorites]
Tags (comma-separated):   - >   - > + />   + /> diff --git a/sections/torrents/browse.php b/sections/torrents/browse.php index 79066181..9b79186d 100644 --- a/sections/torrents/browse.php +++ b/sections/torrents/browse.php @@ -544,7 +544,7 @@ function header_link($SortKey,$DefaultWay="DESC") { View::show_header($Title,'browse'); ?> - + diff --git a/sections/torrents/details.php b/sections/torrents/details.php index a5ef26e2..8b841251 100644 --- a/sections/torrents/details.php +++ b/sections/torrents/details.php @@ -635,7 +635,7 @@ function filelist($Str) { / / - + diff --git a/sections/user/advancedsearch.php b/sections/user/advancedsearch.php index b506dad7..3ae14603 100644 --- a/sections/user/advancedsearch.php +++ b/sections/user/advancedsearch.php @@ -728,7 +728,7 @@ function num_compare($Field, $Operand, $Num1, $Num2 = ''){ IP Email Joined - Last Seen + Last seen Upload Download Downloads diff --git a/sections/user/edit.php b/sections/user/edit.php index fab4d004..b5ed8dd6 100644 --- a/sections/user/edit.php +++ b/sections/user/edit.php @@ -112,7 +112,7 @@ function checked($Checked) {   checked="checked" /> - + @@ -168,8 +168,8 @@ function checked($Checked) { Collage album art view --> @@ -177,12 +177,12 @@ function checked($Checked) { Collage album covers to show per page @@ -190,8 +190,8 @@ function checked($Checked) { Browse page tag list @@ -203,10 +203,10 @@ function checked($Checked) { - Quote Notifications + Quote notifications checked="checked" /> - + @@ -217,7 +217,7 @@ function checked($Checked) { - Mature Content + Mature content checked="checked" /> @@ -245,7 +245,7 @@ function checked($Checked) { - Auto-save Text + Auto-save text checked="checked" /> @@ -262,7 +262,7 @@ function checked($Checked) { Download torrents as text files checked="checked" /> - + @@ -291,9 +291,9 @@ function checked($Checked) { - Last.FM Username + Last.fm Username -

Your Last.FM username. Will be used to display Last.FM information on your profile which can be seen by other users.

+

Your Last.fm username. Will be used to display Last.fm information on your profile which can be seen by other users.

@@ -456,7 +456,7 @@ function checked($Checked) {
- See also this wiki article + See this wiki article for more information. diff --git a/sections/user/invite.php b/sections/user/invite.php index b87f14b1..7ff496f1 100644 --- a/sections/user/invite.php +++ b/sections/user/invite.php @@ -190,7 +190,7 @@ Joined Last Seen Uploaded - Downloaded + Downloaded Ratio " />
-
Staff Notes (Edit)
-
+
Staff Notes + (Edit) + (Toggle) +
+
@@ -1097,7 +1100,7 @@ function check_paranoia_here($Setting) { checked="checked" /> | checked="checked" /> | checked="checked" /> | - checked="checked" /> | + checked="checked" /> | checked="checked" />
checked="checked" /> | diff --git a/sections/userhistory/ip_history.php b/sections/userhistory/ip_history.php index b43f3990..e5e741c6 100644 --- a/sections/userhistory/ip_history.php +++ b/sections/userhistory/ip_history.php @@ -134,7 +134,7 @@ function UnBan(ip, id, elemID) { [View IPs With Users] -
+
diff --git a/static/functions/comments.js b/static/functions/comments.js index 7aeccb1b..0f68a154 100644 --- a/static/functions/comments.js +++ b/static/functions/comments.js @@ -41,7 +41,7 @@ function Edit_Form(post,key) { } $('#bar' + postid).raw().cancel = $('#content' + postid).raw().innerHTML; $('#bar' + postid).raw().oldbar = $('#bar' + postid).raw().innerHTML; - $('#content' + postid).raw().innerHTML = "
"; + $('#content' + postid).raw().innerHTML = "
"; $('#bar' + postid).raw().innerHTML = ""; ajax.get("?action=get_post&post=" + postid, function(response){ $('#editbox' + postid).raw().value = html_entity_decode(response); diff --git a/static/functions/multiformat_uploader.js b/static/functions/multiformat_uploader.js index 057639fd..52ba0ea8 100644 --- a/static/functions/multiformat_uploader.js +++ b/static/functions/multiformat_uploader.js @@ -26,7 +26,7 @@ id:'extra_format_row_' + count }).insertAfter(after); - $(document.createElement("td")).addClass('label').html("Extra Format " + count).appendTo(master); + $(document.createElement("td")).addClass('label').html("Extra format " + count + ":").appendTo(master); var row = $(document.createElement("td")).appendTo(master); addFile(row); addFormats(row); @@ -111,4 +111,4 @@ } -})(jQuery); \ No newline at end of file +})(jQuery);