Passed
Push — master ( a54144...fce1dd )
by Morris
12:27 queued 11s
created
core/Command/Status.php 1 patch
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -28,23 +28,23 @@
 block discarded – undo
28 28
 use Symfony\Component\Console\Output\OutputInterface;
29 29
 
30 30
 class Status extends Base {
31
-	protected function configure() {
32
-		parent::configure();
31
+    protected function configure() {
32
+        parent::configure();
33 33
 
34
-		$this
35
-			->setName('status')
36
-			->setDescription('show some status information')
37
-		;
38
-	}
34
+        $this
35
+            ->setName('status')
36
+            ->setDescription('show some status information')
37
+        ;
38
+    }
39 39
 
40
-	protected function execute(InputInterface $input, OutputInterface $output) {
41
-		$values = array(
42
-			'installed' => (bool) \OC::$server->getConfig()->getSystemValue('installed', false),
43
-			'version' => implode('.', \OCP\Util::getVersion()),
44
-			'versionstring' => \OC_Util::getVersionString(),
45
-			'edition' => '',
46
-		);
40
+    protected function execute(InputInterface $input, OutputInterface $output) {
41
+        $values = array(
42
+            'installed' => (bool) \OC::$server->getConfig()->getSystemValue('installed', false),
43
+            'version' => implode('.', \OCP\Util::getVersion()),
44
+            'versionstring' => \OC_Util::getVersionString(),
45
+            'edition' => '',
46
+        );
47 47
 
48
-		$this->writeArrayInOutputFormat($input, $output, $values);
49
-	}
48
+        $this->writeArrayInOutputFormat($input, $output, $values);
49
+    }
50 50
 }
Please login to merge, or discard this patch.
core/Command/Maintenance/DataFingerprint.php 1 patch
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -30,25 +30,25 @@
 block discarded – undo
30 30
 
31 31
 class DataFingerprint extends Command {
32 32
 
33
-	/** @var IConfig */
34
-	protected $config;
35
-	/** @var ITimeFactory */
36
-	protected $timeFactory;
33
+    /** @var IConfig */
34
+    protected $config;
35
+    /** @var ITimeFactory */
36
+    protected $timeFactory;
37 37
 
38
-	public function __construct(IConfig $config,
39
-								ITimeFactory $timeFactory) {
40
-		$this->config = $config;
41
-		$this->timeFactory = $timeFactory;
42
-		parent::__construct();
43
-	}
38
+    public function __construct(IConfig $config,
39
+                                ITimeFactory $timeFactory) {
40
+        $this->config = $config;
41
+        $this->timeFactory = $timeFactory;
42
+        parent::__construct();
43
+    }
44 44
 
45
-	protected function configure() {
46
-		$this
47
-			->setName('maintenance:data-fingerprint')
48
-			->setDescription('update the systems data-fingerprint after a backup is restored');
49
-	}
45
+    protected function configure() {
46
+        $this
47
+            ->setName('maintenance:data-fingerprint')
48
+            ->setDescription('update the systems data-fingerprint after a backup is restored');
49
+    }
50 50
 
51
-	protected function execute(InputInterface $input, OutputInterface $output) {
52
-		$this->config->setSystemValue('data-fingerprint', md5($this->timeFactory->getTime()));
53
-	}
51
+    protected function execute(InputInterface $input, OutputInterface $output) {
52
+        $this->config->setSystemValue('data-fingerprint', md5($this->timeFactory->getTime()));
53
+    }
54 54
 }
Please login to merge, or discard this patch.
core/Command/Maintenance/Repair.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -132,16 +132,16 @@
 block discarded – undo
132 132
 				$this->output->writeln('');
133 133
 				break;
134 134
 			case '\OC\Repair::step':
135
-				$this->output->writeln(' - ' . $event->getArgument(0));
135
+				$this->output->writeln(' - '.$event->getArgument(0));
136 136
 				break;
137 137
 			case '\OC\Repair::info':
138
-				$this->output->writeln('     - ' . $event->getArgument(0));
138
+				$this->output->writeln('     - '.$event->getArgument(0));
139 139
 				break;
140 140
 			case '\OC\Repair::warning':
141
-				$this->output->writeln('     - WARNING: ' . $event->getArgument(0));
141
+				$this->output->writeln('     - WARNING: '.$event->getArgument(0));
142 142
 				break;
143 143
 			case '\OC\Repair::error':
144
-				$this->output->writeln('     - ERROR: ' . $event->getArgument(0));
144
+				$this->output->writeln('     - ERROR: '.$event->getArgument(0));
145 145
 				break;
146 146
 		}
147 147
 	}
Please login to merge, or discard this patch.
Indentation   +104 added lines, -104 removed lines patch added patch discarded remove patch
@@ -38,119 +38,119 @@
 block discarded – undo
38 38
 use Symfony\Component\EventDispatcher\GenericEvent;
39 39
 
