nextcloud / server

core/Command/TwoFactorAuth/Disable.php

Indentation +25 added lines, -25 removed lines

@@ -30,35 +30,35 @@
 
 class Disable extends Base {
 
-	/** @var Manager */
-	private $manager;
+    /** @var Manager */
+    private $manager;
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	public function __construct(Manager $manager, IUserManager $userManager) {
-		parent::__construct('twofactorauth:disable');
-		$this->manager = $manager;
-		$this->userManager = $userManager;
-	}
+    public function __construct(Manager $manager, IUserManager $userManager) {
+        parent::__construct('twofactorauth:disable');
+        $this->manager = $manager;
+        $this->userManager = $userManager;
+    }
 
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this->setName('twofactorauth:disable');
-		$this->setDescription('Disable two-factor authentication for a user');
-		$this->addArgument('uid', InputArgument::REQUIRED);
-	}
+        $this->setName('twofactorauth:disable');
+        $this->setDescription('Disable two-factor authentication for a user');
+        $this->addArgument('uid', InputArgument::REQUIRED);
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$uid = $input->getArgument('uid');
-		$user = $this->userManager->get($uid);
-		if (is_null($user)) {
-			$output->writeln("<error>Invalid UID</error>");
-			return;
-		}
-		$this->manager->disableTwoFactorAuthentication($user);
-		$output->writeln("Two-factor authentication disabled for user $uid");
-	}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $uid = $input->getArgument('uid');
+        $user = $this->userManager->get($uid);
+        if (is_null($user)) {
+            $output->writeln("<error>Invalid UID</error>");
+            return;
+        }
+        $this->manager->disableTwoFactorAuthentication($user);
+        $output->writeln("Two-factor authentication disabled for user $uid");
+    }
 
 }

core/Command/Maintenance/DataFingerprint.php

Indentation +18 added lines, -18 removed lines

@@ -30,25 +30,25 @@
 
 class DataFingerprint extends Command {
 
-	/** @var IConfig */
-	protected $config;
-	/** @var ITimeFactory */
-	protected $timeFactory;
+    /** @var IConfig */
+    protected $config;
+    /** @var ITimeFactory */
+    protected $timeFactory;
 
-	public function __construct(IConfig $config,
-								ITimeFactory $timeFactory) {
-		$this->config = $config;
-		$this->timeFactory = $timeFactory;
-		parent::__construct();
-	}
+    public function __construct(IConfig $config,
+                                ITimeFactory $timeFactory) {
+        $this->config = $config;
+        $this->timeFactory = $timeFactory;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('maintenance:data-fingerprint')
-			->setDescription('update the systems data-fingerprint after a backup is restored');
-	}
+    protected function configure() {
+        $this
+            ->setName('maintenance:data-fingerprint')
+            ->setDescription('update the systems data-fingerprint after a backup is restored');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$this->config->setSystemValue('data-fingerprint', md5($this->timeFactory->getTime()));
-	}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $this->config->setSystemValue('data-fingerprint', md5($this->timeFactory->getTime()));
+    }
 }

core/Command/Maintenance/Repair.php

Spacing +4 added lines, -4 removed lines

@@ -132,16 +132,16 @@
 				$this->output->writeln('');
 				break;
 			case '\OC\Repair::step':
-				$this->output->writeln(' - ' . $event->getArgument(0));
+				$this->output->writeln(' - '.$event->getArgument(0));
 				break;
 			case '\OC\Repair::info':
-				$this->output->writeln('     - ' . $event->getArgument(0));
+				$this->output->writeln('     - '.$event->getArgument(0));
 				break;
 			case '\OC\Repair::warning':
-				$this->output->writeln('     - WARNING: ' . $event->getArgument(0));
+				$this->output->writeln('     - WARNING: '.$event->getArgument(0));
 				break;
 			case '\OC\Repair::error':
-				$this->output->writeln('     - ERROR: ' . $event->getArgument(0));
+				$this->output->writeln('     - ERROR: '.$event->getArgument(0));
 				break;
 		}
 	}

Indentation +103 added lines, -103 removed lines

