put the current version and edition into a seperate file to simplify packaging. introduce update channels and build version for automated channel updates. More about that later

Conflicts:
	lib/ocsclient.php
	lib/util.php

1 files changed, 38 insertions, 5 deletions

diff --git a/lib/util.php b/lib/util.php
index e03667b0794..5bfa7d74228 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -96,9 +96,8 @@ class OC_Util {
 	 * @return array
 	 */
 	public static function getVersion() {
-		// hint: We only can count up. Reset minor/patchlevel when
-		// updating major/minor version number.
-		return array(5, 80, 05);
+		OC_Util::loadVersion();
+		return $_SESSION['OC_Version'];
 	}
 
 	/**
@@ -106,7 +105,8 @@ class OC_Util {
 	 * @return string
 	 */
 	public static function getVersionString() {
-		return '6.0 pre alpha';
+		OC_Util::loadVersion();
+		return $_SESSION['OC_VersionString'];
 	}
 
 	/**
@@ -116,7 +116,40 @@ class OC_Util {
 	 * @return string
 	 */
 	public static function getEditionString() {
-		return '';
+		OC_Util::loadVersion();
+		return $_SESSION['OC_Edition'];
+	}
+
+	/**
+	 * @description get the update channel of the current installed of ownCloud.
+	 * @return string
+	 */
+	public static function getChannel() {
+		OC_Util::loadVersion();
+		return $_SESSION['OC_Channel'];
+	}
+        
+	/**
+	 * @description get the build number of the current installed of ownCloud.
+	 * @return string
+	 */
+	public static function getBuild() {
+		OC_Util::loadVersion();
+		return $_SESSION['OC_Build'];
+	}
+
+	/**
+	 * @description load the version.php into the session as cache
+	 */
+	private static function loadVersion() {
+		if(!isset($_SESSION['OC_Version'])){
+			require('version.php');
+			$_SESSION['OC_Version']=$OC_Version;
+			$_SESSION['OC_VersionString']=$OC_VersionString;
+			$_SESSION['OC_Edition']=$OC_Edition;
+			$_SESSION['OC_Channel']=$OC_Channel;
+			$_SESSION['OC_Build']=$OC_Build;
+		}
 	}
 
 	/**