@@ -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) { |
@@ -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 | } |
@@ -38,14 +38,14 @@ discard block |
||
38 | 38 | return '0 seconds'; |
39 | 39 | } |
40 | 40 | |
41 | - $a = array( 365 * 24 * 60 * 60 => 'year', |
|
41 | + $a = array(365 * 24 * 60 * 60 => 'year', |
|
42 | 42 | 30 * 24 * 60 * 60 => 'month', |
43 | 43 | 24 * 60 * 60 => 'day', |
44 | 44 | 60 * 60 => 'hour', |
45 | 45 | 60 => 'minute', |
46 | 46 | 1 => 'second' |
47 | 47 | ); |
48 | - $a_plural = array( 'year' => 'years', |
|
48 | + $a_plural = array('year' => 'years', |
|
49 | 49 | 'month' => 'months', |
50 | 50 | 'day' => 'days', |
51 | 51 | 'hour' => 'hours', |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | if ($d >= 1) |
60 | 60 | { |
61 | 61 | $r = round($d); |
62 | - return $r . ' ' . ($r > 1 ? $a_plural[$str] : $str) . ' ago'; |
|
62 | + return $r.' '.($r > 1 ? $a_plural[$str] : $str).' ago'; |
|
63 | 63 | } |
64 | 64 | } |
65 | 65 | return 0; |
@@ -73,13 +73,13 @@ discard block |
||
73 | 73 | * @param string $unit |
74 | 74 | * @return string |
75 | 75 | */ |
76 | -function humanFileSize($size,$unit="") { |
|
77 | - if( (!$unit && $size >= 1<<30) || $unit == "GB") |
|
78 | - return number_format($size/(1<<30),2)."GB"; |
|
79 | - if( (!$unit && $size >= 1<<20) || $unit == "MB") |
|
80 | - return number_format($size/(1<<20),2)."MB"; |
|
81 | - if( (!$unit && $size >= 1<<10) || $unit == "KB") |
|
82 | - return number_format($size/(1<<10),2)."KB"; |
|
76 | +function humanFileSize($size, $unit = "") { |
|
77 | + if ((!$unit && $size >= 1 << 30) || $unit == "GB") |
|
78 | + return number_format($size / (1 << 30), 2)."GB"; |
|
79 | + if ((!$unit && $size >= 1 << 20) || $unit == "MB") |
|
80 | + return number_format($size / (1 << 20), 2)."MB"; |
|
81 | + if ((!$unit && $size >= 1 << 10) || $unit == "KB") |
|
82 | + return number_format($size / (1 << 10), 2)."KB"; |
|
83 | 83 | return number_format($size)." bytes"; |
84 | 84 | } |
85 | 85 | |
@@ -133,9 +133,9 @@ discard block |
||
133 | 133 | * |
134 | 134 | * @return mixed|string |
135 | 135 | */ |
136 | -function slugify($str, $replace=array(), $delimiter='-') { |
|
137 | - if( !empty($replace) ) { |
|
138 | - $str = str_replace((array)$replace, ' ', $str); |
|
136 | +function slugify($str, $replace = array(), $delimiter = '-') { |
|
137 | + if (!empty($replace)) { |
|
138 | + $str = str_replace((array) $replace, ' ', $str); |
|
139 | 139 | } |
140 | 140 | |
141 | 141 | $clean = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $str); |
@@ -158,13 +158,13 @@ discard block |
||
158 | 158 | { |
159 | 159 | $debug_backtrace = current(debug_backtrace()); |
160 | 160 | if (PHP_SAPI == 'cli') { |
161 | - echo 'Dump: ' . $debug_backtrace['file'] . ':' . $debug_backtrace['line'] . "\n"; |
|
161 | + echo 'Dump: '.$debug_backtrace['file'].':'.$debug_backtrace['line']."\n"; |
|
162 | 162 | foreach (func_get_args() as $data) { |
163 | 163 | var_dump($data); |
164 | 164 | } |
165 | 165 | } else { |
166 | 166 | ob_clean(); |
167 | - echo '<div>Dump: ' . $debug_backtrace['file'] . ':<b>' . $debug_backtrace['line'] . "</b></div>"; |
|
167 | + echo '<div>Dump: '.$debug_backtrace['file'].':<b>'.$debug_backtrace['line']."</b></div>"; |
|
168 | 168 | echo '<pre>'; |
169 | 169 | foreach (func_get_args() as $data) { |
170 | 170 | echo "<code>"; |
@@ -212,8 +212,8 @@ discard block |
||
212 | 212 | */ |
213 | 213 | function utf8Convert($array) |
214 | 214 | { |
215 | - array_walk_recursive($array, function(&$item){ |
|
216 | - if(!mb_detect_encoding($item, 'utf-8', true)){ |
|
215 | + array_walk_recursive($array, function(&$item) { |
|
216 | + if (!mb_detect_encoding($item, 'utf-8', true)) { |
|
217 | 217 | $item = utf8_encode($item); |
218 | 218 | } |
219 | 219 | }); |
@@ -9,8 +9,8 @@ discard block |
||
9 | 9 | * |
10 | 10 | * @param $e |
11 | 11 | */ |
12 | -function exceptionHandler ($e) { |
|
13 | - renderError($e->getMessage(),$e->getFile(),$e->getLine(),$e->getCode(),$e->getTrace()); |
|
12 | +function exceptionHandler($e) { |
|
13 | + renderError($e->getMessage(), $e->getFile(), $e->getLine(), $e->getCode(), $e->getTrace()); |
|
14 | 14 | } |
15 | 15 | |
16 | 16 | /** |
@@ -21,18 +21,18 @@ discard block |
||
21 | 21 | * @param $errfile |
22 | 22 | * @param $errline |
23 | 23 | */ |
24 | -function errorHandler ($errno, $errstr, $errfile, $errline) { |
|
25 | - renderError($errstr,$errfile,$errline,$errno,debug_backtrace()); |
|
24 | +function errorHandler($errno, $errstr, $errfile, $errline) { |
|
25 | + renderError($errstr, $errfile, $errline, $errno, debug_backtrace()); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | /** |
29 | 29 | * When an error occurs that kills the process, still try |
30 | 30 | * to show it using a shutdownHandler. |
31 | 31 | */ |
32 | -function shutdownHandler () { |
|
32 | +function shutdownHandler() { |
|
33 | 33 | $error = error_get_last(); |
34 | 34 | if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { |
35 | - errorHandler($error['type'],$error['message'],$error['file'],$error['line']); |
|
35 | + errorHandler($error['type'], $error['message'], $error['file'], $error['line']); |
|
36 | 36 | }elseif ($error['type'] == 1) { |
37 | 37 | dump($error); |
38 | 38 | } |
@@ -50,28 +50,28 @@ discard block |
||
50 | 50 | $errstr = ''; |
51 | 51 | switch ($jsonErrorNr) { |
52 | 52 | case JSON_ERROR_NONE: |
53 | - $errstr .= ' - No errors' . PHP_EOL; |
|
53 | + $errstr .= ' - No errors'.PHP_EOL; |
|
54 | 54 | break; |
55 | 55 | case JSON_ERROR_DEPTH: |
56 | - $errstr .= ' - Maximum stack depth exceeded' . PHP_EOL; |
|
56 | + $errstr .= ' - Maximum stack depth exceeded'.PHP_EOL; |
|
57 | 57 | break; |
58 | 58 | case JSON_ERROR_STATE_MISMATCH: |
59 | - $errstr .= ' - Underflow or the modes mismatch' . PHP_EOL; |
|
59 | + $errstr .= ' - Underflow or the modes mismatch'.PHP_EOL; |
|
60 | 60 | break; |
61 | 61 | case JSON_ERROR_CTRL_CHAR: |
62 | - $errstr .= ' - Unexpected control character found' . PHP_EOL; |
|
62 | + $errstr .= ' - Unexpected control character found'.PHP_EOL; |
|
63 | 63 | break; |
64 | 64 | case JSON_ERROR_SYNTAX: |
65 | - $errstr .= ' - Syntax error, malformed JSON' . PHP_EOL; |
|
65 | + $errstr .= ' - Syntax error, malformed JSON'.PHP_EOL; |
|
66 | 66 | break; |
67 | 67 | case JSON_ERROR_UTF8: |
68 | - $errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded' . PHP_EOL; |
|
68 | + $errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded'.PHP_EOL; |
|
69 | 69 | break; |
70 | 70 | default: |
71 | - $errstr = ' - Unknown error' . PHP_EOL; |
|
71 | + $errstr = ' - Unknown error'.PHP_EOL; |
|
72 | 72 | break; |
73 | 73 | } |
74 | - errorHandler ($jsonErrorNr, $errstr, $file, $line); |
|
74 | + errorHandler($jsonErrorNr, $errstr, $file, $line); |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | /** |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | * @param array $trace |
85 | 85 | * @param string $httpHeader |
86 | 86 | */ |
87 | -function renderError ($message='', $file='', $line='', $code=0, $trace=array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error') { |
|
87 | +function renderError($message = '', $file = '', $line = '', $code = 0, $trace = array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error') { |
|
88 | 88 | if (ob_get_contents()) ob_end_clean(); |
89 | 89 | |
90 | 90 | if (canShowError()) { |
@@ -93,8 +93,8 @@ discard block |
||
93 | 93 | $lines = array(); |
94 | 94 | |
95 | 95 | foreach ($range as $line_number) { |
96 | - if(isset($file_lines[$line_number-1])) { |
|
97 | - $lines[$line_number] = $file_lines[$line_number-1]; |
|
96 | + if (isset($file_lines[$line_number - 1])) { |
|
97 | + $lines[$line_number] = $file_lines[$line_number - 1]; |
|
98 | 98 | } |
99 | 99 | } |
100 | 100 | |
@@ -112,20 +112,20 @@ discard block |
||
112 | 112 | renderCliException($message, $file, $line, $trace, $lines); |
113 | 113 | } |
114 | 114 | |
115 | - if (file_exists(realpath(__DIR__) . '/errorviewdetailed.php')) { |
|
116 | - include(realpath(__DIR__) . '/errorviewdetailed.php'); |
|
115 | + if (file_exists(realpath(__DIR__).'/errorviewdetailed.php')) { |
|
116 | + include(realpath(__DIR__).'/errorviewdetailed.php'); |
|
117 | 117 | } else { |
118 | 118 | header('Content-type: application/json'); |
119 | 119 | die(json_encode($error)); |
120 | 120 | } |
121 | 121 | exit; |
122 | 122 | } else { |
123 | - header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true); |
|
124 | - header('X-Error-Message: ' . $message); |
|
125 | - header('X-Error-File: ' . $file); |
|
126 | - header('X-Error-Line: ' . $line); |
|
127 | - if (file_exists(realpath(__DIR__) . '/errorviewcompact.php')) { |
|
128 | - include(realpath(__DIR__) . '/errorviewcompact.php'); |
|
123 | + header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true); |
|
124 | + header('X-Error-Message: '.$message); |
|
125 | + header('X-Error-File: '.$file); |
|
126 | + header('X-Error-Line: '.$line); |
|
127 | + if (file_exists(realpath(__DIR__).'/errorviewcompact.php')) { |
|
128 | + include(realpath(__DIR__).'/errorviewcompact.php'); |
|
129 | 129 | } else { |
130 | 130 | header('Content-type: application/json'); |
131 | 131 | die(json_encode('An error occured.')); |
@@ -152,35 +152,35 @@ discard block |
||
152 | 152 | function renderCliException($message, $file, $line, $trace, $lines) |
153 | 153 | { |
154 | 154 | echo PHP_EOL; |
155 | - echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
156 | - echo '| THE FOLLOWING ERROR OCCURED |' . PHP_EOL; |
|
157 | - echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
155 | + echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL; |
|
156 | + echo '| THE FOLLOWING ERROR OCCURED |'.PHP_EOL; |
|
157 | + echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL; |
|
158 | 158 | echo PHP_EOL; |
159 | - echo ' ' . $message . PHP_EOL; |
|
159 | + echo ' '.$message.PHP_EOL; |
|
160 | 160 | echo PHP_EOL; |
161 | - echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
162 | - echo '| IN FILE |' . PHP_EOL; |
|
163 | - echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
161 | + echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL; |
|
162 | + echo '| IN FILE |'.PHP_EOL; |
|
163 | + echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL; |
|
164 | 164 | echo PHP_EOL; |
165 | - echo ' ' . $file . ':' . $line . PHP_EOL; |
|
165 | + echo ' '.$file.':'.$line.PHP_EOL; |
|
166 | 166 | echo PHP_EOL; |
167 | - echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
168 | - echo '| CONTENTS OF THE FILE |' . PHP_EOL; |
|
169 | - echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
167 | + echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL; |
|
168 | + echo '| CONTENTS OF THE FILE |'.PHP_EOL; |
|
169 | + echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL; |
|
170 | 170 | echo PHP_EOL; |
171 | - foreach($lines as $nr => $currentLine) { |
|
172 | - echo ($nr == $line ? '* ' : ' ' ) . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine; |
|
171 | + foreach ($lines as $nr => $currentLine) { |
|
172 | + echo ($nr == $line ? '* ' : ' ').str_pad($nr, 3, "0", STR_PAD_LEFT).' '.$currentLine; |
|
173 | 173 | } |
174 | 174 | echo PHP_EOL; |
175 | - echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
176 | - echo '| STACK TRACE |' . PHP_EOL; |
|
177 | - echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
178 | - foreach($trace as $row) { |
|
179 | - echo (isset($row['file']) ? basename($row['file']) : '') . ':' |
|
180 | - . (isset($row['line']) ? $row['line'] : '') . "\t\t\t" |
|
181 | - . (isset($row['class']) ? $row['class'] : ' ') . "\t\t\t" |
|
182 | - . (isset($row['type']) ? $row['type'] : ' ') . "\t\t\t" |
|
183 | - . (isset($row['function']) ? $row['function'] : ' ') . PHP_EOL; |
|
175 | + echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL; |
|
176 | + echo '| STACK TRACE |'.PHP_EOL; |
|
177 | + echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL; |
|
178 | + foreach ($trace as $row) { |
|
179 | + echo (isset($row['file']) ? basename($row['file']) : '').':' |
|
180 | + . (isset($row['line']) ? $row['line'] : '')."\t\t\t" |
|
181 | + . (isset($row['class']) ? $row['class'] : ' ')."\t\t\t" |
|
182 | + . (isset($row['type']) ? $row['type'] : ' ')."\t\t\t" |
|
183 | + . (isset($row['function']) ? $row['function'] : ' ').PHP_EOL; |
|
184 | 184 | } |
185 | 185 | exit; |
186 | 186 | } |
187 | 187 | \ No newline at end of file |
@@ -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(); |
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); |
@@ -229,20 +229,20 @@ 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 | 240 | $container = $this->getDocumentContainerByPath($oldPath); |
241 | 241 | $documentObject = $this->createDocumentFromPostValues($postValues); |
242 | 242 | if ($container->path === '/') { |
243 | - $newPath = $container->path . $documentObject->slug; |
|
243 | + $newPath = $container->path.$documentObject->slug; |
|
244 | 244 | } else { |
245 | - $newPath = $container->path . '/' . $documentObject->slug; |
|
245 | + $newPath = $container->path.'/'.$documentObject->slug; |
|
246 | 246 | } |
247 | 247 | $documentObject->path = $newPath; |
248 | 248 | $this->repository->saveDocument($documentObject); |
@@ -252,9 +252,9 @@ discard block |
||
252 | 252 | { |
253 | 253 | $documentObject = $this->createDocumentFromPostValues($postValues); |
254 | 254 | if ($postValues['path'] === '/') { |
255 | - $documentObject->path = $postValues['path'] . $documentObject->slug; |
|
255 | + $documentObject->path = $postValues['path'].$documentObject->slug; |
|
256 | 256 | } else { |
257 | - $documentObject->path = $postValues['path'] . '/' . $documentObject->slug; |
|
257 | + $documentObject->path = $postValues['path'].'/'.$documentObject->slug; |
|
258 | 258 | } |
259 | 259 | |
260 | 260 | $this->repository->saveDocument($documentObject); |
@@ -262,7 +262,7 @@ discard block |
||
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 | |
@@ -350,9 +350,9 @@ discard block |
||
350 | 350 | { |
351 | 351 | $documentFolderObject = $this->createDocumentFolderFromPostValues($postValues); |
352 | 352 | if ($postValues['path'] === '/') { |
353 | - $documentFolderObject->path = $postValues['path'] . $documentFolderObject->slug; |
|
353 | + $documentFolderObject->path = $postValues['path'].$documentFolderObject->slug; |
|
354 | 354 | } else { |
355 | - $documentFolderObject->path = $postValues['path'] . '/' . $documentFolderObject->slug; |
|
355 | + $documentFolderObject->path = $postValues['path'].'/'.$documentFolderObject->slug; |
|
356 | 356 | } |
357 | 357 | $this->repository->saveDocument($documentFolderObject); |
358 | 358 | } |
@@ -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 | |
@@ -591,13 +591,13 @@ discard block |
||
591 | 591 | |
592 | 592 | public function addImage($postValues) |
593 | 593 | { |
594 | - $destinationPath = realpath(__DIR__ . '/../../www/images/'); |
|
594 | + $destinationPath = realpath(__DIR__.'/../../www/images/'); |
|
595 | 595 | |
596 | 596 | $filename = $this->validateFilename($postValues['name'], $destinationPath); |
597 | - $destination = $destinationPath . '/' . $filename; |
|
597 | + $destination = $destinationPath.'/'.$filename; |
|
598 | 598 | |
599 | 599 | if ($postValues['error'] != '0') { |
600 | - throw new \Exception('Error uploading file. Error code: ' . $postValues['error']); |
|
600 | + throw new \Exception('Error uploading file. Error code: '.$postValues['error']); |
|
601 | 601 | } |
602 | 602 | |
603 | 603 | if (move_uploaded_file($postValues['tmp_name'], $destination)) { |
@@ -622,14 +622,14 @@ discard block |
||
622 | 622 | |
623 | 623 | public function deleteImageByName($filename) |
624 | 624 | { |
625 | - $destinationPath = realpath(__DIR__ . '/../../www/images/'); |
|
625 | + $destinationPath = realpath(__DIR__.'/../../www/images/'); |
|
626 | 626 | |
627 | 627 | $images = $this->getImages(); |
628 | 628 | |
629 | 629 | foreach ($images as $key => $image) { |
630 | 630 | if ($image->file == $filename) { |
631 | 631 | foreach ($image->set as $imageSetFilename) { |
632 | - $destination = $destinationPath . '/' . $imageSetFilename; |
|
632 | + $destination = $destinationPath.'/'.$imageSetFilename; |
|
633 | 633 | if (file_exists($destination)) { |
634 | 634 | unlink($destination); |
635 | 635 | } else { |
@@ -671,7 +671,7 @@ discard block |
||
671 | 671 | */ |
672 | 672 | public function getFiles() |
673 | 673 | { |
674 | - $files = $this->repository->files; |
|
674 | + $files = $this->repository->files; |
|
675 | 675 | usort($files, array($this, 'compareFiles')); |
676 | 676 | return $files; |
677 | 677 | } |
@@ -683,13 +683,13 @@ discard block |
||
683 | 683 | |
684 | 684 | public function addFile($postValues) |
685 | 685 | { |
686 | - $destinationPath = realpath(__DIR__ . '/../../www/files/'); |
|
686 | + $destinationPath = realpath(__DIR__.'/../../www/files/'); |
|
687 | 687 | |
688 | 688 | $filename = $this->validateFilename($postValues['name'], $destinationPath); |
689 | - $destination = $destinationPath . '/' . $filename; |
|
689 | + $destination = $destinationPath.'/'.$filename; |
|
690 | 690 | |
691 | 691 | if ($postValues['error'] != '0') { |
692 | - throw new \Exception('Error uploading file. Error code: ' . $postValues['error']); |
|
692 | + throw new \Exception('Error uploading file. Error code: '.$postValues['error']); |
|
693 | 693 | } |
694 | 694 | |
695 | 695 | if (move_uploaded_file($postValues['tmp_name'], $destination)) { |
@@ -715,23 +715,23 @@ discard block |
||
715 | 715 | array_pop($fileParts); |
716 | 716 | $fileNameWithoutExtension = implode('-', $fileParts); |
717 | 717 | $fileNameWithoutExtension = slugify($fileNameWithoutExtension); |
718 | - $filename = $fileNameWithoutExtension . '.' . $extension; |
|
718 | + $filename = $fileNameWithoutExtension.'.'.$extension; |
|
719 | 719 | } else { |
720 | 720 | $filename = slugify($filename); |
721 | 721 | } |
722 | 722 | |
723 | - if (file_exists($path . '/' . $filename)) { |
|
723 | + if (file_exists($path.'/'.$filename)) { |
|
724 | 724 | $fileParts = explode('.', $filename); |
725 | 725 | if (count($fileParts) > 1) { |
726 | 726 | $extension = end($fileParts); |
727 | 727 | array_pop($fileParts); |
728 | 728 | $fileNameWithoutExtension = implode('-', $fileParts); |
729 | 729 | $fileNameWithoutExtension .= '-copy'; |
730 | - $filename = $fileNameWithoutExtension . '.' . $extension; |
|
730 | + $filename = $fileNameWithoutExtension.'.'.$extension; |
|
731 | 731 | } else { |
732 | 732 | $filename .= '-copy'; |
733 | 733 | } |
734 | - return $this->validateFilename($filename,$path); |
|
734 | + return $this->validateFilename($filename, $path); |
|
735 | 735 | } |
736 | 736 | return $filename; |
737 | 737 | } |
@@ -757,8 +757,8 @@ discard block |
||
757 | 757 | */ |
758 | 758 | public function deleteFileByName($filename) |
759 | 759 | { |
760 | - $destinationPath = realpath(__DIR__ . '/../../www/files/'); |
|
761 | - $destination = $destinationPath . '/' . $filename; |
|
760 | + $destinationPath = realpath(__DIR__.'/../../www/files/'); |
|
761 | + $destination = $destinationPath.'/'.$filename; |
|
762 | 762 | |
763 | 763 | if (file_exists($destination)) { |
764 | 764 | $files = $this->getFiles(); |