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

Merge branch 'master' into lib-private-master-2

This commit is contained in:
Thomas Müller 2013-10-01 16:11:59 +02:00
parent 02d6976263 b66e492d6e
commit e2fe71b6e7
4 changed files with 68 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/private/ocsclient.php
View File

@ -36,7 +36,12 @@ class OC_OCSClient{
* to set it in the config file or it will fallback to the default
*/
private static function getAppStoreURL() {
$url = OC_Config::getValue('appstoreurl', 'http://api.apps.owncloud.com/v1');
if(OC_Util::getEditionString()===''){
$default='http://api.apps.owncloud.com/v1';
}else{
$default='';
}
$url = OC_Config::getValue('appstoreurl', $default);
return($url);
}

2
lib/private/updater.php
View File

@ -56,7 +56,7 @@ class Updater extends BasicEmitter {
$version = \OC_Util::getVersion();
$version['installed'] = \OC_Appconfig::getValue('core', 'installedat');
$version['updated'] = \OC_Appconfig::getValue('core', 'lastupdatedat');
$version['updatechannel'] = 'stable';
$version['updatechannel'] = \OC_Util::getChannel();
$version['edition'] = \OC_Util::getEditionString();
$versionString = implode('x', $version);

49
lib/private/util.php
View File

@ -106,9 +106,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, 07);
OC_Util::loadVersion();
return \OC::$server->getSession()->get('OC_Version');
}
/**
@ -116,7 +115,8 @@ class OC_Util {
* @return string
*/
public static function getVersionString() {
return '6.0 pre alpha';
OC_Util::loadVersion();
return \OC::$server->getSession()->get('OC_VersionString');
}
/**
@ -126,7 +126,46 @@ class OC_Util {
* @return string
*/
public static function getEditionString() {
return '';
OC_Util::loadVersion();
return \OC::$server->getSession()->get('OC_Edition');
}
/**
* @description get the update channel of the current installed of ownCloud.
* @return string
*/
public static function getChannel() {
OC_Util::loadVersion();
return \OC::$server->getSession()->get('OC_Channel');
}
/**
* @description get the build number of the current installed of ownCloud.
* @return string
*/
public static function getBuild() {
OC_Util::loadVersion();
return \OC::$server->getSession()->get('OC_Build');
}
/**
* @description load the version.php into the session as cache
*/
private static function loadVersion() {
if(!\OC::$server->getSession()->exists('OC_Version')) {
require 'version.php';
$session = \OC::$server->getSession();
/** @var $OC_Version string */
$session->set('OC_Version', $OC_Version);
/** @var $OC_VersionString string */
$session->set('OC_VersionString', $OC_VersionString);
/** @var $OC_Edition string */
$session->set('OC_Edition', $OC_Edition);
/** @var $OC_Channel string */
$session->set('OC_Channel', $OC_Channel);
/** @var $OC_Build string */
$session->set('OC_Build', $OC_Build);
}
}
/**

17
version.php Normal file
View File

@ -0,0 +1,17 @@
<?php
// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel when updating major/minor version number.
$OC_Version=array(5, 80, 8, 0);
// 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='';