40 40
 class Repair extends Command {
41
-	/** @var \OC\Repair $repair */
42
-	protected $repair;
43
-	/** @var IConfig */
44
-	protected $config;
45
-	/** @var EventDispatcherInterface */
46
-	private $dispatcher;
47
-	/** @var ProgressBar */
48
-	private $progress;
49
-	/** @var OutputInterface */
50
-	private $output;
51
-	/** @var IAppManager */
52
-	private $appManager;
41
+    /** @var \OC\Repair $repair */
42
+    protected $repair;
43
+    /** @var IConfig */
44
+    protected $config;
45
+    /** @var EventDispatcherInterface */
46
+    private $dispatcher;
47
+    /** @var ProgressBar */
48
+    private $progress;
49
+    /** @var OutputInterface */
50
+    private $output;
51
+    /** @var IAppManager */
52
+    private $appManager;
53 53
 
54
-	/**
55
-	 * @param \OC\Repair $repair
56
-	 * @param IConfig $config
57
-	 * @param EventDispatcherInterface $dispatcher
58
-	 * @param IAppManager $appManager
59
-	 */
60
-	public function __construct(\OC\Repair $repair, IConfig $config, EventDispatcherInterface $dispatcher, IAppManager $appManager) {
61
-		$this->repair = $repair;
62
-		$this->config = $config;
63
-		$this->dispatcher = $dispatcher;
64
-		$this->appManager = $appManager;
65
-		parent::__construct();
66
-	}
54
+    /**
55
+     * @param \OC\Repair $repair
56
+     * @param IConfig $config
57
+     * @param EventDispatcherInterface $dispatcher
58
+     * @param IAppManager $appManager
59
+     */
60
+    public function __construct(\OC\Repair $repair, IConfig $config, EventDispatcherInterface $dispatcher, IAppManager $appManager) {
61
+        $this->repair = $repair;
62
+        $this->config = $config;
63
+        $this->dispatcher = $dispatcher;
64
+        $this->appManager = $appManager;
65
+        parent::__construct();
66
+    }
67 67
 
68
-	protected function configure() {
69
-		$this
70
-			->setName('maintenance:repair')
71
-			->setDescription('repair this installation')
72
-			->addOption(
73
-				'include-expensive',
74
-				null,
75
-				InputOption::VALUE_NONE,
76
-				'Use this option when you want to include resource and load expensive tasks');
77
-	}
68
+    protected function configure() {
69
+        $this
70
+            ->setName('maintenance:repair')
71
+            ->setDescription('repair this installation')
72
+            ->addOption(
73
+                'include-expensive',
74
+                null,
75
+                InputOption::VALUE_NONE,
76
+                'Use this option when you want to include resource and load expensive tasks');
77
+    }
78 78
 
79
-	protected function execute(InputInterface $input, OutputInterface $output) {
80
-		$repairSteps = $this->repair::getRepairSteps();
79
+    protected function execute(InputInterface $input, OutputInterface $output) {
80
+        $repairSteps = $this->repair::getRepairSteps();
81 81
 
82
-		if ($input->getOption('include-expensive')) {
83
-			$repairSteps = array_merge($repairSteps, $this->repair::getExpensiveRepairSteps());
84
-		}
82
+        if ($input->getOption('include-expensive')) {
83
+            $repairSteps = array_merge($repairSteps, $this->repair::getExpensiveRepairSteps());
84
+        }
85 85
 
86
-		foreach ($repairSteps as $step) {
87
-			$this->repair->addStep($step);
88
-		}
86
+        foreach ($repairSteps as $step) {
87
+            $this->repair->addStep($step);
88
+        }
89 89
 
90
-		$apps = $this->appManager->getInstalledApps();
91
-		foreach ($apps as $app) {
92
-			if (!$this->appManager->isEnabledForUser($app)) {
93
-				continue;
94
-			}
95
-			$info = \OC_App::getAppInfo($app);
96
-			if (!is_array($info)) {
97
-				continue;
98
-			}
99
-			$steps = $info['repair-steps']['post-migration'];
100
-			foreach ($steps as $step) {
101
-				try {
102
-					$this->repair->addStep($step);
103
-				} catch (Exception $ex) {
104
-					$output->writeln("<error>Failed to load repair step for $app: {$ex->getMessage()}</error>");
105
-				}
106
-			}
107
-		}
90
+        $apps = $this->appManager->getInstalledApps();
91
+        foreach ($apps as $app) {
92
+            if (!$this->appManager->isEnabledForUser($app)) {
93
+                continue;
94
+            }
95
+            $info = \OC_App::getAppInfo($app);
96
+            if (!is_array($info)) {
97
+                continue;
98
+            }
99
+            $steps = $info['repair-steps']['post-migration'];
100
+            foreach ($steps as $step) {
101
+                try {
102
+                    $this->repair->addStep($step);
103
+                } catch (Exception $ex) {
104
+                    $output->writeln("<error>Failed to load repair step for $app: {$ex->getMessage()}</error>");
105
+                }
106
+            }
107
+        }
108 108
 
109
-		$maintenanceMode = $this->config->getSystemValueBool('maintenance');
110
-		$this->config->setSystemValue('maintenance', true);
109
+        $maintenanceMode = $this->config->getSystemValueBool('maintenance');
110
+        $this->config->setSystemValue('maintenance', true);
111 111
 
112
-		$this->progress = new ProgressBar($output);
113
-		$this->output = $output;
114
-		$this->dispatcher->addListener('\OC\Repair::startProgress', [$this, 'handleRepairFeedBack']);
115
-		$this->dispatcher->addListener('\OC\Repair::advance', [$this, 'handleRepairFeedBack']);
116
-		$this->dispatcher->addListener('\OC\Repair::finishProgress', [$this, 'handleRepairFeedBack']);
117
-		$this->dispatcher->addListener('\OC\Repair::step', [$this, 'handleRepairFeedBack']);
118
-		$this->dispatcher->addListener('\OC\Repair::info', [$this, 'handleRepairFeedBack']);
119
-		$this->dispatcher->addListener('\OC\Repair::warning', [$this, 'handleRepairFeedBack']);
120
-		$this->dispatcher->addListener('\OC\Repair::error', [$this, 'handleRepairFeedBack']);
112
+        $this->progress = new ProgressBar($output);
113
+        $this->output = $output;
114
+        $this->dispatcher->addListener('\OC\Repair::startProgress', [$this, 'handleRepairFeedBack']);
115
+        $this->dispatcher->addListener('\OC\Repair::advance', [$this, 'handleRepairFeedBack']);
116
+        $this->dispatcher->addListener('\OC\Repair::finishProgress', [$this, 'handleRepairFeedBack']);
117
+        $this->dispatcher->addListener('\OC\Repair::step', [$this, 'handleRepairFeedBack']);
118
+        $this->dispatcher->addListener('\OC\Repair::info', [$this, 'handleRepairFeedBack']);
119
+        $this->dispatcher->addListener('\OC\Repair::warning', [$this, 'handleRepairFeedBack']);
120
+        $this->dispatcher->addListener('\OC\Repair::error', [$this, 'handleRepairFeedBack']);
121 121
 
122
-		$this->repair->run();
122
+        $this->repair->run();
123 123
 
124
-		$this->config->setSystemValue('maintenance', $maintenanceMode);
125
-	}
124
+        $this->config->setSystemValue('maintenance', $maintenanceMode);
125
+    }
126 126
 
127
-	public function handleRepairFeedBack($event) {
128
-		if (!$event instanceof GenericEvent) {
129
-			return;
130
-		}
131
-		switch ($event->getSubject()) {
132
-			case '\OC\Repair::startProgress':
133
-				$this->progress->start($event->getArgument(0));
134
-				break;
135
-			case '\OC\Repair::advance':
136
-				$this->progress->advance($event->getArgument(0));
137
-				break;
138
-			case '\OC\Repair::finishProgress':
139
-				$this->progress->finish();
140
-				$this->output->writeln('');
141
-				break;
142
-			case '\OC\Repair::step':
143
-				$this->output->writeln(' - ' . $event->getArgument(0));
144
-				break;
145
-			case '\OC\Repair::info':
146
-				$this->output->writeln('     - ' . $event->getArgument(0));
147
-				break;
148
-			case '\OC\Repair::warning':
149
-				$this->output->writeln('     - WARNING: ' . $event->getArgument(0));
150
-				break;
151
-			case '\OC\Repair::error':
152
-				$this->output->writeln('     - ERROR: ' . $event->getArgument(0));
153
-				break;
154
-		}
155
-	}
127
+    public function handleRepairFeedBack($event) {
128
+        if (!$event instanceof GenericEvent) {
129
+            return;
130
+        }
131
+        switch ($event->getSubject()) {
132
+            case '\OC\Repair::startProgress':
133
+                $this->progress->start($event->getArgument(0));
134
+                break;
135
+            case '\OC\Repair::advance':
136
+                $this->progress->advance($event->getArgument(0));
137
+                break;
138
+            case '\OC\Repair::finishProgress':
139
+                $this->progress->finish();
140
+                $this->output->writeln('');
141
+                break;
142
+            case '\OC\Repair::step':
143
+                $this->output->writeln(' - ' . $event->getArgument(0));
144
+                break;
145
+            case '\OC\Repair::info':
146
+                $this->output->writeln('     - ' . $event->getArgument(0));
147
+                break;
148
+            case '\OC\Repair::warning':
149
+                $this->output->writeln('     - WARNING: ' . $event->getArgument(0));
150
+                break;
151
+            case '\OC\Repair::error':
152
+                $this->output->writeln('     - ERROR: ' . $event->getArgument(0));
153
+                break;
154
+        }
155
+    }
156 156
 }
