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

fixing wrong usage of license vs licence

This commit is contained in:
Thomas Müller 2015-01-06 13:07:17 +01:00
parent 6a3f69c2d0
commit fc38d4cc81
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
settings/controller/appsettingscontroller.php
View File

@ -120,6 +120,8 @@ class AppSettingsController extends Controller {
// fix groups to be an array // fix groups to be an array
$dependencyAnalyzer = new DependencyAnalyzer(new Platform($this->config), $this->l10n); $dependencyAnalyzer = new DependencyAnalyzer(new Platform($this->config), $this->l10n);
$apps = array_map(function($app) use ($dependencyAnalyzer) { $apps = array_map(function($app) use ($dependencyAnalyzer) {
// fix groups
$groups = array(); $groups = array();
if (is_string($app['groups'])) { if (is_string($app['groups'])) {
$groups = json_decode($app['groups']); $groups = json_decode($app['groups']);
@ -127,11 +129,16 @@ class AppSettingsController extends Controller {
$app['groups'] = $groups; $app['groups'] = $groups;
$app['canUnInstall'] = !$app['active'] && $app['removable']; $app['canUnInstall'] = !$app['active'] && $app['removable'];
// fix licence vs license
if (isset($app['license']) && !isset($app['licence'])) {
$app['licence'] = $app['license'];
}
// analyse dependencies // analyse dependencies
$missing = $dependencyAnalyzer->analyze($app); $missing = $dependencyAnalyzer->analyze($app);
$app['canInstall'] = empty($missing); $app['canInstall'] = empty($missing);
$app['missingDependencies'] = $missing; $app['missingDependencies'] = $missing;
return $app; return $app;
}, $apps); }, $apps);

4
settings/templates/apps.php
View File

@ -22,8 +22,8 @@
<h2 class="app-name"><a href="{{detailpage}}" target="_blank">{{name}}</a></h2> <h2 class="app-name"><a href="{{detailpage}}" target="_blank">{{name}}</a></h2>
<div class="app-version"> {{version}}</div> <div class="app-version"> {{version}}</div>
<div class="app-author"><?php p($l->t('by')); ?> {{author}} <div class="app-author"><?php p($l->t('by')); ?> {{author}}
{{#if license}} {{#if licence}}
({{license}}-<?php p($l->t('licensed')); ?>) ({{licence}}-<?php p($l->t('licensed')); ?>)
{{/if}} {{/if}}
</div> </div>
{{#if score}} {{#if score}}