@@ -2,7 +2,7 @@ |
||
2 | 2 | <div class="grid-container"> |
3 | 3 | <div class="grid-box-2"> |
4 | 4 | <div class="grid-inner"> |
5 | - <div<?=isset($value) ? ' style="background-image:url(\'' . $request::$subfolders . 'images/' . $value . '\');"' : '' ?> class="selected-image" id="<?=$field->slug?>_selectedImage"></div> |
|
5 | + <div<?=isset($value) ? ' style="background-image:url(\''.$request::$subfolders.'images/'.$value.'\');"' : '' ?> class="selected-image" id="<?=$field->slug?>_selectedImage"></div> |
|
6 | 6 | </div> |
7 | 7 | </div> |
8 | 8 | <div class="grid-box-10"> |
@@ -10,22 +10,22 @@ |
||
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)? humanFileSize($image->size) : '' ?> |
|
21 | + <?=isset($image) ? 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 ?> |
@@ -1,4 +1,4 @@ discard block |
||
1 | -<script>window.onload=function(){History.init();History.replaceState(null, 'Cloud Control CMS', '/<?=$request::$subfolders . $cmsPrefix?>/documents?path=/');};</script> |
|
1 | +<script>window.onload=function(){History.init();History.replaceState(null, 'Cloud Control CMS', '/<?=$request::$subfolders.$cmsPrefix?>/documents?path=/');};</script> |
|
2 | 2 | <section class="documents"> |
3 | 3 | <h2><i class="fa fa-file-text-o"></i> Documents</h2> |
4 | 4 | <nav class="actions"> |
@@ -24,9 +24,9 @@ discard block |
||
24 | 24 | <? foreach ($documents as $document) : ?> |
25 | 25 | <li class="grid-container"> |
26 | 26 | <? if ($document->type == 'document') : ?> |
27 | - <?renderDocument($document, $cmsPrefix);?> |
|
27 | + <?renderDocument($document, $cmsPrefix); ?> |
|
28 | 28 | <? elseif ($document->type == 'folder') : ?> |
29 | - <?renderFolder($document, $cmsPrefix, '', true);?> |
|
29 | + <?renderFolder($document, $cmsPrefix, '', true); ?> |
|
30 | 30 | <? endif ?> |
31 | 31 | </li> |
32 | 32 | |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | <? function renderDocument($document, $cmsPrefix, $slugPrefix = '') {?> |
38 | 38 | <div class="grid-box-10"> |
39 | 39 | <h3> |
40 | - <a class="btn documentTitle" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/edit-document?slug=<?=$slugPrefix . $document->slug?>" title="Edit"> |
|
40 | + <a class="btn documentTitle" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/edit-document?slug=<?=$slugPrefix.$document->slug?>" title="Edit"> |
|
41 | 41 | <i class="fa fa-file-text-o"></i> <?=$document->title?> |
42 | 42 | </a> |
43 | 43 | <small class="small state <?=strtolower($document->state)?>"><?=ucfirst($document->state)?></small> |
@@ -53,29 +53,29 @@ discard block |
||
53 | 53 | </h3> |
54 | 54 | </div> |
55 | 55 | <div class="documentActions grid-box-2"> |
56 | - <a class="btn" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/edit-document?slug=<?=$slugPrefix . $document->slug?>" title="Edit"><i class="fa fa-pencil"></i></a> |
|
57 | - <a onclick="return confirm('Are you sure you want to delete this item?');" class="btn error" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/delete-document?slug=<?=$slugPrefix . $document->slug?>" title="Delete"><i class="fa fa-times"></i></a> |
|
56 | + <a class="btn" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/edit-document?slug=<?=$slugPrefix.$document->slug?>" title="Edit"><i class="fa fa-pencil"></i></a> |
|
57 | + <a onclick="return confirm('Are you sure you want to delete this item?');" class="btn error" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/delete-document?slug=<?=$slugPrefix.$document->slug?>" title="Delete"><i class="fa fa-times"></i></a> |
|
58 | 58 | </div> |
59 | 59 | <?}?> |
60 | -<? function renderFolder($document, $cmsPrefix, $slugPrefix ='', $root = false) {?> |
|
60 | +<? function renderFolder($document, $cmsPrefix, $slugPrefix = '', $root = false) {?> |
|
61 | 61 | <div class="grid-box-8"> |
62 | 62 | <h3> |
63 | - <a class="btn documentTitle openFolder" data-slug="<?=$slugPrefix . $document->slug?>" title="Open"> |
|
63 | + <a class="btn documentTitle openFolder" data-slug="<?=$slugPrefix.$document->slug?>" title="Open"> |
|
64 | 64 | <i class="fa fa-folder-o "></i> <?=$document->title?> |
65 | 65 | </a> |
66 | 66 | </h3> |
67 | 67 | </div> |
68 | 68 | <div class="documentActions grid-box-4"> |
69 | - <a class="btn" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/edit-folder?slug=<?=$slugPrefix . $document->slug?>" title="Edit"><i class="fa fa-pencil"></i></a> |
|
70 | - <a onclick="return confirm('Are you sure you want to delete this item?');" class="btn error" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/delete-folder?slug=<?=$slugPrefix . $document->slug?>" title="Delete"><i class="fa fa-times"></i></a> |
|
69 | + <a class="btn" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/edit-folder?slug=<?=$slugPrefix.$document->slug?>" title="Edit"><i class="fa fa-pencil"></i></a> |
|
70 | + <a onclick="return confirm('Are you sure you want to delete this item?');" class="btn error" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/delete-folder?slug=<?=$slugPrefix.$document->slug?>" title="Delete"><i class="fa fa-times"></i></a> |
|
71 | 71 | </div> |
72 | 72 | <ul class="documents grid-wrapper nested<?=$root ? ' root' : '' ?>"> |
73 | 73 | <? foreach ($document->content as $subDocument) : ?> |
74 | 74 | <li class="grid-container"> |
75 | 75 | <? if ($subDocument->type == 'document') : ?> |
76 | - <?renderDocument($subDocument, $cmsPrefix, $slugPrefix . $document->slug . '/');?> |
|
76 | + <?renderDocument($subDocument, $cmsPrefix, $slugPrefix.$document->slug.'/'); ?> |
|
77 | 77 | <? elseif ($subDocument->type == 'folder') : ?> |
78 | - <?renderFolder($subDocument, $cmsPrefix, $slugPrefix . $document->slug . '/');?> |
|
78 | + <?renderFolder($subDocument, $cmsPrefix, $slugPrefix.$document->slug.'/'); ?> |
|
79 | 79 | <? endif ?> |
80 | 80 | </li> |
81 | 81 | <? endforeach ?> |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | </li> |
63 | 63 | <? $nrOfMenuItems += 1 ?> |
64 | 64 | <? endif ?> |
65 | - <li class="grid-box-<?=6 + (5-$nrOfMenuItems)?> log-off-box"> |
|
65 | + <li class="grid-box-<?=6 + (5 - $nrOfMenuItems)?> log-off-box"> |
|
66 | 66 | <a class="btn log-off grid-inner" href="<?=$request::$subfolders?><?=$cmsPrefix?>/log-off"> |
67 | 67 | <i class="fa fa-power-off"></i> |
68 | 68 | <span>Log off</span> |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | </main> |
87 | 87 | <script> |
88 | 88 | var subfolders = '<?=$request::$subfolders?>', |
89 | - cmsSubfolders = '<?=$request::$subfolders . $cmsPrefix?>'; |
|
89 | + cmsSubfolders = '<?=$request::$subfolders.$cmsPrefix?>'; |
|
90 | 90 | </script> |
91 | 91 | <script src="<?=$request::$subfolders?>js/cms.js"></script> |
92 | 92 | </body> |
@@ -63,7 +63,7 @@ |
||
63 | 63 | |
64 | 64 | // Define the ratio and adjust the width and height |
65 | 65 | if ($this->_preserveAspectRatio) { |
66 | - $ratio = min($this->_width/$originalWidth, $this->_height/$originalHeight); |
|
66 | + $ratio = min($this->_width / $originalWidth, $this->_height / $originalHeight); |
|
67 | 67 | $this->_width = $originalWidth * $ratio; |
68 | 68 | $this->_height = $originalHeight * $ratio; |
69 | 69 | } |
@@ -26,14 +26,14 @@ |
||
26 | 26 | |
27 | 27 | // Define which ratio will be used, depending on which is the smallest side |
28 | 28 | $ratio = min($hRatio, $wRatio); |
29 | - if($ratio > 1) $ratio = 1; |
|
29 | + if ($ratio > 1) $ratio = 1; |
|
30 | 30 | |
31 | 31 | // Define sizes |
32 | 32 | $this->_destWidth = floor($originalWidth * $ratio); |
33 | 33 | $this->_destHeight = floor($originalHeight * $ratio); |
34 | 34 | |
35 | 35 | // Define margins |
36 | - $this->_destX = floor(($this->_width - $this->_destWidth) / 2); |
|
36 | + $this->_destX = floor(($this->_width - $this->_destWidth) / 2); |
|
37 | 37 | $this->_destY = floor(($this->_height - $this->_destHeight) / 2); |
38 | 38 | |
39 | 39 | // Execute the Crop method with the given parameters |
@@ -49,7 +49,7 @@ |
||
49 | 49 | $output = ''; |
50 | 50 | for ($i = 0; $i < $count; $i += 16) { |
51 | 51 | $random_state = |
52 | - md5(microtime() . $random_state); |
|
52 | + md5(microtime().$random_state); |
|
53 | 53 | $output .= |
54 | 54 | pack('H*', md5($random_state)); |
55 | 55 | } |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | * @param array $parameters |
41 | 41 | * @param $matchedSitemapItem |
42 | 42 | */ |
43 | - public function __construct($template='', Request $request, $parameters=array(), $matchedSitemapItem) |
|
43 | + public function __construct($template = '', Request $request, $parameters = array(), $matchedSitemapItem) |
|
44 | 44 | { |
45 | 45 | $this->template = $template; |
46 | 46 | $this->request = $request; |
@@ -86,9 +86,9 @@ discard block |
||
86 | 86 | * @return string |
87 | 87 | * @throws \Exception |
88 | 88 | */ |
89 | - public function renderTemplate($template='') |
|
89 | + public function renderTemplate($template = '') |
|
90 | 90 | { |
91 | - $templatePath = __DIR__ . '/../../templates/' . $template . '.php'; |
|
91 | + $templatePath = __DIR__.'/../../templates/'.$template.'.php'; |
|
92 | 92 | if (realpath($templatePath) !== false) { |
93 | 93 | ob_clean(); |
94 | 94 | $this->parameters['request'] = $this->request; |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | include($templatePath); |
97 | 97 | return ob_get_contents(); |
98 | 98 | } else { |
99 | - throw new \Exception('Couldnt find template ' . $templatePath); |
|
99 | + throw new \Exception('Couldnt find template '.$templatePath); |
|
100 | 100 | } |
101 | 101 | } |
102 | 102 | } |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | $this->parameters['mainNavClass'] = 'documents'; |
126 | 126 | if (isset($request::$post['title'], $request::$post['path'])) { |
127 | 127 | $this->storage->addDocumentFolder($request::$post); |
128 | - header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents'); |
|
128 | + header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents'); |
|
129 | 129 | exit; |
130 | 130 | } |
131 | 131 | } elseif ($relativeCmsUri == '/documents/new-document' && isset($request::$get['path']) && in_array('documents', $userRights)) { |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | if (isset($request::$get['documentType'])) { |
136 | 136 | if (isset($request::$post['title'], $request::$get['documentType'], $request::$get['path'])) { |
137 | 137 | $this->storage->addDocument($request::$post); |
138 | - header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents'); |
|
138 | + header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents'); |
|
139 | 139 | exit; |
140 | 140 | } |
141 | 141 | $this->parameters['documentType'] = $this->storage->getDocumentTypeBySlug($request::$get['documentType'], true); |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | $this->parameters['smallestImage'] = $this->storage->getSmallestImageSet()->slug; |
150 | 150 | if (isset($request::$post['title'], $request::$get['slug'])) { |
151 | 151 | $this->storage->saveDocument($request::$post); |
152 | - header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents'); |
|
152 | + header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents'); |
|
153 | 153 | exit; |
154 | 154 | } |
155 | 155 | $this->parameters['document'] = $this->storage->getDocumentBySlug($request::$get['slug']); |
@@ -170,11 +170,11 @@ discard block |
||
170 | 170 | array_pop($path); |
171 | 171 | $path = implode('/', $path); |
172 | 172 | |
173 | - $request::$get['path'] = '/' . $path; |
|
173 | + $request::$get['path'] = '/'.$path; |
|
174 | 174 | |
175 | 175 | if (isset($request::$post['title'], $request::$post['content'])) { |
176 | 176 | $this->storage->saveDocumentFolder($request::$post); |
177 | - header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents'); |
|
177 | + header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents'); |
|
178 | 178 | exit; |
179 | 179 | } |
180 | 180 | |
@@ -182,11 +182,11 @@ discard block |
||
182 | 182 | $this->parameters['folder'] = $folder; |
183 | 183 | } else if ($relativeCmsUri == '/documents/delete-document' && isset($request::$get['slug']) && in_array('documents', $userRights)) { |
184 | 184 | $this->storage->deleteDocumentBySlug($request::$get['slug']); |
185 | - header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents'); |
|
185 | + header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents'); |
|
186 | 186 | exit; |
187 | 187 | } else if ($relativeCmsUri == '/documents/delete-folder' && isset($request::$get['slug']) && in_array('documents', $userRights)) { |
188 | 188 | $this->storage->deleteDocumentFolderBySlug($request::$get['slug']); |
189 | - header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents'); |
|
189 | + header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents'); |
|
190 | 190 | exit; |
191 | 191 | } elseif ($relativeCmsUri == '/sitemap' && in_array('sitemap', $userRights)) { |
192 | 192 | $template = 'cms/sitemap'; |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | $this->parameters['mainNavClass'] = 'sitemap'; |
201 | 201 | if (isset($request::$post['title'], $request::$post['template'], $request::$post['component'])) { |
202 | 202 | $this->storage->addSitemapItem($request::$post); |
203 | - header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/sitemap'); |
|
203 | + header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/sitemap'); |
|
204 | 204 | exit; |
205 | 205 | } |
206 | 206 | } elseif ($relativeCmsUri == '/sitemap/edit' && isset($request::$get['slug']) && in_array('sitemap', $userRights)) { |
@@ -209,13 +209,13 @@ discard block |
||
209 | 209 | $sitemapItem = $this->storage->getSitemapItemBySlug($request::$get['slug']); |
210 | 210 | if (isset($request::$post['title'], $request::$post['template'], $request::$post['component'])) { |
211 | 211 | $this->storage->saveSitemapItem($request::$get['slug'], $request::$post); |
212 | - header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/sitemap'); |
|
212 | + header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/sitemap'); |
|
213 | 213 | exit; |
214 | 214 | } |
215 | 215 | $this->parameters['sitemapItem'] = $sitemapItem; |
216 | 216 | } elseif ($relativeCmsUri == '/sitemap/delete' && isset($request::$get['slug']) && in_array('sitemap', $userRights)) { |
217 | 217 | $this->storage->deleteSitemapItemBySlug($request::$get['slug']); |
218 | - header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/sitemap'); |
|
218 | + header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/sitemap'); |
|
219 | 219 | exit; |
220 | 220 | } elseif ($relativeCmsUri == '/images' && in_array('images', $userRights)) { |
221 | 221 | $template = 'cms/images'; |
@@ -231,12 +231,12 @@ discard block |
||
231 | 231 | $this->parameters['mainNavClass'] = 'images'; |
232 | 232 | if (isset($_FILES['file'])) { |
233 | 233 | $this->storage->addImage($_FILES['file']); |
234 | - header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/images'); |
|
234 | + header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/images'); |
|
235 | 235 | exit; |
236 | 236 | } |
237 | 237 | } elseif ($relativeCmsUri == '/images/delete' && isset($request::$get['file']) && in_array('images', $userRights)) { |
238 | 238 | $this->storage->deleteImageByName($request::$get['file']); |
239 | - header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/images'); |
|
239 | + header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/images'); |
|
240 | 240 | exit; |
241 | 241 | } elseif ($relativeCmsUri == '/images/show' && isset($request::$get['file']) && in_array('images', $userRights)) { |
242 | 242 | $template = 'cms/images/show'; |
@@ -255,30 +255,30 @@ discard block |
||
255 | 255 | $this->parameters['mainNavClass'] = 'files'; |
256 | 256 | if (isset($_FILES['file'])) { |
257 | 257 | $this->storage->addFile($_FILES['file']); |
258 | - header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/files'); |
|
258 | + header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/files'); |
|
259 | 259 | exit; |
260 | 260 | } |
261 | 261 | } elseif ($relativeCmsUri == '/files/get' && isset($request::$get['file']) && in_array('files', $userRights)) { |
262 | 262 | $file = $this->storage->getFileByName($request::$get['file']); |
263 | - $path = realpath(__DIR__ . '/../../www/files/'); |
|
264 | - $quoted = sprintf('"%s"', addcslashes(basename($path . '/' . $file->file), '"\\')); |
|
265 | - $size = filesize($path . '/' . $file->file); |
|
263 | + $path = realpath(__DIR__.'/../../www/files/'); |
|
264 | + $quoted = sprintf('"%s"', addcslashes(basename($path.'/'.$file->file), '"\\')); |
|
265 | + $size = filesize($path.'/'.$file->file); |
|
266 | 266 | |
267 | 267 | header('Content-Description: File Transfer'); |
268 | - header('Content-Type: ' . $file->type); |
|
269 | - header('Content-Disposition: attachment; filename=' . $quoted); |
|
268 | + header('Content-Type: '.$file->type); |
|
269 | + header('Content-Disposition: attachment; filename='.$quoted); |
|
270 | 270 | header('Content-Transfer-Encoding: binary'); |
271 | 271 | header('Connection: Keep-Alive'); |
272 | 272 | header('Expires: 0'); |
273 | 273 | header('Cache-Control: must-revalidate, post-check=0, pre-check=0'); |
274 | 274 | header('Pragma: public'); |
275 | - header('Content-Length: ' . $size); |
|
275 | + header('Content-Length: '.$size); |
|
276 | 276 | |
277 | - readfile($path . '/' . $file->file); |
|
277 | + readfile($path.'/'.$file->file); |
|
278 | 278 | exit; |
279 | 279 | } elseif ($relativeCmsUri == '/files/delete' && isset($request::$get['file']) && in_array('files', $userRights)) { |
280 | 280 | $this->storage->deleteFileByName($request::$get['file']); |
281 | - header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/files'); |
|
281 | + header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/files'); |
|
282 | 282 | exit; |
283 | 283 | } elseif ($relativeCmsUri == '/configuration' && in_array('configuration', $userRights)) { |
284 | 284 | $template = 'cms/configuration'; |
@@ -292,12 +292,12 @@ discard block |
||
292 | 292 | $this->parameters['mainNavClass'] = 'configuration'; |
293 | 293 | if (isset($_POST['username'])) { |
294 | 294 | $this->storage->addUser($request::$post); |
295 | - header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/users'); |
|
295 | + header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/users'); |
|
296 | 296 | exit; |
297 | 297 | } |
298 | 298 | } elseif ($relativeCmsUri == '/configuration/users/delete' && isset($request::$get['slug']) && in_array('configuration', $userRights)) { |
299 | 299 | $this->storage->deleteUserBySlug($request::$get['slug']); |
300 | - header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/users'); |
|
300 | + header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/users'); |
|
301 | 301 | exit; |
302 | 302 | } elseif ($relativeCmsUri == '/configuration/users/edit' && isset($request::$get['slug']) && in_array('configuration', $userRights)) { |
303 | 303 | $template = 'cms/configuration/users-form'; |
@@ -305,7 +305,7 @@ discard block |
||
305 | 305 | $this->parameters['user'] = $this->storage->getUserBySlug($request::$get['slug']); |
306 | 306 | if (isset($_POST['username'])) { |
307 | 307 | $this->storage->saveUser($request::$get['slug'], $request::$post); |
308 | - header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/users'); |
|
308 | + header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/users'); |
|
309 | 309 | exit; |
310 | 310 | } |
311 | 311 | } elseif ($relativeCmsUri == '/configuration/document-types' && in_array('configuration', $userRights)) { |
@@ -318,7 +318,7 @@ discard block |
||
318 | 318 | $bricks = $this->storage->getBricks(); |
319 | 319 | if (isset($request::$post['title'])) { |
320 | 320 | $this->storage->addDocumentType($request::$post); |
321 | - header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/document-types'); |
|
321 | + header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/document-types'); |
|
322 | 322 | exit; |
323 | 323 | } |
324 | 324 | $this->parameters['bricks'] = $bricks; |
@@ -329,14 +329,14 @@ discard block |
||
329 | 329 | $bricks = $this->storage->getBricks(); |
330 | 330 | if (isset($request::$post['title'])) { |
331 | 331 | $this->storage->saveDocumentType($request::$get['slug'], $request::$post); |
332 | - header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/document-types'); |
|
332 | + header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/document-types'); |
|
333 | 333 | exit; |
334 | 334 | } |
335 | 335 | $this->parameters['documentType'] = $documentType; |
336 | 336 | $this->parameters['bricks'] = $bricks; |
337 | 337 | } elseif ($relativeCmsUri == '/configuration/document-types/delete' && isset($request::$get['slug']) && in_array('configuration', $userRights)) { |
338 | 338 | $this->storage->deleteDocumentTypeBySlug($request::$get['slug']); |
339 | - header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/document-types'); |
|
339 | + header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/document-types'); |
|
340 | 340 | exit; |
341 | 341 | } elseif ($relativeCmsUri == '/configuration/bricks' && in_array('configuration', $userRights)) { |
342 | 342 | $template = 'cms/configuration/bricks'; |
@@ -347,7 +347,7 @@ discard block |
||
347 | 347 | $this->parameters['mainNavClass'] = 'configuration'; |
348 | 348 | if (isset($request::$post['title'])) { |
349 | 349 | $this->storage->addBrick($request::$post); |
350 | - header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/bricks'); |
|
350 | + header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/bricks'); |
|
351 | 351 | exit; |
352 | 352 | } |
353 | 353 | } elseif ($relativeCmsUri == '/configuration/bricks/edit' && isset($request::$get['slug']) && in_array('configuration', $userRights)) { |
@@ -356,13 +356,13 @@ discard block |
||
356 | 356 | $brick = $this->storage->getBrickBySlug($request::$get['slug']); |
357 | 357 | if (isset($request::$post['title'])) { |
358 | 358 | $this->storage->saveBrick($request::$get['slug'], $request::$post); |
359 | - header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/bricks'); |
|
359 | + header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/bricks'); |
|
360 | 360 | exit; |
361 | 361 | } |
362 | 362 | $this->parameters['brick'] = $brick; |
363 | 363 | } elseif ($relativeCmsUri == '/configuration/bricks/delete' && isset($request::$get['slug']) && in_array('configuration', $userRights)) { |
364 | 364 | $this->storage->deleteBrickBySlug($request::$get['slug']); |
365 | - header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/bricks'); |
|
365 | + header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/bricks'); |
|
366 | 366 | exit; |
367 | 367 | } elseif ($relativeCmsUri == '/configuration/image-set' && in_array('configuration', $userRights)) { |
368 | 368 | $template = 'cms/configuration/image-set'; |
@@ -374,7 +374,7 @@ discard block |
||
374 | 374 | $imageSet = $this->storage->getImageSetBySlug($request::$get['slug']); |
375 | 375 | if (isset($request::$post['title'])) { |
376 | 376 | $this->storage->saveImageSet($request::$get['slug'], $request::$post); |
377 | - header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/image-set'); |
|
377 | + header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/image-set'); |
|
378 | 378 | exit; |
379 | 379 | } |
380 | 380 | $this->parameters['imageSet'] = $imageSet; |
@@ -383,17 +383,17 @@ discard block |
||
383 | 383 | $this->parameters['mainNavClass'] = 'configuration'; |
384 | 384 | if (isset($request::$post['title'])) { |
385 | 385 | $this->storage->addImageSet($request::$post); |
386 | - header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/image-set'); |
|
386 | + header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/image-set'); |
|
387 | 387 | exit; |
388 | 388 | } |
389 | 389 | } elseif ($relativeCmsUri == '/configuration/image-set/delete' && isset($request::$get['slug']) && in_array('configuration', $userRights)) { |
390 | 390 | $this->storage->deleteImageSetBySlug($request::$get['slug']); |
391 | - header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/image-set'); |
|
391 | + header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/image-set'); |
|
392 | 392 | exit; |
393 | 393 | } elseif ($relativeCmsUri == '/log-off') { |
394 | 394 | $_SESSION['cloudcontrol'] = null; |
395 | 395 | unset($_SESSION['cloudcontrol']); |
396 | - header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix']); |
|
396 | + header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix']); |
|
397 | 397 | exit; |
398 | 398 | } |
399 | 399 | |
@@ -408,7 +408,7 @@ discard block |
||
408 | 408 | $whitelistIps = explode(',', $this->parameters['whitelistIps']); |
409 | 409 | $whitelistIps = array_map("trim", $whitelistIps); |
410 | 410 | if (!in_array($remoteAddress, $whitelistIps)) { |
411 | - throw new \Exception('Ip address ' . $remoteAddress . ' is not on whitelist'); |
|
411 | + throw new \Exception('Ip address '.$remoteAddress.' is not on whitelist'); |
|
412 | 412 | } |
413 | 413 | } |
414 | 414 | } |
@@ -419,7 +419,7 @@ discard block |
||
419 | 419 | $blacklistIps = explode(',', $this->parameters['blacklistIps']); |
420 | 420 | $blacklistIps = array_map("trim", $blacklistIps); |
421 | 421 | if (in_array($remoteAddress, $blacklistIps)) { |
422 | - throw new \Exception('Ip address ' . $remoteAddress . ' is on blacklist'); |
|
422 | + throw new \Exception('Ip address '.$remoteAddress.' is on blacklist'); |
|
423 | 423 | } |
424 | 424 | } |
425 | 425 | } |