Replace Expires and caching headers by OC_Response functions

This commit is contained in:
Bart Visscher 2012-02-13 23:48:05 +01:00
parent 29fc82c364
commit 525306c1e2
6 changed files with 10 additions and 22 deletions

View File

@ -67,9 +67,7 @@ if ($source !== false) {
//get time mimetype and set the headers
$mimetype = OC_Filesystem::getMimeType($source);
header("Content-Transfer-Encoding: binary");
header("Expires: 0");
header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
header("Pragma: public");
OC_Response::disableCaching();
header('Content-Disposition: filename="'.basename($source).'"');
header("Content-Type: " . $mimetype);
header("Content-Length: " . OC_Filesystem::filesize($source));

View File

@ -111,18 +111,11 @@ if($arguments['action']){
OC_MEDIA_COLLECTION::registerPlay($songId);
header('Content-Type:'.$ftype);
// calc an offset of 24 hours
$offset = 3600 * 24;
// calc the string in GMT not localtime and add the offset
$expire = "Expires: " . gmdate("D, d M Y H:i:s", time() + $offset) . " GMT";
//output the HTTP header
header($expire);
header('Cache-Control: max-age=3600, must-revalidate');
header('Pragma: public');
OC_Response::enableCaching(3600 * 24); // 24 hour
header('Accept-Ranges: bytes');
header('Content-Length: '.OC_Filesystem::filesize($arguments['path']));
$gmt_mtime = gmdate('D, d M Y H:i:s', OC_Filesystem::filemtime($arguments['path']) ) . ' GMT';
header("Last-Modified: " . $gmt_mtime );
$mtime = OC_Filesystem::filemtime($arguments['path']);
OC_Response::setLastModifiedHeader($mtime);
OC_Filesystem::readfile($arguments['path']);
exit;

View File

@ -43,9 +43,7 @@ if(isset($_POST['play']) and $_POST['play']=='true'){
$song=OC_MEDIA_COLLECTION::getSong($_POST['song']);
$ftype=OC_Filesystem::getMimeType( $song['song_path'] );
header('Content-Type:'.$ftype);
header('Expires: 0');
header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
header('Pragma: public');
OC_Response::disableCaching();
header('Content-Length: '.OC_Filesystem::filesize($song['song_path']));
OC_Filesystem::readfile($song['song_path']);

View File

@ -41,9 +41,7 @@ $ftype=OC_Filesystem::getMimeType( $filename );
header('Content-Type:'.$ftype);
header('Content-Disposition: attachment; filename="'.basename($filename).'"');
header('Expires: 0');
header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
header('Pragma: public');
OC_Response::disableCaching();
header('Content-Length: '.OC_Filesystem::filesize($filename));
@ob_end_clean();

View File

@ -91,9 +91,7 @@ class OC_Files {
if($zip or OC_Filesystem::is_readable($filename)){
header('Content-Disposition: attachment; filename="'.basename($filename).'"');
header('Content-Transfer-Encoding: binary');
header('Expires: 0');
header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
header('Pragma: public');
OC_Response::disableCaching();
if($zip){
header('Content-Type: application/zip');
header('Content-Length: ' . filesize($filename));

View File

@ -30,6 +30,9 @@ class OC_Response {
}
}
static public function disableCaching() {
self::enableCaching(0);
}
static public function setStatus($status) {
$protocol = $_SERVER['SERVER_PROTOCOL'];