nextcloud / server

apps/user_ldap/appinfo/app.php

Indentation +25 added lines, -25 removed lines

@@ -30,33 +30,33 @@
 $helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
 $configPrefixes = $helper->getServerConfigurationPrefixes(true);
 if(count($configPrefixes) > 0) {
-	$ldapWrapper = new OCA\User_LDAP\LDAP();
-	$ocConfig = \OC::$server->getConfig();
-	$notificationManager = \OC::$server->getNotificationManager();
-	$notificationManager->registerNotifier(function() {
-		return new \OCA\User_LDAP\Notification\Notifier(
-			\OC::$server->getL10NFactory()
-		);
-	}, function() {
-		$l = \OC::$server->getL10N('user_ldap');
-		return [
-			'id' => 'user_ldap',
-			'name' => $l->t('LDAP user and group backend'),
-		];
-	});
+    $ldapWrapper = new OCA\User_LDAP\LDAP();
+    $ocConfig = \OC::$server->getConfig();
+    $notificationManager = \OC::$server->getNotificationManager();
+    $notificationManager->registerNotifier(function() {
+        return new \OCA\User_LDAP\Notification\Notifier(
+            \OC::$server->getL10NFactory()
+        );
+    }, function() {
+        $l = \OC::$server->getL10N('user_ldap');
+        return [
+            'id' => 'user_ldap',
+            'name' => $l->t('LDAP user and group backend'),
+        ];
+    });
 
-	$userBackend  = new OCA\User_LDAP\User_Proxy(
-		$configPrefixes, $ldapWrapper, $ocConfig, $notificationManager
-	);
-	$groupBackend  = new OCA\User_LDAP\Group_Proxy($configPrefixes, $ldapWrapper);
-	// register user backend
-	OC_User::useBackend($userBackend);
-	\OC::$server->getGroupManager()->addBackend($groupBackend);
+    $userBackend  = new OCA\User_LDAP\User_Proxy(
+        $configPrefixes, $ldapWrapper, $ocConfig, $notificationManager
+    );
+    $groupBackend  = new OCA\User_LDAP\Group_Proxy($configPrefixes, $ldapWrapper);
+    // register user backend
+    OC_User::useBackend($userBackend);
+    \OC::$server->getGroupManager()->addBackend($groupBackend);
 }
 
 \OCP\Util::connectHook(
-	'\OCA\Files_Sharing\API\Server2Server',
-	'preLoginNameUsedAsUserName',
-	'\OCA\User_LDAP\Helper',
-	'loginName2UserName'
+    '\OCA\Files_Sharing\API\Server2Server',
+    'preLoginNameUsedAsUserName',
+    '\OCA\User_LDAP\Helper',
+    'loginName2UserName'
 );

apps/user_ldap/templates/settings.php

Indentation +44 added lines, -44 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,10 +67,10 @@ 
 		<li class="ldapSettingsTabs"><a href="#ldapSettings-1"><?php p($l->t('Advanced'));?></a></li>
 	</ul>
 	<?php
-	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>');
-	}
-	?>
+    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'); ?>

lib/private/Repair/RepairMimeTypes.php

Indentation +109 added lines, -109 removed lines

