From 910b956b26848e0f280a28c5c5f1e0644724a92e Mon Sep 17 00:00:00 2001 From: Git Date: Mon, 15 Oct 2012 08:00:19 +0000 Subject: [PATCH] Empty commit --- sections/ajax/better/transcode.php | 2 +- sections/ajax/browse.php | 20 ++++++++++---------- sections/better/transcode.php | 2 +- sections/image/index.php | 2 +- sections/rules/chat.php | 4 ++-- sections/rules/clients.php | 4 ++-- sections/rules/collages.php | 2 +- sections/rules/jump.php | 2 +- sections/rules/ratio.php | 2 +- sections/rules/requests.php | 2 +- sections/rules/rules.php | 2 +- sections/rules/tag.php | 2 +- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/sections/ajax/better/transcode.php b/sections/ajax/better/transcode.php index 4c767c2a..e76cb923 100644 --- a/sections/ajax/better/transcode.php +++ b/sections/ajax/better/transcode.php @@ -17,7 +17,7 @@ $Query = '@format FLAC @encoding '.$List; if(!empty($_GET['search'])) { - $Query.=' @(groupname,artistname,yearfulltext) '.$SS->EscapeString($_GET['search']); + $Query.=' @(groupname,artistname,yearfulltext) '.$SS->escape_string($_GET['search']); } $SS->SetFilter('logscore', array(100)); diff --git a/sections/ajax/browse.php b/sections/ajax/browse.php index b8d6e065..c9aa0d6e 100644 --- a/sections/ajax/browse.php +++ b/sections/ajax/browse.php @@ -97,12 +97,12 @@ function header_link($SortKey,$DefaultWay="desc") { foreach($Words as $Key => &$Word) { if($Word[0] == '!' && strlen($Word) >= 3 && count($Words) >= 2) { if(strpos($Word,'!',1) === false) { - $Word = '!'.$SS->EscapeString(substr($Word,1)); + $Word = '!'.$SS->escape_string(substr($Word,1)); } else { - $Word = $SS->EscapeString($Word); + $Word = $SS->escape_string($Word); } } elseif(strlen($Word) >= 2) { - $Word = $SS->EscapeString($Word); + $Word = $SS->escape_string($Word); } else { unset($Words[$Key]); } @@ -123,10 +123,10 @@ function header_link($SortKey,$DefaultWay="desc") { $Tag = trim($Tag); if(strlen($Tag) >= 2) { if($Tag[0] == '!' && strlen($Tag) >= 3) { - $TagListEx[] = '!'.$SS->EscapeString(substr($Tag,1)); + $TagListEx[] = '!'.$SS->escape_string(substr($Tag,1)); unset($TagList[$Key]); } else { - $Tag = $SS->EscapeString($Tag); + $Tag = $SS->escape_string($Tag); } } else { unset($TagList[$Key]); @@ -154,18 +154,18 @@ function header_link($SortKey,$DefaultWay="desc") { if(!empty($_GET[$Search])) { $_GET[$Search] = str_replace(array('%'), '', $_GET[$Search]); if($Search == 'filelist') { - $Queries[]='@filelist "'.$SS->EscapeString($_GET['filelist']).'"~20'; + $Queries[]='@filelist "'.$SS->escape_string($_GET['filelist']).'"~20'; } else { $Words = explode(' ', $_GET[$Search]); foreach($Words as $Key => &$Word) { if($Word[0] == '!' && strlen($Word) >= 3 && count($Words) >= 2) { if(strpos($Word,'!',1) === false) { - $Word = '!'.$SS->EscapeString(substr($Word,1)); + $Word = '!'.$SS->escape_string(substr($Word,1)); } else { - $Word = $SS->EscapeString($Word); + $Word = $SS->escape_string($Word); } } elseif(strlen($Word) >= 2) { - $Word = $SS->EscapeString($Word); + $Word = $SS->escape_string($Word); } else { unset($Words[$Key]); } @@ -194,7 +194,7 @@ function header_link($SortKey,$DefaultWay="desc") { } } if(!empty($_GET['encoding'])) { - $Queries[]='@encoding "'.$SS->EscapeString($_GET['encoding']).'"'; // Note the quotes, for 24bit lossless + $Queries[]='@encoding "'.$SS->escape_string($_GET['encoding']).'"'; // Note the quotes, for 24bit lossless } if(isset($_GET['haslog']) && $_GET['haslog']!=='') { diff --git a/sections/better/transcode.php b/sections/better/transcode.php index 62e692b7..59b7e33f 100644 --- a/sections/better/transcode.php +++ b/sections/better/transcode.php @@ -17,7 +17,7 @@ $Query = '@format FLAC @encoding '.$List; if(!empty($_GET['search'])) { - $Query.=' @(groupname,artistname,yearfulltext) '.$SS->EscapeString($_GET['search']); + $Query.=' @(groupname,artistname,yearfulltext) '.$SS->escape_string($_GET['search']); } $SS->SetFilter('logscore', array(100)); diff --git a/sections/image/index.php b/sections/image/index.php index 14ecaa4a..a2be933e 100644 --- a/sections/image/index.php +++ b/sections/image/index.php @@ -67,7 +67,7 @@ // Send PM - Misc::send_pm($UserID,0,"Your avatar has been automatically reset","The following avatar rules have been in effect for months now: + send_pm($UserID,0,"Your avatar has been automatically reset","The following avatar rules have been in effect for months now: [b]Avatars must not exceed 256kB or be vertically longer than 400px. [/b] diff --git a/sections/rules/chat.php b/sections/rules/chat.php index 96751baa..b22431f8 100644 --- a/sections/rules/chat.php +++ b/sections/rules/chat.php @@ -9,7 +9,7 @@

Forum Rules

-
+
  • Many forums (Tutorials, The Library, etc.) have their own set of rules. Make sure you read and take note of these rules before you attempt to post in one of these forums. @@ -82,7 +82,7 @@

    IRC Rules

    -
    +
    • Staff have the final decision, if they say stop and you continue, expect at least to be banned from the IRC server. diff --git a/sections/rules/clients.php b/sections/rules/clients.php index 25b10256..28563d7a 100644 --- a/sections/rules/clients.php +++ b/sections/rules/clients.php @@ -33,7 +33,7 @@

    Further Rules

    -
    +

    The modification of clients to bypass our client requirements (spoofing) is explicitly forbidden. People caught doing this will be instantly and permanently banned. This is your only warning.

    @@ -45,7 +45,7 @@

    Further Details

    -
    +

    If someone you invited to the site breaks the above rules you will receive a 2 month warning and lose the right to invite people to this site.

    diff --git a/sections/rules/collages.php b/sections/rules/collages.php index e8138a96..189dd7ab 100644 --- a/sections/rules/collages.php +++ b/sections/rules/collages.php @@ -6,7 +6,7 @@

    Collages

    -
    +
    • Collages in the Discography, Staff Picks, Label, and Charts categories must be based on fact, and not opinion. If something is a published Best Of (for instance, "Pitchfork's Best Albums of the 1990's") then it should go in the Charts category.
      • diff --git a/sections/rules/jump.php b/sections/rules/jump.php index dc2ba9d2..86a8cbc0 100644 --- a/sections/rules/jump.php +++ b/sections/rules/jump.php @@ -1,6 +1,6 @@

      Other Sections

      -
      +
      diff --git a/sections/rules/ratio.php b/sections/rules/ratio.php index 28fd57c4..fc5d04b6 100644 --- a/sections/rules/ratio.php +++ b/sections/rules/ratio.php @@ -6,7 +6,7 @@

      Ratio Rules

      -
      +

      Your ratio is the amount you have uploaded divided by the amount you have downloaded.

      diff --git a/sections/rules/requests.php b/sections/rules/requests.php index 654760e6..145009f9 100644 --- a/sections/rules/requests.php +++ b/sections/rules/requests.php @@ -6,7 +6,7 @@

      Requests

      -
      +
      • Do not make requests for torrents that break the rules. It is your responsibility that the request follows the rules. Your request will be deleted, and you will not get your bounty back. Requests cannot be more specific than the upload (and trumping) rules. For example, requesting an MP3 torrent with a log when the rules prohibit replacing an MP3 torrent without a log. Such a request asks for a duplicate to be uploaded. Exceptions: Requests made before the November 2008 rule change are not subject to deletion. However, you are advised to edit such older requests to comply with the rules. diff --git a/sections/rules/rules.php b/sections/rules/rules.php index 0e8e3549..5d9477f1 100644 --- a/sections/rules/rules.php +++ b/sections/rules/rules.php @@ -7,7 +7,7 @@

        Golden Rules

        -
        +
        • All staff decisions must be respected. If you take issue with a decision, you must do so privately with the staff member who issued the decision or with an administrator of the site. Complaining about staff decisions in public or otherwise disrespecting staff members will not be taken lightly.
        • Access to this web site is a privilege, not a right, and it can be taken away from you for any reason.
          • diff --git a/sections/rules/tag.php b/sections/rules/tag.php index 076ca39f..620e5596 100644 --- a/sections/rules/tag.php +++ b/sections/rules/tag.php @@ -7,7 +7,7 @@

          Tagging rules

          -
          +
          • Tags should be comma separated, and you should use a period ('.') to separate words inside a tag - eg. 'hip.hop'.
      Category