jenskooij /
cloudcontrol
@@ -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 | } |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | * submitting the form |
| 149 | 149 | * |
| 150 | 150 | * @param $postValues |
| 151 | - * @param $storage |
|
| 151 | + * @param JsonStorage $storage |
|
| 152 | 152 | */ |
| 153 | 153 | protected function postSubmit($postValues, $storage) |
| 154 | 154 | {} |
@@ -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 | } |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | $error = error_get_last(); |
| 34 | 34 | if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { |
| 35 | 35 | errorHandler($error['type'],$error['message'],$error['file'],$error['line']); |
| 36 | - }elseif ($error['type'] == 1) { |
|
| 36 | + } elseif ($error['type'] == 1) { |
|
| 37 | 37 | dump($error); |
| 38 | 38 | } |
| 39 | 39 | } |
@@ -85,7 +85,9 @@ discard block |
||
| 85 | 85 | * @param string $httpHeader |
| 86 | 86 | */ |
| 87 | 87 | function renderError ($message='', $file='', $line='', $code=0, $trace=array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error') { |
| 88 | - if (ob_get_contents()) ob_end_clean(); |
|
| 88 | + if (ob_get_contents()) { |
|
| 89 | + ob_end_clean(); |
|
| 90 | + } |
|
| 89 | 91 | |
| 90 | 92 | if (canShowError()) { |
| 91 | 93 | $file_lines = file_exists($file) ? file($file) : array(); |
@@ -31,11 +31,11 @@ discard block |
||
| 31 | 31 | */ |
| 32 | 32 | function shutdownHandler () { |
| 33 | 33 | $error = error_get_last(); |
| 34 | - if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { |
|
| 35 | - errorHandler($error['type'],$error['message'],$error['file'],$error['line']); |
|
| 36 | - }elseif ($error['type'] == 1) { |
|
| 37 | - dump($error); |
|
| 38 | - } |
|
| 34 | + if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { |
|
| 35 | + errorHandler($error['type'],$error['message'],$error['file'],$error['line']); |
|
| 36 | + }elseif ($error['type'] == 1) { |
|
| 37 | + dump($error); |
|
| 38 | + } |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | /** |
@@ -49,28 +49,28 @@ discard block |
||
| 49 | 49 | $jsonErrorNr = json_last_error(); |
| 50 | 50 | $errstr = ''; |
| 51 | 51 | switch ($jsonErrorNr) { |
| 52 | - case JSON_ERROR_NONE: |
|
| 53 | - $errstr .= ' - No errors' . PHP_EOL; |
|
| 54 | - break; |
|
| 55 | - case JSON_ERROR_DEPTH: |
|
| 56 | - $errstr .= ' - Maximum stack depth exceeded' . PHP_EOL; |
|
| 57 | - break; |
|
| 58 | - case JSON_ERROR_STATE_MISMATCH: |
|
| 59 | - $errstr .= ' - Underflow or the modes mismatch' . PHP_EOL; |
|
| 60 | - break; |
|
| 61 | - case JSON_ERROR_CTRL_CHAR: |
|
| 62 | - $errstr .= ' - Unexpected control character found' . PHP_EOL; |
|
| 63 | - break; |
|
| 64 | - case JSON_ERROR_SYNTAX: |
|
| 65 | - $errstr .= ' - Syntax error, malformed JSON' . PHP_EOL; |
|
| 66 | - break; |
|
| 67 | - case JSON_ERROR_UTF8: |
|
| 68 | - $errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded' . PHP_EOL; |
|
| 69 | - break; |
|
| 70 | - default: |
|
| 71 | - $errstr = ' - Unknown error' . PHP_EOL; |
|
| 72 | - break; |
|
| 73 | - } |
|
| 52 | + case JSON_ERROR_NONE: |
|
| 53 | + $errstr .= ' - No errors' . PHP_EOL; |
|
| 54 | + break; |
|
| 55 | + case JSON_ERROR_DEPTH: |
|
| 56 | + $errstr .= ' - Maximum stack depth exceeded' . PHP_EOL; |
|
| 57 | + break; |
|
| 58 | + case JSON_ERROR_STATE_MISMATCH: |
|
| 59 | + $errstr .= ' - Underflow or the modes mismatch' . PHP_EOL; |
|
| 60 | + break; |
|
| 61 | + case JSON_ERROR_CTRL_CHAR: |
|
| 62 | + $errstr .= ' - Unexpected control character found' . PHP_EOL; |
|
| 63 | + break; |
|
| 64 | + case JSON_ERROR_SYNTAX: |
|
| 65 | + $errstr .= ' - Syntax error, malformed JSON' . PHP_EOL; |
|
| 66 | + break; |
|
| 67 | + case JSON_ERROR_UTF8: |
|
| 68 | + $errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded' . PHP_EOL; |
|
| 69 | + break; |
|
| 70 | + default: |
|
| 71 | + $errstr = ' - Unknown error' . PHP_EOL; |
|
| 72 | + break; |
|
| 73 | + } |
|
| 74 | 74 | errorHandler ($jsonErrorNr, $errstr, $file, $line); |
| 75 | 75 | } |
| 76 | 76 | |
@@ -85,104 +85,104 @@ discard block |
||
| 85 | 85 | * @param string $httpHeader |
| 86 | 86 | */ |
| 87 | 87 | function renderError ($message='', $file='', $line='', $code=0, $trace=array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error') { |
| 88 | - if (ob_get_contents()) ob_end_clean(); |
|
| 88 | + if (ob_get_contents()) ob_end_clean(); |
|
| 89 | 89 | |
| 90 | - if (canShowError()) { |
|
| 91 | - $file_lines = file_exists($file) ? file($file) : array(); |
|
| 92 | - $range = ($line - 15) < 0 ? range(1, 30) : range($line - 15, $line + 15); |
|
| 93 | - $lines = array(); |
|
| 90 | + if (canShowError()) { |
|
| 91 | + $file_lines = file_exists($file) ? file($file) : array(); |
|
| 92 | + $range = ($line - 15) < 0 ? range(1, 30) : range($line - 15, $line + 15); |
|
| 93 | + $lines = array(); |
|
| 94 | 94 | |
| 95 | - foreach ($range as $line_number) { |
|
| 96 | - if(isset($file_lines[$line_number-1])) { |
|
| 97 | - $lines[$line_number] = $file_lines[$line_number-1]; |
|
| 98 | - } |
|
| 99 | - } |
|
| 95 | + foreach ($range as $line_number) { |
|
| 96 | + if(isset($file_lines[$line_number-1])) { |
|
| 97 | + $lines[$line_number] = $file_lines[$line_number-1]; |
|
| 98 | + } |
|
| 99 | + } |
|
| 100 | 100 | |
| 101 | - $error = array( |
|
| 102 | - 'message' => $message, |
|
| 103 | - 'file' => $file, |
|
| 104 | - 'line' => $line, |
|
| 105 | - 'code' => $code, |
|
| 106 | - 'lines' => $lines, |
|
| 107 | - 'trace' => $trace, |
|
| 108 | - 'httpHeader' => $httpHeader, |
|
| 109 | - ); |
|
| 101 | + $error = array( |
|
| 102 | + 'message' => $message, |
|
| 103 | + 'file' => $file, |
|
| 104 | + 'line' => $line, |
|
| 105 | + 'code' => $code, |
|
| 106 | + 'lines' => $lines, |
|
| 107 | + 'trace' => $trace, |
|
| 108 | + 'httpHeader' => $httpHeader, |
|
| 109 | + ); |
|
| 110 | 110 | |
| 111 | - if (PHP_SAPI === 'cli') { |
|
| 112 | - renderCliException($message, $file, $line, $trace, $lines); |
|
| 113 | - } |
|
| 111 | + if (PHP_SAPI === 'cli') { |
|
| 112 | + renderCliException($message, $file, $line, $trace, $lines); |
|
| 113 | + } |
|
| 114 | 114 | |
| 115 | - if (file_exists(realpath(__DIR__) . '/errorviewdetailed.php')) { |
|
| 116 | - header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true); |
|
| 117 | - include(realpath(__DIR__) . '/errorviewdetailed.php'); |
|
| 118 | - } else { |
|
| 119 | - header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true); |
|
| 120 | - header('Content-type: application/json'); |
|
| 121 | - die(json_encode($error)); |
|
| 122 | - } |
|
| 123 | - exit; |
|
| 124 | - } else { |
|
| 125 | - header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true); |
|
| 126 | - header('X-Error-Message: ' . $message); |
|
| 127 | - header('X-Error-File: ' . $file); |
|
| 128 | - header('X-Error-Line: ' . $line); |
|
| 129 | - if (file_exists(realpath(__DIR__) . '/errorviewcompact.php')) { |
|
| 130 | - include(realpath(__DIR__) . '/errorviewcompact.php'); |
|
| 131 | - } else { |
|
| 132 | - header('Content-type: application/json'); |
|
| 133 | - die(json_encode('An error occured.')); |
|
| 134 | - } |
|
| 135 | - } |
|
| 115 | + if (file_exists(realpath(__DIR__) . '/errorviewdetailed.php')) { |
|
| 116 | + header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true); |
|
| 117 | + include(realpath(__DIR__) . '/errorviewdetailed.php'); |
|
| 118 | + } else { |
|
| 119 | + header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true); |
|
| 120 | + header('Content-type: application/json'); |
|
| 121 | + die(json_encode($error)); |
|
| 122 | + } |
|
| 123 | + exit; |
|
| 124 | + } else { |
|
| 125 | + header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true); |
|
| 126 | + header('X-Error-Message: ' . $message); |
|
| 127 | + header('X-Error-File: ' . $file); |
|
| 128 | + header('X-Error-Line: ' . $line); |
|
| 129 | + if (file_exists(realpath(__DIR__) . '/errorviewcompact.php')) { |
|
| 130 | + include(realpath(__DIR__) . '/errorviewcompact.php'); |
|
| 131 | + } else { |
|
| 132 | + header('Content-type: application/json'); |
|
| 133 | + die(json_encode('An error occured.')); |
|
| 134 | + } |
|
| 135 | + } |
|
| 136 | 136 | } |
| 137 | 137 | |
| 138 | 138 | function canShowError() |
| 139 | 139 | { |
| 140 | - if (PHP_SAPI === 'cli') { |
|
| 141 | - return true; |
|
| 142 | - } |
|
| 143 | - if (file_exists('../config.json') && !isset($_SESSION['cloudcontrol'])) { |
|
| 144 | - $config = file_get_contents('../config.json'); |
|
| 145 | - $config = json_decode($config); |
|
| 146 | - if (isset($config->showErrorsToAll)) { |
|
| 147 | - return $config->showErrorsToAll; |
|
| 148 | - } |
|
| 149 | - } else { |
|
| 150 | - return true; |
|
| 151 | - } |
|
| 140 | + if (PHP_SAPI === 'cli') { |
|
| 141 | + return true; |
|
| 142 | + } |
|
| 143 | + if (file_exists('../config.json') && !isset($_SESSION['cloudcontrol'])) { |
|
| 144 | + $config = file_get_contents('../config.json'); |
|
| 145 | + $config = json_decode($config); |
|
| 146 | + if (isset($config->showErrorsToAll)) { |
|
| 147 | + return $config->showErrorsToAll; |
|
| 148 | + } |
|
| 149 | + } else { |
|
| 150 | + return true; |
|
| 151 | + } |
|
| 152 | 152 | } |
| 153 | 153 | |
| 154 | 154 | function renderCliException($message, $file, $line, $trace, $lines) |
| 155 | 155 | { |
| 156 | - echo PHP_EOL; |
|
| 157 | - echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
| 158 | - echo '| THE FOLLOWING ERROR OCCURED |' . PHP_EOL; |
|
| 159 | - echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
| 160 | - echo PHP_EOL; |
|
| 161 | - echo ' ' . $message . PHP_EOL; |
|
| 162 | - echo PHP_EOL; |
|
| 163 | - echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
| 164 | - echo '| IN FILE |' . PHP_EOL; |
|
| 165 | - echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
| 166 | - echo PHP_EOL; |
|
| 167 | - echo ' ' . $file . ':' . $line . PHP_EOL; |
|
| 168 | - echo PHP_EOL; |
|
| 169 | - echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
| 170 | - echo '| CONTENTS OF THE FILE |' . PHP_EOL; |
|
| 171 | - echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
| 172 | - echo PHP_EOL; |
|
| 173 | - foreach($lines as $nr => $currentLine) { |
|
| 174 | - echo ($nr == $line ? '* ' : ' ' ) . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine; |
|
| 175 | - } |
|
| 176 | - echo PHP_EOL; |
|
| 177 | - echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
| 178 | - echo '| STACK TRACE |' . PHP_EOL; |
|
| 179 | - echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
| 180 | - foreach($trace as $row) { |
|
| 181 | - echo (isset($row['file']) ? basename($row['file']) : '') . ':' |
|
| 182 | - . (isset($row['line']) ? $row['line'] : '') . "\t\t\t" |
|
| 183 | - . (isset($row['class']) ? $row['class'] : ' ') . "\t\t\t" |
|
| 184 | - . (isset($row['type']) ? $row['type'] : ' ') . "\t\t\t" |
|
| 185 | - . (isset($row['function']) ? $row['function'] : ' ') . PHP_EOL; |
|
| 186 | - } |
|
| 187 | - exit; |
|
| 156 | + echo PHP_EOL; |
|
| 157 | + echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
| 158 | + echo '| THE FOLLOWING ERROR OCCURED |' . PHP_EOL; |
|
| 159 | + echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
| 160 | + echo PHP_EOL; |
|
| 161 | + echo ' ' . $message . PHP_EOL; |
|
| 162 | + echo PHP_EOL; |
|
| 163 | + echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
| 164 | + echo '| IN FILE |' . PHP_EOL; |
|
| 165 | + echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
| 166 | + echo PHP_EOL; |
|
| 167 | + echo ' ' . $file . ':' . $line . PHP_EOL; |
|
| 168 | + echo PHP_EOL; |
|
| 169 | + echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
| 170 | + echo '| CONTENTS OF THE FILE |' . PHP_EOL; |
|
| 171 | + echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
| 172 | + echo PHP_EOL; |
|
| 173 | + foreach($lines as $nr => $currentLine) { |
|
| 174 | + echo ($nr == $line ? '* ' : ' ' ) . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine; |
|
| 175 | + } |
|
| 176 | + echo PHP_EOL; |
|
| 177 | + echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
| 178 | + echo '| STACK TRACE |' . PHP_EOL; |
|
| 179 | + echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
| 180 | + foreach($trace as $row) { |
|
| 181 | + echo (isset($row['file']) ? basename($row['file']) : '') . ':' |
|
| 182 | + . (isset($row['line']) ? $row['line'] : '') . "\t\t\t" |
|
| 183 | + . (isset($row['class']) ? $row['class'] : ' ') . "\t\t\t" |
|
| 184 | + . (isset($row['type']) ? $row['type'] : ' ') . "\t\t\t" |
|
| 185 | + . (isset($row['function']) ? $row['function'] : ' ') . PHP_EOL; |
|
| 186 | + } |
|
| 187 | + exit; |
|
| 188 | 188 | } |
| 189 | 189 | \ No newline at end of file |
@@ -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,22 +112,22 @@ discard block |
||
| 112 | 112 | renderCliException($message, $file, $line, $trace, $lines); |
| 113 | 113 | } |
| 114 | 114 | |
| 115 | - if (file_exists(realpath(__DIR__) . '/errorviewdetailed.php')) { |
|
| 116 | - header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true); |
|
| 117 | - include(realpath(__DIR__) . '/errorviewdetailed.php'); |
|
| 115 | + if (file_exists(realpath(__DIR__).'/errorviewdetailed.php')) { |
|
| 116 | + header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true); |
|
| 117 | + include(realpath(__DIR__).'/errorviewdetailed.php'); |
|
| 118 | 118 | } else { |
| 119 | - header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true); |
|
| 119 | + header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true); |
|
| 120 | 120 | header('Content-type: application/json'); |
| 121 | 121 | die(json_encode($error)); |
| 122 | 122 | } |
| 123 | 123 | exit; |
| 124 | 124 | } else { |
| 125 | - header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true); |
|
| 126 | - header('X-Error-Message: ' . $message); |
|
| 127 | - header('X-Error-File: ' . $file); |
|
| 128 | - header('X-Error-Line: ' . $line); |
|
| 129 | - if (file_exists(realpath(__DIR__) . '/errorviewcompact.php')) { |
|
| 130 | - include(realpath(__DIR__) . '/errorviewcompact.php'); |
|
| 125 | + header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true); |
|
| 126 | + header('X-Error-Message: '.$message); |
|
| 127 | + header('X-Error-File: '.$file); |
|
| 128 | + header('X-Error-Line: '.$line); |
|
| 129 | + if (file_exists(realpath(__DIR__).'/errorviewcompact.php')) { |
|
| 130 | + include(realpath(__DIR__).'/errorviewcompact.php'); |
|
| 131 | 131 | } else { |
| 132 | 132 | header('Content-type: application/json'); |
| 133 | 133 | die(json_encode('An error occured.')); |
@@ -154,35 +154,35 @@ discard block |
||
| 154 | 154 | function renderCliException($message, $file, $line, $trace, $lines) |
| 155 | 155 | { |
| 156 | 156 | echo PHP_EOL; |
| 157 | - echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
| 158 | - echo '| THE FOLLOWING ERROR OCCURED |' . PHP_EOL; |
|
| 159 | - echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
| 157 | + echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL; |
|
| 158 | + echo '| THE FOLLOWING ERROR OCCURED |'.PHP_EOL; |
|
| 159 | + echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL; |
|
| 160 | 160 | echo PHP_EOL; |
| 161 | - echo ' ' . $message . PHP_EOL; |
|
| 161 | + echo ' '.$message.PHP_EOL; |
|
| 162 | 162 | echo PHP_EOL; |
| 163 | - echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
| 164 | - echo '| IN FILE |' . PHP_EOL; |
|
| 165 | - echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
| 163 | + echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL; |
|
| 164 | + echo '| IN FILE |'.PHP_EOL; |
|
| 165 | + echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL; |
|
| 166 | 166 | echo PHP_EOL; |
| 167 | - echo ' ' . $file . ':' . $line . PHP_EOL; |
|
| 167 | + echo ' '.$file.':'.$line.PHP_EOL; |
|
| 168 | 168 | echo PHP_EOL; |
| 169 | - echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
| 170 | - echo '| CONTENTS OF THE FILE |' . PHP_EOL; |
|
| 171 | - echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
| 169 | + echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL; |
|
| 170 | + echo '| CONTENTS OF THE FILE |'.PHP_EOL; |
|
| 171 | + echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL; |
|
| 172 | 172 | echo PHP_EOL; |
| 173 | - foreach($lines as $nr => $currentLine) { |
|
| 174 | - echo ($nr == $line ? '* ' : ' ' ) . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine; |
|
| 173 | + foreach ($lines as $nr => $currentLine) { |
|
| 174 | + echo ($nr == $line ? '* ' : ' ').str_pad($nr, 3, "0", STR_PAD_LEFT).' '.$currentLine; |
|
| 175 | 175 | } |
| 176 | 176 | echo PHP_EOL; |
| 177 | - echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
| 178 | - echo '| STACK TRACE |' . PHP_EOL; |
|
| 179 | - echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL; |
|
| 180 | - foreach($trace as $row) { |
|
| 181 | - echo (isset($row['file']) ? basename($row['file']) : '') . ':' |
|
| 182 | - . (isset($row['line']) ? $row['line'] : '') . "\t\t\t" |
|
| 183 | - . (isset($row['class']) ? $row['class'] : ' ') . "\t\t\t" |
|
| 184 | - . (isset($row['type']) ? $row['type'] : ' ') . "\t\t\t" |
|
| 185 | - . (isset($row['function']) ? $row['function'] : ' ') . PHP_EOL; |
|
| 177 | + echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL; |
|
| 178 | + echo '| STACK TRACE |'.PHP_EOL; |
|
| 179 | + echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL; |
|
| 180 | + foreach ($trace as $row) { |
|
| 181 | + echo (isset($row['file']) ? basename($row['file']) : '').':' |
|
| 182 | + . (isset($row['line']) ? $row['line'] : '')."\t\t\t" |
|
| 183 | + . (isset($row['class']) ? $row['class'] : ' ')."\t\t\t" |
|
| 184 | + . (isset($row['type']) ? $row['type'] : ' ')."\t\t\t" |
|
| 185 | + . (isset($row['function']) ? $row['function'] : ' ').PHP_EOL; |
|
| 186 | 186 | } |
| 187 | 187 | exit; |
| 188 | 188 | } |
| 189 | 189 | \ No newline at end of file |
@@ -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 | } |
@@ -74,12 +74,15 @@ |
||
| 74 | 74 | * @return string |
| 75 | 75 | */ |
| 76 | 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"; |
|
| 77 | + if( (!$unit && $size >= 1<<30) || $unit == "GB") { |
|
| 78 | + return number_format($size/(1<<30),2)."GB"; |
|
| 79 | + } |
|
| 80 | + if( (!$unit && $size >= 1<<20) || $unit == "MB") { |
|
| 81 | + return number_format($size/(1<<20),2)."MB"; |
|
| 82 | + } |
|
| 83 | + if( (!$unit && $size >= 1<<10) || $unit == "KB") { |
|
| 84 | + return number_format($size/(1<<10),2)."KB"; |
|
| 85 | + } |
|
| 83 | 86 | return number_format($size)." bytes"; |
| 84 | 87 | } |
| 85 | 88 | |
@@ -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 | }); |
@@ -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 | } |
@@ -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(); |
@@ -58,6 +58,10 @@ discard block |
||
| 58 | 58 | $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_SEARCH); |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | + /** |
|
| 62 | + * @param \library\cc\Request $request |
|
| 63 | + * @param CmsComponent $cmsComponent |
|
| 64 | + */ |
|
| 61 | 65 | private function ajaxUpdateIndexRoute($request, $cmsComponent) |
| 62 | 66 | { |
| 63 | 67 | $cmsComponent->subTemplate = 'cms/search/update-index'; |
@@ -93,6 +97,9 @@ discard block |
||
| 93 | 97 | } |
| 94 | 98 | } |
| 95 | 99 | |
| 100 | + /** |
|
| 101 | + * @param string $obj |
|
| 102 | + */ |
|
| 96 | 103 | private function showJson($obj, $httpHeader = 'HTTP/1.0 200 OK') { |
| 97 | 104 | header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true); |
| 98 | 105 | header('Content-type: application/json'); |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | $indexer->replaceOldIndex(); |
| 87 | 87 | $this->showJson('done'); |
| 88 | 88 | } else { |
| 89 | - $this->showJson('Invalid step: ' . $step . '.', 'HTTP/1.0 500 Internal Server Error'); |
|
| 89 | + $this->showJson('Invalid step: '.$step.'.', 'HTTP/1.0 500 Internal Server Error'); |
|
| 90 | 90 | } |
| 91 | 91 | } else { |
| 92 | 92 | $this->showJson('No step defined.', 'HTTP/1.0 500 Internal Server Error'); |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | private function showJson($obj, $httpHeader = 'HTTP/1.0 200 OK') { |
| 97 | - header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true); |
|
| 97 | + header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true); |
|
| 98 | 98 | header('Content-type: application/json'); |
| 99 | 99 | die(json_encode($obj)); |
| 100 | 100 | exit; |
@@ -38,9 +38,9 @@ discard block |
||
| 38 | 38 | /** |
| 39 | 39 | * Filter out all special characters, like punctuation and characters with accents |
| 40 | 40 | * |
| 41 | - * @param $string |
|
| 41 | + * @param string $string |
|
| 42 | 42 | * |
| 43 | - * @return mixed|string |
|
| 43 | + * @return string |
|
| 44 | 44 | */ |
| 45 | 45 | private function filterSpecialCharacters($string) |
| 46 | 46 | { |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | /** |
| 76 | - * @return mixed|string |
|
| 76 | + * @return string |
|
| 77 | 77 | */ |
| 78 | 78 | public function getFilteredString() |
| 79 | 79 | { |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | { |
| 47 | 47 | $string = strip_tags($string); |
| 48 | 48 | $string = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $string); // Remove special alphanumeric characters |
| 49 | - $string = str_replace(array('+', '=', '!', ',', '.',';', ':', '?'), ' ', $string); // Replace sentence breaking charaters with spaces |
|
| 49 | + $string = str_replace(array('+', '=', '!', ',', '.', ';', ':', '?'), ' ', $string); // Replace sentence breaking charaters with spaces |
|
| 50 | 50 | $string = preg_replace("/[\r\n]+/", " ", $string); // Replace multiple newlines with a single space. |
| 51 | 51 | $string = preg_replace("/[\t]+/", " ", $string); // Replace multiple tabs with a single space. |
| 52 | 52 | $string = preg_replace("/[^a-zA-Z0-9 ]/", '', $string); // Filter out everything that is not alphanumeric or a space |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | { |
| 65 | 65 | $encoding = mb_detect_encoding($string, mb_detect_order(), false); |
| 66 | 66 | |
| 67 | - if($encoding == "UTF-8") { |
|
| 67 | + if ($encoding == "UTF-8") { |
|
| 68 | 68 | $string = mb_convert_encoding($string, 'UTF-8', 'UTF-8'); |
| 69 | 69 | } |
| 70 | 70 | |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | /** |
| 127 | - * @return int|mixed |
|
| 127 | + * @return integer |
|
| 128 | 128 | */ |
| 129 | 129 | private function getTotalDocumentCount() |
| 130 | 130 | { |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | |
| 155 | 155 | /** |
| 156 | 156 | * Adds a logline with the time since last log |
| 157 | - * @param $string |
|
| 157 | + * @param string $string |
|
| 158 | 158 | */ |
| 159 | 159 | private function addLog($string) |
| 160 | 160 | { |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | $this->resetIndex(); |
| 59 | 59 | $this->addLog('Retrieving documents to be indexed.'); |
| 60 | 60 | $documents = $this->storage->getDocuments(); |
| 61 | - $this->addLog('Start Document Term Count for ' . count($documents) . ' documents'); |
|
| 61 | + $this->addLog('Start Document Term Count for '.count($documents).' documents'); |
|
| 62 | 62 | $this->createDocumentTermCount($documents); |
| 63 | 63 | $this->addLog('Start Document Term Frequency.'); |
| 64 | 64 | $this->createDocumentTermFrequency(); |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | private function addLog($string) |
| 160 | 160 | { |
| 161 | 161 | $currentTime = round(microtime(true) * 1000); |
| 162 | - $this->log .= date('d-m-Y H:i:s - ') . str_pad($string, 50, " ", STR_PAD_RIGHT) . "\t" . ($currentTime - $this->lastLog) . 'ms since last log. ' . "\t" . ($currentTime - $this->loggingStart) . 'ms since start.' . PHP_EOL; |
|
| 162 | + $this->log .= date('d-m-Y H:i:s - ').str_pad($string, 50, " ", STR_PAD_RIGHT)."\t".($currentTime - $this->lastLog).'ms since last log. '."\t".($currentTime - $this->loggingStart).'ms since start.'.PHP_EOL; |
|
| 163 | 163 | $this->lastLog = round(microtime(true) * 1000); |
| 164 | 164 | } |
| 165 | 165 | |
@@ -171,8 +171,8 @@ discard block |
||
| 171 | 171 | protected function getSearchDbHandle() |
| 172 | 172 | { |
| 173 | 173 | if ($this->searchDbHandle === null) { |
| 174 | - $path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . $this->storageDir . DIRECTORY_SEPARATOR; |
|
| 175 | - $this->searchDbHandle = new \PDO('sqlite:' . $path . self::SEARCH_TEMP_DB); |
|
| 174 | + $path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$this->storageDir.DIRECTORY_SEPARATOR; |
|
| 175 | + $this->searchDbHandle = new \PDO('sqlite:'.$path.self::SEARCH_TEMP_DB); |
|
| 176 | 176 | } |
| 177 | 177 | return $this->searchDbHandle; |
| 178 | 178 | } |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | public function replaceOldIndex() |
| 184 | 184 | { |
| 185 | 185 | $this->searchDbHandle = null; |
| 186 | - $path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . $this->storageDir . DIRECTORY_SEPARATOR; |
|
| 187 | - rename($path . self::SEARCH_TEMP_DB, $path . 'search.db'); |
|
| 186 | + $path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$this->storageDir.DIRECTORY_SEPARATOR; |
|
| 187 | + rename($path.self::SEARCH_TEMP_DB, $path.'search.db'); |
|
| 188 | 188 | } |
| 189 | 189 | } |
| 190 | 190 | \ No newline at end of file |
