@@ -670,7 +670,7 @@ |
||
| 670 | 670 | /** |
| 671 | 671 | * render the form header html |
| 672 | 672 | * @return string |
| 673 | - */ |
|
| 673 | + */ |
|
| 674 | 674 | public function renderHeader() |
| 675 | 675 | { |
| 676 | 676 | $options = $this->toArray(); |
@@ -48,14 +48,14 @@ |
||
| 48 | 48 | ]; |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | - public function getValueDisplay($context='') |
|
| 51 | + public function getValueDisplay($context = '') |
|
| 52 | 52 | { |
| 53 | 53 | $json = $this->getValue(); |
| 54 | 54 | if (empty($json)) |
| 55 | 55 | return neon()->formatter->asJson($this->getValue()); |
| 56 | - if ($context==='grid') { |
|
| 56 | + if ($context === 'grid') { |
|
| 57 | 57 | $out = ''; |
| 58 | - foreach($json as $image) { |
|
| 58 | + foreach ($json as $image) { |
|
| 59 | 59 | $url = neon()->firefly->getImage($image); |
| 60 | 60 | $out .= "<img src='$url' />"; |
| 61 | 61 | } |
@@ -14,21 +14,21 @@ discard block |
||
| 14 | 14 | |
| 15 | 15 | class ImageCompare extends ImageMultiple |
| 16 | 16 | { |
| 17 | - /** |
|
| 17 | + /** |
|
| 18 | 18 | * @inheritdoc |
| 19 | 19 | */ |
| 20 | - public $ddsDataType = 'json'; |
|
| 20 | + public $ddsDataType = 'json'; |
|
| 21 | 21 | |
| 22 | - /** |
|
| 22 | + /** |
|
| 23 | 23 | * @inheritdoc |
| 24 | 24 | */ |
| 25 | 25 | public function registerScripts($view) |
| 26 | 26 | { |
| 27 | - $view->registerAssetBundle(\neon\cms\assets\CmsFormAsset::class); |
|
| 27 | + $view->registerAssetBundle(\neon\cms\assets\CmsFormAsset::class); |
|
| 28 | 28 | $view->registerAssetBundle(\neon\firefly\assets\BrowserAsset::class); |
| 29 | - } |
|
| 29 | + } |
|
| 30 | 30 | |
| 31 | - /** |
|
| 31 | + /** |
|
| 32 | 32 | * @inheritdoc |
| 33 | 33 | */ |
| 34 | 34 | public function getFilterField() |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | return ['class' => 'neon\\core\\form\\fields\\Text']; |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | - /** |
|
| 39 | + /** |
|
| 40 | 40 | * @inheritdoc |
| 41 | 41 | */ |
| 42 | 42 | public function getComponentDetails() |
@@ -44,9 +44,9 @@ discard block |
||
| 44 | 44 | return [ |
| 45 | 45 | 'icon' => 'fa fa-image', 'group' => 'Media', 'order' => 80, 'label' => 'Image Compare' |
| 46 | 46 | ]; |
| 47 | - } |
|
| 47 | + } |
|
| 48 | 48 | |
| 49 | - public function getValueDisplay($context='') |
|
| 49 | + public function getValueDisplay($context='') |
|
| 50 | 50 | { |
| 51 | 51 | $json = $this->getValue(); |
| 52 | 52 | if (empty($json)) |
@@ -81,14 +81,14 @@ discard block |
||
| 81 | 81 | |
| 82 | 82 | if (Arr::get($params, 'fit', false)) { |
| 83 | 83 | // add callback functionality to retain maximal original image size |
| 84 | - $image->fit($width, $height, function ($constraint) { |
|
| 84 | + $image->fit($width, $height, function($constraint) { |
|
| 85 | 85 | $constraint->aspectRatio(); |
| 86 | 86 | $constraint->upsize(); |
| 87 | 87 | }, $params['fit']); |
| 88 | 88 | } elseif ($width || $height) { |
| 89 | 89 | $width = $width * $pd; |
| 90 | 90 | $height = $height * $pd; |
| 91 | - $image->resize($width, $height, function ($constraint) { |
|
| 91 | + $image->resize($width, $height, function($constraint) { |
|
| 92 | 92 | $constraint->aspectRatio(); |
| 93 | 93 | $constraint->upsize(); |
| 94 | 94 | }); |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | { |
| 135 | 135 | $filter = Arr::get($params, 'filter', false); |
| 136 | 136 | if ($filter) { |
| 137 | - $filters = explode(',',$filter); |
|
| 137 | + $filters = explode(',', $filter); |
|
| 138 | 138 | if (in_array('greyscale', $filters, true)) { |
| 139 | 139 | $image->greyscale(); |
| 140 | 140 | } |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | $x = Arr::get($crop, 'x', null); |
| 170 | 170 | $y = Arr::get($crop, 'y', null); |
| 171 | 171 | } |
| 172 | - if ($w == 0 && $h == 0 && $x == 0 && $y ==0) { |
|
| 172 | + if ($w == 0 && $h == 0 && $x == 0 && $y == 0) { |
|
| 173 | 173 | return $image; |
| 174 | 174 | } |
| 175 | 175 | $image->crop($w, $h, $x, $y); |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | $id = $request->get('id'); |
| 38 | 38 | if (!$firefly->fileManager->exists($id)) { |
| 39 | 39 | // show placeholder image - should be handled by image manager - controllers should not know |
| 40 | - return neon()->response->sendFile(dirname(__DIR__) . '/assets/placeholder.jpg', 'No File', ['inline' => true]); |
|
| 40 | + return neon()->response->sendFile(dirname(__DIR__).'/assets/placeholder.jpg', 'No File', ['inline' => true]); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | // as the url is unique for a file we can be aggressive about caching |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | return $firefly->fileManager->sendFile($id, (bool) $download); |
| 56 | 56 | } catch (\Exception $e) { |
| 57 | 57 | // if path unknown respond with a blank placeholder |
| 58 | - return neon()->response->sendFile(dirname(__DIR__) . '/assets/placeholder.jpg', 'No File', ['inline' => true]); |
|
| 58 | + return neon()->response->sendFile(dirname(__DIR__).'/assets/placeholder.jpg', 'No File', ['inline' => true]); |
|
| 59 | 59 | } |
| 60 | 60 | } |
| 61 | 61 | |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | $id = neon()->request->getRequired('id'); |
| 82 | 82 | |
| 83 | 83 | // create a unique request key - add v2 to force use of new cached version |
| 84 | - $requestKey = neon()->request->absoluteUrl . 'v10'; |
|
| 84 | + $requestKey = neon()->request->absoluteUrl.'v10'; |
|
| 85 | 85 | |
| 86 | 86 | // see if we already have this in cache and the browser already has it too |
| 87 | 87 | // We want to remove the need to process images when ever possible |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | */ |
| 133 | 133 | public function generatePublicFile($id, $imageContent) |
| 134 | 134 | { |
| 135 | - $dir = substr($id,0, 3); |
|
| 135 | + $dir = substr($id, 0, 3); |
|
| 136 | 136 | $publicDir = neon()->getAlias("@webroot/assets/firefly/$dir"); |
| 137 | 137 | if (!file_exists($publicDir)) { |
| 138 | 138 | FileHelper::createDirectory($publicDir); |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | * Handle a request that can return a 304 not modified header |
| 168 | 168 | * @param bool|string $cacheKey - default false - if cache key is specified |
| 169 | 169 | */ |
| 170 | - public function handleNotModified($cacheKey=false) |
|
| 170 | + public function handleNotModified($cacheKey = false) |
|
| 171 | 171 | { |
| 172 | 172 | $requestHeaders = neon()->request->headers; |
| 173 | 173 | $browserHasCache = (isset($requestHeaders['If-Modified-Since']) || isset($requestHeaders['If-None-Match'])); |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | { |
| 184 | 184 | header($_SERVER['SERVER_PROTOCOL'].' 304 Not modified'); |
| 185 | 185 | header('Cache-Control: private, max-age=30000000, immutable, only-if-cached'); |
| 186 | - header('Expires: ' . Carbon::now()->addYear(10)->toRfc1123String()); |
|
| 186 | + header('Expires: '.Carbon::now()->addYear(10)->toRfc1123String()); |
|
| 187 | 187 | exit; |
| 188 | 188 | } |
| 189 | 189 | |
@@ -82,13 +82,13 @@ discard block |
||
| 82 | 82 | * slug it uses - without this property the canonical function will return the url of the first blog-post |
| 83 | 83 | * (collection page) it finds. |
| 84 | 84 | */ |
| 85 | - public function actionPage($nice_id, $slug='') |
|
| 85 | + public function actionPage($nice_id, $slug = '') |
|
| 86 | 86 | { |
| 87 | 87 | \Neon::beginProfile('COBE::RENDER_ACTION', 'cobe'); |
| 88 | 88 | $cms = $this->getCms(); |
| 89 | 89 | $page = $cms->getPage(); |
| 90 | 90 | // check the page with the nice_id exists |
| 91 | - if (! $page->setById($nice_id)) { |
|
| 91 | + if (!$page->setById($nice_id)) { |
|
| 92 | 92 | $this->pageNotFound(); |
| 93 | 93 | } |
| 94 | 94 | //return neon()->view->injectHtml(''); |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | // Don't display draft pages unless in edit mode. |
| 106 | - if ($page->isStatusDraft() && ! $page->isInEditMode()) { |
|
| 106 | + if ($page->isStatusDraft() && !$page->isInEditMode()) { |
|
| 107 | 107 | $this->pageNotFound(); |
| 108 | 108 | } |
| 109 | 109 | |
@@ -135,8 +135,8 @@ discard block |
||
| 135 | 135 | ->innerJoin(CmsPage::tableName(), 'cms_page.nice_id = cms_url.nice_id') |
| 136 | 136 | ->where("status='PUBLISHED'") |
| 137 | 137 | ->all() |
| 138 | - )->reduce(function($carry, $url){ |
|
| 139 | - return $carry . "\t<url>\n\t\t<loc>" . url($url['url'], true) . "</loc>\n\t</url>" . "\n"; |
|
| 138 | + )->reduce(function($carry, $url) { |
|
| 139 | + return $carry."\t<url>\n\t\t<loc>".url($url['url'], true)."</loc>\n\t</url>"."\n"; |
|
| 140 | 140 | }); |
| 141 | 141 | header('Content-Type:application/rss+xml'); |
| 142 | 142 | echo '<?xml version="1.0" encoding="UTF-8"?>'."\n"; |
@@ -22,7 +22,7 @@ |
||
| 22 | 22 | public function getCanonical() |
| 23 | 23 | { |
| 24 | 24 | $params = neon()->controller->actionParams; |
| 25 | - $params[0] = neon()->controller->getRoute(); |
|
| 25 | + $params[0] = neon()->controller->getRoute(); |
|
| 26 | 26 | $urlManager = neon()->getUrlManager(); |
| 27 | 27 | $url = $urlManager->createUrl($params); |
| 28 | 28 | if (strpos($url, '://') === false) { |
@@ -28,9 +28,9 @@ |
||
| 28 | 28 | if (strpos($url, '://') === false) { |
| 29 | 29 | $hostInfo = setting('cms', 'canonical', $urlManager->getHostInfo()); |
| 30 | 30 | if (strncmp($url, '//', 2) === 0) { |
| 31 | - $url = substr($hostInfo, 0, strpos($hostInfo, '://')) . ':' . $url; |
|
| 31 | + $url = substr($hostInfo, 0, strpos($hostInfo, '://')).':'.$url; |
|
| 32 | 32 | } else { |
| 33 | - $url = $hostInfo . $url; |
|
| 33 | + $url = $hostInfo.$url; |
|
| 34 | 34 | } |
| 35 | 35 | } |
| 36 | 36 | return Url::ensureScheme($url, null); |
@@ -923,7 +923,4 @@ |
||
| 923 | 923 | if (!empty($params['assign'])) { |
| 924 | 924 | $smarty->assign($params['assign'], $output); |
| 925 | 925 | } else { |
| 926 | - return $output; |
|
| 927 | - } |
|
| 928 | - } |
|
| 929 | -} |
|
| 926 | + return $output |
|
| 930 | 927 | \ No newline at end of file |
@@ -538,8 +538,8 @@ discard block |
||
| 538 | 538 | |
| 539 | 539 | $html = []; |
| 540 | 540 | $params['loading'] = Arr::get($params, 'loading', 'lazy'); |
| 541 | - $params[Arr::get($params, 'srcset-name', 'srcset')] = Arr::get($params, 'srcset', $this->image_srcset(['src' => $id, 'quality'=> $quality, 'widths'=>$widths])); |
|
| 542 | - $params[Arr::get($params, 'src-name', 'src')] = $this->firefly_image(['id' => $id, 'w' => (int)$srcWidth, 'q' => $quality]); |
|
| 541 | + $params[Arr::get($params, 'srcset-name', 'srcset')] = Arr::get($params, 'srcset', $this->image_srcset(['src' => $id, 'quality'=> $quality, 'widths'=>$widths])); |
|
| 542 | + $params[Arr::get($params, 'src-name', 'src')] = $this->firefly_image(['id' => $id, 'w' => (int)$srcWidth, 'q' => $quality]); |
|
| 543 | 543 | |
| 544 | 544 | // alt |
| 545 | 545 | $params['alt'] = Arr::get($params, 'alt', $this->image_alt(['src' => $id])); |
@@ -897,7 +897,4 @@ discard block |
||
| 897 | 897 | if (!empty($params['assign'])) { |
| 898 | 898 | $smarty->assign($params['assign'], $output); |
| 899 | 899 | } else { |
| 900 | - return $output; |
|
| 901 | - } |
|
| 902 | - } |
|
| 903 | -} |
|
| 900 | + return $output |
|
| 904 | 901 | \ No newline at end of file |
@@ -30,11 +30,11 @@ |
||
| 30 | 30 | */ |
| 31 | 31 | public function parseRequest($manager, $request) |
| 32 | 32 | { |
| 33 | - $pathInfo = '/' . $request->getPathInfo(); |
|
| 33 | + $pathInfo = '/'.$request->getPathInfo(); |
|
| 34 | 34 | $url = CmsUrl::find()->where(['url' => $pathInfo])->limit(1)->one(); |
| 35 | 35 | // if the url is not in the url table then return false to continue processing other route rules |
| 36 | 36 | // typically in a neon setup the module/controller/action rule |
| 37 | - if (! $url) return false; |
|
| 37 | + if (!$url) return false; |
|
| 38 | 38 | // check if the url found represents a redirect |
| 39 | 39 | if ($url['redirect'] !== null) { |
| 40 | 40 | neon()->response->redirect($url['redirect'], 301)->send(); |
@@ -40,7 +40,7 @@ |
||
| 40 | 40 | public function getComponentDetails() |
| 41 | 41 | { |
| 42 | 42 | return [ |
| 43 | - 'name' => 'switch', 'icon' => 'fa fa-toggle-on', 'group' => 'element ui', |
|
| 43 | + 'name' => 'switch', 'icon' => 'fa fa-toggle-on', 'group' => 'element ui', |
|
| 44 | 44 | ]; |
| 45 | 45 | } |
| 46 | 46 | |