Inspection of "Merge pull request #10198 from tml1024/master" - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( c7f808...7a5768 )

by Morris

created 2018-07-13 14:21 UTC

Status

Indentation +60 added lines, -60 removed lines patch added patch discarded remove patch

@@ -28,83 +28,83 @@
 block discarded – undo
 use OCP\ILogger;
 
 abstract class Office extends Provider {
-	private $cmd;
+    private $cmd;
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
-		$this->initCmd();
-		if (is_null($this->cmd)) {
-			return false;
-		}
+    /**
+     * {@inheritDoc}
+     */
+    public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
+        $this->initCmd();
+        if (is_null($this->cmd)) {
+            return false;
+        }
 
-		$absPath = $fileview->toTmpFile($path);
+        $absPath = $fileview->toTmpFile($path);
 
-		$tmpDir = \OC::$server->getTempManager()->getTempBaseDir();
+        $tmpDir = \OC::$server->getTempManager()->getTempBaseDir();
 
-		$defaultParameters = ' -env:UserInstallation=file://' . escapeshellarg($tmpDir . '/owncloud-' . \OC_Util::getInstanceId() . '/') . ' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to png --outdir ';
-		$clParameters = \OC::$server->getConfig()->getSystemValue('preview_office_cl_parameters', $defaultParameters);
+        $defaultParameters = ' -env:UserInstallation=file://' . escapeshellarg($tmpDir . '/owncloud-' . \OC_Util::getInstanceId() . '/') . ' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to png --outdir ';
+        $clParameters = \OC::$server->getConfig()->getSystemValue('preview_office_cl_parameters', $defaultParameters);
 
-		$exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath);
+        $exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath);
 
-		shell_exec($exec);
+        shell_exec($exec);
 
-		//create imagick object from png
-		$pngPreview = null;
-		try {
-			list($dirname, , , $filename) = array_values(pathinfo($absPath));
-			$pngPreview = $dirname . '/' . $filename . '.png';
+        //create imagick object from png
+        $pngPreview = null;
+        try {
+            list($dirname, , , $filename) = array_values(pathinfo($absPath));
+            $pngPreview = $dirname . '/' . $filename . '.png';
 
-			$png = new \imagick($pngPreview . '[0]');
-			$png->setImageFormat('jpg');
-		} catch (\Exception $e) {
-			unlink($absPath);
-			unlink($pngPreview);
-			\OC::$server->getLogger()->logException($e, [
-				'level' => ILogger::ERROR,
-				'app' => 'core',
-			]);
-			return false;
-		}
+            $png = new \imagick($pngPreview . '[0]');
+            $png->setImageFormat('jpg');
+        } catch (\Exception $e) {
+            unlink($absPath);
+            unlink($pngPreview);
+            \OC::$server->getLogger()->logException($e, [
+                'level' => ILogger::ERROR,
+                'app' => 'core',
+            ]);
+            return false;
+        }
 
-		$image = new \OC_Image();
-		$image->loadFromData($png);
+        $image = new \OC_Image();
+        $image->loadFromData($png);
 
-		unlink($absPath);
-		unlink($pngPreview);
+        unlink($absPath);
+        unlink($pngPreview);
 
-		if ($image->valid()) {
-			$image->scaleDownToFit($maxX, $maxY);
+        if ($image->valid()) {
+            $image->scaleDownToFit($maxX, $maxY);
 
-			return $image;
-		}
-		return false;
+            return $image;
+        }
+        return false;
 
-	}
+    }
 
-	private function initCmd() {
-		$cmd = '';
+    private function initCmd() {
+        $cmd = '';
 
-		$libreOfficePath = \OC::$server->getConfig()->getSystemValue('preview_libreoffice_path', null);
-		if (is_string($libreOfficePath)) {
-			$cmd = $libreOfficePath;
-		}
+        $libreOfficePath = \OC::$server->getConfig()->getSystemValue('preview_libreoffice_path', null);
+        if (is_string($libreOfficePath)) {
+            $cmd = $libreOfficePath;
+        }
 
-		$whichLibreOffice = shell_exec('command -v libreoffice');
-		if ($cmd === '' && !empty($whichLibreOffice)) {
-			$cmd = 'libreoffice';
-		}
+        $whichLibreOffice = shell_exec('command -v libreoffice');
+        if ($cmd === '' && !empty($whichLibreOffice)) {
+            $cmd = 'libreoffice';
+        }
 
-		$whichOpenOffice = shell_exec('command -v openoffice');
-		if ($cmd === '' && !empty($whichOpenOffice)) {
-			$cmd = 'openoffice';
-		}
+        $whichOpenOffice = shell_exec('command -v openoffice');
+        if ($cmd === '' && !empty($whichOpenOffice)) {
+            $cmd = 'openoffice';
+        }
 
-		if ($cmd === '') {
-			$cmd = null;
-		}
+        if ($cmd === '') {
+            $cmd = null;
+        }
 
-		$this->cmd = $cmd;
-	}
+        $this->cmd = $cmd;
+    }
 }

