mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Frank Karlitschek 2013-09-27 23:41:24 +02:00 committed by Thomas Müller
parent 69dd6af574
commit 2cf26ee0b1
2 changed files with 55 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lib/util.php
View File

@ -96,9 +96,8 @@ class OC_Util {
* @return array * @return array
*/ */
public static function getVersion() { public static function getVersion() {
// hint: We only can count up. Reset minor/patchlevel when OC_Util::loadVersion();
// updating major/minor version number. return $_SESSION['OC_Version'];
return array(5, 80, 05);
} }
/** /**
@ -106,7 +105,8 @@ class OC_Util {
* @return string * @return string
*/ */
public static function getVersionString() { 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 * @return string
*/ */
public static function getEditionString() { 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;
}
} }
/** /**

17
version.php Normal file
View File

@ -0,0 +1,17 @@
<?php
// We only can count up. Reset minor/patchlevel when updating major/minor version number.
$OC_Version=array(5, 80, 8);
// The human radable string
$OC_VersionString='6.0 pre alpha';
// The ownCloud edition
$OC_Edition='';
// The ownCloud channel
$OC_Channel='';
// The build number
$OC_Build='';