nextcloud / server

lib/private/Preview/TXT.php

Spacing +4 added lines, -4 removed lines

@@ -46,10 +46,10 @@ 
 	 */
 	public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
 		$content = $fileview->fopen($path, 'r');
-		$content = stream_get_contents($content,3000);
+		$content = stream_get_contents($content, 3000);
 
 		//don't create previews of empty text files
-		if(trim($content) === '') {
+		if (trim($content) === '') {
 			return false;
 		}
 
@@ -68,7 +68,7 @@ 
 
 		$canUseTTF = function_exists('imagettftext');
 
-		foreach($lines as $index => $line) {
+		foreach ($lines as $index => $line) {
 			$index = $index + 1;
 
 			$x = (int) 1;
@@ -81,7 +81,7 @@ 
 				imagestring($image, 1, $x, $y, $line, $textColor);
 			}
 
-			if(($index * $lineSize) >= $maxY) {
+			if (($index * $lineSize) >= $maxY) {
 				break;
 			}
 		}

lib/private/Preview/Bitmap.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
 		try {
 			$bp = $this->getResizedPreview($tmpPath, $maxX, $maxY);
 		} catch (\Exception $e) {
-			\OCP\Util::writeLog('core', 'ImageMagick says: ' . $e->getmessage(), \OCP\Util::ERROR);
+			\OCP\Util::writeLog('core', 'ImageMagick says: '.$e->getmessage(), \OCP\Util::ERROR);
 			return false;
 		}
 
@@ -79,7 +79,7 @@ 
 		$bp = new Imagick();
 
 		// Layer 0 contains either the bitmap or a flat representation of all vector layers
-		$bp->readImage($tmpPath . '[0]');
+		$bp->readImage($tmpPath.'[0]');
 
 		$bp = $this->resize($bp, $maxX, $maxY);
 

lib/private/Preview/Office.php

Spacing +5 added lines, -5 removed lines

@@ -41,20 +41,20 @@
 
 		$tmpDir = \OC::$server->getTempManager()->getTempBaseDir();
 
-		$defaultParameters = ' -env:UserInstallation=file://' . escapeshellarg($tmpDir . '/owncloud-' . \OC_Util::getInstanceId() . '/') . ' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to pdf --outdir ';
+		$defaultParameters = ' -env:UserInstallation=file://'.escapeshellarg($tmpDir.'/owncloud-'.\OC_Util::getInstanceId().'/').' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to pdf --outdir ';
 		$clParameters = \OCP\Config::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 pdf
 		$pdfPreview = null;
 		try {
-			list($dirname, , , $filename) = array_values(pathinfo($absPath));
-			$pdfPreview = $dirname . '/' . $filename . '.pdf';
+			list($dirname,,, $filename) = array_values(pathinfo($absPath));
+			$pdfPreview = $dirname.'/'.$filename.'.pdf';
 
-			$pdf = new \imagick($pdfPreview . '[0]');
+			$pdf = new \imagick($pdfPreview.'[0]');
 			$pdf->setImageFormat('jpg');
 		} catch (\Exception $e) {
 			unlink($absPath);

lib/private/Preview/Movie.php

Spacing +7 added lines, -7 removed lines

@@ -84,15 +84,15 @@
 		$tmpPath = \OC::$server->getTempManager()->getTemporaryFile();
 
 		if (self::$avconvBinary) {
-			$cmd = self::$avconvBinary . ' -y -ss ' . escapeshellarg($second) .
-				' -i ' . escapeshellarg($absPath) .
-				' -an -f mjpeg -vframes 1 -vsync 1 ' . escapeshellarg($tmpPath) .
+			$cmd = self::$avconvBinary.' -y -ss '.escapeshellarg($second).
+				' -i '.escapeshellarg($absPath).
+				' -an -f mjpeg -vframes 1 -vsync 1 '.escapeshellarg($tmpPath).
 				' > /dev/null 2>&1';
 		} else {
-			$cmd = self::$ffmpegBinary . ' -y -ss ' . escapeshellarg($second) .
-				' -i ' . escapeshellarg($absPath) .
-				' -f mjpeg -vframes 1' .
-				' ' . escapeshellarg($tmpPath) .
+			$cmd = self::$ffmpegBinary.' -y -ss '.escapeshellarg($second).
+				' -i '.escapeshellarg($absPath).
+				' -f mjpeg -vframes 1'.
+				' '.escapeshellarg($tmpPath).
 				' > /dev/null 2>&1';
 		}
 

lib/private/Preview/SVG.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 
 			$content = stream_get_contents($fileview->fopen($path, 'r'));
 			if (substr($content, 0, 5) !== '<?xml') {
-				$content = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>' . $content;
+				$content = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>'.$content;
 			}
 
 			// Do not parse SVG files with references

lib/private/Share20/ProviderFactory.php

Spacing +3 added lines, -3 removed lines

@@ -178,7 +178,7 @@ 
 		}
 
 		if ($provider === null) {
-			throw new ProviderException('No provider with id .' . $id . ' found.');
+			throw new ProviderException('No provider with id .'.$id.' found.');
 		}
 
 		return $provider;
@@ -190,7 +190,7 @@ 
 	public function getProviderForType($shareType) {
 		$provider = null;
 
-		if ($shareType === \OCP\Share::SHARE_TYPE_USER  ||
+		if ($shareType === \OCP\Share::SHARE_TYPE_USER ||
 			$shareType === \OCP\Share::SHARE_TYPE_GROUP ||
 			$shareType === \OCP\Share::SHARE_TYPE_LINK) {
 			$provider = $this->defaultShareProvider();
@@ -201,7 +201,7 @@ 
 		}
 
 		if ($provider === null) {
-			throw new ProviderException('No share provider for share type ' . $shareType);
+			throw new ProviderException('No share provider for share type '.$shareType);
 		}
 
 		return $provider;

lib/private/Setup/OCI.php

Spacing +41 added lines, -41 removed lines

@@ -53,11 +53,11 @@ 
 
 	public function validate($config) {
 		$errors = array();
-		if(empty($config['dbuser']) && empty($config['dbname'])) {
+		if (empty($config['dbuser']) && empty($config['dbname'])) {
 			$errors[] = $this->trans->t("%s enter the database username and name.", array($this->dbprettyname));
-		} else if(empty($config['dbuser'])) {
+		} else if (empty($config['dbuser'])) {
 			$errors[] = $this->trans->t("%s enter the database username.", array($this->dbprettyname));
-		} else if(empty($config['dbname'])) {
+		} else if (empty($config['dbname'])) {
 			$errors[] = $this->trans->t("%s enter the database name.", array($this->dbprettyname));
 		}
 		return $errors;
@@ -66,7 +66,7 @@ 
 	public function setupDatabase($username) {
 		$e_host = addslashes($this->dbHost);
 		// casting to int to avoid malicious input
-		$e_port = (int)$this->dbPort;
+		$e_port = (int) $this->dbPort;
 		$e_dbname = addslashes($this->dbName);
 		//check if the database user has admin right
 		if ($e_host == '') {
@@ -74,9 +74,9 @@ 
 		} else {
 			$easy_connect_string = '//'.$e_host.(!empty($e_port) ? ":{$e_port}" : "").'/'.$e_dbname;
 		}
-		$this->logger->debug('connect string: ' . $easy_connect_string, ['app' => 'setup.oci']);
+		$this->logger->debug('connect string: '.$easy_connect_string, ['app' => 'setup.oci']);
 		$connection = @oci_connect($this->dbUser, $this->dbPassword, $easy_connect_string);
-		if(!$connection) {
+		if (!$connection) {
 			$errorMessage = $this->getLastError();
 			if ($errorMessage) {
 				throw new \OC\DatabaseSetupException($this->trans->t('Oracle connection could not be established'),
@@ -84,41 +84,41 @@ 
 							.' ORACLE_SID='.getenv('ORACLE_SID')
 							.' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
 							.' NLS_LANG='.getenv('NLS_LANG')
-							.' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable');
+							.' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora') ? '' : 'not ').'readable');
 			}
 			throw new \OC\DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
 					'Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
 							.' ORACLE_SID='.getenv('ORACLE_SID')
 							.' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
 							.' NLS_LANG='.getenv('NLS_LANG')
-							.' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable');
+							.' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora') ? '' : 'not ').'readable');
 		}
 		//check for roles creation rights in oracle
 
-		$query='SELECT count(*) FROM user_role_privs, role_sys_privs'
+		$query = 'SELECT count(*) FROM user_role_privs, role_sys_privs'
 			." WHERE user_role_privs.granted_role = role_sys_privs.role AND privilege = 'CREATE ROLE'";
 		$stmt = oci_parse($connection, $query);
 		if (!$stmt) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)).'<br />';
 			$this->logger->warning($entry, ['app' => 'setup.oci']);
 		}
 		$result = oci_execute($stmt);
