nextcloud / server

apps/files/download.php

Indentation +5 added lines, -5 removed lines

@@ -30,11 +30,11 @@
 $filename = $_GET["file"];
 
 if(!\OC\Files\Filesystem::file_exists($filename)) {
-	header("HTTP/1.0 404 Not Found");
-	$tmpl = new OCP\Template( '', '404', 'guest' );
-	$tmpl->assign('file', $filename);
-	$tmpl->printPage();
-	exit;
+    header("HTTP/1.0 404 Not Found");
+    $tmpl = new OCP\Template( '', '404', 'guest' );
+    $tmpl->assign('file', $filename);
+    $tmpl->printPage();
+    exit;
 }
 
 $ftype=\OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType( $filename ));

apps/files/appinfo/update.php

Indentation +37 added lines, -37 removed lines

@@ -51,48 +51,48 @@
  * @param \OCP\IDBConnection $conn
  */
 function owncloud_reset_encrypted_flag(\OCP\IDBConnection $conn) {
-	$conn->executeUpdate('UPDATE `*PREFIX*filecache` SET `encrypted` = 0 WHERE `encrypted` = 1');
+    $conn->executeUpdate('UPDATE `*PREFIX*filecache` SET `encrypted` = 0 WHERE `encrypted` = 1');
 }
 
 // Current version of ownCloud before the update is 8.1.0 or 8.2.0.(0-2)
 if ($installedVersion === '1.1.9' && (
-		// 8.1.0.x
-		(((int) $ocVersion[0]) === 8 && ((int) $ocVersion[1]) === 1 && ((int) $ocVersion[2]) === 0)
-		||
-		// < 8.2.0.3
-		(((int) $ocVersion[0]) === 8 && ((int) $ocVersion[1]) === 2 && ((int) $ocVersion[2]) === 0 && ((int) $ocVersion[3]) < 3)
-	)) {
+        // 8.1.0.x
+        (((int) $ocVersion[0]) === 8 && ((int) $ocVersion[1]) === 1 && ((int) $ocVersion[2]) === 0)
+        ||
+        // < 8.2.0.3
+        (((int) $ocVersion[0]) === 8 && ((int) $ocVersion[1]) === 2 && ((int) $ocVersion[2]) === 0 && ((int) $ocVersion[3]) < 3)
+    )) {
 
-	// Encryption is not enabled
-	if (!\OC::$server->getEncryptionManager()->isEnabled()) {
-		$conn = \OC::$server->getDatabaseConnection();
+    // Encryption is not enabled
+    if (!\OC::$server->getEncryptionManager()->isEnabled()) {
+        $conn = \OC::$server->getDatabaseConnection();
 
-		// Old encryption is not known in app config
-		$oldEncryption = \OC::$server->getConfig()->getAppKeys('files_encryption');
-		if (empty($oldEncryption)) {
-			owncloud_reset_encrypted_flag($conn);
-		} else {
-			$query = $conn->prepare('SELECT * FROM `*PREFIX*filecache` WHERE `encrypted` = 1 AND `unencrypted_size` > 0', 1);
-			$query->execute();
-			$empty = $query->fetch();
+        // Old encryption is not known in app config
+        $oldEncryption = \OC::$server->getConfig()->getAppKeys('files_encryption');
+        if (empty($oldEncryption)) {
+            owncloud_reset_encrypted_flag($conn);
+        } else {
+            $query = $conn->prepare('SELECT * FROM `*PREFIX*filecache` WHERE `encrypted` = 1 AND `unencrypted_size` > 0', 1);
+            $query->execute();
+            $empty = $query->fetch();
 
-			if (empty($empty)) {
-				owncloud_reset_encrypted_flag($conn);
-			} else {
-				/**
-				 * Sorry in case you are a false positive, but we are not 100% that
-				 * you don't have any encrypted files anymore, so we can not reset
-				 * the value safely
-				 */
-				\OC::$server->getLogger()->warning(
-					'If you have a problem with files not being accessible and '
-					. 'you are not using encryption, please have a look at the following'
-					. 'issue: {issue}',
-					[
-						'issue' => 'https://github.com/owncloud/core/issues/17846',
-					]
-				);
-			}
-		}
-	}
+            if (empty($empty)) {
+                owncloud_reset_encrypted_flag($conn);
+            } else {
+                /**
+                 * Sorry in case you are a false positive, but we are not 100% that
+                 * you don't have any encrypted files anymore, so we can not reset
+                 * the value safely
+                 */
+                \OC::$server->getLogger()->warning(
+                    'If you have a problem with files not being accessible and '
+                    . 'you are not using encryption, please have a look at the following'
+                    . 'issue: {issue}',
+                    [
+                        'issue' => 'https://github.com/owncloud/core/issues/17846',
+                    ]
+                );
+            }
+        }
+    }
 }

