2010 July, 6 (RoyK) (1)

// PHP Code
Index: deki/cp/cache_management.php
===================================================================
--- deki/cp/cache_management.php    (revision 20327)
+++ deki/cp/cache_management.php    (working copy)
@@ -59,8 +59,9 @@
         // cache options
         $cacheMaster = false;
         $this->View->set('cache.disabled', !DekiSite::isCommercial());
-        $this->View->set('commercial.url', ProductURLs::COMMERCIAL);
-        if (DekiSite::isCommercial())
+        $this->View->set('commercial.url', ProductURL::COMMERCIAL);
+        $License = DekiLicense::getCurrent();
+        if ($License->hasCapabilityCaching())
         {
             $this->View->set('form.cache_master.options', $this->getCacheOptions());
             $cacheMaster = wfGetConfig('cache/master');
Index: deki/cp/product_activation.php
===================================================================
--- deki/cp/product_activation.php    (revision 20327)
+++ deki/cp/product_activation.php    (working copy)
@@ -96,6 +96,7 @@
         $this->View->set('license.has.anon', $License->hasCapabilityAnon());
         $this->View->set('license.has.search', $License->hasCapabilitySearch());
         $this->View->set('license.has.memcache', $License->hasCapabilityMemCache());
+        $this->View->set('license.has.caching', $License->hasCapabilityCaching());
        
         $this->View->set('form.action', $this->getUrl('/'));
         $this->View->output();
Index: deki/cp/templates/product_activation/license.php
===================================================================
--- deki/cp/templates/product_activation/license.php    (revision 20327)
+++ deki/cp/templates/product_activation/license.php    (working copy)
@@ -131,6 +131,9 @@
             <dt><?php echo $this->msg('Activation.capability.memcache');?></dt>
             <dd><?php echo $this->get('license.has.memcache') ? $this->msg('Activation.capability.enabled') : $this->msg('Activation.capability.disabled');?></dd>
            
+            <dt><?php echo $this->msg('Activation.capability.caching');?></dt>
+            <dd><?php echo $this->get('license.has.caching') ? $this->msg('Activation.capability.enabled') : $this->msg('Activation.capability.disabled');?></dd>
+            
             <dt><?php echo $this->msg('Activation.capability.anon');?></dt>
             <dd><?php echo $this->get('license.has.anon') ? $this->msg('Activation.capability.enabled') : $this->msg('Activation.capability.disabled');?></dd>
            
Index: deki/core/objects/deki_license.php
===================================================================
--- deki/core/objects/deki_license.php    (revision 20327)
+++ deki/core/objects/deki_license.php    (working copy)
@@ -34,7 +34,7 @@
     const CAPABILITY_ANON = 'anonymous-permissions';
     const ANON_PERMISSIONS = 'ALL';
    
-    const CAPABILITY_CACHE = 'shared-cache-provider';
+    const CAPABILITY_CACHE = 'cache-provider';
     const CACHE_MEMCACHE = 'memcache';
     const CACHE_MEMORY = 'inprocess';
    
@@ -229,6 +229,16 @@
     }
    
     /**
+     * Returns the cache mechanism as enabled by the license
+     * @return bool
+     */
+    public function hasCapabilityCaching()
+    {
+        return $this->getCapability(self::CAPABILITY_CACHE) == self::CACHE_MEMORY
+         || $this->hasCapabilityMemCache();    
+    }
+    
+    /**
      * Returns the capabilities as enabled by the API
      * @return bool
      */
Index: resources/resources.txt
===================================================================
--- resources/resources.txt    (revision 20335)
+++ resources/resources.txt    (working copy)
@@ -28,6 +28,7 @@
     capability.search=Adaptive search:
     capability.anon=Public site license:
     capability.memcache=Memcache capability:
+    capability.caching=Memory caching:
     capability.enabled=Enabled
     capability.disabled=Disabled
     contact=Contact MindTouch