-		if($result) {
+		if ($result) {
 			$row = oci_fetch_row($stmt);
 
 			if ($row[0] > 0) {
 				//use the admin login data for the new database user
 
 				//add prefix to the oracle user name to prevent collisions
-				$this->dbUser='oc_'.$username;
+				$this->dbUser = 'oc_'.$username;
 				//create a new password so we don't need to store the admin config in the config file
 				$this->dbPassword = \OC::$server->getSecureRandom()->generate(30, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS);
 
 				//oracle passwords are treated as identifiers:
 				//  must start with alphanumeric char
 				//  needs to be shortened to 30 bytes, as the two " needed to escape the identifier count towards the identifier length.
-				$this->dbPassword=substr($this->dbPassword, 0, 30);
+				$this->dbPassword = substr($this->dbPassword, 0, 30);
 
 				$this->createDBUser($connection);
 			}
@@ -152,7 +152,7 @@ 
 			$easy_connect_string = '//'.$e_host.'/'.$e_dbname;
 		}
 		$connection = @oci_connect($this->dbUser, $this->dbPassword, $easy_connect_string);
-		if(!$connection) {
+		if (!$connection) {
 			throw new \OC\DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
 					$this->trans->t('You need to enter either an existing account or the administrator.'));
 		}
@@ -161,16 +161,16 @@ 
 		$un = $this->tablePrefix.'users';
 		oci_bind_by_name($stmt, ':un', $un);
 		if (!$stmt) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
-			$this->logger->warning( $entry, ['app' => 'setup.oci']);
+			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)).'<br />';
+			$this->logger->warning($entry, ['app' => 'setup.oci']);
 		}
 		$result = oci_execute($stmt);
 
