@@ -6,124 +6,124 @@ |
||
| 6 | 6 | |
| 7 | 7 | class LanguageComponent implements Component |
| 8 | 8 | { |
| 9 | - protected $request; |
|
| 10 | - protected $parameters; |
|
| 11 | - |
|
| 12 | - protected $defaultLanguage = 'en'; |
|
| 13 | - protected $acceptedLanguages = null; |
|
| 14 | - protected $languageParameterName = 'language'; |
|
| 15 | - protected $forceRedirect = false; |
|
| 16 | - protected $sessionValues; |
|
| 17 | - |
|
| 18 | - /** |
|
| 19 | - * Component constructor. |
|
| 20 | - * |
|
| 21 | - * @param $template |
|
| 22 | - * @param Request $request |
|
| 23 | - * @param $parameters |
|
| 24 | - * @param $matchedSitemapItem |
|
| 25 | - */ |
|
| 26 | - public function __construct($template, Request $request, $parameters, $matchedSitemapItem) |
|
| 27 | - { |
|
| 28 | - $this->parameters = (array) $parameters; |
|
| 29 | - $this->checkParameters(); |
|
| 30 | - |
|
| 31 | - $lang = substr(isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : $this->defaultLanguage, 0, 2); |
|
| 32 | - $_SESSION['LanguageComponent']['detectedLanguage'] = $lang; |
|
| 33 | - |
|
| 34 | - $this->checkLanguageSwitch($request); |
|
| 35 | - |
|
| 36 | - if (!isset($_SESSION['LanguageComponent'][$this->languageParameterName])) { |
|
| 37 | - $this->detectLanguage($lang, $request); |
|
| 38 | - } else { |
|
| 39 | - if ($this->forceRedirect === true) { |
|
| 40 | - $this->detectLanguage($_SESSION['LanguageComponent'][$this->languageParameterName], $request); |
|
| 41 | - } |
|
| 42 | - } |
|
| 43 | - |
|
| 44 | - $this->parameters[$this->languageParameterName] = $_SESSION['LanguageComponent'][$this->languageParameterName]; |
|
| 45 | - } |
|
| 46 | - |
|
| 47 | - /** |
|
| 48 | - * Checks to see if any parameters are given from the configuration in the CMS |
|
| 49 | - */ |
|
| 50 | - private function checkParameters() |
|
| 51 | - { |
|
| 52 | - if (isset($this->parameters['defaultLanguage'])) { |
|
| 53 | - $this->defaultLanguage = $this->parameters['defaultLanguage']; |
|
| 54 | - unset($this->parameters['defaultLanguage']); |
|
| 55 | - } |
|
| 56 | - if (isset($this->parameters['acceptedLanguages'])) { |
|
| 57 | - $this->acceptedLanguages = explode(',', $this->parameters['acceptedLanguages']); |
|
| 58 | - unset($this->parameters['acceptedLanguages']); |
|
| 59 | - } |
|
| 60 | - if (isset($this->parameters['languageParameterName'])) { |
|
| 61 | - $this->languageParameterName = $this->parameters['languageParameterName']; |
|
| 62 | - unset($this->parameters['languageParameterName']); |
|
| 63 | - } |
|
| 64 | - if (isset($this->parameters['forceRedirect'])) { |
|
| 65 | - $this->forceRedirect = (bool) $this->parameters['forceRedirect']; |
|
| 66 | - unset($this->parameters['forceRedirect']); |
|
| 67 | - } |
|
| 68 | - } |
|
| 69 | - |
|
| 70 | - /** |
|
| 71 | - * @return array |
|
| 72 | - */ |
|
| 73 | - public function getParameters() |
|
| 74 | - { |
|
| 75 | - return $this->parameters; |
|
| 76 | - } |
|
| 77 | - |
|
| 78 | - |
|
| 79 | - /** |
|
| 80 | - * Check if the found language is allowed and |
|
| 81 | - * if an action is to be taken. |
|
| 82 | - * |
|
| 83 | - * @param $lang |
|
| 84 | - * @param $request |
|
| 85 | - */ |
|
| 86 | - private function detectLanguage($lang, $request) |
|
| 87 | - { |
|
| 88 | - $_SESSION['LanguageComponent'][$this->languageParameterName] = $this->defaultLanguage; |
|
| 89 | - |
|
| 90 | - if ($this->acceptedLanguages === null) { |
|
| 91 | - $_SESSION['LanguageComponent'][$this->languageParameterName] = $lang; |
|
| 92 | - } else if (in_array($lang, $this->acceptedLanguages)) { |
|
| 93 | - $_SESSION['LanguageComponent'][$this->languageParameterName] = $lang; |
|
| 94 | - } else { |
|
| 95 | - $lang = $this->defaultLanguage; |
|
| 96 | - } |
|
| 97 | - |
|
| 98 | - $this->sessionValues = $_SESSION['LanguageComponent']; |
|
| 99 | - |
|
| 100 | - if ($this->forceRedirect === true) { |
|
| 101 | - if (substr($request::$relativeUri, 0, 2) !== $lang ) { |
|
| 102 | - if ($lang !== $this->defaultLanguage) { |
|
| 103 | - header('Location: ' . $request::$subfolders . $lang . '/' . $request::$relativeUri); |
|
| 104 | - exit; |
|
| 105 | - } |
|
| 106 | - } |
|
| 107 | - } |
|
| 108 | - } |
|
| 109 | - |
|
| 110 | - /** |
|
| 111 | - * Detect if the language is switched manually |
|
| 112 | - * |
|
| 113 | - * @param $request |
|
| 114 | - */ |
|
| 115 | - private function checkLanguageSwitch($request) |
|
| 116 | - { |
|
| 117 | - if (isset($request::$get['langSwitch'])) { |
|
| 118 | - $this->forceRedirect = true; |
|
| 119 | - $this->detectLanguage($request::$get['langSwitch'], $request); |
|
| 120 | - } |
|
| 121 | - } |
|
| 122 | - |
|
| 123 | - /* |
|
| 9 | + protected $request; |
|
| 10 | + protected $parameters; |
|
| 11 | + |
|
| 12 | + protected $defaultLanguage = 'en'; |
|
| 13 | + protected $acceptedLanguages = null; |
|
| 14 | + protected $languageParameterName = 'language'; |
|
| 15 | + protected $forceRedirect = false; |
|
| 16 | + protected $sessionValues; |
|
| 17 | + |
|
| 18 | + /** |
|
| 19 | + * Component constructor. |
|
| 20 | + * |
|
| 21 | + * @param $template |
|
| 22 | + * @param Request $request |
|
| 23 | + * @param $parameters |
|
| 24 | + * @param $matchedSitemapItem |
|
| 25 | + */ |
|
| 26 | + public function __construct($template, Request $request, $parameters, $matchedSitemapItem) |
|
| 27 | + { |
|
| 28 | + $this->parameters = (array) $parameters; |
|
| 29 | + $this->checkParameters(); |
|
| 30 | + |
|
| 31 | + $lang = substr(isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : $this->defaultLanguage, 0, 2); |
|
| 32 | + $_SESSION['LanguageComponent']['detectedLanguage'] = $lang; |
|
| 33 | + |
|
| 34 | + $this->checkLanguageSwitch($request); |
|
| 35 | + |
|
| 36 | + if (!isset($_SESSION['LanguageComponent'][$this->languageParameterName])) { |
|
| 37 | + $this->detectLanguage($lang, $request); |
|
| 38 | + } else { |
|
| 39 | + if ($this->forceRedirect === true) { |
|
| 40 | + $this->detectLanguage($_SESSION['LanguageComponent'][$this->languageParameterName], $request); |
|
| 41 | + } |
|
| 42 | + } |
|
| 43 | + |
|
| 44 | + $this->parameters[$this->languageParameterName] = $_SESSION['LanguageComponent'][$this->languageParameterName]; |
|
| 45 | + } |
|
| 46 | + |
|
| 47 | + /** |
|
| 48 | + * Checks to see if any parameters are given from the configuration in the CMS |
|
| 49 | + */ |
|
| 50 | + private function checkParameters() |
|
| 51 | + { |
|
| 52 | + if (isset($this->parameters['defaultLanguage'])) { |
|
| 53 | + $this->defaultLanguage = $this->parameters['defaultLanguage']; |
|
| 54 | + unset($this->parameters['defaultLanguage']); |
|
| 55 | + } |
|
| 56 | + if (isset($this->parameters['acceptedLanguages'])) { |
|
| 57 | + $this->acceptedLanguages = explode(',', $this->parameters['acceptedLanguages']); |
|
| 58 | + unset($this->parameters['acceptedLanguages']); |
|
| 59 | + } |
|
| 60 | + if (isset($this->parameters['languageParameterName'])) { |
|
| 61 | + $this->languageParameterName = $this->parameters['languageParameterName']; |
|
| 62 | + unset($this->parameters['languageParameterName']); |
|
| 63 | + } |
|
| 64 | + if (isset($this->parameters['forceRedirect'])) { |
|
| 65 | + $this->forceRedirect = (bool) $this->parameters['forceRedirect']; |
|
| 66 | + unset($this->parameters['forceRedirect']); |
|
| 67 | + } |
|
| 68 | + } |
|
| 69 | + |
|
| 70 | + /** |
|
| 71 | + * @return array |
|
| 72 | + */ |
|
| 73 | + public function getParameters() |
|
| 74 | + { |
|
| 75 | + return $this->parameters; |
|
| 76 | + } |
|
| 77 | + |
|
| 78 | + |
|
| 79 | + /** |
|
| 80 | + * Check if the found language is allowed and |
|
| 81 | + * if an action is to be taken. |
|
| 82 | + * |
|
| 83 | + * @param $lang |
|
| 84 | + * @param $request |
|
| 85 | + */ |
|
| 86 | + private function detectLanguage($lang, $request) |
|
| 87 | + { |
|
| 88 | + $_SESSION['LanguageComponent'][$this->languageParameterName] = $this->defaultLanguage; |
|
| 89 | + |
|
| 90 | + if ($this->acceptedLanguages === null) { |
|
| 91 | + $_SESSION['LanguageComponent'][$this->languageParameterName] = $lang; |
|
| 92 | + } else if (in_array($lang, $this->acceptedLanguages)) { |
|
| 93 | + $_SESSION['LanguageComponent'][$this->languageParameterName] = $lang; |
|
| 94 | + } else { |
|
| 95 | + $lang = $this->defaultLanguage; |
|
| 96 | + } |
|
| 97 | + |
|
| 98 | + $this->sessionValues = $_SESSION['LanguageComponent']; |
|
| 99 | + |
|
| 100 | + if ($this->forceRedirect === true) { |
|
| 101 | + if (substr($request::$relativeUri, 0, 2) !== $lang ) { |
|
| 102 | + if ($lang !== $this->defaultLanguage) { |
|
| 103 | + header('Location: ' . $request::$subfolders . $lang . '/' . $request::$relativeUri); |
|
| 104 | + exit; |
|
| 105 | + } |
|
| 106 | + } |
|
| 107 | + } |
|
| 108 | + } |
|
| 109 | + |
|
| 110 | + /** |
|
| 111 | + * Detect if the language is switched manually |
|
| 112 | + * |
|
| 113 | + * @param $request |
|
| 114 | + */ |
|
| 115 | + private function checkLanguageSwitch($request) |
|
| 116 | + { |
|
| 117 | + if (isset($request::$get['langSwitch'])) { |
|
| 118 | + $this->forceRedirect = true; |
|
| 119 | + $this->detectLanguage($request::$get['langSwitch'], $request); |
|
| 120 | + } |
|
| 121 | + } |
|
| 122 | + |
|
| 123 | + /* |
|
| 124 | 124 | * These functions are required by the interface, but not for the functionality |
| 125 | 125 | */ |
| 126 | - public function run(JsonStorage $storage) {} |
|
| 127 | - public function render() {} |
|
| 128 | - public function get() {} |
|
| 126 | + public function run(JsonStorage $storage) {} |
|
| 127 | + public function render() {} |
|
| 128 | + public function get() {} |
|
| 129 | 129 | } |
| 130 | 130 | \ No newline at end of file |
@@ -11,37 +11,37 @@ |
||
| 11 | 11 | |
| 12 | 12 | abstract class StopWordsFilter implements Filter |
| 13 | 13 | { |
| 14 | - protected $tokens; |
|
| 15 | - protected $stopWords = array(); |
|
| 14 | + protected $tokens; |
|
| 15 | + protected $stopWords = array(); |
|
| 16 | 16 | |
| 17 | - /** |
|
| 18 | - * StopWordsFilter constructor. |
|
| 19 | - * @param array $tokens |
|
| 20 | - */ |
|
| 21 | - public function __construct($tokens) |
|
| 22 | - { |
|
| 23 | - $this->tokens = $tokens; |
|
| 24 | - } |
|
| 17 | + /** |
|
| 18 | + * StopWordsFilter constructor. |
|
| 19 | + * @param array $tokens |
|
| 20 | + */ |
|
| 21 | + public function __construct($tokens) |
|
| 22 | + { |
|
| 23 | + $this->tokens = $tokens; |
|
| 24 | + } |
|
| 25 | 25 | |
| 26 | - /** |
|
| 27 | - * @return array |
|
| 28 | - */ |
|
| 29 | - public function getFilterResults() |
|
| 30 | - { |
|
| 31 | - foreach ($this->stopWords as $stopWord) { |
|
| 32 | - foreach ($this->tokens as $field => $tokens) { |
|
| 33 | - if (isset($tokens[$stopWord])) { |
|
| 34 | - $tokens[$stopWord] = null; |
|
| 35 | - unset($tokens[$stopWord]); |
|
| 36 | - $tokens = array_filter($tokens); |
|
| 37 | - asort($tokens); |
|
| 38 | - } |
|
| 26 | + /** |
|
| 27 | + * @return array |
|
| 28 | + */ |
|
| 29 | + public function getFilterResults() |
|
| 30 | + { |
|
| 31 | + foreach ($this->stopWords as $stopWord) { |
|
| 32 | + foreach ($this->tokens as $field => $tokens) { |
|
| 33 | + if (isset($tokens[$stopWord])) { |
|
| 34 | + $tokens[$stopWord] = null; |
|
| 35 | + unset($tokens[$stopWord]); |
|
| 36 | + $tokens = array_filter($tokens); |
|
| 37 | + asort($tokens); |
|
| 38 | + } |
|
| 39 | 39 | |
| 40 | - $this->tokens[$field] = $tokens; |
|
| 41 | - } |
|
| 42 | - } |
|
| 43 | - $this->tokens = array_filter($this->tokens); |
|
| 44 | - asort($this->tokens); |
|
| 45 | - return $this->tokens; |
|
| 46 | - } |
|
| 40 | + $this->tokens[$field] = $tokens; |
|
| 41 | + } |
|
| 42 | + } |
|
| 43 | + $this->tokens = array_filter($this->tokens); |
|
| 44 | + asort($this->tokens); |
|
| 45 | + return $this->tokens; |
|
| 46 | + } |
|
| 47 | 47 | } |
| 48 | 48 | \ No newline at end of file |
@@ -32,11 +32,11 @@ |
||
| 32 | 32 | */ |
| 33 | 33 | function shutdownHandler () { |
| 34 | 34 | $error = error_get_last(); |
| 35 | - if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { |
|
| 35 | + if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { |
|
| 36 | 36 | \library\cc\ErrorHandlingUtil::renderError($error['message'],$error['file'],$error['line'], $error['type']); |
| 37 | - }elseif ($error['type'] == 1) { |
|
| 38 | - dump($error); |
|
| 39 | - } |
|
| 37 | + }elseif ($error['type'] == 1) { |
|
| 38 | + dump($error); |
|
| 39 | + } |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | |
@@ -13,26 +13,26 @@ |
||
| 13 | 13 | class ImagesRouting implements CmsRouting |
| 14 | 14 | { |
| 15 | 15 | |
| 16 | - /** |
|
| 17 | - * ImagesRouting constructor. |
|
| 18 | - * @param \library\cc\Request $request |
|
| 19 | - * @param mixed|string $relativeCmsUri |
|
| 20 | - * @param CmsComponent $cmsComponent |
|
| 21 | - */ |
|
| 22 | - public function __construct($request, $relativeCmsUri, $cmsComponent) |
|
| 23 | - { |
|
| 24 | - if ($relativeCmsUri == '/images') { |
|
| 16 | + /** |
|
| 17 | + * ImagesRouting constructor. |
|
| 18 | + * @param \library\cc\Request $request |
|
| 19 | + * @param mixed|string $relativeCmsUri |
|
| 20 | + * @param CmsComponent $cmsComponent |
|
| 21 | + */ |
|
| 22 | + public function __construct($request, $relativeCmsUri, $cmsComponent) |
|
| 23 | + { |
|
| 24 | + if ($relativeCmsUri == '/images') { |
|
| 25 | 25 | $this->overviewRoute($cmsComponent); |
| 26 | - } elseif ($relativeCmsUri == '/images.json') { |
|
| 26 | + } elseif ($relativeCmsUri == '/images.json') { |
|
| 27 | 27 | $this->jsonRoute($cmsComponent); |
| 28 | - } elseif ($relativeCmsUri == '/images/new') { |
|
| 28 | + } elseif ($relativeCmsUri == '/images/new') { |
|
| 29 | 29 | $this->newRoute($request, $cmsComponent); |
| 30 | - } elseif ($relativeCmsUri == '/images/delete' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) { |
|
| 30 | + } elseif ($relativeCmsUri == '/images/delete' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) { |
|
| 31 | 31 | $this->deleteRoute($request, $cmsComponent); |
| 32 | - } elseif ($relativeCmsUri == '/images/show' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) { |
|
| 32 | + } elseif ($relativeCmsUri == '/images/show' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) { |
|
| 33 | 33 | $this->showRoute($request, $cmsComponent); |
| 34 | - } |
|
| 35 | - } |
|
| 34 | + } |
|
| 35 | + } |
|
| 36 | 36 | |
| 37 | 37 | /** |
| 38 | 38 | * @param CmsComponent $cmsComponent |
@@ -21,9 +21,9 @@ discard block |
||
| 21 | 21 | <div class="documentActions grid-box-2"> |
| 22 | 22 | <? if ($document->state == 'unpublished' || $document->unpublishedChanges) : ?> |
| 23 | 23 | <?renderAction('Publish', |
| 24 | - 'publish', |
|
| 25 | - \library\cc\Request::$subfolders . $cmsPrefix . '/documents/publish-document?slug=' . $slugPrefix . $document->slug, |
|
| 26 | - 'check');?> |
|
| 24 | + 'publish', |
|
| 25 | + \library\cc\Request::$subfolders . $cmsPrefix . '/documents/publish-document?slug=' . $slugPrefix . $document->slug, |
|
| 26 | + 'check');?> |
|
| 27 | 27 | <? endif ?> |
| 28 | 28 | <? if ($document->state == 'published') : ?> |
| 29 | 29 | <?renderAction('Unpublish', |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | 'error', |
| 41 | 41 | \library\cc\Request::$subfolders . $cmsPrefix . '/documents/delete-document?slug=' . $slugPrefix . $document->slug, |
| 42 | 42 | 'trash', |
| 43 | - 'return confirm(\'Are you sure you want to delete this document?\');');?> |
|
| 43 | + 'return confirm(\'Are you sure you want to delete this document?\');');?> |
|
| 44 | 44 | <? endif ?> |
| 45 | 45 | </div> |
| 46 | 46 | <?}?> |
@@ -12,83 +12,83 @@ |
||
| 12 | 12 | |
| 13 | 13 | class ValuelistsStorage extends AbstractStorage |
| 14 | 14 | { |
| 15 | - /** |
|
| 16 | - * Get all valuelists |
|
| 17 | - * |
|
| 18 | - * @return mixed |
|
| 19 | - */ |
|
| 20 | - public function getValuelists() |
|
| 21 | - { |
|
| 22 | - return $this->repository->valuelists; |
|
| 23 | - } |
|
| 15 | + /** |
|
| 16 | + * Get all valuelists |
|
| 17 | + * |
|
| 18 | + * @return mixed |
|
| 19 | + */ |
|
| 20 | + public function getValuelists() |
|
| 21 | + { |
|
| 22 | + return $this->repository->valuelists; |
|
| 23 | + } |
|
| 24 | 24 | |
| 25 | - public function addValuelist($postValues) |
|
| 26 | - { |
|
| 27 | - $valueListObject = ValuelistFactory::createValuelistFromPostValues($postValues); |
|
| 28 | - $valuelists = $this->repository->valuelists; |
|
| 29 | - $valuelists[] = $valueListObject; |
|
| 30 | - $this->repository->valuelists = $valuelists; |
|
| 31 | - $this->save(); |
|
| 32 | - } |
|
| 25 | + public function addValuelist($postValues) |
|
| 26 | + { |
|
| 27 | + $valueListObject = ValuelistFactory::createValuelistFromPostValues($postValues); |
|
| 28 | + $valuelists = $this->repository->valuelists; |
|
| 29 | + $valuelists[] = $valueListObject; |
|
| 30 | + $this->repository->valuelists = $valuelists; |
|
| 31 | + $this->save(); |
|
| 32 | + } |
|
| 33 | 33 | |
| 34 | - /** |
|
| 35 | - * Save changes to a valuelist |
|
| 36 | - * |
|
| 37 | - * @param $slug |
|
| 38 | - * @param $postValues |
|
| 39 | - * |
|
| 40 | - * @throws \Exception |
|
| 41 | - */ |
|
| 42 | - public function saveValuelist($slug, $postValues) |
|
| 43 | - { |
|
| 44 | - $valuelistObject = ValuelistFactory::createValuelistFromPostValues($postValues); |
|
| 34 | + /** |
|
| 35 | + * Save changes to a valuelist |
|
| 36 | + * |
|
| 37 | + * @param $slug |
|
| 38 | + * @param $postValues |
|
| 39 | + * |
|
| 40 | + * @throws \Exception |
|
| 41 | + */ |
|
| 42 | + public function saveValuelist($slug, $postValues) |
|
| 43 | + { |
|
| 44 | + $valuelistObject = ValuelistFactory::createValuelistFromPostValues($postValues); |
|
| 45 | 45 | |
| 46 | - $valuelists = $this->repository->valuelists; |
|
| 47 | - foreach ($valuelists as $key => $valuelist) { |
|
| 48 | - if ($valuelist->slug == $slug) { |
|
| 49 | - $valuelists[$key] = $valuelistObject; |
|
| 50 | - } |
|
| 51 | - } |
|
| 52 | - $this->repository->valuelists = $valuelists; |
|
| 53 | - $this->save(); |
|
| 54 | - } |
|
| 46 | + $valuelists = $this->repository->valuelists; |
|
| 47 | + foreach ($valuelists as $key => $valuelist) { |
|
| 48 | + if ($valuelist->slug == $slug) { |
|
| 49 | + $valuelists[$key] = $valuelistObject; |
|
| 50 | + } |
|
| 51 | + } |
|
| 52 | + $this->repository->valuelists = $valuelists; |
|
| 53 | + $this->save(); |
|
| 54 | + } |
|
| 55 | 55 | |
| 56 | - /** |
|
| 57 | - * Get a valuelist by its slug |
|
| 58 | - * |
|
| 59 | - * @param $slug |
|
| 60 | - * |
|
| 61 | - * @return mixed |
|
| 62 | - */ |
|
| 63 | - public function getValuelistBySlug($slug) |
|
| 64 | - { |
|
| 65 | - $valuelists = $this->repository->valuelists; |
|
| 66 | - foreach ($valuelists as $valuelist) { |
|
| 67 | - if ($valuelist->slug == $slug) { |
|
| 68 | - return $valuelist; |
|
| 69 | - } |
|
| 70 | - } |
|
| 56 | + /** |
|
| 57 | + * Get a valuelist by its slug |
|
| 58 | + * |
|
| 59 | + * @param $slug |
|
| 60 | + * |
|
| 61 | + * @return mixed |
|
| 62 | + */ |
|
| 63 | + public function getValuelistBySlug($slug) |
|
| 64 | + { |
|
| 65 | + $valuelists = $this->repository->valuelists; |
|
| 66 | + foreach ($valuelists as $valuelist) { |
|
| 67 | + if ($valuelist->slug == $slug) { |
|
| 68 | + return $valuelist; |
|
| 69 | + } |
|
| 70 | + } |
|
| 71 | 71 | |
| 72 | - return null; |
|
| 73 | - } |
|
| 72 | + return null; |
|
| 73 | + } |
|
| 74 | 74 | |
| 75 | - /** |
|
| 76 | - * Delete a sitemap item by its slug |
|
| 77 | - * |
|
| 78 | - * @param $slug |
|
| 79 | - * |
|
| 80 | - * @throws \Exception |
|
| 81 | - */ |
|
| 82 | - public function deleteValuelistBySlug($slug) |
|
| 83 | - { |
|
| 84 | - $valuelists = $this->repository->valuelists; |
|
| 85 | - foreach ($valuelists as $key => $valuelist) { |
|
| 86 | - if ($valuelist->slug == $slug) { |
|
| 87 | - unset($valuelists[$key]); |
|
| 88 | - } |
|
| 89 | - } |
|
| 90 | - $valuelists = array_values($valuelists); |
|
| 91 | - $this->repository->valuelists = $valuelists; |
|
| 92 | - $this->save(); |
|
| 93 | - } |
|
| 75 | + /** |
|
| 76 | + * Delete a sitemap item by its slug |
|
| 77 | + * |
|
| 78 | + * @param $slug |
|
| 79 | + * |
|
| 80 | + * @throws \Exception |
|
| 81 | + */ |
|
| 82 | + public function deleteValuelistBySlug($slug) |
|
| 83 | + { |
|
| 84 | + $valuelists = $this->repository->valuelists; |
|
| 85 | + foreach ($valuelists as $key => $valuelist) { |
|
| 86 | + if ($valuelist->slug == $slug) { |
|
| 87 | + unset($valuelists[$key]); |
|
| 88 | + } |
|
| 89 | + } |
|
| 90 | + $valuelists = array_values($valuelists); |
|
| 91 | + $this->repository->valuelists = $valuelists; |
|
| 92 | + $this->save(); |
|
| 93 | + } |
|
| 94 | 94 | } |
| 95 | 95 | \ No newline at end of file |
@@ -12,34 +12,34 @@ |
||
| 12 | 12 | |
| 13 | 13 | class ValuelistFactory |
| 14 | 14 | { |
| 15 | - /** |
|
| 16 | - * Create a sitemap item from post values |
|
| 17 | - * |
|
| 18 | - * @param $postValues |
|
| 19 | - * |
|
| 20 | - * @return \stdClass |
|
| 21 | - * @throws \Exception |
|
| 22 | - */ |
|
| 23 | - public static function createValuelistFromPostValues($postValues) |
|
| 24 | - { |
|
| 25 | - if (isset($postValues['title'])) { |
|
| 26 | - $valuelistObject = new \stdClass(); |
|
| 27 | - $valuelistObject->title = $postValues['title']; |
|
| 28 | - $valuelistObject->slug = StringUtil::slugify($postValues['title']); |
|
| 29 | - $valuelistObject->pairs = new \stdClass(); |
|
| 30 | - if (isset($postValues['keys'], $postValues['values'])) { |
|
| 31 | - foreach ($postValues['keys'] as $key => $value) { |
|
| 32 | - $valuelistObject->pairs->$value = $postValues['values'][$key]; |
|
| 33 | - } |
|
| 34 | - } |
|
| 35 | - $object_vars = get_object_vars($valuelistObject->pairs); |
|
| 36 | - ksort($object_vars); |
|
| 37 | - $valuelistObject->pairs = (object) $object_vars; |
|
| 15 | + /** |
|
| 16 | + * Create a sitemap item from post values |
|
| 17 | + * |
|
| 18 | + * @param $postValues |
|
| 19 | + * |
|
| 20 | + * @return \stdClass |
|
| 21 | + * @throws \Exception |
|
| 22 | + */ |
|
| 23 | + public static function createValuelistFromPostValues($postValues) |
|
| 24 | + { |
|
| 25 | + if (isset($postValues['title'])) { |
|
| 26 | + $valuelistObject = new \stdClass(); |
|
| 27 | + $valuelistObject->title = $postValues['title']; |
|
| 28 | + $valuelistObject->slug = StringUtil::slugify($postValues['title']); |
|
| 29 | + $valuelistObject->pairs = new \stdClass(); |
|
| 30 | + if (isset($postValues['keys'], $postValues['values'])) { |
|
| 31 | + foreach ($postValues['keys'] as $key => $value) { |
|
| 32 | + $valuelistObject->pairs->$value = $postValues['values'][$key]; |
|
| 33 | + } |
|
| 34 | + } |
|
| 35 | + $object_vars = get_object_vars($valuelistObject->pairs); |
|
| 36 | + ksort($object_vars); |
|
| 37 | + $valuelistObject->pairs = (object) $object_vars; |
|
| 38 | 38 | |
| 39 | - return $valuelistObject; |
|
| 40 | - } else { |
|
| 41 | - throw new \Exception('Trying to create valuelist with invalid data.'); |
|
| 42 | - } |
|
| 43 | - } |
|
| 39 | + return $valuelistObject; |
|
| 40 | + } else { |
|
| 41 | + throw new \Exception('Trying to create valuelist with invalid data.'); |
|
| 42 | + } |
|
| 43 | + } |
|
| 44 | 44 | |
| 45 | 45 | } |
| 46 | 46 | \ No newline at end of file |
@@ -12,33 +12,33 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | class DocumentRouting implements CmsRouting |
| 14 | 14 | { |
| 15 | - /** |
|
| 16 | - * DocumentRouting constructor. |
|
| 17 | - * @param $request |
|
| 18 | - * @param $relativeCmsUri |
|
| 19 | - * @param CmsComponent $cmsComponent |
|
| 20 | - */ |
|
| 21 | - public function __construct($request, $relativeCmsUri, $cmsComponent) |
|
| 22 | - { |
|
| 23 | - if ($relativeCmsUri == '/documents') { |
|
| 24 | - $cmsComponent->subTemplate = 'cms/documents'; |
|
| 25 | - $cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENTS, $cmsComponent->storage->getDocuments()->getDocumentsWithState()); |
|
| 26 | - $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS); |
|
| 27 | - } |
|
| 28 | - $this->documentRouting($request, $relativeCmsUri, $cmsComponent); |
|
| 29 | - $this->folderRouting($request, $relativeCmsUri, $cmsComponent); |
|
| 15 | + /** |
|
| 16 | + * DocumentRouting constructor. |
|
| 17 | + * @param $request |
|
| 18 | + * @param $relativeCmsUri |
|
| 19 | + * @param CmsComponent $cmsComponent |
|
| 20 | + */ |
|
| 21 | + public function __construct($request, $relativeCmsUri, $cmsComponent) |
|
| 22 | + { |
|
| 23 | + if ($relativeCmsUri == '/documents') { |
|
| 24 | + $cmsComponent->subTemplate = 'cms/documents'; |
|
| 25 | + $cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENTS, $cmsComponent->storage->getDocuments()->getDocumentsWithState()); |
|
| 26 | + $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS); |
|
| 27 | + } |
|
| 28 | + $this->documentRouting($request, $relativeCmsUri, $cmsComponent); |
|
| 29 | + $this->folderRouting($request, $relativeCmsUri, $cmsComponent); |
|
| 30 | 30 | $this->valuelistsRouting($request, $relativeCmsUri, $cmsComponent); |
| 31 | - } |
|
| 31 | + } |
|
| 32 | 32 | |
| 33 | 33 | |
| 34 | - /** |
|
| 35 | - * @param $request |
|
| 36 | - * @param $relativeCmsUri |
|
| 37 | - * @param CmsComponent $cmsComponent |
|
| 38 | - * @throws \Exception |
|
| 39 | - */ |
|
| 40 | - private function documentRouting($request, $relativeCmsUri, $cmsComponent) |
|
| 41 | - { |
|
| 34 | + /** |
|
| 35 | + * @param $request |
|
| 36 | + * @param $relativeCmsUri |
|
| 37 | + * @param CmsComponent $cmsComponent |
|
| 38 | + * @throws \Exception |
|
| 39 | + */ |
|
| 40 | + private function documentRouting($request, $relativeCmsUri, $cmsComponent) |
|
| 41 | + { |
|
| 42 | 42 | if ($relativeCmsUri == '/documents/new-document' && isset($request::$get[CmsComponent::GET_PARAMETER_PATH])) { |
| 43 | 43 | $this->documentNewRoute($request, $cmsComponent); |
| 44 | 44 | } elseif (isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])){ |
@@ -50,23 +50,23 @@ discard block |
||
| 50 | 50 | case '/documents/unpublish-document': $this->unpublishDocumentRoute($request, $cmsComponent); break; |
| 51 | 51 | } |
| 52 | 52 | } |
| 53 | - } |
|
| 53 | + } |
|
| 54 | 54 | |
| 55 | - /** |
|
| 56 | - * @param $request |
|
| 57 | - * @param $relativeCmsUri |
|
| 58 | - * @param CmsComponent $cmsComponent |
|
| 59 | - */ |
|
| 60 | - private function folderRouting($request, $relativeCmsUri, $cmsComponent) |
|
| 61 | - { |
|
| 62 | - if ($relativeCmsUri == '/documents/new-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_PATH])) { |
|
| 55 | + /** |
|
| 56 | + * @param $request |
|
| 57 | + * @param $relativeCmsUri |
|
| 58 | + * @param CmsComponent $cmsComponent |
|
| 59 | + */ |
|
| 60 | + private function folderRouting($request, $relativeCmsUri, $cmsComponent) |
|
| 61 | + { |
|
| 62 | + if ($relativeCmsUri == '/documents/new-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_PATH])) { |
|
| 63 | 63 | $this->newFolderRoute($request, $cmsComponent); |
| 64 | - } else if ($relativeCmsUri == '/documents/edit-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) { |
|
| 64 | + } else if ($relativeCmsUri == '/documents/edit-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) { |
|
| 65 | 65 | $this->editFolderRoute($request, $cmsComponent); |
| 66 | - } else if ($relativeCmsUri == '/documents/delete-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) { |
|
| 66 | + } else if ($relativeCmsUri == '/documents/delete-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) { |
|
| 67 | 67 | $this->deleteFolderRoute($request, $cmsComponent); |
| 68 | - } |
|
| 69 | - } |
|
| 68 | + } |
|
| 69 | + } |
|
| 70 | 70 | |
| 71 | 71 | private function valuelistsRouting($request, $relativeCmsUri, $cmsComponent) |
| 72 | 72 | { |
@@ -12,10 +12,10 @@ |
||
| 12 | 12 | |
| 13 | 13 | class NotFoundComponent extends BaseComponent |
| 14 | 14 | { |
| 15 | - public function run(Storage $storage) |
|
| 16 | - { |
|
| 17 | - parent::run($storage); |
|
| 18 | - header("HTTP/1.0 404 Not Found"); |
|
| 19 | - } |
|
| 15 | + public function run(Storage $storage) |
|
| 16 | + { |
|
| 17 | + parent::run($storage); |
|
| 18 | + header("HTTP/1.0 404 Not Found"); |
|
| 19 | + } |
|
| 20 | 20 | |
| 21 | 21 | } |
| 22 | 22 | \ No newline at end of file |