summaryrefslogtreecommitdiffstats
path: root/settings/Controller
diff options
context:
space:
mode:
Diffstat (limited to 'settings/Controller')
-rw-r--r--settings/Controller/AdminSettingsController.php61
-rw-r--r--settings/Controller/CommonSettingsTrait.php126
-rw-r--r--settings/Controller/PersonalSettingsController.php106
3 files changed, 240 insertions, 53 deletions
diff --git a/settings/Controller/AdminSettingsController.php b/settings/Controller/AdminSettingsController.php
index 6c915be6f94..33d9cb2c2a3 100644
--- a/settings/Controller/AdminSettingsController.php
+++ b/settings/Controller/AdminSettingsController.php
@@ -28,19 +28,17 @@ use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\INavigationManager;
use OCP\IRequest;
-use OCP\Settings\IIconSection;
use OCP\Settings\IManager as ISettingsManager;
-use OCP\Settings\ISection;
use OCP\Template;
/**
* @package OC\Settings\Controller
*/
class AdminSettingsController extends Controller {
+ use CommonSettingsTrait;
+
/** @var INavigationManager */
private $navigationManager;
- /** @var ISettingsManager */
- private $settingsManager;
/**
* @param string $appName
@@ -67,32 +65,20 @@ class AdminSettingsController extends Controller {
*/
public function index($section) {
$this->navigationManager->setActiveEntry('admin');
-
- $templateParams = [];
- $templateParams = array_merge($templateParams, $this->getNavigationParameters($section));
- $templateParams = array_merge($templateParams, $this->getSettings($section));
-
- return new TemplateResponse('settings', 'admin/frame', $templateParams);
+ return $this->getIndexResponse('admin', $section);
}
/**
* @param string $section
* @return array
*/
- private function getSettings($section) {
- $html = '';
+ protected function getSettings($section) {
$settings = $this->settingsManager->getAdminSettings($section);
- foreach ($settings as $prioritizedSettings) {
- foreach ($prioritizedSettings as $setting) {
- /** @var \OCP\Settings\ISettings $setting */
- $form = $setting->getForm();
- $html .= $form->renderAs('')->render();
- }
- }
+ $formatted = $this->formatSettings($settings);
if($section === 'additional') {
- $html .= $this->getLegacyForms();
+ $formatted['content'] .= $this->getLegacyForms();
}
- return ['content' => $html];
+ return $formatted;
}
/**
@@ -119,42 +105,11 @@ class AdminSettingsController extends Controller {
);
}, $forms);
- $out = new Template('settings', 'admin/additional');
+ $out = new Template('settings', 'settings/additional');
$out->assign('forms', $forms);
return $out->fetchPage();
}
- /**
- * @param string $currentSection
- * @return array
- */
- private function getNavigationParameters($currentSection) {
- $sections = $this->settingsManager->getAdminSections();
- $templateParameters = [];
- /** @var \OC\Settings\Section[] $prioritizedSections */
- foreach($sections as $prioritizedSections) {
- foreach ($prioritizedSections as $section) {
- if (empty($this->settingsManager->getAdminSettings($section->getID()))) {
- continue;
- }
-
- $icon = '';
- if ($section instanceof IIconSection) {
- $icon = $section->getIcon();
- }
-
- $templateParameters[] = [
- 'anchor' => $section->getID(),
- 'section-name' => $section->getName(),
- 'active' => $section->getID() === $currentSection,
- 'icon' => $icon,
- ];
- }
- }
- return [
- 'forms' => $templateParameters
- ];
- }
}
diff --git a/settings/Controller/CommonSettingsTrait.php b/settings/Controller/CommonSettingsTrait.php
new file mode 100644
index 00000000000..ac316aa7f48
--- /dev/null
+++ b/settings/Controller/CommonSettingsTrait.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 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\Controller;
+
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\Settings\IManager as ISettingsManager;
+use OCP\Settings\IIconSection;
+use OCP\Settings\ISettings;
+
+trait CommonSettingsTrait {
+ /** @var ISettingsManager */
+ private $settingsManager;
+
+ /**
+ * @param string $currentSection
+ * @return array
+ */
+ private function getNavigationParameters($currentType, $currentSection) {
+ $templateParameters = [
+ 'personal' => $this->formatPersonalSections($currentType, $currentSection),
+ 'admin' => []
+ ];
+
+ if(\OC_User::isAdminUser(\OC_User::getUser())) {
+ $templateParameters['admin'] = $this->formatAdminSections($currentType, $currentSection);
+ }
+
+ return [
+ 'forms' => $templateParameters
+ ];
+ }
+
+ protected function formatSections($sections, $currentSection, $type, $currentType) {
+ $templateParameters = [];
+ /** @var \OCP\Settings\ISection[] $prioritizedSections */
+ foreach($sections as $prioritizedSections) {
+ foreach ($prioritizedSections as $section) {
+ if($type === 'admin') {
+ $settings = $this->settingsManager->getAdminSettings($section->getID());
+ } else if($type === 'personal') {
+ $settings = $this->settingsManager->getPersonalSettings($section->getID());
+ }
+ if (empty($settings)) {
+ continue;
+ }
+
+ $icon = '';
+ if ($section instanceof IIconSection) {
+ $icon = $section->getIcon();
+ }
+
+ $active = $section->getID() === $currentSection
+ && $type === $currentType;
+
+ $templateParameters[] = [
+ 'anchor' => $section->getID(),
+ 'section-name' => $section->getName(),
+ 'active' => $active,
+ 'icon' => $icon,
+ ];
+ }
+ }
+ return $templateParameters;
+ }
+
+ protected function formatPersonalSections($currentType, $currentSections) {
+ $sections = $this->settingsManager->getPersonalSections();
+ $templateParameters = $this->formatSections($sections, $currentSections, 'personal', $currentType);
+
+ return $templateParameters;
+ }
+
+ protected function formatAdminSections($currentType, $currentSections) {
+ $sections = $this->settingsManager->getAdminSections();
+ $templateParameters = $this->formatSections($sections, $currentSections, 'admin', $currentType);
+
+ return $templateParameters;
+ }
+
+ /**
+ * @param ISettings[] $settings
+ * @return array
+ */
+ private function formatSettings($settings) {
+ $html = '';
+ foreach ($settings as $prioritizedSettings) {
+ foreach ($prioritizedSettings as $setting) {
+ /** @var \OCP\Settings\ISettings $setting */
+ $form = $setting->getForm();
+ $html .= $form->renderAs('')->render();
+ }
+ }
+ return ['content' => $html];
+ }
+
+ private function getIndexResponse($type, $section) {
+ $templateParams = [];
+ $templateParams = array_merge($templateParams, $this->getNavigationParameters($type, $section));
+ $templateParams = array_merge($templateParams, $this->getSettings($section));
+
+ return new TemplateResponse('settings', 'settings/frame', $templateParams);
+ }
+
+ abstract protected function getSettings($section);
+}
diff --git a/settings/Controller/PersonalSettingsController.php b/settings/Controller/PersonalSettingsController.php
new file mode 100644
index 00000000000..7e2d62961b7
--- /dev/null
+++ b/settings/Controller/PersonalSettingsController.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 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\Controller;
+
+use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\INavigationManager;
+use OCP\IRequest;
+use OCP\Settings\IManager as ISettingsManager;
+use OCP\Template;
+
+class PersonalSettingsController extends Controller {
+ use CommonSettingsTrait;
+
+ /** @var INavigationManager */
+ private $navigationManager;
+
+ public function __construct(
+ $appName,
+ IRequest $request,
+ INavigationManager $navigationManager,
+ ISettingsManager $settingsManager
+ ) {
+ parent::__construct($appName, $request);
+ $this->navigationManager = $navigationManager;
+ $this->settingsManager = $settingsManager;
+ }
+
+ /**
+ * @param string $section
+ * @return TemplateResponse
+ *
+ * @NoCSRFRequired
+ * @NoAdminRequired
+ * @NoSubadminRequired
+ */
+ public function index($section) {
+ $this->navigationManager->setActiveEntry('personal');
+ return $this->getIndexResponse('personal', $section);
+
+ }
+
+ /**
+ * @param string $section
+ * @return array
+ */
+ protected function getSettings($section) {
+ $settings = $this->settingsManager->getPersonalSettings($section);
+ $formatted = $this->formatSettings($settings);
+ if($section === 'additional') {
+ $formatted['content'] .= $this->getLegacyForms();
+ }
+ return $formatted;
+ }
+
+ /**
+ * @return bool|string
+ */
+ private function getLegacyForms() {
+ $forms = \OC_App::getForms('personal');
+
+ $forms = array_map(function ($form) {
+ if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) {
+ $sectionName = str_replace('<h2' . $regs['class'] . '>', '', $regs[0]);
+ $sectionName = str_replace('</h2>', '', $sectionName);
+ $anchor = strtolower($sectionName);
+ $anchor = str_replace(' ', '-', $anchor);
+
+ return array(
+ 'anchor' => $anchor,
+ 'section-name' => $sectionName,
+ 'form' => $form
+ );
+ }
+ return array(
+ 'form' => $form
+ );
+ }, $forms);
+
+ $out = new Template('settings', 'settings/additional');
+ $out->assign('forms', $forms);
+
+ return $out->fetchPage();
+ }
+}
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-30 23:13:53 +0000