apps/files/appinfo/routes.php

Indentation +47 added lines, -47 removed lines

@@ -29,60 +29,60 @@
 
 $application = new Application();
 $application->registerRoutes(
-	$this,
-	array(
-		'routes' => array(
-			array(
-				'name' => 'API#getThumbnail',
-				'url' => '/api/v1/thumbnail/{x}/{y}/{file}',
-				'verb' => 'GET',
-				'requirements' => array('file' => '.+')
-			),
-			array(
-				'name' => 'API#updateFileTags',
-				'url' => '/api/v1/files/{path}',
-				'verb' => 'POST',
-				'requirements' => array('path' => '.+'),
-			),
-			array(
-				'name' => 'API#getRecentFiles',
-				'url' => '/api/v1/recent/',
-				'verb' => 'GET'
-			),
-			array(
-				'name' => 'API#updateFileSorting',
-				'url' => '/api/v1/sorting',
-				'verb' => 'POST'
-			),
-			array(
-				'name' => 'API#showHiddenFiles',
-				'url' => '/api/v1/showhidden',
-				'verb' => 'POST'
-			),
-			[
-				'name' => 'view#index',
-				'url' => '/',
-				'verb' => 'GET',
-			],
-			[
-				'name' => 'settings#setMaxUploadSize',
-				'url' => '/settings/maxUpload',
-				'verb' => 'POST',
-			]
-		)
-	)
+    $this,
+    array(
+        'routes' => array(
+            array(
+                'name' => 'API#getThumbnail',
+                'url' => '/api/v1/thumbnail/{x}/{y}/{file}',
+                'verb' => 'GET',
+                'requirements' => array('file' => '.+')
+            ),
+            array(
+                'name' => 'API#updateFileTags',
+                'url' => '/api/v1/files/{path}',
+                'verb' => 'POST',
+                'requirements' => array('path' => '.+'),
+            ),
+            array(
+                'name' => 'API#getRecentFiles',
+                'url' => '/api/v1/recent/',
+                'verb' => 'GET'
+            ),
+            array(
+                'name' => 'API#updateFileSorting',
+                'url' => '/api/v1/sorting',
+                'verb' => 'POST'
+            ),
+            array(
+                'name' => 'API#showHiddenFiles',
+                'url' => '/api/v1/showhidden',
+                'verb' => 'POST'
+            ),
+            [
+                'name' => 'view#index',
+                'url' => '/',
+                'verb' => 'GET',
+            ],
+            [
+                'name' => 'settings#setMaxUploadSize',
+                'url' => '/settings/maxUpload',
+                'verb' => 'POST',
+            ]
+        )
+    )
 );
 
 /** @var $this \OC\Route\Router */
 
 $this->create('files_ajax_download', 'ajax/download.php')
-	->actionInclude('files/ajax/download.php');
+    ->actionInclude('files/ajax/download.php');
 $this->create('files_ajax_getstoragestats', 'ajax/getstoragestats.php')
-	->actionInclude('files/ajax/getstoragestats.php');
+    ->actionInclude('files/ajax/getstoragestats.php');
 $this->create('files_ajax_list', 'ajax/list.php')
-	->actionInclude('files/ajax/list.php');
+    ->actionInclude('files/ajax/list.php');
 
 $this->create('download', 'download{file}')
