@@ -13,26 +13,26 @@ |
||
13 | 13 | class ImagesRouting implements CmsRouting |
14 | 14 | { |
15 | 15 | |
16 | - /** |
|
17 | - * ImagesRouting constructor. |
|
18 | - * @param \library\cc\Request $request |
|
19 | - * @param mixed|string $relativeCmsUri |
|
20 | - * @param CmsComponent $cmsComponent |
|
21 | - */ |
|
22 | - public function __construct($request, $relativeCmsUri, $cmsComponent) |
|
23 | - { |
|
24 | - if ($relativeCmsUri == '/images') { |
|
16 | + /** |
|
17 | + * ImagesRouting constructor. |
|
18 | + * @param \library\cc\Request $request |
|
19 | + * @param mixed|string $relativeCmsUri |
|
20 | + * @param CmsComponent $cmsComponent |
|
21 | + */ |
|
22 | + public function __construct($request, $relativeCmsUri, $cmsComponent) |
|
23 | + { |
|
24 | + if ($relativeCmsUri == '/images') { |
|
25 | 25 | $this->overviewRoute($cmsComponent); |
26 | - } elseif ($relativeCmsUri == '/images.json') { |
|
26 | + } elseif ($relativeCmsUri == '/images.json') { |
|
27 | 27 | $this->jsonRoute($cmsComponent); |
28 | - } elseif ($relativeCmsUri == '/images/new') { |
|
28 | + } elseif ($relativeCmsUri == '/images/new') { |
|
29 | 29 | $this->newRoute($request, $cmsComponent); |
30 | - } elseif ($relativeCmsUri == '/images/delete' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) { |
|
30 | + } elseif ($relativeCmsUri == '/images/delete' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) { |
|
31 | 31 | $this->deleteRoute($request, $cmsComponent); |
32 | - } elseif ($relativeCmsUri == '/images/show' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) { |
|
32 | + } elseif ($relativeCmsUri == '/images/show' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) { |
|
33 | 33 | $this->showRoute($request, $cmsComponent); |
34 | - } |
|
35 | - } |
|
34 | + } |
|
35 | + } |
|
36 | 36 | |
37 | 37 | /** |
38 | 38 | * @param $cmsComponent |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_IMAGES); |
65 | 65 | if (isset($_FILES[CmsComponent::FILES_PARAMETER_FILE])) { |
66 | 66 | $cmsComponent->storage->addImage($_FILES[CmsComponent::FILES_PARAMETER_FILE]); |
67 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/images'); |
|
67 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/images'); |
|
68 | 68 | exit; |
69 | 69 | } |
70 | 70 | } |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | private function deleteRoute($request, $cmsComponent) |
77 | 77 | { |
78 | 78 | $cmsComponent->storage->deleteImageByName($request::$get[CmsComponent::FILES_PARAMETER_FILE]); |
79 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/images'); |
|
79 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/images'); |
|
80 | 80 | exit; |
81 | 81 | } |
82 | 82 |
@@ -12,58 +12,58 @@ |
||
12 | 12 | |
13 | 13 | class DocumentRouting implements CmsRouting |
14 | 14 | { |
15 | - /** |
|
16 | - * DocumentRouting constructor. |
|
17 | - * @param $request |
|
18 | - * @param $relativeCmsUri |
|
19 | - * @param CmsComponent $cmsComponent |
|
20 | - */ |
|
21 | - public function __construct($request, $relativeCmsUri, $cmsComponent) |
|
22 | - { |
|
23 | - if ($relativeCmsUri == '/documents') { |
|
24 | - $cmsComponent->subTemplate = 'cms/documents'; |
|
25 | - $cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENTS, $cmsComponent->storage->getDocuments()); |
|
26 | - $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS); |
|
27 | - } |
|
28 | - $this->documentRouting($request, $relativeCmsUri, $cmsComponent); |
|
29 | - $this->folderRouting($request, $relativeCmsUri, $cmsComponent); |
|
30 | - } |
|
31 | - |
|
32 | - |
|
33 | - /** |
|
34 | - * @param $request |
|
35 | - * @param $relativeCmsUri |
|
36 | - * @param CmsComponent $cmsComponent |
|
37 | - * @throws \Exception |
|
38 | - */ |
|
39 | - private function documentRouting($request, $relativeCmsUri, $cmsComponent) |
|
40 | - { |
|
41 | - if ($relativeCmsUri == '/documents/new-document' && isset($request::$get[CmsComponent::GET_PARAMETER_PATH])) { |
|
15 | + /** |
|
16 | + * DocumentRouting constructor. |
|
17 | + * @param $request |
|
18 | + * @param $relativeCmsUri |
|
19 | + * @param CmsComponent $cmsComponent |
|
20 | + */ |
|
21 | + public function __construct($request, $relativeCmsUri, $cmsComponent) |
|
22 | + { |
|
23 | + if ($relativeCmsUri == '/documents') { |
|
24 | + $cmsComponent->subTemplate = 'cms/documents'; |
|
25 | + $cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENTS, $cmsComponent->storage->getDocuments()); |
|
26 | + $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS); |
|
27 | + } |
|
28 | + $this->documentRouting($request, $relativeCmsUri, $cmsComponent); |
|
29 | + $this->folderRouting($request, $relativeCmsUri, $cmsComponent); |
|
30 | + } |
|
31 | + |
|
32 | + |
|
33 | + /** |
|
34 | + * @param $request |
|
35 | + * @param $relativeCmsUri |
|
36 | + * @param CmsComponent $cmsComponent |
|
37 | + * @throws \Exception |
|
38 | + */ |
|
39 | + private function documentRouting($request, $relativeCmsUri, $cmsComponent) |
|
40 | + { |
|
41 | + if ($relativeCmsUri == '/documents/new-document' && isset($request::$get[CmsComponent::GET_PARAMETER_PATH])) { |
|
42 | 42 | $this->documentOverviewRoute($request, $cmsComponent); |
43 | - } elseif ($relativeCmsUri == '/documents/edit-document' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) { |
|
43 | + } elseif ($relativeCmsUri == '/documents/edit-document' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) { |
|
44 | 44 | $this->editDocumentRoute($request, $cmsComponent); |
45 | - } elseif ($relativeCmsUri == '/documents/get-brick' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) { |
|
45 | + } elseif ($relativeCmsUri == '/documents/get-brick' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) { |
|
46 | 46 | $this->getBrickRoute($request, $cmsComponent); |
47 | - } else if ($relativeCmsUri == '/documents/delete-document' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) { |
|
47 | + } else if ($relativeCmsUri == '/documents/delete-document' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) { |
|
48 | 48 | $this->deleteDocumentRoute($request, $cmsComponent); |
49 | - } |
|
50 | - } |
|
51 | - |
|
52 | - /** |
|
53 | - * @param $request |
|
54 | - * @param $relativeCmsUri |
|
55 | - * @param CmsComponent $cmsComponent |
|
56 | - */ |
|
57 | - private function folderRouting($request, $relativeCmsUri, $cmsComponent) |
|
58 | - { |
|
59 | - if ($relativeCmsUri == '/documents/new-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_PATH])) { |
|
49 | + } |
|
50 | + } |
|
51 | + |
|
52 | + /** |
|
53 | + * @param $request |
|
54 | + * @param $relativeCmsUri |
|
55 | + * @param CmsComponent $cmsComponent |
|
56 | + */ |
|
57 | + private function folderRouting($request, $relativeCmsUri, $cmsComponent) |
|
58 | + { |
|
59 | + if ($relativeCmsUri == '/documents/new-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_PATH])) { |
|
60 | 60 | $this->newFolderRoute($request, $cmsComponent); |
61 | - } else if ($relativeCmsUri == '/documents/edit-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) { |
|
61 | + } else if ($relativeCmsUri == '/documents/edit-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) { |
|
62 | 62 | $this->editFolderRoute($request, $cmsComponent); |
63 | - } else if ($relativeCmsUri == '/documents/delete-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) { |
|
63 | + } else if ($relativeCmsUri == '/documents/delete-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) { |
|
64 | 64 | $this->deleteFolderRoute($request, $cmsComponent); |
65 | - } |
|
66 | - } |
|
65 | + } |
|
66 | + } |
|
67 | 67 | |
68 | 68 | /** |
69 | 69 | * @param $request |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | if (isset($request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE])) { |
80 | 80 | if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE], $request::$get[CmsComponent::GET_PARAMETER_PATH])) { |
81 | 81 | $cmsComponent->storage->addDocument($request::$post); |
82 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents'); |
|
82 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents'); |
|
83 | 83 | exit; |
84 | 84 | } |
85 | 85 | $cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPE, $cmsComponent->storage->getDocumentTypeBySlug($request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE], true)); |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | } else { |
88 | 88 | $documentTypes = $cmsComponent->storage->getDocumentTypes(); |
89 | 89 | if (count($documentTypes) < 1) { |
90 | - throw new \Exception('No Document Types defined yet. <a href="' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/document-types/new">Please do so first.</a>'); |
|
90 | + throw new \Exception('No Document Types defined yet. <a href="'.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/document-types/new">Please do so first.</a>'); |
|
91 | 91 | } |
92 | 92 | $cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPES, $documentTypes); |
93 | 93 | } |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | $cmsComponent->setParameter(CmsComponent::PARAMETER_SMALLEST_IMAGE, $cmsComponent->storage->getSmallestImageSet()->slug); |
105 | 105 | if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$get[CmsComponent::GET_PARAMETER_SLUG])) { |
106 | 106 | $cmsComponent->storage->saveDocument($request::$post); |
107 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents'); |
|
107 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents'); |
|
108 | 108 | exit; |
109 | 109 | } |
110 | 110 | $cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT, $cmsComponent->storage->getDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG])); |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | private function deleteDocumentRoute($request, $cmsComponent) |
142 | 142 | { |
143 | 143 | $cmsComponent->storage->deleteDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]); |
144 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents'); |
|
144 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents'); |
|
145 | 145 | exit; |
146 | 146 | } |
147 | 147 | |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS); |
156 | 156 | if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::GET_PARAMETER_PATH])) { |
157 | 157 | $cmsComponent->storage->addDocumentFolder($request::$post); |
158 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents'); |
|
158 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents'); |
|
159 | 159 | exit; |
160 | 160 | } |
161 | 161 | } |
@@ -174,11 +174,11 @@ discard block |
||
174 | 174 | array_pop($path); |
175 | 175 | $path = implode('/', $path); |
176 | 176 | |
177 | - $request::$get[CmsComponent::GET_PARAMETER_PATH] = '/' . $path; |
|
177 | + $request::$get[CmsComponent::GET_PARAMETER_PATH] = '/'.$path; |
|
178 | 178 | |
179 | 179 | if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post['content'])) { |
180 | 180 | $cmsComponent->storage->saveDocumentFolder($request::$post); |
181 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents'); |
|
181 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents'); |
|
182 | 182 | exit; |
183 | 183 | } |
184 | 184 | |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | private function deleteFolderRoute($request, $cmsComponent) |
194 | 194 | { |
195 | 195 | $cmsComponent->storage->deleteDocumentFolderBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]); |
196 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents'); |
|
196 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents'); |
|
197 | 197 | exit; |
198 | 198 | } |
199 | 199 | } |
200 | 200 | \ No newline at end of file |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | if (isset($_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID])) { |
163 | 163 | $this->formId = $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID]; |
164 | 164 | } else { |
165 | - $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID] = (string)microtime(true); |
|
165 | + $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID] = (string) microtime(true); |
|
166 | 166 | $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName]['submitted'] = false; |
167 | 167 | $this->formId = $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID]; |
168 | 168 | } |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | $postValues = $request::$post; |
191 | 191 | $postValues[self::PARAMETER_DOCUMENT_TYPE] = $this->documentType; |
192 | 192 | $postValues[self::GET_PARAMETER_PATH] = $this->responseFolder; |
193 | - $postValues['title'] = date('r') . ' - From: ' . $request::$requestUri; |
|
193 | + $postValues['title'] = date('r').' - From: '.$request::$requestUri; |
|
194 | 194 | |
195 | 195 | return $postValues; |
196 | 196 | } |
@@ -325,7 +325,7 @@ discard block |
||
325 | 325 | private function setFormParameter($form) |
326 | 326 | { |
327 | 327 | if ($this->isFormSubmitted($this->request) || $this->isSubmitAllowed() === false) { |
328 | - $this->parameters[$this->formParameterName] = '<a name="' . $this->formId . '"></a>' . $this->thankYouMessage; |
|
328 | + $this->parameters[$this->formParameterName] = '<a name="'.$this->formId.'"></a>'.$this->thankYouMessage; |
|
329 | 329 | } else { |
330 | 330 | $this->parameters[$this->formParameterName] = $form; |
331 | 331 | } |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | * submitting the form |
148 | 148 | * |
149 | 149 | * @param $postValues |
150 | - * @param $storage |
|
150 | + * @param Storage $storage |
|
151 | 151 | */ |
152 | 152 | protected function postSubmit($postValues, $storage) |
153 | 153 | { |
@@ -318,7 +318,7 @@ discard block |
||
318 | 318 | } |
319 | 319 | |
320 | 320 | /** |
321 | - * @param $form |
|
321 | + * @param string|null $form |
|
322 | 322 | */ |
323 | 323 | private function setFormParameter($form) |
324 | 324 | { |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | $whitelistIps = explode(',', $this->parameters[self::PARAMETER_WHITELIST_IPS]); |
160 | 160 | $whitelistIps = array_map("trim", $whitelistIps); |
161 | 161 | if (!in_array($remoteAddress, $whitelistIps)) { |
162 | - throw new \Exception('Ip address ' . $remoteAddress . ' is not on whitelist'); |
|
162 | + throw new \Exception('Ip address '.$remoteAddress.' is not on whitelist'); |
|
163 | 163 | } |
164 | 164 | } |
165 | 165 | } |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | $blacklistIps = explode(',', $this->parameters[self::PARAMETER_BLACKLIST_IPS]); |
176 | 176 | $blacklistIps = array_map("trim", $blacklistIps); |
177 | 177 | if (in_array($remoteAddress, $blacklistIps)) { |
178 | - throw new \Exception('Ip address ' . $remoteAddress . ' is on blacklist'); |
|
178 | + throw new \Exception('Ip address '.$remoteAddress.' is on blacklist'); |
|
179 | 179 | } |
180 | 180 | } |
181 | 181 | } |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | if ($relativeCmsUri == '/log-off') { |
220 | 220 | $_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL] = null; |
221 | 221 | unset($_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL]); |
222 | - header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX]); |
|
222 | + header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX]); |
|
223 | 223 | exit; |
224 | 224 | } |
225 | 225 | } |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | } |
182 | 182 | |
183 | 183 | /** |
184 | - * @param $request |
|
184 | + * @param \library\cc\Request $request |
|
185 | 185 | * |
186 | 186 | * @return mixed|string |
187 | 187 | */ |
@@ -214,6 +214,9 @@ discard block |
||
214 | 214 | } |
215 | 215 | } |
216 | 216 | |
217 | + /** |
|
218 | + * @param \library\cc\Request $request |
|
219 | + */ |
|
217 | 220 | private function logOffRouting($request, $relativeCmsUri) |
218 | 221 | { |
219 | 222 | if ($relativeCmsUri == '/log-off') { |
@@ -307,7 +310,7 @@ discard block |
||
307 | 310 | } |
308 | 311 | |
309 | 312 | /** |
310 | - * @param $crypt |
|
313 | + * @param Crypt $crypt |
|
311 | 314 | * @param $request |
312 | 315 | */ |
313 | 316 | protected function invalidCredentials($crypt, $request) |
@@ -319,7 +322,7 @@ discard block |
||
319 | 322 | |
320 | 323 | /** |
321 | 324 | * @param $user |
322 | - * @param $crypt |
|
325 | + * @param Crypt $crypt |
|
323 | 326 | * @param $request |
324 | 327 | */ |
325 | 328 | protected function checkPassword($user, $crypt, $request) |
@@ -338,7 +341,7 @@ discard block |
||
338 | 341 | } |
339 | 342 | |
340 | 343 | /** |
341 | - * @param $request |
|
344 | + * @param \library\cc\Request $request |
|
342 | 345 | */ |
343 | 346 | protected function checkLoginAttempt($request) |
344 | 347 | { |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | spl_autoload_extensions('.php'); |
3 | 3 | spl_autoload_register("autoloader"); |
4 | 4 | |
5 | -$rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)) . '/../../') . '/'); |
|
5 | +$rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)).'/../../').'/'); |
|
6 | 6 | |
7 | 7 | /** |
8 | 8 | * The function to be registered as the default autoload functino |
@@ -32,14 +32,14 @@ discard block |
||
32 | 32 | } |
33 | 33 | |
34 | 34 | global $rootPath; |
35 | - $file = $rootPath . str_replace('\\', '/', $class) . ".php"; |
|
35 | + $file = $rootPath.str_replace('\\', '/', $class).".php"; |
|
36 | 36 | $debug_backtrace = debug_backtrace(); |
37 | 37 | |
38 | 38 | if (file_exists($file)) { |
39 | 39 | require_once($file); |
40 | 40 | if ($throwException) { |
41 | 41 | if (class_exists($class, false) === false && interface_exists($class, false) === false) { |
42 | - throw new \Exception('Could not load class "' . $class . '" in file ' . $file); |
|
42 | + throw new \Exception('Could not load class "'.$class.'" in file '.$file); |
|
43 | 43 | } else { |
44 | 44 | return true; |
45 | 45 | } |
@@ -48,13 +48,13 @@ discard block |
||
48 | 48 | } else { |
49 | 49 | if (isset($debug_backtrace[2]) && isset($debug_backtrace[2]['file']) && isset($debug_backtrace[2]['line'])) { |
50 | 50 | if ($throwException) { |
51 | - errorHandler(0, 'Could not load class \'' . $class . '\' in file ' . $rootPath . $file, $debug_backtrace[2]['file'], $debug_backtrace[2]['line']); |
|
51 | + errorHandler(0, 'Could not load class \''.$class.'\' in file '.$rootPath.$file, $debug_backtrace[2]['file'], $debug_backtrace[2]['line']); |
|
52 | 52 | } else { |
53 | 53 | return false; |
54 | 54 | } |
55 | 55 | } else { |
56 | 56 | if ($throwException) { |
57 | - throw new \Exception('Could not load class "' . $class . '" in file ' . $file . "\n" . 'Called from unknown origin.'); |
|
57 | + throw new \Exception('Could not load class "'.$class.'" in file '.$file."\n".'Called from unknown origin.'); |
|
58 | 58 | } else { |
59 | 59 | return false; |
60 | 60 | } |
@@ -358,7 +358,7 @@ discard block |
||
358 | 358 | /** |
359 | 359 | * Convert path to indeces |
360 | 360 | * |
361 | - * @param $path |
|
361 | + * @param string $path |
|
362 | 362 | * |
363 | 363 | * @return array |
364 | 364 | * @throws \Exception |
@@ -373,7 +373,7 @@ discard block |
||
373 | 373 | * |
374 | 374 | * @param $postValues |
375 | 375 | * |
376 | - * @return \stdClass |
|
376 | + * @return Document |
|
377 | 377 | * @throws \Exception |
378 | 378 | */ |
379 | 379 | private function createDocumentFolderFromPostValues($postValues) |
@@ -666,6 +666,9 @@ discard block |
||
666 | 666 | } |
667 | 667 | } |
668 | 668 | |
669 | + /** |
|
670 | + * @param string $path |
|
671 | + */ |
|
669 | 672 | private function validateFilename($filename, $path) |
670 | 673 | { |
671 | 674 | $fileParts = explode('.', $filename); |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | */ |
37 | 37 | private function config() |
38 | 38 | { |
39 | - $storagePath = __DIR__ . '/../../' . $this->storageDir; |
|
39 | + $storagePath = __DIR__.'/../../'.$this->storageDir; |
|
40 | 40 | if (realpath($storagePath) === false) { |
41 | 41 | initFramework($storagePath); |
42 | 42 | if (Repository::create($storagePath)) { |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | $repository->init(); |
45 | 45 | $this->repository = $repository; |
46 | 46 | } else { |
47 | - throw new \Exception('Could not create repository directory: ' . $storagePath); |
|
47 | + throw new \Exception('Could not create repository directory: '.$storagePath); |
|
48 | 48 | } |
49 | 49 | } else { |
50 | 50 | $this->repository = new Repository($storagePath); |
@@ -194,20 +194,20 @@ discard block |
||
194 | 194 | */ |
195 | 195 | public function getDocumentBySlug($slug) |
196 | 196 | { |
197 | - $path = '/' . $slug; |
|
197 | + $path = '/'.$slug; |
|
198 | 198 | return $this->repository->getDocumentByPath($path); |
199 | 199 | } |
200 | 200 | |
201 | 201 | public function saveDocument($postValues) |
202 | 202 | { |
203 | - $oldPath = '/' . $postValues['path']; |
|
203 | + $oldPath = '/'.$postValues['path']; |
|
204 | 204 | |
205 | 205 | $container = $this->getDocumentContainerByPath($oldPath); |
206 | 206 | $documentObject = $this->createDocumentFromPostValues($postValues); |
207 | 207 | if ($container->path === '/') { |
208 | - $newPath = $container->path . $documentObject->slug; |
|
208 | + $newPath = $container->path.$documentObject->slug; |
|
209 | 209 | } else { |
210 | - $newPath = $container->path . '/' . $documentObject->slug; |
|
210 | + $newPath = $container->path.'/'.$documentObject->slug; |
|
211 | 211 | } |
212 | 212 | $documentObject->path = $newPath; |
213 | 213 | $this->repository->saveDocument($documentObject); |
@@ -217,9 +217,9 @@ discard block |
||
217 | 217 | { |
218 | 218 | $documentObject = $this->createDocumentFromPostValues($postValues); |
219 | 219 | if ($postValues['path'] === '/') { |
220 | - $documentObject->path = $postValues['path'] . $documentObject->slug; |
|
220 | + $documentObject->path = $postValues['path'].$documentObject->slug; |
|
221 | 221 | } else { |
222 | - $documentObject->path = $postValues['path'] . '/' . $documentObject->slug; |
|
222 | + $documentObject->path = $postValues['path'].'/'.$documentObject->slug; |
|
223 | 223 | } |
224 | 224 | |
225 | 225 | $this->repository->saveDocument($documentObject); |
@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | |
228 | 228 | public function deleteDocumentBySlug($slug) |
229 | 229 | { |
230 | - $path = '/' . $slug; |
|
230 | + $path = '/'.$slug; |
|
231 | 231 | $this->repository->deleteDocumentByPath($path); |
232 | 232 | } |
233 | 233 | |
@@ -309,9 +309,9 @@ discard block |
||
309 | 309 | { |
310 | 310 | $documentFolderObject = $this->createDocumentFolderFromPostValues($postValues); |
311 | 311 | if ($postValues['path'] === '/') { |
312 | - $documentFolderObject->path = $postValues['path'] . $documentFolderObject->slug; |
|
312 | + $documentFolderObject->path = $postValues['path'].$documentFolderObject->slug; |
|
313 | 313 | } else { |
314 | - $documentFolderObject->path = $postValues['path'] . '/' . $documentFolderObject->slug; |
|
314 | + $documentFolderObject->path = $postValues['path'].'/'.$documentFolderObject->slug; |
|
315 | 315 | } |
316 | 316 | $this->repository->saveDocument($documentFolderObject); |
317 | 317 | } |
@@ -325,7 +325,7 @@ discard block |
||
325 | 325 | */ |
326 | 326 | public function deleteDocumentFolderBySlug($slug) |
327 | 327 | { |
328 | - $path = '/' . $slug; |
|
328 | + $path = '/'.$slug; |
|
329 | 329 | $this->repository->deleteDocumentByPath($path); |
330 | 330 | } |
331 | 331 | |
@@ -339,7 +339,7 @@ discard block |
||
339 | 339 | */ |
340 | 340 | public function getDocumentFolderBySlug($slug) |
341 | 341 | { |
342 | - $path = '/' . $slug; |
|
342 | + $path = '/'.$slug; |
|
343 | 343 | return $this->repository->getDocumentByPath($path); |
344 | 344 | } |
345 | 345 | |
@@ -550,13 +550,13 @@ discard block |
||
550 | 550 | |
551 | 551 | public function addImage($postValues) |
552 | 552 | { |
553 | - $destinationPath = realpath(__DIR__ . '/../../www/images/'); |
|
553 | + $destinationPath = realpath(__DIR__.'/../../www/images/'); |
|
554 | 554 | |
555 | 555 | $filename = $this->validateFilename($postValues['name'], $destinationPath); |
556 | - $destination = $destinationPath . '/' . $filename; |
|
556 | + $destination = $destinationPath.'/'.$filename; |
|
557 | 557 | |
558 | 558 | if ($postValues['error'] != '0') { |
559 | - throw new \Exception('Error uploading file. Error code: ' . $postValues['error']); |
|
559 | + throw new \Exception('Error uploading file. Error code: '.$postValues['error']); |
|
560 | 560 | } |
561 | 561 | |
562 | 562 | if (move_uploaded_file($postValues['tmp_name'], $destination)) { |
@@ -581,14 +581,14 @@ discard block |
||
581 | 581 | |
582 | 582 | public function deleteImageByName($filename) |
583 | 583 | { |
584 | - $destinationPath = realpath(__DIR__ . '/../../www/images/'); |
|
584 | + $destinationPath = realpath(__DIR__.'/../../www/images/'); |
|
585 | 585 | |
586 | 586 | $images = $this->getImages(); |
587 | 587 | |
588 | 588 | foreach ($images as $key => $image) { |
589 | 589 | if ($image->file == $filename) { |
590 | 590 | foreach ($image->set as $imageSetFilename) { |
591 | - $destination = $destinationPath . '/' . $imageSetFilename; |
|
591 | + $destination = $destinationPath.'/'.$imageSetFilename; |
|
592 | 592 | if (file_exists($destination)) { |
593 | 593 | unlink($destination); |
594 | 594 | } else { |
@@ -630,7 +630,7 @@ discard block |
||
630 | 630 | */ |
631 | 631 | public function getFiles() |
632 | 632 | { |
633 | - $files = $this->repository->files; |
|
633 | + $files = $this->repository->files; |
|
634 | 634 | usort($files, array($this, 'compareFiles')); |
635 | 635 | return $files; |
636 | 636 | } |
@@ -642,13 +642,13 @@ discard block |
||
642 | 642 | |
643 | 643 | public function addFile($postValues) |
644 | 644 | { |
645 | - $destinationPath = realpath(__DIR__ . '/../../www/files/'); |
|
645 | + $destinationPath = realpath(__DIR__.'/../../www/files/'); |
|
646 | 646 | |
647 | 647 | $filename = $this->validateFilename($postValues['name'], $destinationPath); |
648 | - $destination = $destinationPath . '/' . $filename; |
|
648 | + $destination = $destinationPath.'/'.$filename; |
|
649 | 649 | |
650 | 650 | if ($postValues['error'] != '0') { |
651 | - throw new \Exception('Error uploading file. Error code: ' . $postValues['error']); |
|
651 | + throw new \Exception('Error uploading file. Error code: '.$postValues['error']); |
|
652 | 652 | } |
653 | 653 | |
654 | 654 | if (move_uploaded_file($postValues['tmp_name'], $destination)) { |
@@ -674,23 +674,23 @@ discard block |
||
674 | 674 | array_pop($fileParts); |
675 | 675 | $fileNameWithoutExtension = implode('-', $fileParts); |
676 | 676 | $fileNameWithoutExtension = slugify($fileNameWithoutExtension); |
677 | - $filename = $fileNameWithoutExtension . '.' . $extension; |
|
677 | + $filename = $fileNameWithoutExtension.'.'.$extension; |
|
678 | 678 | } else { |
679 | 679 | $filename = slugify($filename); |
680 | 680 | } |
681 | 681 | |
682 | - if (file_exists($path . '/' . $filename)) { |
|
682 | + if (file_exists($path.'/'.$filename)) { |
|
683 | 683 | $fileParts = explode('.', $filename); |
684 | 684 | if (count($fileParts) > 1) { |
685 | 685 | $extension = end($fileParts); |
686 | 686 | array_pop($fileParts); |
687 | 687 | $fileNameWithoutExtension = implode('-', $fileParts); |
688 | 688 | $fileNameWithoutExtension .= '-copy'; |
689 | - $filename = $fileNameWithoutExtension . '.' . $extension; |
|
689 | + $filename = $fileNameWithoutExtension.'.'.$extension; |
|
690 | 690 | } else { |
691 | 691 | $filename .= '-copy'; |
692 | 692 | } |
693 | - return $this->validateFilename($filename,$path); |
|
693 | + return $this->validateFilename($filename, $path); |
|
694 | 694 | } |
695 | 695 | return $filename; |
696 | 696 | } |
@@ -716,8 +716,8 @@ discard block |
||
716 | 716 | */ |
717 | 717 | public function deleteFileByName($filename) |
718 | 718 | { |
719 | - $destinationPath = realpath(__DIR__ . '/../../www/files/'); |
|
720 | - $destination = $destinationPath . '/' . $filename; |
|
719 | + $destinationPath = realpath(__DIR__.'/../../www/files/'); |
|
720 | + $destination = $destinationPath.'/'.$filename; |
|
721 | 721 | |
722 | 722 | if (file_exists($destination)) { |
723 | 723 | $files = $this->getFiles(); |
@@ -2,19 +2,19 @@ discard block |
||
2 | 2 | namespace library\storage |
3 | 3 | { |
4 | 4 | |
5 | - use library\crypt\Crypt; |
|
6 | - use library\images\ImageResizer; |
|
5 | + use library\crypt\Crypt; |
|
6 | + use library\images\ImageResizer; |
|
7 | 7 | |
8 | - /** |
|
8 | + /** |
|
9 | 9 | * Class JsonStorage |
10 | 10 | * @package library\storage |
11 | 11 | */ |
12 | 12 | class JsonStorage implements Storage |
13 | 13 | { |
14 | 14 | private $storageDir; |
15 | - /** |
|
16 | - * @var Repository |
|
17 | - */ |
|
15 | + /** |
|
16 | + * @var Repository |
|
17 | + */ |
|
18 | 18 | private $repository; |
19 | 19 | |
20 | 20 | /** |
@@ -76,12 +76,12 @@ discard block |
||
76 | 76 | return $return; |
77 | 77 | } |
78 | 78 | |
79 | - /** |
|
80 | - * Get user by slug |
|
81 | - * |
|
82 | - * @param $slug |
|
83 | - * @return array |
|
84 | - */ |
|
79 | + /** |
|
80 | + * Get user by slug |
|
81 | + * |
|
82 | + * @param $slug |
|
83 | + * @return array |
|
84 | + */ |
|
85 | 85 | public function getUserBySlug($slug) |
86 | 86 | { |
87 | 87 | $return = array(); |
@@ -97,23 +97,23 @@ discard block |
||
97 | 97 | return $return; |
98 | 98 | } |
99 | 99 | |
100 | - /** |
|
101 | - * Get all users |
|
102 | - * |
|
103 | - * @return mixed |
|
104 | - */ |
|
100 | + /** |
|
101 | + * Get all users |
|
102 | + * |
|
103 | + * @return mixed |
|
104 | + */ |
|
105 | 105 | public function getUsers() |
106 | 106 | { |
107 | 107 | return $this->repository->users; |
108 | 108 | } |
109 | 109 | |
110 | - /** |
|
111 | - * Save user |
|
112 | - * |
|
113 | - * @param $slug |
|
114 | - * @param $postValues |
|
115 | - * @throws \Exception |
|
116 | - */ |
|
110 | + /** |
|
111 | + * Save user |
|
112 | + * |
|
113 | + * @param $slug |
|
114 | + * @param $postValues |
|
115 | + * @throws \Exception |
|
116 | + */ |
|
117 | 117 | public function saveUser($slug, $postValues) |
118 | 118 | { |
119 | 119 | $userObj = $this->createUserFromPostValues($postValues); |
@@ -134,12 +134,12 @@ discard block |
||
134 | 134 | $this->save(); |
135 | 135 | } |
136 | 136 | |
137 | - /** |
|
138 | - * Add user |
|
139 | - * |
|
140 | - * @param $postValues |
|
141 | - * @throws \Exception |
|
142 | - */ |
|
137 | + /** |
|
138 | + * Add user |
|
139 | + * |
|
140 | + * @param $postValues |
|
141 | + * @throws \Exception |
|
142 | + */ |
|
143 | 143 | public function addUser($postValues) |
144 | 144 | { |
145 | 145 | $userObj = $this->createUserFromPostValues($postValues); |
@@ -148,17 +148,17 @@ discard block |
||
148 | 148 | if (!empty($doesItExist)) { |
149 | 149 | throw new \Exception('Trying to add username that already exists.'); |
150 | 150 | } |
151 | - $users = $this->repository->users; |
|
152 | - $users[] = $userObj; |
|
153 | - $this->repository->users = $users; |
|
151 | + $users = $this->repository->users; |
|
152 | + $users[] = $userObj; |
|
153 | + $this->repository->users = $users; |
|
154 | 154 | $this->save(); |
155 | 155 | } |
156 | 156 | |
157 | - /** |
|
158 | - * Delete user by slug |
|
159 | - * @param $slug |
|
160 | - * @throws \Exception |
|
161 | - */ |
|
157 | + /** |
|
158 | + * Delete user by slug |
|
159 | + * @param $slug |
|
160 | + * @throws \Exception |
|
161 | + */ |
|
162 | 162 | public function deleteUserBySlug($slug) |
163 | 163 | { |
164 | 164 | $userToDelete = $this->getUserBySlug($slug); |
@@ -175,12 +175,12 @@ discard block |
||
175 | 175 | $this->save(); |
176 | 176 | } |
177 | 177 | |
178 | - /** |
|
179 | - * Create user from POST values |
|
180 | - * @param $postValues |
|
181 | - * @return \stdClass |
|
182 | - * @throws \Exception |
|
183 | - */ |
|
178 | + /** |
|
179 | + * Create user from POST values |
|
180 | + * @param $postValues |
|
181 | + * @return \stdClass |
|
182 | + * @throws \Exception |
|
183 | + */ |
|
184 | 184 | private function createUserFromPostValues($postValues) |
185 | 185 | { |
186 | 186 | if (isset($postValues['username'])) { |
@@ -229,40 +229,40 @@ discard block |
||
229 | 229 | */ |
230 | 230 | public function getDocumentBySlug($slug) |
231 | 231 | { |
232 | - $path = '/' . $slug; |
|
232 | + $path = '/' . $slug; |
|
233 | 233 | return $this->repository->getDocumentByPath($path); |
234 | 234 | } |
235 | 235 | |
236 | 236 | public function saveDocument($postValues) |
237 | 237 | { |
238 | - $oldPath = '/' . $postValues['path']; |
|
238 | + $oldPath = '/' . $postValues['path']; |
|
239 | 239 | |
240 | - $container = $this->getDocumentContainerByPath($oldPath); |
|
241 | - $documentObject = $this->createDocumentFromPostValues($postValues); |
|
242 | - if ($container->path === '/') { |
|
243 | - $newPath = $container->path . $documentObject->slug; |
|
244 | - } else { |
|
245 | - $newPath = $container->path . '/' . $documentObject->slug; |
|
246 | - } |
|
247 | - $documentObject->path = $newPath; |
|
248 | - $this->repository->saveDocument($documentObject); |
|
249 | - } |
|
240 | + $container = $this->getDocumentContainerByPath($oldPath); |
|
241 | + $documentObject = $this->createDocumentFromPostValues($postValues); |
|
242 | + if ($container->path === '/') { |
|
243 | + $newPath = $container->path . $documentObject->slug; |
|
244 | + } else { |
|
245 | + $newPath = $container->path . '/' . $documentObject->slug; |
|
246 | + } |
|
247 | + $documentObject->path = $newPath; |
|
248 | + $this->repository->saveDocument($documentObject); |
|
249 | + } |
|
250 | 250 | |
251 | 251 | public function addDocument($postValues) |
252 | 252 | { |
253 | 253 | $documentObject = $this->createDocumentFromPostValues($postValues); |
254 | - if ($postValues['path'] === '/') { |
|
255 | - $documentObject->path = $postValues['path'] . $documentObject->slug; |
|
256 | - } else { |
|
257 | - $documentObject->path = $postValues['path'] . '/' . $documentObject->slug; |
|
258 | - } |
|
254 | + if ($postValues['path'] === '/') { |
|
255 | + $documentObject->path = $postValues['path'] . $documentObject->slug; |
|
256 | + } else { |
|
257 | + $documentObject->path = $postValues['path'] . '/' . $documentObject->slug; |
|
258 | + } |
|
259 | 259 | |
260 | - $this->repository->saveDocument($documentObject); |
|
260 | + $this->repository->saveDocument($documentObject); |
|
261 | 261 | } |
262 | 262 | |
263 | 263 | public function deleteDocumentBySlug($slug) |
264 | 264 | { |
265 | - $path = '/' . $slug; |
|
265 | + $path = '/' . $slug; |
|
266 | 266 | $this->repository->deleteDocumentByPath($path); |
267 | 267 | } |
268 | 268 | |
@@ -313,13 +313,13 @@ discard block |
||
313 | 313 | $brickArray[] = $brickObj; |
314 | 314 | } |
315 | 315 | |
316 | - $bricks = $documentObj->bricks; |
|
316 | + $bricks = $documentObj->bricks; |
|
317 | 317 | $bricks[$brickSlug] = $brickArray; |
318 | - $documentObj->bricks = $bricks; |
|
318 | + $documentObj->bricks = $bricks; |
|
319 | 319 | } else { |
320 | - $bricks = $documentObj->bricks; |
|
320 | + $bricks = $documentObj->bricks; |
|
321 | 321 | $bricks[$brickSlug] = $brick; |
322 | - $documentObj->bricks = $bricks; |
|
322 | + $documentObj->bricks = $bricks; |
|
323 | 323 | } |
324 | 324 | } |
325 | 325 | } |
@@ -330,9 +330,9 @@ discard block |
||
330 | 330 | $brickObj = new \stdClass(); |
331 | 331 | $brickObj->type = $brickTypeSlug; |
332 | 332 | $brickObj->fields = $brickContent; |
333 | - $dynamicBricks = $documentObj->dynamicBricks; |
|
333 | + $dynamicBricks = $documentObj->dynamicBricks; |
|
334 | 334 | $dynamicBricks[] = $brickObj; |
335 | - $documentObj->dynamicBricks = $dynamicBricks; |
|
335 | + $documentObj->dynamicBricks = $dynamicBricks; |
|
336 | 336 | } |
337 | 337 | } |
338 | 338 | } |
@@ -348,13 +348,13 @@ discard block |
||
348 | 348 | */ |
349 | 349 | public function addDocumentFolder($postValues) |
350 | 350 | { |
351 | - $documentFolderObject = $this->createDocumentFolderFromPostValues($postValues); |
|
352 | - if ($postValues['path'] === '/') { |
|
353 | - $documentFolderObject->path = $postValues['path'] . $documentFolderObject->slug; |
|
354 | - } else { |
|
355 | - $documentFolderObject->path = $postValues['path'] . '/' . $documentFolderObject->slug; |
|
356 | - } |
|
357 | - $this->repository->saveDocument($documentFolderObject); |
|
351 | + $documentFolderObject = $this->createDocumentFolderFromPostValues($postValues); |
|
352 | + if ($postValues['path'] === '/') { |
|
353 | + $documentFolderObject->path = $postValues['path'] . $documentFolderObject->slug; |
|
354 | + } else { |
|
355 | + $documentFolderObject->path = $postValues['path'] . '/' . $documentFolderObject->slug; |
|
356 | + } |
|
357 | + $this->repository->saveDocument($documentFolderObject); |
|
358 | 358 | } |
359 | 359 | |
360 | 360 | /** |
@@ -366,7 +366,7 @@ discard block |
||
366 | 366 | */ |
367 | 367 | public function deleteDocumentFolderBySlug($slug) |
368 | 368 | { |
369 | - $path = '/' . $slug; |
|
369 | + $path = '/' . $slug; |
|
370 | 370 | $this->repository->deleteDocumentByPath($path); |
371 | 371 | } |
372 | 372 | |
@@ -380,7 +380,7 @@ discard block |
||
380 | 380 | */ |
381 | 381 | public function getDocumentFolderBySlug($slug) |
382 | 382 | { |
383 | - $path = '/' . $slug; |
|
383 | + $path = '/' . $slug; |
|
384 | 384 | return $this->repository->getDocumentByPath($path); |
385 | 385 | } |
386 | 386 | |
@@ -393,7 +393,7 @@ discard block |
||
393 | 393 | */ |
394 | 394 | public function saveDocumentFolder($postValues) |
395 | 395 | { |
396 | - $this->addDocumentFolder($postValues); |
|
396 | + $this->addDocumentFolder($postValues); |
|
397 | 397 | } |
398 | 398 | |
399 | 399 | /** |
@@ -406,7 +406,7 @@ discard block |
||
406 | 406 | */ |
407 | 407 | private function getDocumentContainerByPath($path) |
408 | 408 | { |
409 | - return $this->repository->getDocumentContainerByPath($path); |
|
409 | + return $this->repository->getDocumentContainerByPath($path); |
|
410 | 410 | } |
411 | 411 | |
412 | 412 | /** |
@@ -610,9 +610,9 @@ discard block |
||
610 | 610 | $imageObject->size = $postValues['size']; |
611 | 611 | $imageObject->set = $fileNames; |
612 | 612 | |
613 | - $images = $this->repository->images; |
|
613 | + $images = $this->repository->images; |
|
614 | 614 | $images[] = $imageObject; |
615 | - $this->repository->images = $images; |
|
615 | + $this->repository->images = $images; |
|
616 | 616 | |
617 | 617 | $this->save(); |
618 | 618 | } else { |
@@ -647,7 +647,7 @@ discard block |
||
647 | 647 | /** |
648 | 648 | * @param $filename |
649 | 649 | * @return null |
650 | - */ |
|
650 | + */ |
|
651 | 651 | public function getImageByName($filename) |
652 | 652 | { |
653 | 653 | $images = $this->getImages(); |
@@ -698,9 +698,9 @@ discard block |
||
698 | 698 | $file->type = $postValues['type']; |
699 | 699 | $file->size = $postValues['size']; |
700 | 700 | |
701 | - $files = $this->repository->files; |
|
701 | + $files = $this->repository->files; |
|
702 | 702 | $files[] = $file; |
703 | - $this->repository->files = $files; |
|
703 | + $this->repository->files = $files; |
|
704 | 704 | $this->save(); |
705 | 705 | } else { |
706 | 706 | throw new \Exception('Error moving uploaded file'); |
@@ -739,7 +739,7 @@ discard block |
||
739 | 739 | /** |
740 | 740 | * @param $filename |
741 | 741 | * @return null |
742 | - */ |
|
742 | + */ |
|
743 | 743 | public function getFileByName($filename) |
744 | 744 | { |
745 | 745 | $files = $this->getFiles(); |
@@ -754,7 +754,7 @@ discard block |
||
754 | 754 | /** |
755 | 755 | * @param $filename |
756 | 756 | * @throws \Exception |
757 | - */ |
|
757 | + */ |
|
758 | 758 | public function deleteFileByName($filename) |
759 | 759 | { |
760 | 760 | $destinationPath = realpath(__DIR__ . '/../../www/files/'); |
@@ -799,9 +799,9 @@ discard block |
||
799 | 799 | { |
800 | 800 | $documentTypeObject = $this->createDocumentTypeFromPostValues($postValues); |
801 | 801 | |
802 | - $documentTypes = $this->repository->documentTypes; |
|
803 | - $documentTypes[] = $documentTypeObject; |
|
804 | - $this->repository->documentTypes = $documentTypes; |
|
802 | + $documentTypes = $this->repository->documentTypes; |
|
803 | + $documentTypes[] = $documentTypeObject; |
|
804 | + $this->repository->documentTypes = $documentTypes; |
|
805 | 805 | |
806 | 806 | $this->save(); |
807 | 807 | } |
@@ -947,9 +947,9 @@ discard block |
||
947 | 947 | { |
948 | 948 | $brickObject = $this->createBrickFromPostValues($postValues); |
949 | 949 | |
950 | - $bricks = $this->repository->bricks; |
|
951 | - $bricks[] = $brickObject; |
|
952 | - $this->repository->bricks = $bricks; |
|
950 | + $bricks = $this->repository->bricks; |
|
951 | + $bricks[] = $brickObject; |
|
952 | + $this->repository->bricks = $bricks; |
|
953 | 953 | |
954 | 954 | $this->save(); |
955 | 955 | } |
@@ -1154,9 +1154,9 @@ discard block |
||
1154 | 1154 | { |
1155 | 1155 | $imageSetObject = $this->createImageSetFromPostValues($postValues); |
1156 | 1156 | |
1157 | - $imageSet = $this->repository->imageSet; |
|
1158 | - $imageSet[] = $imageSetObject; |
|
1159 | - $this->repository->imageSet = $imageSet; |
|
1157 | + $imageSet = $this->repository->imageSet; |
|
1158 | + $imageSet[] = $imageSetObject; |
|
1159 | + $this->repository->imageSet = $imageSet; |
|
1160 | 1160 | |
1161 | 1161 | $this->save(); |
1162 | 1162 | } |
@@ -10,85 +10,85 @@ |
||
10 | 10 | |
11 | 11 | class Document |
12 | 12 | { |
13 | - public $id; |
|
14 | - public $path; |
|
15 | - public $title; |
|
16 | - public $slug; |
|
17 | - public $type; |
|
18 | - public $documentType; |
|
19 | - public $documentTypeSlug; |
|
20 | - public $state; |
|
21 | - public $lastModificationDate; |
|
22 | - public $creationDate; |
|
23 | - public $lastModifiedBy; |
|
24 | - protected $fields; |
|
25 | - protected $bricks; |
|
26 | - protected $dynamicBricks; |
|
27 | - protected $content; |
|
13 | + public $id; |
|
14 | + public $path; |
|
15 | + public $title; |
|
16 | + public $slug; |
|
17 | + public $type; |
|
18 | + public $documentType; |
|
19 | + public $documentTypeSlug; |
|
20 | + public $state; |
|
21 | + public $lastModificationDate; |
|
22 | + public $creationDate; |
|
23 | + public $lastModifiedBy; |
|
24 | + protected $fields; |
|
25 | + protected $bricks; |
|
26 | + protected $dynamicBricks; |
|
27 | + protected $content; |
|
28 | 28 | |
29 | - protected $dbHandle; |
|
29 | + protected $dbHandle; |
|
30 | 30 | |
31 | - protected $jsonEncodedFields = array('fields', 'bricks', 'dynamicBricks'); |
|
31 | + protected $jsonEncodedFields = array('fields', 'bricks', 'dynamicBricks'); |
|
32 | 32 | |
33 | - public function __get($name) { |
|
34 | - if (in_array($name, $this->jsonEncodedFields)) { |
|
35 | - if (is_string($this->$name)) { |
|
36 | - return json_decode($this->$name); |
|
37 | - } else { |
|
38 | - return $this->$name; |
|
39 | - } |
|
40 | - } elseif ($name === 'content') { |
|
41 | - if ($this->dbHandle === null) { |
|
42 | - throw new \Exception('Document doesnt have a dbHandle handle. (path: ' . $this->path . ')'); |
|
43 | - } else { |
|
44 | - if ($this->content === null) { |
|
45 | - $this->getContent(); |
|
46 | - } |
|
47 | - return $this->content; |
|
48 | - } |
|
49 | - } elseif ($name === 'repository') { |
|
50 | - throw new \Exception('Trying to get protected property repository.'); |
|
51 | - } |
|
52 | - return $this->$name; |
|
53 | - } |
|
33 | + public function __get($name) { |
|
34 | + if (in_array($name, $this->jsonEncodedFields)) { |
|
35 | + if (is_string($this->$name)) { |
|
36 | + return json_decode($this->$name); |
|
37 | + } else { |
|
38 | + return $this->$name; |
|
39 | + } |
|
40 | + } elseif ($name === 'content') { |
|
41 | + if ($this->dbHandle === null) { |
|
42 | + throw new \Exception('Document doesnt have a dbHandle handle. (path: ' . $this->path . ')'); |
|
43 | + } else { |
|
44 | + if ($this->content === null) { |
|
45 | + $this->getContent(); |
|
46 | + } |
|
47 | + return $this->content; |
|
48 | + } |
|
49 | + } elseif ($name === 'repository') { |
|
50 | + throw new \Exception('Trying to get protected property repository.'); |
|
51 | + } |
|
52 | + return $this->$name; |
|
53 | + } |
|
54 | 54 | |
55 | - public function __set($name, $value) { |
|
56 | - if (in_array($name, $this->jsonEncodedFields)) { |
|
57 | - $this->$name = json_encode($value); |
|
58 | - } elseif ($name === 'content') { |
|
59 | - // Dont do anything for now.. |
|
60 | - return; |
|
61 | - } |
|
55 | + public function __set($name, $value) { |
|
56 | + if (in_array($name, $this->jsonEncodedFields)) { |
|
57 | + $this->$name = json_encode($value); |
|
58 | + } elseif ($name === 'content') { |
|
59 | + // Dont do anything for now.. |
|
60 | + return; |
|
61 | + } |
|
62 | 62 | |
63 | - $this->$name = $value; |
|
64 | - } |
|
63 | + $this->$name = $value; |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * @throws \Exception |
|
68 | - */ |
|
69 | - protected function getContent() |
|
70 | - { |
|
71 | - $folderPathWithWildcard = $this->path . '%'; |
|
72 | - $sql = ' SELECT * |
|
66 | + /** |
|
67 | + * @throws \Exception |
|
68 | + */ |
|
69 | + protected function getContent() |
|
70 | + { |
|
71 | + $folderPathWithWildcard = $this->path . '%'; |
|
72 | + $sql = ' SELECT * |
|
73 | 73 | FROM documents |
74 | 74 | WHERE `path` LIKE ' . $this->dbHandle->quote($folderPathWithWildcard) . ' |
75 | 75 | AND substr(`path`, ' . (strlen($this->path) + 2) . ') NOT LIKE "%/%" |
76 | 76 | AND substr(`path`, ' . (strlen($this->path) + 1) . ', 1) = "/" |
77 | 77 | AND path != ' . $this->dbHandle->quote($this->path) . ' |
78 | 78 | '; |
79 | - $stmt = $this->dbHandle->query($sql); |
|
80 | - if ($stmt === false) { |
|
81 | - $errorInfo = $this->dbHandle->errorInfo(); |
|
82 | - $errorMsg = $errorInfo[2]; |
|
83 | - throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>'); |
|
84 | - } |
|
85 | - $contents = $stmt->fetchAll(\PDO::FETCH_CLASS, '\library\storage\Document'); |
|
86 | - foreach ($contents as $key => $document) { |
|
87 | - if ($document->type === 'folder') { |
|
88 | - $document->dbHandle = $this->dbHandle; |
|
89 | - $contents[$key] = $document; |
|
90 | - } |
|
91 | - } |
|
92 | - $this->content = $contents; |
|
93 | - } |
|
79 | + $stmt = $this->dbHandle->query($sql); |
|
80 | + if ($stmt === false) { |
|
81 | + $errorInfo = $this->dbHandle->errorInfo(); |
|
82 | + $errorMsg = $errorInfo[2]; |
|
83 | + throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>'); |
|
84 | + } |
|
85 | + $contents = $stmt->fetchAll(\PDO::FETCH_CLASS, '\library\storage\Document'); |
|
86 | + foreach ($contents as $key => $document) { |
|
87 | + if ($document->type === 'folder') { |
|
88 | + $document->dbHandle = $this->dbHandle; |
|
89 | + $contents[$key] = $document; |
|
90 | + } |
|
91 | + } |
|
92 | + $this->content = $contents; |
|
93 | + } |
|
94 | 94 | } |
95 | 95 | \ No newline at end of file |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | } |
40 | 40 | } elseif ($name === 'content') { |
41 | 41 | if ($this->dbHandle === null) { |
42 | - throw new \Exception('Document doesnt have a dbHandle handle. (path: ' . $this->path . ')'); |
|
42 | + throw new \Exception('Document doesnt have a dbHandle handle. (path: '.$this->path.')'); |
|
43 | 43 | } else { |
44 | 44 | if ($this->content === null) { |
45 | 45 | $this->getContent(); |
@@ -68,19 +68,19 @@ discard block |
||
68 | 68 | */ |
69 | 69 | protected function getContent() |
70 | 70 | { |
71 | - $folderPathWithWildcard = $this->path . '%'; |
|
71 | + $folderPathWithWildcard = $this->path.'%'; |
|
72 | 72 | $sql = ' SELECT * |
73 | 73 | FROM documents |
74 | - WHERE `path` LIKE ' . $this->dbHandle->quote($folderPathWithWildcard) . ' |
|
75 | - AND substr(`path`, ' . (strlen($this->path) + 2) . ') NOT LIKE "%/%" |
|
76 | - AND substr(`path`, ' . (strlen($this->path) + 1) . ', 1) = "/" |
|
77 | - AND path != ' . $this->dbHandle->quote($this->path) . ' |
|
74 | + WHERE `path` LIKE ' . $this->dbHandle->quote($folderPathWithWildcard).' |
|
75 | + AND substr(`path`, ' . (strlen($this->path) + 2).') NOT LIKE "%/%" |
|
76 | + AND substr(`path`, ' . (strlen($this->path) + 1).', 1) = "/" |
|
77 | + AND path != ' . $this->dbHandle->quote($this->path).' |
|
78 | 78 | '; |
79 | 79 | $stmt = $this->dbHandle->query($sql); |
80 | 80 | if ($stmt === false) { |
81 | 81 | $errorInfo = $this->dbHandle->errorInfo(); |
82 | 82 | $errorMsg = $errorInfo[2]; |
83 | - throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>'); |
|
83 | + throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>'); |
|
84 | 84 | } |
85 | 85 | $contents = $stmt->fetchAll(\PDO::FETCH_CLASS, '\library\storage\Document'); |
86 | 86 | foreach ($contents as $key => $document) { |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | |
52 | 52 | /** |
53 | 53 | * Repository constructor. |
54 | - * @param $storagePath |
|
54 | + * @param string $storagePath |
|
55 | 55 | * @throws \Exception |
56 | 56 | */ |
57 | 57 | public function __construct($storagePath) |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | /** |
68 | 68 | * Creates the folder in which to create all storage related files |
69 | 69 | * |
70 | - * @param $storagePath |
|
70 | + * @param string $storagePath |
|
71 | 71 | * @return bool |
72 | 72 | */ |
73 | 73 | public static function create($storagePath) |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | |
149 | 149 | /** |
150 | 150 | * Persist subset to disk |
151 | - * @param $subset |
|
151 | + * @param string $subset |
|
152 | 152 | */ |
153 | 153 | protected function saveSubset($subset) |
154 | 154 | { |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | } |
175 | 175 | |
176 | 176 | /** |
177 | - * @param $contentSqlPath |
|
177 | + * @param string $contentSqlPath |
|
178 | 178 | */ |
179 | 179 | protected function initContentDb($contentSqlPath) |
180 | 180 | { |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | } |
185 | 185 | |
186 | 186 | /** |
187 | - * @param $storageDefaultPath |
|
187 | + * @param string $storageDefaultPath |
|
188 | 188 | */ |
189 | 189 | protected function initConfigStorage($storageDefaultPath) |
190 | 190 | { |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | |
231 | 231 | /** |
232 | 232 | * Get all documents and folders in a certain path |
233 | - * @param $folderPath |
|
233 | + * @param string $folderPath |
|
234 | 234 | * @return array |
235 | 235 | * @throws \Exception |
236 | 236 | */ |
@@ -310,7 +310,7 @@ discard block |
||
310 | 310 | |
311 | 311 | /** |
312 | 312 | * Return the result of the query as Document |
313 | - * @param $sql |
|
313 | + * @param string $sql |
|
314 | 314 | * @return mixed |
315 | 315 | * @throws \Exception |
316 | 316 | */ |
@@ -385,7 +385,7 @@ discard block |
||
385 | 385 | /** |
386 | 386 | * Delete the document from the database |
387 | 387 | * If it's a folder, also delete it's contents |
388 | - * @param $path |
|
388 | + * @param string $path |
|
389 | 389 | * @throws \Exception |
390 | 390 | */ |
391 | 391 | public function deleteDocumentByPath($path) |
@@ -19,227 +19,227 @@ discard block |
||
19 | 19 | |
20 | 20 | class Repository |
21 | 21 | { |
22 | - protected $storagePath; |
|
23 | - |
|
24 | - protected $fileBasedSubsets = array('sitemap', 'applicationComponents', 'documentTypes', 'bricks', 'imageSet', 'images', 'files', 'users'); |
|
25 | - |
|
26 | - protected $sitemap; |
|
27 | - protected $sitemapChanges = false; |
|
28 | - |
|
29 | - protected $applicationComponents; |
|
30 | - protected $applicationComponentsChanges = false; |
|
31 | - |
|
32 | - protected $documentTypes; |
|
33 | - protected $documentTypesChanges = false; |
|
34 | - |
|
35 | - protected $bricks; |
|
36 | - protected $bricksChanges = false; |
|
37 | - |
|
38 | - protected $imageSet; |
|
39 | - protected $imageSetChanges = false; |
|
40 | - |
|
41 | - protected $images; |
|
42 | - protected $imagesChanges = false; |
|
43 | - |
|
44 | - protected $files; |
|
45 | - protected $filesChanges = false; |
|
46 | - |
|
47 | - protected $users; |
|
48 | - protected $usersChanges = false; |
|
49 | - |
|
50 | - protected $contentDbHandle; |
|
51 | - |
|
52 | - /** |
|
53 | - * Repository constructor. |
|
54 | - * @param $storagePath |
|
55 | - * @throws \Exception |
|
56 | - */ |
|
57 | - public function __construct($storagePath) |
|
58 | - { |
|
59 | - $storagePath = realpath($storagePath); |
|
60 | - if (is_dir($storagePath) && $storagePath !== false) { |
|
61 | - $this->storagePath = $storagePath; |
|
62 | - } else { |
|
63 | - throw new \Exception('Repository not yet initialized.'); |
|
64 | - } |
|
65 | - } |
|
66 | - |
|
67 | - /** |
|
68 | - * Creates the folder in which to create all storage related files |
|
69 | - * |
|
70 | - * @param $storagePath |
|
71 | - * @return bool |
|
72 | - */ |
|
73 | - public static function create($storagePath) |
|
74 | - { |
|
75 | - return mkdir($storagePath); |
|
76 | - } |
|
77 | - |
|
78 | - /** |
|
79 | - * Initiates default storage |
|
80 | - * @throws \Exception |
|
81 | - */ |
|
82 | - public function init() |
|
83 | - { |
|
84 | - $storageDefaultPath = realpath('../library/cc/install/_storage.json'); |
|
85 | - $contentSqlPath = realpath('../library/cc/install/content.sql'); |
|
86 | - |
|
87 | - $this->initConfigStorage($storageDefaultPath); |
|
88 | - $this->initContentDb($contentSqlPath); |
|
89 | - |
|
90 | - $this->save(); |
|
91 | - } |
|
92 | - |
|
93 | - /** |
|
94 | - * Load filebased subset and return it's contents |
|
95 | - * |
|
96 | - * @param $name |
|
97 | - * @return mixed|string |
|
98 | - * @throws \Exception |
|
99 | - */ |
|
100 | - public function __get($name) |
|
101 | - { |
|
102 | - if (isset($this->$name)) { |
|
103 | - if (in_array($name, $this->fileBasedSubsets)) { |
|
104 | - return $this->$name; |
|
105 | - } else { |
|
106 | - throw new \Exception('Trying to get undefined property from Repository: ' . $name); |
|
107 | - } |
|
108 | - } else { |
|
109 | - if (in_array($name, $this->fileBasedSubsets)) { |
|
110 | - return $this->loadSubset($name); |
|
111 | - } else { |
|
112 | - throw new \Exception('Trying to get undefined property from Repository: ' . $name); |
|
113 | - } |
|
114 | - } |
|
115 | - } |
|
116 | - |
|
117 | - /** |
|
118 | - * Set filebased subset contents |
|
119 | - * @param $name |
|
120 | - * @param $value |
|
121 | - * @throws \Exception |
|
122 | - */ |
|
123 | - public function __set($name, $value) |
|
124 | - { |
|
125 | - if (in_array($name, $this->fileBasedSubsets)) { |
|
126 | - $this->$name = $value; |
|
127 | - $changes = $name . 'Changes'; |
|
128 | - $this->$changes = true; |
|
129 | - } else { |
|
130 | - throw new \Exception('Trying to persist unknown subset in repository: ' . $name . ' <br /><pre>' . print_r($value, true) . '</pre>'); |
|
131 | - } |
|
132 | - } |
|
133 | - |
|
134 | - /** |
|
135 | - * Persist all subsets |
|
136 | - */ |
|
137 | - public function save() |
|
138 | - { |
|
139 | - $this->sitemapChanges ? $this->saveSubset('sitemap') : null; |
|
140 | - $this->applicationComponentsChanges ? $this->saveSubset('applicationComponents') : null; |
|
141 | - $this->documentTypesChanges ? $this->saveSubset('documentTypes') : null; |
|
142 | - $this->bricksChanges ? $this->saveSubset('bricks') : null; |
|
143 | - $this->imageSetChanges ? $this->saveSubset('imageSet') : null; |
|
144 | - $this->imagesChanges ? $this->saveSubset('images') : null; |
|
145 | - $this->filesChanges ? $this->saveSubset('files') : null; |
|
146 | - $this->usersChanges ? $this->saveSubset('users') : null; |
|
147 | - } |
|
148 | - |
|
149 | - /** |
|
150 | - * Persist subset to disk |
|
151 | - * @param $subset |
|
152 | - */ |
|
153 | - protected function saveSubset($subset) |
|
154 | - { |
|
155 | - $json = json_encode($this->$subset); |
|
156 | - $subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json'; |
|
157 | - file_put_contents($subsetStoragePath, $json); |
|
158 | - $changes = $subset . 'Changes'; |
|
159 | - $this->$changes = false; |
|
160 | - } |
|
161 | - |
|
162 | - /** |
|
163 | - * Load subset from disk |
|
164 | - * @param $subset |
|
165 | - * @return mixed|string |
|
166 | - */ |
|
167 | - protected function loadSubset($subset) |
|
168 | - { |
|
169 | - $subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json'; |
|
170 | - $json = file_get_contents($subsetStoragePath); |
|
171 | - $json = json_decode($json); |
|
172 | - $this->$subset = $json; |
|
173 | - return $json; |
|
174 | - } |
|
175 | - |
|
176 | - /** |
|
177 | - * @param $contentSqlPath |
|
178 | - */ |
|
179 | - protected function initContentDb($contentSqlPath) |
|
180 | - { |
|
181 | - $db = $this->getContentDbHandle(); |
|
182 | - $sql = file_get_contents($contentSqlPath); |
|
183 | - $db->exec($sql); |
|
184 | - } |
|
185 | - |
|
186 | - /** |
|
187 | - * @param $storageDefaultPath |
|
188 | - */ |
|
189 | - protected function initConfigStorage($storageDefaultPath) |
|
190 | - { |
|
191 | - $json = file_get_contents($storageDefaultPath); |
|
192 | - $json = json_decode($json); |
|
193 | - $this->sitemap = $json->sitemap; |
|
194 | - $this->sitemapChanges = true; |
|
195 | - $this->applicationComponents = $json->applicationComponents; |
|
196 | - $this->applicationComponentsChanges = true; |
|
197 | - $this->documentTypes = $json->documentTypes; |
|
198 | - $this->documentTypesChanges = true; |
|
199 | - $this->bricks = $json->bricks; |
|
200 | - $this->bricksChanges = true; |
|
201 | - $this->imageSet = $json->imageSet; |
|
202 | - $this->imageSetChanges = true; |
|
203 | - $this->images = $json->images; |
|
204 | - $this->imagesChanges = true; |
|
205 | - $this->files = $json->files; |
|
206 | - $this->filesChanges = true; |
|
207 | - $this->users = $json->users; |
|
208 | - $this->usersChanges = true; |
|
209 | - } |
|
210 | - |
|
211 | - /** |
|
212 | - * @return \PDO |
|
213 | - */ |
|
214 | - protected function getContentDbHandle() |
|
215 | - { |
|
216 | - if ($this->contentDbHandle === null) { |
|
217 | - $this->contentDbHandle = new \PDO('sqlite:' . $this->storagePath . DIRECTORY_SEPARATOR . 'content.db'); |
|
218 | - } |
|
219 | - return $this->contentDbHandle; |
|
220 | - } |
|
221 | - |
|
222 | - /** |
|
223 | - * Get all documents |
|
224 | - * @return array |
|
225 | - */ |
|
226 | - public function getDocuments() |
|
227 | - { |
|
228 | - return $this->getDocumentsByPath('/'); |
|
229 | - } |
|
230 | - |
|
231 | - /** |
|
232 | - * Get all documents and folders in a certain path |
|
233 | - * @param $folderPath |
|
234 | - * @return array |
|
235 | - * @throws \Exception |
|
236 | - */ |
|
237 | - public function getDocumentsByPath($folderPath) |
|
238 | - { |
|
239 | - $db = $this->getContentDbHandle(); |
|
240 | - $folderPathWithWildcard = $folderPath . '%'; |
|
241 | - |
|
242 | - $stmt = $this->getDbStatement(' |
|
22 | + protected $storagePath; |
|
23 | + |
|
24 | + protected $fileBasedSubsets = array('sitemap', 'applicationComponents', 'documentTypes', 'bricks', 'imageSet', 'images', 'files', 'users'); |
|
25 | + |
|
26 | + protected $sitemap; |
|
27 | + protected $sitemapChanges = false; |
|
28 | + |
|
29 | + protected $applicationComponents; |
|
30 | + protected $applicationComponentsChanges = false; |
|
31 | + |
|
32 | + protected $documentTypes; |
|
33 | + protected $documentTypesChanges = false; |
|
34 | + |
|
35 | + protected $bricks; |
|
36 | + protected $bricksChanges = false; |
|
37 | + |
|
38 | + protected $imageSet; |
|
39 | + protected $imageSetChanges = false; |
|
40 | + |
|
41 | + protected $images; |
|
42 | + protected $imagesChanges = false; |
|
43 | + |
|
44 | + protected $files; |
|
45 | + protected $filesChanges = false; |
|
46 | + |
|
47 | + protected $users; |
|
48 | + protected $usersChanges = false; |
|
49 | + |
|
50 | + protected $contentDbHandle; |
|
51 | + |
|
52 | + /** |
|
53 | + * Repository constructor. |
|
54 | + * @param $storagePath |
|
55 | + * @throws \Exception |
|
56 | + */ |
|
57 | + public function __construct($storagePath) |
|
58 | + { |
|
59 | + $storagePath = realpath($storagePath); |
|
60 | + if (is_dir($storagePath) && $storagePath !== false) { |
|
61 | + $this->storagePath = $storagePath; |
|
62 | + } else { |
|
63 | + throw new \Exception('Repository not yet initialized.'); |
|
64 | + } |
|
65 | + } |
|
66 | + |
|
67 | + /** |
|
68 | + * Creates the folder in which to create all storage related files |
|
69 | + * |
|
70 | + * @param $storagePath |
|
71 | + * @return bool |
|
72 | + */ |
|
73 | + public static function create($storagePath) |
|
74 | + { |
|
75 | + return mkdir($storagePath); |
|
76 | + } |
|
77 | + |
|
78 | + /** |
|
79 | + * Initiates default storage |
|
80 | + * @throws \Exception |
|
81 | + */ |
|
82 | + public function init() |
|
83 | + { |
|
84 | + $storageDefaultPath = realpath('../library/cc/install/_storage.json'); |
|
85 | + $contentSqlPath = realpath('../library/cc/install/content.sql'); |
|
86 | + |
|
87 | + $this->initConfigStorage($storageDefaultPath); |
|
88 | + $this->initContentDb($contentSqlPath); |
|
89 | + |
|
90 | + $this->save(); |
|
91 | + } |
|
92 | + |
|
93 | + /** |
|
94 | + * Load filebased subset and return it's contents |
|
95 | + * |
|
96 | + * @param $name |
|
97 | + * @return mixed|string |
|
98 | + * @throws \Exception |
|
99 | + */ |
|
100 | + public function __get($name) |
|
101 | + { |
|
102 | + if (isset($this->$name)) { |
|
103 | + if (in_array($name, $this->fileBasedSubsets)) { |
|
104 | + return $this->$name; |
|
105 | + } else { |
|
106 | + throw new \Exception('Trying to get undefined property from Repository: ' . $name); |
|
107 | + } |
|
108 | + } else { |
|
109 | + if (in_array($name, $this->fileBasedSubsets)) { |
|
110 | + return $this->loadSubset($name); |
|
111 | + } else { |
|
112 | + throw new \Exception('Trying to get undefined property from Repository: ' . $name); |
|
113 | + } |
|
114 | + } |
|
115 | + } |
|
116 | + |
|
117 | + /** |
|
118 | + * Set filebased subset contents |
|
119 | + * @param $name |
|
120 | + * @param $value |
|
121 | + * @throws \Exception |
|
122 | + */ |
|
123 | + public function __set($name, $value) |
|
124 | + { |
|
125 | + if (in_array($name, $this->fileBasedSubsets)) { |
|
126 | + $this->$name = $value; |
|
127 | + $changes = $name . 'Changes'; |
|
128 | + $this->$changes = true; |
|
129 | + } else { |
|
130 | + throw new \Exception('Trying to persist unknown subset in repository: ' . $name . ' <br /><pre>' . print_r($value, true) . '</pre>'); |
|
131 | + } |
|
132 | + } |
|
133 | + |
|
134 | + /** |
|
135 | + * Persist all subsets |
|
136 | + */ |
|
137 | + public function save() |
|
138 | + { |
|
139 | + $this->sitemapChanges ? $this->saveSubset('sitemap') : null; |
|
140 | + $this->applicationComponentsChanges ? $this->saveSubset('applicationComponents') : null; |
|
141 | + $this->documentTypesChanges ? $this->saveSubset('documentTypes') : null; |
|
142 | + $this->bricksChanges ? $this->saveSubset('bricks') : null; |
|
143 | + $this->imageSetChanges ? $this->saveSubset('imageSet') : null; |
|
144 | + $this->imagesChanges ? $this->saveSubset('images') : null; |
|
145 | + $this->filesChanges ? $this->saveSubset('files') : null; |
|
146 | + $this->usersChanges ? $this->saveSubset('users') : null; |
|
147 | + } |
|
148 | + |
|
149 | + /** |
|
150 | + * Persist subset to disk |
|
151 | + * @param $subset |
|
152 | + */ |
|
153 | + protected function saveSubset($subset) |
|
154 | + { |
|
155 | + $json = json_encode($this->$subset); |
|
156 | + $subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json'; |
|
157 | + file_put_contents($subsetStoragePath, $json); |
|
158 | + $changes = $subset . 'Changes'; |
|
159 | + $this->$changes = false; |
|
160 | + } |
|
161 | + |
|
162 | + /** |
|
163 | + * Load subset from disk |
|
164 | + * @param $subset |
|
165 | + * @return mixed|string |
|
166 | + */ |
|
167 | + protected function loadSubset($subset) |
|
168 | + { |
|
169 | + $subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json'; |
|
170 | + $json = file_get_contents($subsetStoragePath); |
|
171 | + $json = json_decode($json); |
|
172 | + $this->$subset = $json; |
|
173 | + return $json; |
|
174 | + } |
|
175 | + |
|
176 | + /** |
|
177 | + * @param $contentSqlPath |
|
178 | + */ |
|
179 | + protected function initContentDb($contentSqlPath) |
|
180 | + { |
|
181 | + $db = $this->getContentDbHandle(); |
|
182 | + $sql = file_get_contents($contentSqlPath); |
|
183 | + $db->exec($sql); |
|
184 | + } |
|
185 | + |
|
186 | + /** |
|
187 | + * @param $storageDefaultPath |
|
188 | + */ |
|
189 | + protected function initConfigStorage($storageDefaultPath) |
|
190 | + { |
|
191 | + $json = file_get_contents($storageDefaultPath); |
|
192 | + $json = json_decode($json); |
|
193 | + $this->sitemap = $json->sitemap; |
|
194 | + $this->sitemapChanges = true; |
|
195 | + $this->applicationComponents = $json->applicationComponents; |
|
196 | + $this->applicationComponentsChanges = true; |
|
197 | + $this->documentTypes = $json->documentTypes; |
|
198 | + $this->documentTypesChanges = true; |
|
199 | + $this->bricks = $json->bricks; |
|
200 | + $this->bricksChanges = true; |
|
201 | + $this->imageSet = $json->imageSet; |
|
202 | + $this->imageSetChanges = true; |
|
203 | + $this->images = $json->images; |
|
204 | + $this->imagesChanges = true; |
|
205 | + $this->files = $json->files; |
|
206 | + $this->filesChanges = true; |
|
207 | + $this->users = $json->users; |
|
208 | + $this->usersChanges = true; |
|
209 | + } |
|
210 | + |
|
211 | + /** |
|
212 | + * @return \PDO |
|
213 | + */ |
|
214 | + protected function getContentDbHandle() |
|
215 | + { |
|
216 | + if ($this->contentDbHandle === null) { |
|
217 | + $this->contentDbHandle = new \PDO('sqlite:' . $this->storagePath . DIRECTORY_SEPARATOR . 'content.db'); |
|
218 | + } |
|
219 | + return $this->contentDbHandle; |
|
220 | + } |
|
221 | + |
|
222 | + /** |
|
223 | + * Get all documents |
|
224 | + * @return array |
|
225 | + */ |
|
226 | + public function getDocuments() |
|
227 | + { |
|
228 | + return $this->getDocumentsByPath('/'); |
|
229 | + } |
|
230 | + |
|
231 | + /** |
|
232 | + * Get all documents and folders in a certain path |
|
233 | + * @param $folderPath |
|
234 | + * @return array |
|
235 | + * @throws \Exception |
|
236 | + */ |
|
237 | + public function getDocumentsByPath($folderPath) |
|
238 | + { |
|
239 | + $db = $this->getContentDbHandle(); |
|
240 | + $folderPathWithWildcard = $folderPath . '%'; |
|
241 | + |
|
242 | + $stmt = $this->getDbStatement(' |
|
243 | 243 | SELECT * |
244 | 244 | FROM documents |
245 | 245 | WHERE `path` LIKE ' . $db->quote($folderPathWithWildcard) . ' |
@@ -248,119 +248,119 @@ discard block |
||
248 | 248 | ORDER BY `type` DESC, `path` ASC |
249 | 249 | '); |
250 | 250 | |
251 | - $documents = $stmt->fetchAll(\PDO::FETCH_CLASS, '\library\storage\Document'); |
|
252 | - foreach ($documents as $key => $document) { |
|
253 | - if ($document->type === 'folder') { |
|
254 | - $document->dbHandle = $db; |
|
255 | - $documents[$key] = $document; |
|
256 | - } |
|
257 | - } |
|
258 | - return $documents; |
|
259 | - } |
|
260 | - |
|
261 | - |
|
262 | - /** |
|
263 | - * @param $path |
|
264 | - * @return bool|Document |
|
265 | - */ |
|
266 | - public function getDocumentContainerByPath($path) |
|
267 | - { |
|
268 | - $document = $this->getDocumentByPath($path); |
|
269 | - if ($document === false) { |
|
270 | - return false; |
|
271 | - } |
|
272 | - $slugLength = strlen($document->slug); |
|
273 | - $containerPath = substr($path, 0, -$slugLength); |
|
274 | - if ($containerPath === '/') { |
|
275 | - return $this->getRootFolder(); |
|
276 | - } |
|
277 | - $containerFolder = $this->getDocumentByPath($containerPath); |
|
278 | - return $containerFolder; |
|
279 | - } |
|
280 | - |
|
281 | - /** |
|
282 | - * @param $path |
|
283 | - * @return bool|Document |
|
284 | - */ |
|
285 | - public function getDocumentByPath($path) |
|
286 | - { |
|
287 | - $db = $this->getContentDbHandle(); |
|
288 | - $document = $this->fetchDocument(' |
|
251 | + $documents = $stmt->fetchAll(\PDO::FETCH_CLASS, '\library\storage\Document'); |
|
252 | + foreach ($documents as $key => $document) { |
|
253 | + if ($document->type === 'folder') { |
|
254 | + $document->dbHandle = $db; |
|
255 | + $documents[$key] = $document; |
|
256 | + } |
|
257 | + } |
|
258 | + return $documents; |
|
259 | + } |
|
260 | + |
|
261 | + |
|
262 | + /** |
|
263 | + * @param $path |
|
264 | + * @return bool|Document |
|
265 | + */ |
|
266 | + public function getDocumentContainerByPath($path) |
|
267 | + { |
|
268 | + $document = $this->getDocumentByPath($path); |
|
269 | + if ($document === false) { |
|
270 | + return false; |
|
271 | + } |
|
272 | + $slugLength = strlen($document->slug); |
|
273 | + $containerPath = substr($path, 0, -$slugLength); |
|
274 | + if ($containerPath === '/') { |
|
275 | + return $this->getRootFolder(); |
|
276 | + } |
|
277 | + $containerFolder = $this->getDocumentByPath($containerPath); |
|
278 | + return $containerFolder; |
|
279 | + } |
|
280 | + |
|
281 | + /** |
|
282 | + * @param $path |
|
283 | + * @return bool|Document |
|
284 | + */ |
|
285 | + public function getDocumentByPath($path) |
|
286 | + { |
|
287 | + $db = $this->getContentDbHandle(); |
|
288 | + $document = $this->fetchDocument(' |
|
289 | 289 | SELECT * |
290 | 290 | FROM documents |
291 | 291 | WHERE path = ' . $db->quote($path) . ' |
292 | 292 | '); |
293 | - if ($document instanceof Document && $document->type === 'folder') { |
|
294 | - $document->dbHandle = $db; |
|
295 | - } |
|
296 | - return $document; |
|
297 | - } |
|
298 | - |
|
299 | - /** |
|
300 | - * Return the results of the query as array of Documents |
|
301 | - * @param $sql |
|
302 | - * @return array |
|
303 | - * @throws \Exception |
|
304 | - */ |
|
305 | - protected function fetchAllDocuments($sql) |
|
306 | - { |
|
307 | - $stmt = $this->getDbStatement($sql); |
|
308 | - return $stmt->fetchAll(\PDO::FETCH_CLASS, '\library\storage\Document'); |
|
309 | - } |
|
310 | - |
|
311 | - /** |
|
312 | - * Return the result of the query as Document |
|
313 | - * @param $sql |
|
314 | - * @return mixed |
|
315 | - * @throws \Exception |
|
316 | - */ |
|
317 | - protected function fetchDocument($sql) |
|
318 | - { |
|
319 | - $stmt = $this->getDbStatement($sql); |
|
320 | - return $stmt->fetchObject('\library\storage\Document'); |
|
321 | - } |
|
322 | - |
|
323 | - /** |
|
324 | - * Prepare the sql statement |
|
325 | - * @param $sql |
|
326 | - * @return \PDOStatement |
|
327 | - * @throws \Exception |
|
328 | - */ |
|
329 | - protected function getDbStatement($sql) |
|
330 | - { |
|
331 | - $db = $this->getContentDbHandle(); |
|
332 | - $stmt = $db->query($sql); |
|
333 | - if ($stmt === false) { |
|
334 | - $errorInfo = $db->errorInfo(); |
|
335 | - $errorMsg = $errorInfo[2]; |
|
336 | - throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>'); |
|
337 | - } |
|
338 | - return $stmt; |
|
339 | - } |
|
340 | - |
|
341 | - /** |
|
342 | - * Create a (non-existent) root folder Document and return it |
|
343 | - * @return Document |
|
344 | - */ |
|
345 | - protected function getRootFolder() |
|
346 | - { |
|
347 | - $rootFolder = new Document(); |
|
348 | - $rootFolder->path = '/'; |
|
349 | - $rootFolder->type = 'folder'; |
|
350 | - return $rootFolder; |
|
351 | - } |
|
352 | - |
|
353 | - /** |
|
354 | - * Save the document to the database |
|
355 | - * @param Document $documentObject |
|
356 | - * @return bool |
|
357 | - * @throws \Exception |
|
358 | - * @internal param $path |
|
359 | - */ |
|
360 | - public function saveDocument($documentObject) |
|
361 | - { |
|
362 | - $db = $this->getContentDbHandle(); |
|
363 | - $stmt = $this->getDbStatement(' |
|
293 | + if ($document instanceof Document && $document->type === 'folder') { |
|
294 | + $document->dbHandle = $db; |
|
295 | + } |
|
296 | + return $document; |
|
297 | + } |
|
298 | + |
|
299 | + /** |
|
300 | + * Return the results of the query as array of Documents |
|
301 | + * @param $sql |
|
302 | + * @return array |
|
303 | + * @throws \Exception |
|
304 | + */ |
|
305 | + protected function fetchAllDocuments($sql) |
|
306 | + { |
|
307 | + $stmt = $this->getDbStatement($sql); |
|
308 | + return $stmt->fetchAll(\PDO::FETCH_CLASS, '\library\storage\Document'); |
|
309 | + } |
|
310 | + |
|
311 | + /** |
|
312 | + * Return the result of the query as Document |
|
313 | + * @param $sql |
|
314 | + * @return mixed |
|
315 | + * @throws \Exception |
|
316 | + */ |
|
317 | + protected function fetchDocument($sql) |
|
318 | + { |
|
319 | + $stmt = $this->getDbStatement($sql); |
|
320 | + return $stmt->fetchObject('\library\storage\Document'); |
|
321 | + } |
|
322 | + |
|
323 | + /** |
|
324 | + * Prepare the sql statement |
|
325 | + * @param $sql |
|
326 | + * @return \PDOStatement |
|
327 | + * @throws \Exception |
|
328 | + */ |
|
329 | + protected function getDbStatement($sql) |
|
330 | + { |
|
331 | + $db = $this->getContentDbHandle(); |
|
332 | + $stmt = $db->query($sql); |
|
333 | + if ($stmt === false) { |
|
334 | + $errorInfo = $db->errorInfo(); |
|
335 | + $errorMsg = $errorInfo[2]; |
|
336 | + throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>'); |
|
337 | + } |
|
338 | + return $stmt; |
|
339 | + } |
|
340 | + |
|
341 | + /** |
|
342 | + * Create a (non-existent) root folder Document and return it |
|
343 | + * @return Document |
|
344 | + */ |
|
345 | + protected function getRootFolder() |
|
346 | + { |
|
347 | + $rootFolder = new Document(); |
|
348 | + $rootFolder->path = '/'; |
|
349 | + $rootFolder->type = 'folder'; |
|
350 | + return $rootFolder; |
|
351 | + } |
|
352 | + |
|
353 | + /** |
|
354 | + * Save the document to the database |
|
355 | + * @param Document $documentObject |
|
356 | + * @return bool |
|
357 | + * @throws \Exception |
|
358 | + * @internal param $path |
|
359 | + */ |
|
360 | + public function saveDocument($documentObject) |
|
361 | + { |
|
362 | + $db = $this->getContentDbHandle(); |
|
363 | + $stmt = $this->getDbStatement(' |
|
364 | 364 | INSERT OR REPLACE INTO documents (`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,`state`,`lastModificationDate`,`creationDate`,`lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`) |
365 | 365 | VALUES( |
366 | 366 | ' . $db->quote($documentObject->path) . ', |
@@ -378,37 +378,37 @@ discard block |
||
378 | 378 | ' . $db->quote(json_encode($documentObject->dynamicBricks)) . ' |
379 | 379 | ) |
380 | 380 | '); |
381 | - $result = $stmt->execute(); |
|
382 | - return $result; |
|
383 | - } |
|
384 | - |
|
385 | - /** |
|
386 | - * Delete the document from the database |
|
387 | - * If it's a folder, also delete it's contents |
|
388 | - * @param $path |
|
389 | - * @throws \Exception |
|
390 | - */ |
|
391 | - public function deleteDocumentByPath($path) |
|
392 | - { |
|
393 | - $db = $this->getContentDbHandle(); |
|
394 | - $documentToDelete = $this->getDocumentByPath($path); |
|
395 | - if ($documentToDelete instanceof Document) { |
|
396 | - if ($documentToDelete->type == 'document') { |
|
397 | - $stmt = $this->getDbStatement(' |
|
381 | + $result = $stmt->execute(); |
|
382 | + return $result; |
|
383 | + } |
|
384 | + |
|
385 | + /** |
|
386 | + * Delete the document from the database |
|
387 | + * If it's a folder, also delete it's contents |
|
388 | + * @param $path |
|
389 | + * @throws \Exception |
|
390 | + */ |
|
391 | + public function deleteDocumentByPath($path) |
|
392 | + { |
|
393 | + $db = $this->getContentDbHandle(); |
|
394 | + $documentToDelete = $this->getDocumentByPath($path); |
|
395 | + if ($documentToDelete instanceof Document) { |
|
396 | + if ($documentToDelete->type == 'document') { |
|
397 | + $stmt = $this->getDbStatement(' |
|
398 | 398 | DELETE FROM documents |
399 | 399 | WHERE path = ' . $db->quote($path) . ' |
400 | 400 | '); |
401 | - $stmt->execute(); |
|
402 | - } elseif ($documentToDelete->type == 'folder') { |
|
403 | - $folderPathWithWildcard = $path . '%'; |
|
404 | - $stmt = $this->getDbStatement(' |
|
401 | + $stmt->execute(); |
|
402 | + } elseif ($documentToDelete->type == 'folder') { |
|
403 | + $folderPathWithWildcard = $path . '%'; |
|
404 | + $stmt = $this->getDbStatement(' |
|
405 | 405 | DELETE FROM documents |
406 | 406 | WHERE (path LIKE ' . $db->quote($folderPathWithWildcard) . ' |
407 | 407 | AND substr(`path`, ' . (strlen($path) + 1) . ', 1) = "/") |
408 | 408 | OR path = ' . $db->quote($path) . ' |
409 | 409 | '); |
410 | - $stmt->execute(); |
|
411 | - } |
|
412 | - } |
|
413 | - } |
|
410 | + $stmt->execute(); |
|
411 | + } |
|
412 | + } |
|
413 | + } |
|
414 | 414 | } |
415 | 415 | \ No newline at end of file |
@@ -103,13 +103,13 @@ discard block |
||
103 | 103 | if (in_array($name, $this->fileBasedSubsets)) { |
104 | 104 | return $this->$name; |
105 | 105 | } else { |
106 | - throw new \Exception('Trying to get undefined property from Repository: ' . $name); |
|
106 | + throw new \Exception('Trying to get undefined property from Repository: '.$name); |
|
107 | 107 | } |
108 | 108 | } else { |
109 | 109 | if (in_array($name, $this->fileBasedSubsets)) { |
110 | 110 | return $this->loadSubset($name); |
111 | 111 | } else { |
112 | - throw new \Exception('Trying to get undefined property from Repository: ' . $name); |
|
112 | + throw new \Exception('Trying to get undefined property from Repository: '.$name); |
|
113 | 113 | } |
114 | 114 | } |
115 | 115 | } |
@@ -124,10 +124,10 @@ discard block |
||
124 | 124 | { |
125 | 125 | if (in_array($name, $this->fileBasedSubsets)) { |
126 | 126 | $this->$name = $value; |
127 | - $changes = $name . 'Changes'; |
|
127 | + $changes = $name.'Changes'; |
|
128 | 128 | $this->$changes = true; |
129 | 129 | } else { |
130 | - throw new \Exception('Trying to persist unknown subset in repository: ' . $name . ' <br /><pre>' . print_r($value, true) . '</pre>'); |
|
130 | + throw new \Exception('Trying to persist unknown subset in repository: '.$name.' <br /><pre>'.print_r($value, true).'</pre>'); |
|
131 | 131 | } |
132 | 132 | } |
133 | 133 | |
@@ -153,9 +153,9 @@ discard block |
||
153 | 153 | protected function saveSubset($subset) |
154 | 154 | { |
155 | 155 | $json = json_encode($this->$subset); |
156 | - $subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json'; |
|
156 | + $subsetStoragePath = $this->storagePath.DIRECTORY_SEPARATOR.$subset.'.json'; |
|
157 | 157 | file_put_contents($subsetStoragePath, $json); |
158 | - $changes = $subset . 'Changes'; |
|
158 | + $changes = $subset.'Changes'; |
|
159 | 159 | $this->$changes = false; |
160 | 160 | } |
161 | 161 | |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | */ |
167 | 167 | protected function loadSubset($subset) |
168 | 168 | { |
169 | - $subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json'; |
|
169 | + $subsetStoragePath = $this->storagePath.DIRECTORY_SEPARATOR.$subset.'.json'; |
|
170 | 170 | $json = file_get_contents($subsetStoragePath); |
171 | 171 | $json = json_decode($json); |
172 | 172 | $this->$subset = $json; |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | protected function getContentDbHandle() |
215 | 215 | { |
216 | 216 | if ($this->contentDbHandle === null) { |
217 | - $this->contentDbHandle = new \PDO('sqlite:' . $this->storagePath . DIRECTORY_SEPARATOR . 'content.db'); |
|
217 | + $this->contentDbHandle = new \PDO('sqlite:'.$this->storagePath.DIRECTORY_SEPARATOR.'content.db'); |
|
218 | 218 | } |
219 | 219 | return $this->contentDbHandle; |
220 | 220 | } |
@@ -237,14 +237,14 @@ discard block |
||
237 | 237 | public function getDocumentsByPath($folderPath) |
238 | 238 | { |
239 | 239 | $db = $this->getContentDbHandle(); |
240 | - $folderPathWithWildcard = $folderPath . '%'; |
|
240 | + $folderPathWithWildcard = $folderPath.'%'; |
|
241 | 241 | |
242 | 242 | $stmt = $this->getDbStatement(' |
243 | 243 | SELECT * |
244 | 244 | FROM documents |
245 | - WHERE `path` LIKE ' . $db->quote($folderPathWithWildcard) . ' |
|
246 | - AND substr(`path`, ' . (strlen($folderPath) + 1) . ') NOT LIKE "%/%" |
|
247 | - AND path != ' . $db->quote($folderPath) . ' |
|
245 | + WHERE `path` LIKE ' . $db->quote($folderPathWithWildcard).' |
|
246 | + AND substr(`path`, ' . (strlen($folderPath) + 1).') NOT LIKE "%/%" |
|
247 | + AND path != ' . $db->quote($folderPath).' |
|
248 | 248 | ORDER BY `type` DESC, `path` ASC |
249 | 249 | '); |
250 | 250 | |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | $document = $this->fetchDocument(' |
289 | 289 | SELECT * |
290 | 290 | FROM documents |
291 | - WHERE path = ' . $db->quote($path) . ' |
|
291 | + WHERE path = ' . $db->quote($path).' |
|
292 | 292 | '); |
293 | 293 | if ($document instanceof Document && $document->type === 'folder') { |
294 | 294 | $document->dbHandle = $db; |
@@ -333,7 +333,7 @@ discard block |
||
333 | 333 | if ($stmt === false) { |
334 | 334 | $errorInfo = $db->errorInfo(); |
335 | 335 | $errorMsg = $errorInfo[2]; |
336 | - throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>'); |
|
336 | + throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>'); |
|
337 | 337 | } |
338 | 338 | return $stmt; |
339 | 339 | } |
@@ -363,19 +363,19 @@ discard block |
||
363 | 363 | $stmt = $this->getDbStatement(' |
364 | 364 | INSERT OR REPLACE INTO documents (`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,`state`,`lastModificationDate`,`creationDate`,`lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`) |
365 | 365 | VALUES( |
366 | - ' . $db->quote($documentObject->path) . ', |
|
367 | - ' . $db->quote($documentObject->title) . ', |
|
368 | - ' . $db->quote($documentObject->slug) . ', |
|
369 | - ' . $db->quote($documentObject->type) . ', |
|
370 | - ' . $db->quote($documentObject->documentType) . ', |
|
371 | - ' . $db->quote($documentObject->documentTypeSlug) . ', |
|
372 | - ' . $db->quote($documentObject->state) . ', |
|
373 | - ' . $db->quote($documentObject->lastModificationDate) . ', |
|
374 | - ' . $db->quote($documentObject->creationDate) . ', |
|
375 | - ' . $db->quote($documentObject->lastModifiedBy) . ', |
|
376 | - ' . $db->quote(json_encode($documentObject->fields)) . ', |
|
377 | - ' . $db->quote(json_encode($documentObject->bricks)) . ', |
|
378 | - ' . $db->quote(json_encode($documentObject->dynamicBricks)) . ' |
|
366 | + ' . $db->quote($documentObject->path).', |
|
367 | + ' . $db->quote($documentObject->title).', |
|
368 | + ' . $db->quote($documentObject->slug).', |
|
369 | + ' . $db->quote($documentObject->type).', |
|
370 | + ' . $db->quote($documentObject->documentType).', |
|
371 | + ' . $db->quote($documentObject->documentTypeSlug).', |
|
372 | + ' . $db->quote($documentObject->state).', |
|
373 | + ' . $db->quote($documentObject->lastModificationDate).', |
|
374 | + ' . $db->quote($documentObject->creationDate).', |
|
375 | + ' . $db->quote($documentObject->lastModifiedBy).', |
|
376 | + ' . $db->quote(json_encode($documentObject->fields)).', |
|
377 | + ' . $db->quote(json_encode($documentObject->bricks)).', |
|
378 | + ' . $db->quote(json_encode($documentObject->dynamicBricks)).' |
|
379 | 379 | ) |
380 | 380 | '); |
381 | 381 | $result = $stmt->execute(); |
@@ -396,16 +396,16 @@ discard block |
||
396 | 396 | if ($documentToDelete->type == 'document') { |
397 | 397 | $stmt = $this->getDbStatement(' |
398 | 398 | DELETE FROM documents |
399 | - WHERE path = ' . $db->quote($path) . ' |
|
399 | + WHERE path = ' . $db->quote($path).' |
|
400 | 400 | '); |
401 | 401 | $stmt->execute(); |
402 | 402 | } elseif ($documentToDelete->type == 'folder') { |
403 | - $folderPathWithWildcard = $path . '%'; |
|
403 | + $folderPathWithWildcard = $path.'%'; |
|
404 | 404 | $stmt = $this->getDbStatement(' |
405 | 405 | DELETE FROM documents |
406 | - WHERE (path LIKE ' . $db->quote($folderPathWithWildcard) . ' |
|
407 | - AND substr(`path`, ' . (strlen($path) + 1) . ', 1) = "/") |
|
408 | - OR path = ' . $db->quote($path) . ' |
|
406 | + WHERE (path LIKE ' . $db->quote($folderPathWithWildcard).' |
|
407 | + AND substr(`path`, ' . (strlen($path) + 1).', 1) = "/") |
|
408 | + OR path = ' . $db->quote($path).' |
|
409 | 409 | '); |
410 | 410 | $stmt->execute(); |
411 | 411 | } |