@@ -38,116 +38,116 @@
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Repair extends Command {
-	/** @var \OC\Repair $repair */
-	protected $repair;
-	/** @var IConfig */
-	protected $config;
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-	/** @var ProgressBar */
-	private $progress;
-	/** @var OutputInterface */
-	private $output;
-	/** @var IAppManager */
-	private $appManager;
+    /** @var \OC\Repair $repair */
+    protected $repair;
+    /** @var IConfig */
+    protected $config;
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
+    /** @var ProgressBar */
+    private $progress;
+    /** @var OutputInterface */
+    private $output;
+    /** @var IAppManager */
+    private $appManager;
 
-	/**
-	 * @param \OC\Repair $repair
-	 * @param IConfig $config
-	 * @param EventDispatcherInterface $dispatcher
-	 * @param IAppManager $appManager
-	 */
-	public function __construct(\OC\Repair $repair, IConfig $config, EventDispatcherInterface $dispatcher, IAppManager $appManager) {
-		$this->repair = $repair;
-		$this->config = $config;
-		$this->dispatcher = $dispatcher;
-		$this->appManager = $appManager;
-		parent::__construct();
-	}
+    /**
+     * @param \OC\Repair $repair
+     * @param IConfig $config
+     * @param EventDispatcherInterface $dispatcher
+     * @param IAppManager $appManager
+     */
+    public function __construct(\OC\Repair $repair, IConfig $config, EventDispatcherInterface $dispatcher, IAppManager $appManager) {
+        $this->repair = $repair;
+        $this->config = $config;
+        $this->dispatcher = $dispatcher;
+        $this->appManager = $appManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('maintenance:repair')
-			->setDescription('repair this installation')
-			->addOption(
-				'include-expensive',
-				null,
-				InputOption::VALUE_NONE,
-				'Use this option when you want to include resource and load expensive tasks');
-	}
+    protected function configure() {
+        $this
+            ->setName('maintenance:repair')
+            ->setDescription('repair this installation')
+            ->addOption(
+                'include-expensive',
+                null,
+                InputOption::VALUE_NONE,
+                'Use this option when you want to include resource and load expensive tasks');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$includeExpensive = $input->getOption('include-expensive');
-		if ($includeExpensive) {
-			foreach ($this->repair->getExpensiveRepairSteps() as $step) {
-				$this->repair->addStep($step);
-			}
-		}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $includeExpensive = $input->getOption('include-expensive');
+        if ($includeExpensive) {
+            foreach ($this->repair->getExpensiveRepairSteps() as $step) {
+                $this->repair->addStep($step);
+            }
+        }
 
-		$apps = $this->appManager->getInstalledApps();
-		foreach ($apps as $app) {
-			if (!$this->appManager->isEnabledForUser($app)) {
-				continue;
-			}
-			$info = \OC_App::getAppInfo($app);
-			if (!is_array($info)) {
-				continue;
-			}
-			$steps = $info['repair-steps']['post-migration'];
-			foreach ($steps as $step) {
-				try {
-					$this->repair->addStep($step);
-				} catch (Exception $ex) {
-					$output->writeln("<error>Failed to load repair step for $app: {$ex->getMessage()}</error>");
-				}
-			}
-		}
+        $apps = $this->appManager->getInstalledApps();
+        foreach ($apps as $app) {
+            if (!$this->appManager->isEnabledForUser($app)) {
+                continue;
+            }
+            $info = \OC_App::getAppInfo($app);
+            if (!is_array($info)) {
+                continue;
+            }
+            $steps = $info['repair-steps']['post-migration'];
+            foreach ($steps as $step) {
+                try {
+                    $this->repair->addStep($step);
+                } catch (Exception $ex) {
+                    $output->writeln("<error>Failed to load repair step for $app: {$ex->getMessage()}</error>");
+                }
+            }
+        }
 
-		$maintenanceMode = $this->config->getSystemValue('maintenance', false);
-		$this->config->setSystemValue('maintenance', true);
+        $maintenanceMode = $this->config->getSystemValue('maintenance', false);
+        $this->config->setSystemValue('maintenance', true);
 
-		$this->progress = new ProgressBar($output);
-		$this->output = $output;
-		$this->dispatcher->addListener('\OC\Repair::startProgress', [$this, 'handleRepairFeedBack']);
-		$this->dispatcher->addListener('\OC\Repair::advance', [$this, 'handleRepairFeedBack']);
-		$this->dispatcher->addListener('\OC\Repair::finishProgress', [$this, 'handleRepairFeedBack']);
-		$this->dispatcher->addListener('\OC\Repair::step', [$this, 'handleRepairFeedBack']);
-		$this->dispatcher->addListener('\OC\Repair::info', [$this, 'handleRepairFeedBack']);
-		$this->dispatcher->addListener('\OC\Repair::warning', [$this, 'handleRepairFeedBack']);
-		$this->dispatcher->addListener('\OC\Repair::error', [$this, 'handleRepairFeedBack']);
+        $this->progress = new ProgressBar($output);
+        $this->output = $output;
+        $this->dispatcher->addListener('\OC\Repair::startProgress', [$this, 'handleRepairFeedBack']);
+        $this->dispatcher->addListener('\OC\Repair::advance', [$this, 'handleRepairFeedBack']);
+        $this->dispatcher->addListener('\OC\Repair::finishProgress', [$this, 'handleRepairFeedBack']);
+        $this->dispatcher->addListener('\OC\Repair::step', [$this, 'handleRepairFeedBack']);
+        $this->dispatcher->addListener('\OC\Repair::info', [$this, 'handleRepairFeedBack']);
+        $this->dispatcher->addListener('\OC\Repair::warning', [$this, 'handleRepairFeedBack']);
+        $this->dispatcher->addListener('\OC\Repair::error', [$this, 'handleRepairFeedBack']);
 
-		$this->repair->run();
+        $this->repair->run();
 
-		$this->config->setSystemValue('maintenance', $maintenanceMode);
-	}
+        $this->config->setSystemValue('maintenance', $maintenanceMode);
+    }
 