Please login to merge, or discard this patch.
core/Command/Maintenance/Mimetype/UpdateDB.php 1 patch
Indentation   +53 added lines, -53 removed lines patch added patch discarded remove patch
@@ -32,67 +32,67 @@
 block discarded – undo
32 32
 
33 33
 class UpdateDB extends Command {
34 34
 
35
-	const DEFAULT_MIMETYPE = 'application/octet-stream';
35
+    const DEFAULT_MIMETYPE = 'application/octet-stream';
36 36
 
37
-	/** @var IMimeTypeDetector */
38
-	protected $mimetypeDetector;
37
+    /** @var IMimeTypeDetector */
38
+    protected $mimetypeDetector;
39 39
 
40
-	/** @var IMimeTypeLoader */
41
-	protected $mimetypeLoader;
40
+    /** @var IMimeTypeLoader */
41
+    protected $mimetypeLoader;
42 42
 
43
-	public function __construct(
44
-		IMimeTypeDetector $mimetypeDetector,
45
-		IMimeTypeLoader $mimetypeLoader
46
-	) {
47
-		parent::__construct();
48
-		$this->mimetypeDetector = $mimetypeDetector;
49
-		$this->mimetypeLoader = $mimetypeLoader;
50
-	}
43
+    public function __construct(
44
+        IMimeTypeDetector $mimetypeDetector,
45
+        IMimeTypeLoader $mimetypeLoader
46
+    ) {
47
+        parent::__construct();
48
+        $this->mimetypeDetector = $mimetypeDetector;
49
+        $this->mimetypeLoader = $mimetypeLoader;
50
+    }
51 51
 
52
-	protected function configure() {
53
-		$this
54
-			->setName('maintenance:mimetype:update-db')
55
-			->setDescription('Update database mimetypes and update filecache')
56
-			->addOption(
57
-				'repair-filecache',
58
-				null,
59
-				InputOption::VALUE_NONE,
60
-				'Repair filecache for all mimetypes, not just new ones'
61
-			)
62
-		;
63
-	}
52
+    protected function configure() {
53
+        $this
54
+            ->setName('maintenance:mimetype:update-db')
55
+            ->setDescription('Update database mimetypes and update filecache')
56
+            ->addOption(
57
+                'repair-filecache',
58
+                null,
59
+                InputOption::VALUE_NONE,
60
+                'Repair filecache for all mimetypes, not just new ones'
61
+            )
62
+        ;
63
+    }
64 64
 
65
-	protected function execute(InputInterface $input, OutputInterface $output) {
66
-		$mappings = $this->mimetypeDetector->getAllMappings();
65
+    protected function execute(InputInterface $input, OutputInterface $output) {
66
+        $mappings = $this->mimetypeDetector->getAllMappings();
67 67
 
68
-		$totalFilecacheUpdates = 0;
69
-		$totalNewMimetypes = 0;
68
+        $totalFilecacheUpdates = 0;
69
+        $totalNewMimetypes = 0;
70 70
 
71
-		foreach ($mappings as $ext => $mimetypes) {
72
-			if ($ext[0] === '_') {
73
-				// comment
74
-				continue;
75
-			}
76
-			$mimetype = $mimetypes[0];
77
-			$existing = $this->mimetypeLoader->exists($mimetype);
78
-			// this will add the mimetype if it didn't exist
79
-			$mimetypeId = $this->mimetypeLoader->getId($mimetype);
71
+        foreach ($mappings as $ext => $mimetypes) {
72
+            if ($ext[0] === '_') {
73
+                // comment
74
+                continue;
75
+            }
76
+            $mimetype = $mimetypes[0];
77
+            $existing = $this->mimetypeLoader->exists($mimetype);
78
+            // this will add the mimetype if it didn't exist
79
+            $mimetypeId = $this->mimetypeLoader->getId($mimetype);
80 80
 
81
-			if (!$existing) {
82
-				$output->writeln('Added mimetype "'.$mimetype.'" to database');
83
-				$totalNewMimetypes++;
84
-			}
81
+            if (!$existing) {
82
+                $output->writeln('Added mimetype "'.$mimetype.'" to database');
83
+                $totalNewMimetypes++;
84
+            }
85 85
 
86
-			if (!$existing || $input->getOption('repair-filecache')) {
87
-				$touchedFilecacheRows = $this->mimetypeLoader->updateFilecache($ext, $mimetypeId);
88
-				if ($touchedFilecacheRows > 0) {
89
-					$output->writeln('Updated '.$touchedFilecacheRows.' filecache rows for mimetype "'.$mimetype.'"');
90
-				}
91
-				$totalFilecacheUpdates += $touchedFilecacheRows;
92
-			}
93
-		}
86
+            if (!$existing || $input->getOption('repair-filecache')) {
87
+                $touchedFilecacheRows = $this->mimetypeLoader->updateFilecache($ext, $mimetypeId);
88
+                if ($touchedFilecacheRows > 0) {
89
+                    $output->writeln('Updated '.$touchedFilecacheRows.' filecache rows for mimetype "'.$mimetype.'"');
90
+                }
91
+                $totalFilecacheUpdates += $touchedFilecacheRows;
92
+            }
93
+        }
94 94
 
95
-		$output->writeln('Added '.$totalNewMimetypes.' new mimetypes');
96
-		$output->writeln('Updated '.$totalFilecacheUpdates.' filecache rows');
97
-	}
95
+        $output->writeln('Added '.$totalNewMimetypes.' new mimetypes');
96
+        $output->writeln('Updated '.$totalFilecacheUpdates.' filecache rows');
97
+    }
98 98
 }