Please login to merge, or discard this patch.

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -43,20 +43,20 @@
 block discarded – undo
 
 		$tmpDir = \OC::$server->getTempManager()->getTempBaseDir();
 
-		$defaultParameters = ' -env:UserInstallation=file://' . escapeshellarg($tmpDir . '/owncloud-' . \OC_Util::getInstanceId() . '/') . ' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to png --outdir ';
+		$defaultParameters = ' -env:UserInstallation=file://'.escapeshellarg($tmpDir.'/owncloud-'.\OC_Util::getInstanceId().'/').' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to png --outdir ';
 		$clParameters = \OC::$server->getConfig()->getSystemValue('preview_office_cl_parameters', $defaultParameters);
 
-		$exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath);
+		$exec = $this->cmd.$clParameters.escapeshellarg($tmpDir).' '.escapeshellarg($absPath);
 
 		shell_exec($exec);
 
 		//create imagick object from png
 		$pngPreview = null;
 		try {
-			list($dirname, , , $filename) = array_values(pathinfo($absPath));
-			$pngPreview = $dirname . '/' . $filename . '.png';
+			list($dirname,,, $filename) = array_values(pathinfo($absPath));
+			$pngPreview = $dirname.'/'.$filename.'.png';
 
-			$png = new \imagick($pngPreview . '[0]');
+			$png = new \imagick($pngPreview.'[0]');
 			$png->setImageFormat('jpg');
 		} catch (\Exception $e) {
 			unlink($absPath);

Please login to merge, or discard this patch.

		@@ -43,20 +43,20 @@
		block discarded – undo
43	43
44	44	$tmpDir = \OC::$server->getTempManager()->getTempBaseDir();
45	45
46		- $defaultParameters = ' -env:UserInstallation=file://' . escapeshellarg($tmpDir . '/owncloud-' . \OC_Util::getInstanceId() . '/') . ' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to png --outdir ';
	46	+ $defaultParameters = ' -env:UserInstallation=file://'.escapeshellarg($tmpDir.'/owncloud-'.\OC_Util::getInstanceId().'/').' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to png --outdir ';
47	47	$clParameters = \OC::$server->getConfig()->getSystemValue('preview_office_cl_parameters', $defaultParameters);
48	48
49		- $exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath);
	49	+ $exec = $this->cmd.$clParameters.escapeshellarg($tmpDir).' '.escapeshellarg($absPath);
50	50
51	51	shell_exec($exec);
52	52
53	53	//create imagick object from png
54	54	$pngPreview = null;
55	55	try {
56		- list($dirname, , , $filename) = array_values(pathinfo($absPath));
57		- $pngPreview = $dirname . '/' . $filename . '.png';
	56	+ list($dirname,,, $filename) = array_values(pathinfo($absPath));
	57	+ $pngPreview = $dirname.'/'.$filename.'.png';
58	58
59		- $png = new \imagick($pngPreview . '[0]');
	59	+ $png = new \imagick($pngPreview.'[0]');
60	60	$png->setImageFormat('jpg');
61	61	} catch (\Exception $e) {
62	62	unlink($absPath);

		@@ -28,83 +28,83 @@
		block discarded – undo
28	28	use OCP\ILogger;
29	29
30	30	abstract class Office extends Provider {
31		- private $cmd;
	31	+ private $cmd;
32	32
33		- /**
34		- * {@inheritDoc}
35		- */
36		- public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
37		- $this->initCmd();
38		- if (is_null($this->cmd)) {
39		- return false;
40		- }
	33	+ /**
	34	+ * {@inheritDoc}
	35	+ */
	36	+ public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
	37	+ $this->initCmd();
	38	+ if (is_null($this->cmd)) {
	39	+ return false;
	40	+ }
41	41
42		- $absPath = $fileview->toTmpFile($path);
	42	+ $absPath = $fileview->toTmpFile($path);
43	43
44		- $tmpDir = \OC::$server->getTempManager()->getTempBaseDir();
	44	+ $tmpDir = \OC::$server->getTempManager()->getTempBaseDir();
45	45
46		- $defaultParameters = ' -env:UserInstallation=file://' . escapeshellarg($tmpDir . '/owncloud-' . \OC_Util::getInstanceId() . '/') . ' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to png --outdir ';
47		- $clParameters = \OC::$server->getConfig()->getSystemValue('preview_office_cl_parameters', $defaultParameters);
	46	+ $defaultParameters = ' -env:UserInstallation=file://' . escapeshellarg($tmpDir . '/owncloud-' . \OC_Util::getInstanceId() . '/') . ' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to png --outdir ';
	47	+ $clParameters = \OC::$server->getConfig()->getSystemValue('preview_office_cl_parameters', $defaultParameters);
48	48
49		- $exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath);
	49	+ $exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath);
