Fallback for legacy settings. They are placed into Additional Settings

2 files changed, 67 insertions, 0 deletions

diff --git a/settings/Controller/AdminSettingsController.php b/settings/Controller/AdminSettingsController.php
index 68707addfe4..b6a6e74705f 100644
--- a/settings/Controller/AdminSettingsController.php
+++ b/settings/Controller/AdminSettingsController.php
@@ -83,6 +83,10 @@ class AdminSettingsController extends Controller {
 	}
 
 	private function getSettings($section) {
+		if($section === 'additional') {
+			return $this->getLegacyForms();
+		}
+
 		$settings = $this->settingsManager->getAdminSettings($section);
 		$html = '';
 		foreach ($settings as $prioritizedSettings) {
@@ -95,6 +99,33 @@ class AdminSettingsController extends Controller {
 		return ['content' => $html];
 	}
 
+	private function getLegacyForms() {
+		$forms = \OC_App::getForms('admin');
+
+		$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 \OCP\Template('settings', 'admin/additional');
+		$out->assign('forms', $forms);
+
+		return ['content' => $out->fetchPage()];
+	}
+
 	private function getNavigationParameters() {
 		$a = 'anchor';
 		$name = 'section-name';
diff --git a/settings/templates/admin/additional.php b/settings/templates/admin/additional.php
new file mode 100644
index 00000000000..c4e70dbddb2
--- /dev/null
+++ b/settings/templates/admin/additional.php
@@ -0,0 +1,36 @@
+<?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/>.
+ *
+ */
+
+/** @var \OCP\IL10N $l */
+/** @var array $_ */
+
+?>
+
+<div class="section" id="additional">
+	<h2><?php p($l->t('Additional Settings'));?></h2>
+	<?php foreach($_['forms'] as $form) {
+		if (isset($form['form'])) {?>
+			<div id="<?php isset($form['anchor']) ? p($form['anchor']) : p('');?>"><?php print_unescaped($form['form']);?></div>
+		<?php }
+	};?>
+</div>