-	public function handleRepairFeedBack($event) {
-		if (!$event instanceof GenericEvent) {
-			return;
-		}
-		switch ($event->getSubject()) {
-			case '\OC\Repair::startProgress':
-				$this->progress->start($event->getArgument(0));
-				break;
-			case '\OC\Repair::advance':
-				$this->progress->advance($event->getArgument(0));
-				break;
-			case '\OC\Repair::finishProgress':
-				$this->progress->finish();
-				$this->output->writeln('');
-				break;
-			case '\OC\Repair::step':
-				$this->output->writeln(' - ' . $event->getArgument(0));
-				break;
-			case '\OC\Repair::info':
-				$this->output->writeln('     - ' . $event->getArgument(0));
-				break;
-			case '\OC\Repair::warning':
-				$this->output->writeln('     - WARNING: ' . $event->getArgument(0));
-				break;
-			case '\OC\Repair::error':
-				$this->output->writeln('     - ERROR: ' . $event->getArgument(0));
-				break;
-		}
-	}
+    public function handleRepairFeedBack($event) {
+        if (!$event instanceof GenericEvent) {
+            return;
+        }
+        switch ($event->getSubject()) {
+            case '\OC\Repair::startProgress':
+                $this->progress->start($event->getArgument(0));
+                break;
+            case '\OC\Repair::advance':
+                $this->progress->advance($event->getArgument(0));
+                break;
+            case '\OC\Repair::finishProgress':
+                $this->progress->finish();
+                $this->output->writeln('');
+                break;
+            case '\OC\Repair::step':
+                $this->output->writeln(' - ' . $event->getArgument(0));
+                break;
+            case '\OC\Repair::info':
+                $this->output->writeln('     - ' . $event->getArgument(0));
+                break;
+            case '\OC\Repair::warning':
+                $this->output->writeln('     - WARNING: ' . $event->getArgument(0));
+                break;
+            case '\OC\Repair::error':
+                $this->output->writeln('     - ERROR: ' . $event->getArgument(0));
+                break;
+        }
+    }
 }

