diff --git a/classes/class_debug.php b/classes/class_debug.php index 52548dce..be630bad 100644 --- a/classes/class_debug.php +++ b/classes/class_debug.php @@ -277,7 +277,7 @@ public function include_table($Includes=false) { $Includes = $this->get_includes(); } ?> - +
@@ -301,7 +301,7 @@ public function class_table($Classes=false) { $Classes = $this->get_classes(); } ?> -
(View) Includes:
+
@@ -318,7 +318,7 @@ public function class_table($Classes=false) { public function extension_table() { ?> -
(View) Classes:
+
@@ -341,7 +341,7 @@ public function flag_table($Flags=false) { return; } ?> -
(View) Extensions:
+
@@ -368,7 +368,7 @@ public function constant_table($Constants=false) { $Constants = $this->get_constants(); } ?> -
(View) Flags:
+
@@ -396,7 +396,7 @@ public function cache_table($CacheKeys=false) { $Header = ' '.number_format(count($CacheKeys)).' '.$Header.':'; ?> -
(View) Constants:
+
@@ -424,7 +424,7 @@ public function error_table($Errors=false) { return; } ?> -
(View)
+
@@ -457,7 +457,7 @@ public function query_table($Queries=false) { } $Header = ' '.number_format(count($Queries)).' '.$Header.':'; ?> -
(View) Errors:
+
@@ -492,7 +492,7 @@ public function sphinx_table($Queries=false) { } $Header = ' '.number_format(count($Queries)).' '.$Header.':'; ?> -
(View)
+
@@ -524,7 +524,7 @@ public function vars_table($Vars=false) { $Header = ' '.number_format(count($Vars)).' '.$Header.':'; ?> -
(View)
+
diff --git a/classes/class_text.php b/classes/class_text.php index 3f6202da..770fcf1d 100644 --- a/classes/class_text.php +++ b/classes/class_text.php @@ -264,7 +264,7 @@ function parse($Str) { if($CloseTag === false) { // block finishes with URL $CloseTag = $Len; } - if(preg_match('/[!;,.?:]+$/',substr($Str, $i, $CloseTag), $Match)) { + if(preg_match('/[!,.?:]+$/',substr($Str, $i, $CloseTag), $Match)) { $CloseTag -= strlen($Match[0]); } $URL = substr($Str, $i, $CloseTag); diff --git a/classes/class_torrent_form.php b/classes/class_torrent_form.php index ead3ed28..6ef69596 100644 --- a/classes/class_torrent_form.php +++ b/classes/class_torrent_form.php @@ -78,7 +78,7 @@ function head() { } ?> NewTorrent) { ?> -
(View)
+
Torrent file @@ -115,7 +115,7 @@ function foot() { ?> - +
NewTorrent) { if(check_perms('torrents_freeleech')) { ?> @@ -193,7 +193,7 @@ function music_form($GenreTags) { $LossywebApproved = $Torrent['LossywebApproved']; global $ReleaseTypes; ?> -
+
NewTorrent) { ?> @@ -633,7 +633,7 @@ function show() { function audiobook_form() { $Torrent = $this->Torrent; ?> -
Artist(s)
+
NewTorrent){ ?> @@ -736,7 +736,7 @@ function audiobook_form() { function simple_form($CategoryID) { $Torrent = $this->Torrent; -?>
Author - Title
+?>
NewTorrent) { if ($this->Categories[$CategoryID] == 'E-Books') { ?> diff --git a/classes/permissions_form.php b/classes/permissions_form.php index 69761fb8..d890c9e4 100644 --- a/classes/permissions_form.php +++ b/classes/permissions_form.php @@ -115,8 +115,8 @@ function permissions_form(){ ?>
- - + +
Site
Site
@@ -165,8 +165,8 @@ function permissions_form(){ ?>
- - + +
Users
Users
@@ -207,8 +207,8 @@ function permissions_form(){ ?>
- - + +
Torrents
Torrents
@@ -232,8 +232,8 @@ function permissions_form(){ ?>
- - + +
Administrative
Administrative
diff --git a/design/publicheader.php b/design/publicheader.php index 5de6becf..20e2a24e 100644 --- a/design/publicheader.php +++ b/design/publicheader.php @@ -32,7 +32,7 @@ - +
- +
@@ -706,7 +706,7 @@ function compare($X, $Y){ if($NumRequests > 0) { ?> -
↑  (View)
+
↑  diff --git a/sections/artist/artist_rearrange.php b/sections/artist/artist_rearrange.php index d01122ef..d6476add 100644 --- a/sections/artist/artist_rearrange.php +++ b/sections/artist/artist_rearrange.php @@ -230,7 +230,7 @@ function display_name($ReleaseType) { $HideDiscogDefault = false; } ?> - " id="torrents_"> +
" id="torrents_">
@@ -564,7 +564,7 @@ function display_name($ReleaseType) { if($NumRequests > 0) { ?> - +
↑  diff --git a/sections/better/files.php b/sections/better/files.php index 0df5fa19..d1991ba5 100644 --- a/sections/better/files.php +++ b/sections/better/files.php @@ -42,7 +42,7 @@

There are torrents remaining

- +
$Info) { list($GroupID, $GroupName, $GroupYear, $GroupRecordLabel, $GroupCatalogueNumber, $TorrentTags, $ReleaseType, $GroupVanityHouse, $Torrents, $Artists) = array_values($Results[$Info['GroupID']]); diff --git a/sections/better/folders.php b/sections/better/folders.php index 14c54514..af54f581 100644 --- a/sections/better/folders.php +++ b/sections/better/folders.php @@ -43,7 +43,7 @@

There are torrents remaining

-
+
$Info) { list($GroupID, $GroupName, $GroupYear, $GroupRecordLabel, $GroupCatalogueNumber, $TorrentTags, $ReleaseType, $GroupVanityHouse, $Torrents, $Artists) = array_values($Results[$Info['GroupID']]); diff --git a/sections/better/single.php b/sections/better/single.php index 8c91156a..1fbc47dc 100644 --- a/sections/better/single.php +++ b/sections/better/single.php @@ -18,7 +18,7 @@ show_header('Single seeder FLACs'); ?>
-
+
diff --git a/sections/better/snatch.php b/sections/better/snatch.php index 52dfd43d..6b70cd30 100644 --- a/sections/better/snatch.php +++ b/sections/better/snatch.php @@ -61,7 +61,7 @@
-
Torrent
+
diff --git a/sections/better/tags.php b/sections/better/tags.php index cb077b45..844e8ccd 100644 --- a/sections/better/tags.php +++ b/sections/better/tags.php @@ -43,7 +43,7 @@

There are torrents remaining

-
Torrent V2
+
$Info) { list($GroupID, $GroupName, $GroupYear, $GroupRecordLabel, $GroupCatalogueNumber, $TorrentTags, $ReleaseType, $GroupVanityHouse, $Torrents, $Artists) = array_values($Results[$Info['GroupID']]); diff --git a/sections/better/transcode.php b/sections/better/transcode.php index b7b6c89b..ebffdf34 100644 --- a/sections/better/transcode.php +++ b/sections/better/transcode.php @@ -84,7 +84,7 @@
- +
diff --git a/sections/better/upload.php b/sections/better/upload.php index 347bc255..d5debc57 100644 --- a/sections/better/upload.php +++ b/sections/better/upload.php @@ -48,7 +48,7 @@ show_header('Transcode Uploads'); ?>
-
Torrent V2
+
diff --git a/sections/bookmarks/artists.php b/sections/bookmarks/artists.php index 3ad41784..91c561f6 100644 --- a/sections/bookmarks/artists.php +++ b/sections/bookmarks/artists.php @@ -49,7 +49,7 @@ show_footer(); die(); } ?> -
Torrent V2
+
diff --git a/sections/bookmarks/torrents.php b/sections/bookmarks/torrents.php index 73eb55f4..dde405e3 100644 --- a/sections/bookmarks/torrents.php +++ b/sections/bookmarks/torrents.php @@ -407,7 +407,7 @@ function compare($X, $Y){
-
Artist
+
diff --git a/sections/collages/browse.php b/sections/collages/browse.php index 359e64bb..6a4c16be 100644 --- a/sections/collages/browse.php +++ b/sections/collages/browse.php @@ -152,7 +152,7 @@
-
+
Search for: @@ -263,7 +263,7 @@ - +
diff --git a/sections/collages/collage.php b/sections/collages/collage.php index 3fae4f2e..b2173aad 100644 --- a/sections/collages/collage.php +++ b/sections/collages/collage.php @@ -633,7 +633,7 @@ function compare($X, $Y){ -
Category Collage
+
diff --git a/sections/collages/edit.php b/sections/collages/edit.php index a1e66b3f..8c7b3310 100644 --- a/sections/collages/edit.php +++ b/sections/collages/edit.php @@ -18,7 +18,7 @@ -
+
diff --git a/sections/collages/manage.php b/sections/collages/manage.php index e42b5ef6..ef8e322e 100644 --- a/sections/collages/manage.php +++ b/sections/collages/manage.php @@ -40,7 +40,7 @@

Manage collage

-
Name
+
Sorting
diff --git a/sections/collages/new.php b/sections/collages/new.php index 8d30438e..8f746348 100644 --- a/sections/collages/new.php +++ b/sections/collages/new.php @@ -24,7 +24,7 @@ - +
Name diff --git a/sections/forums/forum.php b/sections/forums/forum.php index 3e900088..26e78345 100644 --- a/sections/forums/forum.php +++ b/sections/forums/forum.php @@ -77,7 +77,7 @@

Search this forum:

- +
diff --git a/sections/forums/newthread.php b/sections/forums/newthread.php index bded690c..24cfa32d 100644 --- a/sections/forums/newthread.php +++ b/sections/forums/newthread.php @@ -75,7 +75,7 @@ -
+
diff --git a/sections/forums/search.php b/sections/forums/search.php index 5f9d7852..47c889f6 100644 --- a/sections/forums/search.php +++ b/sections/forums/search.php @@ -79,7 +79,7 @@

Forums > Search

-
Title
+
Search for: @@ -100,7 +100,7 @@
Forums: - +
-
+
diff --git a/sections/forums/thread.php b/sections/forums/thread.php index e5b9827d..6590496b 100644 --- a/sections/forums/thread.php +++ b/sections/forums/thread.php @@ -156,7 +156,7 @@

Search this thread:

-
Forum
+
@@ -535,7 +535,7 @@ -
+
Sticky diff --git a/sections/forums/warn.php b/sections/forums/warn.php index e23f3737..ed87349d 100644 --- a/sections/forums/warn.php +++ b/sections/forums/warn.php @@ -23,7 +23,7 @@ - +
Reason: diff --git a/sections/friends/friends.php b/sections/friends/friends.php index 1b109dca..4706f71e 100644 --- a/sections/friends/friends.php +++ b/sections/friends/friends.php @@ -69,8 +69,8 @@ - - +
+
 Ratio: diff --git a/sections/inbox/conversation.php b/sections/inbox/conversation.php index 659002a0..ffb6efb8 100644 --- a/sections/inbox/conversation.php +++ b/sections/inbox/conversation.php @@ -109,7 +109,7 @@ - +
diff --git a/sections/inbox/inbox.php b/sections/inbox/inbox.php index 4fdcfa20..e12ad470 100644 --- a/sections/inbox/inbox.php +++ b/sections/inbox/inbox.php @@ -115,7 +115,7 @@   - +
diff --git a/sections/index/private.php b/sections/index/private.php index 5d0a3f03..1426ae5f 100644 --- a/sections/index/private.php +++ b/sections/index/private.php @@ -363,7 +363,7 @@ (View) -
Subject
+
-
+
Search for: @@ -47,11 +47,10 @@
+ echo $Pages;?>
- +
@@ -201,7 +200,7 @@ +show_footer(); ?> diff --git a/sections/login/login.php b/sections/login/login.php index b21deb1b..bf32aac3 100644 --- a/sections/login/login.php +++ b/sections/login/login.php @@ -19,7 +19,7 @@ You have attempts remaining.

WARNING: You will be banned for 6 hours after your login attempts run out!

-
Time Message - style="color: ;"> + style="color: ;">
+
diff --git a/sections/login/recover_step1.php b/sections/login/recover_step1.php index 1858116d..9217cf25 100644 --- a/sections/login/recover_step1.php +++ b/sections/login/recover_step1.php @@ -12,7 +12,7 @@

An email will be sent to your email address with information on how to reset your password

-
Username 
+
diff --git a/sections/login/recover_step2.php b/sections/login/recover_step2.php index b37c2739..89747a6e 100644 --- a/sections/login/recover_step2.php +++ b/sections/login/recover_step2.php @@ -14,7 +14,7 @@ ?>

A strong password is between 8 and 40 characters long, contains at least 1 lowercase and uppercase letter, contains at least a number or symbol

-
Email 
+
diff --git a/sections/register/code.php b/sections/register/code.php index 29e530b6..53295d77 100644 --- a/sections/register/code.php +++ b/sections/register/code.php @@ -4,7 +4,7 @@
Please enter your invite code into the box bellow.

-
Password 
+
diff --git a/sections/register/step1.php b/sections/register/step1.php index 9c488b78..9b54844a 100644 --- a/sections/register/step1.php +++ b/sections/register/step1.php @@ -17,7 +17,7 @@ ?>

-
Invite 
+
Username  diff --git a/sections/reports/report.php b/sections/reports/report.php index 86cc11c7..dc876969 100644 --- a/sections/reports/report.php +++ b/sections/reports/report.php @@ -154,7 +154,7 @@ - +
Year (required) diff --git a/sections/reports/stats.php b/sections/reports/stats.php index cf5fb4a3..ff020db6 100644 --- a/sections/reports/stats.php +++ b/sections/reports/stats.php @@ -20,7 +20,7 @@ $DB->query("SELECT um.Username, COUNT(r.ID) AS Reports FROM reports AS r JOIN users_main AS um ON um.ID=r.ResolverID WHERE r.ReportedTime > '2009-08-21 22:39:41' AND r.ReportedTime > NOW() - INTERVAL 24 HOUR GROUP BY r.ResolverID ORDER BY Reports DESC"); $Results = $DB->to_array(); ?> - +
Reports resolved in the last 24h diff --git a/sections/reportsv2/ajax_new_report.php b/sections/reportsv2/ajax_new_report.php index 87b432bd..a5a16806 100644 --- a/sections/reportsv2/ajax_new_report.php +++ b/sections/reportsv2/ajax_new_report.php @@ -92,7 +92,7 @@ WHERE ID=".$ReportID); ?>
- +
Report for torrent (deleted) has been automatically resolved. @@ -150,7 +150,7 @@ - +
Reported Torrent: diff --git a/sections/reportsv2/ajax_report.php b/sections/reportsv2/ajax_report.php index b3441bbb..97fbaebf 100644 --- a/sections/reportsv2/ajax_report.php +++ b/sections/reportsv2/ajax_report.php @@ -28,7 +28,7 @@ ?>
- +
diff --git a/sections/reportsv2/report.php b/sections/reportsv2/report.php index b571b855..08f34d94 100644 --- a/sections/reportsv2/report.php +++ b/sections/reportsv2/report.php @@ -30,7 +30,7 @@ -
+
Reason : diff --git a/sections/reportsv2/static.php b/sections/reportsv2/static.php index 93d8ece0..70ff2d58 100644 --- a/sections/reportsv2/static.php +++ b/sections/reportsv2/static.php @@ -210,7 +210,7 @@ if(count($Reports) == 0) { ?>
- +
No new reports! \o/ @@ -236,10 +236,10 @@ WHERE ID=".$ReportID); $Cache->decrement('num_torrent_reportsv2'); ?> -
> - +
+
- @@ -294,7 +294,7 @@ -
+ Report for torrent (deleted) has been automatically resolved.
+
Reported Torrent: diff --git a/sections/reportsv2/takeresolve.php b/sections/reportsv2/takeresolve.php index 76d259a7..b415ea52 100644 --- a/sections/reportsv2/takeresolve.php +++ b/sections/reportsv2/takeresolve.php @@ -83,7 +83,7 @@ } else { //Someone beat us to it. Inform the staffer. ?> - +
Somebody has already resolved this report @@ -282,7 +282,7 @@ } else { //Someone beat us to it. Inform the staffer. ?> - +
Somebody has already resolved this report diff --git a/sections/reportsv2/views.php b/sections/reportsv2/views.php index a6c85a35..6dfde92a 100644 --- a/sections/reportsv2/views.php +++ b/sections/reportsv2/views.php @@ -24,7 +24,7 @@
-
+
query("SELECT um.ID, um.Username, COUNT(r.ID) AS Reports FROM reportsv2 AS r JOIN users_main AS um ON um.ID=r.ResolverID WHERE r.LastChangeTime > NOW() - INTERVAL 24 HOUR GROUP BY r.ResolverID ORDER BY Reports DESC"); $Results = $DB->to_array(); @@ -184,10 +184,10 @@ ?> Currently assigned reports by staff member - - - - + + + +
Staff memberCurrent CountTasted
Staff memberCurrent CountTasted
- - - + + + " /> -
TypeCurrent Count
TypeCurrent Count
+
diff --git a/sections/requests/request.php b/sections/requests/request.php index d69c5acd..74f489bd 100644 --- a/sections/requests/request.php +++ b/sections/requests/request.php @@ -235,7 +235,7 @@
Top Contributors
-
Please make sure your request follows the request rules!
+
-
+
Created diff --git a/sections/requests/requests.php b/sections/requests/requests.php index e7a2503f..b1814361 100644 --- a/sections/requests/requests.php +++ b/sections/requests/requests.php @@ -317,7 +317,7 @@ - +
Search terms: @@ -354,7 +354,7 @@
- +
- +
-
Release Types @@ -428,8 +428,6 @@
-
@@ -444,7 +442,7 @@ - +
Request Name / Year diff --git a/sections/requests/requests.php.presphinx b/sections/requests/requests.php.presphinx index 6528a35f..72f8a44a 100644 --- a/sections/requests/requests.php.presphinx +++ b/sections/requests/requests.php.presphinx @@ -260,7 +260,7 @@ show_header($Title, 'requests');
- +
Search terms: @@ -292,7 +292,7 @@ show_header($Title, 'requests');
- +
$CatName) { } ?>
- +
-
Release Types @@ -366,8 +366,6 @@ foreach($Categories as $CatKey => $CatName) {
-
@@ -381,7 +379,7 @@ foreach($Categories as $CatKey => $CatName) { - +
Request Name diff --git a/sections/staffpm/ajax_delete_response.php b/sections/staffpm/ajax_delete_response.php index edf8142a..30653bd1 100644 --- a/sections/staffpm/ajax_delete_response.php +++ b/sections/staffpm/ajax_delete_response.php @@ -1,29 +1,29 @@ -query(" - SELECT - i.SupportFor, - p.DisplayStaff - FROM users_info as i - JOIN users_main as m ON m.ID = i.UserID - JOIN permissions as p ON p.ID = m.PermissionID - WHERE i.UserID = ".$LoggedUser['ID'] -); -list($SupportFor, $DisplayStaff) = $DB->next_record(); - -if (!($SupportFor != '' || $DisplayStaff == '1')) { - // Logged in user is not FLS or Staff - error(403); -} - -if ($ID = (int)$_POST['id']) { - $DB->query("DELETE FROM staff_pm_responses WHERE ID=$ID"); - echo '1'; - -} else { - // No id - echo '-1'; -} +query(" + SELECT + i.SupportFor, + p.DisplayStaff + FROM users_info as i + JOIN users_main as m ON m.ID = i.UserID + JOIN permissions as p ON p.ID = m.PermissionID + WHERE i.UserID = ".$LoggedUser['ID'] +); +list($SupportFor, $DisplayStaff) = $DB->next_record(); + +if (!($SupportFor != '' || $DisplayStaff == '1')) { + // Logged in user is not FLS or Staff + error(403); +} + +if ($ID = (int)$_POST['id']) { + $DB->query("DELETE FROM staff_pm_responses WHERE ID=$ID"); + echo '1'; + +} else { + // No id + echo '-1'; +} ?> \ No newline at end of file diff --git a/sections/staffpm/ajax_edit_response.php b/sections/staffpm/ajax_edit_response.php index c1486d81..a37add79 100644 --- a/sections/staffpm/ajax_edit_response.php +++ b/sections/staffpm/ajax_edit_response.php @@ -1,48 +1,48 @@ -query(" - SELECT - i.SupportFor, - p.DisplayStaff - FROM users_info as i - JOIN users_main as m ON m.ID = i.UserID - JOIN permissions as p ON p.ID = m.PermissionID - WHERE i.UserID = ".$LoggedUser['ID'] -); -list($SupportFor, $DisplayStaff) = $DB->next_record(); - -if (!($SupportFor != '' || $DisplayStaff == '1')) { - // Logged in user is not FLS or Staff - error(403); -} - -if (($Message = db_string($_POST['message'])) && ($Name = db_string($_POST['name']))) { - $ID = (int)$_POST['id']; - if (is_numeric($ID)) { - if ($ID == 0) { - // Create new response - $DB->query("INSERT INTO staff_pm_responses (Message, Name) VALUES ('$Message', '$Name')"); - echo '1'; - } else { - $DB->query("SELECT * FROM staff_pm_responses WHERE ID=$ID"); - if ($DB->record_count() != 0) { - // Edit response - $DB->query("UPDATE staff_pm_responses SET Message='$Message', Name='$Name' WHERE ID=$ID"); - echo '2'; - } else { - // Create new response - $DB->query("INSERT INTO staff_pm_responses (Message, Name) VALUES ('$Message', '$Name')"); - echo '1'; - } - } - } else { - // No id - echo '-2'; - } - -} else { - // No message/name - echo '-1'; -} +query(" + SELECT + i.SupportFor, + p.DisplayStaff + FROM users_info as i + JOIN users_main as m ON m.ID = i.UserID + JOIN permissions as p ON p.ID = m.PermissionID + WHERE i.UserID = ".$LoggedUser['ID'] +); +list($SupportFor, $DisplayStaff) = $DB->next_record(); + +if (!($SupportFor != '' || $DisplayStaff == '1')) { + // Logged in user is not FLS or Staff + error(403); +} + +if (($Message = db_string($_POST['message'])) && ($Name = db_string($_POST['name']))) { + $ID = (int)$_POST['id']; + if (is_numeric($ID)) { + if ($ID == 0) { + // Create new response + $DB->query("INSERT INTO staff_pm_responses (Message, Name) VALUES ('$Message', '$Name')"); + echo '1'; + } else { + $DB->query("SELECT * FROM staff_pm_responses WHERE ID=$ID"); + if ($DB->record_count() != 0) { + // Edit response + $DB->query("UPDATE staff_pm_responses SET Message='$Message', Name='$Name' WHERE ID=$ID"); + echo '2'; + } else { + // Create new response + $DB->query("INSERT INTO staff_pm_responses (Message, Name) VALUES ('$Message', '$Name')"); + echo '1'; + } + } + } else { + // No id + echo '-2'; + } + +} else { + // No message/name + echo '-1'; +} ?> \ No newline at end of file diff --git a/sections/staffpm/common_responses.php b/sections/staffpm/common_responses.php index cad7dea5..3542763d 100644 --- a/sections/staffpm/common_responses.php +++ b/sections/staffpm/common_responses.php @@ -1,101 +1,101 @@ - -
-
-

Staff PMs - Manage common responses

-
- - [My unanswered] - - [All unanswered] - [Open] - [Resolved] - - [Back to conversation] - -
-
-
-
-
-
- -
-
-

Create new response:

-
-
- -
- Name: - -
-
- -
- -
- -
-
-
-
-

Edit old responses:

-
-query("SELECT ID, Message, Name FROM staff_pm_responses ORDER BY ID DESC"); -while(list($ID, $Message, $Name) = $DB->next_record()) { - -?> -
- -
-
-
-
- Name: - - -
-
- - -
- - - -
-
-
- -
-
- + +
+
+

Staff PMs - Manage common responses

+
+ + [My unanswered] + + [All unanswered] + [Open] + [Resolved] + + [Back to conversation] + +
+
+
+
+
+
+ +
+
+

Create new response:

+
+
+
+
+ Name: + +
+
+ +
+ +
+
+
+
+
+
+

Edit old responses:

+
+query("SELECT ID, Message, Name FROM staff_pm_responses ORDER BY ID DESC"); +while(list($ID, $Message, $Name) = $DB->next_record()) { + +?> +
+ +
+
+
+
+ Name: + + +
+
+ + +
+ + + +
+
+
+ +
+
+ diff --git a/sections/staffpm/multiresolve.php b/sections/staffpm/multiresolve.php index 829e3b3a..63756dd3 100644 --- a/sections/staffpm/multiresolve.php +++ b/sections/staffpm/multiresolve.php @@ -1 +1,35 @@ -query("SELECT UserID, AssignedToUser FROM staff_pm_conversations WHERE ID=$ID"); list($UserID, $AssignedToUser) = $DB->next_record(); if ($UserID == $LoggedUser['ID'] || $DisplayStaff == '1' || $UserID == $AssignedToUser) { // Conversation belongs to user or user is staff, queue query $Queries[] = "UPDATE staff_pm_conversations SET Status='Resolved', ResolverID=".$LoggedUser['ID']." WHERE ID=$ID"; } else { // Trying to run disallowed query error(403); } } // Run queries foreach ($Queries as $Query) { $DB->query($Query); } // Clear cache for user $Cache->delete_value('staff_pm_new_'.$LoggedUser['ID']); $Cache->delete_value('num_staff_pms_'.$LoggedUser['ID']); // Done! Return to inbox header("Location: staffpm.php"); } else { // No id header("Location: staffpm.php"); } ?> \ No newline at end of file +query("SELECT UserID, AssignedToUser FROM staff_pm_conversations WHERE ID=$ID"); + list($UserID, $AssignedToUser) = $DB->next_record(); + + if ($UserID == $LoggedUser['ID'] || $DisplayStaff == '1' || $UserID == $AssignedToUser) { + // Conversation belongs to user or user is staff, queue query + $Queries[] = "UPDATE staff_pm_conversations SET Status='Resolved', ResolverID=".$LoggedUser['ID']." WHERE ID=$ID"; + } else { + // Trying to run disallowed query + error(403); + } + } + + // Run queries + foreach ($Queries as $Query) { + $DB->query($Query); + } + // Clear cache for user + $Cache->delete_value('staff_pm_new_'.$LoggedUser['ID']); + $Cache->delete_value('num_staff_pms_'.$LoggedUser['ID']); + + // Done! Return to inbox + header("Location: staffpm.php"); + +} else { + // No id + header("Location: staffpm.php"); +} +?> diff --git a/sections/staffpm/resolve.php b/sections/staffpm/resolve.php index 8394678a..3fe11535 100644 --- a/sections/staffpm/resolve.php +++ b/sections/staffpm/resolve.php @@ -1,22 +1,22 @@ -query("SELECT UserID, AssignedToUser FROM staff_pm_conversations WHERE ID=$ID"); - list($UserID, $AssignedToUser) = $DB->next_record(); - - if ($UserID == $LoggedUser['ID'] || $IsFLS || $AssignedToUser == $LoggedUser['ID']) { - // Conversation belongs to user or user is staff, resolve it - $DB->query("UPDATE staff_pm_conversations SET Status='Resolved', ResolverID=".$LoggedUser['ID']." WHERE ID=$ID"); - $Cache->delete_value('staff_pm_new_'.$LoggedUser['ID']); - $Cache->delete_value('num_staff_pms_'.$LoggedUser['ID']); - - header('Location: staffpm.php'); - } else { - // Conversation does not belong to user - error(403); - } -} else { - // No id - header('Location: staffpm.php'); -} -?> +query("SELECT UserID, AssignedToUser FROM staff_pm_conversations WHERE ID=$ID"); + list($UserID, $AssignedToUser) = $DB->next_record(); + + if ($UserID == $LoggedUser['ID'] || $IsFLS || $AssignedToUser == $LoggedUser['ID']) { + // Conversation belongs to user or user is staff, resolve it + $DB->query("UPDATE staff_pm_conversations SET Status='Resolved', ResolverID=".$LoggedUser['ID']." WHERE ID=$ID"); + $Cache->delete_value('staff_pm_new_'.$LoggedUser['ID']); + $Cache->delete_value('num_staff_pms_'.$LoggedUser['ID']); + + header('Location: staffpm.php'); + } else { + // Conversation does not belong to user + error(403); + } +} else { + // No id + header('Location: staffpm.php'); +} +?> diff --git a/sections/staffpm/staff_inbox.php b/sections/staffpm/staff_inbox.php index 0683d623..15df3762 100644 --- a/sections/staffpm/staff_inbox.php +++ b/sections/staffpm/staff_inbox.php @@ -117,7 +117,7 @@ // Table head ?> - +
diff --git a/sections/staffpm/user_inbox.php b/sections/staffpm/user_inbox.php index 7cbd2256..ea6cf5ff 100644 --- a/sections/staffpm/user_inbox.php +++ b/sections/staffpm/user_inbox.php @@ -1,120 +1,120 @@ -query(" - SELECT - ID, - Subject, - UserID, - Status, - Level, - AssignedToUser, - Date, - Unread - FROM staff_pm_conversations - WHERE UserID=".$LoggedUser['ID']." - ORDER BY Status, Date DESC" -); - -// Start page -?> -
-
-

Staff PMs

-
- [Compose New] -
-
-
-
- -
-record_count() == 0) { - // No messages -?> -

No messages

- -
- -

Open messages

-
- - - - - - -next_record()) { - if($Unread === '1') { - $RowClass = 'unreadpm'; - } else { - $Row = ($Row === 'a') ? 'b' : 'a'; - $RowClass = 'row'.$Row; - } - - if ($Status == 'Resolved') { $ShowBox++; } - if ($ShowBox == 2) { - // First resolved PM -?> -
SubjectDateAssigned to
-
-

Resolved messages

- - - - - - - - - - - - - - - -set_query_id($StaffPMs); - } - - // Close table and multiresolve form -?> -
SubjectDateAssigned to
- - - - - - +query(" + SELECT + ID, + Subject, + UserID, + Status, + Level, + AssignedToUser, + Date, + Unread + FROM staff_pm_conversations + WHERE UserID=".$LoggedUser['ID']." + ORDER BY Status, Date DESC" +); + +// Start page +?> +
+
+

Staff PMs

+
+ [Compose New] +
+
+
+
+ +
+record_count() == 0) { + // No messages +?> +

No messages

+ +
+ +

Open messages

+ + + + + + + +next_record()) { + if($Unread === '1') { + $RowClass = 'unreadpm'; + } else { + $Row = ($Row === 'a') ? 'b' : 'a'; + $RowClass = 'row'.$Row; + } + + if ($Status == 'Resolved') { $ShowBox++; } + if ($ShowBox == 2) { + // First resolved PM +?> +
SubjectDateAssigned to
+
+

Resolved messages

+ + + + + + + + + + + + + + + +set_query_id($StaffPMs); + } + + // Close table and multiresolve form +?> +
SubjectDateAssigned to
+ +
+ +
+
+ diff --git a/sections/tools/data/bitcoin_balance.php b/sections/tools/data/bitcoin_balance.php index b2304027..f74c7f0d 100644 --- a/sections/tools/data/bitcoin_balance.php +++ b/sections/tools/data/bitcoin_balance.php @@ -15,7 +15,7 @@

- + diff --git a/sections/tools/data/donation_log.php b/sections/tools/data/donation_log.php index 7a6a2c9b..a24bccd5 100644 --- a/sections/tools/data/donation_log.php +++ b/sections/tools/data/donation_log.php @@ -53,7 +53,7 @@
-
Username Receiving bitcoin address Amount
+
Email: diff --git a/sections/tools/data/invite_pool.php b/sections/tools/data/invite_pool.php index 8bdab7f6..089a7e65 100644 --- a/sections/tools/data/invite_pool.php +++ b/sections/tools/data/invite_pool.php @@ -41,7 +41,7 @@
- +
Email: diff --git a/sections/tools/data/opcode_stats.php b/sections/tools/data/opcode_stats.php index 46c6df47..3f63c23b 100644 --- a/sections/tools/data/opcode_stats.php +++ b/sections/tools/data/opcode_stats.php @@ -57,7 +57,7 @@ - +
Enable: @@ -90,8 +90,8 @@

- - + + diff --git a/sections/tools/data/service_stats.php b/sections/tools/data/service_stats.php index a5cdc208..fb9a4dfa 100644 --- a/sections/tools/data/service_stats.php +++ b/sections/tools/data/service_stats.php @@ -1,279 +1,279 @@ -flush(); -} -$DB->query('SHOW GLOBAL STATUS'); -$DBStats =$DB->to_array('Variable_name'); -$MemStats = $Cache->getStats(); - -show_header("Service Stats"); -?> -
- [Database Specifics] -
-
-
-
Status
Status
Total Storage:
- - - - - - - - - - 0.7) { echo ' class="invalid" '; } ?>>Database: - - - - - - - - - - - - - - - - - - - - - - - - 0.85) { echo ' class="invalid" title="Evictions begin when storage exceeds 85%" '; } ?>>Cache Storage: - - - - - - - - -
Service
Threads (Active)
Cache: (100.000%)
(%)
Connections
Cache:
Database:
Special
Cache Current Index:
Cache Total Index:
(%)
Utilities
Cache: - - - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - >Cache: - - - - - - - - - - - - - - - - - - >Cache Increment: - - - - >Cache Decrement: - - - - - 0 && $MemStats['cas_hits']/($MemStats['cas_hits']+$MemStats['cas_misses']) < 0.7) { echo ' class="invalid" title="More than 30% of the issued CAS commands were unnecessary wasting time and resources." '; } elseif ($MemStats['cas_hits'] == 0) { echo ' class="notice" title="Disable CAS with the -C parameter and save resources since it is not used." '; } ?>>Cache: - - - - - - - - - >Cache: - - - - - - - - - - $MemStats['uptime']/7*24*3600) { echo ' class="invalid" title="Flushing the cache on a regular basis defeats the benefits of it, look into using cache transactions, or deletes instead of global flushing where possible." '; } ?>>Cache Flushes: - - - - 0) { echo ' class="invalid" '; } ?>>Cache Evicted: - - - - $DBStats['Questions']['Value']/7500) { echo ' class="invalid" title="1/7500 queries is allowed to be slow to minimize performance impact." '; } ?>>Database Slow: - - - - - - - - - - - - - - - - - - - - - -
Activity
Total Reads
Cache:
Database:
Total Writes
Cache:
Database:
Get/Select (Success)
(%)
Database: (100.000%)
Set/Insert (Success)
Cache: (100.000%)
Database: (100.000%)
Increment/Decrement (Success)
(%)
(%)
CAS/Update (Success)
( 0) { echo number_format(($MemStats['cas_hits']/($MemStats['cas_hits']+$MemStats['cas_misses']))*100, 3); } else { echo '0.000'; }?>%)
Database: (100.000%)
Deletes (Success)
(%)
Database: (100.000%)
Special
Data Read
Cache:
Database:
Data Write
Cache:
Database:
-
-
- - - - - - - >Cache: - - - - - - - - - >Cache: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Concurrency
Total Reads
/s
Database:/s
Total Writes
/s
Database:/s
Get/Select
Cache:/s
Database:/s
Set/Insert
Cache:/s
Database:/s
Increment/Decrement
Cache Increment:/s
Cache Decrement:/s
CAS/Updates
Cache:/s
Database:/s
Deletes
Cache:/s
Database:/s
Special
Cache Flushes:/s
Cache Evicted:/s
Database Slow:/s
Data Read
Cache:/s
Database:/s
Data Write
Cache:/s
Database:/s
-
- - +flush(); +} +$DB->query('SHOW GLOBAL STATUS'); +$DBStats =$DB->to_array('Variable_name'); +$MemStats = $Cache->getStats(); + +show_header("Service Stats"); +?> +
+ [Database Specifics] +
+
+
+ + + + + + + + + + + 0.7) { echo ' class="invalid" '; } ?>>Database: + + + + + + + + + + + + + + + + + + + + + + + + 0.85) { echo ' class="invalid" title="Evictions begin when storage exceeds 85%" '; } ?>>Cache Storage: + + + + + + + + +
Service
Threads (Active)
Cache: (100.000%)
(%)
Connections
Cache:
Database:
Special
Cache Current Index:
Cache Total Index:
(%)
Utilities
Cache: +
+ + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + >Cache: + + + + + + + + + + + + + + + + + + >Cache Increment: + + + + >Cache Decrement: + + + + + 0 && $MemStats['cas_hits']/($MemStats['cas_hits']+$MemStats['cas_misses']) < 0.7) { echo ' class="invalid" title="More than 30% of the issued CAS commands were unnecessary wasting time and resources." '; } elseif ($MemStats['cas_hits'] == 0) { echo ' class="notice" title="Disable CAS with the -C parameter and save resources since it is not used." '; } ?>>Cache: + + + + + + + + + >Cache: + + + + + + + + + + $MemStats['uptime']/7*24*3600) { echo ' class="invalid" title="Flushing the cache on a regular basis defeats the benefits of it, look into using cache transactions, or deletes instead of global flushing where possible." '; } ?>>Cache Flushes: + + + + 0) { echo ' class="invalid" '; } ?>>Cache Evicted: + + + + $DBStats['Questions']['Value']/7500) { echo ' class="invalid" title="1/7500 queries is allowed to be slow to minimize performance impact." '; } ?>>Database Slow: + + + + + + + + + + + + + + + + + + + + + +
Activity
Total Reads
Cache:
Database:
Total Writes
Cache:
Database:
Get/Select (Success)
(%)
Database: (100.000%)
Set/Insert (Success)
Cache: (100.000%)
Database: (100.000%)
Increment/Decrement (Success)
(%)
(%)
CAS/Update (Success)
( 0) { echo number_format(($MemStats['cas_hits']/($MemStats['cas_hits']+$MemStats['cas_misses']))*100, 3); } else { echo '0.000'; }?>%)
Database: (100.000%)
Deletes (Success)
(%)
Database: (100.000%)
Special
Data Read
Cache:
Database:
Data Write
Cache:
Database:
+
+
+ + + + + + + >Cache: + + + + + + + + + >Cache: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Concurrency
Total Reads
/s
Database:/s
Total Writes
/s
Database:/s
Get/Select
Cache:/s
Database:/s
Set/Insert
Cache:/s
Database:/s
Increment/Decrement
Cache Increment:/s
Cache Decrement:/s
CAS/Updates
Cache:/s
Database:/s
Deletes
Cache:/s
Database:/s
Special
Cache Flushes:/s
Cache Evicted:/s
Database Slow:/s
Data Read
Cache:/s
Database:/s
Data Write
Cache:/s
Database:/s
+
+
+ diff --git a/sections/tools/managers/bans.php b/sections/tools/managers/bans.php index 4943c3f9..da056fae 100644 --- a/sections/tools/managers/bans.php +++ b/sections/tools/managers/bans.php @@ -79,7 +79,7 @@
- +
- - + + diff --git a/sections/tools/managers/eb.php b/sections/tools/managers/eb.php index 9f3613a3..f729f3a8 100644 --- a/sections/tools/managers/eb.php +++ b/sections/tools/managers/eb.php @@ -22,8 +22,8 @@ - - + + diff --git a/sections/tools/managers/forum_list.php b/sections/tools/managers/forum_list.php index 666059e8..92b5ad9f 100644 --- a/sections/tools/managers/forum_list.php +++ b/sections/tools/managers/forum_list.php @@ -119,8 +119,8 @@ function class_list($Selected=0){ - - + + diff --git a/sections/tools/managers/official_tags.php b/sections/tools/managers/official_tags.php index 44291a3a..9a609e77 100644 --- a/sections/tools/managers/official_tags.php +++ b/sections/tools/managers/official_tags.php @@ -1 +1,106 @@ -query("UPDATE tags SET TagType = 'other' WHERE ID IN ($OldTagIDs)"); } if ($_POST['newtag']) { $TagName = sanitize_tag($_POST['newtag']); $DB->query("SELECT t.ID FROM tags AS t WHERE t.Name LIKE '".$TagName."'"); list($TagID) = $DB->next_record(); if($TagID) { $DB->query("UPDATE tags SET TagType = 'genre' WHERE ID = $TagID"); } else { // Tag doesn't exist yet - create tag $DB->query("INSERT INTO tags (Name, UserID, TagType, Uses) VALUES ('".$TagName."', ".$LoggedUser['ID'].", 'genre', 0)"); $TagID = $DB->inserted_id(); } } $Cache->delete_value('genre_tags'); } show_header('Official Tags'); ?>

Official Tags

diff --git a/sections/tools/managers/dnu_list.php b/sections/tools/managers/dnu_list.php index 82a5c8de..2d2b1e61 100644 --- a/sections/tools/managers/dnu_list.php +++ b/sections/tools/managers/dnu_list.php @@ -44,8 +44,8 @@
Add Do Not Upload
Add Do Not Upload
Added Submit
Add To Email or Domain to Blacklist
Add To Email or Domain to Blacklist
Create forum
Create forum
query("SELECT ID, Name, Uses FROM tags WHERE TagType='genre' ORDER BY Name ASC"); $TagCount = $DB->record_count(); $Tags = $DB->to_array(); for ($i = 0; $i < $TagCount / 3; $i++) { list($TagID1, $TagName1, $TagUses1) = $Tags[$i]; list($TagID2, $TagName2, $TagUses2) = $Tags[ceil($TagCount/3) + $i]; list($TagID3, $TagName3, $TagUses3) = $Tags[2*ceil($TagCount/3) + $i]; ?>
Remove Tag Uses     Remove Tag Uses     Remove Tag Uses
             
+query("UPDATE tags SET TagType = 'other' WHERE ID IN ($OldTagIDs)"); + } + + if ($_POST['newtag']) { + $TagName = sanitize_tag($_POST['newtag']); + + $DB->query("SELECT t.ID FROM tags AS t WHERE t.Name LIKE '".$TagName."'"); + list($TagID) = $DB->next_record(); + + if($TagID) { + $DB->query("UPDATE tags SET TagType = 'genre' WHERE ID = $TagID"); + } else { // Tag doesn't exist yet - create tag + $DB->query("INSERT INTO tags (Name, UserID, TagType, Uses) VALUES ('".$TagName."', ".$LoggedUser['ID'].", 'genre', 0)"); + $TagID = $DB->inserted_id(); + } + } + + $Cache->delete_value('genre_tags'); +} + +show_header('Official Tags'); +?> +
+

Official Tags

+
+
+
+
+ + + + + + + + + + + + + + + + + +query("SELECT ID, Name, Uses FROM tags WHERE TagType='genre' ORDER BY Name ASC"); +$TagCount = $DB->record_count(); +$Tags = $DB->to_array(); +for ($i = 0; $i < $TagCount / 3; $i++) { + list($TagID1, $TagName1, $TagUses1) = $Tags[$i]; + list($TagID2, $TagName2, $TagUses2) = $Tags[ceil($TagCount/3) + $i]; + list($TagID3, $TagName3, $TagUses3) = $Tags[2*ceil($TagCount/3) + $i]; +?> + + + + + + + + + + + + + + + + + + + + + +
RemoveTagUses   RemoveTagUses   RemoveTagUses
       + + + +        + + + +
+
+
+
+ diff --git a/sections/tools/managers/permissions_alter.php b/sections/tools/managers/permissions_alter.php index 7666d64f..e68e1fe0 100644 --- a/sections/tools/managers/permissions_alter.php +++ b/sections/tools/managers/permissions_alter.php @@ -19,7 +19,7 @@ function display_perm($Key,$Title) { [Back to permission list] [Back to Tools] - +
diff --git a/sections/tools/managers/recommend_list.php b/sections/tools/managers/recommend_list.php index c57881e2..7e3acbd6 100644 --- a/sections/tools/managers/recommend_list.php +++ b/sections/tools/managers/recommend_list.php @@ -24,7 +24,7 @@ -
Permission Name
+
diff --git a/sections/tools/managers/whitelist_list.php b/sections/tools/managers/whitelist_list.php index 2ca0f94b..c2e28e2f 100644 --- a/sections/tools/managers/whitelist_list.php +++ b/sections/tools/managers/whitelist_list.php @@ -43,8 +43,8 @@
Add Recommendation: Link to a torrent group on site. E.g. http:///torrents.php?id=10000
- - + + diff --git a/sections/tools/misc/clear_cache.php b/sections/tools/misc/clear_cache.php index 755e97bc..569b374d 100644 --- a/sections/tools/misc/clear_cache.php +++ b/sections/tools/misc/clear_cache.php @@ -23,7 +23,7 @@ -
Add Client
Add Client
+
Key diff --git a/sections/tools/misc/create_user.php b/sections/tools/misc/create_user.php index 2fe577c0..c6b3bec0 100644 --- a/sections/tools/misc/create_user.php +++ b/sections/tools/misc/create_user.php @@ -81,7 +81,7 @@ - +
diff --git a/sections/tools/misc/manipulate_tree.php b/sections/tools/misc/manipulate_tree.php index 5faeb25a..7aec19a2 100644 --- a/sections/tools/misc/manipulate_tree.php +++ b/sections/tools/misc/manipulate_tree.php @@ -105,7 +105,7 @@ -
Username 
+
UserID diff --git a/sections/tools/tools.php b/sections/tools/tools.php index 19b3f7d0..74571b09 100644 --- a/sections/tools/tools.php +++ b/sections/tools/tools.php @@ -6,8 +6,8 @@ ?>
- - +
Managers
+ @@ -38,8 +38,8 @@
Managers
Permissions
- - +
Data
+ @@ -65,8 +65,8 @@
Data
- - +
Misc
+ diff --git a/sections/top10/history.php b/sections/top10/history.php index 69668d92..d91e531e 100644 --- a/sections/top10/history.php +++ b/sections/top10/history.php @@ -17,7 +17,7 @@

Search for a date! (After 2010-09-05)

-
Misc
Manipulate Tree
+
@@ -90,7 +90,7 @@

Top 10 for

-
Date:
+
diff --git a/sections/top10/torrents.php b/sections/top10/torrents.php index 952eddcf..3bfe01e1 100644 --- a/sections/top10/torrents.php +++ b/sections/top10/torrents.php @@ -56,7 +56,7 @@
-
+
Tags (comma-separated): @@ -309,7 +309,7 @@ function generate_torrent_table($Caption, $Tag, $Details, $Limit) { - +
@@ -370,7 +370,7 @@ function generate_torrent_table($Caption, $Tag, $Details, $Limit) { $AddExtra=''; if($Format) { $ExtraInfo.=$Format; $AddExtra=' / '; } if($Encoding) { $ExtraInfo.=$AddExtra.$Encoding; $AddExtra=' / '; } - "FLAC / Lossless / Log (100%) / Cue / CD"; + // "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=' / '; } @@ -397,7 +397,7 @@ function generate_torrent_table($Caption, $Tag, $Details, $Limit) { // print row ?> - +
-
+
- +
- +
get_value('genre_tags'); @@ -754,7 +754,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
- +
@@ -780,7 +780,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
0) { ?> -
(View Tags)
+
diff --git a/sections/torrents/browse2.php b/sections/torrents/browse2.php index 09ba92a2..1453e80f 100644 --- a/sections/torrents/browse2.php +++ b/sections/torrents/browse2.php @@ -553,7 +553,7 @@ function header_link($SortKey,$DefaultWay="desc") {
- +
- +
get_value('genre_tags'); @@ -606,7 +606,7 @@ function header_link($SortKey,$DefaultWay="desc") {
- +
@@ -681,7 +681,7 @@ function header_link($SortKey,$DefaultWay="desc") {
- +
diff --git a/sections/torrents/delete.php b/sections/torrents/delete.php index a769ab7d..0eccc028 100644 --- a/sections/torrents/delete.php +++ b/sections/torrents/delete.php @@ -147,7 +147,7 @@ -
+
Torrent: diff --git a/sections/torrents/details.php b/sections/torrents/details.php index 1f88bbd6..2985d83c 100644 --- a/sections/torrents/details.php +++ b/sections/torrents/details.php @@ -365,7 +365,7 @@ function compare($X, $Y){
- +
@@ -448,7 +448,7 @@ function filelist($Str) { $FileList = str_replace(array('_','-'), ' ', $FileList); $FileList = str_replace('|||','
Torrents Size
',display_str($FileList)); $FileList = preg_replace_callback('/\{\{\{([^\{]*)\}\}\}/i','filelist',$FileList); - $FileList = '
File Name'.(check_perms('users_mod') ? ' [Regenerate]' : '').'
'.(empty($FilePath) ? '' : '/'.$FilePath.'/' ).'
Size
'.$FileList."
"; + $FileList = '
File Name'.(check_perms('users_mod') ? ' [Regenerate]' : '').'
'.(empty($FilePath) ? '' : '/'.$FilePath.'/' ).'
Size
'.$FileList."
"; $ExtraInfo=''; // String that contains information on the torrent, eg. format and encoding $AddExtra=''; // Separator between torrent properties @@ -603,7 +603,7 @@ function filelist($Str) { ?>
Requests () (Show)
- + @@ -660,7 +660,7 @@ function filelist($Str) { $SeeAll = ''; } ?> - +
@@ -705,7 +705,7 @@ function filelist($Str) { $SeeAll = ''; } ?> -
This album is in collage1)?'s':'')?> # torrents
+
diff --git a/sections/torrents/edit.php b/sections/torrents/edit.php index 9610526c..59f1c9c2 100644 --- a/sections/torrents/edit.php +++ b/sections/torrents/edit.php @@ -106,7 +106,7 @@ -
This album is in personal collage1)?'s':'')?> # torrents
+
Group ID @@ -127,7 +127,7 @@ - +
Artist diff --git a/sections/torrents/editgroup.php b/sections/torrents/editgroup.php index 43b87f0d..a6625bec 100644 --- a/sections/torrents/editgroup.php +++ b/sections/torrents/editgroup.php @@ -85,7 +85,7 @@ - +
diff --git a/sections/torrents/masspm.php b/sections/torrents/masspm.php index 33ac4189..e2a0b19c 100644 --- a/sections/torrents/masspm.php +++ b/sections/torrents/masspm.php @@ -48,22 +48,22 @@ -
This is for editing the information related to the original release only.
+
Subject - +
Message - +
- +
diff --git a/sections/torrents/notify.php b/sections/torrents/notify.php index 0cdebab0..3915485b 100644 --- a/sections/torrents/notify.php +++ b/sections/torrents/notify.php @@ -53,7 +53,7 @@ record_count()) { ?> - +
No new notifications found! Edit notification filters @@ -84,7 +84,7 @@ (clear selected) - +
@@ -145,9 +145,9 @@ // print row ?> - + - +
[ DL diff --git a/sections/torrents/user.php b/sections/torrents/user.php index 8776acd2..20385c32 100644 --- a/sections/torrents/user.php +++ b/sections/torrents/user.php @@ -276,7 +276,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
- +
Search for: @@ -368,7 +368,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
- +
-
+
diff --git a/sections/torrents/warn.php b/sections/torrents/warn.php index 0cf55b62..c294c9d7 100644 --- a/sections/torrents/warn.php +++ b/sections/torrents/warn.php @@ -28,7 +28,7 @@ -
Torrent
+
Reason: diff --git a/sections/upload/upload.php b/sections/upload/upload.php index 458da9d9..a9aa7f15 100644 --- a/sections/upload/upload.php +++ b/sections/upload/upload.php @@ -108,7 +108,7 @@ (Show)

- +
diff --git a/sections/user/advancedsearch.php b/sections/user/advancedsearch.php index a07fe2fd..962056f9 100644 --- a/sections/user/advancedsearch.php +++ b/sections/user/advancedsearch.php @@ -424,7 +424,7 @@ function num_compare($Field, $Operand, $Num1, $Num2 = ''){
-
Name Comment
+
Username: diff --git a/sections/user/connchecker.php b/sections/user/connchecker.php index 527eb07e..77221017 100644 --- a/sections/user/connchecker.php +++ b/sections/user/connchecker.php @@ -39,7 +39,7 @@

> Connectability Checker

- +
IP diff --git a/sections/user/edit.php b/sections/user/edit.php index fa1dbc49..d67ca599 100644 --- a/sections/user/edit.php +++ b/sections/user/edit.php @@ -74,7 +74,7 @@ function checked($Checked) { - +
Site preferences @@ -138,7 +138,7 @@ function checked($Checked) {
Hide release types - +
-
+
Email: diff --git a/sections/user/linkedfunctions.php b/sections/user/linkedfunctions.php index 48962d0f..bff67501 100644 --- a/sections/user/linkedfunctions.php +++ b/sections/user/linkedfunctions.php @@ -168,7 +168,7 @@ function user_dupes_table($UserID) {
Linked Account (View)
- + ':''?> query("SELECT ID FROM users_main WHERE Username LIKE '".db_string($Target)."'"); if (list($TargetID) = $DB->next_record()) { link_users($UserID, $TargetID); } else { error("User '$Target' not found."); } } $DB->query("SELECT GroupID FROM users_dupes WHERE UserID = '$UserID'"); list($GroupID) = $DB->next_record(); if ($_REQUEST['dupecomments'] && $GroupID) { dupe_comments($GroupID, $_REQUEST['dupecomments']); } break; default: error(403); } echo '\o/'; header("Location: user.php?id=$UserID"); ?> \ No newline at end of file +query("SELECT ID FROM users_main WHERE Username LIKE '".db_string($Target)."'"); + if (list($TargetID) = $DB->next_record()) { + link_users($UserID, $TargetID); + } else { + error("User '$Target' not found."); + } + } + + $DB->query("SELECT GroupID FROM users_dupes WHERE UserID = '$UserID'"); + list($GroupID) = $DB->next_record(); + + if ($_REQUEST['dupecomments'] && $GroupID) { + dupe_comments($GroupID, $_REQUEST['dupecomments']); + } + break; + + default: + error(403); + } + echo '\o/'; + header("Location: user.php?id=$UserID"); +?> \ No newline at end of file diff --git a/sections/user/notify_edit.php b/sections/user/notify_edit.php index e7d38972..88c04d11 100644 --- a/sections/user/notify_edit.php +++ b/sections/user/notify_edit.php @@ -40,7 +40,7 @@ - > + > $NumFilters){ ?> diff --git a/sections/user/permissions.php b/sections/user/permissions.php index b30668b0..63c0588b 100644 --- a/sections/user/permissions.php +++ b/sections/user/permissions.php @@ -76,7 +76,7 @@ function reset() {
- +
diff --git a/sections/user/search.php b/sections/user/search.php index c2fa2c98..78f7a44c 100644 --- a/sections/user/search.php +++ b/sections/user/search.php @@ -51,7 +51,7 @@ -
Extra personal collages
+
Username: diff --git a/sections/user/sessions.php b/sections/user/sessions.php index 42f16a40..69228e2e 100644 --- a/sections/user/sessions.php +++ b/sections/user/sessions.php @@ -47,7 +47,7 @@

Note: Clearing cookies can result in ghost sessions which are automatically removed after 30 days.

- +
diff --git a/sections/user/user.php b/sections/user/user.php index 1a23037d..cde29e11 100644 --- a/sections/user/user.php +++ b/sections/user/user.php @@ -678,7 +678,7 @@ function check_paranoia_here($Setting) { $Cache->cache_value('recent_snatches_'.$UserID, $RecentSnatches, 0); //inf cache } ?> -
IP Browser
+
@@ -718,7 +718,7 @@ function check_paranoia_here($Setting) { $Cache->cache_value('recent_uploads_'.$UserID, $RecentUploads, 0); //inf cache } ?> -
Recent Snatches
+
@@ -747,18 +747,18 @@ function check_paranoia_here($Setting) { ORDER BY ct.Sort LIMIT 5"); $Collage = $DB->to_array(); ?> -
Recent Uploads
+
- > +
Requests (View)
-
- see full - +
@@ -922,7 +922,7 @@ function check_paranoia_here($Setting) { ?>
Staff PMs (View)
- + @@ -999,9 +999,9 @@ function check_paranoia_here($Setting) { - - - +
User Info
+ + @@ -1170,7 +1170,7 @@ function check_paranoia_here($Setting) {
User Info

- +
@@ -1227,7 +1227,7 @@ function check_paranoia_here($Setting) {
Warn User

- +
query("SELECT DISTINCT Email, IP FROM users_history_emails WHERE UserID = ".$UserID." ORDER BY Time ASC"); @@ -1309,7 +1309,7 @@ function check_paranoia_here($Setting) {
User Privileges

- +
@@ -1322,7 +1322,7 @@ function check_paranoia_here($Setting) {
Session
Reset session:
- +
diff --git a/sections/userhistory/subscribed_collages.php b/sections/userhistory/subscribed_collages.php index 1bba2c0b..add61426 100644 --- a/sections/userhistory/subscribed_collages.php +++ b/sections/userhistory/subscribed_collages.php @@ -284,7 +284,7 @@
Submit
Reason:
- +
diff --git a/sections/wiki/aliases.php b/sections/wiki/aliases.php index 6616e630..b2da1a2a 100644 --- a/sections/wiki/aliases.php +++ b/sections/wiki/aliases.php @@ -18,7 +18,7 @@ -
+
diff --git a/sections/wiki/search.php b/sections/wiki/search.php index d99239e3..3d180907 100644 --- a/sections/wiki/search.php +++ b/sections/wiki/search.php @@ -66,7 +66,7 @@ -
Add an alias to this article
+
Search for: diff --git a/staffpm.php b/staffpm.php index 890998b1..62025895 100644 --- a/staffpm.php +++ b/staffpm.php @@ -1,2 +1,2 @@ -
Message from report " + reportid + ": " + message + "\n
"; + div.innerHTML = "
Message from report " + reportid + ": " + message + "\n
"; $('#all_reports').raw().insertBefore(div, $('#all_reports').raw().firstChild); } @@ -102,7 +102,7 @@ function NewReport(q, view, id) { if(!$('#report').results() && !$('#no_reports').results()) { var div = document.createElement("div"); div.id = "no_reports"; - div.innerHTML = "
No new reports! \\o/
"; + div.innerHTML = "
No new reports! \\o/
"; $('#all_reports').raw().appendChild(div); } } diff --git a/static/styles/celebrate/images/Anonymous.ttf b/static/styles/celebrate/images/Anonymous.ttf deleted file mode 100644 index 6419ef45..00000000 Binary files a/static/styles/celebrate/images/Anonymous.ttf and /dev/null differ diff --git a/static/styles/postmod/images/Anonymous.ttf b/static/styles/postmod/images/Anonymous.ttf deleted file mode 100644 index 6419ef45..00000000 Binary files a/static/styles/postmod/images/Anonymous.ttf and /dev/null differ diff --git a/static/styles/proton/style.css b/static/styles/proton/style.css index bf14b7f0..48e7be89 100644 --- a/static/styles/proton/style.css +++ b/static/styles/proton/style.css @@ -1207,7 +1207,7 @@ strong.quoteheader { .permission_container { float:left; - width:33.33%; + width:33.3%; } /* TORRENTS */