nextcloud / server

apps/files/lib/BackgroundJob/ScanFiles.php

Indentation +69 added lines, -69 removed lines

@@ -36,80 +36,80 @@
  * @package OCA\Files\BackgroundJob
  */
 class ScanFiles extends \OC\BackgroundJob\TimedJob {
-	/** @var IConfig */
-	private $config;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IDBConnection */
-	private $dbConnection;
-	/** @var ILogger */
-	private $logger;
-	/** Amount of users that should get scanned per execution */
-	const USERS_PER_SESSION = 500;
+    /** @var IConfig */
+    private $config;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IDBConnection */
+    private $dbConnection;
+    /** @var ILogger */
+    private $logger;
+    /** Amount of users that should get scanned per execution */
+    const USERS_PER_SESSION = 500;
 
-	/**
-	 * @param IConfig|null $config
-	 * @param IUserManager|null $userManager
-	 * @param IDBConnection|null $dbConnection
-	 * @param ILogger|null $logger
-	 */
-	public function __construct(IConfig $config = null,
-								IUserManager $userManager = null,
-								IDBConnection $dbConnection = null,
-								ILogger $logger = null) {
-		// Run once per 10 minutes
-		$this->setInterval(60 * 10);
+    /**
+     * @param IConfig|null $config
+     * @param IUserManager|null $userManager
+     * @param IDBConnection|null $dbConnection
+     * @param ILogger|null $logger
+     */
+    public function __construct(IConfig $config = null,
+                                IUserManager $userManager = null,
+                                IDBConnection $dbConnection = null,
+                                ILogger $logger = null) {
+        // Run once per 10 minutes
+        $this->setInterval(60 * 10);
 
-		if (is_null($userManager) || is_null($config)) {
-			$this->fixDIForJobs();
-		} else {
-			$this->config = $config;
-			$this->userManager = $userManager;
-			$this->logger = $logger;
-		}
-	}
+        if (is_null($userManager) || is_null($config)) {
+            $this->fixDIForJobs();
+        } else {
+            $this->config = $config;
+            $this->userManager = $userManager;
+            $this->logger = $logger;
+        }
+    }
 
-	protected function fixDIForJobs() {
-		$this->config = \OC::$server->getConfig();
-		$this->userManager = \OC::$server->getUserManager();
-		$this->logger = \OC::$server->getLogger();
-	}
+    protected function fixDIForJobs() {
+        $this->config = \OC::$server->getConfig();
+        $this->userManager = \OC::$server->getUserManager();
+        $this->logger = \OC::$server->getLogger();
+    }
 
-	/**
-	 * @param IUser $user
-	 */
-	protected function runScanner(IUser $user) {
-		try {
-			$scanner = new Scanner(
-					$user->getUID(),
-					$this->dbConnection,
-					$this->logger
-			);
-			$scanner->backgroundScan('');
-		} catch (\Exception $e) {
-			$this->logger->logException($e, ['app' => 'files']);
-		}
-		\OC_Util::tearDownFS();
-	}
+    /**
+     * @param IUser $user
+     */
+    protected function runScanner(IUser $user) {
+        try {
+            $scanner = new Scanner(
+                    $user->getUID(),
+                    $this->dbConnection,
+                    $this->logger
+            );
+            $scanner->backgroundScan('');
+        } catch (\Exception $e) {
+            $this->logger->logException($e, ['app' => 'files']);
+        }
+        \OC_Util::tearDownFS();
+    }
 
-	/**
-	 * @param $argument
-	 * @throws \Exception
-	 */
-	protected function run($argument) {
-		$offset = $this->config->getAppValue('files', 'cronjob_scan_files', 0);
-		$users = $this->userManager->search('', self::USERS_PER_SESSION, $offset);
-		if (!count($users)) {
-			// No users found, reset offset and retry
-			$offset = 0;
-			$users = $this->userManager->search('', self::USERS_PER_SESSION);
-		}
+    /**
+     * @param $argument
+     * @throws \Exception
+     */
+    protected function run($argument) {
+        $offset = $this->config->getAppValue('files', 'cronjob_scan_files', 0);
+        $users = $this->userManager->search('', self::USERS_PER_SESSION, $offset);
+        if (!count($users)) {
+            // No users found, reset offset and retry
+            $offset = 0;
+            $users = $this->userManager->search('', self::USERS_PER_SESSION);
+        }
 
-		$offset += self::USERS_PER_SESSION;
-		$this->config->setAppValue('files', 'cronjob_scan_files', $offset);
+        $offset += self::USERS_PER_SESSION;
+        $this->config->setAppValue('files', 'cronjob_scan_files', $offset);
 
-		foreach ($users as $user) {
-			$this->runScanner($user);
-		}
-	}
+        foreach ($users as $user) {
+            $this->runScanner($user);
+        }
+    }
 }

