nextcloud / server

lib/private/DB/Connection.php

Spacing +12 added lines, -12 removed lines

@@ -58,7 +58,7 @@ 
 			return parent::connect();
 		} catch (DBALException $e) {
 			// throw a new exception to prevent leaking info from the stacktrace
-			throw new DBALException('Failed to connect to the database: ' . $e->getMessage(), $e->getCode());
+			throw new DBALException('Failed to connect to the database: '.$e->getMessage(), $e->getCode());
 		}
 	}
 
@@ -110,7 +110,7 @@ 
 		// 0 is the method where we use `getCallerBacktrace`
 		// 1 is the target method which uses the method we want to log
 		if (isset($traces[1])) {
-			return $traces[1]['file'] . ':' . $traces[1]['line'];
+			return $traces[1]['file'].':'.$traces[1]['line'];
 		}
 
 		return '';
@@ -156,7 +156,7 @@ 
 	 * @param int $offset
 	 * @return \Doctrine\DBAL\Driver\Statement The prepared statement.
 	 */
-	public function prepare( $statement, $limit=null, $offset=null ) {
+	public function prepare($statement, $limit = null, $offset = null) {
 		if ($limit === -1) {
 			$limit = null;
 		}
@@ -321,7 +321,7 @@ 
 			throw new \BadMethodCallException('Can not lock a new table until the previous lock is released.');
 		}
 
-		$tableName = $this->tablePrefix . $tableName;
+		$tableName = $this->tablePrefix.$tableName;
 		$this->lockedTable = $tableName;
 		$this->adapter->lockTable($tableName);
 	}