core/Command/Maintenance/Mimetype/UpdateDB.php

Indentation +53 added lines, -53 removed lines

@@ -32,67 +32,67 @@
 
 class UpdateDB extends Command {
 
-	const DEFAULT_MIMETYPE = 'application/octet-stream';
+    const DEFAULT_MIMETYPE = 'application/octet-stream';
 
-	/** @var IMimeTypeDetector */
-	protected $mimetypeDetector;
+    /** @var IMimeTypeDetector */
+    protected $mimetypeDetector;
 
-	/** @var IMimeTypeLoader */
-	protected $mimetypeLoader;
+    /** @var IMimeTypeLoader */
+    protected $mimetypeLoader;
 
-	public function __construct(
-		IMimeTypeDetector $mimetypeDetector,
-		IMimeTypeLoader $mimetypeLoader
-	) {
-		parent::__construct();
-		$this->mimetypeDetector = $mimetypeDetector;
-		$this->mimetypeLoader = $mimetypeLoader;
-	}
+    public function __construct(
+        IMimeTypeDetector $mimetypeDetector,
+        IMimeTypeLoader $mimetypeLoader
+    ) {
+        parent::__construct();
+        $this->mimetypeDetector = $mimetypeDetector;
+        $this->mimetypeLoader = $mimetypeLoader;
+    }
 
-	protected function configure() {
-		$this
-			->setName('maintenance:mimetype:update-db')
-			->setDescription('Update database mimetypes and update filecache')
-			->addOption(
-				'repair-filecache',
-				null,
-				InputOption::VALUE_NONE,
-				'Repair filecache for all mimetypes, not just new ones'
-			)
-		;
-	}
+    protected function configure() {
+        $this
+            ->setName('maintenance:mimetype:update-db')
+            ->setDescription('Update database mimetypes and update filecache')
+            ->addOption(
+                'repair-filecache',
+                null,
+                InputOption::VALUE_NONE,
+                'Repair filecache for all mimetypes, not just new ones'
+            )
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$mappings = $this->mimetypeDetector->getAllMappings();
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $mappings = $this->mimetypeDetector->getAllMappings();
 
-		$totalFilecacheUpdates = 0;
-		$totalNewMimetypes = 0;
+        $totalFilecacheUpdates = 0;
+        $totalNewMimetypes = 0;
 
-		foreach ($mappings as $ext => $mimetypes) {
-			if ($ext[0] === '_') {
-				// comment
-				continue;
-			}
-			$mimetype = $mimetypes[0];
-			$existing = $this->mimetypeLoader->exists($mimetype);
-			// this will add the mimetype if it didn't exist
-			$mimetypeId = $this->mimetypeLoader->getId($mimetype);
+        foreach ($mappings as $ext => $mimetypes) {
+            if ($ext[0] === '_') {
+                // comment
+                continue;
+            }
+            $mimetype = $mimetypes[0];
+            $existing = $this->mimetypeLoader->exists($mimetype);
+            // this will add the mimetype if it didn't exist
+            $mimetypeId = $this->mimetypeLoader->getId($mimetype);
 
-			if (!$existing) {
-				$output->writeln('Added mimetype "'.$mimetype.'" to database');
-				$totalNewMimetypes++;
-			}
+            if (!$existing) {
+                $output->writeln('Added mimetype "'.$mimetype.'" to database');
+                $totalNewMimetypes++;
+            }
 
-			if (!$existing || $input->getOption('repair-filecache')) {
-				$touchedFilecacheRows = $this->mimetypeLoader->updateFilecache($ext, $mimetypeId);
-				if ($touchedFilecacheRows > 0) {
-					$output->writeln('Updated '.$touchedFilecacheRows.' filecache rows for mimetype "'.$mimetype.'"');
-				}
-				$totalFilecacheUpdates += $touchedFilecacheRows;
-			}
-		}
+            if (!$existing || $input->getOption('repair-filecache')) {
+                $touchedFilecacheRows = $this->mimetypeLoader->updateFilecache($ext, $mimetypeId);
+                if ($touchedFilecacheRows > 0) {
+                    $output->writeln('Updated '.$touchedFilecacheRows.' filecache rows for mimetype "'.$mimetype.'"');
+                }
+                $totalFilecacheUpdates += $touchedFilecacheRows;
+            }
+        }
 
-		$output->writeln('Added '.$totalNewMimetypes.' new mimetypes');
-		$output->writeln('Updated '.$totalFilecacheUpdates.' filecache rows');
-	}
+        $output->writeln('Added '.$totalNewMimetypes.' new mimetypes');
+        $output->writeln('Updated '.$totalFilecacheUpdates.' filecache rows');
+    }
 }

