Show the different editions to the user. Used in the status call, on the personal settings page and in the updater to update to the next available version from the same edition.

lib/updater.php

@@ -36,6 +36,7 @@ class OC_Updater{
 		$version['installed']=OC_Config::getValue('installedat');
 		$version['updated']=OC_Appconfig::getValue('core', 'lastupdatedat', OC_Config::getValue( 'lastupdatedat'));
 		$version['updatechannel']='stable';
+		$version['edition']=OC_Util::getEditionString();
 		$versionstring=implode('x',$version);
 
 		//fetch xml data from updater

lib/util.php

@@ -77,6 +77,14 @@ class OC_Util {
 		return '3';
 	}
 
+        /**
+         * get the current installed edition of ownCloud. There is the community edition that just returns an empty string and the enterprise edition that returns "Enterprise".
+         * @return string
+         */
+        public static function getEditionString(){
+                return '';
+        }
+
 	/**
 	 * add a javascript file
 	 *

settings/templates/personal.php

@@ -50,7 +50,7 @@
 };?>
 
 <p class="personalblock">
-	<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?><br />
+	<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?><br />
 	developed by the <a href="http://ownCloud.org/credits" target="_blank">ownCloud community</a><br />
 	<?php echo(OC_Updater::ShowUpdatingHint());     ?><br />
 	<a href="http://gitorious.org/owncloud" target="_blank">source code</a> licensed freely under <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank">AGPL</a>

status.php

@@ -26,7 +26,7 @@ $RUNTIME_NOAPPS = TRUE; //no apps, yet
 require_once('lib/base.php');
 
 if(OC_Config::getValue('installed')==1) $installed='true'; else $installed='false';
-$values=array('installed'=>$installed,'version'=>implode('.',OC_Util::getVersion()),'versionstring'=>OC_Util::getVersionString());
+$values=array('installed'=>$installed,'version'=>implode('.',OC_Util::getVersion()),'versionstring'=>OC_Util::getVersionString(),'edition'=>OC_Util::getEditionString());
 
 echo(json_encode($values));