Allow theme cache lifetime to be configured

diff --git a/framework/Core/lib/Horde/Core/Factory/ThemesCache.php b/framework/Core/lib/Horde/Core/Factory/ThemesCache.php
index e90f86e..d6bbab4 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/ThemesCache.php
+++ b/framework/Core/lib/Horde/Core/Factory/ThemesCache.php
@@ -72,7 +72,7 @@ class Horde_Core_Factory_ThemesCache
                 $instance = new Horde_Themes_Cache($app, $theme);
             } else {
                 try {
-                    $instance = @unserialize($cache->get($sig, 86400));
+                    $instance = @unserialize($cache->get($sig, $GLOBALS['conf']['cachethemesparams']['lifetime']));
                 } catch (Exception $e) {
                     $instance = null;
                 }
@@ -102,7 +102,7 @@ class Horde_Core_Factory_ThemesCache
 
         foreach ($this->_instances as $key => $val) {
             if ($val->changed) {
-                $cache->set($key, serialize($val), 86400);
+                $cache->set($key, serialize($val), $GLOBALS['conf']['cachethemesparams']['lifetime']);
             }
         }
     }

diff --git a/horde/config/conf.xml b/horde/config/conf.xml
index ade0b17..e2de2fd 100644 (file)
--- a/horde/config/conf.xml
+++ b/horde/config/conf.xml
@@ -1084,7 +1084,7 @@
        directory on the web frontend.
        </configdescription>
       </case>
-      <case name="horde_cache" desc="Horde_Cache">
+      <case name="horde_cache" desc="Horde Cache">
        <configdescription>
         &lt;strong&gt;Requires a configured Horde caching
         backend.&lt;/strong&gt;
@@ -1126,7 +1126,7 @@
        directory on the web frontend.
        </configdescription>
       </case>
-      <case name="horde_cache" desc="Horde_Cache">
+      <case name="horde_cache" desc="Horde Cache">
        <configdescription>
         &lt;strong&gt;Requires a configured Horde caching
         backend.&lt;/strong&gt;
@@ -1166,12 +1166,15 @@
    is HIGHLY RECOMMENDED. &lt;strong&gt;Requires a configured Horde caching
    backend.&lt;/strong&gt;
   </configdescription>
-  <configenum name="cachethemes" desc="Cache themes?">false
-   <values>
-    <value desc="No">false</value>
-    <value desc="Yes">true</value>
-   </values>
-  </configenum>
+  <configswitch name="cachethemes" desc="Cache themes?">false
+   <case name="false" desc="No" />
+   <case name="true" desc="Yes">
+    <configsection name="cachethemesparams">
+     <configinteger name="lifetime" desc="Lifetime of the cached files, in
+     seconds.">604800</configinteger>
+    </configsection>
+   </case>
+  </configswitch>
  </configtab>
 
  <configtab name="lock" desc="Lock System">