core/Command/Maintenance/Mimetype/UpdateJS.php

Indentation +80 added lines, -80 removed lines

@@ -32,82 +32,82 @@ 
 
 class UpdateJS extends Command {
 
-	/** @var IMimeTypeDetector */
-	protected $mimetypeDetector;
-
-	public function __construct(
-		IMimeTypeDetector $mimetypeDetector
-	) {
-		parent::__construct();
-		$this->mimetypeDetector = $mimetypeDetector;
-	}
-
-	protected function configure() {
-		$this
-			->setName('maintenance:mimetype:update-js')
-			->setDescription('Update mimetypelist.js');
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		// Fetch all the aliases
-		$aliases = $this->mimetypeDetector->getAllAliases();
-
-		// Remove comments
-		$keys = array_filter(array_keys($aliases), function($k) {
-			return $k[0] === '_';
-		});
-		foreach($keys as $key) {
-			unset($aliases[$key]);
-		}
-
-		// Fetch all files
-		$dir = new \DirectoryIterator(\OC::$SERVERROOT.'/core/img/filetypes');
-
-		$files = [];
-		foreach($dir as $fileInfo) {
-			if ($fileInfo->isFile()) {
-				$file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
-				$files[] = $file;
-			}
-		}
-
-		//Remove duplicates
-		$files = array_values(array_unique($files));
-		sort($files);
-
-		// Fetch all themes!
-		$themes = [];
-		$dirs = new \DirectoryIterator(\OC::$SERVERROOT.'/themes/');
-		foreach($dirs as $dir) {
-			//Valid theme dir
-			if ($dir->isFile() || $dir->isDot()) {
-				continue;
-			}
-
-			$theme = $dir->getFilename();
-			$themeDir = $dir->getPath() . '/' . $theme . '/core/img/filetypes/';
-			// Check if this theme has its own filetype icons
-			if (!file_exists($themeDir)) {
-				continue;
-			}
-
-			$themes[$theme] = [];
-			// Fetch all the theme icons!
-			$themeIt = new \DirectoryIterator($themeDir);
-			foreach ($themeIt as $fileInfo) {
-				if ($fileInfo->isFile()) {
-					$file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
-					$themes[$theme][] = $file;
-				}
-			}
-
-			//Remove Duplicates
-			$themes[$theme] = array_values(array_unique($themes[$theme]));
-			sort($themes[$theme]);
-		}
-
-		//Generate the JS
-		$js = '/**
+    /** @var IMimeTypeDetector */
+    protected $mimetypeDetector;
+
+    public function __construct(
+        IMimeTypeDetector $mimetypeDetector
+    ) {
+        parent::__construct();
+        $this->mimetypeDetector = $mimetypeDetector;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('maintenance:mimetype:update-js')
+            ->setDescription('Update mimetypelist.js');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        // Fetch all the aliases
+        $aliases = $this->mimetypeDetector->getAllAliases();
+
+        // Remove comments
+        $keys = array_filter(array_keys($aliases), function($k) {
+            return $k[0] === '_';
+        });
+        foreach($keys as $key) {
+            unset($aliases[$key]);
+        }
+
+        // Fetch all files
+        $dir = new \DirectoryIterator(\OC::$SERVERROOT.'/core/img/filetypes');
+
+        $files = [];
+        foreach($dir as $fileInfo) {
+            if ($fileInfo->isFile()) {
+                $file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
+                $files[] = $file;
+            }
+        }
+
+        //Remove duplicates
+        $files = array_values(array_unique($files));
+        sort($files);
+
+        // Fetch all themes!
+        $themes = [];
+        $dirs = new \DirectoryIterator(\OC::$SERVERROOT.'/themes/');
+        foreach($dirs as $dir) {
+            //Valid theme dir
+            if ($dir->isFile() || $dir->isDot()) {
+                continue;
+            }
+
+            $theme = $dir->getFilename();
+            $themeDir = $dir->getPath() . '/' . $theme . '/core/img/filetypes/';
+            // Check if this theme has its own filetype icons
+            if (!file_exists($themeDir)) {
+                continue;
+            }
+
+            $themes[$theme] = [];
+            // Fetch all the theme icons!
+            $themeIt = new \DirectoryIterator($themeDir);
+            foreach ($themeIt as $fileInfo) {
+                if ($fileInfo->isFile()) {
+                    $file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
+                    $themes[$theme][] = $file;
+                }
+            }
+
+            //Remove Duplicates
+            $themes[$theme] = array_values(array_unique($themes[$theme]));
+            sort($themes[$theme]);
+        }
+
+        //Generate the JS
+        $js = '/**
 * This file is automatically generated
 * DO NOT EDIT MANUALLY!
 *
@@ -122,9 +122,9 @@ 
 };
 ';
 
-		//Output the JS
-		file_put_contents(\OC::$SERVERROOT.'/core/js/mimetypelist.js', $js);
+        //Output the JS
+        file_put_contents(\OC::$SERVERROOT.'/core/js/mimetypelist.js', $js);
 
-		$output->writeln('<info>mimetypelist.js is updated');
-	}
+        $output->writeln('<info>mimetypelist.js is updated');
+    }
 }

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).'
 };
 ';
 

