Passed
Pull Request — master (#132)
by
unknown
15:02 queued 06:44
created
Classes/Exceptions/DocumentMaxSizeErrorException.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -14,10 +14,8 @@
 block discarded – undo
14 14
  * The TYPO3 project - inspiring people to share!
15 15
  */
16 16
 
17
-class DocumentMaxSizeErrorException extends \Exception implements DPFExceptionInterface
18
-{
19
-    public function messageLanguageKey()
20
-    {
17
+class DocumentMaxSizeErrorException extends \Exception implements DPFExceptionInterface {
18
+    public function messageLanguageKey() {
21 19
         return 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_save.max_size_error';
22 20
     }
23 21
 }
24 22
\ No newline at end of file
Please login to merge, or discard this patch.
Classes/Controller/DocumentFormController.php 3 patches
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -16,11 +16,9 @@  discard block
 block discarded – undo
16 16
 
17 17
 use EWW\Dpf\Exceptions\DPFExceptionInterface;
18 18
 
19
-class DocumentFormController extends AbstractDocumentFormController
20
-{
19
+class DocumentFormController extends AbstractDocumentFormController {
21 20
 
22
-    protected function redirectToList($message = null)
23
-    {
21
+    protected function redirectToList($message = null) {
24 22
         $this->redirect('list', 'DocumentForm', null, array('message' => $message));
25 23
     }
26 24
 
@@ -30,8 +28,7 @@  discard block
 block discarded – undo
30 28
      * @param \EWW\Dpf\Domain\Model\DocumentForm $newDocumentForm
31 29
      * @return void
32 30
      */
33
-    public function createAction(\EWW\Dpf\Domain\Model\DocumentForm $newDocumentForm)
34
-    {
31
+    public function createAction(\EWW\Dpf\Domain\Model\DocumentForm $newDocumentForm) {
35 32
         foreach ($newDocumentForm->getNewFiles() as $newFile) {
36 33
             $uid = $newFile->getUID();
37 34
             if (empty($uid)) {
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 
22 22
     protected function redirectToList($message = null)
23 23
     {
24
-        $this->redirect('list', 'DocumentForm', null, array('message' => $message));
24
+        $this->redirect('list', 'DocumentForm', null, array ('message' => $message));
25 25
     }
26 26
 
27 27
     /**
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
         try {
46 46
             parent::createAction($newDocumentForm);
47 47
 
48
-            if (key_exists('afterDocSavedRedirectPage',$this->settings) && $this->settings['afterDocSavedRedirectPage']) {
48
+            if (key_exists('afterDocSavedRedirectPage', $this->settings) && $this->settings['afterDocSavedRedirectPage']) {
49 49
                 $uri = $this->uriBuilder
50 50
                     ->setTargetPageUid($this->settings['afterDocSavedRedirectPage'])
51 51
                     ->build();
@@ -65,8 +65,8 @@  discard block
 block discarded – undo
65 65
 
66 66
             $message[] = \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate($key, 'dpf');
67 67
 
68
-            $this->addFlashMessage(implode(" ", $message), '', $severity,true);
69
-            $this->forward('new', 'DocumentForm', null, array('newDocumentForm' => $newDocumentForm));
68
+            $this->addFlashMessage(implode(" ", $message), '', $severity, true);
69
+            $this->forward('new', 'DocumentForm', null, array ('newDocumentForm' => $newDocumentForm));
70 70
         }
71 71
     }
72 72
 }
Please login to merge, or discard this patch.
Upper-Lower-Casing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -19,9 +19,9 @@  discard block
 block discarded – undo
19 19
 class DocumentFormController extends AbstractDocumentFormController
20 20
 {
21 21
 
22
-    protected function redirectToList($message = null)
22
+    protected function redirectToList($message = NULL)
23 23
     {
24
-        $this->redirect('list', 'DocumentForm', null, array('message' => $message));
24
+        $this->redirect('list', 'DocumentForm', NULL, array('message' => $message));
25 25
     }
26 26
 
27 27
     /**
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
         foreach ($newDocumentForm->getNewFiles() as $newFile) {
36 36
             $uid = $newFile->getUID();
37 37
             if (empty($uid)) {
38
-                $newFile->setDownload(true);
38
+                $newFile->setDownload(TRUE);
39 39
             }
40 40
             $files[] = $newFile;
41 41
         }
@@ -65,8 +65,8 @@  discard block
 block discarded – undo
65 65
 
66 66
             $message[] = \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate($key, 'dpf');
67 67
 
68
-            $this->addFlashMessage(implode(" ", $message), '', $severity,true);
69
-            $this->forward('new', 'DocumentForm', null, array('newDocumentForm' => $newDocumentForm));
68
+            $this->addFlashMessage(implode(" ", $message), '', $severity,TRUE);
69
+            $this->forward('new', 'DocumentForm', NULL, array('newDocumentForm' => $newDocumentForm));
70 70
         }
71 71
     }
72 72
 }
Please login to merge, or discard this patch.
Classes/Domain/Model/DocumentFormField.php 1 patch
Braces   +16 added lines, -32 removed lines patch added patch discarded remove patch
@@ -14,8 +14,7 @@  discard block
 block discarded – undo
14 14
  * The TYPO3 project - inspiring people to share!
15 15
  */
16 16
 
17
-class DocumentFormField extends AbstractFormElement
18
-{
17
+class DocumentFormField extends AbstractFormElement {
19 18
 
20 19
     protected $value;
21 20
 
@@ -56,13 +55,11 @@  discard block
 block discarded – undo
56 55
     protected $maxInputLength;
57 56
 
58 57
 
59
-    public function getValue()
60
-    {
58
+    public function getValue() {
61 59
         return $this->value;
62 60
     }
63 61
 
64
-    public function setValue($value, $defaultValue = '')
65
-    {
62
+    public function setValue($value, $defaultValue = '') {
66 63
 
67 64
         $this->hasDefaultValue = !empty($defaultValue);
68 65
 
@@ -93,13 +90,11 @@  discard block
 block discarded – undo
93 90
         }
94 91
     }
95 92
 
96
-    public function getInputField()
97
-    {
93
+    public function getInputField() {
98 94
         return $this->inputField;
99 95
     }
100 96
 
101
-    public function setInputField($inputField)
102
-    {
97
+    public function setInputField($inputField) {
103 98
         $this->inputField = $inputField;
104 99
     }
105 100
 
@@ -107,8 +102,7 @@  discard block
 block discarded – undo
107 102
      *
108 103
      * @return array
109 104
      */
110
-    public function getInputOptions()
111
-    {
105
+    public function getInputOptions() {
112 106
         return $this->inputOptions;
113 107
     }
114 108
 
@@ -116,8 +110,7 @@  discard block
 block discarded – undo
116 110
      *
117 111
      * @param \EWW\Dpf\Domain\Model\InputOptionList $inputOptionList
118 112
      */
119
-    public function setInputOptions(\EWW\Dpf\Domain\Model\InputOptionList $inputOptionList = null)
120
-    {
113
+    public function setInputOptions(\EWW\Dpf\Domain\Model\InputOptionList $inputOptionList = null) {
121 114
 
122 115
         $this->inputOptions = array();
123 116
 
@@ -137,8 +130,7 @@  discard block
 block discarded – undo
137 130
      *
138 131
      * @return string $fillOutService
139 132
      */
140
-    public function getFillOutService()
141
-    {
133
+    public function getFillOutService() {
142 134
         return $this->fillOutService;
143 135
     }
144 136
 
@@ -148,8 +140,7 @@  discard block
 block discarded – undo
148 140
      * @param string $fillOutService
149 141
      * @return void
150 142
      */
151
-    public function setFillOutService($fillOutService)
152
-    {
143
+    public function setFillOutService($fillOutService) {
153 144
         $this->fillOutService = $fillOutService;
154 145
     }
155 146
 
@@ -158,8 +149,7 @@  discard block
 block discarded – undo
158 149
      *
159 150
      * @return boolean $consent
160 151
      */
161
-    public function getConsent()
162
-    {
152
+    public function getConsent() {
163 153
         return $this->consent;
164 154
     }
165 155
 
@@ -169,23 +159,19 @@  discard block
 block discarded – undo
169 159
      * @param boolean $consent
170 160
      * @return void
171 161
      */
172
-    public function setConsent($consent)
173
-    {
162
+    public function setConsent($consent) {
174 163
         $this->consent = $consent;
175 164
     }
176 165
 
177
-    public function getHasDefaultValue()
178
-    {
166
+    public function getHasDefaultValue() {
179 167
         return $this->hasDefaultValue;
180 168
     }
181 169
 
182
-    public function getValidation()
183
-    {
170
+    public function getValidation() {
184 171
         return $this->validation;
185 172
     }
186 173
 
187
-    public function setValidation($validation)
188
-    {
174
+    public function setValidation($validation) {
189 175
         $this->validation = $validation;
190 176
     }
191 177
 
@@ -194,8 +180,7 @@  discard block
 block discarded – undo
194 180
      *
195 181
      * @return string
196 182
      */
197
-    public function getDataType()
198
-    {
183
+    public function getDataType() {
199 184
         return $this->dataType;
200 185
     }
201 186
 
@@ -205,8 +190,7 @@  discard block
 block discarded – undo
205 190
      * @param string $dataType
206 191
      * @return void
207 192
      */
208
-    public function setDataType($dataType)
209
-    {
193
+    public function setDataType($dataType) {
210 194
         $this->dataType = $dataType;
211 195
     }
212 196
 
Please login to merge, or discard this patch.
Classes/Domain/Model/MetadataObject.php 1 patch
Braces   +37 added lines, -74 removed lines patch added patch discarded remove patch
@@ -17,8 +17,7 @@  discard block
 block discarded – undo
17 17
 /**
18 18
  * MetadataObject
19 19
  */
20
-class MetadataObject extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
21
-{
20
+class MetadataObject extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
22 21
 
23 22
     /**
24 23
      * name
@@ -151,8 +150,7 @@  discard block
 block discarded – undo
151 150
      *
152 151
      * @return string $name
153 152
      */
154
-    public function getName()
155
-    {
153
+    public function getName() {
156 154
         return $this->name;
157 155
     }
158 156
 
@@ -162,8 +160,7 @@  discard block
 block discarded – undo
162 160
      * @param string $name
163 161
      * @return void
164 162
      */
165
-    public function setName($name)
166
-    {
163
+    public function setName($name) {
167 164
         $this->name = $name;
168 165
     }
169 166
 
@@ -172,8 +169,7 @@  discard block
 block discarded – undo
172 169
      *
173 170
      * @return string $displayName
174 171
      */
175
-    public function getDisplayName()
176
-    {
172
+    public function getDisplayName() {
177 173
         return $this->displayName;
178 174
     }
179 175
 
@@ -183,8 +179,7 @@  discard block
 block discarded – undo
183 179
      * @param string $displayName
184 180
      * @return void
185 181
      */
186
-    public function setDisplayName($displayName)
187
-    {
182
+    public function setDisplayName($displayName) {
188 183
         $this->displayName = $displayName;
189 184
     }
190 185
 
@@ -193,8 +188,7 @@  discard block
 block discarded – undo
193 188
      *
194 189
      * @return integer $maxIteration
195 190
      */
196
-    public function getMaxIteration()
197
-    {
191
+    public function getMaxIteration() {
198 192
         return $this->maxIteration;
199 193
     }
200 194
 
@@ -204,8 +198,7 @@  discard block
 block discarded – undo
204 198
      * @param integer $maxIteration
205 199
      * @return void
206 200
      */
207
-    public function setMaxIteration($maxIteration)
208
-    {
201
+    public function setMaxIteration($maxIteration) {
209 202
         $this->maxIteration = $maxIteration;
210 203
     }
211 204
 
@@ -214,8 +207,7 @@  discard block
 block discarded – undo
214 207
      *
215 208
      * @return boolean $mandatory
216 209
      */
217
-    public function getMandatory()
218
-    {
210
+    public function getMandatory() {
219 211
         return $this->mandatory;
220 212
     }
221 213
 
@@ -225,8 +217,7 @@  discard block
 block discarded – undo
225 217
      * @param boolean $mandatory
226 218
      * @return void
227 219
      */
228
-    public function setMandatory($mandatory)
229
-    {
220
+    public function setMandatory($mandatory) {
230 221
         $this->mandatory = $mandatory;
231 222
     }
232 223
 
@@ -235,8 +226,7 @@  discard block
 block discarded – undo
235 226
      *
236 227
      * @return boolean
237 228
      */
238
-    public function isMandatory()
239
-    {
229
+    public function isMandatory() {
240 230
         return $this->mandatory;
241 231
     }
242 232
 
@@ -245,8 +235,7 @@  discard block
 block discarded – undo
245 235
      *
246 236
      * @return boolean $modsExtension
247 237
      */
248
-    public function getModsExtension()
249
-    {
238
+    public function getModsExtension() {
250 239
         return $this->modsExtension;
251 240
     }
252 241
 
@@ -256,8 +245,7 @@  discard block
 block discarded – undo
256 245
      * @param boolean $modsExtension
257 246
      * @return void
258 247
      */
259
-    public function setModsExtension($modsExtension)
260
-    {
248
+    public function setModsExtension($modsExtension) {
261 249
         $this->modsExtension = $modsExtension;
262 250
     }
263 251
 
@@ -266,8 +254,7 @@  discard block
 block discarded – undo
266 254
      *
267 255
      * @return boolean
268 256
      */
269
-    public function isModsExtension()
270
-    {
257
+    public function isModsExtension() {
271 258
         return $this->modsExtension;
272 259
     }
273 260
 
@@ -276,8 +263,7 @@  discard block
 block discarded – undo
276 263
      *
277 264
      * @return string $mapping
278 265
      */
279
-    public function getMapping()
280
-    {
266
+    public function getMapping() {
281 267
         return $this->mapping;
282 268
     }
283 269
 
@@ -287,8 +273,7 @@  discard block
 block discarded – undo
287 273
      * @param string $mapping
288 274
      * @return void
289 275
      */
290
-    public function setMapping($mapping)
291
-    {
276
+    public function setMapping($mapping) {
292 277
         $this->mapping = $mapping;
293 278
     }
294 279
 
@@ -297,8 +282,7 @@  discard block
 block discarded – undo
297 282
      *
298 283
      * @return string $relativeMapping
299 284
      */
300
-    public function getRelativeMapping()
301
-    {
285
+    public function getRelativeMapping() {
302 286
         $modsRegExp = "/^.*?mods:mods/i";
303 287
         $mapping    = preg_replace($modsRegExp, "", $this->mapping);
304 288
         return trim($mapping, " /");
@@ -309,8 +293,7 @@  discard block
 block discarded – undo
309 293
      *
310 294
      * @return integer $inputField
311 295
      */
312
-    public function getInputField()
313
-    {
296
+    public function getInputField() {
314 297
         return $this->inputField;
315 298
     }
316 299
 
@@ -320,8 +303,7 @@  discard block
 block discarded – undo
320 303
      * @param integer $inputField
321 304
      * @return void
322 305
      */
323
-    public function setInputField($inputField)
324
-    {
306
+    public function setInputField($inputField) {
325 307
         $this->inputField = $inputField;
326 308
     }
327 309
 
@@ -330,8 +312,7 @@  discard block
 block discarded – undo
330 312
      *
331 313
      * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\EWW\Dpf\Domain\Model\MetadataObject> $metadataObject
332 314
      */
333
-    public function getChildren()
334
-    {
315
+    public function getChildren() {
335 316
         return null;
336 317
     }
337 318
 
@@ -340,8 +321,7 @@  discard block
 block discarded – undo
340 321
      *
341 322
      * @return \EWW\Dpf\Domain\Model\InputOptionList $inputOptionList
342 323
      */
343
-    public function getInputOptionList()
344
-    {
324
+    public function getInputOptionList() {
345 325
         return $this->inputOptionList;
346 326
     }
347 327
 
@@ -351,8 +331,7 @@  discard block
 block discarded – undo
351 331
      * @param \EWW\Dpf\Domain\Model\InputOptionList $inputOptionList
352 332
      * @return void
353 333
      */
354
-    public function setInputOptionList(\EWW\Dpf\Domain\Model\InputOptionList $inputOptionList)
355
-    {
334
+    public function setInputOptionList(\EWW\Dpf\Domain\Model\InputOptionList $inputOptionList) {
356 335
         $this->inputOptionList = $inputOptionList;
357 336
     }
358 337
 
@@ -361,8 +340,7 @@  discard block
 block discarded – undo
361 340
      *
362 341
      * @return string $fillOutService
363 342
      */
364
-    public function getFillOutService()
365
-    {
343
+    public function getFillOutService() {
366 344
         return $this->fillOutService;
367 345
     }
368 346
 
@@ -372,8 +350,7 @@  discard block
 block discarded – undo
372 350
      * @param string $fillOutService
373 351
      * @return void
374 352
      */
375
-    public function setFillOutService($fillOutService)
376
-    {
353
+    public function setFillOutService($fillOutService) {
377 354
         $this->fillOutService = $fillOutService;
378 355
     }
379 356
 
@@ -382,8 +359,7 @@  discard block
 block discarded – undo
382 359
      *
383 360
      * @return boolean $backendOnly
384 361
      */
385
-    public function getBackendOnly()
386
-    {
362
+    public function getBackendOnly() {
387 363
         return $this->backendOnly;
388 364
     }
389 365
 
@@ -393,8 +369,7 @@  discard block
 block discarded – undo
393 369
      * @param boolean $backendOnly
394 370
      * @return void
395 371
      */
396
-    public function setBackendOnly($backendOnly)
397
-    {
372
+    public function setBackendOnly($backendOnly) {
398 373
         $this->backendOnly = $backendOnly;
399 374
     }
400 375
 
@@ -403,8 +378,7 @@  discard block
 block discarded – undo
403 378
      *
404 379
      * @return boolean $consent
405 380
      */
406
-    public function getConsent()
407
-    {
381
+    public function getConsent() {
408 382
         return $this->consent;
409 383
     }
410 384
 
@@ -414,8 +388,7 @@  discard block
 block discarded – undo
414 388
      * @param boolean $consent
415 389
      * @return void
416 390
      */
417
-    public function setConsent($consent)
418
-    {
391
+    public function setConsent($consent) {
419 392
         $this->consent = $consent;
420 393
     }
421 394
 
@@ -424,8 +397,7 @@  discard block
 block discarded – undo
424 397
      *
425 398
      * @return string $defaultValue
426 399
      */
427
-    public function getDefaultValue()
428
-    {
400
+    public function getDefaultValue() {
429 401
         return $this->defaultValue;
430 402
     }
431 403
 
@@ -435,8 +407,7 @@  discard block
 block discarded – undo
435 407
      * @param string $defaultValue
436 408
      * @return void
437 409
      */
438
-    public function setDefaultValue($defaultValue)
439
-    {
410
+    public function setDefaultValue($defaultValue) {
440 411
         $this->defaultValue = $defaultValue;
441 412
     }
442 413
 
@@ -445,8 +416,7 @@  discard block
 block discarded – undo
445 416
      *
446 417
      * @return string $validation
447 418
      */
448
-    public function getValidation()
449
-    {
419
+    public function getValidation() {
450 420
         return $this->validation;
451 421
     }
452 422
 
@@ -456,8 +426,7 @@  discard block
 block discarded – undo
456 426
      * @param string $validation
457 427
      * @return void
458 428
      */
459
-    public function setValidation($validation)
460
-    {
429
+    public function setValidation($validation) {
461 430
         $this->validation = $validation;
462 431
     }
463 432
 
@@ -466,8 +435,7 @@  discard block
 block discarded – undo
466 435
      *
467 436
      * @return string $dataType
468 437
      */
469
-    public function getDataType()
470
-    {
438
+    public function getDataType() {
471 439
         return $this->dataType;
472 440
     }
473 441
 
@@ -477,32 +445,28 @@  discard block
 block discarded – undo
477 445
      * @param string $dataType
478 446
      * @return void
479 447
      */
480
-    public function setDataType($dataType)
481
-    {
448
+    public function setDataType($dataType) {
482 449
         $this->dataType = $dataType;
483 450
     }
484 451
 
485 452
     /**
486 453
      * @return string
487 454
      */
488
-    public function getGndFieldUid()
489
-    {
455
+    public function getGndFieldUid() {
490 456
         return $this->gndFieldUid;
491 457
     }
492 458
 
493 459
     /**
494 460
      * @param string $gndFieldUid
495 461
      */
496
-    public function setGndFieldUid($gndFieldUid)
497
-    {
462
+    public function setGndFieldUid($gndFieldUid) {
498 463
         $this->gndFieldUid = $gndFieldUid;
499 464
     }
500 465
 
501 466
     /**
502 467
      * @return integer
503 468
      */
504
-    public function getMaxInputLength()
505
-    {
469
+    public function getMaxInputLength() {
506 470
         if ($this->maxInputLength == 0) {
507 471
             if ($this->inputField == self::input) {
508 472
                 return 255;
@@ -517,8 +481,7 @@  discard block
 block discarded – undo
517 481
     /**
518 482
      * @return integer
519 483
      */
520
-    public function setMaxInputLength($maxInputLength)
521
-    {
484
+    public function setMaxInputLength($maxInputLength) {
522 485
         $this->maxInputLength = $maxInputLength;
523 486
     }
524 487
 
Please login to merge, or discard this patch.
Classes/Controller/DocumentFormBEController.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 
29 29
     protected function redirectToList($message = null)
30 30
     {
31
-        $this->redirect('list', 'Document', null, array('message' => $message));
31
+        $this->redirect('list', 'Document', null, array ('message' => $message));
32 32
     }
33 33
 
34 34
     /**
@@ -70,13 +70,13 @@  discard block
 block discarded – undo
70 70
             $message[] = \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate(
71 71
                 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_delete.failure',
72 72
                 'dpf',
73
-                array($document->getTitle())
73
+                array ($document->getTitle())
74 74
             );
75 75
 
76 76
             $message[] = \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate($key, 'dpf');
77
-            $this->addFlashMessage(implode(" ", $message), '', $severity,true);
77
+            $this->addFlashMessage(implode(" ", $message), '', $severity, true);
78 78
 
79
-            $this->forward('edit', DocumentFormBE, null, array('document' => $document));
79
+            $this->forward('edit', DocumentFormBE, null, array ('document' => $document));
80 80
         }
81 81
 
82 82
 
@@ -110,15 +110,15 @@  discard block
 block discarded – undo
110 110
             $message[] = \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate(
111 111
                 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_update.failure',
112 112
                 'dpf',
113
-                array($updateDocument->getTitle())
113
+                array ($updateDocument->getTitle())
114 114
             );
115 115
 
116 116
             $message[] = \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate($key, 'dpf');
117 117
 
118 118
 
119
-            $this->addFlashMessage(implode(" ", $message), '', $severity,true);
119
+            $this->addFlashMessage(implode(" ", $message), '', $severity, true);
120 120
 
121
-            $this->forward('edit', 'DocumentFormBE', null, array('document' => $updateDocument));
121
+            $this->forward('edit', 'DocumentFormBE', null, array ('document' => $updateDocument));
122 122
         }
123 123
     }
124 124
 
Please login to merge, or discard this patch.
Upper-Lower-Casing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -26,9 +26,9 @@  discard block
 block discarded – undo
26 26
 
27 27
     }
28 28
 
29
-    protected function redirectToList($message = null)
29
+    protected function redirectToList($message = NULL)
30 30
     {
31
-        $this->redirect('list', 'Document', null, array('message' => $message));
31
+        $this->redirect('list', 'Document', NULL, array('message' => $message));
32 32
     }
33 33
 
34 34
     /**
@@ -74,9 +74,9 @@  discard block
 block discarded – undo
74 74
             );
75 75
 
76 76
             $message[] = \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate($key, 'dpf');
77
-            $this->addFlashMessage(implode(" ", $message), '', $severity,true);
77
+            $this->addFlashMessage(implode(" ", $message), '', $severity,TRUE);
78 78
 
79
-            $this->forward('edit', DocumentFormBE, null, array('document' => $document));
79
+            $this->forward('edit', DocumentFormBE, NULL, array('document' => $document));
80 80
         }
81 81
 
82 82
 
@@ -116,9 +116,9 @@  discard block
 block discarded – undo
116 116
             $message[] = \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate($key, 'dpf');
117 117
 
118 118
 
119
-            $this->addFlashMessage(implode(" ", $message), '', $severity,true);
119
+            $this->addFlashMessage(implode(" ", $message), '', $severity,TRUE);
120 120
 
121
-            $this->forward('edit', 'DocumentFormBE', null, array('document' => $updateDocument));
121
+            $this->forward('edit', 'DocumentFormBE', NULL, array('document' => $updateDocument));
122 122
         }
123 123
     }
124 124
 
Please login to merge, or discard this patch.
Configuration/TCA/tx_dpf_domain_model_metadataobject.php 1 patch
Spacing   +86 added lines, -86 removed lines patch added patch discarded remove patch
@@ -16,8 +16,8 @@  discard block
 block discarded – undo
16 16
     die('Access denied.');
17 17
 }
18 18
 
19
-return array(
20
-    'ctrl' => array(
19
+return array (
20
+    'ctrl' => array (
21 21
         'title'                    => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject',
22 22
         'label'                    => 'name',
23 23
         'tstamp'                   => 'tstamp',
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
         'transOrigPointerField'    => 'l10n_parent',
29 29
         'transOrigDiffSourceField' => 'l10n_diffsource',
30 30
         'delete'                   => 'deleted',
31
-        'enablecolumns'            => array(
31
+        'enablecolumns'            => array (
32 32
             'disabled'  => 'hidden',
33 33
             'starttime' => 'starttime',
34 34
             'endtime'   => 'endtime',
@@ -37,248 +37,248 @@  discard block
 block discarded – undo
37 37
         'iconfile'                 => 'EXT:dpf/Resources/Public/Icons/tx_dpf_domain_model_metadataobject.gif',
38 38
         'requestUpdate' => 'fill_out_service',
39 39
     ),
40
-    'interface' => array(
40
+    'interface' => array (
41 41
         'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, display_name, max_iteration, mandatory, data_type, validation, mapping, mods_extension, input_field, max_input_length, input_option_list, fill_out_service, gnd_field_uid, default_value, backend_only, consent',
42 42
     ),
43
-    'types'     => array(
44
-        '1' => array('showitem' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, --palette--;;1, name, display_name, max_iteration, mandatory, data_type, validation, mapping, mods_extension, input_field, max_input_length, input_option_list, fill_out_service, gnd_field_uid, default_value, backend_only, consent, --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.access, starttime, endtime'),
43
+    'types'     => array (
44
+        '1' => array ('showitem' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, --palette--;;1, name, display_name, max_iteration, mandatory, data_type, validation, mapping, mods_extension, input_field, max_input_length, input_option_list, fill_out_service, gnd_field_uid, default_value, backend_only, consent, --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.access, starttime, endtime'),
45 45
     ),
46
-    'palettes'  => array(
47
-        '1' => array('showitem' => ''),
46
+    'palettes'  => array (
47
+        '1' => array ('showitem' => ''),
48 48
     ),
49
-    'columns'   => array(
49
+    'columns'   => array (
50 50
 
51
-        'sys_language_uid'  => array(
51
+        'sys_language_uid'  => array (
52 52
             'exclude' => 1,
53 53
             'label'   => 'LLL:EXT:lang/locallang_general.xlf:LGL.language',
54
-            'config'  => array(
54
+            'config'  => array (
55 55
                 'type'                => 'select',
56 56
                 'renderType'          => 'selectSingle',
57 57
                 'foreign_table'       => 'sys_language',
58 58
                 'foreign_table_where' => 'ORDER BY sys_language.title',
59
-                'items'               => array(
60
-                    array('LLL:EXT:lang/locallang_general.xlf:LGL.allLanguages', -1),
61
-                    array('LLL:EXT:lang/locallang_general.xlf:LGL.default_value', 0),
59
+                'items'               => array (
60
+                    array ('LLL:EXT:lang/locallang_general.xlf:LGL.allLanguages', -1),
61
+                    array ('LLL:EXT:lang/locallang_general.xlf:LGL.default_value', 0),
62 62
                 ),
63 63
             ),
64 64
         ),
65
-        'l10n_parent'       => array(
65
+        'l10n_parent'       => array (
66 66
             'displayCond' => 'FIELD:sys_language_uid:>:0',
67 67
             'exclude'     => 1,
68 68
             'label'       => 'LLL:EXT:lang/locallang_general.xlf:LGL.l18n_parent',
69
-            'config'      => array(
69
+            'config'      => array (
70 70
                 'type'                => 'select',
71 71
                 'renderType'          => 'selectSingle',
72
-                'items'               => array(
73
-                    array('', 0),
72
+                'items'               => array (
73
+                    array ('', 0),
74 74
                 ),
75 75
                 'foreign_table'       => 'tx_dpf_domain_model_metadataobject',
76 76
                 'foreign_table_where' => 'AND tx_dpf_domain_model_metadataobject.pid=###CURRENT_PID### AND tx_dpf_domain_model_metadataobject.sys_language_uid IN (-1,0)',
77 77
             ),
78 78
         ),
79
-        'l10n_diffsource'   => array(
80
-            'config' => array(
79
+        'l10n_diffsource'   => array (
80
+            'config' => array (
81 81
                 'type' => 'passthrough',
82 82
             ),
83 83
         ),
84 84
 
85
-        't3ver_label'       => array(
85
+        't3ver_label'       => array (
86 86
             'label'  => 'LLL:EXT:lang/locallang_general.xlf:LGL.versionLabel',
87
-            'config' => array(
87
+            'config' => array (
88 88
                 'type' => 'input',
89 89
                 'size' => 30,
90 90
                 'max'  => 255,
91 91
             ),
92 92
         ),
93 93
 
94
-        'hidden'            => array(
94
+        'hidden'            => array (
95 95
             'exclude'   => 1,
96 96
             'l10n_mode' => 'exclude',
97 97
             'label'     => 'LLL:EXT:lang/locallang_general.xlf:LGL.hidden',
98
-            'config'    => array(
98
+            'config'    => array (
99 99
                 'type' => 'check',
100 100
             ),
101 101
         ),
102
-        'starttime'         => array(
102
+        'starttime'         => array (
103 103
             'exclude'   => 1,
104 104
             'l10n_mode' => 'mergeIfNotBlank',
105 105
             'label'     => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
106
-            'config'    => array(
106
+            'config'    => array (
107 107
                 'type'     => 'input',
108 108
                 'renderType' => 'inputDateTime',
109 109
                 'size'     => 13,
110 110
                 'eval'     => 'datetime',
111 111
                 'checkbox' => 0,
112 112
                 'default'  => 0,
113
-                'range'    => array(
113
+                'range'    => array (
114 114
                     'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')),
115 115
                 ),
116 116
             ),
117 117
         ),
118
-        'endtime'           => array(
118
+        'endtime'           => array (
119 119
             'exclude'   => 1,
120 120
             'l10n_mode' => 'mergeIfNotBlank',
121 121
             'label'     => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
122
-            'config'    => array(
122
+            'config'    => array (
123 123
                 'type'     => 'input',
124 124
                 'renderType' => 'inputDateTime',
125 125
                 'size'     => 13,
126 126
                 'eval'     => 'datetime',
127 127
                 'checkbox' => 0,
128 128
                 'default'  => 0,
129
-                'range'    => array(
129
+                'range'    => array (
130 130
                     'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')),
131 131
                 ),
132 132
             ),
133 133
         ),
134 134
 
135
-        'name'              => array(
135
+        'name'              => array (
136 136
             'exclude'   => 1,
137 137
             'l10n_mode' => 'exclude',
138 138
             'label'     => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.name',
139
-            'config'    => array(
139
+            'config'    => array (
140 140
                 'type' => 'input',
141 141
                 'size' => 30,
142 142
                 'eval' => 'trim',
143 143
             ),
144 144
         ),
145
-        'display_name'      => array(
145
+        'display_name'      => array (
146 146
             'exclude' => 1,
147 147
             'label'   => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.display_name',
148
-            'config'  => array(
148
+            'config'  => array (
149 149
                 'type' => 'input',
150 150
                 'size' => 30,
151 151
                 'eval' => 'trim',
152 152
             ),
153 153
         ),
154
-        'max_iteration'     => array(
154
+        'max_iteration'     => array (
155 155
             'exclude'   => 1,
156 156
             'l10n_mode' => 'exclude',
157 157
             'label'     => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.max_iteration',
158
-            'config'    => array(
158
+            'config'    => array (
159 159
                 'type' => 'input',
160 160
                 'size' => 4,
161 161
                 'eval' => 'int',
162 162
             ),
163 163
         ),
164
-        'mandatory'         => array(
164
+        'mandatory'         => array (
165 165
             'exclude'   => 1,
166 166
             'l10n_mode' => 'exclude',
167 167
             'label'     => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.mandatory',
168
-            'config'    => array(
168
+            'config'    => array (
169 169
                 'type'    => 'check',
170 170
                 'default' => 0,
171 171
             ),
172 172
         ),
173
-        'mapping'           => array(
173
+        'mapping'           => array (
174 174
             'exclude'   => 1,
175 175
             'l10n_mode' => 'exclude',
176 176
             'label'     => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.mapping',
177
-            'config'    => array(
177
+            'config'    => array (
178 178
                 'type' => 'input',
179 179
                 'size' => 30,
180 180
                 'eval' => 'trim',
181 181
             ),
182 182
         ),
183
-        'data_type'         => array(
183
+        'data_type'         => array (
184 184
             'exclude'   => 1,
185 185
             'l10n_mode' => 'exclude',
186 186
             'label'     => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.data_type',
187
-            'config'    => array(
187
+            'config'    => array (
188 188
                 'type'     => 'select',
189 189
                 'renderType' => 'selectSingle',
190
-                'items'    => array(
191
-                    array('', ''),
192
-                    array('LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.data_type.regexp', \EWW\Dpf\Domain\Model\MetadataObject::INPUT_DATA_TYPE_REGEXP),
193
-                    array('LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.data_type.date', \EWW\Dpf\Domain\Model\MetadataObject::INPUT_DATA_TYPE_DATE),
190
+                'items'    => array (
191
+                    array ('', ''),
192
+                    array ('LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.data_type.regexp', \EWW\Dpf\Domain\Model\MetadataObject::INPUT_DATA_TYPE_REGEXP),
193
+                    array ('LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.data_type.date', \EWW\Dpf\Domain\Model\MetadataObject::INPUT_DATA_TYPE_DATE),
194 194
                 ),
195 195
                 'size'     => 1,
196 196
                 'maxitems' => 1,
197 197
                 'eval'     => '',
198 198
             ),
199 199
         ),
200
-        'validation'        => array(
200
+        'validation'        => array (
201 201
             'exclude'   => 1,
202 202
             'l10n_mode' => 'exclude',
203 203
             'label'     => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.validation',
204
-            'config'    => array(
204
+            'config'    => array (
205 205
                 'type' => 'input',
206 206
                 'size' => 30,
207 207
                 'eval' => 'trim',
208 208
             ),
209 209
         ),
210
-        'mods_extension'    => array(
210
+        'mods_extension'    => array (
211 211
             'exclude'   => 1,
212 212
             'l10n_mode' => 'exclude',
213 213
             'label'     => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.mods_extension',
214
-            'config'    => array(
214
+            'config'    => array (
215 215
                 'type'    => 'check',
216 216
                 'default' => 0,
217 217
             ),
218 218
         ),
219
-        'backend_only'      => array(
219
+        'backend_only'      => array (
220 220
             'exclude'   => 1,
221 221
             'l10n_mode' => 'exclude',
222 222
             'label'     => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.backend_only',
223
-            'config'    => array(
223
+            'config'    => array (
224 224
                 'type'    => 'check',
225 225
                 'default' => 0,
226 226
             ),
227 227
         ),
228
-        'consent'           => array(
228
+        'consent'           => array (
229 229
             'exclude'   => 1,
230 230
             'l10n_mode' => 'exclude',
231 231
             'label'     => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.consent',
232
-            'config'    => array(
232
+            'config'    => array (
233 233
                 'type'    => 'check',
234 234
                 'default' => 0,
235 235
             ),
236 236
         ),
237
-        'input_field'       => array(
237
+        'input_field'       => array (
238 238
             'exclude'   => 1,
239 239
             'l10n_mode' => 'exclude',
240 240
             'label'     => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.input_field',
241
-            'config'    => array(
241
+            'config'    => array (
242 242
                 'type'     => 'select',
243 243
                 'renderType' => 'selectSingle',
244
-                'items'    => array(
245
-                    array('LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.input_type.input', \EWW\Dpf\Domain\Model\MetadataObject::input),
246
-                    array('LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.input_type.textarea', \EWW\Dpf\Domain\Model\MetadataObject::textarea),
247
-                    array('LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.input_type.select', \EWW\Dpf\Domain\Model\MetadataObject::select),
248
-                    array('LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.input_type.checkbox', \EWW\Dpf\Domain\Model\MetadataObject::checkbox),
249
-                    array('LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.input_type.hidden', \EWW\Dpf\Domain\Model\MetadataObject::hidden),
250
-                    array('LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.input_type.inputDropdown', \EWW\Dpf\Domain\Model\MetadataObject::INPUTDROPDOWN),
244
+                'items'    => array (
245
+                    array ('LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.input_type.input', \EWW\Dpf\Domain\Model\MetadataObject::input),
246
+                    array ('LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.input_type.textarea', \EWW\Dpf\Domain\Model\MetadataObject::textarea),
247
+                    array ('LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.input_type.select', \EWW\Dpf\Domain\Model\MetadataObject::select),
248
+                    array ('LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.input_type.checkbox', \EWW\Dpf\Domain\Model\MetadataObject::checkbox),
249
+                    array ('LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.input_type.hidden', \EWW\Dpf\Domain\Model\MetadataObject::hidden),
250
+                    array ('LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.input_type.inputDropdown', \EWW\Dpf\Domain\Model\MetadataObject::INPUTDROPDOWN),
251 251
                 ),
252 252
                 'size'     => 1,
253 253
                 'maxitems' => 1,
254 254
                 'eval'     => '',
255 255
             ),
256 256
         ),
257
-        'max_input_length'       => array(
258
-            'displayCond' => array(
259
-                'OR' => array(
257
+        'max_input_length'       => array (
258
+            'displayCond' => array (
259
+                'OR' => array (
260 260
                     'FIELD:input_field:REQ:false',
261
-                    'FIELD:input_field:=:'.\EWW\Dpf\Domain\Model\MetadataObject::input,
262
-                    'FIELD:input_field:=:'.\EWW\Dpf\Domain\Model\MetadataObject::textarea,
261
+                    'FIELD:input_field:=:' . \EWW\Dpf\Domain\Model\MetadataObject::input,
262
+                    'FIELD:input_field:=:' . \EWW\Dpf\Domain\Model\MetadataObject::textarea,
263 263
                 ),
264 264
             ),
265 265
             'exclude'   => 1,
266 266
             'l10n_mode' => 'exclude',
267 267
             'label'     => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.max_input_length',
268
-            'config'    => array(
268
+            'config'    => array (
269 269
                 'type' => 'input',
270 270
                 'size' => 4,
271 271
                 'eval' => 'trim,number',
272 272
             ),
273 273
         ),
274
-        'input_option_list' => array(
274
+        'input_option_list' => array (
275 275
             'exclude' => 1,
276 276
             'label'   => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.input_option_list',
277
-            'config'  => array(
277
+            'config'  => array (
278 278
                 'type'                => 'select',
279 279
                 'renderType'          => 'selectSingle',
280
-                'items'               => array(
281
-                    array('', 0),
280
+                'items'               => array (
281
+                    array ('', 0),
282 282
                 ),
283 283
                 'foreign_table'       => 'tx_dpf_domain_model_inputoptionlist',
284 284
                 'foreign_table_where' => ' AND (tx_dpf_domain_model_inputoptionlist.pid=###CURRENT_PID###) AND (tx_dpf_domain_model_inputoptionlist.sys_language_uid = 0)',
@@ -286,45 +286,45 @@  discard block
 block discarded – undo
286 286
                 'maxitems'            => 1,
287 287
             ),
288 288
         ),
289
-        'default_value'     => array(
289
+        'default_value'     => array (
290 290
             'exclude' => 1,
291 291
             'label'   => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.default_value',
292
-            'config'  => array(
292
+            'config'  => array (
293 293
                 'type' => 'text',
294 294
                 'cols' => 20,
295 295
                 'rows' => 3,
296 296
                 'eval' => 'trim',
297 297
             ),
298 298
         ),
299
-        'fill_out_service'  => array(
299
+        'fill_out_service'  => array (
300 300
             'exclude'   => 1,
301 301
             'l10n_mode' => 'exclude',
302 302
             'label'     => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.fill_out_service',
303
-            'config'    => array(
303
+            'config'    => array (
304 304
                 'type'     => 'select',
305 305
                 'renderType' => 'selectSingle',
306
-                'items'    => array(
307
-                    array('', 0),
308
-                    array('LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.fill_out_service.urn', \EWW\Dpf\Domain\Model\MetadataObject::FILL_OUT_SERVICE_URN),
309
-                    array('LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.fill_out_service.gnd', \EWW\Dpf\Domain\Model\MetadataObject::FILL_OUT_SERVICE_GND),
306
+                'items'    => array (
307
+                    array ('', 0),
308
+                    array ('LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.fill_out_service.urn', \EWW\Dpf\Domain\Model\MetadataObject::FILL_OUT_SERVICE_URN),
309
+                    array ('LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.fill_out_service.gnd', \EWW\Dpf\Domain\Model\MetadataObject::FILL_OUT_SERVICE_GND),
310 310
                 ),
311 311
                 'size'     => 1,
312 312
                 'maxitems' => 1,
313 313
                 'eval'     => '',
314 314
             ),
315 315
         ),
316
-        'gnd_field_uid' => array(
317
-            'displayCond' => 'FIELD:fill_out_service:=:'.\EWW\Dpf\Domain\Model\MetadataObject::FILL_OUT_SERVICE_GND,
316
+        'gnd_field_uid' => array (
317
+            'displayCond' => 'FIELD:fill_out_service:=:' . \EWW\Dpf\Domain\Model\MetadataObject::FILL_OUT_SERVICE_GND,
318 318
             'exclude'   => 0,
319 319
             'label'   => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadataobject.gnd_field_uid',
320
-            'config'  => array(
320
+            'config'  => array (
321 321
                 'type' => 'input',
322 322
                 'size' => 30,
323 323
                 'eval' => 'trim',
324 324
             ),
325 325
         ),
326
-        'metadatagroup'     => array(
327
-            'config' => array(
326
+        'metadatagroup'     => array (
327
+            'config' => array (
328 328
                 'type' => 'passthrough',
329 329
             ),
330 330
         ),
Please login to merge, or discard this patch.