jenskooij / cloudcontrol

cloudcontrol/library/storage/Repository.php

Spacing +31 added lines, -31 removed lines

@@ -102,7 +102,7 @@ 
             if (in_array($name, $this->fileBasedSubsets)) {
                 return $this->loadSubset($name);
             } else {
-                throw new \Exception('Trying to get undefined property from Repository: ' . $name);
+                throw new \Exception('Trying to get undefined property from Repository: '.$name);
             }
         }
     }
@@ -111,10 +111,10 @@ 
     {
         if (in_array($name, $this->fileBasedSubsets)) {
             $this->$name = $value;
-            $changes = $name . 'Changes';
+            $changes = $name.'Changes';
             $this->$changes = true;
         } else {
-            throw new \Exception('Trying to persist unknown subset in repository: ' . $name . ' <br /><pre>' . print_r($value, true) . '</pre>');
+            throw new \Exception('Trying to persist unknown subset in repository: '.$name.' <br /><pre>'.print_r($value, true).'</pre>');
         }
     }
 
@@ -133,15 +133,15 @@ 
     protected function saveSubset($subset)
     {
         $json = json_encode($this->$subset);
-        $subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
+        $subsetStoragePath = $this->storagePath.DIRECTORY_SEPARATOR.$subset.'.json';
         file_put_contents($subsetStoragePath, $json);
-        $changes = $subset . 'Changes';
+        $changes = $subset.'Changes';
         $this->$changes = false;
     }
 
     protected function loadSubset($subset)
     {
-        $subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
+        $subsetStoragePath = $this->storagePath.DIRECTORY_SEPARATOR.$subset.'.json';
         $json = file_get_contents($subsetStoragePath);
         $json = json_decode($json);
         $this->$subset = $json;
@@ -189,7 +189,7 @@ 
     protected function getContentDbHandle()
     {
         if ($this->contentDbHandle === null) {
-            $this->contentDbHandle = new \PDO('sqlite:' . $this->storagePath . DIRECTORY_SEPARATOR . 'content.db');
+            $this->contentDbHandle = new \PDO('sqlite:'.$this->storagePath.DIRECTORY_SEPARATOR.'content.db');
         }
         return $this->contentDbHandle;
     }
@@ -202,14 +202,14 @@ 
     public function getDocumentsByPath($folderPath)
     {
         $db = $this->getContentDbHandle();
-        $folderPathWithWildcard = $folderPath . '%';
+        $folderPathWithWildcard = $folderPath.'%';
 
         $stmt = $this->getDbStatement('
             SELECT *
               FROM documents
-             WHERE `path` LIKE ' . $db->quote($folderPathWithWildcard) . '
-               AND substr(`path`, ' . (strlen($folderPath) + 1) . ') NOT LIKE "%/%"
-               AND path != ' . $db->quote($folderPath) . '
+             WHERE `path` LIKE ' . $db->quote($folderPathWithWildcard).'
+               AND substr(`path`, ' . (strlen($folderPath) + 1).') NOT LIKE "%/%"
+               AND path != ' . $db->quote($folderPath).'
           ORDER BY `type` DESC, `path` ASC
         ');
 
@@ -253,7 +253,7 @@ 
         $document = $this->fetchDocument('
             SELECT *
               FROM documents
-             WHERE path = ' . $db->quote($path) . '
+             WHERE path = ' . $db->quote($path).'
         ');
         if ($document instanceof Document && $document->type === 'folder') {
             $document->dbHandle = $db;
@@ -285,7 +285,7 @@ 
         if ($stmt === false) {
             $errorInfo = $db->errorInfo();
             $errorMsg = $errorInfo[2];
-            throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+            throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>');
         }
         return $stmt;
     }
@@ -309,19 +309,19 @@ 
         $stmt = $this->getDbStatement('
             INSERT OR REPLACE INTO documents (`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,`state`,`lastModificationDate`,`creationDate`,`lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`)
             VALUES(
-              ' . $db->quote($documentObject->path) . ',
-              ' . $db->quote($documentObject->title) . ',
-              ' . $db->quote($documentObject->slug) . ',
-              ' . $db->quote($documentObject->type) . ',
-              ' . $db->quote($documentObject->documentType) . ',
-              ' . $db->quote($documentObject->documentTypeSlug) . ',
-              ' . $db->quote($documentObject->state) . ',
-              ' . $db->quote($documentObject->lastModificationDate) . ',
-              ' . $db->quote($documentObject->creationDate) . ',
-              ' . $db->quote($documentObject->lastModifiedBy) . ',
-              ' . $db->quote(json_encode($documentObject->fields)) . ',
-              ' . $db->quote(json_encode($documentObject->bricks)) . ',
-              ' . $db->quote(json_encode($documentObject->dynamicBricks)) . '
+              ' . $db->quote($documentObject->path).',
+              ' . $db->quote($documentObject->title).',
+              ' . $db->quote($documentObject->slug).',
+              ' . $db->quote($documentObject->type).',
+              ' . $db->quote($documentObject->documentType).',
+              ' . $db->quote($documentObject->documentTypeSlug).',
+              ' . $db->quote($documentObject->state).',
+              ' . $db->quote($documentObject->lastModificationDate).',
+              ' . $db->quote($documentObject->creationDate).',
+              ' . $db->quote($documentObject->lastModifiedBy).',
+              ' . $db->quote(json_encode($documentObject->fields)).',
+              ' . $db->quote(json_encode($documentObject->bricks)).',
+              ' . $db->quote(json_encode($documentObject->dynamicBricks)).'
             )
         ');
         $result = $stmt->execute();
@@ -336,15 +336,15 @@ 
             if ($documentToDelete->type == 'document') {
                 $stmt = $this->getDbStatement('
                     DELETE FROM documents
-                          WHERE path = ' . $db->quote($path) . '
+                          WHERE path = ' . $db->quote($path).'
                 ');
             } elseif ($documentToDelete->type == 'folder') {
-                $folderPathWithWildcard = $path . '%';
+                $folderPathWithWildcard = $path.'%';
                 $stmt = $this->getDbStatement('
                     DELETE FROM documents
-                          WHERE (path LIKE ' . $db->quote($folderPathWithWildcard) . '
-                            AND substr(`path`, ' . (strlen($path) + 1) . ', 1) = "/")
-                            OR path = ' . $db->quote($path) . '
+                          WHERE (path LIKE ' . $db->quote($folderPathWithWildcard).'
+                            AND substr(`path`, ' . (strlen($path) + 1).', 1) = "/")
+                            OR path = ' . $db->quote($path).'
                 ');
             }
         }

cloudcontrol/library/storage/Document.php

Spacing +7 added lines, -7 removed lines

@@ -39,7 +39,7 @@ 
             }
         } elseif ($name === 'content') {
             if ($this->dbHandle === null) {
-                throw new \Exception('Document doesnt have a dbHandle handle. (path: ' . $this->path . ')');
+                throw new \Exception('Document doesnt have a dbHandle handle. (path: '.$this->path.')');
             } else {
                 if ($this->content === null) {
                     $this->getContent();
@@ -68,19 +68,19 @@ 
      */
     protected function getContent()
     {
-        $folderPathWithWildcard = $this->path . '%';
+        $folderPathWithWildcard = $this->path.'%';
         $sql = '    SELECT *
                       FROM documents
-                     WHERE `path` LIKE ' . $this->dbHandle->quote($folderPathWithWildcard) . '
-                       AND substr(`path`, ' . (strlen($this->path) + 2) . ') NOT LIKE "%/%"
-                       AND substr(`path`, ' . (strlen($this->path) + 1) . ', 1) = "/"
-                       AND path != ' . $this->dbHandle->quote($this->path) . '
+                     WHERE `path` LIKE ' . $this->dbHandle->quote($folderPathWithWildcard).'
+                       AND substr(`path`, ' . (strlen($this->path) + 2).') NOT LIKE "%/%"
+                       AND substr(`path`, ' . (strlen($this->path) + 1).', 1) = "/"
+                       AND path != ' . $this->dbHandle->quote($this->path).'
                     ';
         $stmt = $this->dbHandle->query($sql);
         if ($stmt === false) {
             $errorInfo = $this->dbHandle->errorInfo();
             $errorMsg = $errorInfo[2];
-            throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+            throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>');
         }
         $contents = $stmt->fetchAll(\PDO::FETCH_CLASS, '\library\storage\Document');
         foreach ($contents as $key => $document) {

cloudcontrol/library/storage/JsonStorage.php

Spacing +28 added lines, -28 removed lines

@@ -36,7 +36,7 @@ 
 		 */
 		private function config()
 		{
-			$storagePath = __DIR__ . '/../../' . $this->storageDir;
+			$storagePath = __DIR__.'/../../'.$this->storageDir;
 			if (realpath($storagePath) === false) {
 				initFramework($storagePath);
 				if (Repository::create($storagePath)) {
@@ -44,7 +44,7 @@ 
 					$repository->init();
 					$this->repository = $repository;
 				} else {
-					throw new \Exception('Could not create repository directory: ' . $storagePath);
+					throw new \Exception('Could not create repository directory: '.$storagePath);
 				}
 			} else {
 				$this->repository = new Repository($storagePath);
@@ -194,20 +194,20 @@ 
 		 */
 		public function getDocumentBySlug($slug)
 		{
-            $path = '/' . $slug;
+            $path = '/'.$slug;
 			return $this->repository->getDocumentByPath($path);
 		}
 
 		public function saveDocument($postValues)
 		{
-            $oldPath = '/' . $postValues['path'];
+            $oldPath = '/'.$postValues['path'];
 
             $container = $this->getDocumentContainerByPath($oldPath);
             $documentObject = $this->createDocumentFromPostValues($postValues);
             if ($container->path === '/') {
-                $newPath = $container->path . $documentObject->slug;
+                $newPath = $container->path.$documentObject->slug;
             } else {
-                $newPath = $container->path . '/' . $documentObject->slug;
+                $newPath = $container->path.'/'.$documentObject->slug;
             }
             $documentObject->path = $newPath;
             $this->repository->saveDocument($documentObject);
@@ -217,9 +217,9 @@ 
 		{
 			$documentObject = $this->createDocumentFromPostValues($postValues);
             if ($postValues['path'] === '/') {
-                $documentObject->path = $postValues['path'] . $documentObject->slug;
+                $documentObject->path = $postValues['path'].$documentObject->slug;
             } else {
-                $documentObject->path = $postValues['path'] . '/' . $documentObject->slug;
+                $documentObject->path = $postValues['path'].'/'.$documentObject->slug;
             }
 
             $this->repository->saveDocument($documentObject);
@@ -227,7 +227,7 @@ 
 
 		public function deleteDocumentBySlug($slug)
 		{
-            $path = '/' . $slug;
+            $path = '/'.$slug;
 			$this->repository->deleteDocumentByPath($path);
 		}
 
@@ -309,9 +309,9 @@ 
 		{
             $documentFolderObject = $this->createDocumentFolderFromPostValues($postValues);
             if ($postValues['path'] === '/') {
-                $documentFolderObject->path = $postValues['path'] . $documentFolderObject->slug;
+                $documentFolderObject->path = $postValues['path'].$documentFolderObject->slug;
             } else {
-                $documentFolderObject->path = $postValues['path'] . '/' . $documentFolderObject->slug;
+                $documentFolderObject->path = $postValues['path'].'/'.$documentFolderObject->slug;
             }
             $this->repository->saveDocument($documentFolderObject);
 		}
@@ -325,7 +325,7 @@ 
 		 */
 		public function deleteDocumentFolderBySlug($slug)
 		{
-            $path = '/' . $slug;
+            $path = '/'.$slug;
 			$this->repository->deleteDocumentByPath($path);
 		}
 
@@ -339,7 +339,7 @@ 
 		 */
 		public function getDocumentFolderBySlug($slug)
 		{
-            $path = '/' . $slug;
+            $path = '/'.$slug;
 			return $this->repository->getDocumentByPath($path);
 		}
 
@@ -550,13 +550,13 @@ 
 
 		public function addImage($postValues)
 		{
-			$destinationPath = realpath(__DIR__ . '/../../www/images/');
+			$destinationPath = realpath(__DIR__.'/../../www/images/');
 
 			$filename = $this->validateFilename($postValues['name'], $destinationPath);
-			$destination = $destinationPath . '/' . $filename;
+			$destination = $destinationPath.'/'.$filename;
 
 			if ($postValues['error'] != '0') {
-				throw new \Exception('Error uploading file. Error code: ' . $postValues['error']);
+				throw new \Exception('Error uploading file. Error code: '.$postValues['error']);
 			}
 
 			if (move_uploaded_file($postValues['tmp_name'], $destination)) {
@@ -581,14 +581,14 @@ 
 
 		public function deleteImageByName($filename)
 		{
-			$destinationPath = realpath(__DIR__ . '/../../www/images/');
+			$destinationPath = realpath(__DIR__.'/../../www/images/');
 
 			$images = $this->getImages();
 
 			foreach ($images as $key => $image) {
 				if ($image->file == $filename) {
 					foreach ($image->set as $imageSetFilename) {
-						$destination = $destinationPath . '/' . $imageSetFilename;
+						$destination = $destinationPath.'/'.$imageSetFilename;
 						if (file_exists($destination)) {
 							unlink($destination);
 						} else {
@@ -630,7 +630,7 @@ 
 		 */
 		public function getFiles()
 		{
-			$files =  $this->repository->files;
+			$files = $this->repository->files;
 			usort($files, array($this, 'compareFiles'));
 			return $files;
 		}
@@ -642,13 +642,13 @@ 
 
 		public function addFile($postValues)
 		{
-			$destinationPath = realpath(__DIR__ . '/../../www/files/');
+			$destinationPath = realpath(__DIR__.'/../../www/files/');
 
 			$filename = $this->validateFilename($postValues['name'], $destinationPath);
-			$destination = $destinationPath . '/' . $filename;
+			$destination = $destinationPath.'/'.$filename;
 
 			if ($postValues['error'] != '0') {
-				throw new \Exception('Error uploading file. Error code: ' . $postValues['error']);
+				throw new \Exception('Error uploading file. Error code: '.$postValues['error']);
 			}
 
 			if (move_uploaded_file($postValues['tmp_name'], $destination)) {
@@ -674,23 +674,23 @@ 
 				array_pop($fileParts);
 				$fileNameWithoutExtension = implode('-', $fileParts);
 				$fileNameWithoutExtension = slugify($fileNameWithoutExtension);
-				$filename = $fileNameWithoutExtension . '.' . $extension;
+				$filename = $fileNameWithoutExtension.'.'.$extension;
 			} else {
 				$filename = slugify($filename);
 			}
 
-			if (file_exists($path . '/' . $filename)) {
+			if (file_exists($path.'/'.$filename)) {
 				$fileParts = explode('.', $filename);
 				if (count($fileParts) > 1) {
 					$extension = end($fileParts);
 					array_pop($fileParts);
 					$fileNameWithoutExtension = implode('-', $fileParts);
 					$fileNameWithoutExtension .= '-copy';
-					$filename = $fileNameWithoutExtension . '.' . $extension;
+					$filename = $fileNameWithoutExtension.'.'.$extension;
 				} else {
 					$filename .= '-copy';
 				}
-				return $this->validateFilename($filename,$path);
+				return $this->validateFilename($filename, $path);
 			}
 			return $filename;
 		}
@@ -716,8 +716,8 @@ 
          */
 		public function deleteFileByName($filename)
 		{
-			$destinationPath = realpath(__DIR__ . '/../../www/files/');
-			$destination = $destinationPath . '/' . $filename;
+			$destinationPath = realpath(__DIR__.'/../../www/files/');
+			$destination = $destinationPath.'/'.$filename;
 
 			if (file_exists($destination)) {
 				$files = $this->getFiles();