From 5a09f8159fba70269d0aea9cbfc3d42e9a5b501d Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Wed, 3 Jun 2020 17:51:21 +0200 Subject: [PATCH] typos --- lam/HISTORY | 2 +- lam/lib/2factor.inc | 8 ++++---- lam/lib/tools/webauthn.inc | 2 +- lam/templates/config/mainmanage.php | 2 +- lam/templates/lib/500_lam.js | 8 ++++---- lam/templates/misc/ajax.php | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lam/HISTORY b/lam/HISTORY index 67896aec..cd67bb00 100644 --- a/lam/HISTORY +++ b/lam/HISTORY @@ -14,7 +14,7 @@ September 2020 17.03.2020 7.1 - PHP 7 required - - Webauthn/FIDO2 support for 2-factor-authentication (requires PHP 7.2) + - WebAuthn/FIDO2 support for 2-factor-authentication (requires PHP 7.2) - IMAP: changed library to support latest TLS versions - Personal: support display name (hidden by default in server profile) - Windows users: support allowed workstations, more profile options diff --git a/lam/lib/2factor.inc b/lam/lib/2factor.inc index f65b9a90..88754c8e 100644 --- a/lam/lib/2factor.inc +++ b/lam/lib/2factor.inc @@ -526,16 +526,16 @@ class WebauthnProvider extends BaseProvider { */ public function addCustomInput(&$row, $userDn) { if (version_compare(phpversion(), '7.2.0') < 0) { - $row->add(new htmlStatusMessage('ERROR', 'Webauthn requires PHP 7.2.'), 12); + $row->add(new htmlStatusMessage('ERROR', 'WebAuthn requires PHP 7.2.'), 12); return; } if (!extension_loaded('PDO')) { - $row->add(new htmlStatusMessage('ERROR', 'Webauthn requires the PDO extension for PHP.'), 12); + $row->add(new htmlStatusMessage('ERROR', 'WebAuthn requires the PDO extension for PHP.'), 12); return; } $pdoDrivers = \PDO::getAvailableDrivers(); if (!in_array('sqlite', $pdoDrivers)) { - $row->add(new htmlStatusMessage('ERROR', 'Webauthn requires the sqlite PDO driver for PHP.'), 12); + $row->add(new htmlStatusMessage('ERROR', 'WebAuthn requires the sqlite PDO driver for PHP.'), 12); return; } include_once __DIR__ . '/webauthn.inc'; @@ -567,7 +567,7 @@ class WebauthnProvider extends BaseProvider { } $errorMessageDiv = new htmlDiv('generic-webauthn-error', new htmlOutputText('')); $errorMessageDiv->addDataAttribute('button', _('Ok')); - $errorMessageDiv->addDataAttribute('title', _('Webauthn failed')); + $errorMessageDiv->addDataAttribute('title', _('WebAuthn failed')); $row->add($errorMessageDiv, 12); $row->add(new htmlJavaScript('window.lam.webauthn.start(\'' . $pathPrefix . '\', ' . $selfServiceParam . ');'), 0); } diff --git a/lam/lib/tools/webauthn.inc b/lam/lib/tools/webauthn.inc index ce10c11e..19bc19a2 100644 --- a/lam/lib/tools/webauthn.inc +++ b/lam/lib/tools/webauthn.inc @@ -43,7 +43,7 @@ class toolWebauthn implements \LAMTool { * @return string name */ function getName() { - return _('Webauthn devices'); + return _('WebAuthn devices'); } /** diff --git a/lam/templates/config/mainmanage.php b/lam/templates/config/mainmanage.php index b5c386b8..3d633644 100644 --- a/lam/templates/config/mainmanage.php +++ b/lam/templates/config/mainmanage.php @@ -512,7 +512,7 @@ printHeaderContents(_("Edit general settings"), '../..'); include_once __DIR__ . '/../../lib/webauthn.inc'; $database = new \LAM\LOGIN\WEBAUTHN\PublicKeyCredentialSourceRepositorySQLite(); if ($database->hasRegisteredCredentials()) { - $row->add(new htmlSubTitle(_('Webauthn devices')), 12); + $row->add(new htmlSubTitle(_('WebAuthn devices')), 12); $webauthnSearchField = new htmlResponsiveInputField(_('User DN'), 'webauthn_searchTerm', null, '252'); $row->add($webauthnSearchField, 12); $row->addVerticalSpacer('0.5rem'); diff --git a/lam/templates/lib/500_lam.js b/lam/templates/lib/500_lam.js index 9ff53532..d7839e40 100644 --- a/lam/templates/lib/500_lam.js +++ b/lam/templates/lib/500_lam.js @@ -1453,7 +1453,7 @@ window.lam.webauthn.run = function(prefix, isSelfService) { } }) .fail(function() { - console.log('Webauthn failed'); + console.log('WebAuthn failed'); }); } @@ -1602,7 +1602,7 @@ window.lam.webauthn.searchDevices = function(event) { window.lam.webauthn.addDeviceActionListeners(); }) .fail(function() { - console.log('Webauthn search failed'); + console.log('WebAuthn search failed'); }); return false; } @@ -1721,7 +1721,7 @@ window.lam.webauthn.sendRemoveDeviceRequest = function(element, action, successC } }) .fail(function() { - console.log('Webauthn device deletion failed'); + console.log('WebAuthn device deletion failed'); }); } @@ -1763,7 +1763,7 @@ window.lam.webauthn.registerOwnDevice = function(event, isSelfService) { resultDiv.html(jsonData.content); }) .fail(function() { - console.log('Webauthn device registration failed'); + console.log('WebAuthn device registration failed'); }); }; } diff --git a/lam/templates/misc/ajax.php b/lam/templates/misc/ajax.php index ca5974ec..02b6bb88 100644 --- a/lam/templates/misc/ajax.php +++ b/lam/templates/misc/ajax.php @@ -343,7 +343,7 @@ class Ajax { $dn = $_POST['dn']; $sessionDn = $_SESSION['ldap']->getUserName(); if ($sessionDn !== $dn) { - logNewMessage(LOG_ERR, 'Webauthn delete canceled, DN does not match.'); + logNewMessage(LOG_ERR, 'WebAuthn delete canceled, DN does not match.'); die(); } if ($action === 'delete') {