@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_CONFIGURATION); |
| 57 | 57 | if (isset($request::$post[CmsComponent::POST_PARAMETER_USERNAME])) { |
| 58 | 58 | $cmsComponent->storage->addUser($request::$post); |
| 59 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/users'); |
|
| 59 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/users'); |
|
| 60 | 60 | exit; |
| 61 | 61 | } |
| 62 | 62 | } |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | private function deleteRoute($request, $cmsComponent) |
| 69 | 69 | { |
| 70 | 70 | $cmsComponent->storage->deleteUserBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]); |
| 71 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/users'); |
|
| 71 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/users'); |
|
| 72 | 72 | exit; |
| 73 | 73 | } |
| 74 | 74 | |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | $cmsComponent->setParameter(CmsComponent::PARAMETER_USER, $cmsComponent->storage->getUserBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG])); |
| 84 | 84 | if (isset($_POST[CmsComponent::POST_PARAMETER_USERNAME])) { |
| 85 | 85 | $cmsComponent->storage->saveUser($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post); |
| 86 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/users'); |
|
| 86 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/users'); |
|
| 87 | 87 | exit; |
| 88 | 88 | } |
| 89 | 89 | } |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_SITEMAP); |
| 58 | 58 | if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::POST_PARAMETER_TEMPLATE], $request::$post[CmsComponent::POST_PARAMETER_COMPONENT])) { |
| 59 | 59 | $cmsComponent->storage->addSitemapItem($request::$post); |
| 60 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap'); |
|
| 60 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap'); |
|
| 61 | 61 | exit; |
| 62 | 62 | } |
| 63 | 63 | } |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | $sitemapItem = $cmsComponent->storage->getSitemapItemBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]); |
| 74 | 74 | if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::POST_PARAMETER_TEMPLATE], $request::$post[CmsComponent::POST_PARAMETER_COMPONENT])) { |
| 75 | 75 | $cmsComponent->storage->saveSitemapItem($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post); |
| 76 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap'); |
|
| 76 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap'); |
|
| 77 | 77 | exit; |
| 78 | 78 | } |
| 79 | 79 | $cmsComponent->setParameter(CmsComponent::PARAMETER_SITEMAP_ITEM, $sitemapItem); |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | private function deleteRoute($request, $cmsComponent) |
| 87 | 87 | { |
| 88 | 88 | $cmsComponent->storage->deleteSitemapItemBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]); |
| 89 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap'); |
|
| 89 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap'); |
|
| 90 | 90 | exit; |
| 91 | 91 | } |
| 92 | 92 | } |
| 93 | 93 | \ No newline at end of file |
@@ -39,21 +39,21 @@ discard block |
||
| 39 | 39 | private function downloadRoute($slug, $cmsComponent) |
| 40 | 40 | { |
| 41 | 41 | $file = $cmsComponent->storage->getFileByName($slug); |
| 42 | - $path = realpath(__DIR__ . '/../../../www/files/'); |
|
| 43 | - $quoted = sprintf('"%s"', addcslashes(basename($path . '/' . $file->file), '"\\')); |
|
| 44 | - $size = filesize($path . '/' . $file->file); |
|
| 42 | + $path = realpath(__DIR__.'/../../../www/files/'); |
|
| 43 | + $quoted = sprintf('"%s"', addcslashes(basename($path.'/'.$file->file), '"\\')); |
|
| 44 | + $size = filesize($path.'/'.$file->file); |
|
| 45 | 45 | |
| 46 | 46 | header('Content-Description: File Transfer'); |
| 47 | - header('Content-Type: ' . $file->type); |
|
| 48 | - header('Content-Disposition: attachment; filename=' . $quoted); |
|
| 47 | + header('Content-Type: '.$file->type); |
|
| 48 | + header('Content-Disposition: attachment; filename='.$quoted); |
|
| 49 | 49 | header('Content-Transfer-Encoding: binary'); |
| 50 | 50 | header('Connection: Keep-Alive'); |
| 51 | 51 | header('Expires: 0'); |
| 52 | 52 | header('Cache-Control: must-revalidate, post-check=0, pre-check=0'); |
| 53 | 53 | header('Pragma: public'); |
| 54 | - header('Content-Length: ' . $size); |
|
| 54 | + header('Content-Length: '.$size); |
|
| 55 | 55 | |
| 56 | - readfile($path . '/' . $file->file); |
|
| 56 | + readfile($path.'/'.$file->file); |
|
| 57 | 57 | exit; |
| 58 | 58 | } |
| 59 | 59 | |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_FILES); |
| 78 | 78 | if (isset($_FILES[CmsComponent::FILES_PARAMETER_FILE])) { |
| 79 | 79 | $cmsComponent->storage->addFile($_FILES[CmsComponent::FILES_PARAMETER_FILE]); |
| 80 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/files'); |
|
| 80 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/files'); |
|
| 81 | 81 | exit; |
| 82 | 82 | } |
| 83 | 83 | } |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | private function deleteRoute($request, $cmsComponent) |
| 90 | 90 | { |
| 91 | 91 | $cmsComponent->storage->deleteFileByName($request::$get[CmsComponent::FILES_PARAMETER_FILE]); |
| 92 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/files'); |
|
| 92 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/files'); |
|
| 93 | 93 | exit; |
| 94 | 94 | } |
| 95 | 95 | |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_IMAGES); |
| 65 | 65 | if (isset($_FILES[CmsComponent::FILES_PARAMETER_FILE])) { |
| 66 | 66 | $cmsComponent->storage->addImage($_FILES[CmsComponent::FILES_PARAMETER_FILE]); |
| 67 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/images'); |
|
| 67 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/images'); |
|
| 68 | 68 | exit; |
| 69 | 69 | } |
| 70 | 70 | } |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | private function deleteRoute($request, $cmsComponent) |
| 77 | 77 | { |
| 78 | 78 | $cmsComponent->storage->deleteImageByName($request::$get[CmsComponent::FILES_PARAMETER_FILE]); |
| 79 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/images'); |
|
| 79 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/images'); |
|
| 80 | 80 | exit; |
| 81 | 81 | } |
| 82 | 82 | |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | if (isset($request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE])) { |
| 80 | 80 | if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE], $request::$get[CmsComponent::GET_PARAMETER_PATH])) { |
| 81 | 81 | $cmsComponent->storage->addDocument($request::$post); |
| 82 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents'); |
|
| 82 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents'); |
|
| 83 | 83 | exit; |
| 84 | 84 | } |
| 85 | 85 | $cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPE, $cmsComponent->storage->getDocumentTypeBySlug($request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE], true)); |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | } else { |
| 88 | 88 | $documentTypes = $cmsComponent->storage->getDocumentTypes(); |
| 89 | 89 | if (count($documentTypes) < 1) { |
| 90 | - throw new \Exception('No Document Types defined yet. <a href="' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/document-types/new">Please do so first.</a>'); |
|
| 90 | + throw new \Exception('No Document Types defined yet. <a href="'.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/document-types/new">Please do so first.</a>'); |
|
| 91 | 91 | } |
| 92 | 92 | $cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPES, $documentTypes); |
| 93 | 93 | } |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | $cmsComponent->setParameter(CmsComponent::PARAMETER_SMALLEST_IMAGE, $cmsComponent->storage->getSmallestImageSet()->slug); |
| 105 | 105 | if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$get[CmsComponent::GET_PARAMETER_SLUG])) { |
| 106 | 106 | $cmsComponent->storage->saveDocument($request::$post); |
| 107 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents'); |
|
| 107 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents'); |
|
| 108 | 108 | exit; |
| 109 | 109 | } |
| 110 | 110 | $cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT, $cmsComponent->storage->getDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG])); |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | private function deleteDocumentRoute($request, $cmsComponent) |
| 142 | 142 | { |
| 143 | 143 | $cmsComponent->storage->deleteDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]); |
| 144 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents'); |
|
| 144 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents'); |
|
| 145 | 145 | exit; |
| 146 | 146 | } |
| 147 | 147 | |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS); |
| 156 | 156 | if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::GET_PARAMETER_PATH])) { |
| 157 | 157 | $cmsComponent->storage->addDocumentFolder($request::$post); |
| 158 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents'); |
|
| 158 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents'); |
|
| 159 | 159 | exit; |
| 160 | 160 | } |
| 161 | 161 | } |
@@ -174,11 +174,11 @@ discard block |
||
| 174 | 174 | array_pop($path); |
| 175 | 175 | $path = implode('/', $path); |
| 176 | 176 | |
| 177 | - $request::$get[CmsComponent::GET_PARAMETER_PATH] = '/' . $path; |
|
| 177 | + $request::$get[CmsComponent::GET_PARAMETER_PATH] = '/'.$path; |
|
| 178 | 178 | |
| 179 | 179 | if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post['content'])) { |
| 180 | 180 | $cmsComponent->storage->saveDocumentFolder($request::$post); |
| 181 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents'); |
|
| 181 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents'); |
|
| 182 | 182 | exit; |
| 183 | 183 | } |
| 184 | 184 | |
@@ -193,7 +193,7 @@ discard block |
||
| 193 | 193 | private function deleteFolderRoute($request, $cmsComponent) |
| 194 | 194 | { |
| 195 | 195 | $cmsComponent->storage->deleteDocumentFolderBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]); |
| 196 | - header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents'); |
|
| 196 | + header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents'); |
|
| 197 | 197 | exit; |
| 198 | 198 | } |
| 199 | 199 | } |
| 200 | 200 | \ No newline at end of file |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | if (isset($_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID])) { |
| 163 | 163 | $this->formId = $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID]; |
| 164 | 164 | } else { |
| 165 | - $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID] = (string)microtime(true); |
|
| 165 | + $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID] = (string) microtime(true); |
|
| 166 | 166 | $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName]['submitted'] = false; |
| 167 | 167 | $this->formId = $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID]; |
| 168 | 168 | } |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | $postValues = $request::$post; |
| 191 | 191 | $postValues[self::PARAMETER_DOCUMENT_TYPE] = $this->documentType; |
| 192 | 192 | $postValues[self::GET_PARAMETER_PATH] = $this->responseFolder; |
| 193 | - $postValues['title'] = date('r') . ' - From: ' . $request::$requestUri; |
|
| 193 | + $postValues['title'] = date('r').' - From: '.$request::$requestUri; |
|
| 194 | 194 | |
| 195 | 195 | return $postValues; |
| 196 | 196 | } |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | private function setFormParameter($form) |
| 326 | 326 | { |
| 327 | 327 | if ($this->isFormSubmitted($this->request) || $this->isSubmitAllowed() === false) { |
| 328 | - $this->parameters[$this->formParameterName] = '<a name="' . $this->formId . '"></a>' . $this->thankYouMessage; |
|
| 328 | + $this->parameters[$this->formParameterName] = '<a name="'.$this->formId.'"></a>'.$this->thankYouMessage; |
|
| 329 | 329 | } else { |
| 330 | 330 | $this->parameters[$this->formParameterName] = $form; |
| 331 | 331 | } |
@@ -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 | } |
@@ -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 | }); |
@@ -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(); |