diff --git a/classes/class_torrent_form.php b/classes/class_torrent_form.php index 2d77566d..ca4e8c88 100644 --- a/classes/class_torrent_form.php +++ b/classes/class_torrent_form.php @@ -347,7 +347,7 @@ function show() { +
Search File Lists
+ + /> - + diff --git a/sections/forums/poll_vote.php b/sections/forums/poll_vote.php index f870c2dd..65031698 100644 --- a/sections/forums/poll_vote.php +++ b/sections/forums/poll_vote.php @@ -69,9 +69,9 @@ ?> Please select an option.
- + - + diff --git a/sections/forums/warn.php b/sections/forums/warn.php index b83225d5..787809b3 100644 --- a/sections/forums/warn.php +++ b/sections/forums/warn.php @@ -19,10 +19,10 @@
- - - - + + + + @@ -36,10 +36,10 @@ diff --git a/sections/inbox/compose.php b/sections/inbox/compose.php index 75f2c3d6..09584562 100644 --- a/sections/inbox/compose.php +++ b/sections/inbox/compose.php @@ -30,7 +30,7 @@

Subject

-
+

Body

@@ -45,4 +45,4 @@ \ No newline at end of file +?> diff --git a/sections/index/private.php b/sections/index/private.php index 53b48140..3bad0ee4 100644 --- a/sections/index/private.php +++ b/sections/index/private.php @@ -309,8 +309,8 @@
- - + + diff --git a/sections/login/recover_step2.php b/sections/login/recover_step2.php index e0e23f37..aaabe663 100644 --- a/sections/login/recover_step2.php +++ b/sections/login/recover_step2.php @@ -17,22 +17,22 @@
Reason:
- + - +
Password 
Confirm Password 
- Your password has been succesfully reset.
+ Your password has been successfully reset.
Please click here to log in using your new password.
\ No newline at end of file +?> diff --git a/sections/register/step1.php b/sections/register/step1.php index f4d093c7..19d16603 100644 --- a/sections/register/step1.php +++ b/sections/register/step1.php @@ -31,11 +31,11 @@ Password  - + Verify Password  - +

A strong password is 8 characters or longer, contains at least 1 lowercase and uppercase letter, and contains at least a number or a symbol.

diff --git a/sections/reportsv2/reports.php b/sections/reportsv2/reports.php index c31bf83f..258250cc 100644 --- a/sections/reportsv2/reports.php +++ b/sections/reportsv2/reports.php @@ -29,7 +29,7 @@ function Taste(torrent_id, report_id, taste) {
- | + | | |
diff --git a/sections/requests/new_edit.php b/sections/requests/new_edit.php index 9587f2b1..6a80d840 100644 --- a/sections/requests/new_edit.php +++ b/sections/requests/new_edit.php @@ -281,8 +281,7 @@ $Val) { if($Key % 8 == 0) echo "
";?> - /> + /> @@ -294,7 +293,7 @@ if($Key % 8 == 0) echo "
";?> - onchange="if(!this.checked) { $('#toggle_bitrates').raw().checked = false; }"/> + onchange="if(!this.checked) { $('#toggle_bitrates').raw().checked = false; }" /> @@ -306,7 +305,7 @@ if($Key % 8 == 0) echo "
";?> - onchange="if(!this.checked) { $('#toggle_media').raw().checked = false; }"/> + onchange="if(!this.checked) { $('#toggle_media').raw().checked = false; }" /> @@ -314,7 +313,7 @@ Log / Cue (FLAC only) /> - +
/>
@@ -331,7 +330,7 @@ Torrent Group - https://what.cd/torrents.php?id=
+ https://what.cd/torrents.php?id=
If this request matches a torrent group already existing on the site, please indicate that here. @@ -358,7 +357,7 @@ - + % of this is deducted as tax by the system. diff --git a/sections/requests/request.php b/sections/requests/request.php index db9289c9..77e57672 100644 --- a/sections/requests/request.php +++ b/sections/requests/request.php @@ -389,7 +389,7 @@ - + % of this is deducted as tax by the system. @@ -402,7 +402,7 @@ - + @@ -410,7 +410,7 @@ If you add the entered 0.00 MB of bounty, your new stats will be:
Uploaded: Ratio: - + @@ -611,4 +611,4 @@ - \ No newline at end of file + diff --git a/sections/tools/data/common_snatches.php b/sections/tools/data/common_snatches.php index bed1aa07..286cc6a3 100644 --- a/sections/tools/data/common_snatches.php +++ b/sections/tools/data/common_snatches.php @@ -20,16 +20,16 @@
- + - + - + - +
@@ -67,4 +67,4 @@ } show_footer(); -?> \ No newline at end of file +?> diff --git a/sections/tools/managers/news.php b/sections/tools/managers/news.php index 85116281..65c197c3 100644 --- a/sections/tools/managers/news.php +++ b/sections/tools/managers/news.php @@ -40,7 +40,7 @@

Title

/> - +

Body



diff --git a/sections/tools/managers/tag_aliases.php b/sections/tools/managers/tag_aliases.php index c846fbde..38cfb4fc 100644 --- a/sections/tools/managers/tag_aliases.php +++ b/sections/tools/managers/tag_aliases.php @@ -45,13 +45,13 @@
- + - + - +
@@ -64,17 +64,17 @@ - + - + - - + + - \ No newline at end of file + diff --git a/sections/torrents/warn.php b/sections/torrents/warn.php index 17691392..2723df65 100644 --- a/sections/torrents/warn.php +++ b/sections/torrents/warn.php @@ -23,16 +23,16 @@
- - - - - + + + + + @@ -41,10 +41,10 @@ @@ -65,4 +65,4 @@
Reason: - +
- \ No newline at end of file + diff --git a/sections/user/edit.php b/sections/user/edit.php index d330c2bf..7af302b6 100644 --- a/sections/user/edit.php +++ b/sections/user/edit.php @@ -441,11 +441,11 @@ function checked($Checked) { New password - + Re-type new password - + diff --git a/sections/user/tc_advancedsearch.php b/sections/user/tc_advancedsearch.php deleted file mode 100644 index 92d690d5..00000000 --- a/sections/user/tc_advancedsearch.php +++ /dev/null @@ -1,395 +0,0 @@ ->>>>>>>>>>>>>>>>>>>>>>>>>> User search <<<<<<<<<<<<<<<<<<<<<<<<<<<<* - * Best viewed with a wide screen monitor * - **********************************************************************/ -if (!empty($_GET['search'])) { - if (preg_match("/^".IP_REGEX."$/", $_GET['search'])) { - $_GET['ip'] = $_GET['search']; - } elseif (preg_match("/^".EMAIL_REGEX."$/i", $_GET['search'])) { - $_GET['email'] = $_GET['search']; - } elseif (preg_match('/^[a-z0-9_?]{1,20}$/iD',$_GET['search'])) { - $DB->query("SELECT ID FROM users_main WHERE Username='".db_string($_GET['search'])."'"); - if (list($ID) = $DB->next_record()) { - header('Location: user.php?id='.$ID); - die(); - } - $_GET['username'] = $_GET['search']; - } else { - $_GET['comment'] = $_GET['search']; - } -} - -define('USERS_PER_PAGE', 30); - -if(!check_perms("tc_advanced_user_search")) { error(403); } - -function wrap($String, $ForceMatch = '', $IPSearch = false){ - if(!$ForceMatch){ - global $Match; - } else { - $Match = $ForceMatch; - } - if($Match == ' REGEXP '){ - if(strpos($String, '\'') !== false || preg_match('/^.*\\\\$/i', $String)){ - error('Regex contains illegal characters.'); - } - } else { - $String = db_string($String); - } - if($Match == ' LIKE '){ - // Fuzzy search - // Stick in wildcards at beginning and end of string unless string starts or ends with | - if (($String[0] != '|') && !$IPSearch) { - $String = '%'.$String; - } elseif ($String[0] == '|') { - $String = substr($String, 1, strlen($String)); - } - - if(substr($String, -1, 1) != '|'){ - $String = $String.'%'; - } else { - $String = substr($String, 0, -1); - } - - } - $String="'$String'"; - return $String; -} - -function date_compare($Field, $Operand, $Date1, $Date2 = ''){ - $Date1 = db_string($Date1); - $Date2 = db_string($Date2); - $Return = array(); - - switch($Operand){ - case 'on': - $Return []= " $Field>='$Date1 00:00:00' "; - $Return []= " $Field<='$Date1 23:59:59' "; - break; - case 'before': - $Return []= " $Field<'$Date1 00:00:00' "; - break; - case 'after': - $Return []= " $Field>'$Date1 23:59:59' "; - break; - case 'between': - $Return []= " $Field>='$Date1 00:00:00' "; - $Return []= " $Field<='$Date2 00:00:00' "; - break; - } - - return $Return; -} - - -function num_compare($Field, $Operand, $Num1, $Num2 = ''){ - - if($Num1!=0){ - $Num1 = db_string($Num1); - } - if($Num2!=0){ - $Num2 = db_string($Num2); - } - - $Return = array(); - - switch($Operand){ - case 'equal': - $Return []= " $Field='$Num1' "; - break; - case 'above': - $Return []= " $Field>'$Num1' "; - break; - case 'below': - $Return []= " $Field<'$Num1' "; - break; - case 'between': - $Return []= " $Field>'$Num1' "; - $Return []= " $Field<'$Num2' "; - break; - default: - print_r($Return); - die(); - } - return $Return; -} - -// Arrays, regexes, and all that fun stuff we can use for validation, form generation, etc - -$DateChoices = array('inarray'=>array('on', 'before', 'after', 'between')); -$SingleDateChoices = array('inarray'=>array('on', 'before', 'after')); -$NumberChoices = array('inarray'=>array('equal', 'above', 'below', 'between', 'buffer')); -$YesNo = array('inarray'=>array('any', 'yes', 'no')); -$OrderVals = array('inarray'=>array('Username', 'Ratio', 'IP', 'Email', 'Joined', 'Last Seen', 'Uploaded', 'Downloaded', 'Invites', 'Snatches')); -$WayVals = array('inarray'=>array('Ascending', 'Descending')); - -if(count($_GET)){ - $DateRegex = array('regex'=>'/\d{4}-\d{2}-\d{2}/'); - - $ClassIDs = array(); - $SecClassIDs = array(); - foreach ($Classes as $ClassID => $Value) { - if ($Value['Secondary']) { - $SecClassIDs[]=$ClassID; - } else { - $ClassIDs[]=$ClassID; - } - } - - $Val->SetFields('comment','0','string','Comment is too long.', array('maxlength'=>512)); - $Val->SetFields('disabled_invites', '0', 'inarray', 'Invalid disabled_invites field', $YesNo); - - - $Val->SetFields('joined', '0', 'inarray', 'Invalid joined field', $DateChoices); - $Val->SetFields('join1', '0', 'regex', 'Invalid join1 field', $DateRegex); - $Val->SetFields('join2', '0', 'regex', 'Invalid join2 field', $DateRegex); - - $Val->SetFields('lastactive', '0', 'inarray', 'Invalid lastactive field', $DateChoices); - $Val->SetFields('lastactive1', '0', 'regex', 'Invalid lastactive1 field', $DateRegex); - $Val->SetFields('lastactive2', '0', 'regex', 'Invalid lastactive2 field', $DateRegex); - - $Val->SetFields('ratio', '0', 'inarray', 'Invalid ratio field', $NumberChoices); - $Val->SetFields('uploaded', '0', 'inarray', 'Invalid uploaded field', $NumberChoices); - $Val->SetFields('downloaded', '0', 'inarray', 'Invalid downloaded field', $NumberChoices); - //$Val->SetFields('snatched', '0', 'inarray', 'Invalid snatched field', $NumberChoices); - - $Val->SetFields('matchtype', '0', 'inarray', 'Invalid matchtype field', array('inarray'=>array('strict', 'fuzzy', 'regex'))); - - - $Val->SetFields('enabled', '0', 'inarray', 'Invalid enabled field', array('inarray'=>array('', 0, 1, 2))); - $Val->SetFields('class', '0', 'inarray', 'Invalid class', array('inarray'=>$ClassIDs)); - $Val->SetFields('secclass', '0', 'inarray', 'Invalid class', array('inarray'=>$SecClassIDs)); - $Val->SetFields('donor', '0', 'inarray', 'Invalid donor field', $YesNo); - $Val->SetFields('warned', '0', 'inarray', 'Invalid warned field', $YesNo); - $Val->SetFields('disabled_uploads', '0', 'inarray', 'Invalid disabled_uploads field', $YesNo); - - $Val->SetFields('order', '0', 'inarray', 'Invalid ordering', $OrderVals); - $Val->SetFields('way', '0', 'inarray', 'Invalid way', $WayVals); - - $Val->SetFields('passkey', '0', 'string', 'Invalid passkey', array('maxlength'=>32)); - $Val->SetFields('avatar', '0', 'string', 'Avatar URL too long', array('maxlength'=>512)); - $Val->SetFields('stylesheet', '0', 'inarray', 'Invalid stylesheet', array_unique(array_keys($Stylesheets))); - $Val->SetFields('cc', '0', 'inarray', 'Invalid Country Code', array('maxlength'=>2)); - - $Err = $Val->ValidateForm($_GET); - - if(!$Err){ - // Passed validation. Let's rock. - $RunQuery = false; // if we should run the search - - if(isset($_GET['matchtype']) && $_GET['matchtype'] == 'strict'){ - $Match = ' = '; - } elseif(isset($_GET['matchtype']) && $_GET['matchtype'] == 'regex') { - $Match = ' REGEXP '; - } else { - $Match = ' LIKE '; - } - - $OrderTable = array('Username'=>'um1.Username', 'Joined'=>'ui1.JoinDate', 'Email'=>'um1.Email', 'IP'=>'um1.IP', 'Last Seen'=>'um1.LastAccess'); - - $WayTable = array('Ascending'=>'ASC', 'Descending'=>'DESC'); - - $Where = array(); - $Having = array(); - $Join = array(); - $Group = array(); - $Distinct = ''; - $Order = ''; - - - $SQL = 'SQL_CALC_FOUND_ROWS - um1.ID, - um1.Username, - um1.Email, - um1.IP, - ui1.JoinDate, - um1.LastAccess - FROM users_main AS um1 JOIN users_info AS ui1 ON ui1.UserID=um1.ID '; - - if(!empty($_GET['username'])){ - $Where[]='um1.Username'.$Match.wrap($_GET['username']); - } - - if(!empty($_GET['email'])){ - if(isset($_GET['email_history'])){ - $Distinct = 'DISTINCT '; - $Join['he']=' JOIN users_history_emails AS he ON he.UserID=um1.ID '; - $Where[]= ' he.Email '.$Match.wrap($_GET['email']); - $Where[] = " he.Email NOT LIKE '%what.cd'"; - } else { - $Where[]='um1.Email'.$Match.wrap($_GET['email']); - } - } - $Where[] = " um1.Email NOT LIKE '%what.cd'"; - - if (!empty($_GET['email_cnt'])) { - $Query = "SELECT UserID FROM users_history_emails GROUP BY UserID HAVING COUNT(DISTINCT Email) "; - if ($_GET['emails_opt'] === 'equal') { - $operator = '='; - } - if ($_GET['emails_opt'] === 'above') { - $operator = '>'; - } - if ($_GET['emails_opt'] === 'below') { - $operator = '<'; - } - $Query .= $operator." ".$_GET['email_cnt']; - $DB->query($Query); - $Users = implode(',', $DB->collect('UserID')); - if (!empty($Users)) { - $Where[] = "um1.ID IN (".$Users.")"; - } - } - - - if(!empty($_GET['ip'])){ - if(isset($_GET['ip_history'])){ - $Distinct = 'DISTINCT '; - $Join['hi']=' JOIN users_history_ips AS hi ON hi.UserID=um1.ID '; - $Where[]= ' hi.IP '.$Match.wrap($_GET['ip'], '', true); - $Where[] = " hi.IP <> '127.0.0.1'"; - $Where[] = " hi.IP <> '0.0.0.0'"; - } else { - $Where[]='um1.IP'.$Match.wrap($_GET['ip'], '', true); - } - } - - //Search for only user to torrent master classes. - $Where[] = " um1.IP <> '127.0.0.1'"; - $Where[] = " um1.IP <> '0.0.0.0'"; - $Where[]=" um1.PermissionID BETWEEN 2 AND 5 OR um1.PermissionID = 7"; - - - if($OrderTable[$_GET['order']] && $WayTable[$_GET['way']]){ - $Order = ' ORDER BY '.$OrderTable[$_GET['order']].' '.$WayTable[$_GET['way']].' '; - } - - //---------- Finish generating the search string - - $SQL = 'SELECT '.$Distinct.$SQL; - $SQL .= implode(' ', $Join); - - if(count($Where)){ - $SQL .= ' WHERE '.implode(' AND ', $Where); - } - - if(count($Having)){ - $SQL .= ' HAVING '.implode(' AND ', $Having); - } - $SQL .= $Order; - - if(count($Where)>0 || count($Join)>0 || count($Having)>0){ - $RunQuery = true; - } - - list($Page,$Limit) = page_limit(USERS_PER_PAGE); - $SQL.=" LIMIT $Limit"; - } else { error($Err); } - -} -show_header('User search'); -?> -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
Username: - -
Email: - -
IP: - -
Extra: - /> - - - /> - -
Type - Strict /> | - Fuzzy /> | - Regex /> - Order: - - -
- -
-
-
-query($SQL); - $DB->query('SELECT FOUND_ROWS();'); - list($NumResults) = $DB->next_record(); -$DB->set_query_id($Results); -} - -$Pages=get_pages($Page,$NumResults,USERS_PER_PAGE,11); -if ($Pages) { ?> - - -
- - - - - - - - -next_record()){ ?> - - - - - - - - -
UsernameIPEmailJoinedLast Seen
()
- - - -
- diff --git a/sections/userhistory/ip_history.php b/sections/userhistory/ip_history.php index cc339897..37082af5 100644 --- a/sections/userhistory/ip_history.php +++ b/sections/userhistory/ip_history.php @@ -144,8 +144,9 @@ function UnBan(ip, id, elemID) {
- - + + +
diff --git a/sections/wiki/article.php b/sections/wiki/article.php index 4eb8ede7..3333f343 100644 --- a/sections/wiki/article.php +++ b/sections/wiki/article.php @@ -69,7 +69,7 @@ /> -
+
Browse articles
@@ -131,4 +131,4 @@
- \ No newline at end of file +