Admin page split

apps/user_ldap/appinfo/info.xml

@@ -9,7 +9,7 @@ A user logs into ownCloud with their LDAP or AD credentials, and is granted acce
 	</description>
 	<licence>AGPL</licence>
 	<author>Dominik Schmidt and Arthur Schiwon</author>
-	<version>1.1.0</version>
+	<version>1.1.1</version>
 	<types>
 		<authentication/>
 	</types>
@@ -27,4 +27,9 @@ A user logs into ownCloud with their LDAP or AD credentials, and is granted acce
 		<job>OCA\User_LDAP\Jobs\UpdateGroups</job>
 		<job>OCA\User_LDAP\Jobs\CleanUp</job>
 	</background-jobs>
+
+	<settings>
+		<admin>\OCA\User_LDAP\Settings\Admin</admin>
+		<admin-section>\OCA\User_LDAP\Settings\Section</admin-section>
+	</settings>
 </info>

apps/user_ldap/lib/Settings/Admin.php

@@ -0,0 +1,115 @@
+<?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 OCA\User_LDAP\Settings;
+
+
+use OCA\User_LDAP\Configuration;
+use OCA\User_LDAP\Helper;
+use OCP\IL10N;
+use OCP\Settings\IAdmin;
+use OCP\Template;
+
+class Admin implements IAdmin {
+
+	/** @var IL10N */
+	private $l;
+
+	public function __construct(IL10N $l) {
+		$this->l = $l;
+	}
+
+	/**
+	 * @return Template all parameters are supposed to be assigned
+	 */
+	public function render() {
+		$settings = new Template('user_ldap', 'settings');
+
+		$helper = new Helper();
+		$prefixes = $helper->getServerConfigurationPrefixes();
+		$hosts = $helper->getServerConfigurationHosts();
+
+		$wizardHtml = '';
+		$toc = [];
+
+		$wControls = new Template('user_ldap', 'part.wizardcontrols');
+		$wControls = $wControls->fetchPage();
+		$sControls = new Template('user_ldap', 'part.settingcontrols');
+		$sControls = $sControls->fetchPage();
+
+		$wizTabs = [
+			['tpl' => 'part.wizard-server',      'cap' => $this->l->t('Server')],
+			['tpl' => 'part.wizard-userfilter',  'cap' => $this->l->t('Users')],
+			['tpl' => 'part.wizard-loginfilter', 'cap' => $this->l->t('Login Attributes')],
+			['tpl' => 'part.wizard-groupfilter', 'cap' => $this->l->t('Groups')],
+		];
+		$wizTabsCount = count($wizTabs);
+		for($i = 0; $i < $wizTabsCount; $i++) {
+			$tab = new Template('user_ldap', $wizTabs[$i]['tpl']);
+			if($i === 0) {
+				$tab->assign('serverConfigurationPrefixes', $prefixes);
+				$tab->assign('serverConfigurationHosts', $hosts);
+			}
+			$tab->assign('wizardControls', $wControls);
+			$wizardHtml .= $tab->fetchPage();
+			$toc['#ldapWizard'.($i+1)] = $wizTabs[$i]['cap'];
+		}
+
+		$settings->assign('tabs', $wizardHtml);
+		$settings->assign('toc', $toc);
+		$settings->assign('settingControls', $sControls);
+
+		// assign default values
+		$config = new Configuration('', false);
+		$defaults = $config->getDefaults();
+		foreach($defaults as $key => $default) {
+			$settings->assign($key.'_default', $default);
+		}
+
+		return $settings;
+	}
+
+	/**
+	 * @return string the section ID, e.g. 'sharing'
+	 */
+	public function getSection() {
+		return 'ldap';
+	}
+
+	/**
+	 * @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 5;
+	}
+
+	private function renderControls() {
+		$controls = new Template('user_ldap', 'part.settingcontrols');
+		return $controls->fetchPage();
+
+	}
+}

apps/user_ldap/lib/Settings/Section.php

@@ -0,0 +1,67 @@
+<?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 OCA\User_LDAP\Settings;
+
+use OCP\IL10N;
+use OCP\Settings\ISection;
+
+class Section implements ISection {
+	/** @var IL10N */
+	private $l;
+
+	public function __construct(IL10N $l) {
+		$this->l = $l;
+	}
+
+	/**
+	 * returns the ID of the section. It is supposed to be a lower case string,
+	 * e.g. 'ldap'
+	 *
+	 * @returns string
+	 */
+	public function getID() {
+		return 'ldap';
+	}
+
+	/**
+	 * 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->l->t('LDAP / AD Integration');
+	}
+
+	/**
+	 * @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 25;
+	}
+}

core/templates/untrustedDomain.php

@@ -10,7 +10,7 @@
 			<?php p($l->t('Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain.')); ?>
 			<br><br>
 			<p style="text-align:center;">
-				<a href="<?php print_unescaped(\OC::$server->getURLGenerator()->getAbsoluteURL(\OCP\Util::linkToRoute('settings_admin'))); ?>?trustDomain=<?php p($_['domain']); ?>" class="button">
+				<a href="<?php print_unescaped(\OC::$server->getURLGenerator()->getAbsoluteURL(\OCP\Util::linkToRoute('settings.AdminSettings.index'))); ?>?trustDomain=<?php p($_['domain']); ?>" class="button">
 					<?php p($l->t('Add "%s" as trusted domain', array($_['domain']))); ?>
 				</a>
 			</p>

db_structure.xml

@@ -1976,4 +1976,98 @@
 
 	</table>
 
+	<table>
+		<!-- Extra admin settings sections -->
+		<name>*dbprefix*admin_sections</name>
+
+		<declaration>
+
+			<field>
+				<name>id</name>
+				<type>text</type>
+				<default></default>
+				<notnull>false</notnull>
+				<length>64</length>
+			</field>
+
+			<field>
+				<name>class</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>255</length>
+			</field>
+
+			<field>
+				<name>priority</name>
+				<type>integer</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>1</length>
+			</field>
+
+			<index>
+				<name>admin_sections_id_index</name>
+				<unique>true</unique>
+				<field>
+					<name>id</name>
+					<sorting>ascending</sorting>
+				</field>
+			</index>
+
+		</declaration>
+	</table>
+
+	<table>
+		<!-- Extra admin settings -->
+		<name>*dbprefix*admin_settings</name>
+
+		<declaration>
+
+			<field>
+				<name>id</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<autoincrement>1</autoincrement>
+				<length>4</length>
+			</field>
+
+			<field>
+				<name>class</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>255</length>
+			</field>
+
+			<!-- id of the section, foreign key: admin_sections.id -->
+			<field>
+				<name>section</name>
+				<type>text</type>
+				<default></default>
+				<notnull>false</notnull>
+				<length>64</length>
+			</field>
+
+			<field>
+				<name>priority</name>
+				<type>integer</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>1</length>
+			</field>
+
+			<index>
+				<name>admin_settings_id_index</name>
+				<unique>true</unique>
+				<field>
+					<name>id</name>
+					<sorting>ascending</sorting>
+				</field>
+			</index>
+
+		</declaration>
+	</table>
+
 </database>

lib/private/Installer.php

@@ -135,6 +135,7 @@ public static function installApp( $data = array()) {
 		}
 
 		\OC_App::setupBackgroundJobs($info['background-jobs']);
+		\OC::$server->getSettingsManager()->setupSettings($info['settings']);
 
 		//run appinfo/install.php
 		if((!isset($data['noinstall']) or $data['noinstall']==false)) {