-	->requirements(array('file' => '.*'))
-	->actionInclude('files/download.php');
+    ->requirements(array('file' => '.*'))
+    ->actionInclude('files/download.php');
 

apps/files/appinfo/app.php

Indentation +14 added lines, -14 removed lines

@@ -39,21 +39,21 @@
 $templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadsheet', 'core/templates/filetemplates/template.ods');
 
 \OCA\Files\App::getNavigationManager()->add(function () use ($l) {
-	return [
-		'id' => 'files',
-		'appname' => 'files',
-		'script' => 'list.php',
-		'order' => 0,
-		'name' => $l->t('All files'),
-	];
+    return [
+        'id' => 'files',
+        'appname' => 'files',
+        'script' => 'list.php',
+        'order' => 0,
+        'name' => $l->t('All files'),
+    ];
 });
 
 \OCA\Files\App::getNavigationManager()->add(function () use ($l) {
-	return [
-		'id' => 'recent',
-		'appname' => 'files',
-		'script' => 'recentlist.php',
-		'order' => 2,
-		'name' => $l->t('Recent'),
-	];
+    return [
+        'id' => 'recent',
+        'appname' => 'files',
+        'script' => 'recentlist.php',
+        'order' => 2,
+        'name' => $l->t('Recent'),
+    ];
 });

apps/lookup_server_connector/lib/UpdateLookupServer.php

Indentation +90 added lines, -90 removed lines

