@@ -89,20 +89,20 @@ discard block |
||
89 | 89 | $max = count($Blocks); |
90 | 90 | for ($i = 0; $i < $max; $i++) { |
91 | 91 | // block_id が取得できない場合は INSERT しない |
92 | - if (!isset($data['id_' . $i])) { |
|
92 | + if (!isset($data['id_'.$i])) { |
|
93 | 93 | continue; |
94 | 94 | } |
95 | 95 | // 未使用は INSERT しない |
96 | - if ($data['target_id_' . $i] == \Eccube\Entity\PageLayout::TARGET_ID_UNUSED) { |
|
96 | + if ($data['target_id_'.$i] == \Eccube\Entity\PageLayout::TARGET_ID_UNUSED) { |
|
97 | 97 | continue; |
98 | 98 | } |
99 | 99 | // 他のページに anywhere が存在する場合は INSERT しない |
100 | - $anywhere = (isset($data['anywhere_' . $i]) && $data['anywhere_' . $i] == 1) ? 1 : 0; |
|
101 | - if (isset($data['anywhere_' . $i]) && $data['anywhere_' . $i] == 1) { |
|
100 | + $anywhere = (isset($data['anywhere_'.$i]) && $data['anywhere_'.$i] == 1) ? 1 : 0; |
|
101 | + if (isset($data['anywhere_'.$i]) && $data['anywhere_'.$i] == 1) { |
|
102 | 102 | $Other = $app['orm.em']->getRepository('Eccube\Entity\BlockPosition') |
103 | 103 | ->findBy(array( |
104 | 104 | 'anywhere' => 1, |
105 | - 'block_id' => $data['id_' . $i], |
|
105 | + 'block_id' => $data['id_'.$i], |
|
106 | 106 | )); |
107 | 107 | if (count($Other) > 0) { |
108 | 108 | continue; |
@@ -112,14 +112,14 @@ discard block |
||
112 | 112 | $BlockPosition = new \Eccube\Entity\BlockPosition(); |
113 | 113 | $Block = $app['orm.em']->getRepository('Eccube\Entity\Block') |
114 | 114 | ->findOneBy(array( |
115 | - 'id' => $data['id_' . $i], |
|
115 | + 'id' => $data['id_'.$i], |
|
116 | 116 | 'DeviceType' => $DeviceType, |
117 | 117 | )); |
118 | 118 | $BlockPosition |
119 | 119 | ->setPageId($id) |
120 | - ->setBlockId($data['id_' . $i]) |
|
121 | - ->setBlockRow($data['top_' . $i]) |
|
122 | - ->setTargetId($data['target_id_' . $i]) |
|
120 | + ->setBlockId($data['id_'.$i]) |
|
121 | + ->setBlockRow($data['top_'.$i]) |
|
122 | + ->setTargetId($data['target_id_'.$i]) |
|
123 | 123 | ->setBlock($Block) |
124 | 124 | ->setPageLayout($TargetPageLayout) |
125 | 125 | ->setAnywhere($anywhere); |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | $em->getConfiguration()->setSQLLogger(null); |
172 | 172 | |
173 | 173 | $response = new StreamedResponse(); |
174 | - $response->setCallback(function () use ($app, $request) { |
|
174 | + $response->setCallback(function() use ($app, $request) { |
|
175 | 175 | |
176 | 176 | // CSV種別を元に初期化. |
177 | 177 | $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_CUSTOMER); |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | |
186 | 186 | // データ行の出力. |
187 | 187 | $app['eccube.service.csv.export']->setExportQueryBuilder($qb); |
188 | - $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) { |
|
188 | + $app['eccube.service.csv.export']->exportData(function($entity, $csvService) { |
|
189 | 189 | |
190 | 190 | $Csvs = $csvService->getCsvs(); |
191 | 191 | |
@@ -207,9 +207,9 @@ discard block |
||
207 | 207 | }); |
208 | 208 | |
209 | 209 | $now = new \DateTime(); |
210 | - $filename = 'customer_' . $now->format('YmdHis') . '.csv'; |
|
210 | + $filename = 'customer_'.$now->format('YmdHis').'.csv'; |
|
211 | 211 | $response->headers->set('Content-Type', 'application/octet-stream'); |
212 | - $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename); |
|
212 | + $response->headers->set('Content-Disposition', 'attachment; filename='.$filename); |
|
213 | 213 | $response->send(); |
214 | 214 | |
215 | 215 | return $response; |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | $em->getConfiguration()->setSQLLogger(null); |
185 | 185 | |
186 | 186 | $response = new StreamedResponse(); |
187 | - $response->setCallback(function () use ($app, $request) { |
|
187 | + $response->setCallback(function() use ($app, $request) { |
|
188 | 188 | |
189 | 189 | // CSV種別を元に初期化. |
190 | 190 | $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_ORDER); |
@@ -198,7 +198,7 @@ discard block |
||
198 | 198 | |
199 | 199 | // データ行の出力. |
200 | 200 | $app['eccube.service.csv.export']->setExportQueryBuilder($qb); |
201 | - $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) { |
|
201 | + $app['eccube.service.csv.export']->exportData(function($entity, $csvService) { |
|
202 | 202 | |
203 | 203 | $Csvs = $csvService->getCsvs(); |
204 | 204 | |
@@ -228,9 +228,9 @@ discard block |
||
228 | 228 | }); |
229 | 229 | |
230 | 230 | $now = new \DateTime(); |
231 | - $filename = 'order_' . $now->format('YmdHis') . '.csv'; |
|
231 | + $filename = 'order_'.$now->format('YmdHis').'.csv'; |
|
232 | 232 | $response->headers->set('Content-Type', 'application/octet-stream'); |
233 | - $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename); |
|
233 | + $response->headers->set('Content-Disposition', 'attachment; filename='.$filename); |
|
234 | 234 | $response->send(); |
235 | 235 | |
236 | 236 | return $response; |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | $em->getConfiguration()->setSQLLogger(null); |
254 | 254 | |
255 | 255 | $response = new StreamedResponse(); |
256 | - $response->setCallback(function () use ($app, $request) { |
|
256 | + $response->setCallback(function() use ($app, $request) { |
|
257 | 257 | |
258 | 258 | // CSV種別を元に初期化. |
259 | 259 | $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_SHIPPING); |
@@ -267,7 +267,7 @@ discard block |
||
267 | 267 | |
268 | 268 | // データ行の出力. |
269 | 269 | $app['eccube.service.csv.export']->setExportQueryBuilder($qb); |
270 | - $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) { |
|
270 | + $app['eccube.service.csv.export']->exportData(function($entity, $csvService) { |
|
271 | 271 | |
272 | 272 | $Csvs = $csvService->getCsvs(); |
273 | 273 | |
@@ -305,9 +305,9 @@ discard block |
||
305 | 305 | }); |
306 | 306 | |
307 | 307 | $now = new \DateTime(); |
308 | - $filename = 'shipping_' . $now->format('YmdHis') . '.csv'; |
|
308 | + $filename = 'shipping_'.$now->format('YmdHis').'.csv'; |
|
309 | 309 | $response->headers->set('Content-Type', 'application/octet-stream'); |
310 | - $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename); |
|
310 | + $response->headers->set('Content-Disposition', 'attachment; filename='.$filename); |
|
311 | 311 | $response->send(); |
312 | 312 | |
313 | 313 | return $response; |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | $em->getConfiguration()->setSQLLogger(null); |
165 | 165 | |
166 | 166 | $response = new StreamedResponse(); |
167 | - $response->setCallback(function () use ($app, $request) { |
|
167 | + $response->setCallback(function() use ($app, $request) { |
|
168 | 168 | |
169 | 169 | // CSV種別を元に初期化. |
170 | 170 | $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_CATEGORY); |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | |
179 | 179 | // データ行の出力. |
180 | 180 | $app['eccube.service.csv.export']->setExportQueryBuilder($qb); |
181 | - $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) { |
|
181 | + $app['eccube.service.csv.export']->exportData(function($entity, $csvService) { |
|
182 | 182 | |
183 | 183 | $Csvs = $csvService->getCsvs(); |
184 | 184 | |
@@ -198,9 +198,9 @@ discard block |
||
198 | 198 | }); |
199 | 199 | |
200 | 200 | $now = new \DateTime(); |
201 | - $filename = 'category_' . $now->format('YmdHis') . '.csv'; |
|
201 | + $filename = 'category_'.$now->format('YmdHis').'.csv'; |
|
202 | 202 | $response->headers->set('Content-Type', 'application/octet-stream'); |
203 | - $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename); |
|
203 | + $response->headers->set('Content-Disposition', 'attachment; filename='.$filename); |
|
204 | 204 | $response->send(); |
205 | 205 | |
206 | 206 | return $response; |
@@ -95,7 +95,7 @@ |
||
95 | 95 | $num = $app['eccube.repository.product_class']->createQueryBuilder('pc') |
96 | 96 | ->select('count(pc.id)') |
97 | 97 | ->where('pc.ClassCategory1 = :id OR pc.ClassCategory2 = :id') |
98 | - ->setParameter('id',$id) |
|
98 | + ->setParameter('id', $id) |
|
99 | 99 | ->getQuery() |
100 | 100 | ->getSingleScalarResult(); |
101 | 101 | if ($num > 0) { |
@@ -70,10 +70,10 @@ discard block |
||
70 | 70 | // ファイルアップロード |
71 | 71 | $file = $form['payment_image']->getData(); |
72 | 72 | $fs = new Filesystem(); |
73 | - if ($file && $fs->exists($app['config']['image_temp_realdir'] . '/' . $file)) { |
|
73 | + if ($file && $fs->exists($app['config']['image_temp_realdir'].'/'.$file)) { |
|
74 | 74 | $fs->rename( |
75 | - $app['config']['image_temp_realdir'] . '/' . $file, |
|
76 | - $app['config']['image_save_realdir'] . '/' . $file |
|
75 | + $app['config']['image_temp_realdir'].'/'.$file, |
|
76 | + $app['config']['image_save_realdir'].'/'.$file |
|
77 | 77 | ); |
78 | 78 | } |
79 | 79 | |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | if (isset($images['payment_image_file'])) { |
101 | 101 | $image = $images['payment_image_file']; |
102 | 102 | $extension = $image->guessExtension(); |
103 | - $filename = date('mdHis') . uniqid('_') . '.' . $extension; |
|
103 | + $filename = date('mdHis').uniqid('_').'.'.$extension; |
|
104 | 104 | $image->move($app['config']['image_temp_realdir'], $filename); |
105 | 105 | } |
106 | 106 | |
@@ -127,12 +127,12 @@ discard block |
||
127 | 127 | foreach ($Payments as $Payment) { |
128 | 128 | if ($Payment->getId() != $id) { |
129 | 129 | $Payment->setRank($rank); |
130 | - $rank ++; |
|
130 | + $rank++; |
|
131 | 131 | } |
132 | 132 | } |
133 | 133 | $app['orm.em']->flush(); |
134 | 134 | |
135 | - $app->addSuccess('admin.delete.complete', 'admin') ; |
|
135 | + $app->addSuccess('admin.delete.complete', 'admin'); |
|
136 | 136 | |
137 | 137 | return $app->redirect($app->url('admin_setting_shop_payment')); |
138 | 138 | } |
@@ -62,7 +62,7 @@ |
||
62 | 62 | $log = array(); |
63 | 63 | $message = array(); |
64 | 64 | |
65 | - foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)) as $line) { |
|
65 | + foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES)) as $line) { |
|
66 | 66 | // 上限に達した場合、処理を抜ける |
67 | 67 | if (count($log) >= $formData['line_max']) { |
68 | 68 | break; |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | |
50 | 50 | return $phpinfo; |
51 | 51 | |
52 | - break; |
|
52 | + break; |
|
53 | 53 | default: |
54 | 54 | break; |
55 | 55 | } |
@@ -61,8 +61,8 @@ discard block |
||
61 | 61 | )); |
62 | 62 | } |
63 | 63 | |
64 | - public function getSystemInfo(Application $app) |
|
65 | - { |
|
64 | + public function getSystemInfo(Application $app) |
|
65 | + { |
|
66 | 66 | $system = $app['eccube.service.system']; |
67 | 67 | $server = $app['request']; |
68 | 68 | |
@@ -78,5 +78,5 @@ discard block |
||
78 | 78 | $arrSystemInfo[] = array('title' => 'HTTPユーザーエージェント', 'value' => $server->headers->get('User-Agent')); |
79 | 79 | |
80 | 80 | return $arrSystemInfo; |
81 | - } |
|
81 | + } |
|
82 | 82 | } |
@@ -67,13 +67,13 @@ |
||
67 | 67 | $server = $app['request']; |
68 | 68 | |
69 | 69 | $arrSystemInfo = array( |
70 | - array('title' => 'EC-CUBE', 'value' => Constant::VERSION), |
|
71 | - array('title' => 'サーバーOS', 'value' => php_uname()), |
|
72 | - array('title' => 'DBサーバー', 'value' => $system->getDbversion()), |
|
73 | - array('title' => 'WEBサーバー', 'value' => $server->server->get("SERVER_SOFTWARE")), |
|
70 | + array('title' => 'EC-CUBE', 'value' => Constant::VERSION), |
|
71 | + array('title' => 'サーバーOS', 'value' => php_uname()), |
|
72 | + array('title' => 'DBサーバー', 'value' => $system->getDbversion()), |
|
73 | + array('title' => 'WEBサーバー', 'value' => $server->server->get("SERVER_SOFTWARE")), |
|
74 | 74 | ); |
75 | 75 | |
76 | - $value = phpversion() . ' (' . implode(', ', get_loaded_extensions()) . ')'; |
|
76 | + $value = phpversion().' ('.implode(', ', get_loaded_extensions()).')'; |
|
77 | 77 | $arrSystemInfo[] = array('title' => 'PHP', 'value' => $value); |
78 | 78 | $arrSystemInfo[] = array('title' => 'HTTPユーザーエージェント', 'value' => $server->headers->get('User-Agent')); |
79 | 79 |
@@ -38,7 +38,7 @@ |
||
38 | 38 | |
39 | 39 | if ($app['eccube.layout']) { |
40 | 40 | foreach ($app['eccube.layout']->getBlocPositions() as $blocPositions) { |
41 | - if ($blocPositions->getTargetId() == constant("Eccube\Entity\BlocPosition::" . $position)) { |
|
41 | + if ($blocPositions->getTargetId() == constant("Eccube\Entity\BlocPosition::".$position)) { |
|
42 | 42 | $blocks[] = $blocPositions->getBloc(); |
43 | 43 | } |
44 | 44 | } |