@@ -9,9 +9,9 @@ |
||
9 | 9 | namespace CloudControl\Cms\images\methods |
10 | 10 | { |
11 | 11 | |
12 | - use CloudControl\Cms\images\IMethod; |
|
12 | + use CloudControl\Cms\images\IMethod; |
|
13 | 13 | |
14 | - class Grayscale extends IMethod |
|
14 | + class Grayscale extends IMethod |
|
15 | 15 | { |
16 | 16 | public function Execute($imageResource) |
17 | 17 | { |
@@ -2,9 +2,9 @@ |
||
2 | 2 | namespace CloudControl\Cms\images |
3 | 3 | { |
4 | 4 | |
5 | - use CloudControl\Cms\cc\StringUtil; |
|
5 | + use CloudControl\Cms\cc\StringUtil; |
|
6 | 6 | |
7 | - /** |
|
7 | + /** |
|
8 | 8 | * Class ImageResizer |
9 | 9 | * @package CloudControl\Cms\images |
10 | 10 | */ |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | } |
46 | 46 | return $returnFileNames; |
47 | 47 | } else { |
48 | - throw new \Exception('Image doesnt exist: ' . $imagePath); |
|
48 | + throw new \Exception('Image doesnt exist: '.$imagePath); |
|
49 | 49 | } |
50 | 50 | } |
51 | 51 | |
@@ -56,10 +56,10 @@ discard block |
||
56 | 56 | * @return string |
57 | 57 | * @throws \Exception |
58 | 58 | */ |
59 | - public function resize($imagePath='', $width='',$height='') |
|
59 | + public function resize($imagePath = '', $width = '', $height = '') |
|
60 | 60 | { |
61 | - $modifier = '-r' . $width . 'x' . $height; |
|
62 | - return $this->applyMethod('Resize', $imagePath, $width,$height, $modifier); |
|
61 | + $modifier = '-r'.$width.'x'.$height; |
|
62 | + return $this->applyMethod('Resize', $imagePath, $width, $height, $modifier); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | /** |
@@ -69,10 +69,10 @@ discard block |
||
69 | 69 | * @return string |
70 | 70 | * @throws \Exception |
71 | 71 | */ |
72 | - public function smartcrop($imagePath='', $width='',$height='') |
|
72 | + public function smartcrop($imagePath = '', $width = '', $height = '') |
|
73 | 73 | { |
74 | - $modifier = '-s' . $width . 'x' . $height; |
|
75 | - return $this->applyMethod('SmartCrop', $imagePath, $width,$height, $modifier); |
|
74 | + $modifier = '-s'.$width.'x'.$height; |
|
75 | + return $this->applyMethod('SmartCrop', $imagePath, $width, $height, $modifier); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | /** |
@@ -82,10 +82,10 @@ discard block |
||
82 | 82 | * @return string |
83 | 83 | * @throws \Exception |
84 | 84 | */ |
85 | - public function boxcrop($imagePath='', $width='',$height='') |
|
85 | + public function boxcrop($imagePath = '', $width = '', $height = '') |
|
86 | 86 | { |
87 | - $modifier = '-b' . $width . 'x' . $height; |
|
88 | - return $this->applyMethod('BoxCrop', $imagePath, $width,$height, $modifier); |
|
87 | + $modifier = '-b'.$width.'x'.$height; |
|
88 | + return $this->applyMethod('BoxCrop', $imagePath, $width, $height, $modifier); |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | /** |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | * |
95 | 95 | * @return string |
96 | 96 | */ |
97 | - private function modifyName($imagePath, $modifier='') |
|
97 | + private function modifyName($imagePath, $modifier = '') |
|
98 | 98 | { |
99 | 99 | $filename = basename($imagePath); |
100 | 100 | $path = dirname($imagePath); |
@@ -104,30 +104,30 @@ discard block |
||
104 | 104 | array_pop($fileParts); |
105 | 105 | $fileNameWithoutExtension = implode('-', $fileParts); |
106 | 106 | $fileNameWithoutExtension = StringUtil::slugify($fileNameWithoutExtension); |
107 | - $filename = $fileNameWithoutExtension . $modifier . '.' . $extension; |
|
107 | + $filename = $fileNameWithoutExtension.$modifier.'.'.$extension; |
|
108 | 108 | } else { |
109 | 109 | $filename = StringUtil::slugify($filename); |
110 | 110 | } |
111 | 111 | |
112 | - if (file_exists($path . '/' . $filename)) { |
|
112 | + if (file_exists($path.'/'.$filename)) { |
|
113 | 113 | $fileParts = explode('.', $filename); |
114 | 114 | if (count($fileParts) > 1) { |
115 | 115 | $extension = end($fileParts); |
116 | 116 | array_pop($fileParts); |
117 | 117 | $fileNameWithoutExtension = implode('-', $fileParts); |
118 | 118 | $fileNameWithoutExtension .= '-copy'; |
119 | - $filename = $fileNameWithoutExtension . '.' . $extension; |
|
119 | + $filename = $fileNameWithoutExtension.'.'.$extension; |
|
120 | 120 | } else { |
121 | 121 | $filename .= '-copy'; |
122 | 122 | } |
123 | - return $this->modifyName($path . '/' . $filename); |
|
123 | + return $this->modifyName($path.'/'.$filename); |
|
124 | 124 | } |
125 | - return $path . '/' . $filename; |
|
125 | + return $path.'/'.$filename; |
|
126 | 126 | } |
127 | 127 | |
128 | 128 | private function applyMethod($method, $imagePath, $width, $height, $modifier) |
129 | 129 | { |
130 | - $method = 'CloudControl\Cms\\images\\methods\\' . $method; |
|
130 | + $method = 'CloudControl\Cms\\images\\methods\\'.$method; |
|
131 | 131 | $destination = $this->modifyName($imagePath, $modifier); |
132 | 132 | if (file_exists($imagePath)) { |
133 | 133 | $image = new Image(); |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | $resizedImage->saveImage($destination, $resizedImage->getImageMimeType($imagePath), 80); |
142 | 142 | return basename($destination); |
143 | 143 | } else { |
144 | - throw new \Exception('Image doesnt exist: ' . $imagePath); |
|
144 | + throw new \Exception('Image doesnt exist: '.$imagePath); |
|
145 | 145 | } |
146 | 146 | } |
147 | 147 | } |
@@ -1,10 +1,10 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | namespace CloudControl\Cms\cc |
3 | 3 | { |
4 | - /** |
|
5 | - * Class Request |
|
6 | - * @package CloudControl\Cms\cc |
|
7 | - */ |
|
4 | + /** |
|
5 | + * Class Request |
|
6 | + * @package CloudControl\Cms\cc |
|
7 | + */ |
|
8 | 8 | class Request { |
9 | 9 | |
10 | 10 | /** |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | */ |
46 | 46 | public function __construct() |
47 | 47 | { |
48 | - $rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)) . '/../../') . '/'); |
|
48 | + $rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)) . '/../../') . '/'); |
|
49 | 49 | |
50 | 50 | self::$subfolders = '/' . str_replace('//', '/', str_replace(str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']), "", $rootPath)); |
51 | 51 | self::$subfolders = str_replace('//', '/', self::$subfolders); |
@@ -45,23 +45,23 @@ |
||
45 | 45 | */ |
46 | 46 | public function __construct() |
47 | 47 | { |
48 | - $rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)) . '/../../') . '/'); |
|
48 | + $rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)).'/../../').'/'); |
|
49 | 49 | |
50 | - self::$subfolders = '/' . str_replace('//', '/', str_replace(str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']), "", $rootPath)); |
|
50 | + self::$subfolders = '/'.str_replace('//', '/', str_replace(str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']), "", $rootPath)); |
|
51 | 51 | self::$subfolders = str_replace('//', '/', self::$subfolders); |
52 | 52 | if (PHP_SAPI === 'cli') { |
53 | 53 | global $argv; |
54 | 54 | array_shift($argv); |
55 | 55 | self::$queryString = ''; |
56 | - self::$requestUri = self::$subfolders . implode('/', $argv); |
|
56 | + self::$requestUri = self::$subfolders.implode('/', $argv); |
|
57 | 57 | } else { |
58 | 58 | self::$requestUri = $_SERVER['REQUEST_URI']; |
59 | 59 | self::$queryString = $_SERVER['QUERY_STRING']; |
60 | 60 | } |
61 | 61 | if (self::$subfolders === '/') { |
62 | - self::$relativeUri = str_replace('?' . self::$queryString, '', substr(self::$requestUri,1)); |
|
62 | + self::$relativeUri = str_replace('?'.self::$queryString, '', substr(self::$requestUri, 1)); |
|
63 | 63 | } else { |
64 | - self::$relativeUri = str_replace('?' . self::$queryString, '', str_replace(self::$subfolders, '', self::$requestUri)); |
|
64 | + self::$relativeUri = str_replace('?'.self::$queryString, '', str_replace(self::$subfolders, '', self::$requestUri)); |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | self::$requestParameters = explode('/', self::$relativeUri); |
@@ -2,21 +2,21 @@ discard block |
||
2 | 2 | | THE FOLLOWING ERROR OCCURED | |
3 | 3 | ------------------------------------------------------------------------------------------------------------------------------------------------ |
4 | 4 | |
5 | - <?php echo $message . PHP_EOL; ?> |
|
5 | + <?php echo $message.PHP_EOL; ?> |
|
6 | 6 | |
7 | 7 | ------------------------------------------------------------------------------------------------------------------------------------------------ |
8 | 8 | | IN FILE | |
9 | 9 | ------------------------------------------------------------------------------------------------------------------------------------------------ |
10 | 10 | |
11 | - <?php echo $file . ':' . $line . PHP_EOL; ?> |
|
11 | + <?php echo $file.':'.$line.PHP_EOL; ?> |
|
12 | 12 | |
13 | 13 | ------------------------------------------------------------------------------------------------------------------------------------------------ |
14 | 14 | | CONTENTS OF THE FILE | |
15 | 15 | ------------------------------------------------------------------------------------------------------------------------------------------------ |
16 | 16 | |
17 | 17 | <?php |
18 | -foreach($lines as $nr => $currentLine) { |
|
19 | - echo ($nr == $line ? '* ' : ' ' ) . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine; |
|
18 | +foreach ($lines as $nr => $currentLine) { |
|
19 | + echo ($nr == $line ? '* ' : ' ').str_pad($nr, 3, "0", STR_PAD_LEFT).' '.$currentLine; |
|
20 | 20 | } |
21 | 21 | ?> |
22 | 22 | |
@@ -25,11 +25,11 @@ discard block |
||
25 | 25 | ------------------------------------------------------------------------------------------------------------------------------------------------ |
26 | 26 | |
27 | 27 | <?php |
28 | -foreach($trace as $row) { |
|
29 | - echo (isset($row['file']) ? basename($row['file']) : '') . ':' |
|
30 | - . (isset($row['line']) ? $row['line'] : '') . "\t\t\t" |
|
31 | - . (isset($row['class']) ? $row['class'] : ' ') . "\t\t\t" |
|
32 | - . (isset($row['type']) ? $row['type'] : ' ') . "\t\t\t" |
|
33 | - . (isset($row['function']) ? $row['function'] : ' ') . PHP_EOL; |
|
28 | +foreach ($trace as $row) { |
|
29 | + echo (isset($row['file']) ? basename($row['file']) : '').':' |
|
30 | + . (isset($row['line']) ? $row['line'] : '')."\t\t\t" |
|
31 | + . (isset($row['class']) ? $row['class'] : ' ')."\t\t\t" |
|
32 | + . (isset($row['type']) ? $row['type'] : ' ')."\t\t\t" |
|
33 | + . (isset($row['function']) ? $row['function'] : ' ').PHP_EOL; |
|
34 | 34 | } |
35 | 35 | ?> |
36 | 36 | \ No newline at end of file |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | public static function slugify($str, $replace = array(), $delimiter = '-') |
21 | 21 | { |
22 | 22 | if (!empty($replace)) { |
23 | - $str = str_replace((array)$replace, ' ', $str); |
|
23 | + $str = str_replace((array) $replace, ' ', $str); |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | $clean = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $str); |
@@ -79,13 +79,13 @@ discard block |
||
79 | 79 | public static function humanFileSize($size, $unit = "") |
80 | 80 | { |
81 | 81 | if ((!$unit && $size >= 1 << 30) || $unit == "GB") |
82 | - return number_format($size / (1 << 30), 2) . "GB"; |
|
82 | + return number_format($size / (1 << 30), 2)."GB"; |
|
83 | 83 | if ((!$unit && $size >= 1 << 20) || $unit == "MB") |
84 | - return number_format($size / (1 << 20), 2) . "MB"; |
|
84 | + return number_format($size / (1 << 20), 2)."MB"; |
|
85 | 85 | if ((!$unit && $size >= 1 << 10) || $unit == "KB") |
86 | - return number_format($size / (1 << 10), 2) . "KB"; |
|
86 | + return number_format($size / (1 << 10), 2)."KB"; |
|
87 | 87 | |
88 | - return number_format($size) . " bytes"; |
|
88 | + return number_format($size)." bytes"; |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | /** |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | if ($d >= 1) { |
122 | 122 | $r = round($d); |
123 | 123 | |
124 | - return $r . ' ' . ($r > 1 ? $a_plural[$str] : $str) . ' ago'; |
|
124 | + return $r.' '.($r > 1 ? $a_plural[$str] : $str).' ago'; |
|
125 | 125 | } |
126 | 126 | } |
127 | 127 |
@@ -78,12 +78,15 @@ |
||
78 | 78 | */ |
79 | 79 | public static function humanFileSize($size, $unit = "") |
80 | 80 | { |
81 | - if ((!$unit && $size >= 1 << 30) || $unit == "GB") |
|
82 | - return number_format($size / (1 << 30), 2) . "GB"; |
|
83 | - if ((!$unit && $size >= 1 << 20) || $unit == "MB") |
|
84 | - return number_format($size / (1 << 20), 2) . "MB"; |
|
85 | - if ((!$unit && $size >= 1 << 10) || $unit == "KB") |
|
86 | - return number_format($size / (1 << 10), 2) . "KB"; |
|
81 | + if ((!$unit && $size >= 1 << 30) || $unit == "GB") { |
|
82 | + return number_format($size / (1 << 30), 2) . "GB"; |
|
83 | + } |
|
84 | + if ((!$unit && $size >= 1 << 20) || $unit == "MB") { |
|
85 | + return number_format($size / (1 << 20), 2) . "MB"; |
|
86 | + } |
|
87 | + if ((!$unit && $size >= 1 << 10) || $unit == "KB") { |
|
88 | + return number_format($size / (1 << 10), 2) . "KB"; |
|
89 | + } |
|
87 | 90 | |
88 | 91 | return number_format($size) . " bytes"; |
89 | 92 | } |
@@ -31,26 +31,26 @@ |
||
31 | 31 | <div class="documentActions grid-box-2"> |
32 | 32 | <? if ($document->state == 'unpublished' || $document->unpublishedChanges) : ?> |
33 | 33 | <? renderAction('Publish', |
34 | - 'publish', |
|
35 | - $request::$subfolders . $cmsPrefix . '/documents/publish-document?slug=' . $slugPrefix . $document->slug, |
|
36 | - 'check'); ?> |
|
34 | + 'publish', |
|
35 | + $request::$subfolders . $cmsPrefix . '/documents/publish-document?slug=' . $slugPrefix . $document->slug, |
|
36 | + 'check'); ?> |
|
37 | 37 | <? endif ?> |
38 | 38 | <? if ($document->state == 'published') : ?> |
39 | 39 | <? renderAction('Unpublish', |
40 | - 'unpublish', |
|
41 | - $request::$subfolders . $cmsPrefix . '/documents/unpublish-document?slug=' . $slugPrefix . $document->slug, |
|
42 | - 'times'); ?> |
|
40 | + 'unpublish', |
|
41 | + $request::$subfolders . $cmsPrefix . '/documents/unpublish-document?slug=' . $slugPrefix . $document->slug, |
|
42 | + 'times'); ?> |
|
43 | 43 | <? endif ?> |
44 | 44 | <? renderAction('Edit', |
45 | - '', |
|
46 | - $request::$subfolders . $cmsPrefix . '/documents/edit-document?slug=' . $slugPrefix . $document->slug, |
|
47 | - 'pencil'); ?> |
|
45 | + '', |
|
46 | + $request::$subfolders . $cmsPrefix . '/documents/edit-document?slug=' . $slugPrefix . $document->slug, |
|
47 | + 'pencil'); ?> |
|
48 | 48 | <? if ($document->state == 'unpublished') : ?> |
49 | 49 | <? renderAction('Delete', |
50 | - 'error', |
|
51 | - $request::$subfolders . $cmsPrefix . '/documents/delete-document?slug=' . $slugPrefix . $document->slug, |
|
52 | - 'trash', |
|
53 | - 'return confirm(\'Are you sure you want to delete this document?\');'); ?> |
|
50 | + 'error', |
|
51 | + $request::$subfolders . $cmsPrefix . '/documents/delete-document?slug=' . $slugPrefix . $document->slug, |
|
52 | + 'trash', |
|
53 | + 'return confirm(\'Are you sure you want to delete this document?\');'); ?> |
|
54 | 54 | <? endif ?> |
55 | 55 | </div> |
56 | 56 | <? } ?> |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | { ?> |
10 | 10 | <div class="grid-box-10"> |
11 | 11 | <h3> |
12 | - <a class="btn documentTitle" href="<?= $request::$subfolders ?><?= $cmsPrefix ?>/documents/edit-document?slug=<?= $slugPrefix . $document->slug ?>" title="Edit"> |
|
12 | + <a class="btn documentTitle" href="<?= $request::$subfolders ?><?= $cmsPrefix ?>/documents/edit-document?slug=<?= $slugPrefix.$document->slug ?>" title="Edit"> |
|
13 | 13 | <i class="fa fa-file-text-o"></i> |
14 | 14 | <small class="state <?= strtolower($document->state) ?>"> |
15 | 15 | <i class="fa <?= $document->state == 'published' ? 'fa-check-circle-o' : 'fa-times-circle-o' ?>"></i></small> |
@@ -32,23 +32,23 @@ discard block |
||
32 | 32 | <? if ($document->state == 'unpublished' || $document->unpublishedChanges) : ?> |
33 | 33 | <? renderAction('Publish', |
34 | 34 | 'publish', |
35 | - $request::$subfolders . $cmsPrefix . '/documents/publish-document?slug=' . $slugPrefix . $document->slug, |
|
35 | + $request::$subfolders.$cmsPrefix.'/documents/publish-document?slug='.$slugPrefix.$document->slug, |
|
36 | 36 | 'check'); ?> |
37 | 37 | <? endif ?> |
38 | 38 | <? if ($document->state == 'published') : ?> |
39 | 39 | <? renderAction('Unpublish', |
40 | 40 | 'unpublish', |
41 | - $request::$subfolders . $cmsPrefix . '/documents/unpublish-document?slug=' . $slugPrefix . $document->slug, |
|
41 | + $request::$subfolders.$cmsPrefix.'/documents/unpublish-document?slug='.$slugPrefix.$document->slug, |
|
42 | 42 | 'times'); ?> |
43 | 43 | <? endif ?> |
44 | 44 | <? renderAction('Edit', |
45 | 45 | '', |
46 | - $request::$subfolders . $cmsPrefix . '/documents/edit-document?slug=' . $slugPrefix . $document->slug, |
|
46 | + $request::$subfolders.$cmsPrefix.'/documents/edit-document?slug='.$slugPrefix.$document->slug, |
|
47 | 47 | 'pencil'); ?> |
48 | 48 | <? if ($document->state == 'unpublished') : ?> |
49 | 49 | <? renderAction('Delete', |
50 | 50 | 'error', |
51 | - $request::$subfolders . $cmsPrefix . '/documents/delete-document?slug=' . $slugPrefix . $document->slug, |
|
51 | + $request::$subfolders.$cmsPrefix.'/documents/delete-document?slug='.$slugPrefix.$document->slug, |
|
52 | 52 | 'trash', |
53 | 53 | 'return confirm(\'Are you sure you want to delete this document?\');'); ?> |
54 | 54 | <? endif ?> |
@@ -4,9 +4,9 @@ |
||
4 | 4 | </div> |
5 | 5 | <label><?= $brick->title ?></label> |
6 | 6 | <? if ($static == true) { |
7 | - $fieldPrefix = 'bricks[' . $myBrickSlug . '][' . str_replace('.', '', str_replace(' ', '', microtime())) . '][fields]'; |
|
7 | + $fieldPrefix = 'bricks[' . $myBrickSlug . '][' . str_replace('.', '', str_replace(' ', '', microtime())) . '][fields]'; |
|
8 | 8 | } else { |
9 | - $fieldPrefix = 'dynamicBricks[' . $brick->slug . '][' . str_replace('.', '', str_replace(' ', '', microtime())) . ']'; |
|
9 | + $fieldPrefix = 'dynamicBricks[' . $brick->slug . '][' . str_replace('.', '', str_replace(' ', '', microtime())) . ']'; |
|
10 | 10 | } ?> |
11 | 11 | <? foreach ($brick->fields as $field) : ?> |
12 | 12 | <div class="form-element"> |
@@ -4,9 +4,9 @@ discard block |
||
4 | 4 | </div> |
5 | 5 | <label><?= $brick->title ?></label> |
6 | 6 | <? if ($static == true) { |
7 | - $fieldPrefix = 'bricks[' . $myBrickSlug . '][' . str_replace('.', '', str_replace(' ', '', microtime())) . '][fields]'; |
|
7 | + $fieldPrefix = 'bricks['.$myBrickSlug.']['.str_replace('.', '', str_replace(' ', '', microtime())).'][fields]'; |
|
8 | 8 | } else { |
9 | - $fieldPrefix = 'dynamicBricks[' . $brick->slug . '][' . str_replace('.', '', str_replace(' ', '', microtime())) . ']'; |
|
9 | + $fieldPrefix = 'dynamicBricks['.$brick->slug.']['.str_replace('.', '', str_replace(' ', '', microtime())).']'; |
|
10 | 10 | } ?> |
11 | 11 | <? foreach ($brick->fields as $field) : ?> |
12 | 12 | <div class="form-element"> |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | <a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a> |
32 | 32 | <div class="form-element"> |
33 | 33 | <? endif ?> |
34 | - <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?> |
|
34 | + <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?> |
|
35 | 35 | <? if ($field->multiple == true && $field->type != 'Rich Text') : ?> |
36 | 36 | |
37 | 37 | </div> |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | <li class="grid-container"> |
54 | 54 | <div class="grid-box-10"> |
55 | 55 | <div class="grid-inner form-element"> |
56 | - <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?> |
|
56 | + <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?> |
|
57 | 57 | </div> |
58 | 58 | </div> |
59 | 59 | <div class="grid-box-2"> |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | </div> |
64 | 64 | </div> |
65 | 65 | </li> |
66 | - <?$value='';?> |
|
66 | + <?$value = ''; ?> |
|
67 | 67 | <? endforeach ?> |
68 | 68 | <? endif ?> |
69 | 69 | </ul> |
@@ -80,10 +80,10 @@ discard block |
||
80 | 80 | <a class="btn error js-deletemultiple"><i class="fa fa-trash"></i></a> |
81 | 81 | <a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a> |
82 | 82 | <div class="form-element"> |
83 | - <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?> |
|
83 | + <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?> |
|
84 | 84 | </div> |
85 | 85 | </li> |
86 | - <?$value='';?> |
|
86 | + <?$value = ''; ?> |
|
87 | 87 | <? endforeach ?> |
88 | 88 | <? endif ?> |
89 | 89 | </div> |
@@ -92,5 +92,5 @@ discard block |
||
92 | 92 | <a class="btn js-addrtemultiple">+</a> |
93 | 93 | <? endif ?> |
94 | 94 | </div> |
95 | - <?$value='';?> |
|
95 | + <?$value = ''; ?> |
|
96 | 96 | <? endforeach ?> |
@@ -9,8 +9,10 @@ |
||
9 | 9 | <? if (isset($dynamicBrick)) : |
10 | 10 | $fieldSlug = $field->slug; |
11 | 11 | $value = isset($dynamicBrick->fields->$fieldSlug) ? current($dynamicBrick->fields->$fieldSlug) : ''; |
12 | - else : |
|
12 | + else { |
|
13 | + : |
|
13 | 14 | $value = ''; |
15 | + } |
|
14 | 16 | endif ?> |
15 | 17 | <? if ($field->multiple == true && $field->type != 'Rich Text') : ?> |
16 | 18 | <ul class="grid-wrapper sortable"> |
@@ -1,4 +1,4 @@ discard block |
||
1 | -<form method="<?= isset($documentType) ? 'post' : 'get' ?>" onsubmit="return processRtes();" action="<?= isset($formId) ? '#' . $formId : '' ?>"> |
|
1 | +<form method="<?= isset($documentType) ? 'post' : 'get' ?>" onsubmit="return processRtes();" action="<?= isset($formId) ? '#'.$formId : '' ?>"> |
|
2 | 2 | <? if (!isset($hideTitleAndState)) : ?> |
3 | 3 | <input type="hidden" name="path" value="<?= $request::$get['path'] ?>"/> |
4 | 4 | <? else : ?> |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | <input required="required" value="<?=isset($document) ? $document->title : '' ?>" type="text" id="title" name="title" placeholder="Title" /> |
18 | 18 | </div> |
19 | 19 | <? endif ?> |
20 | - <?$fieldPrefix='fields';?> |
|
20 | + <?$fieldPrefix = 'fields'; ?> |
|
21 | 21 | <? foreach ($documentType->fields as $field) : ?> |
22 | 22 | <div class="form-element"> |
23 | 23 | <label for="<?=$field->slug?>"><?=$field->title?></label> |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | <a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a> |
42 | 42 | <div class="form-element"> |
43 | 43 | <? endif ?> |
44 | - <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?> |
|
44 | + <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?> |
|
45 | 45 | <? if ($field->multiple == true && $field->type != 'Rich Text') : ?> |
46 | 46 | |
47 | 47 | </div> |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | <li class="grid-container"> |
64 | 64 | <div class="grid-box-10"> |
65 | 65 | <div class="grid-inner form-element"> |
66 | - <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?> |
|
66 | + <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?> |
|
67 | 67 | </div> |
68 | 68 | </div> |
69 | 69 | <div class="grid-box-2"> |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | </div> |
74 | 74 | </div> |
75 | 75 | </li> |
76 | - <?$value='';?> |
|
76 | + <?$value = ''; ?> |
|
77 | 77 | <? endforeach ?> |
78 | 78 | <? endif ?> |
79 | 79 | </ul> |
@@ -90,10 +90,10 @@ discard block |
||
90 | 90 | <a class="btn error js-deletemultiple"><i class="fa fa-trash"></i></a> |
91 | 91 | <a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a> |
92 | 92 | <div class="form-element"> |
93 | - <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?> |
|
93 | + <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?> |
|
94 | 94 | </div> |
95 | 95 | </li> |
96 | - <?$value='';?> |
|
96 | + <?$value = ''; ?> |
|
97 | 97 | <? endforeach ?> |
98 | 98 | <? endif ?> |
99 | 99 | </div> |
@@ -102,17 +102,17 @@ discard block |
||
102 | 102 | <a class="btn js-addrtemultiple">+</a> |
103 | 103 | <? endif ?> |
104 | 104 | </div> |
105 | - <?$value='';?> |
|
105 | + <?$value = ''; ?> |
|
106 | 106 | <? endforeach ?> |
107 | 107 | <hr /> |
108 | - <? $static_brick_nr = 0;?> |
|
108 | + <? $static_brick_nr = 0; ?> |
|
109 | 109 | <? foreach ($documentType->bricks as $brick) : ?> |
110 | 110 | <div class="brick"> |
111 | 111 | <label><?=$brick->title?></label> |
112 | 112 | <? if ($brick->multiple == 'true') : ?> |
113 | 113 | <input type="hidden" value="<?=$brick->brickSlug?>"/> |
114 | 114 | <input type="hidden" value="<?=$brick->slug?>"/> |
115 | - <?$myBrickSlug=$brick->slug;?> |
|
115 | + <?$myBrickSlug = $brick->slug; ?> |
|
116 | 116 | <ul id="newBrickDropzone_<?=$static_brick_nr?>" class="dynamicBricks sortable"> |
117 | 117 | <? if (isset($document)) : ?> |
118 | 118 | <? foreach ($document->bricks as $currentBrickSlug => $brickArray) : ?> |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | <li class="brick form-element"> |
127 | 127 | |
128 | 128 | <?$static = true; ?> |
129 | - <?include(__DIR__ . '/brick.php')?> |
|
129 | + <?include(__DIR__.'/brick.php')?> |
|
130 | 130 | </li> |
131 | 131 | <? endif ?> |
132 | 132 | <? endforeach ?> |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | <a class="btn" onclick="addDynamicBrick(this, 'true', 'newBrickDropzone_<?=$static_brick_nr?>');">+</a> |
137 | 137 | <?$static_brick_nr += 1?> |
138 | 138 | <? else : ?> |
139 | - <?$fieldPrefix='bricks[' . $brick->slug . '][fields]';?> |
|
139 | + <?$fieldPrefix = 'bricks['.$brick->slug.'][fields]'; ?> |
|
140 | 140 | <input type="hidden" name="bricks[<?=$brick->slug?>][type]" value="<?=$brick->brickSlug?>" /> |
141 | 141 | <? foreach ($brick->structure->fields as $field) : ?> |
142 | 142 | <div class="form-element"> |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | <a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a> |
163 | 163 | <div class="form-element"> |
164 | 164 | <? endif ?> |
165 | - <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?> |
|
165 | + <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?> |
|
166 | 166 | <? if ($field->multiple == true && $field->type != 'Rich Text') : ?> |
167 | 167 | |
168 | 168 | </div> |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | <li class="grid-container"> |
186 | 186 | <div class="grid-box-10"> |
187 | 187 | <div class="grid-inner form-element"> |
188 | - <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?> |
|
188 | + <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?> |
|
189 | 189 | </div> |
190 | 190 | </div> |
191 | 191 | <div class="grid-box-2"> |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | </div> |
196 | 196 | </div> |
197 | 197 | </li> |
198 | - <?$value='';?> |
|
198 | + <?$value = ''; ?> |
|
199 | 199 | <? endforeach ?> |
200 | 200 | <? endif ?> |
201 | 201 | </ul> |
@@ -213,10 +213,10 @@ discard block |
||
213 | 213 | <a class="btn error js-deletemultiple"><i class="fa fa-trash"></i></a> |
214 | 214 | <a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a> |
215 | 215 | <div class="form-element"> |
216 | - <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?> |
|
216 | + <? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?> |
|
217 | 217 | </div> |
218 | 218 | </li> |
219 | - <?$value='';?> |
|
219 | + <?$value = ''; ?> |
|
220 | 220 | <? endforeach ?> |
221 | 221 | <? endif ?> |
222 | 222 | </div> |
@@ -225,12 +225,12 @@ discard block |
||
225 | 225 | <a class="btn js-addrtemultiple">+</a> |
226 | 226 | <? endif ?> |
227 | 227 | </div> |
228 | - <?$value='';?> |
|
228 | + <?$value = ''; ?> |
|
229 | 229 | <? endforeach ?> |
230 | 230 | <? endif ?> |
231 | 231 | </div> |
232 | 232 | <hr /> |
233 | - <? endforeach;?> |
|
233 | + <? endforeach; ?> |
|
234 | 234 | |
235 | 235 | |
236 | 236 | |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | <li class="brick form-element"> |
254 | 254 | <label><?=$brick->title?></label> |
255 | 255 | <?$static = false; ?> |
256 | - <?include(__DIR__ . '/brick.php')?> |
|
256 | + <?include(__DIR__.'/brick.php')?> |
|
257 | 257 | </li> |
258 | 258 | <? endforeach ?> |
259 | 259 | <? endif ?> |
@@ -1,7 +1,8 @@ discard block |
||
1 | 1 | <form method="<?= isset($documentType) ? 'post' : 'get' ?>" onsubmit="return processRtes();" action="<?= isset($formId) ? '#' . $formId : '' ?>"> |
2 | 2 | <? if (!isset($hideTitleAndState)) : ?> |
3 | 3 | <input type="hidden" name="path" value="<?= $request::$get['path'] ?>"/> |
4 | - <? else : ?> |
|
4 | + <? else { |
|
5 | + : ?> |
|
5 | 6 | <input type="hidden" name="formId" value="<?= $formId ?>"/> |
6 | 7 | <a name="<?= $formId ?>"></a> |
7 | 8 | <? endif ?> |
@@ -17,15 +18,19 @@ discard block |
||
17 | 18 | <input required="required" value="<?=isset($document) ? $document->title : '' ?>" type="text" id="title" name="title" placeholder="Title" /> |
18 | 19 | </div> |
19 | 20 | <? endif ?> |
20 | - <?$fieldPrefix='fields';?> |
|
21 | + <?$fieldPrefix='fields'; |
|
22 | +} |
|
23 | +?> |
|
21 | 24 | <? foreach ($documentType->fields as $field) : ?> |
22 | 25 | <div class="form-element"> |
23 | 26 | <label for="<?=$field->slug?>"><?=$field->title?></label> |
24 | 27 | <? if (isset($document)) : |
25 | 28 | $fieldSlug = $field->slug; |
26 | 29 | $value = isset($document->fields->$fieldSlug) ? current($document->fields->$fieldSlug) : ''; |
27 | - else : |
|
30 | + else { |
|
31 | + : |
|
28 | 32 | $value = ''; |
33 | + } |
|
29 | 34 | endif ?> |
30 | 35 | <? if ($field->multiple == true && $field->type != 'Rich Text') : ?> |
31 | 36 | <ul class="grid-wrapper sortable"> |
@@ -135,8 +140,11 @@ discard block |
||
135 | 140 | </ul> |
136 | 141 | <a class="btn" onclick="addDynamicBrick(this, 'true', 'newBrickDropzone_<?=$static_brick_nr?>');">+</a> |
137 | 142 | <?$static_brick_nr += 1?> |
138 | - <? else : ?> |
|
139 | - <?$fieldPrefix='bricks[' . $brick->slug . '][fields]';?> |
|
143 | + <? else { |
|
144 | + : ?> |
|
145 | + <?$fieldPrefix='bricks[' . $brick->slug . '][fields]'; |
|
146 | +} |
|
147 | +?> |
|
140 | 148 | <input type="hidden" name="bricks[<?=$brick->slug?>][type]" value="<?=$brick->brickSlug?>" /> |
141 | 149 | <? foreach ($brick->structure->fields as $field) : ?> |
142 | 150 | <div class="form-element"> |
@@ -145,8 +153,10 @@ discard block |
||
145 | 153 | $brickSlug = $brick->slug; |
146 | 154 | $fieldSlug = $field->slug; |
147 | 155 | $value = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? current($document->bricks->$brickSlug->fields->$fieldSlug) : ''; |
148 | - else : |
|
156 | + else { |
|
157 | + : |
|
149 | 158 | $value = ''; |
159 | + } |
|
150 | 160 | endif ?> |
151 | 161 | <? if ($field->multiple == true && $field->type != 'Rich Text') : ?> |
152 | 162 | <ul class="grid-wrapper sortable"> |
@@ -2,7 +2,7 @@ |
||
2 | 2 | <div class="grid-container"> |
3 | 3 | <div class="grid-box-2"> |
4 | 4 | <div class="grid-inner"> |
5 | - <div<?= isset($value) ? ' style="background-image:url(\'' . $request::$subfolders . 'images/' . $value . '\');"' : '' ?> class="selected-image" id="<?= $field->slug ?>_selectedImage"></div> |
|
5 | + <div<?= isset($value) ? ' style="background-image:url(\''.$request::$subfolders.'images/'.$value.'\');"' : '' ?> class="selected-image" id="<?= $field->slug ?>_selectedImage"></div> |
|
6 | 6 | </div> |
7 | 7 | </div> |
8 | 8 | <div class="grid-box-10"> |