@@ -38,99 +38,99 @@
  * @package OCA\LookupServerConnector
  */
 class UpdateLookupServer {
-	/** @var AccountManager */
-	private $accountManager;
-	/** @var IConfig */
-	private $config;
-	/** @var ISecureRandom */
-	private $secureRandom;
-	/** @var IClientService */
-	private $clientService;
-	/** @var Manager */
-	private $keyManager;
-	/** @var Signer */
-	private $signer;
-	/** @var IJobList */
-	private $jobList;
-	/** @var string URL point to lookup server */
-	private $lookupServer = 'https://lookup.nextcloud.com/users';
+    /** @var AccountManager */
+    private $accountManager;
+    /** @var IConfig */
+    private $config;
+    /** @var ISecureRandom */
+    private $secureRandom;
+    /** @var IClientService */
+    private $clientService;
+    /** @var Manager */
+    private $keyManager;
+    /** @var Signer */
+    private $signer;
+    /** @var IJobList */
+    private $jobList;
+    /** @var string URL point to lookup server */
+    private $lookupServer = 'https://lookup.nextcloud.com/users';
 
-	/**
-	 * @param AccountManager $accountManager
-	 * @param IConfig $config
-	 * @param ISecureRandom $secureRandom
-	 * @param IClientService $clientService
-	 * @param Manager $manager
-	 * @param Signer $signer
-	 * @param IJobList $jobList
-	 */
-	public function __construct(AccountManager $accountManager,
-								IConfig $config,
-								ISecureRandom $secureRandom,
-								IClientService $clientService,
-								Manager $manager,
-								Signer $signer,
-								IJobList $jobList) {
-		$this->accountManager = $accountManager;
-		$this->config = $config;
-		$this->secureRandom = $secureRandom;
-		$this->clientService = $clientService;
-		$this->keyManager = $manager;
-		$this->signer = $signer;
-		$this->jobList = $jobList;
-	}
+    /**
+     * @param AccountManager $accountManager
+     * @param IConfig $config
+     * @param ISecureRandom $secureRandom
+     * @param IClientService $clientService
+     * @param Manager $manager
+     * @param Signer $signer
+     * @param IJobList $jobList
+     */
+    public function __construct(AccountManager $accountManager,
+                                IConfig $config,
+                                ISecureRandom $secureRandom,
+                                IClientService $clientService,
+                                Manager $manager,
+                                Signer $signer,
+                                IJobList $jobList) {
+        $this->accountManager = $accountManager;
+        $this->config = $config;
+        $this->secureRandom = $secureRandom;
+        $this->clientService = $clientService;
+        $this->keyManager = $manager;
+        $this->signer = $signer;
+        $this->jobList = $jobList;
+    }
 
-	/**
-	 * @param IUser $user
-	 */
-	public function userUpdated(IUser $user) {
-		$userData = $this->accountManager->getUser($user);
-		$publicData = [];
+    /**
+     * @param IUser $user
+     */
+    public function userUpdated(IUser $user) {
+        $userData = $this->accountManager->getUser($user);
+        $publicData = [];
 
-		foreach ($userData as $key => $data) {
-			if ($data['scope'] === AccountManager::VISIBILITY_PUBLIC) {
-				$publicData[$key] = $data;
-			}
-		}
+        foreach ($userData as $key => $data) {
+            if ($data['scope'] === AccountManager::VISIBILITY_PUBLIC) {
+                $publicData[$key] = $data;
+            }
+        }
 
-		if (!empty($publicData)) {
-			$this->sendToLookupServer($user, $publicData);
-		}
-	}
+        if (!empty($publicData)) {
+            $this->sendToLookupServer($user, $publicData);
+        }
+    }
 
-	/**
-	 * send public user data to the lookup server
-	 *
-	 * @param IUser $user
-	 * @param array $publicData
-	 */
-	protected function sendToLookupServer(IUser $user, array $publicData) {
-		$dataArray = [
-			'federationId' => $user->getCloudId(),
-			'name' => isset($publicData[AccountManager::PROPERTY_DISPLAYNAME]) ? $publicData[AccountManager::PROPERTY_DISPLAYNAME]['value'] : '',
-			'email' => isset($publicData[AccountManager::PROPERTY_EMAIL]) ? $publicData[AccountManager::PROPERTY_EMAIL]['value'] : '',
-			'address' => isset($publicData[AccountManager::PROPERTY_ADDRESS]) ? $publicData[AccountManager::PROPERTY_ADDRESS]['value'] : '',
-			'website' => isset($publicData[AccountManager::PROPERTY_WEBSITE]) ? $publicData[AccountManager::PROPERTY_WEBSITE]['value'] : '',
-			'twitter' => isset($publicData[AccountManager::PROPERTY_TWITTER]) ? $publicData[AccountManager::PROPERTY_TWITTER]['value'] : '',
-			'phone' => isset($publicData[AccountManager::PROPERTY_PHONE]) ? $publicData[AccountManager::PROPERTY_PHONE]['value'] : '',
-		];
-		$dataArray = $this->signer->sign('lookupserver', $dataArray, $user);
-		$httpClient = $this->clientService->newClient();
-		try {
-			$httpClient->post($this->lookupServer,
-				[
-					'body' => json_encode($dataArray),
-					'timeout' => 10,
-					'connect_timeout' => 3,
-				]
-			);
-		} catch (\Exception $e) {
-			$this->jobList->add(RetryJob::class,
-				[
-					'dataArray' => $dataArray,
-					'retryNo' => 0,
-				]
-			);
-		}
-	}
+    /**
+     * send public user data to the lookup server
+     *
+     * @param IUser $user
+     * @param array $publicData
+     */
+    protected function sendToLookupServer(IUser $user, array $publicData) {
+        $dataArray = [
+            'federationId' => $user->getCloudId(),
+            'name' => isset($publicData[AccountManager::PROPERTY_DISPLAYNAME]) ? $publicData[AccountManager::PROPERTY_DISPLAYNAME]['value'] : '',
+            'email' => isset($publicData[AccountManager::PROPERTY_EMAIL]) ? $publicData[AccountManager::PROPERTY_EMAIL]['value'] : '',
+            'address' => isset($publicData[AccountManager::PROPERTY_ADDRESS]) ? $publicData[AccountManager::PROPERTY_ADDRESS]['value'] : '',
+            'website' => isset($publicData[AccountManager::PROPERTY_WEBSITE]) ? $publicData[AccountManager::PROPERTY_WEBSITE]['value'] : '',
+            'twitter' => isset($publicData[AccountManager::PROPERTY_TWITTER]) ? $publicData[AccountManager::PROPERTY_TWITTER]['value'] : '',
+            'phone' => isset($publicData[AccountManager::PROPERTY_PHONE]) ? $publicData[AccountManager::PROPERTY_PHONE]['value'] : '',
+        ];
+        $dataArray = $this->signer->sign('lookupserver', $dataArray, $user);
+        $httpClient = $this->clientService->newClient();
+        try {
+            $httpClient->post($this->lookupServer,
+                [
+                    'body' => json_encode($dataArray),
+                    'timeout' => 10,
+                    'connect_timeout' => 3,
+                ]
+            );
+        } catch (\Exception $e) {
+            $this->jobList->add(RetryJob::class,
+                [
+                    'dataArray' => $dataArray,
+                    'retryNo' => 0,
+                ]
+            );
+        }
+    }
 }

apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php

Indentation +45 added lines, -45 removed lines

@@ -28,54 +28,54 @@
 use OCP\Http\Client\IClientService;
 
 class RetryJob extends Job {
-	/** @var IClientService */
-	private $clientService;
-	/** @var IJobList */
-	private $jobList;
-	/** @var string */
-	private $lookupServer = 'https://lookup.nextcloud.com/users';
+    /** @var IClientService */
+    private $clientService;
+    /** @var IJobList */
+    private $jobList;
+    /** @var string */
+    private $lookupServer = 'https://lookup.nextcloud.com/users';
 
-	/**
-	 * @param IClientService|null $clientService
-	 * @param IJobList|null $jobList
-	 */
-	public function __construct(IClientService $clientService = null,
-								IJobList $jobList = null) {
-		if($clientService !== null) {
-			$this->clientService = $clientService;
-		} else {
-			$this->clientService = \OC::$server->getHTTPClientService();
-		}
-		if($jobList !== null) {
-			$this->jobList = $jobList;
-		} else {
-			$this->jobList = \OC::$server->getJobList();
-		}
-	}
+    /**
+     * @param IClientService|null $clientService
+     * @param IJobList|null $jobList
+     */
+    public function __construct(IClientService $clientService = null,
+                                IJobList $jobList = null) {
+        if($clientService !== null) {
+            $this->clientService = $clientService;
+        } else {
+            $this->clientService = \OC::$server->getHTTPClientService();
+        }
+        if($jobList !== null) {
+            $this->jobList = $jobList;
+        } else {
+            $this->jobList = \OC::$server->getJobList();
+        }
+    }
 
-	protected function run($argument) {
-		if($argument['retryNo'] === 5) {
-			return;
-		}
+    protected function run($argument) {
+        if($argument['retryNo'] === 5) {
+            return;
+        }
 
-		$client = $this->clientService->newClient();
+        $client = $this->clientService->newClient();
 
-		try {
-			$client->post($this->lookupServer,
-				[
-					'body' => json_encode($argument['dataArray']),
-					'timeout' => 10,
-					'connect_timeout' => 3,
-				]
-			);
-		} catch (\Exception $e) {
-			$this->jobList->add(RetryJob::class,
-				[
-					'dataArray' => $argument['dataArray'],
-					'retryNo' => $argument['retryNo'] + 1,
-				]
-			);
+        try {
+            $client->post($this->lookupServer,
+                [
+                    'body' => json_encode($argument['dataArray']),
+                    'timeout' => 10,
+                    'connect_timeout' => 3,
+                ]
+            );
+        } catch (\Exception $e) {
+            $this->jobList->add(RetryJob::class,
+                [
+                    'dataArray' => $argument['dataArray'],
+                    'retryNo' => $argument['retryNo'] + 1,
+                ]
+            );
 
-		}
-	}
+        }
+    }
 }

apps/lookup_server_connector/appinfo/app.php

Indentation +19 added lines, -19 removed lines

