send the current owncloud version to the ocs server so that we can filter for compati...

diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index f05a9af31c2e0caa637075720a8554329a21721f..dde2545858d35a9a69bbd9ebdd417a91d865a2f4 100644 (file)
--- 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 082f1cfb922412fb9702d011b0f892939a7eac54..f68843fac31276096fd08b3d18a641e1561377e9 100644 (file)
--- 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;