Please login to merge, or discard this patch.
core/Command/Maintenance/Mimetype/UpdateJS.php 2 patches
Indentation   +80 added lines, -80 removed lines patch added patch discarded remove patch
@@ -32,82 +32,82 @@  discard block
 block discarded – undo
32 32
 
33 33
 class UpdateJS extends Command {
34 34
 
35
-	/** @var IMimeTypeDetector */
36
-	protected $mimetypeDetector;
37
-
38
-	public function __construct(
39
-		IMimeTypeDetector $mimetypeDetector
40
-	) {
41
-		parent::__construct();
42
-		$this->mimetypeDetector = $mimetypeDetector;
43
-	}
44
-
45
-	protected function configure() {
46
-		$this
47
-			->setName('maintenance:mimetype:update-js')
48
-			->setDescription('Update mimetypelist.js');
49
-	}
50
-
51
-	protected function execute(InputInterface $input, OutputInterface $output) {
52
-		// Fetch all the aliases
53
-		$aliases = $this->mimetypeDetector->getAllAliases();
54
-
55
-		// Remove comments
56
-		$keys = array_filter(array_keys($aliases), function($k) {
57
-			return $k[0] === '_';
58
-		});
59
-		foreach($keys as $key) {
60
-			unset($aliases[$key]);
61
-		}
62
-
63
-		// Fetch all files
64
-		$dir = new \DirectoryIterator(\OC::$SERVERROOT.'/core/img/filetypes');
65
-
66
-		$files = [];
67
-		foreach($dir as $fileInfo) {
68
-			if ($fileInfo->isFile()) {
69
-				$file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
70
-				$files[] = $file;
71
-			}
72
-		}
73
-
74
-		//Remove duplicates
75
-		$files = array_values(array_unique($files));
76
-		sort($files);
77
-
78
-		// Fetch all themes!
79
-		$themes = [];
80
-		$dirs = new \DirectoryIterator(\OC::$SERVERROOT.'/themes/');
81
-		foreach($dirs as $dir) {
82
-			//Valid theme dir
83
-			if ($dir->isFile() || $dir->isDot()) {
84
-				continue;
85
-			}
86
-
87
-			$theme = $dir->getFilename();
88
-			$themeDir = $dir->getPath() . '/' . $theme . '/core/img/filetypes/';
89
-			// Check if this theme has its own filetype icons
90
-			if (!file_exists($themeDir)) {
91
-				continue;
92
-			}
93
-
94
-			$themes[$theme] = [];
95
-			// Fetch all the theme icons!
96
-			$themeIt = new \DirectoryIterator($themeDir);
97
-			foreach ($themeIt as $fileInfo) {
98
-				if ($fileInfo->isFile()) {
99
-					$file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
100
-					$themes[$theme][] = $file;
101
-				}
102
-			}
103
-
104
-			//Remove Duplicates
105
-			$themes[$theme] = array_values(array_unique($themes[$theme]));
106
-			sort($themes[$theme]);
107
-		}
108
-
109
-		//Generate the JS
110
-		$js = '/**
35
+    /** @var IMimeTypeDetector */
36
+    protected $mimetypeDetector;
37
+
38
+    public function __construct(
39
+        IMimeTypeDetector $mimetypeDetector
40
+    ) {
41
+        parent::__construct();
42
+        $this->mimetypeDetector = $mimetypeDetector;
43
+    }
44
+
45
+    protected function configure() {
46
+        $this
47
+            ->setName('maintenance:mimetype:update-js')
48
+            ->setDescription('Update mimetypelist.js');
49
+    }
50
+
51
+    protected function execute(InputInterface $input, OutputInterface $output) {
52
+        // Fetch all the aliases
53
+        $aliases = $this->mimetypeDetector->getAllAliases();
54
+
55
+        // Remove comments
56
+        $keys = array_filter(array_keys($aliases), function($k) {
57
+            return $k[0] === '_';
58
+        });
59
+        foreach($keys as $key) {
60
+            unset($aliases[$key]);
61
+        }
62
+
63
+        // Fetch all files
64
+        $dir = new \DirectoryIterator(\OC::$SERVERROOT.'/core/img/filetypes');
65
+
66
+        $files = [];
67
+        foreach($dir as $fileInfo) {
68
+            if ($fileInfo->isFile()) {
69
+                $file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
70
+                $files[] = $file;
71
+            }
72
+        }
73
+
74
+        //Remove duplicates
75
+        $files = array_values(array_unique($files));
76
+        sort($files);
77
+
78
+        // Fetch all themes!
79
+        $themes = [];
80
+        $dirs = new \DirectoryIterator(\OC::$SERVERROOT.'/themes/');
81
+        foreach($dirs as $dir) {
82
+            //Valid theme dir
83
+            if ($dir->isFile() || $dir->isDot()) {
84
+                continue;
85
+            }
86
+
87
+            $theme = $dir->getFilename();
88
+            $themeDir = $dir->getPath() . '/' . $theme . '/core/img/filetypes/';
89
+            // Check if this theme has its own filetype icons
90
+            if (!file_exists($themeDir)) {
91
+                continue;
92
+            }
93
+
94
+            $themes[$theme] = [];
95
+            // Fetch all the theme icons!
96
+            $themeIt = new \DirectoryIterator($themeDir);
97
+            foreach ($themeIt as $fileInfo) {
98
+                if ($fileInfo->isFile()) {
99
+                    $file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
100
+                    $themes[$theme][] = $file;
101
+                }
102
+            }
103
+
104
+            //Remove Duplicates
105
+            $themes[$theme] = array_values(array_unique($themes[$theme]));
106
+            sort($themes[$theme]);
107
+        }
108
+
109
+        //Generate the JS
110
+        $js = '/**
111 111
 * This file is automatically generated
112 112
 * DO NOT EDIT MANUALLY!
113 113
 *
@@ -122,9 +122,9 @@  discard block
 block discarded – undo
122 122
 };
123 123
 ';
124 124
 
125
-		//Output the JS
126
-		file_put_contents(\OC::$SERVERROOT.'/core/js/mimetypelist.js', $js);
125
+        //Output the JS
126
+        file_put_contents(\OC::$SERVERROOT.'/core/js/mimetypelist.js', $js);
127 127
 
128
-		$output->writeln('<info>mimetypelist.js is updated');
129
-	}
128
+        $output->writeln('<info>mimetypelist.js is updated');
129
+    }
130 130
 }
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 		$keys = array_filter(array_keys($aliases), function($k) {
57 57
 			return $k[0] === '_';
58 58
 		});
