[Pkg-owncloud-commits] [owncloud] 13/15: Add oc version to app store requests in stable8
David Prévot
taffit at moszumanska.debian.org
Thu Jul 2 18:39:09 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to annotated tag v8.0.5RC1
in repository owncloud.
commit 57789e15a9216a1ea0aaa9adec09047d676b1744
Author: Joas Schilling <nickvergessen at owncloud.com>
Date: Mon Jun 29 15:45:50 2015 +0200
Add oc version to app store requests in stable8
---
lib/private/app.php | 10 +++++-----
lib/private/installer.php | 6 +++---
lib/private/ocsclient.php | 18 +++++++++++++-----
settings/controller/appsettingscontroller.php | 2 +-
4 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/lib/private/app.php b/lib/private/app.php
index d3dcf1f..1ebad2d 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -294,8 +294,8 @@ class OC_App {
* @return int
*/
public static function downloadApp($app) {
- $appData=OC_OCSClient::getApplication($app);
- $download=OC_OCSClient::getApplicationDownload($app, 1);
+ $appData=OC_OCSClient::getApplication($app, \OC_Util::getVersion());
+ $download=OC_OCSClient::getApplicationDownload($app, 1, \OC_Util::getVersion());
if(isset($download['downloadlink']) and $download['downloadlink']!='') {
// Replace spaces in download link without encoding entire URL
$download['downloadlink'] = str_replace(' ', '%20', $download['downloadlink']);
@@ -926,7 +926,7 @@ class OC_App {
public static function getAppstoreApps($filter = 'approved', $category = null) {
$categories = array($category);
if (is_null($category)) {
- $categoryNames = OC_OCSClient::getCategories();
+ $categoryNames = OC_OCSClient::getCategories(\OC_Util::getVersion());
if (is_array($categoryNames)) {
// Check that categories of apps were retrieved correctly
if (!$categories = array_keys($categoryNames)) {
@@ -938,7 +938,7 @@ class OC_App {
}
$page = 0;
- $remoteApps = OC_OCSClient::getApplications($categories, $page, $filter);
+ $remoteApps = OC_OCSClient::getApplications($categories, $page, $filter, \OC_Util::getVersion());
$app1 = array();
$i = 0;
$l = \OC::$server->getL10N('core');
@@ -1088,7 +1088,7 @@ class OC_App {
public static function installApp($app) {
$l = \OC::$server->getL10N('core');
$config = \OC::$server->getConfig();
- $appData=OC_OCSClient::getApplication($app);
+ $appData=OC_OCSClient::getApplication($app, \OC_Util::getVersion());
// check if app is a shipped app or not. OCS apps have an integer as id, shipped apps use a string
if(!is_numeric($app)) {
diff --git a/lib/private/installer.php b/lib/private/installer.php
index 7325e0d..7568795 100644
--- a/lib/private/installer.php
+++ b/lib/private/installer.php
@@ -205,8 +205,8 @@ class OC_Installer{
* @throws Exception
*/
public static function updateAppByOCSId($ocsid) {
- $appdata = OC_OCSClient::getApplication($ocsid);
- $download = OC_OCSClient::getApplicationDownload($ocsid, 1);
+ $appdata = OC_OCSClient::getApplication($ocsid, \OC_Util::getVersion());
+ $download = OC_OCSClient::getApplicationDownload($ocsid, 1, \OC_Util::getVersion());
if (isset($download['downloadlink']) && trim($download['downloadlink']) !== '') {
$download['downloadlink'] = str_replace(' ', '%20', $download['downloadlink']);
@@ -368,7 +368,7 @@ class OC_Installer{
if($ocsid<>'') {
- $ocsdata=OC_OCSClient::getApplication($ocsid);
+ $ocsdata=OC_OCSClient::getApplication($ocsid, \OC_Util::getVersion());
$ocsversion= (string) $ocsdata['version'];
$currentversion=OC_App::getAppVersion($app);
if (version_compare($ocsversion, $currentversion, '>')) {
diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php
index 7ce6723..fe881be 100644
--- a/lib/private/ocsclient.php
+++ b/lib/private/ocsclient.php
@@ -67,12 +67,15 @@ class OC_OCSClient{
* @return array|null an array of category ids or null
* @note returns NULL if config value appstoreenabled is set to false
* This function returns a list of all the application categories on the OCS server
+ *
+ * @param array $targetVersion The target ownCloud version
*/
- public static function getCategories() {
+ public static function getCategories(array $targetVersion) {
if(!self::isAppstoreEnabled()) {
return null;
}
$url=OC_OCSClient::getAppStoreURL().'/content/categories';
+ $url .= '?version='.implode('x', $targetVersion);
$xml=OC_OCSClient::getOCSresponse($url);
if($xml==false) {
return null;
@@ -103,8 +106,9 @@ class OC_OCSClient{
* @param array|string $categories
* @param int $page
* @param string $filter
+ * @param array $targetVersion The target ownCloud version
*/
- public static function getApplications($categories, $page, $filter) {
+ public static function getApplications($categories, $page, $filter, array $targetVersion) {
if(!self::isAppstoreEnabled()) {
return(array());
}
@@ -115,7 +119,7 @@ class OC_OCSClient{
$categoriesstring=$categories;
}
- $version='&version='.implode('x', \OC_Util::getVersion());
+ $version='&version='.implode('x', $targetVersion);
$filterurl='&filter='.urlencode($filter);
$url=OC_OCSClient::getAppStoreURL().'/content/data?categories='.urlencode($categoriesstring)
.'&sortmode=new&page='.urlencode($page).'&pagesize=100'.$filterurl.$version;
@@ -158,15 +162,17 @@ class OC_OCSClient{
/**
* Get an the applications from the OCS server
* @param string $id
+ * @param array $targetVersion The target ownCloud version
* @return array|null an array of application data or null
*
* This function returns an applications from the OCS server
*/
- public static function getApplication($id) {
+ public static function getApplication($id, array $targetVersion) {
if(!self::isAppstoreEnabled()) {
return null;
}
$url=OC_OCSClient::getAppStoreURL().'/content/data/'.urlencode($id);
+ $url .= '?version='.implode('x', $targetVersion);
$xml=OC_OCSClient::getOCSresponse($url);
if($xml==false) {
@@ -209,12 +215,14 @@ class OC_OCSClient{
* This function returns an download url for an applications from the OCS server
* @param string $id
* @param integer $item
+ * @param array $targetVersion The target ownCloud version
*/
- public static function getApplicationDownload($id, $item) {
+ public static function getApplicationDownload($id, $item, array $targetVersion) {
if(!self::isAppstoreEnabled()) {
return null;
}
$url=OC_OCSClient::getAppStoreURL().'/content/download/'.urlencode($id).'/'.urlencode($item);
+ $url .= '?version='.implode('x', $targetVersion);
$xml=OC_OCSClient::getOCSresponse($url);
if($xml==false) {
diff --git a/settings/controller/appsettingscontroller.php b/settings/controller/appsettingscontroller.php
index 7240343..e118e5a 100644
--- a/settings/controller/appsettingscontroller.php
+++ b/settings/controller/appsettingscontroller.php
@@ -66,7 +66,7 @@ class AppSettingsController extends Controller {
if($this->config->getSystemValue('appstoreenabled', true)) {
$categories[] = ['id' => 2, 'displayName' => (string)$this->l10n->t('Recommended')];
// apps from external repo via OCS
- $ocs = \OC_OCSClient::getCategories();
+ $ocs = \OC_OCSClient::getCategories(\OC_Util::getVersion());
if ($ocs) {
foreach($ocs as $k => $v) {
$categories[] = array(
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list