@@ -342,11 +342,11 @@ 
 	 * @return string
 	 */
 	public function getError() {
-		$msg = $this->errorCode() . ': ';
+		$msg = $this->errorCode().': ';
 		$errorInfo = $this->errorInfo();
 		if (is_array($errorInfo)) {
-			$msg .= 'SQLSTATE = '.$errorInfo[0] . ', ';
-			$msg .= 'Driver Code = '.$errorInfo[1] . ', ';
+			$msg .= 'SQLSTATE = '.$errorInfo[0].', ';
+			$msg .= 'Driver Code = '.$errorInfo[1].', ';
 			$msg .= 'Driver Message = '.$errorInfo[2];
 		}
 		return $msg;
@@ -358,9 +358,9 @@ 
 	 * @param string $table table name without the prefix
 	 */
 	public function dropTable($table) {
-		$table = $this->tablePrefix . trim($table);
+		$table = $this->tablePrefix.trim($table);
 		$schema = $this->getSchemaManager();
-		if($schema->tablesExist(array($table))) {
+		if ($schema->tablesExist(array($table))) {
 			$schema->dropTable($table);
 		}
 	}
@@ -371,8 +371,8 @@ 
 	 * @param string $table table name without the prefix
 	 * @return bool
 	 */
-	public function tableExists($table){
-		$table = $this->tablePrefix . trim($table);
+	public function tableExists($table) {
+		$table = $this->tablePrefix.trim($table);
 		$schema = $this->getSchemaManager();
 		return $schema->tablesExist(array($table));
 	}
@@ -383,7 +383,7 @@ 
 	 * @return string
 	 */
 	protected function replaceTablePrefix($statement) {
-		return str_replace( '*PREFIX*', $this->tablePrefix, $statement );
+		return str_replace('*PREFIX*', $this->tablePrefix, $statement);
 	}
 
 	/**

lib/private/Diagnostics/EventLogger.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 	 * @inheritdoc
 	 */
 	public function start($id, $description) {
-		if ($this->activated){
+		if ($this->activated) {
 			$this->events[$id] = new Event($id, $description, microtime(true));
 		}
 	}

lib/private/Files/Utils/Scanner.php

Spacing +15 added lines, -15 removed lines

@@ -118,17 +118,17 @@ 
 	protected function attachListener($mount) {
 		$scanner = $mount->getStorage()->getScanner();
 		$emitter = $this;
-		$scanner->listen('\OC\Files\Cache\Scanner', 'scanFile', function ($path) use ($mount, $emitter) {
-			$emitter->emit('\OC\Files\Utils\Scanner', 'scanFile', array($mount->getMountPoint() . $path));
+		$scanner->listen('\OC\Files\Cache\Scanner', 'scanFile', function($path) use ($mount, $emitter) {
+			$emitter->emit('\OC\Files\Utils\Scanner', 'scanFile', array($mount->getMountPoint().$path));
 		});
-		$scanner->listen('\OC\Files\Cache\Scanner', 'scanFolder', function ($path) use ($mount, $emitter) {
-			$emitter->emit('\OC\Files\Utils\Scanner', 'scanFolder', array($mount->getMountPoint() . $path));
+		$scanner->listen('\OC\Files\Cache\Scanner', 'scanFolder', function($path) use ($mount, $emitter) {
+			$emitter->emit('\OC\Files\Utils\Scanner', 'scanFolder', array($mount->getMountPoint().$path));
 		});
-		$scanner->listen('\OC\Files\Cache\Scanner', 'postScanFile', function ($path) use ($mount, $emitter) {
-			$emitter->emit('\OC\Files\Utils\Scanner', 'postScanFile', array($mount->getMountPoint() . $path));
+		$scanner->listen('\OC\Files\Cache\Scanner', 'postScanFile', function($path) use ($mount, $emitter) {
+			$emitter->emit('\OC\Files\Utils\Scanner', 'postScanFile', array($mount->getMountPoint().$path));
 		});
-		$scanner->listen('\OC\Files\Cache\Scanner', 'postScanFolder', function ($path) use ($mount, $emitter) {
-			$emitter->emit('\OC\Files\Utils\Scanner', 'postScanFolder', array($mount->getMountPoint() . $path));
+		$scanner->listen('\OC\Files\Cache\Scanner', 'postScanFolder', function($path) use ($mount, $emitter) {
+			$emitter->emit('\OC\Files\Utils\Scanner', 'postScanFolder', array($mount->getMountPoint().$path));
 		});
 	}
 
@@ -160,13 +160,13 @@ 
 			$scanner = $storage->getScanner();
 			$this->attachListener($mount);
 
-			$scanner->listen('\OC\Files\Cache\Scanner', 'removeFromCache', function ($path) use ($storage) {
+			$scanner->listen('\OC\Files\Cache\Scanner', 'removeFromCache', function($path) use ($storage) {
 				$this->triggerPropagator($storage, $path);
 			});
-			$scanner->listen('\OC\Files\Cache\Scanner', 'updateCache', function ($path) use ($storage) {
+			$scanner->listen('\OC\Files\Cache\Scanner', 'updateCache', function($path) use ($storage) {
 				$this->triggerPropagator($storage, $path);
 			});
-			$scanner->listen('\OC\Files\Cache\Scanner', 'addToCache', function ($path) use ($storage) {
+			$scanner->listen('\OC\Files\Cache\Scanner', 'addToCache', function($path) use ($storage) {
 				$this->triggerPropagator($storage, $path);
 			});
 
@@ -219,13 +219,13 @@ 
 			$scanner->setUseTransactions(false);
 			$this->attachListener($mount);
 
-			$scanner->listen('\OC\Files\Cache\Scanner', 'removeFromCache', function ($path) use ($storage) {
+			$scanner->listen('\OC\Files\Cache\Scanner', 'removeFromCache', function($path) use ($storage) {
 				$this->postProcessEntry($storage, $path);
 			});
-			$scanner->listen('\OC\Files\Cache\Scanner', 'updateCache', function ($path) use ($storage) {
+			$scanner->listen('\OC\Files\Cache\Scanner', 'updateCache', function($path) use ($storage) {
 				$this->postProcessEntry($storage, $path);
 			});
-			$scanner->listen('\OC\Files\Cache\Scanner', 'addToCache', function ($path) use ($storage) {
+			$scanner->listen('\OC\Files\Cache\Scanner', 'addToCache', function($path) use ($storage) {
 				$this->postProcessEntry($storage, $path);
 			});
 
@@ -247,7 +247,7 @@ 
 				}
 				$propagator->commitBatch();
 			} catch (StorageNotAvailableException $e) {
-				$this->logger->error('Storage ' . $storage->getId() . ' not available');
+				$this->logger->error('Storage '.$storage->getId().' not available');
 				$this->logger->logException($e);
 				$this->emit('\OC\Files\Utils\Scanner', 'StorageNotAvailable', [$e]);
 			}

apps/dav/lib/Connector/Sabre/ObjectTree.php

Spacing +3 added lines, -3 removed lines

@@ -90,7 +90,7 @@ 
 			if (isset($info['transferid'])) {
 				// getNodePath is called for multiple nodes within a chunk
 				// upload call
-				$path = $dir . '/' . $info['name'];
+				$path = $dir.'/'.$info['name'];
 				$path = ltrim($path, '/');
 			}
 		}
@@ -161,7 +161,7 @@ 
 			} catch (StorageNotAvailableException $e) {
 				throw new \Sabre\DAV\Exception\ServiceUnavailable('Storage is temporarily not available');
 			} catch (StorageInvalidException $e) {
-				throw new \Sabre\DAV\Exception\NotFound('Storage ' . $path . ' is invalid');
+				throw new \Sabre\DAV\Exception\NotFound('Storage '.$path.' is invalid');
 			} catch (LockedException $e) {
 				throw new \Sabre\DAV\Exception\Locked();
 			} catch (ForbiddenException $e) {
@@ -170,7 +170,7 @@ 
 		}
 
 		if (!$info) {
-			throw new \Sabre\DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
+			throw new \Sabre\DAV\Exception\NotFound('File with name '.$path.' could not be located');
 		}
 
 		if ($info->getType() === 'dir') {

lib/private/App/AppStore/Bundles/SocialSharingBundle.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	 * {@inheritDoc}
 	 */
 	public function getName() {
-		return (string)$this->l10n->t('Social sharing bundle');
+		return (string) $this->l10n->t('Social sharing bundle');
 	}
 
 	/**

apps/workflowengine/templates/admin.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 	<h2 class="inlineblock"><?php p($_['heading']); ?></h2>
 	<?php if (!empty($_['docs'])): ?>
 		<a target="_blank" rel="noreferrer" class="icon-info svg"
-		   title="<?php p($l->t('Open documentation'));?>"
+		   title="<?php p($l->t('Open documentation')); ?>"
 		   href="<?php p(link_to_docs($_['docs'])); ?>">
 		</a>
 	<?php endif; ?>

apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 	}
 
 	protected function run($argument) {
-		if($argument['retryNo'] === 5) {
+		if ($argument['retryNo'] === 5) {
 			return;
 		}
 

settings/BackgroundJobs/VerifyUserData.php

Spacing +9 added lines, -9 removed lines

@@ -103,9 +103,9 @@ 
 
 	protected function run($argument) {
 
-		$try = (int)$argument['try'] + 1;
+		$try = (int) $argument['try'] + 1;
 
-		switch($argument['type']) {
+		switch ($argument['type']) {
 			case AccountManager::PROPERTY_WEBSITE:
 				$result = $this->verifyWebsite($argument);
 				break;
@@ -115,7 +115,7 @@ 
 				break;
 			default:
 				// no valid type given, no need to retry
-				$this->logger->error($argument['type'] . ' is no valid type for user account data.');
+				$this->logger->error($argument['type'].' is no valid type for user account data.');
 				$result = true;
 		}
 
@@ -134,7 +134,7 @@ 
 
 		$result = false;
 
-		$url = rtrim($argument['data'], '/') . '/.well-known/' . 'CloudIdVerificationCode.txt';
+		$url = rtrim($argument['data'], '/').'/.well-known/'.'CloudIdVerificationCode.txt';
 
 		$client = $this->httpClientService->newClient();
 		try {
@@ -151,7 +151,7 @@ 
 			$user = $this->userManager->get($argument['uid']);
 			// we don't check a valid user -> give up
 			if ($user === null) {
-				$this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
+				$this->logger->error($argument['uid'].' doesn\'t exist, can\'t verify user data.');
 				return $result;
 			}
 			$userData = $this->accountManager->getUser($user);
@@ -181,7 +181,7 @@ 
 
 		// we don't check a valid user -> give up
 		if ($user === null) {
-			$this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
+			$this->logger->error($argument['uid'].' doesn\'t exist, can\'t verify user data.');
 			return true;
 		}
 
@@ -220,7 +220,7 @@ 
 		try {
 			$client = $this->httpClientService->newClient();
 			$response = $client->get(
-				$this->lookupServerUrl . '/users?search=' . urlencode($cloudId) . '&exactCloudId=1',
+				$this->lookupServerUrl.'/users?search='.urlencode($cloudId).'&exactCloudId=1',
 				[
 					'timeout' => 10,
 					'connect_timeout' => 3,
@@ -253,7 +253,7 @@ 
 				'data' => $argument['data'],
 				'type' => $argument['type'],
 				'uid' => $argument['uid'],
-				'try' => (int)$argument['try'] + 1,
+				'try' => (int) $argument['try'] + 1,
 				'lastRun' => time()
 			]
 		);
@@ -266,7 +266,7 @@ 
 	 * @return bool
 	 */
 	protected function shouldRun(array $argument) {
-		$lastRun = (int)$argument['lastRun'];
+		$lastRun = (int) $argument['lastRun'];
 		return ((time() - $lastRun) > $this->interval);
 	}
 

lib/private/legacy/image.php

Spacing +43 added lines, -43 removed lines

@@ -145,7 +145,7 @@ 
 	 */
 	public function widthTopLeft() {
 		$o = $this->getOrientation();
-		$this->logger->debug('OC_Image->widthTopLeft() Orientation: ' . $o, array('app' => 'core'));
+		$this->logger->debug('OC_Image->widthTopLeft() Orientation: '.$o, array('app' => 'core'));
 		switch ($o) {
 			case -1:
 			case 1:
@@ -169,7 +169,7 @@ 
 	 */
 	public function heightTopLeft() {
 		$o = $this->getOrientation();
-		$this->logger->debug('OC_Image->heightTopLeft() Orientation: ' . $o, array('app' => 'core'));
+		$this->logger->debug('OC_Image->heightTopLeft() Orientation: '.$o, array('app' => 'core'));
 		switch ($o) {
 			case -1:
 			case 1:
@@ -196,7 +196,7 @@ 
 		if ($mimeType === null) {
 			$mimeType = $this->mimeType();
 		}
-		header('Content-Type: ' . $mimeType);
+		header('Content-Type: '.$mimeType);
 		return $this->_output(null, $mimeType);
 	}
 
@@ -214,7 +214,7 @@ 
 		}
 		if ($filePath === null) {
 			if ($this->filePath === null) {
-				$this->logger->error(__METHOD__ . '(): called with no path.', array('app' => 'core'));
+				$this->logger->error(__METHOD__.'(): called with no path.', array('app' => 'core'));
 				return false;
 			} else {
 				$filePath = $this->filePath;
@@ -238,10 +238,10 @@ 
 			}
 			$isWritable = is_writable(dirname($filePath));
 			if (!$isWritable) {
-				$this->logger->error(__METHOD__ . '(): Directory \'' . dirname($filePath) . '\' is not writable.', array('app' => 'core'));
+				$this->logger->error(__METHOD__.'(): Directory \''.dirname($filePath).'\' is not writable.', array('app' => 'core'));
 				return false;
 			} elseif ($isWritable && file_exists($filePath) && !is_writable($filePath)) {
-				$this->logger->error(__METHOD__ . '(): File \'' . $filePath . '\' is not writable.', array('app' => 'core'));
+				$this->logger->error(__METHOD__.'(): File \''.$filePath.'\' is not writable.', array('app' => 'core'));
 				return false;
 			}
 		}
@@ -269,7 +269,7 @@ 
 					$imageType = IMAGETYPE_BMP;
 					break;
 				default:
-					throw new Exception('\OC_Image::_output(): "' . $mimeType . '" is not supported when forcing a specific output format');
+					throw new Exception('\OC_Image::_output(): "'.$mimeType.'" is not supported when forcing a specific output format');
 			}
 		}
 
@@ -417,7 +417,7 @@ 
 			return;
 		}
 
-		$exif = @exif_read_data('data://image/jpeg;base64,' . base64_encode($data));
+		$exif = @exif_read_data('data://image/jpeg;base64,'.base64_encode($data));
 		if (!$exif) {
 			return;
 		}
@@ -435,7 +435,7 @@ 
 	 */
 	public function fixOrientation() {
 		$o = $this->getOrientation();
-		$this->logger->debug('OC_Image->fixOrientation() Orientation: ' . $o, array('app' => 'core'));
+		$this->logger->debug('OC_Image->fixOrientation() Orientation: '.$o, array('app' => 'core'));
 		$rotate = 0;
 		$flip = false;
 		switch ($o) {
@@ -470,7 +470,7 @@ 
 				$rotate = 90;
 				break;
 		}
-		if($flip && function_exists('imageflip')) {
+		if ($flip && function_exists('imageflip')) {
 			imageflip($this->resource, IMG_FLIP_HORIZONTAL);
 		}
 		if ($rotate) {
@@ -518,7 +518,7 @@ 
 		} elseif ($this->loadFromData($imageRef) !== false) {
 			return $this->resource;
 		}
-		$this->logger->debug(__METHOD__ . '(): could not load anything. Giving up!', array('app' => 'core'));
+		$this->logger->debug(__METHOD__.'(): could not load anything. Giving up!', array('app' => 'core'));
 		return false;
 	}
 
@@ -557,7 +557,7 @@ 
 					imagealphablending($this->resource, true);
 					imagesavealpha($this->resource, true);
 				} else {
-					$this->logger->debug('OC_Image->loadFromFile, GIF images not supported: ' . $imagePath, array('app' => 'core'));
+					$this->logger->debug('OC_Image->loadFromFile, GIF images not supported: '.$imagePath, array('app' => 'core'));
 				}
 				break;
 			case IMAGETYPE_JPEG:
@@ -565,10 +565,10 @@ 
 					if (getimagesize($imagePath) !== false) {
 						$this->resource = @imagecreatefromjpeg($imagePath);
 					} else {
-						$this->logger->debug('OC_Image->loadFromFile, JPG image not valid: ' . $imagePath, array('app' => 'core'));
+						$this->logger->debug('OC_Image->loadFromFile, JPG image not valid: '.$imagePath, array('app' => 'core'));
 					}
 				} else {
-					$this->logger->debug('OC_Image->loadFromFile, JPG images not supported: ' . $imagePath, array('app' => 'core'));
+					$this->logger->debug('OC_Image->loadFromFile, JPG images not supported: '.$imagePath, array('app' => 'core'));
 				}
 				break;
 			case IMAGETYPE_PNG:
@@ -578,21 +578,21 @@ 
 					imagealphablending($this->resource, true);
 					imagesavealpha($this->resource, true);
 				} else {
-					$this->logger->debug('OC_Image->loadFromFile, PNG images not supported: ' . $imagePath, array('app' => 'core'));
+					$this->logger->debug('OC_Image->loadFromFile, PNG images not supported: '.$imagePath, array('app' => 'core'));
 				}
 				break;
 			case IMAGETYPE_XBM:
 				if (imagetypes() & IMG_XPM) {
 					$this->resource = @imagecreatefromxbm($imagePath);
 				} else {
-					$this->logger->debug('OC_Image->loadFromFile, XBM/XPM images not supported: ' . $imagePath, array('app' => 'core'));
+					$this->logger->debug('OC_Image->loadFromFile, XBM/XPM images not supported: '.$imagePath, array('app' => 'core'));
 				}
 				break;
 			case IMAGETYPE_WBMP:
 				if (imagetypes() & IMG_WBMP) {
 					$this->resource = @imagecreatefromwbmp($imagePath);
 				} else {
-					$this->logger->debug('OC_Image->loadFromFile, WBMP images not supported: ' . $imagePath, array('app' => 'core'));
+					$this->logger->debug('OC_Image->loadFromFile, WBMP images not supported: '.$imagePath, array('app' => 'core'));
 				}
 				break;
 			case IMAGETYPE_BMP:
@@ -702,7 +702,7 @@ 
 	 */
 	private function imagecreatefrombmp($fileName) {
 		if (!($fh = fopen($fileName, 'rb'))) {
-			$this->logger->warning('imagecreatefrombmp: Can not open ' . $fileName, array('app' => 'core'));
+			$this->logger->warning('imagecreatefrombmp: Can not open '.$fileName, array('app' => 'core'));
 			return false;
 		}
 		// read file header
@@ -710,7 +710,7 @@ 
 		// check for bitmap
 		if ($meta['type'] != 19778) {
 			fclose($fh);
-			$this->logger->warning('imagecreatefrombmp: Can not open ' . $fileName . ' is not a bitmap!', array('app' => 'core'));
+			$this->logger->warning('imagecreatefrombmp: Can not open '.$fileName.' is not a bitmap!', array('app' => 'core'));
 			return false;
 		}
 		// read image header
@@ -734,7 +734,7 @@ 
 				$meta['imagesize'] = @filesize($fileName) - $meta['offset'];
 				if ($meta['imagesize'] < 1) {
 					fclose($fh);
-					$this->logger->warning('imagecreatefrombmp: Can not obtain file size of ' . $fileName . ' is not a bitmap!', array('app' => 'core'));
+					$this->logger->warning('imagecreatefrombmp: Can not obtain file size of '.$fileName.' is not a bitmap!', array('app' => 'core'));
 					return false;
 				}
 			}
@@ -744,7 +744,7 @@ 
 		// read color palette
 		$palette = array();
 		if ($meta['bits'] < 16) {
-			$palette = unpack('l' . $meta['colors'], fread($fh, $meta['colors'] * 4));
+			$palette = unpack('l'.$meta['colors'], fread($fh, $meta['colors'] * 4));
 			// in rare cases the color value is signed
 			if ($palette[1] < 0) {
 				foreach ($palette as $i => $color) {
@@ -757,7 +757,7 @@ 
 		if ($im == false) {
 			fclose($fh);
 			$this->logger->warning(
-				'imagecreatefrombmp: imagecreatetruecolor failed for file "' . $fileName . '" with dimensions ' . $meta['width'] . 'x' . $meta['height'],
+				'imagecreatefrombmp: imagecreatetruecolor failed for file "'.$fileName.'" with dimensions '.$meta['width'].'x'.$meta['height'],
 				array('app' => 'core'));
 			return false;
 		}
@@ -766,7 +766,7 @@ 
 		$p = 0;
 		$vide = chr(0);
 		$y = $meta['height'] - 1;
-		$error = 'imagecreatefrombmp: ' . $fileName . ' has not enough data!';
+		$error = 'imagecreatefrombmp: '.$fileName.' has not enough data!';
 		// loop through the image data beginning with the lower left corner
 		while ($y >= 0) {
 			$x = 0;
@@ -778,7 +778,7 @@ 
 							$this->logger->warning($error, array('app' => 'core'));
 							return $im;
 						}
-						$color = @unpack('V', $part . $vide);
+						$color = @unpack('V', $part.$vide);
 						break;
 					case 16:
 						if (!($part = substr($data, $p, 2))) {
@@ -790,16 +790,16 @@ 
 						$color[1] = (($color[1] & 0xf800) >> 8) * 65536 + (($color[1] & 0x07e0) >> 3) * 256 + (($color[1] & 0x001f) << 3);
 						break;
 					case 8:
-						$color = @unpack('n', $vide . substr($data, $p, 1));
+						$color = @unpack('n', $vide.substr($data, $p, 1));
 						$color[1] = (isset($palette[$color[1] + 1])) ? $palette[$color[1] + 1] : $palette[1];
 						break;
 					case 4:
-						$color = @unpack('n', $vide . substr($data, floor($p), 1));
+						$color = @unpack('n', $vide.substr($data, floor($p), 1));
 						$color[1] = ($p * 2) % 2 == 0 ? $color[1] >> 4 : $color[1] & 0x0F;
 						$color[1] = (isset($palette[$color[1] + 1])) ? $palette[$color[1] + 1] : $palette[1];
 						break;
 					case 1:
-						$color = @unpack('n', $vide . substr($data, floor($p), 1));
+						$color = @unpack('n', $vide.substr($data, floor($p), 1));
 						switch (($p * 8) % 8) {
 							case 0:
 								$color[1] = $color[1] >> 7;
@@ -830,7 +830,7 @@ 
 						break;
 					default:
 						fclose($fh);
-						$this->logger->warning('imagecreatefrombmp: ' . $fileName . ' has ' . $meta['bits'] . ' bits and this is not supported!', array('app' => 'core'));
+						$this->logger->warning('imagecreatefrombmp: '.$fileName.' has '.$meta['bits'].' bits and this is not supported!', array('app' => 'core'));
 						return false;
 				}
 				imagesetpixel($im, $x, $y, $color[1]);
@@ -852,7 +852,7 @@ 
 	 */
 	public function resize($maxSize) {
 		if (!$this->valid()) {
-			$this->logger->error(__METHOD__ . '(): No image loaded', array('app' => 'core'));
+			$this->logger->error(__METHOD__.'(): No image loaded', array('app' => 'core'));
 			return false;
 		}
 		$widthOrig = imagesx($this->resource);
@@ -878,7 +878,7 @@ 
 	 */
 	public function preciseResize($width, $height) {
 		if (!$this->valid()) {
-			$this->logger->error(__METHOD__ . '(): No image loaded', array('app' => 'core'));
+			$this->logger->error(__METHOD__.'(): No image loaded', array('app' => 'core'));
 			return false;
 		}
 		$widthOrig = imagesx($this->resource);
@@ -886,7 +886,7 @@ 
 		$process = imagecreatetruecolor($width, $height);
 
 		if ($process == false) {
-			$this->logger->error(__METHOD__ . '(): Error creating true color image', array('app' => 'core'));
+			$this->logger->error(__METHOD__.'(): Error creating true color image', array('app' => 'core'));
 			imagedestroy($process);
 			return false;
 		}
@@ -900,7 +900,7 @@ 
 
 		imagecopyresampled($process, $this->resource, 0, 0, 0, 0, $width, $height, $widthOrig, $heightOrig);
 		if ($process == false) {
-			$this->logger->error(__METHOD__ . '(): Error re-sampling process image', array('app' => 'core'));
+			$this->logger->error(__METHOD__.'(): Error re-sampling process image', array('app' => 'core'));
 			imagedestroy($process);
 			return false;
 		}
@@ -958,7 +958,7 @@ 
 
 		imagecopyresampled($process, $this->resource, 0, 0, $x, $y, $targetWidth, $targetHeight, $width, $height);
 		if ($process == false) {
-			$this->logger->error('OC_Image->centerCrop, Error re-sampling process image ' . $width . 'x' . $height, array('app' => 'core'));
+			$this->logger->error('OC_Image->centerCrop, Error re-sampling process image '.$width.'x'.$height, array('app' => 'core'));
 			imagedestroy($process);
 			return false;
 		}
@@ -978,12 +978,12 @@ 
 	 */
 	public function crop($x, $y, $w, $h) {
 		if (!$this->valid()) {
-			$this->logger->error(__METHOD__ . '(): No image loaded', array('app' => 'core'));
+			$this->logger->error(__METHOD__.'(): No image loaded', array('app' => 'core'));
 			return false;
 		}
 		$process = imagecreatetruecolor($w, $h);
 		if ($process == false) {
-			$this->logger->error(__METHOD__ . '(): Error creating true color image', array('app' => 'core'));
+			$this->logger->error(__METHOD__.'(): Error creating true color image', array('app' => 'core'));
 			imagedestroy($process);
 			return false;
 		}
@@ -997,7 +997,7 @@ 
 
 		imagecopyresampled($process, $this->resource, 0, 0, $x, $y, $w, $h, $w, $h);
 		if ($process == false) {
-			$this->logger->error(__METHOD__ . '(): Error re-sampling process image ' . $w . 'x' . $h, array('app' => 'core'));
+			$this->logger->error(__METHOD__.'(): Error re-sampling process image '.$w.'x'.$h, array('app' => 'core'));
 			imagedestroy($process);
 			return false;
 		}
@@ -1017,7 +1017,7 @@ 
 	 */
 	public function fitIn($maxWidth, $maxHeight) {
 		if (!$this->valid()) {
-			$this->logger->error(__METHOD__ . '(): No image loaded', array('app' => 'core'));
+			$this->logger->error(__METHOD__.'(): No image loaded', array('app' => 'core'));
 			return false;
 		}
 		$widthOrig = imagesx($this->resource);
@@ -1040,7 +1040,7 @@ 
 	 */
 	public function scaleDownToFit($maxWidth, $maxHeight) {
 		if (!$this->valid()) {
-			$this->logger->error(__METHOD__ . '(): No image loaded', array('app' => 'core'));
+			$this->logger->error(__METHOD__.'(): No image loaded', array('app' => 'core'));
 			return false;
 		}
 		$widthOrig = imagesx($this->resource);
@@ -1098,7 +1098,7 @@ 
 		if ($bit <= 8) {
 			for ($i = 0; $i < $colorsNum; $i++) {
 				$colors = imagecolorsforindex($im, $i);
-				$rgbQuad .= chr($colors['blue']) . chr($colors['green']) . chr($colors['red']) . "\0";
+				$rgbQuad .= chr($colors['blue']).chr($colors['green']).chr($colors['red'])."\0";
 			}
 			$bmpData = '';
 			if ($compression == 0 || $bit < 8) {
@@ -1131,7 +1131,7 @@ 
 						$index = imagecolorat($im, $i, $j);
 						if ($index !== $lastIndex || $sameNum > 255) {
 							if ($sameNum != 0) {
-								$bmpData .= chr($sameNum) . chr($lastIndex);
+								$bmpData .= chr($sameNum).chr($lastIndex);
 							}
 							$lastIndex = $index;
 							$sameNum = 1;
@@ -1172,15 +1172,15 @@ 
 			$sizeData = strlen($bmpData);
 			$colorsNum = 0;
 		}
-		$fileHeader = 'BM' . pack('V3', 54 + $sizeQuad + $sizeData, 0, 54 + $sizeQuad);
+		$fileHeader = 'BM'.pack('V3', 54 + $sizeQuad + $sizeData, 0, 54 + $sizeQuad);
 		$infoHeader = pack('V3v2V*', 0x28, $width, $height, 1, $bit, $compression, $sizeData, 0, 0, $colorsNum, 0);
 		if ($fileName != '') {
 			$fp = fopen($fileName, 'wb');
-			fwrite($fp, $fileHeader . $infoHeader . $rgbQuad . $bmpData);
+			fwrite($fp, $fileHeader.$infoHeader.$rgbQuad.$bmpData);
 			fclose($fp);
 			return true;
 		}
-		echo $fileHeader . $infoHeader . $rgbQuad . $bmpData;
+		echo $fileHeader.$infoHeader.$rgbQuad.$bmpData;
 		return true;
 	}
 }