50	50
51		- shell_exec($exec);
	51	+ shell_exec($exec);
52	52
53		- //create imagick object from png
54		- $pngPreview = null;
55		- try {
56		- list($dirname, , , $filename) = array_values(pathinfo($absPath));
57		- $pngPreview = $dirname . '/' . $filename . '.png';
	53	+ //create imagick object from png
	54	+ $pngPreview = null;
	55	+ try {
	56	+ list($dirname, , , $filename) = array_values(pathinfo($absPath));
	57	+ $pngPreview = $dirname . '/' . $filename . '.png';
58	58
59		- $png = new \imagick($pngPreview . '[0]');
60		- $png->setImageFormat('jpg');
61		- } catch (\Exception $e) {
62		- unlink($absPath);
63		- unlink($pngPreview);
64		- \OC::$server->getLogger()->logException($e, [
65		- 'level' => ILogger::ERROR,
66		- 'app' => 'core',
67		- ]);
68		- return false;
69		- }
	59	+ $png = new \imagick($pngPreview . '[0]');
	60	+ $png->setImageFormat('jpg');
	61	+ } catch (\Exception $e) {
	62	+ unlink($absPath);
	63	+ unlink($pngPreview);
	64	+ \OC::$server->getLogger()->logException($e, [
	65	+ 'level' => ILogger::ERROR,
	66	+ 'app' => 'core',
	67	+ ]);
	68	+ return false;
	69	+ }
70	70
71		- $image = new \OC_Image();
72		- $image->loadFromData($png);
	71	+ $image = new \OC_Image();
	72	+ $image->loadFromData($png);
73	73
74		- unlink($absPath);
75		- unlink($pngPreview);
	74	+ unlink($absPath);
	75	+ unlink($pngPreview);
76	76
77		- if ($image->valid()) {
78		- $image->scaleDownToFit($maxX, $maxY);
	77	+ if ($image->valid()) {
	78	+ $image->scaleDownToFit($maxX, $maxY);
79	79
80		- return $image;
81		- }
82		- return false;
	80	+ return $image;
	81	+ }
	82	+ return false;
83	83
84		- }
	84	+ }
85	85
86		- private function initCmd() {
87		- $cmd = '';
	86	+ private function initCmd() {
	87	+ $cmd = '';
88	88
89		- $libreOfficePath = \OC::$server->getConfig()->getSystemValue('preview_libreoffice_path', null);
90		- if (is_string($libreOfficePath)) {
91		- $cmd = $libreOfficePath;
92		- }
	89	+ $libreOfficePath = \OC::$server->getConfig()->getSystemValue('preview_libreoffice_path', null);
	90	+ if (is_string($libreOfficePath)) {
	91	+ $cmd = $libreOfficePath;
	92	+ }
93	93
94		- $whichLibreOffice = shell_exec('command -v libreoffice');
95		- if ($cmd === '' && !empty($whichLibreOffice)) {
96		- $cmd = 'libreoffice';
97		- }
	94	+ $whichLibreOffice = shell_exec('command -v libreoffice');
	95	+ if ($cmd === '' && !empty($whichLibreOffice)) {
	96	+ $cmd = 'libreoffice';
	97	+ }
98	98
99		- $whichOpenOffice = shell_exec('command -v openoffice');
100		- if ($cmd === '' && !empty($whichOpenOffice)) {
101		- $cmd = 'openoffice';
102		- }
	99	+ $whichOpenOffice = shell_exec('command -v openoffice');
	100	+ if ($cmd === '' && !empty($whichOpenOffice)) {
	101	+ $cmd = 'openoffice';
	102	+ }
103	103
104		- if ($cmd === '') {
105		- $cmd = null;
106		- }
	104	+ if ($cmd === '') {
	105	+ $cmd = null;
	106	+ }
107	107
108		- $this->cmd = $cmd;
109		- }
	108	+ $this->cmd = $cmd;
	109	+ }
110	110	}

nextcloud / server

Push — master ( c7f808...7a5768 )

Status

Category

Indentation +60 added lines, -60 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch