Passed
Push — develop ( 02ffeb...d59462 )
by Jens
02:18
created
cloudcontrol/templates/cms/images/show.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -10,22 +10,22 @@
 block discarded – undo
10 10
 	<div class="show-image">
11 11
 		<label>File</label>
12 12
 		<div class="value">
13
-			<?=isset($image)? $image->file : '' ?>
13
+			<?=isset($image) ? $image->file : '' ?>
14 14
 		</div>
15 15
 		<label>Type</label>
16 16
 		<div class="value">
17
-			<?=isset($image)? $image->type : '' ?>
17
+			<?=isset($image) ? $image->type : '' ?>
18 18
 		</div>
19 19
 		<label>Size</label>
20 20
 		<div class="value">
21
-			<?=isset($image)? \library\cc\StringUtil::humanFileSize($image->size) : '' ?>
21
+			<?=isset($image) ? \library\cc\StringUtil::humanFileSize($image->size) : '' ?>
22 22
 		</div>
23 23
 		<label>Set</label>
24 24
 		<? if (isset($image)) : ?>
25 25
 			<? foreach ($image->set as $key => $set) : ?>
26 26
 				<div class="sets">
27 27
 					<label><?=$key?></label>
28
-					<img src="<?=\library\cc\Request::$subfolders . 'images/' . $set?>" />
28
+					<img src="<?=\library\cc\Request::$subfolders.'images/'.$set?>" />
29 29
 				</div>
30 30
 			<? endforeach ?>
31 31
 		<? endif ?>
