diff --git a/classes/class_text.php b/classes/class_text.php index 10af9b84..7c6ad374 100644 --- a/classes/class_text.php +++ b/classes/class_text.php @@ -2,7 +2,7 @@ class TEXT { // tag=>max number of attributes private $ValidTags = array('b'=>0, 'u'=>0, 'i'=>0, 's'=>0, '*'=>0, '#'=>0, 'artist'=>0, 'user'=>0, 'n'=>0, 'inlineurl'=>0, 'inlinesize'=>1, 'headline'=>1, 'align'=>1, 'color'=>1, 'colour'=>1, 'size'=>1, 'url'=>1, 'img'=>1, 'quote'=>1, 'pre'=>1, 'code'=>1, 'tex'=>0, 'hide'=>1, 'plain'=>0, 'important'=>0, 'torrent'=>0, 'rule'=>0, - ); + private $Smileys = array( ':angry:' => 'angry.gif', ':-D' => 'biggrin.gif', @@ -40,6 +40,7 @@ class TEXT { ':sorry:' => 'sorry.gif', ':thanks:' => 'thanks.gif', ':P' => 'tongue.gif', + ':p' => 'tongue.gif', ':-P' => 'tongue.gif', ':-p' => 'tongue.gif', ':wave:' => 'wave.gif', diff --git a/classes/script_start.php b/classes/script_start.php index db3c0e0f..58df09fe 100644 --- a/classes/script_start.php +++ b/classes/script_start.php @@ -2443,9 +2443,14 @@ function freeleech_groups($GroupIDs, $FreeNeutral = 1, $FreeLeechType = 0) { $Debug->set_flag('completed module execution'); /* Required in the absence of session_start() for providing that pages will change -upon hit rather than being browser cache'd for changing content. */ -header('Cache-Control: no-cache, must-revalidate, post-check=0, pre-check=0'); -header('Pragma: no-cache'); +upon hit rather than being browser cache'd for changing content. + +Old versions of Internet explorer choke when downloading binary files over HTTPS with disabled cache. +Define the following constant in files that handle file downloads */ +if(!defined('IE_WORKAROUND_NO_CACHE_HEADERS')) { + header('Cache-Control: no-cache, must-revalidate, post-check=0, pre-check=0'); + header('Pragma: no-cache'); +} //Flush to user ob_end_flush(); diff --git a/sections/artist/download.php b/sections/artist/download.php index cffb2412..9734e1b0 100644 --- a/sections/artist/download.php +++ b/sections/artist/download.php @@ -203,4 +203,6 @@ $Cache->insert('Collector',$Settings); $Cache->commit_transaction(0); } + +define('IE_WORKAROUND_NO_CACHE_HEADERS', 1); ?> diff --git a/sections/collages/download.php b/sections/collages/download.php index a8f2c556..eea370b2 100644 --- a/sections/collages/download.php +++ b/sections/collages/download.php @@ -193,4 +193,6 @@ $Cache->insert('Collector',$Settings); $Cache->commit_transaction(0); } + +define('IE_WORKAROUND_NO_CACHE_HEADERS', 1); ?> diff --git a/sections/schedule/index.php b/sections/schedule/index.php index 8791686c..e0fc3a1d 100644 --- a/sections/schedule/index.php +++ b/sections/schedule/index.php @@ -306,7 +306,7 @@ function next_hour() { $Message = 'You have downloaded more then 10gb while on Ratio Watch. Your Leeching privileges have been disabled. Please reread the rules and refer to this guide on how to improve your ratio https://ssl.what.cd/wiki.php?action=article&id=110'; foreach($UserIDs as $UserID) { send_pm($UserID,0,db_string($Subject),db_string($Message)); - send_irc("PRIVMSG #reports : Leeching Disabled. Downloaded 10GB+ on Ratio Watch. https://what.cd/user.php?id=$UserID"); + send_irc("PRIVMSG #reports : !leechdisabled Downloaded 10GB+ on Ratio Watch. https://what.cd/user.php?id=$UserID"); } $DB->query("UPDATE users_info AS i JOIN users_main AS m ON m.ID=i.UserID diff --git a/sections/torrents/download.php b/sections/torrents/download.php index e2bfb80d..38662ca9 100644 --- a/sections/torrents/download.php +++ b/sections/torrents/download.php @@ -216,3 +216,5 @@ header('Content-disposition: attachment; filename="'.$FileName.'"'); echo $Tor->enc(); + +define('IE_WORKAROUND_NO_CACHE_HEADERS', 1); diff --git a/sections/torrents/redownload.php b/sections/torrents/redownload.php index da6eb45c..47d15407 100644 --- a/sections/torrents/redownload.php +++ b/sections/torrents/redownload.php @@ -102,3 +102,5 @@ $Zip->add_file($Tor->enc(), file_string($Month).'/'.$FileName); } $Zip->close_stream(); + +define('IE_WORKAROUND_NO_CACHE_HEADERS', 1);