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

Merge pull request #14009 from owncloud/installing-installed-apps-is-stupid 

don't allow installation of already installed apps - fixes #14004
This commit is contained in:
Thomas Müller 2015-02-24 10:34:06 +01:00
parent a320edaca5 b40d4c9cbc
commit da8e34cf7f
4 changed files with 137 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/private/app.php
View File

@ -45,6 +45,7 @@
*/ */
use OC\App\DependencyAnalyzer; use OC\App\DependencyAnalyzer;
use OC\App\Platform; use OC\App\Platform;
use OC\OCSClient;
/** /**
* This class manages the apps. It allows them to register and integrate in the * This class manages the apps. It allows them to register and integrate in the
@ -290,9 +291,9 @@ class OC_App {
* @return int * @return int
*/ */
public static function downloadApp($app) { public static function downloadApp($app) {
$appData = OC_OCSClient::getApplication($app); $appData= OCSClient::getApplication($app);
$download = OC_OCSClient::getApplicationDownload($app, 1); $download= OCSClient::getApplicationDownload($app, 1);
if (isset($download['downloadlink']) and $download['downloadlink'] != '') { if(isset($download['downloadlink']) and $download['downloadlink']!='') {
// Replace spaces in download link without encoding entire URL // Replace spaces in download link without encoding entire URL
$download['downloadlink'] = str_replace(' ', '%20', $download['downloadlink']); $download['downloadlink'] = str_replace(' ', '%20', $download['downloadlink']);
$info = array('source' => 'http', 'href' => $download['downloadlink'], 'appdata' => $appData); $info = array('source' => 'http', 'href' => $download['downloadlink'], 'appdata' => $appData);
@ -904,7 +905,7 @@ class OC_App {
public static function getAppstoreApps($filter = 'approved', $category = null) { public static function getAppstoreApps($filter = 'approved', $category = null) {
$categories = array($category); $categories = array($category);
if (is_null($category)) { if (is_null($category)) {
$categoryNames = OC_OCSClient::getCategories(); $categoryNames = OCSClient::getCategories();
if (is_array($categoryNames)) { if (is_array($categoryNames)) {
// Check that categories of apps were retrieved correctly // Check that categories of apps were retrieved correctly
if (!$categories = array_keys($categoryNames)) { if (!$categories = array_keys($categoryNames)) {
@ -916,7 +917,7 @@ class OC_App {
} }
$page = 0; $page = 0;
$remoteApps = OC_OCSClient::getApplications($categories, $page, $filter); $remoteApps = OCSClient::getApplications($categories, $page, $filter);
$app1 = array(); $app1 = array();
$i = 0; $i = 0;
$l = \OC::$server->getL10N('core'); $l = \OC::$server->getL10N('core');
@ -1098,7 +1099,7 @@ class OC_App {
public static function installApp($app) { public static function installApp($app) {
$l = \OC::$server->getL10N('core'); $l = \OC::$server->getL10N('core');
$config = \OC::$server->getConfig(); $config = \OC::$server->getConfig();
$appData = OC_OCSClient::getApplication($app); $appData=OCSClient::getApplication($app);
// check if app is a shipped app or not. OCS apps have an integer as id, shipped apps use a string // 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)) { if (!is_numeric($app)) {

11
lib/private/installer.php
View File

@ -36,6 +36,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
* *
*/ */
use OC\OCSClient;
/**
* This class provides the functionality needed to install, update and remove plugins/apps
*/
class OC_Installer{ class OC_Installer{
/** /**
@ -215,8 +220,8 @@ class OC_Installer{
* @throws Exception * @throws Exception
*/ */
public static function updateAppByOCSId($ocsid) { public static function updateAppByOCSId($ocsid) {
$appdata = OC_OCSClient::getApplication($ocsid); $appdata = OCSClient::getApplication($ocsid);
$download = OC_OCSClient::getApplicationDownload($ocsid, 1); $download = OCSClient::getApplicationDownload($ocsid, 1);
if (isset($download['downloadlink']) && trim($download['downloadlink']) !== '') { if (isset($download['downloadlink']) && trim($download['downloadlink']) !== '') {
$download['downloadlink'] = str_replace(' ', '%20', $download['downloadlink']); $download['downloadlink'] = str_replace(' ', '%20', $download['downloadlink']);
@ -378,7 +383,7 @@ class OC_Installer{
if($ocsid<>'') { if($ocsid<>'') {
$ocsdata=OC_OCSClient::getApplication($ocsid); $ocsdata=OCSClient::getApplication($ocsid);
$ocsversion= (string) $ocsdata['version']; $ocsversion= (string) $ocsdata['version'];
$currentversion=OC_App::getAppVersion($app); $currentversion=OC_App::getAppVersion($app);
if (version_compare($ocsversion, $currentversion, '>')) { if (version_compare($ocsversion, $currentversion, '>')) {

183
lib/private/ocsclient.php
View File

@ -33,14 +33,23 @@
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
* *
*/ */
class OC_OCSClient{
namespace OC;
/**
* This class provides an easy way for apps to store config values in the
* database.
*/
class OCSClient {
/** /**
* Returns whether the AppStore is enabled (i.e. because the AppStore is disabled for EE) * Returns whether the AppStore is enabled (i.e. because the AppStore is disabled for EE)
*
* @return bool * @return bool
*/ */
protected static function isAppstoreEnabled() { public static function isAppStoreEnabled() {
if(OC::$server->getConfig()->getSystemValue('appstoreenabled', true) === false OR OC_Util::getEditionString() !== '') { if (\OC::$server->getConfig()->getSystemValue('appstoreenabled', true) === false ) {
return false; return false;
} }
@ -49,53 +58,44 @@ class OC_OCSClient{
/** /**
* Get the url of the OCS AppStore server. * Get the url of the OCS AppStore server.
*
* @return string of the AppStore server * @return string of the AppStore server
* *
* This function returns the url of the OCS AppStore server. It´s possible * This function returns the url of the OCS AppStore server. It´s possible
* to set it in the config file or it will fallback to the default * to set it in the config file or it will fallback to the default
*/ */
private static function getAppStoreURL() { private static function getAppStoreURL() {
return OC::$server->getConfig()->getSystemValue('appstoreurl', 'https://api.owncloud.com/v1'); return \OC::$server->getConfig()->getSystemValue('appstoreurl', 'https://api.owncloud.com/v1');
}
/**
* Get the content of an OCS url call.
* @return string of the response
* This function calls an OCS server and returns the response. It also sets a sane timeout
* @param string $url
*/
private static function getOCSresponse($url) {
$data = \OC_Util::getUrlContent($url);
return($data);
} }
/** /**
* Get all the categories from the OCS server * Get all the categories from the OCS server
*
* @return array|null an array of category ids or null * @return array|null an array of category ids or null
* @note returns NULL if config value appstoreenabled is set to false * @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 * This function returns a list of all the application categories on the OCS server
*/ */
public static function getCategories() { public static function getCategories() {
if(!self::isAppstoreEnabled()) { if (!self::isAppStoreEnabled()) {
return null; return null;
} }
$url=OC_OCSClient::getAppStoreURL().'/content/categories'; $url = self::getAppStoreURL() . '/content/categories';
$xml=OC_OCSClient::getOCSresponse($url); $xml = \OC::$server->getHTTPHelper()->getUrlContent($url);
if($xml==false) { if ($xml == false) {
return null; return null;
} }
$loadEntities = libxml_disable_entity_loader(true); $loadEntities = libxml_disable_entity_loader(true);
$data = simplexml_load_string($xml); $data = simplexml_load_string($xml);
libxml_disable_entity_loader($loadEntities); libxml_disable_entity_loader($loadEntities);
$tmp=$data->data; $tmp = $data->data;
$cats=array(); $cats = array();
foreach($tmp->category as $value) { foreach ($tmp->category as $value) {
$id= (int) $value->id; $id = (int)$value->id;
$name= (string) $value->name; $name = (string)$value->name;
$cats[$id]=$name; $cats[$id] = $name;
} }
@ -104,6 +104,7 @@ class OC_OCSClient{
/** /**
* Get all the applications from the OCS server * Get all the applications from the OCS server
*
* @return array|null an array of application data or null * @return array|null an array of application data or null
* *
* This function returns a list of all the applications on the OCS server * This function returns a list of all the applications on the OCS server
@ -112,24 +113,24 @@ class OC_OCSClient{
* @param string $filter * @param string $filter
*/ */
public static function getApplications($categories, $page, $filter) { public static function getApplications($categories, $page, $filter) {
if(!self::isAppstoreEnabled()) { if (!self::isAppStoreEnabled()) {
return(array()); return (array());
} }
if(is_array($categories)) { if (is_array($categories)) {
$categoriesstring=implode('x', $categories); $categoriesString = implode('x', $categories);
}else{ } else {
$categoriesstring=$categories; $categoriesString = $categories;
} }
$version='&version='.implode('x', \OC_Util::getVersion()); $version = '&version=' . implode('x', \OC_Util::getVersion());
$filterurl='&filter='.urlencode($filter); $filterUrl = '&filter=' . urlencode($filter);
$url=OC_OCSClient::getAppStoreURL().'/content/data?categories='.urlencode($categoriesstring) $url = self::getAppStoreURL() . '/content/data?categories=' . urlencode($categoriesString)
.'&sortmode=new&page='.urlencode($page).'&pagesize=100'.$filterurl.$version; . '&sortmode=new&page=' . urlencode($page) . '&pagesize=100' . $filterUrl . $version;
$apps=array(); $apps = array();
$xml=OC_OCSClient::getOCSresponse($url); $xml = \OC::$server->getHTTPHelper()->getUrlContent($url);
if($xml==false) { if ($xml == false) {
return null; return null;
} }
$loadEntities = libxml_disable_entity_loader(true); $loadEntities = libxml_disable_entity_loader(true);
@ -138,25 +139,25 @@ class OC_OCSClient{
$tmp = $data->data->content; $tmp = $data->data->content;
$tmpCount = count($tmp); $tmpCount = count($tmp);
for($i = 0; $i < $tmpCount; $i++) { for ($i = 0; $i < $tmpCount; $i++) {
$app=array(); $app = array();
$app['id']=(string)$tmp[$i]->id; $app['id'] = (string)$tmp[$i]->id;
$app['name']=(string)$tmp[$i]->name; $app['name'] = (string)$tmp[$i]->name;
$app['label']=(string)$tmp[$i]->label; $app['label'] = (string)$tmp[$i]->label;
$app['version']=(string)$tmp[$i]->version; $app['version'] = (string)$tmp[$i]->version;
$app['type']=(string)$tmp[$i]->typeid; $app['type'] = (string)$tmp[$i]->typeid;
$app['typename']=(string)$tmp[$i]->typename; $app['typename'] = (string)$tmp[$i]->typename;
$app['personid']=(string)$tmp[$i]->personid; $app['personid'] = (string)$tmp[$i]->personid;
$app['license']=(string)$tmp[$i]->license; $app['license'] = (string)$tmp[$i]->license;
$app['detailpage']=(string)$tmp[$i]->detailpage; $app['detailpage'] = (string)$tmp[$i]->detailpage;
$app['preview']=(string)$tmp[$i]->smallpreviewpic1; $app['preview'] = (string)$tmp[$i]->smallpreviewpic1;
$app['preview-full']=(string)$tmp[$i]->previewpic1; $app['preview-full'] = (string)$tmp[$i]->previewpic1;
$app['changed']=strtotime($tmp[$i]->changed); $app['changed'] = strtotime($tmp[$i]->changed);
$app['description']=(string)$tmp[$i]->description; $app['description'] = (string)$tmp[$i]->description;
$app['score']=(string)$tmp[$i]->score; $app['score'] = (string)$tmp[$i]->score;
$app['downloads'] = (int)$tmp[$i]->downloads; $app['downloads'] = (int)$tmp[$i]->downloads;
$apps[]=$app; $apps[] = $app;
} }
return $apps; return $apps;
} }
@ -164,53 +165,55 @@ class OC_OCSClient{
/** /**
* Get an the applications from the OCS server * Get an the applications from the OCS server
*
* @param string $id * @param string $id
* @return array|null an array of application data or null * @return array|null an array of application data or null
* *
* This function returns an applications from the OCS server * This function returns an applications from the OCS server
*/ */
public static function getApplication($id) { public static function getApplication($id) {
if(!self::isAppstoreEnabled()) { if (!self::isAppStoreEnabled()) {
return null; return null;
} }
$url=OC_OCSClient::getAppStoreURL().'/content/data/'.urlencode($id); $url = self::getAppStoreURL() . '/content/data/' . urlencode($id);
$xml=OC_OCSClient::getOCSresponse($url); $xml = \OC::$server->getHTTPHelper()->getUrlContent($url);
if($xml==false) { if ($xml == false) {
OC_Log::write('core', 'Unable to parse OCS content for app ' . $id, OC_Log::FATAL); \OC_Log::write('core', 'Unable to parse OCS content for app ' . $id, \OC_Log::FATAL);
return null; return null;
} }
$loadEntities = libxml_disable_entity_loader(true); $loadEntities = libxml_disable_entity_loader(true);
$data = simplexml_load_string($xml); $data = simplexml_load_string($xml);
libxml_disable_entity_loader($loadEntities); libxml_disable_entity_loader($loadEntities);
$tmp=$data->data->content; $tmp = $data->data->content;
if (is_null($tmp)) { if (is_null($tmp)) {
OC_Log::write('core', 'Invalid OCS content returned for app ' . $id, OC_Log::FATAL); \OC_Log::write('core', 'Invalid OCS content returned for app ' . $id, \OC_Log::FATAL);
return null; return null;
} }
$app=array(); $app = array();
$app['id']=$tmp->id; $app['id'] = $tmp->id;
$app['name']=$tmp->name; $app['name'] = $tmp->name;
$app['version']=$tmp->version; $app['version'] = $tmp->version;
$app['type']=$tmp->typeid; $app['type'] = $tmp->typeid;
$app['label']=$tmp->label; $app['label'] = $tmp->label;
$app['typename']=$tmp->typename; $app['typename'] = $tmp->typename;
$app['personid']=$tmp->personid; $app['personid'] = $tmp->personid;
$app['detailpage']=$tmp->detailpage; $app['detailpage'] = $tmp->detailpage;
$app['preview1']=$tmp->smallpreviewpic1; $app['preview1'] = $tmp->smallpreviewpic1;
$app['preview2']=$tmp->smallpreviewpic2; $app['preview2'] = $tmp->smallpreviewpic2;
$app['preview3']=$tmp->smallpreviewpic3; $app['preview3'] = $tmp->smallpreviewpic3;
$app['changed']=strtotime($tmp->changed); $app['changed'] = strtotime($tmp->changed);
$app['description']=$tmp->description; $app['description'] = $tmp->description;
$app['detailpage']=$tmp->detailpage; $app['detailpage'] = $tmp->detailpage;
$app['score']=$tmp->score; $app['score'] = $tmp->score;
return $app; return $app;
} }
/** /**
* Get the download url for an application from the OCS server * Get the download url for an application from the OCS server
*
* @return array|null an array of application data or null * @return array|null an array of application data or null
* *
* This function returns an download url for an applications from the OCS server * This function returns an download url for an applications from the OCS server
@ -218,26 +221,26 @@ class OC_OCSClient{
* @param integer $item * @param integer $item
*/ */
public static function getApplicationDownload($id, $item) { public static function getApplicationDownload($id, $item) {
if(!self::isAppstoreEnabled()) { if (!self::isAppStoreEnabled()) {
return null; return null;
} }
$url=OC_OCSClient::getAppStoreURL().'/content/download/'.urlencode($id).'/'.urlencode($item); $url = self::getAppStoreURL() . '/content/download/' . urlencode($id) . '/' . urlencode($item);
$xml=OC_OCSClient::getOCSresponse($url); $xml = \OC::$server->getHTTPHelper()->getUrlContent($url);
if($xml==false) { if ($xml == false) {
OC_Log::write('core', 'Unable to parse OCS content', OC_Log::FATAL); \OC_Log::write('core', 'Unable to parse OCS content', \OC_Log::FATAL);
return null; return null;
} }
$loadEntities = libxml_disable_entity_loader(true); $loadEntities = libxml_disable_entity_loader(true);
$data = simplexml_load_string($xml); $data = simplexml_load_string($xml);
libxml_disable_entity_loader($loadEntities); libxml_disable_entity_loader($loadEntities);
$tmp=$data->data->content; $tmp = $data->data->content;
$app=array(); $app = array();
if(isset($tmp->downloadlink)) { if (isset($tmp->downloadlink)) {
$app['downloadlink']=$tmp->downloadlink; $app['downloadlink'] = $tmp->downloadlink;
}else{ } else {
$app['downloadlink']=''; $app['downloadlink'] = '';
} }
return $app; return $app;
} }

35
settings/controller/appsettingscontroller.php
View File

@ -24,6 +24,7 @@ namespace OC\Settings\Controller;
use OC\App\DependencyAnalyzer; use OC\App\DependencyAnalyzer;
use OC\App\Platform; use OC\App\Platform;
use OC\OCSClient;
use \OCP\AppFramework\Controller; use \OCP\AppFramework\Controller;
use OCP\ICacheFactory; use OCP\ICacheFactory;
use OCP\IRequest; use OCP\IRequest;
@ -74,10 +75,10 @@ class AppSettingsController extends Controller {
['id' => 1, 'displayName' => (string)$this->l10n->t('Not enabled')], ['id' => 1, 'displayName' => (string)$this->l10n->t('Not enabled')],
]; ];
if($this->config->getSystemValue('appstoreenabled', true)) { if(OCSClient::isAppStoreEnabled()) {
$categories[] = ['id' => 2, 'displayName' => (string)$this->l10n->t('Recommended')]; $categories[] = ['id' => 2, 'displayName' => (string)$this->l10n->t('Recommended')];
// apps from external repo via OCS // apps from external repo via OCS
$ocs = \OC_OCSClient::getCategories(); $ocs = OCSClient::getCategories();
if ($ocs) { if ($ocs) {
foreach($ocs as $k => $v) { foreach($ocs as $k => $v) {
$categories[] = array( $categories[] = array(
@ -106,10 +107,7 @@ class AppSettingsController extends Controller {
switch ($category) { switch ($category) {
// installed apps // installed apps
case 0: case 0:
$apps = \OC_App::listAllApps(true); $apps = $this->getInstalledApps();
$apps = array_filter($apps, function ($app) {
return $app['active'];
});
usort($apps, function ($a, $b) { usort($apps, function ($a, $b) {
$a = (string)$a['name']; $a = (string)$a['name'];
$b = (string)$b['name']; $b = (string)$b['name'];
@ -147,7 +145,21 @@ class AppSettingsController extends Controller {
} }
if (!$apps) { if (!$apps) {
$apps = array(); $apps = array();
} else {
// don't list installed apps
$installedApps = $this->getInstalledApps();
$installedApps = array_map(function ($app) {
if (isset($app['ocsid'])) {
return $app['ocsid'];
}
return $app['id'];
}, $installedApps);
$apps = array_filter($apps, function ($app) use ($installedApps) {
return !in_array($app['id'], $installedApps);
});
} }
// sort by score
usort($apps, function ($a, $b) { usort($apps, function ($a, $b) {
$a = (int)$a['score']; $a = (int)$a['score'];
$b = (int)$b['score']; $b = (int)$b['score'];
@ -189,4 +201,15 @@ class AppSettingsController extends Controller {
return ['apps' => $apps, 'status' => 'success']; return ['apps' => $apps, 'status' => 'success'];
} }
/**
* @return array
*/
private function getInstalledApps() {
$apps = \OC_App::listAllApps(true);
$apps = array_filter($apps, function ($app) {
return $app['active'];
});
return $apps;
}
} }