core/Command/App/GetPath.php

Indentation +40 added lines, -40 removed lines

@@ -29,48 +29,48 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class GetPath extends Base {
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this
-			->setName('app:getpath')
-			->setDescription('Get an absolute path to the app directory')
-			->addArgument(
-				'app',
-				InputArgument::REQUIRED,
-				'Name of the app'
-			)
-		;
-	}
+        $this
+            ->setName('app:getpath')
+            ->setDescription('Get an absolute path to the app directory')
+            ->addArgument(
+                'app',
+                InputArgument::REQUIRED,
+                'Name of the app'
+            )
+        ;
+    }
 
-	/**
-	 * Executes the current command.
-	 *
-	 * @param InputInterface  $input  An InputInterface instance
-	 * @param OutputInterface $output An OutputInterface instance
-	 * @return null|int null or 0 if everything went fine, or an error code
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$appName = $input->getArgument('app');
-		$path = \OC_App::getAppPath($appName);
-		if ($path !== false) {
-			$output->writeln($path);
-			return 0;
-		}
+    /**
+     * Executes the current command.
+     *
+     * @param InputInterface  $input  An InputInterface instance
+     * @param OutputInterface $output An OutputInterface instance
+     * @return null|int null or 0 if everything went fine, or an error code
+     */
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $appName = $input->getArgument('app');
+        $path = \OC_App::getAppPath($appName);
+        if ($path !== false) {
+            $output->writeln($path);
+            return 0;
+        }
 
-		// App not found, exit with non-zero
-		return 1;
-	}
+        // App not found, exit with non-zero
+        return 1;
+    }
 
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app') {
-			return \OC_App::getAllApps();
-		}
-		return [];
-	}
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app') {
+            return \OC_App::getAllApps();
+        }
+        return [];
+    }
 }

core/Command/App/Enable.php

Indentation +68 added lines, -68 removed lines

