[Fmsystem-commits] [6474] API: cachedir for js-combine

[Sigurd Nes]

Revision: 6474
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6474
Author:   sigurdne
Date:     2010-10-11 21:45:16 +0000 (Mon, 11 Oct 2010)
Log Message:
-----------
API: cachedir for js-combine

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.js.inc.php
    trunk/phpgwapi/inc/combine.php

Modified: trunk/phpgwapi/inc/class.js.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.js.inc.php 2010-10-11 21:14:59 UTC (rev 6473)
+++ trunk/phpgwapi/inc/class.js.inc.php 2010-10-11 21:45:16 UTC (rev 6474)
@@ -140,9 +140,10 @@
                                        }
                                }
                        }
+                       $cachedir = 
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
                        $jsfiles = implode(',', $jsfiles);
                        $links .= '<script type="text/javascript" '
-                                       . 
"src=\"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/inc/combine.php?type=javascript&files={$jsfiles}\">"
+                                       . 
"src=\"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files={$jsfiles}\">"
                                        . "</script>\n";
                        unset($jsfiles);
 

Modified: trunk/phpgwapi/inc/combine.php
===================================================================
--- trunk/phpgwapi/inc/combine.php      2010-10-11 21:14:59 UTC (rev 6473)
+++ trunk/phpgwapi/inc/combine.php      2010-10-11 21:45:16 UTC (rev 6474)
@@ -26,7 +26,7 @@
 
 
        $cache = true;
-       $cachedir = dirname(__FILE__) . '/../cache';
+       $cachedir = urldecode($_GET['cachedir']);//dirname(__FILE__) . 
'/../cache';
        $cssdir = dirname(__FILE__) . '/../../';
        $jsdir = dirname(__FILE__) . '/../../';
 
@@ -164,4 +164,4 @@
                                fclose($fp);
                        }
                }
-       }
\ No newline at end of file
+       }