aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/base.php17
-rw-r--r--lib/private/AppFramework/DependencyInjection/DIContainer.php12
-rw-r--r--lib/private/Installer.php6
-rw-r--r--lib/private/Server.php28
-rw-r--r--lib/private/Settings/Admin/Additional.php88
-rw-r--r--lib/private/Settings/Admin/Encryption.php91
-rw-r--r--lib/private/Settings/Admin/Logging.php86
-rw-r--r--lib/private/Settings/Admin/Server.php149
-rw-r--r--lib/private/Settings/Admin/Sharing.php90
-rw-r--r--lib/private/Settings/Admin/TipsTricks.php71
-rw-r--r--lib/private/Settings/Manager.php431
-rw-r--r--lib/private/Settings/RemoveOrphaned.php91
-rw-r--r--lib/private/Settings/Section.php77
-rw-r--r--lib/private/legacy/app.php26
-rw-r--r--lib/public/App/ManagerEvent.php5
-rw-r--r--lib/public/Settings/IManager.php98
-rw-r--r--lib/public/Settings/ISection.php57
-rw-r--r--lib/public/Settings/ISettings.php54
18 files changed, 1474 insertions, 3 deletions
diff --git a/lib/base.php b/lib/base.php
index 3457a74e989..a69a4dffef8 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -725,6 +725,7 @@ class OC {
self::registerLogRotate();
self::registerEncryptionWrapper();
self::registerEncryptionHooks();
+ self::registerSettingsHooks();
//make sure temporary files are cleaned up
$tmpManager = \OC::$server->getTempManager();
@@ -803,6 +804,22 @@ class OC {
}
}
+ public static function registerSettingsHooks() {
+ $dispatcher = \OC::$server->getEventDispatcher();
+ $dispatcher->addListener(OCP\App\ManagerEvent::EVENT_APP_DISABLE, function($event) {
+ /** @var \OCP\App\ManagerEvent $event */
+ \OC::$server->getSettingsManager()->onAppDisabled($event->getAppID());
+ });
+ $dispatcher->addListener(OCP\App\ManagerEvent::EVENT_APP_UPDATE, function($event) {
+ /** @var \OCP\App\ManagerEvent $event */
+ $jobList = \OC::$server->getJobList();
+ $job = 'OC\\Settings\\RemoveOrphaned';
+ if(!($jobList->has($job, null))) {
+ $jobList->add($job);
+ }
+ });
+ }
+
private static function registerEncryptionWrapper() {
$manager = self::$server->getEncryptionManager();
\OCP\Util::connectHook('OC_Filesystem', 'preSetup', $manager, 'setupStorage');
diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php
index 66ca59d26e2..77192847867 100644
--- a/lib/private/AppFramework/DependencyInjection/DIContainer.php
+++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php
@@ -124,6 +124,10 @@ class DIContainer extends SimpleContainer implements IAppContainer {
return $this->getServer()->getDateTimeZone();
});
+ $this->registerService('OCP\\IDateTimeFormatter', function($c) {
+ return $this->getServer()->getDateTimeFormatter();
+ });
+
$this->registerService('OCP\\IDb', function($c) {
return $this->getServer()->getDb();
});
@@ -148,6 +152,10 @@ class DIContainer extends SimpleContainer implements IAppContainer {
return $this->getServer()->getMountProviderCollection();
});
+ $this->registerService('OCP\\Files\\Config\\IUserMountCache', function($c) {
+ return $this->getServer()->getUserMountCache();
+ });
+
$this->registerService('OCP\\Files\\IRootFolder', function($c) {
return $this->getServer()->getRootFolder();
});
@@ -306,6 +314,10 @@ class DIContainer extends SimpleContainer implements IAppContainer {
return $c->query('ServerContainer')->getWebRoot();
});
+ $this->registerService('OCP\Encryption\IManager', function ($c) {
+ return $this->getServer()->getEncryptionManager();
+ });
+
/**
* App Framework APIs
diff --git a/lib/private/Installer.php b/lib/private/Installer.php
index eed97e18d94..3d8a923417a 100644
--- a/lib/private/Installer.php
+++ b/lib/private/Installer.php
@@ -593,6 +593,12 @@ class Installer {
OC_App::setAppTypes($info['id']);
+ if(isset($info['settings']) && is_array($info['settings'])) {
+ // requires that autoloading was registered for the app,
+ // as happens before running the install.php some lines above
+ \OC::$server->getSettingsManager()->setupSettings($info['settings']);
+ }
+
return $info['id'];
}
diff --git a/lib/private/Server.php b/lib/private/Server.php
index 03c3633c9f2..44fc605826c 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -82,7 +82,7 @@ use OC\Security\SecureRandom;
use OC\Security\TrustedDomainHelper;
use OC\Session\CryptoWrapper;
use OC\Tagging\TagMapper;
-use OCA\Theming\Template;
+use OCA\Theming\ThemingDefaults;
use OCP\IL10N;
use OCP\IServerContainer;
use OCP\Security\IContentSecurityPolicyManager;
@@ -651,7 +651,7 @@ class Server extends ServerContainer implements IServerContainer {
}
if ($classExists && $this->getConfig()->getSystemValue('installed', false) && $this->getAppManager()->isInstalled('theming')) {
- return new Template(
+ return new ThemingDefaults(
$this->getConfig(),
$this->getL10N('theming'),
$this->getURLGenerator(),
@@ -722,6 +722,18 @@ class Server extends ServerContainer implements IServerContainer {
return $manager;
});
+ $this->registerService('SettingsManager', function(Server $c) {
+ $manager = new \OC\Settings\Manager(
+ $c->getLogger(),
+ $c->getDatabaseConnection(),
+ $c->getL10N('core'),
+ $c->getConfig(),
+ $c->getEncryptionManager(),
+ $c->getUserManager(),
+ $c->getLockingProvider()
+ );
+ return $manager;
+ });
}
/**
@@ -1277,6 +1289,11 @@ class Server extends ServerContainer implements IServerContainer {
return $this->query('MountManager');
}
+ /** @return \OCP\Files\Config\IUserMountCache */
+ function getUserMountCache() {
+ return $this->query('UserMountCache');
+ }
+
/**
* Get the MimeTypeDetector
*
@@ -1425,4 +1442,11 @@ class Server extends ServerContainer implements IServerContainer {
public function getLDAPProvider() {
return $this->query('LDAPProvider');
}
+
+ /**
+ * @return \OCP\Settings\IManager
+ */
+ public function getSettingsManager() {
+ return $this->query('SettingsManager');
+ }
}
diff --git a/lib/private/Settings/Admin/Additional.php b/lib/private/Settings/Admin/Additional.php
new file mode 100644
index 00000000000..d133e4737a7
--- /dev/null
+++ b/lib/private/Settings/Admin/Additional.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Settings\Admin;
+
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Platforms\SqlitePlatform;
+use OC\Lock\DBLockingProvider;
+use OC\Lock\NoopLockingProvider;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IConfig;
+use OCP\IDBConnection;
+use OCP\IL10N;
+use OCP\Lock\ILockingProvider;
+use OCP\Settings\ISettings;
+
+class Additional implements ISettings {
+ /** @var IConfig */
+ private $config;
+
+ /**
+ * @param IConfig $config
+ */
+ public function __construct(IConfig $config) {
+ $this->config = $config;
+ }
+
+ /**
+ * @return TemplateResponse
+ */
+ public function getForm() {
+ $parameters = [
+ // Mail
+ 'sendmail_is_available' => (bool) \OC_Helper::findBinaryPath('sendmail'),
+ 'mail_domain' => $this->config->getSystemValue('mail_domain', ''),
+ 'mail_from_address' => $this->config->getSystemValue('mail_from_address', ''),
+ 'mail_smtpmode' => $this->config->getSystemValue('mail_smtpmode', ''),
+ 'mail_smtpsecure' => $this->config->getSystemValue('mail_smtpsecure', ''),
+ 'mail_smtphost' => $this->config->getSystemValue('mail_smtphost', ''),
+ 'mail_smtpport' => $this->config->getSystemValue('mail_smtpport', ''),
+ 'mail_smtpauthtype' => $this->config->getSystemValue('mail_smtpauthtype', ''),
+ 'mail_smtpauth' => $this->config->getSystemValue('mail_smtpauth', false),
+ 'mail_smtpname' => $this->config->getSystemValue('mail_smtpname', ''),
+ 'mail_smtppassword' => $this->config->getSystemValue('mail_smtppassword', ''),
+ ];
+
+ return new TemplateResponse('settings', 'admin/additional-mail', $parameters, '');
+ }
+
+ /**
+ * @return string the section ID, e.g. 'sharing'
+ */
+ public function getSection() {
+ return 'additional';
+ }
+
+ /**
+ * @return int whether the form should be rather on the top or bottom of
+ * the admin section. The forms are arranged in ascending order of the
+ * priority values. It is required to return a value between 0 and 100.
+ *
+ * E.g.: 70
+ */
+ public function getPriority() {
+ return 0;
+ }
+}
diff --git a/lib/private/Settings/Admin/Encryption.php b/lib/private/Settings/Admin/Encryption.php
new file mode 100644
index 00000000000..6e93407f1a3
--- /dev/null
+++ b/lib/private/Settings/Admin/Encryption.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Settings\Admin;
+
+use OC\Encryption\Manager;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IUserManager;
+use OCP\Settings\ISettings;
+
+class Encryption implements ISettings {
+ /** @var Manager */
+ private $manager;
+
+ /** @var IUserManager */
+ private $userManager;
+
+ /**
+ * @param Manager $manager
+ * @param IUserManager $userManager
+ */
+ public function __construct(Manager $manager, IUserManager $userManager) {
+ $this->manager = $manager;
+ $this->userManager = $userManager;
+ }
+
+ /**
+ * @return TemplateResponse
+ */
+ public function getForm() {
+ $encryptionModules = $this->manager->getEncryptionModules();
+ $defaultEncryptionModuleId = $this->manager->getDefaultEncryptionModuleId();
+ $encryptionModuleList = [];
+ foreach ($encryptionModules as $module) {
+ $encryptionModuleList[$module['id']]['displayName'] = $module['displayName'];
+ $encryptionModuleList[$module['id']]['default'] = false;
+ if ($module['id'] === $defaultEncryptionModuleId) {
+ $encryptionModuleList[$module['id']]['default'] = true;
+ }
+ }
+
+ $parameters = [
+ // Encryption API
+ 'encryptionEnabled' => $this->manager->isEnabled(),
+ 'encryptionReady' => $this->manager->isReady(),
+ 'externalBackendsEnabled' => count($this->userManager->getBackends()) > 1,
+ // Modules
+ 'encryptionModules' => $encryptionModuleList,
+ ];
+
+ return new TemplateResponse('settings', 'admin/encryption', $parameters, '');
+ }
+
+ /**
+ * @return string the section ID, e.g. 'sharing'
+ */
+ public function getSection() {
+ return 'encryption';
+ }
+
+ /**
+ * @return int whether the form should be rather on the top or bottom of
+ * the admin section. The forms are arranged in ascending order of the
+ * priority values. It is required to return a value between 0 and 100.
+ *
+ * E.g.: 70
+ */
+ public function getPriority() {
+ return 0;
+ }
+}
diff --git a/lib/private/Settings/Admin/Logging.php b/lib/private/Settings/Admin/Logging.php
new file mode 100644
index 00000000000..407248ac4b1
--- /dev/null
+++ b/lib/private/Settings/Admin/Logging.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Settings\Admin;
+
+use OC\Log\File as LogFile;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IConfig;
+use OCP\Settings\ISettings;
+
+class Logging implements ISettings {
+ /** @var IConfig */
+ private $config;
+
+ /**
+ * @param IConfig $config
+ */
+ public function __construct(IConfig $config) {
+ $this->config = $config;
+ }
+
+ /**
+ * @return TemplateResponse
+ */
+ public function getForm() {
+ $logType = $this->config->getSystemValue('log_type', 'file');
+ $showLog = ($logType === 'file' || $logType === 'owncloud');
+
+ $numEntriesToLoad = 5;
+ $entries = LogFile::getEntries($numEntriesToLoad + 1);
+ $entriesRemaining = count($entries) > $numEntriesToLoad;
+ $entries = array_slice($entries, 0, $numEntriesToLoad);
+
+ $logFileExists = file_exists(LogFile::getLogFilePath()) ;
+ $logFileSize = $logFileExists ? filesize(LogFile::getLogFilePath()) : 0;
+
+ $parameters = [
+ 'loglevel' => $this->config->getSystemValue('loglevel', 2),
+ 'entries' => $entries,
+ 'entriesremain' => $entriesRemaining,
+ 'doesLogFileExist' => $logFileExists,
+ 'logFileSize' => $logFileSize,
+ 'showLog' => $showLog,
+ ];
+
+ return new TemplateResponse('settings', 'admin/logging', $parameters, '');
+ }
+
+ /**
+ * @return string the section ID, e.g. 'sharing'
+ */
+ public function getSection() {
+ return 'logging';
+ }
+
+ /**
+ * @return int whether the form should be rather on the top or bottom of
+ * the admin section. The forms are arranged in ascending order of the
+ * priority values. It is required to return a value between 0 and 100.
+ *
+ * E.g.: 70
+ */
+ public function getPriority() {
+ return 0;
+ }
+}
diff --git a/lib/private/Settings/Admin/Server.php b/lib/private/Settings/Admin/Server.php
new file mode 100644
index 00000000000..6b381ab48ed
--- /dev/null
+++ b/lib/private/Settings/Admin/Server.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Settings\Admin;
+
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Platforms\SqlitePlatform;
+use OC\Lock\DBLockingProvider;
+use OC\Lock\NoopLockingProvider;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IConfig;
+use OCP\IDBConnection;
+use OCP\IL10N;
+use OCP\Lock\ILockingProvider;
+use OCP\Settings\ISettings;
+
+class Server implements ISettings {
+ /** @var IDBConnection|Connection */
+ private $db;
+ /** @var IConfig */
+ private $config;
+ /** @var ILockingProvider */
+ private $lockingProvider;
+ /** @var IL10N */
+ private $l;
+
+ /**
+ * @param IDBConnection $db
+ * @param IConfig $config
+ * @param ILockingProvider $lockingProvider
+ * @param IL10N $l
+ */
+ public function __construct(IDBConnection $db,
+ IConfig $config,
+ ILockingProvider $lockingProvider,
+ IL10N $l) {
+ $this->db = $db;
+ $this->config = $config;
+ $this->lockingProvider = $lockingProvider;
+ $this->l = $l;
+ }
+
+ /**
+ * @return TemplateResponse
+ */
+ public function getForm() {
+ try {
+ if ($this->db->getDatabasePlatform() instanceof SqlitePlatform) {
+ $invalidTransactionIsolationLevel = false;
+ } else {
+ $invalidTransactionIsolationLevel = $this->db->getTransactionIsolation() !== Connection::TRANSACTION_READ_COMMITTED;
+ }
+ } catch (DBALException $e) {
+ // ignore
+ $invalidTransactionIsolationLevel = false;
+ }
+
+ $envPath = getenv('PATH');
+
+ // warn if outdated version of a memcache module is used
+ $caches = [
+ 'apcu' => ['name' => $this->l->t('APCu'), 'version' => '4.0.6'],
+ 'redis' => ['name' => $this->l->t('Redis'), 'version' => '2.2.5'],
+ ];
+ $outdatedCaches = [];
+ foreach ($caches as $php_module => $data) {
+ $isOutdated = extension_loaded($php_module) && version_compare(phpversion($php_module), $data['version'], '<');
+ if ($isOutdated) {
+ $outdatedCaches[$php_module] = $data;
+ }
+ }
+
+ if ($this->lockingProvider instanceof NoopLockingProvider) {
+ $fileLockingType = 'none';
+ } else if ($this->lockingProvider instanceof DBLockingProvider) {
+ $fileLockingType = 'db';
+ } else {
+ $fileLockingType = 'cache';
+ }
+
+ // If the current web root is non-empty but the web root from the config is,
+ // and system cron is used, the URL generator fails to build valid URLs.
+ $shouldSuggestOverwriteCliUrl = $this->config->getAppValue('core', 'backgroundjobs_mode', 'ajax') === 'cron'
+ && \OC::$WEBROOT && \OC::$WEBROOT !== '/'
+ && !$this->config->getSystemValue('overwrite.cli.url', '');
+ $suggestedOverwriteCliUrl = ($shouldSuggestOverwriteCliUrl) ? \OC::$WEBROOT : '';
+
+ $parameters = [
+ // Diagnosis
+ 'readOnlyConfigEnabled' => \OC_Helper::isReadOnlyConfigEnabled(),
+ 'isLocaleWorking' => \OC_Util::isSetLocaleWorking(),
+ 'isAnnotationsWorking' => \OC_Util::isAnnotationsWorking(),
+ 'checkForWorkingWellKnownSetup' => $this->config->getSystemValue('check_for_working_wellknown_setup', true),
+ 'has_fileinfo' => \OC_Util::fileInfoLoaded(),
+ 'invalidTransactionIsolationLevel' => $invalidTransactionIsolationLevel,
+ 'getenvServerNotWorking' => empty($envPath),
+ 'OutdatedCacheWarning' => $outdatedCaches,
+ 'fileLockingType' => $fileLockingType,
+ 'suggestedOverwriteCliUrl' => $suggestedOverwriteCliUrl,
+
+ // Background jobs
+ 'backgroundjobs_mode' => $this->config->getAppValue('core', 'backgroundjobs_mode', 'ajax'),
+ 'cron_log' => $this->config->getSystemValue('cron_log', true),
+ 'lastcron' => $this->config->getAppValue('core', 'lastcron', false),
+ 'cronErrors' => $this->config->getAppValue('core', 'cronErrors'),
+ ];
+
+ return new TemplateResponse('settings', 'admin/server', $parameters, '');
+ }
+
+ /**
+ * @return string the section ID, e.g. 'sharing'
+ */
+ public function getSection() {
+ return 'server';
+ }
+
+ /**
+ * @return int whether the form should be rather on the top or bottom of
+ * the admin section. The forms are arranged in ascending order of the
+ * priority values. It is required to return a value between 0 and 100.
+ *
+ * E.g.: 70
+ */
+ public function getPriority() {
+ return 0;
+ }
+}
diff --git a/lib/private/Settings/Admin/Sharing.php b/lib/private/Settings/Admin/Sharing.php
new file mode 100644
index 00000000000..8d3ddc9b3b5
--- /dev/null
+++ b/lib/private/Settings/Admin/Sharing.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Settings\Admin;
+
+use OC\Share\Share;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IConfig;
+use OCP\Settings\ISettings;
+use OCP\Util;
+
+class Sharing implements ISettings {
+ /** @var IConfig */
+ private $config;
+
+ /**
+ * @param IConfig $config
+ */
+ public function __construct(IConfig $config) {
+ $this->config = $config;
+ }
+
+ /**
+ * @return TemplateResponse
+ */
+ public function getForm() {
+ $excludedGroups = $this->config->getAppValue('core', 'shareapi_exclude_groups_list', '');
+ $excludeGroupsList = !is_null(json_decode($excludedGroups))
+ ? implode('|', json_decode($excludedGroups, true)) : '';
+
+ $parameters = [
+ // Built-In Sharing
+ 'allowGroupSharing' => $this->config->getAppValue('core', 'shareapi_allow_group_sharing', 'yes'),
+ 'allowLinks' => $this->config->getAppValue('core', 'shareapi_allow_links', 'yes'),
+ 'allowMailNotification' => $this->config->getAppValue('core', 'shareapi_allow_mail_notification', 'no'),
+ 'allowPublicMailNotification' => $this->config->getAppValue('core', 'shareapi_allow_public_notification', 'no'),
+ 'allowPublicUpload' => $this->config->getAppValue('core', 'shareapi_allow_public_upload', 'yes'),
+ 'allowResharing' => $this->config->getAppValue('core', 'shareapi_allow_resharing', 'yes'),
+ 'allowShareDialogUserEnumeration' => $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes'),
+ 'enforceLinkPassword' => Util::isPublicLinkPasswordRequired(),
+ 'onlyShareWithGroupMembers' => Share::shareWithGroupMembersOnly(),
+ 'shareAPIEnabled' => $this->config->getAppValue('core', 'shareapi_enabled', 'yes'),
+ 'shareDefaultExpireDateSet' => $this->config->getAppValue('core', 'shareapi_default_expire_date', 'no'),
+ 'shareExpireAfterNDays' => $this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7'),
+ 'shareEnforceExpireDate' => $this->config->getAppValue('core', 'shareapi_enforce_expire_date', 'no'),
+ 'shareExcludeGroups' => $this->config->getAppValue('core', 'shareapi_exclude_groups', 'no') === 'yes' ? true : false,
+ 'shareExcludedGroupsList' => $excludeGroupsList,
+ ];
+
+ return new TemplateResponse('settings', 'admin/sharing', $parameters, '');
+ }
+
+ /**
+ * @return string the section ID, e.g. 'sharing'
+ */
+ public function getSection() {
+ return 'sharing';
+ }
+
+ /**
+ * @return int whether the form should be rather on the top or bottom of
+ * the admin section. The forms are arranged in ascending order of the
+ * priority values. It is required to return a value between 0 and 100.
+ *
+ * E.g.: 70
+ */
+ public function getPriority() {
+ return 0;
+ }
+}
diff --git a/lib/private/Settings/Admin/TipsTricks.php b/lib/private/Settings/Admin/TipsTricks.php
new file mode 100644
index 00000000000..fd0fd595844
--- /dev/null
+++ b/lib/private/Settings/Admin/TipsTricks.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Settings\Admin;
+
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IConfig;
+use OCP\Settings\ISettings;
+
+class TipsTricks implements ISettings {
+ /** @var IConfig */
+ private $config;
+
+ /**
+ * @param IConfig $config
+ */
+ public function __construct(IConfig $config) {
+ $this->config = $config;
+ }
+
+ /**
+ * @return TemplateResponse
+ */
+ public function getForm() {
+ $databaseOverload = (strpos($this->config->getSystemValue('dbtype'), 'sqlite') !== false);
+
+ $parameters = [
+ 'databaseOverload' => $databaseOverload,
+ ];
+
+ return new TemplateResponse('settings', 'admin/tipstricks', $parameters, '');
+ }
+
+ /**
+ * @return string the section ID, e.g. 'sharing'
+ */
+ public function getSection() {
+ return 'tips-tricks';
+ }
+
+ /**
+ * @return int whether the form should be rather on the top or bottom of
+ * the admin section. The forms are arranged in ascending order of the
+ * priority values. It is required to return a value between 0 and 100.
+ *
+ * E.g.: 70
+ */
+ public function getPriority() {
+ return 0;
+ }
+}
diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php
new file mode 100644
index 00000000000..7574695d709
--- /dev/null
+++ b/lib/private/Settings/Manager.php
@@ -0,0 +1,431 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Settings;
+
+use OCP\AppFramework\QueryException;
+use OCP\Encryption\IManager as EncryptionManager;
+use OCP\IConfig;
+use OCP\IDBConnection;
+use OCP\IL10N;
+use OCP\ILogger;
+use OCP\IUserManager;
+use OCP\Lock\ILockingProvider;
+use OCP\Settings\ISettings;
+use OCP\Settings\IManager;
+use OCP\Settings\ISection;
+
+class Manager implements IManager {
+ const TABLE_ADMIN_SETTINGS = 'admin_settings';
+ const TABLE_ADMIN_SECTIONS = 'admin_sections';
+
+ /** @var ILogger */
+ private $log;
+ /** @var IDBConnection */
+ private $dbc;
+ /** @var IL10N */
+ private $l;
+ /** @var IConfig */
+ private $config;
+ /** @var EncryptionManager */
+ private $encryptionManager;
+ /** @var IUserManager */
+ private $userManager;
+ /** @var ILockingProvider */
+ private $lockingProvider;
+
+ /**
+ * @param ILogger $log
+ * @param IDBConnection $dbc
+ * @param IL10N $l
+ * @param IConfig $config
+ * @param EncryptionManager $encryptionManager
+ * @param IUserManager $userManager
+ * @param ILockingProvider $lockingProvider
+ */
+ public function __construct(
+ ILogger $log,
+ IDBConnection $dbc,
+ IL10N $l,
+ IConfig $config,
+ EncryptionManager $encryptionManager,
+ IUserManager $userManager,
+ ILockingProvider $lockingProvider
+ ) {
+ $this->log = $log;
+ $this->dbc = $dbc;
+ $this->l = $l;
+ $this->config = $config;
+ $this->encryptionManager = $encryptionManager;
+ $this->userManager = $userManager;
+ $this->lockingProvider = $lockingProvider;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function setupSettings(array $settings) {
+ if(isset($settings[IManager::KEY_ADMIN_SECTION])) {
+ $this->setupAdminSection($settings[IManager::KEY_ADMIN_SECTION]);
+ }
+ if(isset($settings[IManager::KEY_ADMIN_SETTINGS])) {
+ $this->setupAdminSettings($settings[IManager::KEY_ADMIN_SETTINGS]);
+ }
+ }
+
+ /**
+ * attempts to remove an apps section and/or settings entry. A listener is
+ * added centrally making sure that this method is called ones an app was
+ * disabled.
+ *
+ * @param string $appId
+ * @since 9.1.0
+ */
+ public function onAppDisabled($appId) {
+ $appInfo = \OC_App::getAppInfo($appId); // hello static legacy
+
+ if(isset($appInfo['settings'][IManager::KEY_ADMIN_SECTION])) {
+ $this->remove(self::TABLE_ADMIN_SECTIONS, $appInfo['settings'][IManager::KEY_ADMIN_SECTION]);
+ }
+ if(isset($settings['settings'][IManager::KEY_ADMIN_SETTINGS])) {
+ $this->remove(self::TABLE_ADMIN_SETTINGS, $appInfo['settings'][IManager::KEY_ADMIN_SETTINGS]);
+ }
+ }
+
+ public function checkForOrphanedClassNames() {
+ $tables = [ self::TABLE_ADMIN_SECTIONS, self::TABLE_ADMIN_SETTINGS ];
+ foreach ($tables as $table) {
+ $classes = $this->getClasses($table);
+ foreach($classes as $className) {
+ try {
+ \OC::$server->query($className);
+ } catch (QueryException $e) {
+ $this->remove($table, $className);
+ }
+ }
+ }
+ }
+
+ /**
+ * returns the registerd classes in the given table
+ *
+ * @param $table
+ * @return string[]
+ */
+ private function getClasses($table) {
+ $q = $this->dbc->getQueryBuilder();
+ $resultStatement = $q->select('class')
+ ->from($table)
+ ->execute();
+ $data = $resultStatement->fetchAll();
+ $resultStatement->closeCursor();
+
+ return array_map(function($row) { return $row['class']; }, $data);
+ }
+
+ /**
+ * @param string $sectionClassName
+ */
+ private function setupAdminSection($sectionClassName) {
+ if(!class_exists($sectionClassName)) {
+ $this->log->debug('Could not find admin section class ' . $sectionClassName);
+ return;
+ }
+ try {
+ $section = $this->query($sectionClassName);
+ } catch (QueryException $e) {
+ // cancel
+ return;
+ }
+
+ if(!$section instanceof ISection) {
+ $this->log->error(
+ 'Admin section instance must implement \OCP\ISection. Invalid class: {class}',
+ ['class' => $sectionClassName]
+ );
+ return;
+ }
+ if(!$this->hasAdminSection(get_class($section))) {
+ $this->addAdminSection($section);
+ } else {
+ $this->updateAdminSection($section);
+ }
+ }
+
+ private function addAdminSection(ISection $section) {
+ $this->add(self::TABLE_ADMIN_SECTIONS, [
+ 'id' => $section->getID(),
+ 'class' => get_class($section),
+ 'priority' => $section->getPriority(),
+ ]);
+ }
+
+ private function addAdminSettings(ISettings $settings) {
+ $this->add(self::TABLE_ADMIN_SETTINGS, [
+ 'class' => get_class($settings),
+ 'section' => $settings->getSection(),
+ 'priority' => $settings->getPriority(),
+ ]);
+ }
+
+ /**
+ * @param string $table
+ * @param array $values
+ */
+ private function add($table, array $values) {
+ $query = $this->dbc->getQueryBuilder();
+ $values = array_map(function($value) use ($query) {
+ return $query->createNamedParameter($value);
+ }, $values);
+ $query->insert($table)->values($values);
+ $query->execute();
+ }
+
+ private function updateAdminSettings(ISettings $settings) {
+ $this->update(
+ self::TABLE_ADMIN_SETTINGS,
+ 'class',
+ get_class($settings),
+ [
+ 'section' => $settings->getSection(),
+ 'priority' => $settings->getPriority(),
+ ]
+ );
+ }
+
+ private function updateAdminSection(ISection $section) {
+ $this->update(
+ self::TABLE_ADMIN_SECTIONS,
+ 'class',
+ get_class($section),
+ [
+ 'id' => $section->getID(),
+ 'priority' => $section->getPriority(),
+ ]
+ );
+ }
+
+ private function update($table, $idCol, $id, $values) {
+ $query = $this->dbc->getQueryBuilder();
+ $query->update($table);
+ foreach($values as $key => $value) {
+ $query->set($key, $query->createNamedParameter($value));
+ }
+ $query
+ ->where($query->expr()->eq($idCol, $query->createParameter($idCol)))
+ ->setParameter($idCol, $id)
+ ->execute();
+ }
+
+ /**
+ * @param string $className
+ * @return bool
+ */
+ private function hasAdminSection($className) {
+ return $this->has(self::TABLE_ADMIN_SECTIONS, $className);
+ }
+
+ /**
+ * @param string $className
+ * @return bool
+ */
+ private function hasAdminSettings($className) {
+ return $this->has(self::TABLE_ADMIN_SETTINGS, $className);
+ }
+
+ /**
+ * @param string $table
+ * @param string $className
+ * @return bool
+ */
+ private function has($table, $className) {
+ $query = $this->dbc->getQueryBuilder();
+ $query->select('class')
+ ->from($table)
+ ->where($query->expr()->eq('class', $query->createNamedParameter($className)))
+ ->setMaxResults(1);
+
+ $result = $query->execute();
+ $row = $result->fetch();
+ $result->closeCursor();
+
+ return (bool) $row;
+ }
+
+ /**
+ * deletes an settings or admin entry from the given table
+ *
+ * @param $table
+ * @param $className
+ */
+ private function remove($table, $className) {
+ $query = $this->dbc->getQueryBuilder();
+ $query->delete($table)
+ ->where($query->expr()->eq('class', $query->createNamedParameter($className)));
+
+ $query->execute();
+ }
+
+ private function setupAdminSettings($settingsClassName) {
+ if(!class_exists($settingsClassName)) {
+ $this->log->debug('Could not find admin section class ' . $settingsClassName);
+ return;
+ }
+
+ try {
+ /** @var ISettings $settings */
+ $settings = $this->query($settingsClassName);
+ } catch (QueryException $e) {
+ // cancel
+ return;
+ }
+
+ if(!$settings instanceof ISettings) {
+ $this->log->error(
+ 'Admin section instance must implement \OCP\ISection. Invalid class: {class}',
+ ['class' => $settingsClassName]
+ );
+ return;
+ }
+ if(!$this->hasAdminSettings(get_class($settings))) {
+ $this->addAdminSettings($settings);
+ } else {
+ $this->updateAdminSettings($settings);
+ }
+ }
+
+ private function query($className) {
+ try {
+ return \OC::$server->query($className);
+ } catch (QueryException $e) {
+ $this->log->logException($e);
+ throw $e;
+ }
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getAdminSections() {
+ $query = $this->dbc->getQueryBuilder();
+ $query->select(['class', 'priority'])
+ ->from(self::TABLE_ADMIN_SECTIONS);
+
+ // built-in sections
+ $sections = [
+ 0 => [new Section('server', $this->l->t('Server settings'), 0)],
+ 5 => [new Section('sharing', $this->l->t('Sharing'), 0)],
+ 45 => [new Section('encryption', $this->l->t('Encryption'), 0)],
+ 90 => [new Section('logging', $this->l->t('Logging'), 0)],
+ 98 => [new Section('additional', $this->l->t('Additional settings'), 0)],
+ 99 => [new Section('tips-tricks', $this->l->t('Tips & tricks'), 0)],
+ ];
+
+ $result = $query->execute();
+ while($row = $result->fetch()) {
+ if(!isset($sections[$row['priority']])) {
+ $sections[$row['priority']] = [];
+ }
+ try {
+ $sections[$row['priority']][] = $this->query($row['class']);
+ } catch (QueryException $e) {
+ // skip
+ }
+ }
+ $result->closeCursor();
+
+ ksort($sections);
+ return $sections;
+ }
+
+ private function getBuiltInAdminSettings($section) {
+ $forms = [];
+ try {
+ if($section === 'server') {
+ /** @var ISettings $form */
+ $form = new Admin\Server($this->dbc, $this->config, $this->lockingProvider, $this->l);
+ $forms[$form->getPriority()] = [$form];
+ }
+ if($section === 'encryption') {
+ /** @var ISettings $form */
+ $form = new Admin\Encryption($this->encryptionManager, $this->userManager);
+ $forms[$form->getPriority()] = [$form];
+ }
+ if($section === 'sharing') {
+ /** @var ISettings $form */
+ $form = new Admin\Sharing($this->config);
+ $forms[$form->getPriority()] = [$form];
+ }
+ if($section === 'logging') {
+ /** @var ISettings $form */
+ $form = new Admin\Logging($this->config);
+ $forms[$form->getPriority()] = [$form];
+ }
+ if($section === 'additional') {
+ /** @var ISettings $form */
+ $form = new Admin\Additional($this->config);
+ $forms[$form->getPriority()] = [$form];
+ }
+ if($section === 'tips-tricks') {
+ /** @var ISettings $form */
+ $form = new Admin\TipsTricks($this->config);
+ $forms[$form->getPriority()] = [$form];
+ }
+ } catch (QueryException $e) {
+ // skip
+ }
+ return $forms;
+ }
+
+ private function getAdminSettingsFromDB($section, &$settings) {
+ $query = $this->dbc->getQueryBuilder();
+ $query->select(['class', 'priority'])
+ ->from(self::TABLE_ADMIN_SETTINGS)
+ ->where($query->expr()->eq('section', $this->dbc->getQueryBuilder()->createParameter('section')))
+ ->setParameter('section', $section);
+
+ $result = $query->execute();
+ while($row = $result->fetch()) {
+ if(!isset($settings[$row['priority']])) {
+ $settings[$row['priority']] = [];
+ }
+ try {
+ $settings[$row['priority']][] = $this->query($row['class']);
+ } catch (QueryException $e) {
+ // skip
+ }
+ }
+ $result->closeCursor();
+
+ ksort($settings);
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getAdminSettings($section) {
+ $settings = $this->getBuiltInAdminSettings($section);
+ $this->getAdminSettingsFromDB($section, $settings);
+ return $settings;
+ }
+}
diff --git a/lib/private/Settings/RemoveOrphaned.php b/lib/private/Settings/RemoveOrphaned.php
new file mode 100644
index 00000000000..fbee95c8879
--- /dev/null
+++ b/lib/private/Settings/RemoveOrphaned.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Settings;
+
+use OC\BackgroundJob\JobList;
+use OC\BackgroundJob\TimedJob;
+use OC\NeedsUpdateException;
+use OCP\BackgroundJob\IJobList;
+use OCP\ILogger;
+
+/**
+ * Class RemoveOrphaned
+ *
+ * @package OC\Settings
+ */
+class RemoveOrphaned extends TimedJob {
+
+ /** @var IJobList */
+ private $jobList;
+
+ /** @var ILogger */
+ private $logger;
+
+ /** @var Manager */
+ private $manager;
+
+ public function __construct(Manager $manager = null) {
+ if($manager !== null) {
+ $this->manager = $manager;
+ } else {
+ // fix DI for Jobs
+ $this->manager = \OC::$server->getSettingsManager();
+ }
+ }
+
+ /**
+ * run the job, then remove it from the job list
+ *
+ * @param JobList $jobList
+ * @param ILogger $logger
+ */
+ public function execute($jobList, ILogger $logger = null) {
+ // add an interval of 15 mins
+ $this->setInterval(15*60);
+
+ $this->jobList = $jobList;
+ $this->logger = $logger;
+ parent::execute($jobList, $logger);
+ }
+
+ /**
+ * @param array $argument
+ * @throws \Exception
+ * @throws \OC\NeedsUpdateException
+ */
+ protected function run($argument) {
+ try {
+ \OC_App::loadApps();
+ } catch (NeedsUpdateException $ex) {
+ // only run when apps are up to date
+ return;
+ }
+
+ $this->manager->checkForOrphanedClassNames();
+
+ // remove the job once executed successfully
+ $this->jobList->remove($this);
+ }
+
+}
diff --git a/lib/private/Settings/Section.php b/lib/private/Settings/Section.php
new file mode 100644
index 00000000000..b3cf242279f
--- /dev/null
+++ b/lib/private/Settings/Section.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Settings;
+
+use OCP\Settings\ISection;
+
+class Section implements ISection {
+ /** @var string */
+ private $id;
+ /** @var string */
+ private $name;
+ /** @var int */
+ private $priority;
+
+ /**
+ * @param string $id
+ * @param string $name
+ * @param int $priority
+ */
+ public function __construct($id, $name, $priority) {
+ $this->id = $id;
+ $this->name = $name;
+ $this->priority = $priority;
+ }
+
+ /**
+ * returns the ID of the section. It is supposed to be a lower case string,
+ * e.g. 'ldap'
+ *
+ * @returns string
+ */
+ public function getID() {
+ return $this->id;
+ }
+
+ /**
+ * returns the translated name as it should be displayed, e.g. 'LDAP / AD
+ * integration'. Use the L10N service to translate it.
+ *
+ * @return string
+ */
+ public function getName() {
+ return $this->name;
+ }
+
+ /**
+ * @return int whether the form should be rather on the top or bottom of
+ * the settings navigation. The sections are arranged in ascending order of
+ * the priority values. It is required to return a value between 0 and 99.
+ *
+ * E.g.: 70
+ */
+ public function getPriority() {
+ return $this->priority;
+ }
+}
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
index 2d5e5ba1932..ceb36449bf0 100644
--- a/lib/private/legacy/app.php
+++ b/lib/private/legacy/app.php
@@ -51,6 +51,7 @@ use OC\App\Platform;
use OC\Installer;
use OC\OCSClient;
use OC\Repair;
+use OCP\App\ManagerEvent;
/**
* This class manages the apps. It allows them to register and integrate in the
@@ -345,6 +346,13 @@ class OC_App {
} else {
$appManager->enableApp($app);
}
+
+ $info = self::getAppInfo($app);
+ if(isset($info['settings']) && is_array($info['settings'])) {
+ $appPath = self::getAppPath($app);
+ self::registerAutoloading($app, $appPath);
+ \OC::$server->getSettingsManager()->setupSettings($info['settings']);
+ }
}
/**
@@ -471,7 +479,7 @@ class OC_App {
$settings[] = array(
"id" => "admin",
"order" => 1000,
- "href" => $urlGenerator->linkToRoute('settings_admin'),
+ "href" => $urlGenerator->linkToRoute('settings.AdminSettings.index'),
"name" => $l->t("Admin"),
"icon" => $urlGenerator->imagePath("settings", "admin.svg")
);
@@ -1162,6 +1170,13 @@ class OC_App {
if (isset($appData['id'])) {
$config->setAppValue($app, 'ocsid', $appData['id']);
}
+
+ if(isset($info['settings']) && is_array($info['settings'])) {
+ $appPath = self::getAppPath($app);
+ self::registerAutoloading($app, $appPath);
+ \OC::$server->getSettingsManager()->setupSettings($info['settings']);
+ }
+
\OC_Hook::emit('OC_App', 'post_enable', array('app' => $app));
} else {
if(empty($appName) ) {
@@ -1199,6 +1214,11 @@ class OC_App {
include $appPath . '/appinfo/update.php';
}
self::setupBackgroundJobs($appData['background-jobs']);
+ if(isset($appData['settings']) && is_array($appData['settings'])) {
+ $appPath = self::getAppPath($appId);
+ self::registerAutoloading($appId, $appPath);
+ \OC::$server->getSettingsManager()->setupSettings($appData['settings']);
+ }
//set remote/public handlers
if (array_key_exists('ocsid', $appData)) {
@@ -1218,6 +1238,10 @@ class OC_App {
$version = \OC_App::getAppVersion($appId);
\OC::$server->getAppConfig()->setValue($appId, 'installed_version', $version);
+ \OC::$server->getEventDispatcher()->dispatch(ManagerEvent::EVENT_APP_UPDATE, new ManagerEvent(
+ ManagerEvent::EVENT_APP_UPDATE, $appId
+ ));
+
return true;
}
diff --git a/lib/public/App/ManagerEvent.php b/lib/public/App/ManagerEvent.php
index a70345b62fd..b25ea55aee6 100644
--- a/lib/public/App/ManagerEvent.php
+++ b/lib/public/App/ManagerEvent.php
@@ -36,6 +36,11 @@ class ManagerEvent extends Event {
const EVENT_APP_ENABLE_FOR_GROUPS = 'OCP\App\IAppManager::enableAppForGroups';
const EVENT_APP_DISABLE = 'OCP\App\IAppManager::disableApp';
+ /**
+ * @since 9.1.0
+ */
+ const EVENT_APP_UPDATE = 'OCP\App\IAppManager::updateApp';
+
/** @var string */
protected $event;
/** @var string */
diff --git a/lib/public/Settings/IManager.php b/lib/public/Settings/IManager.php
new file mode 100644
index 00000000000..a406915ad09
--- /dev/null
+++ b/lib/public/Settings/IManager.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCP\Settings;
+
+/**
+ * @since 9.1
+ */
+interface IManager {
+ /**
+ * @since 9.1.0
+ */
+ const KEY_ADMIN_SETTINGS = 'admin';
+
+ /**
+ * @since 9.1.0
+ */
+ const KEY_ADMIN_SECTION = 'admin-section';
+
+ /**
+ * sets up settings according to data specified by an apps info.xml, within
+ * the <settings> element.
+ *
+ * @param array $settings an associative array, allowed keys are as specified
+ * by the KEY_ constant of this interface. The value
+ * must always be a class name, implement either
+ * IAdmin or ISection. I.e. only one section and admin
+ * setting can be configured per app.
+ * @since 9.1.0
+ */
+ public function setupSettings(array $settings);
+
+ /**
+ * attempts to remove an apps section and/or settings entry. A listener is
+ * added centrally making sure that this method is called ones an app was
+ * disabled.
+ *
+ * What this does not help with is when applications change their settings
+ * or section classes during their life time. New entries will be added,
+ * but inactive ones will still reside in the database.
+ *
+ * @param string $appId
+ * @since 9.1.0
+ */
+ public function onAppDisabled($appId);
+
+ /**
+ * The method should check all registered classes whether they are still
+ * instantiable and remove them, if not. This method is called by a
+ * background job once, after one or more apps were updated.
+ *
+ * An app`s info.xml can change during an update and make it unknown whether
+ * a registered class name was changed or not. An old one would just stay
+ * registered. Another case is if an admin takes a radical approach and
+ * simply removes an app from the app folder. These unregular checks will
+ * take care of such situations.
+ *
+ * @since 9.1.0
+ */
+ public function checkForOrphanedClassNames();
+
+ /**
+ * returns a list of the admin sections
+ *
+ * @return array array of ISection[] where key is the priority
+ * @since 9.1.0
+ */
+ public function getAdminSections();
+
+ /**
+ * returns a list of the admin settings
+ *
+ * @param string $section the section id for which to load the settings
+ * @return array array of IAdmin[] where key is the priority
+ * @since 9.1.0
+ */
+ public function getAdminSettings($section);
+}
diff --git a/lib/public/Settings/ISection.php b/lib/public/Settings/ISection.php
new file mode 100644
index 00000000000..5edf5de0ca4
--- /dev/null
+++ b/lib/public/Settings/ISection.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCP\Settings;
+
+/**
+ * @since 9.1
+ */
+interface ISection {
+ /**
+ * returns the ID of the section. It is supposed to be a lower case string,
+ * e.g. 'ldap'
+ *
+ * @returns string
+ * @since 9.1
+ */
+ public function getID();
+
+ /**
+ * returns the translated name as it should be displayed, e.g. 'LDAP / AD
+ * integration'. Use the L10N service to translate it.
+ *
+ * @return string
+ * @since 9.1
+ */
+ public function getName();
+
+ /**
+ * @return int whether the form should be rather on the top or bottom of
+ * the settings navigation. The sections are arranged in ascending order of
+ * the priority values. It is required to return a value between 0 and 99.
+ *
+ * E.g.: 70
+ * @since 9.1
+ */
+ public function getPriority();
+}
diff --git a/lib/public/Settings/ISettings.php b/lib/public/Settings/ISettings.php
new file mode 100644
index 00000000000..611bb713b33
--- /dev/null
+++ b/lib/public/Settings/ISettings.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCP\Settings;
+
+use OCP\AppFramework\Http\TemplateResponse;
+
+/**
+ * @since 9.1
+ */
+interface ISettings {
+
+ /**
+ * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
+ * @since 9.1
+ */
+ public function getForm();
+
+ /**
+ * @return string the section ID, e.g. 'sharing'
+ * @since 9.1
+ */
+ public function getSection();
+
+ /**
+ * @return int whether the form should be rather on the top or bottom of
+ * the admin section. The forms are arranged in ascending order of the
+ * priority values. It is required to return a value between 0 and 100.
+ *
+ * E.g.: 70
+ * @since 9.1
+ */
+ public function getPriority();
+}
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-05 13:54:38 +0000