user-trashbin
diff --git a/apps/files_versions/appinfo/info.xml b/apps/files_versions/appinfo/info.xml
index 8fe6372279..0098ea9e20 100644
--- a/apps/files_versions/appinfo/info.xml
+++ b/apps/files_versions/appinfo/info.xml
@@ -4,7 +4,6 @@
Versions
AGPL
Frank Karlitschek, Bjoern Schiessle
- true
This application enables ownCloud to automatically maintain older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user’s directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. ownCloud then automatically manages the versions folder to ensure the user doesn’t run out of Quota because of versions.
In addition to the expiry of versions, ownCloud’s versions app makes certain never to use more than 50% of the user’s currently available free space. If stored versions exceed this limit, ownCloud will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation.
@@ -15,7 +14,7 @@ In addition to the expiry of versions, ownCloud’s versions app makes certain n
-
+
user-versions
diff --git a/apps/provisioning_api/appinfo/info.xml b/apps/provisioning_api/appinfo/info.xml
index a77b1f67e2..a8702aaf1e 100644
--- a/apps/provisioning_api/appinfo/info.xml
+++ b/apps/provisioning_api/appinfo/info.xml
@@ -13,7 +13,6 @@
AGPL
Tom Needham
- true
admin-provisioning-api
@@ -24,6 +23,6 @@
-
+
diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml
index 7dbce1da5f..864eaebe4d 100644
--- a/apps/user_ldap/appinfo/info.xml
+++ b/apps/user_ldap/appinfo/info.xml
@@ -9,7 +9,6 @@ A user logs into ownCloud with their LDAP or AD credentials, and is granted acce
AGPL
Dominik Schmidt and Arthur Schiwon
- true
0.8.0
@@ -19,6 +18,6 @@ A user logs into ownCloud with their LDAP or AD credentials, and is granted acce
ldap
-
+
diff --git a/core/command/app/checkcode.php b/core/command/app/checkcode.php
index e186d458c0..bc3ae07890 100644
--- a/core/command/app/checkcode.php
+++ b/core/command/app/checkcode.php
@@ -131,6 +131,10 @@ class CheckCode extends Command {
}
});
+ $infoChecker->listen('InfoChecker', 'missingRequirement', function($minMax) use ($output) {
+ $output->writeln("ownCloud $minMax version requirement missing (will be an error in ownCloud 11 and later)");
+ });
+
$infoChecker->listen('InfoChecker', 'duplicateRequirement', function($minMax) use ($output) {
$output->writeln("Duplicate $minMax ownCloud version requirement found");
});
diff --git a/lib/private/app/codechecker/infochecker.php b/lib/private/app/codechecker/infochecker.php
index 24835d8148..2589277118 100644
--- a/lib/private/app/codechecker/infochecker.php
+++ b/lib/private/app/codechecker/infochecker.php
@@ -83,13 +83,18 @@ class InfoChecker extends BasicEmitter {
'type' => 'duplicateRequirement',
'field' => 'min',
];
+ } else if (!isset($info['dependencies']['owncloud']['@attributes']['min-version'])) {
+ $this->emit('InfoChecker', 'missingRequirement', ['min']);
}
+
if (isset($info['dependencies']['owncloud']['@attributes']['max-version']) && $info['requiremax']) {
$this->emit('InfoChecker', 'duplicateRequirement', ['max']);
$errors[] = [
'type' => 'duplicateRequirement',
'field' => 'max',
];
+ } else if (!isset($info['dependencies']['owncloud']['@attributes']['max-version'])) {
+ $this->emit('InfoChecker', 'missingRequirement', ['max']);
}
foreach ($info as $key => $value) {
diff --git a/settings/controller/appsettingscontroller.php b/settings/controller/appsettingscontroller.php
index 765fe2d285..79b7589027 100644
--- a/settings/controller/appsettingscontroller.php
+++ b/settings/controller/appsettingscontroller.php
@@ -296,6 +296,9 @@ class AppSettingsController extends Controller {
$app['canInstall'] = empty($missing);
$app['missingDependencies'] = $missing;
+ $app['missingMinOwnCloudVersion'] = !isset($app['dependencies']['owncloud']['@attributes']['min-version']);
+ $app['missingMaxOwnCloudVersion'] = !isset($app['dependencies']['owncloud']['@attributes']['max-version']);
+
return $app;
}, $apps);
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 7213d552c0..94efd76c7c 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -97,6 +97,18 @@ script(
t("Show description …"));?>
t("Hide description …"));?>
+ {{#if missingMinOwnCloudVersion}}
+
+
t('This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later.')); ?>
+
+
t('This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later.')); ?>
+
t('This app cannot be installed because the following dependencies are not fulfilled:')); ?>