2010 July, 2 (RoyK)

Index: deki/cp/product_activation.php
===================================================================
--- deki/cp/product_activation.php    (revision 20279)
+++ deki/cp/product_activation.php    (working copy)
@@ -78,12 +78,23 @@
         $this->View->set('license.date', $wgLang->date(mktime()));
         $this->View->set('license.usercount', $License->getUserCount());
         $this->View->set('license.sitecount', $License->getSiteCount());
-        $this->View->set('license.hosts', $License->getHosts());
+        $this->View->set('license.hosts', $License->getHosts());
+        $sids = $License->getSids();
+        foreach ($sids as $k => $v)
+        {
+            $sids[$k] = $wgLang->date($v);
+        }
+        $this->View->set('license.has.sids', !empty($sids));
+        $this->View->set('license.sids', $sids);
         $this->View->set('license.licensee', $License->getLicensee());
         $this->View->set('license.type', DekiSite::getProductName());
         $this->View->set('license.type.expired', $this->View->msg('Product.type.expired'));
         $this->View->set('license.terms', DekiLicense::getEmbeddedMSA());
         $this->View->set('license.productkey', strtoupper(md5($wgDekiApiKey)));
+        $this->View->set('license.has.rating', $License->hasCapabilityRating());
+        $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('form.action', $this->getUrl('/'));
         $this->View->output();
Index: deki/cp/templates/product_activation/license.php
===================================================================
--- deki/cp/templates/product_activation/license.php    (revision 20279)
+++ deki/cp/templates/product_activation/license.php    (working copy)
@@ -122,7 +122,32 @@
                 </dd>
                    
             <?php } ?>
-                        
+            <dt><?php echo $this->msg('Activation.capability.rating');?></dt>
+            <dd><?php echo $this->get('license.has.rating') ? $this->msg('Activation.capability.enabled') : $this->msg('Activation.capability.disabled');?></dd>
+            
+            <dt><?php echo $this->msg('Activation.capability.search');?></dt>
+            <dd><?php echo $this->get('license.has.search') ? $this->msg('Activation.capability.enabled') : $this->msg('Activation.capability.disabled');?></dd>
+            
+            <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.anon');?></dt>
+            <dd><?php echo $this->get('license.has.anon') ? $this->msg('Activation.capability.enabled') : $this->msg('Activation.capability.disabled');?></dd>
+            
+            <dt><?php echo $this->msg('Activation.capability.rating');?></dt>
+            <dd><?php echo $this->get('license.has.rating') ? $this->msg('Activation.capability.enabled') : $this->msg('Activation.capability.disabled');?></dd>
+            
+            <?php if ($this->get('license.has.sids')) : ?>
+                <dt><?php echo $this->msg('Activation.sid'); ?></dt>
+                <dd><?php
+                    echo('<ul>');
+                    foreach ($this->get('license.sids') as $sid => $expiration)
+                    {
+                        echo('<li>'.$sid.'<span class="expiration">'.$this->msg('Activation.sid.expires', $expiration).'</span></li>');
+                    }
+                    echo('</ul>');
+                ?></dd>
+            <?php endif; ?>
             <dt><?php echo $this->msg('Activation.form.product-key'); ?></dt>
             <dd><?php $this->html('license.productkey'); ?></dd>
            
Index: deki/cp/assets/settings.css
===================================================================
--- deki/cp/assets/settings.css    (revision 20279)
+++ deki/cp/assets/settings.css    (working copy)
@@ -572,4 +572,8 @@
 .warning {
     font-size: 11px;
     color: #f00;    
+}
+span.expiration {
+    font-size: 11px;
+    font-style: italic;
 }
\ No newline at end of file
Index: deki/core/objects/deki_license.php
===================================================================
--- deki/core/objects/deki_license.php    (revision 20279)
+++ deki/core/objects/deki_license.php    (working copy)
@@ -186,7 +186,7 @@
     public function getSids()
     {
         $sids = array();
-        $services = $this->License->getVal('body/license.private/grants/service-license');
+        $services = $this->License->getAll('body/license.private/grants/service-license');
         $licenseExpiration = $this->getExpirationDate(null);
         foreach ($services as $service)
         {
@@ -212,7 +212,7 @@
      */
     public function hasCapabilityAnon()
     {
-        return $this->getCapability(self::CAPABILITY_ANON_PERMISSIONS) == self::CAPABILITY_ANON_PERMISSIONS;    
+        return $this->getCapability(self::CAPABILITY_ANON) == self::CAPABILITY_ANON_PERMISSIONS;    
     }
    
     /**
Index: resources/resources.txt
===================================================================
--- resources/resources.txt    (revision 20279)
+++ resources/resources.txt    (working copy)
@@ -23,6 +23,13 @@
 
 [Activation]
     activated=Your Current License
+    capabilities=Capabilities
+    capability.rating=Content rating:
+    capability.search=Adaptive search:
+    capability.anon=Public site license:
+    capability.memcache=Memcache capability:
+    capability.enabled=Enabled
+    capability.disabled=Disabled
     contact=Contact MindTouch
     error=Your license is invalid. Contact <a href="http://www.mindtouch.com/Support">MindTouch Support</a> to resolve this issue.
     error-unsigned=While you have a valid commercial license, your site is currently using an Open Source license. This is most likely because you have installed the wrong binaries for MindTouch - please <a href="http://www.mindtouch.com/Support">contact MindTouch Support</a> for assistance.
@@ -55,6 +62,8 @@
     princexml=Purchase PrinceXML Server License
     princexml.description=Our PDF generation is handled by PrinceXML; the best PDF generation tool in existence! The fantastic folks over at YesLogic are offering a discount for the PrinceXML Server License - <a href="$1">check out its benefits and upgrade today</a>!
     princexml.url=http://princexml.com/purchase/deki/
+    sid=Licensed services:
+    sid.expires= (Expires $1)
     success.trial=You have successfully activated your MindTouch trial.
     success=You have successfully activated MindTouch.
     sales=Sales