@@ -34,132 +34,132 @@
 use OCP\Migration\IRepairStep;
 
 class RepairMimeTypes implements IRepairStep {
-	/**
-	 * @var \OCP\IConfig
-	 */
-	protected $config;
-
-	/**
-	 * @var int
-	 */
-	protected $folderMimeTypeId;
-
-	/**
-	 * @param \OCP\IConfig $config
-	 */
-	public function __construct($config) {
-		$this->config = $config;
-	}
-
-	public function getName() {
-		return 'Repair mime types';
-	}
-
-	private static function existsStmt() {
-		return \OC_DB::prepare('
+    /**
+     * @var \OCP\IConfig
+     */
+    protected $config;
+
+    /**
+     * @var int
+     */
+    protected $folderMimeTypeId;
+
+    /**
+     * @param \OCP\IConfig $config
+     */
+    public function __construct($config) {
+        $this->config = $config;
+    }
+
+    public function getName() {
+        return 'Repair mime types';
+    }
+
+    private static function existsStmt() {
+        return \OC_DB::prepare('
 			SELECT count(`mimetype`)
 			FROM   `*PREFIX*mimetypes`
 			WHERE  `mimetype` = ?
 		');
-	}
+    }
 
-	private static function getIdStmt() {
-		return \OC_DB::prepare('
+    private static function getIdStmt() {
+        return \OC_DB::prepare('
 			SELECT `id`
 			FROM   `*PREFIX*mimetypes`
 			WHERE  `mimetype` = ?
 		');
-	}
+    }
 
-	private static function insertStmt() {
-		return \OC_DB::prepare('
+    private static function insertStmt() {
+        return \OC_DB::prepare('
 			INSERT INTO `*PREFIX*mimetypes` ( `mimetype` )
 			VALUES ( ? )
 		');
-	}
+    }
 
-	private static function updateByNameStmt() {
-		return \OC_DB::prepare('
+    private static function updateByNameStmt() {
+        return \OC_DB::prepare('
 			UPDATE `*PREFIX*filecache`
 			SET `mimetype` = ?
 			WHERE `mimetype` <> ? AND `mimetype` <> ? AND `name` ILIKE ?
 		');
-	}
-
-	private function updateMimetypes($updatedMimetypes) {
-		if (empty($this->folderMimeTypeId)) {
-			$result = \OC_DB::executeAudited(self::getIdStmt(), array('httpd/unix-directory'));
-			$this->folderMimeTypeId = (int)$result->fetchOne();
-		}
-
-		foreach ($updatedMimetypes as $extension => $mimetype) {
-			$result = \OC_DB::executeAudited(self::existsStmt(), array($mimetype));
-			$exists = $result->fetchOne();
-
-			if (!$exists) {
-				// insert mimetype
-				\OC_DB::executeAudited(self::insertStmt(), array($mimetype));
-			}
+    }
+
+    private function updateMimetypes($updatedMimetypes) {
+        if (empty($this->folderMimeTypeId)) {
+            $result = \OC_DB::executeAudited(self::getIdStmt(), array('httpd/unix-directory'));
+            $this->folderMimeTypeId = (int)$result->fetchOne();
+        }
+
+        foreach ($updatedMimetypes as $extension => $mimetype) {
+            $result = \OC_DB::executeAudited(self::existsStmt(), array($mimetype));
+            $exists = $result->fetchOne();
+
+            if (!$exists) {
+                // insert mimetype
+                \OC_DB::executeAudited(self::insertStmt(), array($mimetype));
+            }
 			
-			// get target mimetype id
-			$result = \OC_DB::executeAudited(self::getIdStmt(), array($mimetype));
-			$mimetypeId = $result->fetchOne();
-
-			// change mimetype for files with x extension
-			\OC_DB::executeAudited(self::updateByNameStmt(), array($mimetypeId, $this->folderMimeTypeId, $mimetypeId, '%.' . $extension));
-		}
-	}
-
-	private function introduceImageTypes() {
-		$updatedMimetypes = array(
-			'jp2' => 'image/jp2',
-			'webp' => 'image/webp',
-		);
-
-		$this->updateMimetypes($updatedMimetypes);
-	}
-
-	private function introduceWindowsProgramTypes() {
-		$updatedMimetypes = array(
-			'htaccess' => 'text/plain',
-			'bat' => 'application/x-msdos-program',
-			'cmd' => 'application/cmd',
-		);
-
-		$this->updateMimetypes($updatedMimetypes);
-	}
-
-	private function introduceLocationTypes() {
-		$updatedMimetypes = [
-			'gpx' => 'application/gpx+xml',
-			'kml' => 'application/vnd.google-earth.kml+xml',
-			'kmz' => 'application/vnd.google-earth.kmz',
-			'tcx' => 'application/vnd.garmin.tcx+xml',
-		];
-
-		$this->updateMimetypes($updatedMimetypes);
-	}
-
-	/**
-	 * Fix mime types
-	 */
-	public function run(IOutput $out) {
-
-		$ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
-
-		// NOTE TO DEVELOPERS: when adding new mime types, please make sure to
-		// add a version comparison to avoid doing it every time
-
-		if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.14', '<') && $this->introduceImageTypes()) {
-			$out->info('Fixed image mime types');
-		}
-
-		if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.13', '<') && $this->introduceWindowsProgramTypes()) {
-			$out->info('Fixed windows program mime types');
-		}
-
-		if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.0', '<') && $this->introduceLocationTypes()) {
-			$out->info('Fixed geospatial mime types');
-		}
-	}
+            // get target mimetype id
+            $result = \OC_DB::executeAudited(self::getIdStmt(), array($mimetype));
+            $mimetypeId = $result->fetchOne();
+
+            // change mimetype for files with x extension
+            \OC_DB::executeAudited(self::updateByNameStmt(), array($mimetypeId, $this->folderMimeTypeId, $mimetypeId, '%.' . $extension));
+        }
+    }
+
+    private function introduceImageTypes() {
+        $updatedMimetypes = array(
+            'jp2' => 'image/jp2',
+            'webp' => 'image/webp',
+        );
+
+        $this->updateMimetypes($updatedMimetypes);
+    }
+
+    private function introduceWindowsProgramTypes() {
+        $updatedMimetypes = array(
+            'htaccess' => 'text/plain',
+            'bat' => 'application/x-msdos-program',
+            'cmd' => 'application/cmd',
+        );
+
+        $this->updateMimetypes($updatedMimetypes);
+    }
+
+    private function introduceLocationTypes() {
+        $updatedMimetypes = [
+            'gpx' => 'application/gpx+xml',
+            'kml' => 'application/vnd.google-earth.kml+xml',
+            'kmz' => 'application/vnd.google-earth.kmz',
+            'tcx' => 'application/vnd.garmin.tcx+xml',
+        ];
+
+        $this->updateMimetypes($updatedMimetypes);
+    }
+
+    /**
+     * Fix mime types
+     */
+    public function run(IOutput $out) {
+
+        $ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+
+        // NOTE TO DEVELOPERS: when adding new mime types, please make sure to
+        // add a version comparison to avoid doing it every time
+
+        if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.14', '<') && $this->introduceImageTypes()) {
+            $out->info('Fixed image mime types');
+        }
+
+        if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.13', '<') && $this->introduceWindowsProgramTypes()) {
+            $out->info('Fixed windows program mime types');
+        }
+
+        if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.0', '<') && $this->introduceLocationTypes()) {
+            $out->info('Fixed geospatial mime types');
+        }
+    }
 }