From c960e421484f92f31a48a074eb849f1f3747c821 Mon Sep 17 00:00:00 2001 From: Git Date: Sun, 14 Oct 2012 08:00:20 +0000 Subject: [PATCH] Empty commit --- classes/class_search.php | 20 +++++++++-- sections/ajax/userhistory/post_history.php | 2 +- sections/requests/request.php | 40 +++++++++++----------- sections/torrents/browse2.php | 14 ++++---- sections/torrents/details.php | 16 ++++----- sections/torrents/downloadlist.php | 2 +- sections/torrents/peerlist.php | 2 +- sections/torrents/snatchlist.php | 2 +- sections/user/community_stats.php | 2 +- sections/user/user.php | 8 ++--- sections/userhistory/post_history.php | 2 +- sections/userhistory/subscriptions.php | 2 +- static/styles/anorex/style.css | 2 +- static/styles/postmod/style.css | 4 +++ 14 files changed, 69 insertions(+), 49 deletions(-) diff --git a/classes/class_search.php b/classes/class_search.php index 4d1ec69d..1404726e 100644 --- a/classes/class_search.php +++ b/classes/class_search.php @@ -164,8 +164,24 @@ function set_filter_range($Name, $Min, $Max, $Exclude) { } function escape_string($String) { - return strtr($String, array('('=>'\(', ')'=>'\)', '|'=>'\|', '-'=>'\-', '@'=>'\@', '~'=>'\~', '&'=>'\&', '/'=>'\/')); - } + return strtr($String, array( + '('=>'\(', + ')'=>'\)', + '|'=>'\|', + '-'=>'\-', + '@'=>'\@', + '~'=>'\~', + '&'=>'\&', + '!'=>'\!', + '"'=>'\"', + '/'=>'\/', + '\\'=>'\\\\', + '*'=>'\*', + '?'=>'\?', + '^'=>'\^', + '$'=>'\$', + '='=>'\=')); + } } diff --git a/sections/ajax/userhistory/post_history.php b/sections/ajax/userhistory/post_history.php index 676e39d5..91465f86 100644 --- a/sections/ajax/userhistory/post_history.php +++ b/sections/ajax/userhistory/post_history.php @@ -55,7 +55,7 @@ function error_out($reason = "") { } if(check_perms('site_proxy_images') && !empty($Avatar)) { - $Avatar = 'http'.($SSL?'s':'').'://'.SITE_URL.'/image.php?c=1&i='.urlencode($Avatar); + $Avatar = 'http'.($SSL?'s':'').'://'.SITE_URL.'/image.php?c=1&i='.urlencode($Avatar); } if($LoggedUser['CustomForums']) { diff --git a/sections/requests/request.php b/sections/requests/request.php index 84d16056..371c8fb7 100644 --- a/sections/requests/request.php +++ b/sections/requests/request.php @@ -99,12 +99,12 @@ [Bookmark] - [Report Request] + [Report request] - ">[Upload Request] + ">[Upload request] - [Request Update] + [Requestsv2 update] - [Find in Library] - [Find in Stores] + [Find in library] + [Find in stores]
@@ -234,7 +234,7 @@
-
Top Contributors
+
Top contributors
- + @@ -293,39 +293,39 @@ - + - + - + - + - + - + @@ -358,8 +358,8 @@ $GroupLink = Artists::display_artists($Group['ExtendedArtists']).''.$Group['Name'].'';*/ ?> - - + + @@ -374,7 +374,7 @@ $TimeAdded) { ?> - + @@ -382,7 +382,7 @@ - +
Record LabelRecord label
Catalogue NumberCatalogue number
Release TypeRelease type
Acceptable BitratesAcceptable bitrates
Acceptable FormatsAcceptable formats
Acceptable MediaAcceptable media
Required FLAC only extra(s)Required FLAC-only extras
Torrent Grouptorrents.php?id=Torrent grouptorrents.php?id=
Last VotedLast voted
Custom Vote (MB)Custom vote (MB)
#XXXXXX - by Just now - [Report Comment] + by Just now + [Report comment] ↑ diff --git a/sections/torrents/browse2.php b/sections/torrents/browse2.php index d7a249bb..20e962ed 100644 --- a/sections/torrents/browse2.php +++ b/sections/torrents/browse2.php @@ -120,7 +120,7 @@ function header_link($SortKey,$DefaultWay="desc") { if(!empty($_GET['filelist'])) { $SearchString = trim($_GET['filelist']); if($SearchString != '') { - $Queries[] = '@filelist "'.$SS->EscapeString($_GET['filelist']).'"~20'; + $Queries[] = '@filelist "'.$SS->escape_string($_GET['filelist']).'"~20'; $EnableNegation = true; } } @@ -194,11 +194,11 @@ function header_link($SortKey,$DefaultWay="desc") { } $QueryParts = array(); foreach($BasicSearch['include'] as $Word) { - $QueryParts[] = $SS->EscapeString($Word); + $QueryParts[] = $SS->escape_string($Word); } if(!empty($BasicSearch['exclude'])) { foreach($BasicSearch['exclude'] as $Word) { - $QueryParts[] = '!'.$SS->EscapeString(substr($Word,1)); + $QueryParts[] = '!'.$SS->escape_string(substr($Word,1)); } } if(!empty($FilterBitrates)) { @@ -221,11 +221,11 @@ function header_link($SortKey,$DefaultWay="desc") { unset($Tags['exclude']); } foreach($Tags['include'] as &$Tag) { - $Tag = $SS->EscapeString($Tag); + $Tag = $SS->escape_string($Tag); } if(!empty($Tags['exclude'])) { foreach($Tags['exclude'] as &$Tag) { - $Tag = '!'.$SS->EscapeString(substr($Tag,1)); + $Tag = '!'.$SS->escape_string(substr($Tag,1)); } } @@ -264,11 +264,11 @@ function header_link($SortKey,$DefaultWay="desc") { unset($Words['exclude']); } foreach($Words['include'] as $Word) { - $QueryParts[] = $SS->EscapeString($Word); + $QueryParts[] = $SS->escape_string($Word); } if(!empty($Words['exclude'])) { foreach($Words['exclude'] as $Word) { - $QueryParts[] = '!'.$SS->EscapeString(substr($Word,1)); + $QueryParts[] = '!'.$SS->escape_string(substr($Word,1)); } } if(!empty($QueryParts)) { diff --git a/sections/torrents/details.php b/sections/torrents/details.php index 707cdf81..42d27673 100644 --- a/sections/torrents/details.php +++ b/sections/torrents/details.php @@ -568,18 +568,18 @@ function filelist($Str) {
- [Mass PM Snatchers] + [Mass PM snatchers]
- (View Peerlist) + (View peer list) - (View Downloadlist) - (View Snatchlist) + (View downloader list) + (View snatcher list) - (View Filelist) + (View file list) - (View Report Information) + (View report information)
@@ -800,7 +800,7 @@ function filelist($Str) {
- # +
# [Report] ','');">[Quote] - [Edit] - [Delete] - +
↑ diff --git a/sections/torrents/downloadlist.php b/sections/torrents/downloadlist.php index 1e81ee50..7c02c396 100644 --- a/sections/torrents/downloadlist.php +++ b/sections/torrents/downloadlist.php @@ -36,7 +36,7 @@ ?> -

Downloadlist

+

List of Downloaders

100) { ?>
diff --git a/sections/torrents/peerlist.php b/sections/torrents/peerlist.php index 3431ad4b..309fb208 100644 --- a/sections/torrents/peerlist.php +++ b/sections/torrents/peerlist.php @@ -30,7 +30,7 @@ $DB->set_query_id($Result); ?> -

Peerlist

+

Peer List

100) { ?>
diff --git a/sections/torrents/snatchlist.php b/sections/torrents/snatchlist.php index 7ec4b0bf..ef941446 100644 --- a/sections/torrents/snatchlist.php +++ b/sections/torrents/snatchlist.php @@ -23,7 +23,7 @@ list($NumResults) = $DB->next_record(); ?> -

Snatches

+

List of Snatchers

100) { ?>
diff --git a/sections/user/community_stats.php b/sections/user/community_stats.php index 791c9add..2eea5cc0 100644 --- a/sections/user/community_stats.php +++ b/sections/user/community_stats.php @@ -89,7 +89,7 @@ if (($Override=check_paranoia_here('uploads+'))) { ?>
  • >Uploaded: [ href="torrents.php?type=uploaded&userid=" title="View">View] [Download] + onclick="return confirm('If you no longer have the content, your ratio WILL be affected; be sure to check the size of all torrents before redownloading.');">Download]
    • diff --git a/sections/user/user.php b/sections/user/user.php index fb96844f..5121291f 100644 --- a/sections/user/user.php +++ b/sections/user/user.php @@ -201,7 +201,7 @@ function check_paranoia_here($Setting) {
    @@ -214,7 +214,7 @@ function check_paranoia_here($Setting) {
    • Joined:
      • -
    • >Last Seen:
      • +
    • >Last seen:
    • >Uploaded:
      • @@ -411,7 +411,7 @@ function check_paranoia_here($Setting) { if (check_perms('users_view_keys',$Class) || $OwnProfile) { ?> -
    • Passkey: [View]
      • +
    • Passkey: [View]
      • -
    • Invited By:
      • +
    • Invited by:
    • Invites: query("SELECT count(InviterID) FROM invites WHERE InviterID = '$UserID'"); list($Pending) = $DB->next_record(); diff --git a/sections/userhistory/post_history.php b/sections/userhistory/post_history.php index 2654063c..d8c8119b 100644 --- a/sections/userhistory/post_history.php +++ b/sections/userhistory/post_history.php @@ -47,7 +47,7 @@ } if(check_perms('site_proxy_images') && !empty($Avatar)) { - $Avatar = 'http'.($SSL?'s':'').'://'.SITE_URL.'/image.php?c=1&i='.urlencode($Avatar); + $Avatar = 'http'.($SSL?'s':'').'://'.SITE_URL.'/image.php?c=1&i='.urlencode($Avatar); } View::show_header('Post history for '.$Username,'subscriptions,comments,bbcode'); diff --git a/sections/userhistory/subscriptions.php b/sections/userhistory/subscriptions.php index 0b0c7667..c00f285e 100644 --- a/sections/userhistory/subscriptions.php +++ b/sections/userhistory/subscriptions.php @@ -162,7 +162,7 @@
    		]+)+\.(jpg|jpeg|gif|png|tif|tiff|bmp)$/is',$AuthorAvatar)) { ?> - <?=$AuthorName?>'s avatar + <?=$AuthorName?>'s avatar Default avatar diff --git a/static/styles/anorex/style.css b/static/styles/anorex/style.css index 78aa67bd..57b6db1c 100644 --- a/static/styles/anorex/style.css +++ b/static/styles/anorex/style.css @@ -146,7 +146,7 @@ ul.thin li { margin:0px 0px; padding:0px; } height: 47px; text-align: center; font-size: 9pt; - margin: 0px 280px 0px 90px; + margin: 0 370px 0 180px; padding-top: 28px; } diff --git a/static/styles/postmod/style.css b/static/styles/postmod/style.css index 9b1eb785..5c75e7d0 100644 --- a/static/styles/postmod/style.css +++ b/static/styles/postmod/style.css @@ -1041,3 +1041,7 @@ select:hover, option:hover { font-size: 1.25em; font-weight: bold; } + +ul, ol{ + list-style-position: inside; +}