-		if($result) {
+		if ($result) {
 			$row = oci_fetch_row($stmt);
 		}
-		if(!$result or $row[0]==0) {
+		if (!$result or $row[0] == 0) {
 			\OC_DB::createDbFromStructure($this->dbDefinitionFile);
 		}
 	}
@@ -184,35 +184,35 @@ 
 		$query = "SELECT * FROM all_users WHERE USERNAME = :un";
 		$stmt = oci_parse($connection, $query);
 		if (!$stmt) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)).'<br />';
 			$this->logger->warning($entry, ['app' => 'setup.oci']);
 		}
 		oci_bind_by_name($stmt, ':un', $name);
 		$result = oci_execute($stmt);
-		if(!$result) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+		if (!$result) {
+			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)).'<br />';
 			$this->logger->warning($entry, ['app' => 'setup.oci']);
 		}
 
-		if(! oci_fetch_row($stmt)) {
+		if (!oci_fetch_row($stmt)) {
 			//user does not exists let's create it :)
 			//password must start with alphabetic character in oracle
 			$query = 'CREATE USER '.$name.' IDENTIFIED BY "'.$password.'" DEFAULT TABLESPACE '.$this->dbtablespace;
 			$stmt = oci_parse($connection, $query);
 			if (!$stmt) {
-				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-				$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
+				$entry .= $this->trans->t('Offending command was: "%s"', array($query)).'<br />';
 				$this->logger->warning($entry, ['app' => 'setup.oci']);
 
 			}
 			//oci_bind_by_name($stmt, ':un', $name);
 			$result = oci_execute($stmt);
-			if(!$result) {
-				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
+			if (!$result) {
+				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
 				$entry .= $this->trans->t('Offending command was: "%s", name: %s, password: %s',
-					array($query, $name, $password)) . '<br />';
+					array($query, $name, $password)).'<br />';
 				$this->logger->warning($entry, ['app' => 'setup.oci']);
 
 			}
@@ -220,16 +220,16 @@ 
 			$query = "ALTER USER :un IDENTIFIED BY :pw";
 			$stmt = oci_parse($connection, $query);
 			if (!$stmt) {
-				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-				$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
+				$entry .= $this->trans->t('Offending command was: "%s"', array($query)).'<br />';
 				$this->logger->warning($entry, ['app' => 'setup.oci']);
 			}
 			oci_bind_by_name($stmt, ':un', $name);
 			oci_bind_by_name($stmt, ':pw', $password);
 			$result = oci_execute($stmt);
-			if(!$result) {
-				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-				$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+			if (!$result) {
+				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
+				$entry .= $this->trans->t('Offending command was: "%s"', array($query)).'<br />';
 				$this->logger->warning($entry, ['app' => 'setup.oci']);
 			}
 		}
@@ -237,15 +237,15 @@ 
 		$query = 'GRANT CREATE SESSION, CREATE TABLE, CREATE SEQUENCE, CREATE TRIGGER, UNLIMITED TABLESPACE TO '.$name;
 		$stmt = oci_parse($connection, $query);
 		if (!$stmt) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)).'<br />';
 			$this->logger->warning($entry, ['app' => 'setup.oci']);
 		}
 		$result = oci_execute($stmt);