@@ -37,79 +37,79 @@
 
 class Enable extends Command implements CompletionAwareInterface {
 
-	/** @var IAppManager */
-	protected $manager;
+    /** @var IAppManager */
+    protected $manager;
 
-	/**
-	 * @param IAppManager $manager
-	 */
-	public function __construct(IAppManager $manager) {
-		parent::__construct();
-		$this->manager = $manager;
-	}
+    /**
+     * @param IAppManager $manager
+     */
+    public function __construct(IAppManager $manager) {
+        parent::__construct();
+        $this->manager = $manager;
+    }
 
-	protected function configure() {
-		$this
-			->setName('app:enable')
-			->setDescription('enable an app')
-			->addArgument(
-				'app-id',
-				InputArgument::REQUIRED,
-				'enable the specified app'
-			)
-			->addOption(
-				'groups',
-				'g',
-				InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
-				'enable the app only for a list of groups'
-			)
-		;
-	}
+    protected function configure() {
+        $this
+            ->setName('app:enable')
+            ->setDescription('enable an app')
+            ->addArgument(
+                'app-id',
+                InputArgument::REQUIRED,
+                'enable the specified app'
+            )
+            ->addOption(
+                'groups',
+                'g',
+                InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
+                'enable the app only for a list of groups'
+            )
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$appId = $input->getArgument('app-id');
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $appId = $input->getArgument('app-id');
 
-		if (!\OC_App::getAppPath($appId)) {
-			$output->writeln($appId . ' not found');
-			return 1;
-		}
+        if (!\OC_App::getAppPath($appId)) {
+            $output->writeln($appId . ' not found');
+            return 1;
+        }
 
-		$groups = $input->getOption('groups');
-		$appClass = new \OC_App();
-		if (empty($groups)) {
-			$appClass->enable($appId);
-			$output->writeln($appId . ' enabled');
-		} else {
-			$appClass->enable($appId, $groups);
-			$output->writeln($appId . ' enabled for groups: ' . implode(', ', $groups));
-		}
-		return 0;
-	}
+        $groups = $input->getOption('groups');
+        $appClass = new \OC_App();
+        if (empty($groups)) {
+            $appClass->enable($appId);
+            $output->writeln($appId . ' enabled');
+        } else {
+            $appClass->enable($appId, $groups);
+            $output->writeln($appId . ' enabled for groups: ' . implode(', ', $groups));
+        }
+        return 0;
+    }
 
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		if ($optionName === 'groups') {
-			return array_map(function(IGroup $group) {
-				return $group->getGID();
-			}, \OC::$server->getGroupManager()->search($context->getCurrentWord()));
-		}
-		return [];
-	}
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        if ($optionName === 'groups') {
+            return array_map(function(IGroup $group) {
+                return $group->getGID();
+            }, \OC::$server->getGroupManager()->search($context->getCurrentWord()));
+        }
+        return [];
+    }
 
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app-id') {
-			$allApps = \OC_App::getAllApps();
-			return array_diff($allApps, \OC_App::getEnabledApps(true, true));
-		}
-		return [];
-	}
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app-id') {
+            $allApps = \OC_App::getAllApps();
+            return array_diff($allApps, \OC_App::getEnabledApps(true, true));
+        }
+        return [];
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -70,7 +70,7 @@ 
 		$appId = $input->getArgument('app-id');
 
 		if (!\OC_App::getAppPath($appId)) {
-			$output->writeln($appId . ' not found');
+			$output->writeln($appId.' not found');
 			return 1;
 		}
 
@@ -78,10 +78,10 @@ 
 		$appClass = new \OC_App();
 		if (empty($groups)) {
 			$appClass->enable($appId);
-			$output->writeln($appId . ' enabled');
+			$output->writeln($appId.' enabled');
 		} else {
 			$appClass->enable($appId, $groups);
-			$output->writeln($appId . ' enabled for groups: ' . implode(', ', $groups));
+			$output->writeln($appId.' enabled for groups: '.implode(', ', $groups));
 		}
 		return 0;
 	}

core/Command/App/Disable.php

Indentation +52 added lines, -52 removed lines