@@ -22,24 +22,24 @@
 $dispatcher = \OC::$server->getEventDispatcher();
 
 $dispatcher->addListener('OC\AccountManager::userUpdated', function(\Symfony\Component\EventDispatcher\GenericEvent $event) {
-	$user = $event->getSubject();
+    $user = $event->getSubject();
 
-	$keyManager = new \OC\Security\IdentityProof\Manager(
-		\OC::$server->getAppDataDir('identityproof'),
-		\OC::$server->getCrypto()
-	);
-	$updateLookupServer = new \OCA\LookupServerConnector\UpdateLookupServer(
-		new \OC\Accounts\AccountManager(\OC::$server->getDatabaseConnection(), \OC::$server->getEventDispatcher()),
-		\OC::$server->getConfig(),
-		\OC::$server->getSecureRandom(),
-		\OC::$server->getHTTPClientService(),
-		$keyManager,
-		new \OC\Security\IdentityProof\Signer(
-			$keyManager,
-			new \OC\AppFramework\Utility\TimeFactory(),
-			\OC::$server->getUserManager()
-		),
-		\OC::$server->getJobList()
-	);
-	$updateLookupServer->userUpdated($user);
+    $keyManager = new \OC\Security\IdentityProof\Manager(
+        \OC::$server->getAppDataDir('identityproof'),
+        \OC::$server->getCrypto()
+    );
+    $updateLookupServer = new \OCA\LookupServerConnector\UpdateLookupServer(
+        new \OC\Accounts\AccountManager(\OC::$server->getDatabaseConnection(), \OC::$server->getEventDispatcher()),
+        \OC::$server->getConfig(),
+        \OC::$server->getSecureRandom(),
+        \OC::$server->getHTTPClientService(),
+        $keyManager,
+        new \OC\Security\IdentityProof\Signer(
+            $keyManager,
+            new \OC\AppFramework\Utility\TimeFactory(),
+            \OC::$server->getUserManager()
+        ),
+        \OC::$server->getJobList()
+    );
+    $updateLookupServer->userUpdated($user);
 });

apps/user_ldap/templates/settings.php

Indentation +46 added lines, -46 removed lines

@@ -5,46 +5,46 @@ 
 vendor_style('user_ldap', 'ui-multiselect/jquery.multiselect');
 
 script('user_ldap', [
-	'wizard/controller',
-	'wizard/configModel',
-	'wizard/view',
-	'wizard/wizardObject',
-	'wizard/wizardTabGeneric',
-	'wizard/wizardTabElementary',
-	'wizard/wizardTabAbstractFilter',
-	'wizard/wizardTabUserFilter',
-	'wizard/wizardTabLoginFilter',
-	'wizard/wizardTabGroupFilter',
-	'wizard/wizardTabAdvanced',
-	'wizard/wizardTabExpert',
-	'wizard/wizardDetectorQueue',
-	'wizard/wizardDetectorGeneric',
-	'wizard/wizardDetectorPort',
-	'wizard/wizardDetectorBaseDN',
-	'wizard/wizardDetectorFeatureAbstract',
-	'wizard/wizardDetectorUserObjectClasses',
-	'wizard/wizardDetectorGroupObjectClasses',
-	'wizard/wizardDetectorGroupsForUsers',
-	'wizard/wizardDetectorGroupsForGroups',
-	'wizard/wizardDetectorSimpleRequestAbstract',
-	'wizard/wizardDetectorFilterUser',
-	'wizard/wizardDetectorFilterLogin',
-	'wizard/wizardDetectorFilterGroup',
-	'wizard/wizardDetectorUserCount',
-	'wizard/wizardDetectorGroupCount',
-	'wizard/wizardDetectorEmailAttribute',
-	'wizard/wizardDetectorUserDisplayNameAttribute',
-	'wizard/wizardDetectorUserGroupAssociation',
-	'wizard/wizardDetectorAvailableAttributes',
-	'wizard/wizardDetectorTestAbstract',
-	'wizard/wizardDetectorTestLoginName',
-	'wizard/wizardDetectorTestBaseDN',
-	'wizard/wizardDetectorTestConfiguration',
-	'wizard/wizardDetectorClearUserMappings',
-	'wizard/wizardDetectorClearGroupMappings',
-	'wizard/wizardFilterOnType',
-	'wizard/wizardFilterOnTypeFactory',
-	'wizard/wizard'
+    'wizard/controller',
+    'wizard/configModel',
+    'wizard/view',
+    'wizard/wizardObject',
+    'wizard/wizardTabGeneric',
+    'wizard/wizardTabElementary',
+    'wizard/wizardTabAbstractFilter',
+    'wizard/wizardTabUserFilter',
+    'wizard/wizardTabLoginFilter',
+    'wizard/wizardTabGroupFilter',
+    'wizard/wizardTabAdvanced',
+    'wizard/wizardTabExpert',
+    'wizard/wizardDetectorQueue',
+    'wizard/wizardDetectorGeneric',
+    'wizard/wizardDetectorPort',
+    'wizard/wizardDetectorBaseDN',
+    'wizard/wizardDetectorFeatureAbstract',
+    'wizard/wizardDetectorUserObjectClasses',
+    'wizard/wizardDetectorGroupObjectClasses',
+    'wizard/wizardDetectorGroupsForUsers',
+    'wizard/wizardDetectorGroupsForGroups',
+    'wizard/wizardDetectorSimpleRequestAbstract',
+    'wizard/wizardDetectorFilterUser',
+    'wizard/wizardDetectorFilterLogin',
+    'wizard/wizardDetectorFilterGroup',
+    'wizard/wizardDetectorUserCount',
+    'wizard/wizardDetectorGroupCount',
+    'wizard/wizardDetectorEmailAttribute',
+    'wizard/wizardDetectorUserDisplayNameAttribute',
+    'wizard/wizardDetectorUserGroupAssociation',
+    'wizard/wizardDetectorAvailableAttributes',
+    'wizard/wizardDetectorTestAbstract',
+    'wizard/wizardDetectorTestLoginName',
+    'wizard/wizardDetectorTestBaseDN',
+    'wizard/wizardDetectorTestConfiguration',
+    'wizard/wizardDetectorClearUserMappings',
+    'wizard/wizardDetectorClearGroupMappings',
+    'wizard/wizardFilterOnType',
+    'wizard/wizardFilterOnTypeFactory',
+    'wizard/wizard'
 ]);
 
 style('user_ldap', 'settings');