-		if(!$result) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
+		if (!$result) {
+			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
 			$entry .= $this->trans->t('Offending command was: "%s", name: %s, password: %s',
-				array($query, $name, $password)) . '<br />';
+				array($query, $name, $password)).'<br />';
 			$this->logger->warning($entry, ['app' => 'setup.oci']);
 		}
 	}

lib/private/Setup/AbstractDatabase.php

Spacing +4 added lines, -4 removed lines

@@ -68,14 +68,14 @@
 
 	public function validate($config) {
 		$errors = array();
-		if(empty($config['dbuser']) && empty($config['dbname'])) {
+		if (empty($config['dbuser']) && empty($config['dbname'])) {
 			$errors[] = $this->trans->t("%s enter the database username and name.", array($this->dbprettyname));
-		} else if(empty($config['dbuser'])) {
+		} else if (empty($config['dbuser'])) {
 			$errors[] = $this->trans->t("%s enter the database username.", array($this->dbprettyname));
-		} else if(empty($config['dbname'])) {
+		} else if (empty($config['dbname'])) {
 			$errors[] = $this->trans->t("%s enter the database name.", array($this->dbprettyname));
 		}
-		if(substr_count($config['dbname'], '.') >= 1) {
+		if (substr_count($config['dbname'], '.') >= 1) {
 			$errors[] = $this->trans->t("%s you may not use dots in the database name", array($this->dbprettyname));
 		}
 		return $errors;

lib/private/PreviewManager.php

Spacing +2 added lines, -2 removed lines

@@ -244,7 +244,7 @@ 
 		}
 
 		$mount = $file->getMountPoint();
-		if ($mount and !$mount->getOption('previews', true)){
+		if ($mount and !$mount->getOption('previews', true)) {
 			return false;
 		}
 
@@ -330,7 +330,7 @@ 
 	 */
 	protected function registerCoreProvider($class, $mimeType, $options = []) {
 		if (in_array(trim($class, '\\'), $this->getEnabledDefaultProvider())) {
-			$this->registerProvider($mimeType, function () use ($class, $options) {
+			$this->registerProvider($mimeType, function() use ($class, $options) {
 				return new $class($options);
 			});
 		}