59
-		foreach($keys as $key) {
59
+		foreach ($keys as $key) {
60 60
 			unset($aliases[$key]);
61 61
 		}
62 62
 
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 		$dir = new \DirectoryIterator(\OC::$SERVERROOT.'/core/img/filetypes');
65 65
 
66 66
 		$files = [];
67
-		foreach($dir as $fileInfo) {
67
+		foreach ($dir as $fileInfo) {
68 68
 			if ($fileInfo->isFile()) {
69 69
 				$file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
70 70
 				$files[] = $file;
@@ -78,14 +78,14 @@  discard block
 block discarded – undo
78 78
 		// Fetch all themes!
79 79
 		$themes = [];
80 80
 		$dirs = new \DirectoryIterator(\OC::$SERVERROOT.'/themes/');
81
-		foreach($dirs as $dir) {
81
+		foreach ($dirs as $dir) {
82 82
 			//Valid theme dir
83 83
 			if ($dir->isFile() || $dir->isDot()) {
84 84
 				continue;
85 85
 			}
86 86
 
87 87
 			$theme = $dir->getFilename();
88
-			$themeDir = $dir->getPath() . '/' . $theme . '/core/img/filetypes/';
88
+			$themeDir = $dir->getPath().'/'.$theme.'/core/img/filetypes/';
89 89
 			// Check if this theme has its own filetype icons
90 90
 			if (!file_exists($themeDir)) {
91 91
 				continue;
@@ -116,9 +116,9 @@  discard block
 block discarded – undo
116 116
 * To regenerate this file run ./occ maintenance:mimetype:update-js
117 117
 */
118 118
 OC.MimeTypeList={
119
-	aliases: ' . json_encode($aliases, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . ',
120
-	files: ' . json_encode($files, JSON_PRETTY_PRINT) . ',
121
-	themes: ' . json_encode($themes, JSON_PRETTY_PRINT) . '
119
+	aliases: ' . json_encode($aliases, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES).',
120
+	files: ' . json_encode($files, JSON_PRETTY_PRINT).',
121
+	themes: ' . json_encode($themes, JSON_PRETTY_PRINT).'
122 122
 };
123 123
 ';
124 124
 
Please login to merge, or discard this patch.
core/Command/App/GetPath.php 1 patch
Indentation   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -29,48 +29,48 @@
 block discarded – undo
29 29
 use Symfony\Component\Console\Output\OutputInterface;
30 30
 
31 31
 class GetPath extends Base {
32
-	protected function configure() {
33
-		parent::configure();
32
+    protected function configure() {
33
+        parent::configure();
34 34
 
35
-		$this
36
-			->setName('app:getpath')
37
-			->setDescription('Get an absolute path to the app directory')
38
-			->addArgument(
39
-				'app',
40
-				InputArgument::REQUIRED,
41
-				'Name of the app'
42
-			)
43
-		;
44
-	}
35
+        $this
36
+            ->setName('app:getpath')
37
+            ->setDescription('Get an absolute path to the app directory')
38
+            ->addArgument(
39
+                'app',
40
+                InputArgument::REQUIRED,
41
+                'Name of the app'
42
+            )
43
+        ;
44
+    }
45 45
 
46
-	/**
47
-	 * Executes the current command.
48
-	 *
49
-	 * @param InputInterface  $input  An InputInterface instance
50
-	 * @param OutputInterface $output An OutputInterface instance
51
-	 * @return null|int null or 0 if everything went fine, or an error code
52
-	 */
53
-	protected function execute(InputInterface $input, OutputInterface $output) {
54
-		$appName = $input->getArgument('app');
55
-		$path = \OC_App::getAppPath($appName);
56
-		if ($path !== false) {
57
-			$output->writeln($path);
58
-			return 0;
59
-		}
46
+    /**
47
+     * Executes the current command.
48
+     *
49
+     * @param InputInterface  $input  An InputInterface instance
50
+     * @param OutputInterface $output An OutputInterface instance
51
+     * @return null|int null or 0 if everything went fine, or an error code
52
+     */
53
+    protected function execute(InputInterface $input, OutputInterface $output) {
54
+        $appName = $input->getArgument('app');
55
+        $path = \OC_App::getAppPath($appName);
56
+        if ($path !== false) {
57
+            $output->writeln($path);
58
+            return 0;
59
+        }
60 60
 
61
-		// App not found, exit with non-zero
62
-		return 1;
63
-	}
61
+        // App not found, exit with non-zero
62
+        return 1;
63
+    }
64 64
 
65
-	/**
66
-	 * @param string $argumentName
67
-	 * @param CompletionContext $context
68
-	 * @return string[]
69
-	 */
70
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
71
-		if ($argumentName === 'app') {
72
-			return \OC_App::getAllApps();
73
-		}
74
-		return [];
75
-	}
65
+    /**
66
+     * @param string $argumentName
67
+     * @param CompletionContext $context
68
+     * @return string[]
69
+     */
70
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
71
+        if ($argumentName === 'app') {
72
+            return \OC_App::getAllApps();
73
+        }
74
+        return [];
75
+    }
76 76
 }
Please login to merge, or discard this patch.
core/Command/Encryption/ShowKeyStorageRoot.php 2 patches
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -30,30 +30,30 @@
 block discarded – undo
30 30
 
31 31
 class ShowKeyStorageRoot extends Command{
32 32
 
33
-	/** @var Util  */
34
-	protected $util;
35
-
36
-	/**
37
-	 * @param Util $util
38
-	 */
39
-	public function __construct(Util $util) {
40
-		parent::__construct();
41
-		$this->util = $util;
42
-	}
43
-
44
-	protected function configure() {
45
-		parent::configure();
46
-		$this
47
-			->setName('encryption:show-key-storage-root')
48
-			->setDescription('Show current key storage root');
49
-	}
50
-
51
-	protected function execute(InputInterface $input, OutputInterface $output) {
52
-		$currentRoot = $this->util->getKeyStorageRoot();
53
-
54
-		$rootDescription = $currentRoot !== '' ? $currentRoot : 'default storage location (data/)';
55
-
56
-		$output->writeln("Current key storage root:  <info>$rootDescription</info>");
57
-	}
33
+    /** @var Util  */
34
+    protected $util;
35
+
36
+    /**
37
+     * @param Util $util
38
+     */
39
+    public function __construct(Util $util) {
40
+        parent::__construct();
41
+        $this->util = $util;
42
+    }
43
+
44
+    protected function configure() {
45
+        parent::configure();
46
+        $this
47
+            ->setName('encryption:show-key-storage-root')
48
+            ->setDescription('Show current key storage root');
49
+    }
50
+
51
+    protected function execute(InputInterface $input, OutputInterface $output) {
52
+        $currentRoot = $this->util->getKeyStorageRoot();
53
+
54
+        $rootDescription = $currentRoot !== '' ? $currentRoot : 'default storage location (data/)';
55
+
56
+        $output->writeln("Current key storage root:  <info>$rootDescription</info>");
57
+    }
58 58
 
59 59
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
 use Symfony\Component\Console\Input\InputInterface;
29 29
 use Symfony\Component\Console\Output\OutputInterface;
30 30
 
31
-class ShowKeyStorageRoot extends Command{
31
+class ShowKeyStorageRoot extends Command {
32 32
 
33 33
 	/** @var Util  */
34 34
 	protected $util;
Please login to merge, or discard this patch.
core/Command/Encryption/Enable.php 2 patches
Indentation   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -29,51 +29,51 @@
 block discarded – undo
29 29
 use Symfony\Component\Console\Output\OutputInterface;
30 30
 
31 31
 class Enable extends Command {
32
-	/** @var IConfig */
33
-	protected $config;
32
+    /** @var IConfig */
33
+    protected $config;
34 34
 
35
-	/** @var IManager */
36
-	protected $encryptionManager;
35
+    /** @var IManager */
36
+    protected $encryptionManager;
37 37
 
38
-	/**
39
-	 * @param IConfig $config
40
-	 * @param IManager $encryptionManager
41
-	 */
42
-	public function __construct(IConfig $config, IManager $encryptionManager) {
43
-		parent::__construct();
38
+    /**
39
+     * @param IConfig $config
40
+     * @param IManager $encryptionManager
41
+     */
42
+    public function __construct(IConfig $config, IManager $encryptionManager) {
43
+        parent::__construct();
44 44
 
45
-		$this->encryptionManager = $encryptionManager;
46
-		$this->config = $config;
47
-	}
45
+        $this->encryptionManager = $encryptionManager;
46
+        $this->config = $config;
47
+    }
48 48
 
49
-	protected function configure() {
50
-		$this
51
-			->setName('encryption:enable')
52
-			->setDescription('Enable encryption')
53
-		;
54
-	}
49
+    protected function configure() {
50
+        $this
51
+            ->setName('encryption:enable')
52
+            ->setDescription('Enable encryption')
53
+        ;
54
+    }
55 55
 
56
-	protected function execute(InputInterface $input, OutputInterface $output) {
57
-		if ($this->config->getAppValue('core', 'encryption_enabled', 'no') === 'yes') {
58
-			$output->writeln('Encryption is already enabled');
59
-		} else {
60
-			$this->config->setAppValue('core', 'encryption_enabled', 'yes');
61
-			$output->writeln('<info>Encryption enabled</info>');
62
-		}
63
-		$output->writeln('');
56
+    protected function execute(InputInterface $input, OutputInterface $output) {
57
+        if ($this->config->getAppValue('core', 'encryption_enabled', 'no') === 'yes') {
58
+            $output->writeln('Encryption is already enabled');
59
+        } else {
60
+            $this->config->setAppValue('core', 'encryption_enabled', 'yes');
61
+            $output->writeln('<info>Encryption enabled</info>');
62
+        }
63
+        $output->writeln('');
64 64
 
65
-		$modules = $this->encryptionManager->getEncryptionModules();
66
-		if (empty($modules)) {
67
-			$output->writeln('<error>No encryption module is loaded</error>');
68
-		} else {
69
-			$defaultModule = $this->config->getAppValue('core', 'default_encryption_module', null);
70
-			if ($defaultModule === null) {
71
-				$output->writeln('<error>No default module is set</error>');
72
-			} else if (!isset($modules[$defaultModule])) {
73
-				$output->writeln('<error>The current default module does not exist: ' . $defaultModule . '</error>');
74
-			} else {
75
-				$output->writeln('Default module: ' . $defaultModule);
76
-			}
77
-		}
78
-	}
65
+        $modules = $this->encryptionManager->getEncryptionModules();
66
+        if (empty($modules)) {
67
+            $output->writeln('<error>No encryption module is loaded</error>');
68
+        } else {
69
+            $defaultModule = $this->config->getAppValue('core', 'default_encryption_module', null);
70
+            if ($defaultModule === null) {
71
+                $output->writeln('<error>No default module is set</error>');
72
+            } else if (!isset($modules[$defaultModule])) {
73
+                $output->writeln('<error>The current default module does not exist: ' . $defaultModule . '</error>');
74
+            } else {
75
+                $output->writeln('Default module: ' . $defaultModule);
76
+            }
77
+        }
78
+    }
79 79
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -70,9 +70,9 @@
 block discarded – undo
70 70
 			if ($defaultModule === null) {
71 71
 				$output->writeln('<error>No default module is set</error>');
72 72
 			} else if (!isset($modules[$defaultModule])) {
73
-				$output->writeln('<error>The current default module does not exist: ' . $defaultModule . '</error>');
73
+				$output->writeln('<error>The current default module does not exist: '.$defaultModule.'</error>');
74 74
 			} else {
75
-				$output->writeln('Default module: ' . $defaultModule);
75
+				$output->writeln('Default module: '.$defaultModule);
76 76
 			}
77 77
 		}
78 78
 	}
Please login to merge, or discard this patch.
core/Command/Encryption/Disable.php 1 patch
Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -28,30 +28,30 @@
 block discarded – undo
28 28
 use Symfony\Component\Console\Output\OutputInterface;
29 29
 
30 30
 class Disable extends Command {
31
-	/** @var IConfig */
32
-	protected $config;
31
+    /** @var IConfig */
32
+    protected $config;
33 33
 
34
-	/**
35
-	 * @param IConfig $config
36
-	 */
37
-	public function __construct(IConfig $config) {
38
-		parent::__construct();
39
-		$this->config = $config;
40
-	}
34
+    /**
35
+     * @param IConfig $config
36
+     */
37
+    public function __construct(IConfig $config) {
38
+        parent::__construct();
39
+        $this->config = $config;
40
+    }
41 41
 
42
-	protected function configure() {
43
-		$this
44
-			->setName('encryption:disable')
45
-			->setDescription('Disable encryption')
46
-		;
47
-	}
42
+    protected function configure() {
43
+        $this
44
+            ->setName('encryption:disable')
45
+            ->setDescription('Disable encryption')
46
+        ;
47
+    }
48 48
 
49
-	protected function execute(InputInterface $input, OutputInterface $output) {
50
-		if ($this->config->getAppValue('core', 'encryption_enabled', 'no') !== 'yes') {
51
-			$output->writeln('Encryption is already disabled');
52
-		} else {
53
-			$this->config->setAppValue('core', 'encryption_enabled', 'no');
54
-			$output->writeln('<info>Encryption disabled</info>');
55
-		}
56
-	}
49
+    protected function execute(InputInterface $input, OutputInterface $output) {
50
+        if ($this->config->getAppValue('core', 'encryption_enabled', 'no') !== 'yes') {
51
+            $output->writeln('Encryption is already disabled');
52
+        } else {
53
+            $this->config->setAppValue('core', 'encryption_enabled', 'no');
54
+            $output->writeln('<info>Encryption disabled</info>');
55
+        }
56
+    }
57 57
 }
Please login to merge, or discard this patch.