diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2012-08-31 20:22:03 +0200 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2012-08-31 20:22:03 +0200 |
| commit | 72e80bf6bd7c1dfe8e6b23787c2ba8d8add098c9 (patch) | |
| tree | 3d451cf2cbc851bcc75e62f609c5694ab9d2feea | |
| parent | 6f8efcfe6162cd7fea68dd0677b7d4a6f1120c1f (diff) | |
| download | nextcloud-server-72e80bf6bd7c1dfe8e6b23787c2ba8d8add098c9.tar.gz nextcloud-server-72e80bf6bd7c1dfe8e6b23787c2ba8d8add098c9.zip | |
send the current owncloud version to the ocs server so that we can filter for compatible apps
| -rw-r--r-- | lib/ocsclient.php | 7 | ||||
| -rw-r--r-- | settings/ajax/apps/ocs.php | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lib/ocsclient.php b/lib/ocsclient.php index f05a9af31c2..dde2545858d 100644 --- a/lib/ocsclient.php +++ b/lib/ocsclient.php @@ -88,7 +88,7 @@ class OC_OCSClient{ * * This function returns a list of all the applications on the OCS server */ - public static function getApplications($categories,$page){ + public static function getApplications($categories,$page,$filter){ if(OC_Config::getValue('appstoreenabled', true)==false){ return(array()); } @@ -98,7 +98,10 @@ class OC_OCSClient{ }else{ $categoriesstring=$categories; } - $url=OC_OCSClient::getAppStoreURL().'/content/data?categories='.urlencode($categoriesstring).'&sortmode=new&page='.urlencode($page).'&pagesize=100'; + + $version='&version='.implode('x',\OC_Util::getVersion()); + $filterurl='&filter='.urlencode($filter); + $url=OC_OCSClient::getAppStoreURL().'/content/data?categories='.urlencode($categoriesstring).'&sortmode=new&page='.urlencode($page).'&pagesize=100'.$filterurl.$version; $apps=array(); $xml=@file_get_contents($url); if($xml==FALSE){ diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php index 082f1cfb922..f68843fac31 100644 --- a/settings/ajax/apps/ocs.php +++ b/settings/ajax/apps/ocs.php @@ -30,7 +30,8 @@ $catagoryNames=OC_OCSClient::getCategories(); if(is_array($catagoryNames)){ $categories=array_keys($catagoryNames); $page=0; - $externalApps=OC_OCSClient::getApplications($categories,$page); + $filter='approved'; + $externalApps=OC_OCSClient::getApplications($categories,$page,$filter); foreach($externalApps as $app){ // show only external apps that aren't enabled yet $local=false; |