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

Merge pull request #10614 from owncloud/remove-ee-hack 

Remove different URL for EE
This commit is contained in:
Lukas Reschke 2014-08-29 18:23:15 +02:00
parent 10382ef2f0 ca7e4c8c67
commit 35276def1c
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/private/ocsclient.php
View File

@ -28,6 +28,18 @@
class OC_OCSClient{
/**
* Returns whether the AppStore is enabled (i.e. because the AppStore is disabled for EE)
* @return bool
*/
protected static function isAppstoreEnabled() {
if(OC::$server->getConfig()->getSystemValue('appstoreenabled', true) === false OR OC_Util::getEditionString() !== '') {
return false;
}
return true;
}
/**
* Get the url of the OCS AppStore server.
* @return string of the AppStore server
@ -36,16 +48,9 @@ class OC_OCSClient{
* to set it in the config file or it will fallback to the default
*/
private static function getAppStoreURL() {
if(OC_Util::getEditionString()===''){
$default='https://api.owncloud.com/v1';
}else{
$default='';
}
$url = OC_Config::getValue('appstoreurl', $default);
return($url);
return OC::$server->getConfig()->getSystemValue('appstoreurl', 'https://api.owncloud.com/v1');
}
/**
* Get the content of an OCS url call.
* @return string of the response
@ -64,7 +69,7 @@ class OC_OCSClient{
* This function returns a list of all the application categories on the OCS server
*/
public static function getCategories() {
if(OC_Config::getValue('appstoreenabled', true)==false) {
if(!self::isAppstoreEnabled()) {
return null;
}
$url=OC_OCSClient::getAppStoreURL().'/content/categories';
@ -100,7 +105,7 @@ class OC_OCSClient{
* @param string $filter
*/
public static function getApplications($categories, $page, $filter) {
if(OC_Config::getValue('appstoreenabled', true)==false) {
if(!self::isAppstoreEnabled()) {
return(array());
}
@ -155,7 +160,7 @@ class OC_OCSClient{
* This function returns an applications from the OCS server
*/
public static function getApplication($id) {
if(OC_Config::getValue('appstoreenabled', true)==false) {
if(!self::isAppstoreEnabled()) {
return null;
}
$url=OC_OCSClient::getAppStoreURL().'/content/data/'.urlencode($id);
@ -203,7 +208,7 @@ class OC_OCSClient{
* @param integer $item
*/
public static function getApplicationDownload($id, $item) {
if(OC_Config::getValue('appstoreenabled', true)==false) {
if(!self::isAppstoreEnabled()) {
return null;
}
$url=OC_OCSClient::getAppStoreURL().'/content/download/'.urlencode($id).'/'.urlencode($item);