@@ -155,8 +155,8 @@ discard block |
||
155 | 155 | * @param string $id 다국어 key |
156 | 156 | * @param array $parameters 인자 |
157 | 157 | * @param null $domain domain |
158 | - * @param null $locale locale |
|
159 | - * @return mixed |
|
158 | + * @param string $locale locale |
|
159 | + * @return string |
|
160 | 160 | */ |
161 | 161 | public function trans($id, array $parameters = array(), $domain = null, $locale = null) |
162 | 162 | { |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | * @param array $parameters 인자 |
202 | 202 | * @param null $domain domain |
203 | 203 | * @param null $locale locale |
204 | - * @return mixed |
|
204 | + * @return string |
|
205 | 205 | */ |
206 | 206 | public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null) |
207 | 207 | { |
@@ -219,8 +219,8 @@ discard block |
||
219 | 219 | * |
220 | 220 | * @param string $key 다국어 key |
221 | 221 | * @param array $replace 변경 데이터 |
222 | - * @param null $locale 로케일 |
|
223 | - * @return mixed |
|
222 | + * @param null|string $locale 로케일 |
|
223 | + * @return string |
|
224 | 224 | */ |
225 | 225 | public function get($key, array $replace = [], $locale = null) |
226 | 226 | { |
@@ -242,7 +242,7 @@ discard block |
||
242 | 242 | * @param int $number 숫자 |
243 | 243 | * @param array $replace 변경 데이터 |
244 | 244 | * @param null $locale 로케일 |
245 | - * @return mixed |
|
245 | + * @return string |
|
246 | 246 | */ |
247 | 247 | public function choice($key, $number, array $replace = [], $locale = null) |
248 | 248 | { |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | |
256 | 256 | /** |
257 | 257 | * @param string $key 다국어 key |
258 | - * @return mixed |
|
258 | + * @return string |
|
259 | 259 | */ |
260 | 260 | public function getOriginalLine($key) |
261 | 261 | { |
@@ -268,7 +268,7 @@ discard block |
||
268 | 268 | * @param string $item 아이템 |
269 | 269 | * @param string $locale 로케일 |
270 | 270 | * @param array $replace 변경 데이터 |
271 | - * @return mixed |
|
271 | + * @return string |
|
272 | 272 | */ |
273 | 273 | protected function getLine($namespace, $item, $locale, array $replace) |
274 | 274 | { |
@@ -282,7 +282,7 @@ discard block |
||
282 | 282 | * |
283 | 283 | * @param string $line 원시 라인 |
284 | 284 | * @param array $replace 변경 데이터 |
285 | - * @return mixed |
|
285 | + * @return string |
|
286 | 286 | */ |
287 | 287 | protected function makeReplacements($line, array $replace) |
288 | 288 | { |
@@ -302,7 +302,7 @@ discard block |
||
302 | 302 | * 먼저 해석하여 정확도를 높여줍니다. |
303 | 303 | * |
304 | 304 | * @param array $replace 변경 데이터 |
305 | - * @return array |
|
305 | + * @return Collection |
|
306 | 306 | */ |
307 | 307 | protected function sortReplacements(array $replace) |
308 | 308 | { |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | return $id; |
182 | 182 | } |
183 | 183 | |
184 | - $userKeyHead = $this->userKeyPrefix . '::'; |
|
184 | + $userKeyHead = $this->userKeyPrefix.'::'; |
|
185 | 185 | if (substr($id, 0, strlen($userKeyHead)) == $userKeyHead) { |
186 | 186 | return ''; |
187 | 187 | } |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | $sentence = $this->choice($id, $number, $parameters, $locale); |
209 | 209 | |
210 | 210 | if ($sentence == $id) { |
211 | - return $number . ' ' . $this->makeUnknownSentence($id); |
|
211 | + return $number.' '.$this->makeUnknownSentence($id); |
|
212 | 212 | } |
213 | 213 | |
214 | 214 | return $sentence; |
@@ -306,7 +306,7 @@ discard block |
||
306 | 306 | */ |
307 | 307 | protected function sortReplacements(array $replace) |
308 | 308 | { |
309 | - return (new Collection($replace))->sortBy(function ($value, $key) { |
|
309 | + return (new Collection($replace))->sortBy(function($value, $key) { |
|
310 | 310 | return mb_strlen($key) * -1; |
311 | 311 | }); |
312 | 312 | } |
@@ -361,7 +361,7 @@ discard block |
||
361 | 361 | */ |
362 | 362 | public function getSelector() |
363 | 363 | { |
364 | - if (! isset($this->selector)) { |
|
364 | + if (!isset($this->selector)) { |
|
365 | 365 | $this->selector = new MessageSelector; |
366 | 366 | } |
367 | 367 | |
@@ -375,7 +375,7 @@ discard block |
||
375 | 375 | */ |
376 | 376 | public function genUserKey() |
377 | 377 | { |
378 | - return $this->userKeyPrefix . '::' . $this->keyGen->generate(); |
|
378 | + return $this->userKeyPrefix.'::'.$this->keyGen->generate(); |
|
379 | 379 | } |
380 | 380 | |
381 | 381 | /** |
@@ -64,6 +64,9 @@ |
||
64 | 64 | } |
65 | 65 | } |
66 | 66 | |
67 | + /** |
|
68 | + * @param AbstractUIObject $content |
|
69 | + */ |
|
67 | 70 | private function generateBox($title, $content) |
68 | 71 | { |
69 | 72 | return "<div class=\"form-group\"> |
@@ -3,7 +3,6 @@ |
||
3 | 3 | use XeFrontend; |
4 | 4 | use Xpressengine\Permission\Grant; |
5 | 5 | use Xpressengine\Permission\Permission; |
6 | -use Xpressengine\Permission\PermissionHandler; |
|
7 | 6 | use Xpressengine\UIObject\AbstractUIObject; |
8 | 7 | |
9 | 8 | class SettingsPermission extends AbstractUIObject |
@@ -58,8 +58,8 @@ discard block |
||
58 | 58 | { |
59 | 59 | $config = $this->config; |
60 | 60 | $boolean = ''; |
61 | - if (isset($args[$config->get('id') . 'Boolean'])) { |
|
62 | - $boolean = $args[$config->get('id') . 'Boolean']; |
|
61 | + if (isset($args[$config->get('id').'Boolean'])) { |
|
62 | + $boolean = $args[$config->get('id').'Boolean']; |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | return View::make('dynamicField/boolean/default/edit', [ |
@@ -79,8 +79,8 @@ discard block |
||
79 | 79 | { |
80 | 80 | $config = $this->config; |
81 | 81 | $boolean = ''; |
82 | - if (isset($args[$config->get('id') . 'Boolean'])) { |
|
83 | - $boolean = $args[$config->get('id') . 'Boolean']; |
|
82 | + if (isset($args[$config->get('id').'Boolean'])) { |
|
83 | + $boolean = $args[$config->get('id').'Boolean']; |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | return View::make('dynamicField/boolean/default/show', [ |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | |
25 | 25 | public function settings(ConfigEntity $config = null) |
26 | 26 | { |
27 | - return View::make('dynamicField/number/default/createSkin', ['config' => $config,])->render(); |
|
27 | + return View::make('dynamicField/number/default/createSkin', ['config' => $config, ])->render(); |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | public function create(array $inputs) |
@@ -39,8 +39,8 @@ discard block |
||
39 | 39 | { |
40 | 40 | $config = $this->config; |
41 | 41 | $num = ''; |
42 | - if (isset($args[$config->get('id') . 'Num'])) { |
|
43 | - $num = $args[$config->get('id') . 'Num']; |
|
42 | + if (isset($args[$config->get('id').'Num'])) { |
|
43 | + $num = $args[$config->get('id').'Num']; |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | |
@@ -54,8 +54,8 @@ discard block |
||
54 | 54 | { |
55 | 55 | $config = $this->config; |
56 | 56 | $num = ''; |
57 | - if (isset($args[$config->get('id') . 'Num'])) { |
|
58 | - $num = $args[$config->get('id') . 'Num']; |
|
57 | + if (isset($args[$config->get('id').'Num'])) { |
|
58 | + $num = $args[$config->get('id').'Num']; |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | return View::make('dynamicField/number/default/show', [ |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | |
28 | 28 | public function settings(ConfigEntity $config = null) |
29 | 29 | { |
30 | - return View::make('dynamicField/category/beforeTitle/createSkin', ['config' => $config,])->render(); |
|
30 | + return View::make('dynamicField/category/beforeTitle/createSkin', ['config' => $config, ])->render(); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | public function create(array $inputs) |
@@ -49,8 +49,8 @@ discard block |
||
49 | 49 | $items = Category::progenitors($category); |
50 | 50 | |
51 | 51 | $itemId = ''; |
52 | - if (isset($args[$config->get('id') . 'ItemId'])) { |
|
53 | - $itemId = $args[$config->get('id') . 'ItemId']; |
|
52 | + if (isset($args[$config->get('id').'ItemId'])) { |
|
53 | + $itemId = $args[$config->get('id').'ItemId']; |
|
54 | 54 | } |
55 | 55 | |
56 | 56 | return View::make('dynamicField/category/beforeTitle/edit', [ |
@@ -64,8 +64,8 @@ discard block |
||
64 | 64 | { |
65 | 65 | $config = $this->config; |
66 | 66 | $item = ''; |
67 | - if (isset($args[$config->get('id') . 'ItemId'])) { |
|
68 | - $itemId = $args[$config->get('id') . 'ItemId']; |
|
67 | + if (isset($args[$config->get('id').'ItemId'])) { |
|
68 | + $itemId = $args[$config->get('id').'ItemId']; |
|
69 | 69 | $item = Category::getItem($itemId); |
70 | 70 | } |
71 | 71 |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | |
28 | 28 | public function settings(ConfigEntity $config = null) |
29 | 29 | { |
30 | - return View::make('dynamicField/category/afterTitle/createSkin', ['config' => $config,])->render(); |
|
30 | + return View::make('dynamicField/category/afterTitle/createSkin', ['config' => $config, ])->render(); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | public function create(array $inputs) |
@@ -49,8 +49,8 @@ discard block |
||
49 | 49 | $items = Category::progenitors($category); |
50 | 50 | |
51 | 51 | $itemId = ''; |
52 | - if (isset($args[$config->get('id') . 'ItemId'])) { |
|
53 | - $itemId = $args[$config->get('id') . 'ItemId']; |
|
52 | + if (isset($args[$config->get('id').'ItemId'])) { |
|
53 | + $itemId = $args[$config->get('id').'ItemId']; |
|
54 | 54 | } |
55 | 55 | |
56 | 56 | return View::make('dynamicField/category/afterTitle/edit', [ |
@@ -64,8 +64,8 @@ discard block |
||
64 | 64 | { |
65 | 65 | $config = $this->config; |
66 | 66 | $item = ''; |
67 | - if (isset($args[$config->get('id') . 'ItemId'])) { |
|
68 | - $itemId = $args[$config->get('id') . 'ItemId']; |
|
67 | + if (isset($args[$config->get('id').'ItemId'])) { |
|
68 | + $itemId = $args[$config->get('id').'ItemId']; |
|
69 | 69 | $item = Category::getItem($itemId); |
70 | 70 | } |
71 | 71 |
@@ -59,8 +59,8 @@ discard block |
||
59 | 59 | { |
60 | 60 | $config = $this->config; |
61 | 61 | $text = ''; |
62 | - if (isset($args[$config->get('id') . 'Text'])) { |
|
63 | - $text = $args[$config->get('id') . 'Text']; |
|
62 | + if (isset($args[$config->get('id').'Text'])) { |
|
63 | + $text = $args[$config->get('id').'Text']; |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | return View::make('dynamicField/text/default/edit', [ |
@@ -80,8 +80,8 @@ discard block |
||
80 | 80 | { |
81 | 81 | $config = $this->config; |
82 | 82 | $text = ''; |
83 | - if (isset($args[$config->get('id') . 'Text'])) { |
|
84 | - $text = $args[$config->get('id') . 'Text']; |
|
83 | + if (isset($args[$config->get('id').'Text'])) { |
|
84 | + $text = $args[$config->get('id').'Text']; |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | return View::make('dynamicField/text/default/show', [ |
@@ -52,7 +52,7 @@ |
||
52 | 52 | |
53 | 53 | $headString = []; |
54 | 54 | $headString[] = "<ul>"; |
55 | - $headString[] = "<li data-jstree='{$treeOption}' id='{$menu->id}' node='{$menu->id}'>" . $menu->title; |
|
55 | + $headString[] = "<li data-jstree='{$treeOption}' id='{$menu->id}' node='{$menu->id}'>".$menu->title; |
|
56 | 56 | $headString[] = "<div class='action'>"; |
57 | 57 | |
58 | 58 | $headString[] = sprintf('<a href="/manage/menu/selectItemType/%s" onclick="javascript:appendItem(\'%s\')"><i class="fa fa-plus"></i></a>', |
@@ -28,13 +28,13 @@ |
||
28 | 28 | $nameGlobal = array_get($args, 'name'); |
29 | 29 | |
30 | 30 | $labelText = array_get($args, 'label'); |
31 | - if($labelText !== null) { |
|
31 | + if ($labelText !== null) { |
|
32 | 32 | $label->removeClass('hidden')->html($labelText); |
33 | 33 | } |
34 | 34 | |
35 | 35 | // checkbox가 따로 있을 경우 |
36 | - if($checkboxes !== null) { |
|
37 | - foreach((array) $checkboxes as $arg){ |
|
36 | + if ($checkboxes !== null) { |
|
37 | + foreach ((array) $checkboxes as $arg) { |
|
38 | 38 | $checkboxObj = PhpQuery::pq( |
39 | 39 | "<label class=\"checkbox-inline\"><input type=\"checkbox\"><span></span></label>" |
40 | 40 | ); |