Please login to merge, or discard this patch.
cloudcontrol/library/search/indexer/TermCount.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 	protected function applyFilters($tokens)
47 47
 	{
48 48
 		foreach ($this->filters as $filterName) {
49
-			$filterClassName = '\library\search\filters\\' . $filterName;
49
+			$filterClassName = '\library\search\filters\\'.$filterName;
50 50
 			$filter = new $filterClassName($tokens);
51 51
 			$tokens = $filter->getFilterResults();
52 52
 		}
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 		foreach ($documentTermCount as $field => $countArray) {
67 67
 			$quotedField = $db->quote($field);
68 68
 			foreach ($countArray as $term => $count) {
69
-				$values[] = $quotedDocumentPath . ', ' . $db->quote($term) . ', ' . $db->quote($count) . ', ' . $quotedField;
69
+				$values[] = $quotedDocumentPath.', '.$db->quote($term).', '.$db->quote($count).', '.$quotedField;
70 70
 				$i += 1;
71 71
 				if ($i >= Indexer::SQLITE_MAX_COMPOUND_SELECT) {
72 72
 					$this->executeStoreDocumentTermCount($values, $sql, $db);
@@ -90,13 +90,13 @@  discard block
 block discarded – undo
90 90
 	 */
91 91
 	protected function executeStoreDocumentTermCount($values, $sql, $db)
92 92
 	{
93
-		$sql .= '(' . implode('),' . PHP_EOL . '(', $values) . ');';
93
+		$sql .= '('.implode('),'.PHP_EOL.'(', $values).');';
94 94
 
95 95
 		$stmt = $db->prepare($sql);
96 96
 		if ($stmt === false || !$stmt->execute()) {
97 97
 			$errorInfo = $db->errorInfo();
98 98
 			$errorMsg = $errorInfo[2];
99
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
99
+			throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>');
100 100
 		}
101 101
 	}
102 102
 
Please login to merge, or discard this patch.
cloudcontrol/library/storage/storage/DocumentStorage.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 	public function getDocuments($state = 'published')
22 22
 	{
23 23
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
24
-			throw new \Exception('Unsupported document state: ' . $state);
24
+			throw new \Exception('Unsupported document state: '.$state);
25 25
 		}
26 26
 		return $this->repository->getDocuments($state);
27 27
 	}
@@ -50,9 +50,9 @@  discard block
 block discarded – undo
50 50
 	public function getDocumentBySlug($slug, $state = 'published')
51 51
 	{
52 52
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
53
-			throw new \Exception('Unsupported document state: ' . $state);
53
+			throw new \Exception('Unsupported document state: '.$state);
54 54
 		}
55
-		$path = '/' . $slug;
55
+		$path = '/'.$slug;
56 56
 
57 57
 		return $this->repository->getDocumentByPath($path, $state);
58 58
 	}
@@ -66,16 +66,16 @@  discard block
 block discarded – undo
66 66
 	public function saveDocument($postValues, $state = 'unpublished')
67 67
 	{
68 68
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
69
-			throw new \Exception('Unsupported document state: ' . $state);
69
+			throw new \Exception('Unsupported document state: '.$state);
70 70
 		}
71
-		$oldPath = '/' . $postValues['path'];
71
+		$oldPath = '/'.$postValues['path'];
72 72
 
73 73
 		$container = $this->getDocumentContainerByPath($oldPath);
74 74
 		$documentObject = DocumentFactory::createDocumentFromPostValues($postValues, new DocumentTypesStorage($this->repository));
75 75
 		if ($container->path === '/') {
76
-			$newPath = $container->path . $documentObject->slug;
76
+			$newPath = $container->path.$documentObject->slug;
77 77
 		} else {
78
-			$newPath = $container->path . '/' . $documentObject->slug;
78
+			$newPath = $container->path.'/'.$documentObject->slug;
79 79
 		}
80 80
 		$documentObject->path = $newPath;
81 81
 		$this->repository->saveDocument($documentObject, $state);
@@ -89,9 +89,9 @@  discard block
 block discarded – undo
89 89
 	{
90 90
 		$documentObject = DocumentFactory::createDocumentFromPostValues($postValues, new DocumentTypesStorage($this->repository));
91 91
 		if ($postValues['path'] === '/') {
92
-			$documentObject->path = $postValues['path'] . $documentObject->slug;
92
+			$documentObject->path = $postValues['path'].$documentObject->slug;
93 93
 		} else {
94
-			$documentObject->path = $postValues['path'] . '/' . $documentObject->slug;
94
+			$documentObject->path = $postValues['path'].'/'.$documentObject->slug;
95 95
 		}
96 96
 
97 97
 		$this->repository->saveDocument($documentObject, $state);
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 	 */
103 103
 	public function deleteDocumentBySlug($slug)
104 104
 	{
105
-		$path = '/' . $slug;
105
+		$path = '/'.$slug;
106 106
 		$this->repository->deleteDocumentByPath($path);
107 107
 	}
108 108
 
Please login to merge, or discard this patch.
cloudcontrol/library/storage/Storage.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 		 */
83 83
 		private function config()
84 84
 		{
85
-			$storagePath = __DIR__ . '/../../' . $this->storageDir;
85
+			$storagePath = __DIR__.'/../../'.$this->storageDir;
86 86
 			if (realpath($storagePath) === false) {
87 87
 				initFramework();
88 88
 				if (Repository::create($storagePath)) {
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 					$repository->init();
91 91
 					$this->repository = $repository;
92 92
 				} else {
93
-					throw new \Exception('Could not create repository directory: ' . $storagePath);
93
+					throw new \Exception('Could not create repository directory: '.$storagePath);
94 94
 				}
95 95
 			} else {
96 96
 				$this->repository = new Repository($storagePath);
@@ -133,9 +133,9 @@  discard block
 block discarded – undo
133 133
 		{
134 134
 			$documentFolderObject = DocumentFolderFactory::createDocumentFolderFromPostValues($postValues);
135 135
 			if ($postValues['path'] === '/') {
136
-				$documentFolderObject->path = $postValues['path'] . $documentFolderObject->slug;
136
+				$documentFolderObject->path = $postValues['path'].$documentFolderObject->slug;
137 137
 			} else {
138
-				$documentFolderObject->path = $postValues['path'] . '/' . $documentFolderObject->slug;
138
+				$documentFolderObject->path = $postValues['path'].'/'.$documentFolderObject->slug;
139 139
 			}
140 140
 			$this->repository->saveDocument($documentFolderObject, 'published');
141 141
 			$this->repository->saveDocument($documentFolderObject, 'unpublished');
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 		 */
151 151
 		public function deleteDocumentFolderBySlug($slug)
152 152
 		{
153
-			$path = '/' . $slug;
153
+			$path = '/'.$slug;
154 154
 			$this->repository->deleteDocumentByPath($path, 'published');
155 155
 			$this->repository->deleteDocumentByPath($path, 'unpublished');
156 156
 			$this->repository->cleanPublishedDeletedDocuments();
@@ -158,13 +158,13 @@  discard block
 block discarded – undo
158 158
 
159 159
 		public function publishDocumentBySlug($slug)
160 160
 		{
161
-			$path = '/' . $slug;
161
+			$path = '/'.$slug;
162 162
 			$this->repository->publishDocumentByPath($path);
163 163
 		}
164 164
 
165 165
 		public function unpublishDocumentBySlug($slug)
166 166
 		{
167
-			$path = '/' . $slug;
167
+			$path = '/'.$slug;
168 168
 			$this->repository->unpublishDocumentByPath($path);
169 169
 		}
170 170
 
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 		 */
179 179
 		public function getDocumentFolderBySlug($slug)
180 180
 		{
181
-			$path = '/' . $slug;
181
+			$path = '/'.$slug;
182 182
 
183 183
 			return $this->repository->getDocumentByPath($path);
184 184
 		}
Please login to merge, or discard this patch.
cloudcontrol/library/search/Indexer.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 		$this->storage->getDocuments()->cleanPublishedDeletedDocuments();
61 61
 		$this->addLog('Retrieving documents to be indexed.');
62 62
 		$documents = $this->storage->getDocuments()->getPublishedDocumentsNoFolders();
63
-		$this->addLog('Start Document Term Count for ' . count($documents) . ' documents');
63
+		$this->addLog('Start Document Term Count for '.count($documents).' documents');
64 64
 		$this->createDocumentTermCount($documents);
65 65
 		$this->addLog('Start Document Term Frequency.');
66 66
 		$this->createDocumentTermFrequency();
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
 	private function addLog($string)
162 162
 	{
163 163
 		$currentTime = round(microtime(true) * 1000);
164
-		$this->log .= date('d-m-Y H:i:s - ') . str_pad($string, 50, " ", STR_PAD_RIGHT) . "\t" . ($currentTime - $this->lastLog) . 'ms since last log. ' . "\t" . ($currentTime - $this->loggingStart) . 'ms since start.' . PHP_EOL;
164
+		$this->log .= date('d-m-Y H:i:s - ').str_pad($string, 50, " ", STR_PAD_RIGHT)."\t".($currentTime - $this->lastLog).'ms since last log. '."\t".($currentTime - $this->loggingStart).'ms since start.'.PHP_EOL;
165 165
 		$this->lastLog = round(microtime(true) * 1000);
166 166
 	}
167 167
 
@@ -173,8 +173,8 @@  discard block
 block discarded – undo
173 173
 	protected function getSearchDbHandle()
174 174
 	{
175 175
 		if ($this->searchDbHandle === null) {
176
-			$path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . $this->storageDir . DIRECTORY_SEPARATOR;
177
-			$this->searchDbHandle = new \PDO('sqlite:' . $path . self::SEARCH_TEMP_DB);
176
+			$path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$this->storageDir.DIRECTORY_SEPARATOR;
177
+			$this->searchDbHandle = new \PDO('sqlite:'.$path.self::SEARCH_TEMP_DB);
178 178
 		}
179 179
 		return $this->searchDbHandle;
180 180
 	}
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
 	public function replaceOldIndex()
186 186
 	{
187 187
 		$this->searchDbHandle = null;
188
-		$path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . $this->storageDir . DIRECTORY_SEPARATOR;
189
-		rename($path . self::SEARCH_TEMP_DB, $path . 'search.db');
188
+		$path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$this->storageDir.DIRECTORY_SEPARATOR;
189
+		rename($path.self::SEARCH_TEMP_DB, $path.'search.db');
190 190
 	}
191 191
 }
192 192
\ No newline at end of file
Please login to merge, or discard this patch.
cloudcontrol/library/components/cms/SearchRouting.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 	}
73 73
 
74 74
 	private function showJson($obj, $httpHeader = 'HTTP/1.0 200 OK') {
75
-		header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
75
+		header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true);
76 76
 		header('Content-type: application/json');
77 77
 		die(json_encode($obj));
78 78
 	}
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 	 */
85 85
 	private function stepRouting($step, $cmsComponent, $indexer)
86 86
 	{
87
-		switch($step) {
87
+		switch ($step) {
88 88
 			case 'resetIndex': $indexer->resetIndex(); break;
89 89
 			case 'cleanPublishedDeletedDocuments': $cmsComponent->storage->getDocuments()->cleanPublishedDeletedDocuments(); break;
90 90
 			case 'createDocumentTermCount':
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 			case 'createTermFieldLengthNorm': $indexer->createTermFieldLengthNorm(); break;
96 96
 			case 'createInverseDocumentFrequency': $indexer->createInverseDocumentFrequency(); break;
97 97
 			case 'replaceOldIndex': $indexer->replaceOldIndex(); break;
98
-			default : $this->showJson('Invalid step: ' . $step . '.', 'HTTP/1.0 500 Internal Server Error'); break;
98
+			default : $this->showJson('Invalid step: '.$step.'.', 'HTTP/1.0 500 Internal Server Error'); break;
99 99
 		}
100 100
 		$this->showJson('done');
101 101
 	}
Please login to merge, or discard this patch.
cloudcontrol/templates/cms/documents.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
1 1
 <? include('documents/function.renderAction.php'); ?>
2 2
 <? include('documents/function.renderDocument.php'); ?>
3 3
 <? include('documents/function.renderFolder.php'); ?>
4
-<script>window.onload=function(){History.init();History.replaceState(null, 'Cloud Control CMS', '/<?=$request::$subfolders . $cmsPrefix?>/documents?path=/');};</script>
4
+<script>window.onload=function(){History.init();History.replaceState(null, 'Cloud Control CMS', '/<?=$request::$subfolders.$cmsPrefix?>/documents?path=/');};</script>
5 5
 <section class="documents">
6 6
 	<h2><i class="fa fa-file-text-o"></i> Documents</h2>
7 7
 	<nav class="actions">
@@ -27,9 +27,9 @@  discard block
 block discarded – undo
27 27
 			<? foreach ($documents as $document) : ?>
28 28
 				<li class="grid-container">
29 29
 					<? if ($document->type == 'document') : ?>
30
-						<?renderDocument($document, $cmsPrefix);?>
30
+						<?renderDocument($document, $cmsPrefix); ?>
31 31
 					<? elseif ($document->type == 'folder') : ?>
32
-						<?renderFolder($document, $cmsPrefix, '', true);?>
32
+						<?renderFolder($document, $cmsPrefix, '', true); ?>
33 33
 					<? endif ?>
34 34
 				</li>
35 35
 			<? endforeach ?>
Please login to merge, or discard this patch.
cloudcontrol/library/storage/Repository.php 1 patch
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -106,13 +106,13 @@  discard block
 block discarded – undo
106 106
             if (in_array($name, $this->fileBasedSubsets)) {
107 107
                 return $this->$name;
108 108
             } else {
109
-                throw new \Exception('Trying to get undefined property from Repository: ' . $name);
109
+                throw new \Exception('Trying to get undefined property from Repository: '.$name);
110 110
             }
111 111
         } else {
112 112
             if (in_array($name, $this->fileBasedSubsets)) {
113 113
                 return $this->loadSubset($name);
114 114
             } else {
115
-                throw new \Exception('Trying to get undefined property from Repository: ' . $name);
115
+                throw new \Exception('Trying to get undefined property from Repository: '.$name);
116 116
             }
117 117
         }
118 118
     }
@@ -127,10 +127,10 @@  discard block
 block discarded – undo
127 127
     {
128 128
         if (in_array($name, $this->fileBasedSubsets)) {
129 129
             $this->$name = $value;
130
-            $changes = $name . 'Changes';
130
+            $changes = $name.'Changes';
131 131
             $this->$changes = true;
132 132
         } else {
133
-            throw new \Exception('Trying to persist unknown subset in repository: ' . $name . ' <br /><pre>' . print_r($value, true) . '</pre>');
133
+            throw new \Exception('Trying to persist unknown subset in repository: '.$name.' <br /><pre>'.print_r($value, true).'</pre>');
134 134
         }
135 135
     }
136 136
 
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
      */
140 140
     public function save()
141 141
     {
142
-        array_map(function ($value) {
142
+        array_map(function($value) {
143 143
         	$this->saveSubset($value);
144 144
 		}, $this->fileBasedSubsets);
145 145
     }
@@ -150,10 +150,10 @@  discard block
 block discarded – undo
150 150
      */
151 151
     protected function saveSubset($subset)
152 152
     {
153
-		$changes = $subset . 'Changes';
153
+		$changes = $subset.'Changes';
154 154
 		if ($this->$changes === true) {
155 155
 			$json = json_encode($this->$subset, JSON_PRETTY_PRINT);
156
-			$subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
156
+			$subsetStoragePath = $this->storagePath.DIRECTORY_SEPARATOR.$subset.'.json';
157 157
 			file_put_contents($subsetStoragePath, $json);
158 158
 
159 159
 			$this->$changes = false;
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
      */
168 168
     protected function loadSubset($subset)
169 169
     {
170
-        $subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
170
+        $subsetStoragePath = $this->storagePath.DIRECTORY_SEPARATOR.$subset.'.json';
171 171
         $json = file_get_contents($subsetStoragePath);
172 172
         $json = json_decode($json);
173 173
         $this->$subset = $json;
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
     public function getContentDbHandle()
216 216
     {
217 217
         if ($this->contentDbHandle === null) {
218
-            $this->contentDbHandle = new \PDO('sqlite:' . $this->storagePath . DIRECTORY_SEPARATOR . 'content.db');
218
+            $this->contentDbHandle = new \PDO('sqlite:'.$this->storagePath.DIRECTORY_SEPARATOR.'content.db');
219 219
         }
220 220
         return $this->contentDbHandle;
221 221
     }
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
     public function getDocuments($state = 'published')
232 232
     {
233 233
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
234
-			throw new \Exception('Unsupported document state: ' . $state);
234
+			throw new \Exception('Unsupported document state: '.$state);
235 235
 		}
236 236
         return $this->getDocumentsByPath('/', $state);
237 237
     }
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 	public function getDocumentsWithState($folderPath = '/')
240 240
 	{
241 241
 		$db = $this->getContentDbHandle();
242
-		$folderPathWithWildcard = $folderPath . '%';
242
+		$folderPathWithWildcard = $folderPath.'%';
243 243
 
244 244
 		$ifRootIndex = 1;
245 245
 		if ($folderPath == '/') {
@@ -254,10 +254,10 @@  discard block
 block discarded – undo
254 254
               FROM documents_unpublished
255 255
 		 LEFT JOIN documents_published
256 256
          		ON documents_published.path = documents_unpublished.path
257
-             WHERE documents_unpublished.`path` LIKE ' . $db->quote($folderPathWithWildcard) . '
258
-               AND substr(documents_unpublished.`path`, ' . (strlen($folderPath) + $ifRootIndex + 1) . ') NOT LIKE "%/%"
259
-               AND length(documents_unpublished.`path`) > ' . (strlen($folderPath) + $ifRootIndex) . '
260
-               AND documents_unpublished.path != ' . $db->quote($folderPath) . '
257
+             WHERE documents_unpublished.`path` LIKE ' . $db->quote($folderPathWithWildcard).'
258
+               AND substr(documents_unpublished.`path`, ' . (strlen($folderPath) + $ifRootIndex + 1).') NOT LIKE "%/%"
259
+               AND length(documents_unpublished.`path`) > ' . (strlen($folderPath) + $ifRootIndex).'
260
+               AND documents_unpublished.path != ' . $db->quote($folderPath).'
261 261
           ORDER BY documents_unpublished.`type` DESC, documents_unpublished.`path` ASC
262 262
         ';
263 263
 		$stmt = $this->getDbStatement($sql);
@@ -284,16 +284,16 @@  discard block
 block discarded – undo
284 284
     public function getDocumentsByPath($folderPath, $state = 'published')
285 285
     {
286 286
     	if (!in_array($state, Document::$DOCUMENT_STATES)) {
287
-    		throw new \Exception('Unsupported document state: ' . $state);
287
+    		throw new \Exception('Unsupported document state: '.$state);
288 288
 		}
289 289
         $db = $this->getContentDbHandle();
290
-        $folderPathWithWildcard = $folderPath . '%';
290
+        $folderPathWithWildcard = $folderPath.'%';
291 291
 
292 292
         $sql = 'SELECT *
293
-              FROM documents_' . $state . '
294
-             WHERE `path` LIKE ' . $db->quote($folderPathWithWildcard) . '
295
-               AND substr(`path`, ' . (strlen($folderPath) + 1) . ') NOT LIKE "%/%"
296
-               AND path != ' . $db->quote($folderPath) . '
293
+              FROM documents_' . $state.'
294
+             WHERE `path` LIKE ' . $db->quote($folderPathWithWildcard).'
295
+               AND substr(`path`, ' . (strlen($folderPath) + 1).') NOT LIKE "%/%"
296
+               AND path != ' . $db->quote($folderPath).'
297 297
           ORDER BY `type` DESC, `path` ASC';
298 298
         $stmt = $this->getDbStatement($sql);
299 299
 
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
         if ($containerPath === '/') {
321 321
             return $this->getRootFolder();
322 322
         }
323
-        if (substr($containerPath, -1) === '/'){
323
+        if (substr($containerPath, -1) === '/') {
324 324
 			$containerPath = substr($containerPath, 0, -1);
325 325
 		}
326 326
         $containerFolder = $this->getDocumentByPath($containerPath, 'unpublished');
@@ -337,13 +337,13 @@  discard block
 block discarded – undo
337 337
     public function getDocumentByPath($path, $state = 'published')
338 338
     {
339 339
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
340
-			throw new \Exception('Unsupported document state: ' . $state);
340
+			throw new \Exception('Unsupported document state: '.$state);
341 341
 		}
342 342
         $db = $this->getContentDbHandle();
343 343
         $document = $this->fetchDocument('
344 344
             SELECT *
345
-              FROM documents_' .  $state . '
346
-             WHERE path = ' . $db->quote($path) . '
345
+              FROM documents_' .  $state.'
346
+             WHERE path = ' . $db->quote($path).'
347 347
         ');
348 348
         if ($document instanceof Document && $document->type === 'folder') {
349 349
             $document->dbHandle = $db;
@@ -363,16 +363,16 @@  discard block
 block discarded – undo
363 363
 	public function getTotalDocumentCount($state = 'published')
364 364
 	{
365 365
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
366
-			throw new \Exception('Unsupported document state: ' . $state);
366
+			throw new \Exception('Unsupported document state: '.$state);
367 367
 		}
368 368
 		$db = $this->getContentDbHandle();
369 369
 		$stmt = $db->query('
370 370
 			SELECT count(*)
371
-			  FROM documents_' . $state . '
371
+			  FROM documents_' . $state.'
372 372
 			 WHERE `type` != "folder"
373 373
 		');
374 374
 		$result = $stmt->fetch(\PDO::FETCH_ASSOC);
375
-		if (!is_array($result )) {
375
+		if (!is_array($result)) {
376 376
 			return 0;
377 377
 		}
378 378
 		return intval(current($result));
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
 		if ($stmt === false || !$stmt->execute()) {
392 392
 			$errorInfo = $db->errorInfo();
393 393
 			$errorMsg = $errorInfo[2];
394
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
394
+			throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>');
395 395
 		}
396 396
 		return $result;
397 397
 	}
@@ -401,7 +401,7 @@  discard block
 block discarded – undo
401 401
 			$sql = '
402 402
 				INSERT OR REPLACE INTO documents_published 
403 403
 					  (`id`,`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,`state`,`lastModificationDate`,`creationDate`,`publicationDate`,`lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`)
404
-				SELECT `id`,`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,"published" as state,`lastModificationDate`,`creationDate`,' . time() . ' as publicationDate, `lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`
404
+				SELECT `id`,`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,"published" as state,`lastModificationDate`,`creationDate`,' . time().' as publicationDate, `lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`
405 405
 				  FROM documents_unpublished
406 406
 				 WHERE `path` = :path
407 407
 			';
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
414 414
 		if ($stmt === false) {
415 415
 			$errorInfo = $db->errorInfo();
416 416
 			$errorMsg = $errorInfo[2];
417
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
417
+			throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>');
418 418
 		}
419 419
 		$stmt->bindValue(':path', $path);
420 420
 		$stmt->execute();
@@ -481,7 +481,7 @@  discard block
 block discarded – undo
481 481
         if ($stmt === false) {
482 482
             $errorInfo = $db->errorInfo();
483 483
             $errorMsg = $errorInfo[2];
484
-            throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
484
+            throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>');
485 485
         }
486 486
         return $stmt;
487 487
     }
@@ -511,25 +511,25 @@  discard block
 block discarded – undo
511 511
     public function saveDocument($documentObject, $state = 'published')
512 512
     {
513 513
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
514
-			throw new \Exception('Unsupported document state: ' . $state);
514
+			throw new \Exception('Unsupported document state: '.$state);
515 515
 		}
516 516
         $db = $this->getContentDbHandle();
517 517
         $stmt = $this->getDbStatement('
518
-            INSERT OR REPLACE INTO documents_' . $state . ' (`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,`state`,`lastModificationDate`,`creationDate`,`lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`)
518
+            INSERT OR REPLACE INTO documents_' . $state.' (`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,`state`,`lastModificationDate`,`creationDate`,`lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`)
519 519
             VALUES(
520
-              ' . $db->quote($documentObject->path) . ',
521
-              ' . $db->quote($documentObject->title) . ',
522
-              ' . $db->quote($documentObject->slug) . ',
523
-              ' . $db->quote($documentObject->type) . ',
524
-              ' . $db->quote($documentObject->documentType) . ',
525
-              ' . $db->quote($documentObject->documentTypeSlug) . ',
526
-              ' . $db->quote($documentObject->state) . ',
527
-              ' . $db->quote($documentObject->lastModificationDate) . ',
528
-              ' . $db->quote($documentObject->creationDate) . ',
529
-              ' . $db->quote($documentObject->lastModifiedBy) . ',
530
-              ' . $db->quote(json_encode($documentObject->fields)) . ',
531
-              ' . $db->quote(json_encode($documentObject->bricks)) . ',
532
-              ' . $db->quote(json_encode($documentObject->dynamicBricks)) . '
520
+              ' . $db->quote($documentObject->path).',
521
+              ' . $db->quote($documentObject->title).',
522
+              ' . $db->quote($documentObject->slug).',
523
+              ' . $db->quote($documentObject->type).',
524
+              ' . $db->quote($documentObject->documentType).',
525
+              ' . $db->quote($documentObject->documentTypeSlug).',
526
+              ' . $db->quote($documentObject->state).',
527
+              ' . $db->quote($documentObject->lastModificationDate).',
528
+              ' . $db->quote($documentObject->creationDate).',
529
+              ' . $db->quote($documentObject->lastModifiedBy).',
530
+              ' . $db->quote(json_encode($documentObject->fields)).',
531
+              ' . $db->quote(json_encode($documentObject->bricks)).',
532
+              ' . $db->quote(json_encode($documentObject->dynamicBricks)).'
533 533
             )
534 534
         ');
535 535
         $result = $stmt->execute();
@@ -553,16 +553,16 @@  discard block
 block discarded – undo
553 553
             if ($documentToDelete->type == 'document') {
554 554
                 $stmt = $this->getDbStatement('
555 555
                     DELETE FROM documents_unpublished
556
-                          WHERE path = ' . $db->quote($path) . '
556
+                          WHERE path = ' . $db->quote($path).'
557 557
                 ');
558 558
                 $stmt->execute();
559 559
             } elseif ($documentToDelete->type == 'folder') {
560
-                $folderPathWithWildcard = $path . '%';
560
+                $folderPathWithWildcard = $path.'%';
561 561
                 $stmt = $this->getDbStatement('
562 562
                     DELETE FROM documents_unpublished
563
-                          WHERE (path LIKE ' . $db->quote($folderPathWithWildcard) . '
564
-                            AND substr(`path`, ' . (strlen($path) + 1) . ', 1) = "/")
565
-                            OR path = ' . $db->quote($path) . '
563
+                          WHERE (path LIKE ' . $db->quote($folderPathWithWildcard).'
564
+                            AND substr(`path`, ' . (strlen($path) + 1).', 1) = "/")
565
+                            OR path = ' . $db->quote($path).'
566 566
                 ');
567 567
                 $stmt->execute();
568 568
             }
Please login to merge, or discard this patch.
cloudcontrol/templates/cms/documents/brick.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -4,9 +4,9 @@  discard block
 block discarded – undo
4 4
 </div>
5 5
 <label><?=$brick->title?></label>
6 6
 <?if ($static == true) {
7
-	$fieldPrefix = 'bricks[' . $myBrickSlug . '][' . str_replace('.', '', str_replace(' ', '', microtime())) . '][fields]';
7
+	$fieldPrefix = 'bricks['.$myBrickSlug.']['.str_replace('.', '', str_replace(' ', '', microtime())).'][fields]';
8 8
 } else {
9
-	$fieldPrefix = 'dynamicBricks[' . $brick->slug . '][' . str_replace('.', '', str_replace(' ', '', microtime())) . ']';
9
+	$fieldPrefix = 'dynamicBricks['.$brick->slug.']['.str_replace('.', '', str_replace(' ', '', microtime())).']';
10 10
 }?>
11 11
 <? foreach ($brick->fields as $field) : ?>
12 12
 			<div class="form-element">
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 							<a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a>
32 32
 							<div class="form-element">
33 33
 				<? endif ?>
34
-					<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
34
+					<? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
35 35
 				<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
36 36
 
37 37
 							</div>
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 						<li class="grid-container">
54 54
 							<div class="grid-box-10">
55 55
 								<div class="grid-inner form-element">
56
-									<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
56
+									<? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
57 57
 								</div>
58 58
 							</div>
59 59
 							<div class="grid-box-2">
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 								</div>
64 64
 							</div>
65 65
 						</li>
66
-						<?$value='';?>
66
+						<?$value = ''; ?>
67 67
 						<? endforeach ?>
68 68
 					<? endif ?>
69 69
 				</ul>
@@ -80,10 +80,10 @@  discard block
 block discarded – undo
80 80
 							<a class="btn error js-deletemultiple"><i class="fa fa-trash"></i></a>
81 81
 							<a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a>
82 82
 							<div class="form-element">
83
-							<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
83
+							<? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
84 84
 							</div>
85 85
 						</li>
86
-						<?$value='';?>
86
+						<?$value = ''; ?>
87 87
 					<? endforeach ?>
88 88
 					<? endif ?>
89 89
 					</div>
@@ -92,5 +92,5 @@  discard block
 block discarded – undo
92 92
 				<a class="btn js-addrtemultiple">+</a>
93 93
 				<? endif ?>
94 94
 			</div>
95
-			<?$value='';?>
95
+			<?$value = ''; ?>
96 96
 		<? endforeach ?>
Please login to merge, or discard this patch.