wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of gitorious.org:owncloud/owncloud

Browse source
This commit is contained in:
Florian Hülsmann 2012-06-18 13:37:25 +02:00
commit 7064f3a8a8
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/base.php
View file

@ -282,7 +282,7 @@ class OC{
if(substr(OC::$REQUESTEDFILE, -3) == 'css'){
$file = 'apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE;
$minimizer = new OC_Minimizer_CSS();
$minimizer->output(array(array(OC::$APPSROOT, OC::$APPSWEBROOT, $file)));
$minimizer->output(array(array(OC::$APPSROOT, OC::$APPSWEBROOT, $file)), $file);
exit;
}elseif(substr(OC::$REQUESTEDFILE, -3) == 'php'){
require_once(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE);

8
lib/cache/fileglobal.php vendored
View file

@ -16,7 +16,12 @@ class OC_Cache_FileGlobal{
return $cache_dir;
}
protected function fixKey($key) {
return str_replace('/', '_', $key);
}
public function get($key) {
$key = $this->fixKey($key);
if ($this->hasKey($key)) {
$cache_dir = $this->getCacheDir();
return file_get_contents($cache_dir.$key);
@ -25,6 +30,7 @@ class OC_Cache_FileGlobal{
}
public function set($key, $value, $ttl=0) {
$key = $this->fixKey($key);
$cache_dir = $this->getCacheDir();
if ($cache_dir and file_put_contents($cache_dir.$key, $value)) {
if ($ttl === 0) {
@ -36,6 +42,7 @@ class OC_Cache_FileGlobal{
}
public function hasKey($key) {
$key = $this->fixKey($key);
$cache_dir = $this->getCacheDir();
if ($cache_dir && is_file($cache_dir.$key)) {
$mtime = filemtime($cache_dir.$key);
@ -53,6 +60,7 @@ class OC_Cache_FileGlobal{
if(!$cache_dir){
return false;
}
$key = $this->fixKey($key);
return unlink($cache_dir.$key);
}

3
lib/request.php
View file

@ -15,6 +15,9 @@ class OC_Request {
}
static public function acceptGZip() {
if (!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) {
return false;
}
$HTTP_ACCEPT_ENCODING = $_SERVER["HTTP_ACCEPT_ENCODING"];
if( strpos($HTTP_ACCEPT_ENCODING, 'x-gzip') !== false )
return 'x-gzip';