nextcloud / server

lib/private/Repair/RepairMimeTypes.php

Indentation +123 added lines, -123 removed lines

@@ -34,145 +34,145 @@
 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));
-			}
-
-			// 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);
-	}
-
-	private function introduceInternetShortcutTypes() {
-		$updatedMimetypes = [
-			'url' => 'application/internet-shortcut',
-			'webloc' => 'application/internet-shortcut'
-		];
-
-		$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');
-		}
-
-		if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.3', '<') && $this->introduceInternetShortcutTypes()) {
-			$out->info('Fixed internet-shortcut mime types');
-		}
-	}
+    }
+
+    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);
+    }
+
+    private function introduceInternetShortcutTypes() {
+        $updatedMimetypes = [
+            'url' => 'application/internet-shortcut',
+            'webloc' => 'application/internet-shortcut'
+        ];
+
+        $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');
+        }
+
+        if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.3', '<') && $this->introduceInternetShortcutTypes()) {
+            $out->info('Fixed internet-shortcut mime types');
+        }
+    }
 }

core/Command/Maintenance/Mimetype/UpdateJS.php

Spacing +7 added lines, -7 removed lines

@@ -56,7 +56,7 @@ 
 		$keys = array_filter(array_keys($aliases), function($k) {
 			return $k[0] === '_';
 		});
-		foreach($keys as $key) {
+		foreach ($keys as $key) {
 			unset($aliases[$key]);
 		}
 
@@ -64,7 +64,7 @@ 
 		$dir = new \DirectoryIterator(\OC::$SERVERROOT.'/core/img/filetypes');
 
 		$files = [];
-		foreach($dir as $fileInfo) {
+		foreach ($dir as $fileInfo) {
 			if ($fileInfo->isFile()) {
 				$file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
 				$files[] = $file;
@@ -78,14 +78,14 @@ 
 		// Fetch all themes!
 		$themes = [];
 		$dirs = new \DirectoryIterator(\OC::$SERVERROOT.'/themes/');
-		foreach($dirs as $dir) {
+		foreach ($dirs as $dir) {
 			//Valid theme dir
 			if ($dir->isFile() || $dir->isDot()) {
 				continue;
 			}
 
 			$theme = $dir->getFilename();
-			$themeDir = $dir->getPath() . '/' . $theme . '/core/img/filetypes/';
+			$themeDir = $dir->getPath().'/'.$theme.'/core/img/filetypes/';
 			// Check if this theme has its own filetype icons
 			if (!file_exists($themeDir)) {
 				continue;
@@ -116,9 +116,9 @@ 
 * To regenerate this file run ./occ maintenance:mimetype:update-js
 */
 OC.MimeTypeList={
-	aliases: ' . json_encode($aliases, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . ',
-	files: ' . json_encode($files, JSON_PRETTY_PRINT) . ',
-	themes: ' . json_encode($themes, JSON_PRETTY_PRINT) . '
+	aliases: ' . json_encode($aliases, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES).',
+	files: ' . json_encode($files, JSON_PRETTY_PRINT).',
+	themes: ' . json_encode($themes, JSON_PRETTY_PRINT).'
 };
 ';