@@ -35,61 +35,61 @@
 
 class Disable extends Command implements CompletionAwareInterface {
 
-	/** @var IAppManager */
-	protected $manager;
+    /** @var IAppManager */
+    protected $manager;
 
-	/**
-	 * @param IAppManager $manager
-	 */
-	public function __construct(IAppManager $manager) {
-		parent::__construct();
-		$this->manager = $manager;
-	}
+    /**
+     * @param IAppManager $manager
+     */
+    public function __construct(IAppManager $manager) {
+        parent::__construct();
+        $this->manager = $manager;
+    }
 
-	protected function configure() {
-		$this
-			->setName('app:disable')
-			->setDescription('disable an app')
-			->addArgument(
-				'app-id',
-				InputArgument::REQUIRED,
-				'disable the specified app'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('app:disable')
+            ->setDescription('disable an app')
+            ->addArgument(
+                'app-id',
+                InputArgument::REQUIRED,
+                'disable the specified app'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$appId = $input->getArgument('app-id');
-		if ($this->manager->isInstalled($appId)) {
-			try {
-				$this->manager->disableApp($appId);
-				$output->writeln($appId . ' disabled');
-			} catch(\Exception $e) {
-				$output->writeln($e->getMessage());
-				return 2;
-			}
-		} else {
-			$output->writeln('No such app enabled: ' . $appId);
-		}
-	}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $appId = $input->getArgument('app-id');
+        if ($this->manager->isInstalled($appId)) {
+            try {
+                $this->manager->disableApp($appId);
+                $output->writeln($appId . ' disabled');
+            } catch(\Exception $e) {
+                $output->writeln($e->getMessage());
+                return 2;
+            }
+        } else {
+            $output->writeln('No such app enabled: ' . $appId);
+        }
+    }
 
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		return [];
-	}
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        return [];
+    }
 
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app-id') {
-			return array_diff(\OC_App::getEnabledApps(true, true), $this->manager->getAlwaysEnabledApps());
-		}
-		return [];
-	}
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app-id') {
+            return array_diff(\OC_App::getEnabledApps(true, true), $this->manager->getAlwaysEnabledApps());
+        }
+        return [];
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -62,13 +62,13 @@
 		if ($this->manager->isInstalled($appId)) {
 			try {
 				$this->manager->disableApp($appId);
-				$output->writeln($appId . ' disabled');
-			} catch(\Exception $e) {
+				$output->writeln($appId.' disabled');
+			} catch (\Exception $e) {
 				$output->writeln($e->getMessage());
 				return 2;
 			}
 		} else {
-			$output->writeln('No such app enabled: ' . $appId);
+			$output->writeln('No such app enabled: '.$appId);
 		}
 	}
 

core/Command/Encryption/ShowKeyStorageRoot.php

Indentation +25 added lines, -25 removed lines

@@ -30,30 +30,30 @@
 
 class ShowKeyStorageRoot extends Command{
 
-	/** @var Util  */
-	protected $util;
-
-	/**
-	 * @param Util $util
-	 */
-	public function __construct(Util $util) {
-		parent::__construct();
-		$this->util = $util;
-	}
-
-	protected function configure() {
-		parent::configure();
-		$this
-			->setName('encryption:show-key-storage-root')
-			->setDescription('Show current key storage root');
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$currentRoot = $this->util->getKeyStorageRoot();
-
-		$rootDescription = $currentRoot !== '' ? $currentRoot : 'default storage location (data/)';
-
-		$output->writeln("Current key storage root:  <info>$rootDescription</info>");
-	}
+    /** @var Util  */
+    protected $util;
+
+    /**
+     * @param Util $util
+     */
+    public function __construct(Util $util) {
+        parent::__construct();
+        $this->util = $util;
+    }
+
+    protected function configure() {
+        parent::configure();
+        $this
+            ->setName('encryption:show-key-storage-root')
+            ->setDescription('Show current key storage root');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $currentRoot = $this->util->getKeyStorageRoot();
+
+        $rootDescription = $currentRoot !== '' ? $currentRoot : 'default storage location (data/)';
+
+        $output->writeln("Current key storage root:  <info>$rootDescription</info>");
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class ShowKeyStorageRoot extends Command{
+class ShowKeyStorageRoot extends Command {
 
 	/** @var Util  */
 	protected $util;