From cf6894df38261b3b92c75d441bbe0a0ba58d963e Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Thu, 25 May 2006 16:40:00 +0200
Subject: more mediamanager fixes

This fixes some styling issues, the cookie handling and a bug in the
JavaScript caching mechanism.

darcs-hash:20060525144000-7ad00-2f0b673d4f747c979f460e4e927a50eeeae81ec1.gz
---
 lib/exe/css.php          | 1 +
 lib/exe/js.php           | 3 ++-
 lib/exe/mediamanager.php | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib/exe')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index b63841a03..cb85d1a35 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -72,6 +72,7 @@ function css_out(){
     header('Pragma: public');
     if(css_cacheok($cache,array_keys($files))){
         http_conditionalRequest(filemtime($cache));
+        if($conf['allowdebug']) header("X-CacheUsed: $cache");
         readfile($cache);
         return;
     } else {
diff --git a/lib/exe/js.php b/lib/exe/js.php
index 583faa5ad..7ff60710c 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -35,7 +35,7 @@ function js_out(){
     $write = (bool) $_REQUEST['write'];  // writable?
 
     // The generated script depends on some dynamic options
-    $cache = getCacheName('scripts'.$edit.$write,'.js'); 
+    $cache = getCacheName('scripts'.$edit.'x'.$write,'.js'); 
 
     // Array of needed files
     $files = array(
@@ -66,6 +66,7 @@ function js_out(){
     header('Pragma: public');
     if(js_cacheok($cache,array_merge($files,$plugins))){
         http_conditionalRequest(filemtime($cache));
+        if($conf['allowdebug']) header("X-CacheUsed: $cache");
         readfile($cache);
         return;
     } else {
diff --git a/lib/exe/mediamanager.php b/lib/exe/mediamanager.php
index 23140ee3c..b381fabf6 100644
--- a/lib/exe/mediamanager.php
+++ b/lib/exe/mediamanager.php
@@ -1,4 +1,4 @@
-<?
+<?php
     if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/');
     define('DOKU_MEDIAMANAGER',1);
     require_once(DOKU_INC.'inc/init.php');
-- 
cgit v1.2.3