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

fix appstore download.

This commit is contained in:
Frank Karlitschek 2012-01-27 17:34:47 +01:00
parent ad4e305c96
commit 05f1fffddc
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/app.php
View File

@ -100,7 +100,7 @@ class OC_App{
}else{
$download=OC_OCSClient::getApplicationDownload($app,1);
if(isset($download['downloadlink']) and $download['downloadlink']<>'') {
OC_Installer::installApp(array('source'=>'http','href'=>$download['downloadlink']));
$app=OC_Installer::installApp(array('source'=>'http','href'=>$download['downloadlink']));
}
}
}

4
lib/installer.php
View File

@ -152,14 +152,14 @@ class OC_Installer{
}
//run appinfo/install.php
if(!isset($data['noinstall']) or $data['noinstall']==false and is_file($basedir.'/appinfo/install.php')){
if((!isset($data['noinstall']) or $data['noinstall']==false) and file_exists($basedir.'/appinfo/install.php')){
include($basedir.'/appinfo/install.php');
}
//set the installed version
OC_Appconfig::setValue($info['id'],'installed_version',$info['version']);
OC_Appconfig::setValue($info['id'],'enabled','no');
return true;
return $info['id'];
}
/**

24
settings/apps.php
View File

@ -57,14 +57,22 @@ usort($apps, 'app_sort');
$categories=array_keys($catagoryNames);
$externalApps=OC_OCSClient::getApplications($categories);
foreach($externalApps as $app){
$apps[]=array(
'name'=>$app['name'],
'id'=>$app['id'],
'active'=>false,
'description'=>$app['description'],
'author'=>$app['personid'],
'license'=>$app['license'],
);
// show only external apps that are not exist yet
$local=false;
foreach($apps as $a){
if($a['name']==$app['name']) $local=true;
}
if(!$local) {
$apps[]=array(
'name'=>$app['name'],
'id'=>$app['id'],
'active'=>false,
'description'=>$app['description'],
'author'=>$app['personid'],
'license'=>$app['license'],
);
}
}
}