apps/files/lib/Settings/Admin.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 		$maxUploadFilesize = Util::humanFileSize(min($upload_max_filesize, $post_max_size));
 
 		$parameters = [
-			'uploadChangable'              => (($htaccessWorking and $htaccessWritable) or $userIniWritable ),
+			'uploadChangable'              => (($htaccessWorking and $htaccessWritable) or $userIniWritable),
 			'uploadMaxFilesize'            => $maxUploadFilesize,
 			// max possible makes only sense on a 32 bit system
 			'displayMaxPossibleUploadSize' => PHP_INT_SIZE === 4,

Indentation +43 added lines, -43 removed lines

@@ -31,56 +31,56 @@
 
 class Admin implements ISettings {
 
-	/** @var IniGetWrapper */
-	private $iniWrapper;
+    /** @var IniGetWrapper */
+    private $iniWrapper;
 
-	/** @var IRequest */
-	private $request;
+    /** @var IRequest */
+    private $request;
 
-	public function __construct(IniGetWrapper $iniWrapper, IRequest $request) {
-		$this->iniWrapper = $iniWrapper;
-		$this->request = $request;
-	}
+    public function __construct(IniGetWrapper $iniWrapper, IRequest $request) {
+        $this->iniWrapper = $iniWrapper;
+        $this->request = $request;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$htaccessWorking  = (getenv('htaccessWorking') === 'true');
-		$htaccessWritable = is_writable(\OC::$SERVERROOT.'/.htaccess');
-		$userIniWritable  = is_writable(\OC::$SERVERROOT.'/.user.ini');
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $htaccessWorking  = (getenv('htaccessWorking') === 'true');
+        $htaccessWritable = is_writable(\OC::$SERVERROOT.'/.htaccess');
+        $userIniWritable  = is_writable(\OC::$SERVERROOT.'/.user.ini');
 
-		$upload_max_filesize = $this->iniWrapper->getBytes('upload_max_filesize');
-		$post_max_size = $this->iniWrapper->getBytes('post_max_size');
-		$maxUploadFilesize = Util::humanFileSize(min($upload_max_filesize, $post_max_size));
+        $upload_max_filesize = $this->iniWrapper->getBytes('upload_max_filesize');
+        $post_max_size = $this->iniWrapper->getBytes('post_max_size');
+        $maxUploadFilesize = Util::humanFileSize(min($upload_max_filesize, $post_max_size));
 
-		$parameters = [
-			'uploadChangable'              => (($htaccessWorking and $htaccessWritable) or $userIniWritable ),
-			'uploadMaxFilesize'            => $maxUploadFilesize,
-			// max possible makes only sense on a 32 bit system
-			'displayMaxPossibleUploadSize' => PHP_INT_SIZE === 4,
-			'maxPossibleUploadSize'        => Util::humanFileSize(PHP_INT_MAX),
-		];
+        $parameters = [
+            'uploadChangable'              => (($htaccessWorking and $htaccessWritable) or $userIniWritable ),
+            'uploadMaxFilesize'            => $maxUploadFilesize,
+            // max possible makes only sense on a 32 bit system
+            'displayMaxPossibleUploadSize' => PHP_INT_SIZE === 4,
+            'maxPossibleUploadSize'        => Util::humanFileSize(PHP_INT_MAX),
+        ];
 
-		return new TemplateResponse('files', 'admin', $parameters, '');
-	}
+        return new TemplateResponse('files', 'admin', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'additional';
-	}
+    /**
+     * @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 5;
-	}
+    /**
+     * @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;
+    }
 
 }

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 ));

Spacing +4 added lines, -4 removed lines

@@ -29,15 +29,15 @@ 
 
 $filename = $_GET["file"];
 
-if(!\OC\Files\Filesystem::file_exists($filename)) {
+if (!\OC\Files\Filesystem::file_exists($filename)) {
 	header("HTTP/1.0 404 Not Found");
-	$tmpl = new OCP\Template( '', '404', 'guest' );
+	$tmpl = new OCP\Template('', '404', 'guest');
 	$tmpl->assign('file', $filename);
 	$tmpl->printPage();
 	exit;
 }
 
-$ftype=\OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType( $filename ));
+$ftype = \OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType($filename));
 
 header('Content-Type:'.$ftype);
 OCP\Response::setContentDispositionHeader(basename($filename), 'attachment');
@@ -45,4 +45,4 @@ 
 OCP\Response::setContentLengthHeader(\OC\Files\Filesystem::filesize($filename));
 
 OC_Util::obEnd();
-\OC\Files\Filesystem::readfile( $filename );
+\OC\Files\Filesystem::readfile($filename);

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'),
+    ];
 });

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
 $templateManager->registerTemplate('application/vnd.oasis.opendocument.text', 'core/templates/filetemplates/template.odt');
 $templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadsheet', 'core/templates/filetemplates/template.ods');
 
-\OCA\Files\App::getNavigationManager()->add(function () use ($l) {
+\OCA\Files\App::getNavigationManager()->add(function() use ($l) {
 	return [
 		'id' => 'files',
 		'appname' => 'files',
@@ -48,7 +48,7 @@ 
 	];
 });
 
-\OCA\Files\App::getNavigationManager()->add(function () use ($l) {
+\OCA\Files\App::getNavigationManager()->add(function() use ($l) {
 	return [
 		'id' => 'recent',
 		'appname' => 'files',

apps/user_ldap/templates/part.wizardcontrols.php

Spacing +4 added lines, -4 removed lines

@@ -1,17 +1,17 @@
 <div class="ldapWizardControls">
-	<span class="ldap_saving hidden"><?php p($l->t('Saving'));?> <img class="wizSpinner" src="<?php p(image_path('core', 'loading.gif')); ?>"/></span>
+	<span class="ldap_saving hidden"><?php p($l->t('Saving')); ?> <img class="wizSpinner" src="<?php p(image_path('core', 'loading.gif')); ?>"/></span>
 	<span class="ldap_config_state_indicator"></span> <span class="ldap_config_state_indicator_sign"></span>
 	<button class="ldap_action_back invisible" name="ldap_action_back"
 			type="button">
-		<?php p($l->t('Back'));?>
+		<?php p($l->t('Back')); ?>
 	</button>
 	<button class="ldap_action_continue" name="ldap_action_continue" type="button">
-		<?php p($l->t('Continue'));?>
+		<?php p($l->t('Continue')); ?>
 	</button>
 	<a href="<?php p(link_to_docs('admin-ldap')); ?>"
 		target="_blank" rel="noreferrer">
 		<img src="<?php print_unescaped(image_path('', 'actions/info.svg')); ?>"
 			style="height:1.75ex" />
-		<span class="ldap_grey"><?php p($l->t('Help'));?></span>
+		<span class="ldap_grey"><?php p($l->t('Help')); ?></span>
 	</a>
 </div>

apps/user_ldap/templates/part.settingcontrols.php

Spacing +2 added lines, -2 removed lines

@@ -1,11 +1,11 @@
 <div class="ldapSettingControls">
 	<button type="button" class="ldap_action_test_connection" name="ldap_action_test_connection">
-		<?php p($l->t('Test Configuration'));?>
+		<?php p($l->t('Test Configuration')); ?>
 	</button>
 	<a href="<?php p(link_to_docs('admin-ldap')); ?>"
 		target="_blank" rel="noreferrer">
 		<img src="<?php print_unescaped(image_path('', 'actions/info.svg')); ?>"
 			style="height:1.75ex" />
-		<?php p($l->t('Help'));?>
+		<?php p($l->t('Help')); ?>
 	</a>
 </div>

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

Spacing +12 added lines, -12 removed lines

@@ -1,11 +1,11 @@ 
 <fieldset id="ldapWizard2">
 	<div>
 		<p>
-			<?php p($l->t('Listing and searching for users is constrained by these criteria:'));?>
+			<?php p($l->t('Listing and searching for users is constrained by these criteria:')); ?>
 		</p>
 		<p>
 			<label for="ldap_userfilter_objectclass">
-				<?php p($l->t('Only these object classes:'));?>
+				<?php p($l->t('Only these object classes:')); ?>
 			</label>
 
 			<select id="ldap_userfilter_objectclass" multiple="multiple"
@@ -14,14 +14,14 @@ 
 		</p>
 		<p>
 			<label></label>
-			<span class="ldapInputColElement"><?php p($l->t('The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin.'));?></span>
+			<span class="ldapInputColElement"><?php p($l->t('The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin.')); ?></span>
 		</p>
 		<p>
 			<label for="ldap_userfilter_groups">
-				<?php p($l->t('Only from these groups:'));?>
+				<?php p($l->t('Only from these groups:')); ?>
 			</label>
 
-			<input type="text" class="ldapManyGroupsSupport ldapManyGroupsSearch hidden" placeholder="<?php p($l->t('Search groups'));?>" />
+			<input type="text" class="ldapManyGroupsSupport ldapManyGroupsSearch hidden" placeholder="<?php p($l->t('Search groups')); ?>" />
 
 			<select id="ldap_userfilter_groups" multiple="multiple"
 			 name="ldap_userfilter_groups" class="multiSelectPlugin">
@@ -30,26 +30,26 @@ 
 		<p class="ldapManyGroupsSupport hidden">
 			<label></label>
 			<select class="ldapGroupList ldapGroupListAvailable" multiple="multiple"
-					title="<?php p($l->t('Available groups'));?>"></select>
+					title="<?php p($l->t('Available groups')); ?>"></select>
 			<span class="buttonSpan">
 				<button class="ldapGroupListSelect" type="button">&gt;</button><br/>
 				<button class="ldapGroupListDeselect" type="button">&lt;</button>
 			</span>
 			<select class="ldapGroupList ldapGroupListSelected" multiple="multiple"
-					title="<?php p($l->t('Selected groups'));?>"></select>
+					title="<?php p($l->t('Selected groups')); ?>"></select>
 		</p>
 		<p>
-			<label><a id='toggleRawUserFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query'));?></a></label>
+			<label><a id='toggleRawUserFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query')); ?></a></label>
 		</p>
 		<p id="ldapReadOnlyUserFilterContainer" class="hidden ldapReadOnlyFilterContainer">
-			<label><?php p($l->t('LDAP Filter:'));?></label>
+			<label><?php p($l->t('LDAP Filter:')); ?></label>
 			<span class="ldapFilterReadOnlyElement ldapInputColElement"></span>
 		</p>
 		<p id="rawUserFilterContainer">
 			<textarea type="text" id="ldap_userlist_filter" name="ldap_userlist_filter"
 				class="ldapFilterInputElement"
-				placeholder="<?php p($l->t('Edit LDAP Query'));?>"
-				title="<?php p($l->t('The filter specifies which LDAP users shall have access to the %s instance.', $theme->getName()));?>">
+				placeholder="<?php p($l->t('Edit LDAP Query')); ?>"
+				title="<?php p($l->t('The filter specifies which LDAP users shall have access to the %s instance.', $theme->getName())); ?>">
 			</textarea>
 		</p>
 		<p>
@@ -57,7 +57,7 @@ 
 		</p>
 		<p class="ldap_count">
 			<button class="ldapGetEntryCount ldapGetUserCount" name="ldapGetEntryCount" type="button">
-				<?php p($l->t('Verify settings and count users'));?>
+				<?php p($l->t('Verify settings and count users')); ?>
 			</button>
 			<span id="ldap_user_count"></span>
 		</p>

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"

Spacing +21 added lines, -21 removed lines

@@ -8,16 +8,16 @@ 
 <fieldset id="ldapWizard1">
 		<p>
 		<select id="ldap_serverconfig_chooser" name="ldap_serverconfig_chooser">
-		<?php if(count($_['serverConfigurationPrefixes']) === 0 ) {
+		<?php if (count($_['serverConfigurationPrefixes']) === 0) {
 			?>
-				<option value="" selected><?php p($l->t('1. Server'));?></option>');
+				<option value="" selected><?php p($l->t('1. Server')); ?></option>');
 			<?php
 		} else {
 			$i = 1;
 			$sel = ' selected';
-			foreach($_['serverConfigurationPrefixes'] as $prefix) {
+			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>
+				<option value="<?php p($prefix); ?>"<?php p($sel); $sel = ''; ?>><?php p($l->t('%s. Server:', array($i++))); ?> <?php p(' '.$_['serverConfigurationHosts'][$prefix]); ?></option>
 				<?php
 			}
 		}
@@ -25,14 +25,14 @@ 
 		</select>
 		<button type="button" id="ldap_action_add_configuration"
 			name="ldap_action_add_configuration" class="icon-add icon-default-style"
-			title="<?php p($l->t('Add a new configuration'));?>">&nbsp;</button>
+			title="<?php p($l->t('Add a new configuration')); ?>">&nbsp;</button>
 		<button type="button" id="ldap_action_copy_configuration"
 			name="ldap_action_copy_configuration"
 			class="ldapIconCopy icon-default-style"
-			title="<?php p($l->t('Copy current configuration into new directory binding'));?>">&nbsp;</button>
+			title="<?php p($l->t('Copy current configuration into new directory binding')); ?>">&nbsp;</button>
 		<button type="button" id="ldap_action_delete_configuration"
 			name="ldap_action_delete_configuration" class="icon-delete icon-default-style"
-			title="<?php p($l->t('Delete the current configuration'));?>">&nbsp;</button>
+			title="<?php p($l->t('Delete the current configuration')); ?>">&nbsp;</button>
 		</p>
 
 		<div class="hostPortCombinator">
@@ -41,14 +41,14 @@ 
 					<div class="table">
 						<input type="text" class="host" id="ldap_host"
 							name="ldap_host"
-							placeholder="<?php p($l->t('Host'));?>"
-							title="<?php p($l->t('You can omit the protocol, unless you require SSL. If so, start with ldaps://'));?>"
+							placeholder="<?php p($l->t('Host')); ?>"
+							title="<?php p($l->t('You can omit the protocol, unless you require SSL. If so, start with ldaps://')); ?>"
 							/>
 						<span class="hostPortCombinatorSpan">
 							<input type="number" id="ldap_port" name="ldap_port"
-								placeholder="<?php p($l->t('Port'));?>" />
+								placeholder="<?php p($l->t('Port')); ?>" />
 							<button class="ldapDetectPort" name="ldapDetectPort" type="button">
-								<?php p($l->t('Detect Port'));?>
+								<?php p($l->t('Detect Port')); ?>
 							</button>
 						</span>
 					</div>
@@ -57,40 +57,40 @@ 
 			<div class="tablerow">
 				<input type="text" id="ldap_dn" name="ldap_dn"
 				class="tablecell"
-				placeholder="<?php p($l->t('User DN'));?>" autocomplete="off"
-				title="<?php p($l->t('The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty.'));?>"
+				placeholder="<?php p($l->t('User DN')); ?>" autocomplete="off"
+				title="<?php p($l->t('The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty.')); ?>"
 				/>
 			</div>
 
 			<div class="tablerow">
 				<input type="password" id="ldap_agent_password"
 				class="tablecell" name="ldap_agent_password"
-				placeholder="<?php p($l->t('Password'));?>" autocomplete="off"
-				title="<?php p($l->t('For anonymous access, leave DN and Password empty.'));?>"
+				placeholder="<?php p($l->t('Password')); ?>" autocomplete="off"
+				title="<?php p($l->t('For anonymous access, leave DN and Password empty.')); ?>"
 				/>
 			</div>
 
 			<div class="tablerow">
 				<textarea id="ldap_base" name="ldap_base"
 					class="tablecell"
-					placeholder="<?php p($l->t('One Base DN per line'));?>"
-					title="<?php p($l->t('You can specify Base DN for users and groups in the Advanced tab'));?>">
+					placeholder="<?php p($l->t('One Base DN per line')); ?>"
+					title="<?php p($l->t('You can specify Base DN for users and groups in the Advanced tab')); ?>">
 				</textarea>
 				<button class="ldapDetectBase" name="ldapDetectBase" type="button">
-					<?php p($l->t('Detect Base DN'));?>
+					<?php p($l->t('Detect Base DN')); ?>
 				</button>
 				<button class="ldapTestBase" name="ldapTestBase" type="button">
-					<?php p($l->t('Test Base DN'));?>
+					<?php p($l->t('Test Base DN')); ?>
 				</button>
 			</div>
 
 			<div class="tablerow left">
 				<input type="checkbox" id="ldap_experienced_admin" value="1"
 					name="ldap_experienced_admin" class="tablecell"
-					title="<?php p($l->t('Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.'));?>"
+					title="<?php p($l->t('Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.')); ?>"
 					/>
 				<label for="ldap_experienced_admin" class="tablecell">
-					<?php p($l->t('Manually enter LDAP filters (recommended for large directories)'));?>
+					<?php p($l->t('Manually enter LDAP filters (recommended for large directories)')); ?>
 				</label>
 			</div>