@@ -67,12 +67,12 @@ 
 		<li class="ldapSettingsTabs"><a href="#ldapSettings-1"><?php p($l->t('Advanced'));?></a></li>
 	</ul>
 	<?php if(OCP\App::isEnabled('user_webdavauth')) {
-		print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them.').'</p>');
-	}
-	if(!function_exists('ldap_connect')) {
-		print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.').'</p>');
-	}
-	?>
+        print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them.').'</p>');
+    }
+    if(!function_exists('ldap_connect')) {
+        print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.').'</p>');
+    }
+    ?>
 	<?php require_once(__DIR__ . '/part.wizard-server.php'); ?>
 	<?php require_once(__DIR__ . '/part.wizard-userfilter.php'); ?>
 	<?php require_once(__DIR__ . '/part.wizard-loginfilter.php'); ?>

apps/user_ldap/templates/part.wizard-server.php

Indentation +9 added lines, -9 removed lines

@@ -9,19 +9,19 @@
 		<p>
 		<select id="ldap_serverconfig_chooser" name="ldap_serverconfig_chooser">
 		<?php if(count($_['serverConfigurationPrefixes']) === 0 ) {
-			?>
+            ?>
 				<option value="" selected><?php p($l->t('1. Server'));?></option>');
 			<?php
-		} else {
-			$i = 1;
-			$sel = ' selected';
-			foreach($_['serverConfigurationPrefixes'] as $prefix) {
-				?>
+        } else {
+            $i = 1;
+            $sel = ' selected';
+            foreach($_['serverConfigurationPrefixes'] as $prefix) {
+                ?>
 				<option value="<?php p($prefix); ?>"<?php p($sel); $sel = ''; ?>><?php p($l->t('%s. Server:', array($i++)));?> <?php p(' '.$_['serverConfigurationHosts'][$prefix]); ?></option>
 				<?php
-			}
-		}
-		?>
+            }
+        }
+        ?>
 		</select>
 		<button type="button" id="ldap_action_add_configuration"
 			name="ldap_action_add_configuration" class="icon-add icon-default-style"