Skip to content

Commit 345a54b

Browse files
namePlayernamePlayer
committed
QR Code Generator: UI and Bug Fixes
1 parent 106382d commit 345a54b

File tree

2 files changed

+25
-22
lines changed

2 files changed

+25
-22
lines changed

‎src/App/Controller/QrCode/GenerateController.php

+23-21
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function create(ServerRequestInterface $request, string $module): ?array
6363
if($module === 'text')
6464
{
6565
$textDto = new TextQrCodeDTO();
66-
$textDto->setText($_POST['qrcodeGeneratorTextFormTextareaInput']);
66+
$textDto->setText(trim($_POST['qrcodeGeneratorTextFormTextareaInput']));
6767

6868
$qrCode['data'] = $textDto->getText();
6969
$qrCode['object'] = $textDto;
@@ -72,7 +72,7 @@ public function create(ServerRequestInterface $request, string $module): ?array
7272
if($module === 'website')
7373
{
7474
$websiteDto = new WebsiteQrCodeDTO();
75-
$websiteDto->setWebsite($_POST['qrcodeGeneratorWebsiteInput']);
75+
$websiteDto->setWebsite(trim($_POST['qrcodeGeneratorWebsiteInput']));
7676

7777
$qrCode['data'] = $websiteDto->getWebsite();
7878
$qrCode['object'] = $websiteDto;
@@ -81,7 +81,7 @@ public function create(ServerRequestInterface $request, string $module): ?array
8181
if($module === "wifi")
8282
{
8383
$wifiDto = new WifiQrCodeDTO();
84-
$wifiDto->setNetworkName($_POST['qrcodeGeneratorWifiFormNetworkNameInput']);
84+
$wifiDto->setNetworkName(trim($_POST['qrcodeGeneratorWifiFormNetworkNameInput']));
8585

8686
switch ($_POST['qrcodeGeneratorWifiFormEncryptionSelect'])
8787
{
@@ -95,7 +95,7 @@ public function create(ServerRequestInterface $request, string $module): ?array
9595
$wifiDto->setEncryption('nopass');
9696
}
9797

98-
$wifiDto->setPassword($_POST['qrcodeGeneratorWifiFormPasswordInput']);
98+
$wifiDto->setPassword(trim($_POST['qrcodeGeneratorWifiFormPasswordInput']));
9999
$wifiDto->setHidden(isset($_POST['qrcodeGeneratorWifiFormHiddenNetwork']));
100100

101101
$qrCode['data'] = $this->qrCodeStringFormatService->createWifiFormatString($wifiDto);
@@ -105,20 +105,20 @@ public function create(ServerRequestInterface $request, string $module): ?array
105105
if($module === "contact")
106106
{
107107
$contactDto = new ContactQrCodeDTO();
108-
$contactDto->setForename($_POST['qrcodeGeneratorContactForename']);
109-
$contactDto->setSurname($_POST['qrcodeGeneratorContactSurname']);
110-
$contactDto->setOrganisation($_POST['qrcodeGeneratorContactOrganisation']);
111-
$contactDto->setJob($_POST['qrcodeGeneratorContactJobTitle']);
112-
$contactDto->setWebsite($_POST['qrcodeGeneratorContactWebsite']);
113-
$contactDto->setEmail($_POST['qrcodeGeneratorContactEmail']);
114-
$contactDto->setPhoneMobile($_POST['qrcodeGeneratorContactMobilePhoneNumber']);
115-
$contactDto->setPhoneLandline($_POST['qrcodeGeneratorContactHomePhoneNumber']);
116-
$contactDto->setFax($_POST['qrcodeGeneratorContactFaxNumber']);
117-
$contactDto->setStreet($_POST['qrcodeGeneratorContactStreet']);
118-
$contactDto->setZipCode($_POST['qrcodeGeneratorContactZipCode']);
119-
$contactDto->setCity($_POST['qrcodeGeneratorContactCity']);
120-
$contactDto->setState($_POST['qrcodeGeneratorContactState']);
121-
$contactDto->setCountry($_POST['qrcodeGeneratorContactCountry']);
108+
$contactDto->setForename(trim($_POST['qrcodeGeneratorContactForename']));
109+
$contactDto->setSurname(trim($_POST['qrcodeGeneratorContactSurname']));
110+
$contactDto->setOrganisation(trim($_POST['qrcodeGeneratorContactOrganisation']));
111+
$contactDto->setJob(trim($_POST['qrcodeGeneratorContactJobTitle']));
112+
$contactDto->setWebsite(trim($_POST['qrcodeGeneratorContactWebsite']));
113+
$contactDto->setEmail(trim($_POST['qrcodeGeneratorContactEmail']));
114+
$contactDto->setPhoneMobile(trim($_POST['qrcodeGeneratorContactMobilePhoneNumber']));
115+
$contactDto->setPhoneLandline(trim($_POST['qrcodeGeneratorContactHomePhoneNumber']));
116+
$contactDto->setFax(trim($_POST['qrcodeGeneratorContactFaxNumber']));
117+
$contactDto->setStreet(trim($_POST['qrcodeGeneratorContactStreet']));
118+
$contactDto->setZipCode(trim($_POST['qrcodeGeneratorContactZipCode']));
119+
$contactDto->setCity(trim($_POST['qrcodeGeneratorContactCity']));
120+
$contactDto->setState(trim($_POST['qrcodeGeneratorContactState']));
121+
$contactDto->setCountry(trim($_POST['qrcodeGeneratorContactCountry']));
122122

123123
$qrCode['data'] = $this->qrCodeStringFormatService->createContactFormatString($contactDto);
124124
$qrCode['object'] = $contactDto;
@@ -127,16 +127,18 @@ public function create(ServerRequestInterface $request, string $module): ?array
127127
if($module === "email")
128128
{
129129
$emailDto = new EmailQrCodeDTO();
130-
$emailDto->setRecipient($_POST['qrcodeGeneratorEmailFormEmailRecipientAddressInput']);
131-
$emailDto->setSubject($_POST['qrcodeGeneratorEmailFormSubjectInput']);
132-
$emailDto->setMessage($_POST['qrcodeGeneratorEmailFormMessage']);
130+
$emailDto->setRecipient(trim($_POST['qrcodeGeneratorEmailFormEmailRecipientAddressInput']));
131+
$emailDto->setSubject(trim($_POST['qrcodeGeneratorEmailFormSubjectInput']));
132+
$emailDto->setMessage(trim($_POST['qrcodeGeneratorEmailFormMessage']));
133133

134134
$qrCode['data'] = $this->qrCodeStringFormatService->createEmailFormatString($emailDto);
135135
$qrCode['object'] = $emailDto;
136136
}
137137

138138
$qrCode['base64Img'] = $this->qrCodeGeneratorService->createBase64QrCodeFromString($qrCode['data']);
139139

140+
MESSAGES->add('success', 'qrcode-generator-generation-successful');
141+
140142
return $qrCode;
141143

142144
}

‎translations/de.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,7 @@
521521
"qrcode-generator-preset-email-subject-label": "Betreff",
522522
"qrcode-generator-preset-email-subject-placeholder": "Lorem ipsum",
523523
"qrcode-generator-preset-email-message-label": "Nachricht",
524-
"qrcode-generator-preset-email-message-placeholder": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam..."
524+
"qrcode-generator-preset-email-message-placeholder": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam...",
525+
"qrcode-generator-generation-successful": "Der QR-Code wurde erstellt."
525526

526527
}

0 commit comments

Comments
 (0)