From f5a76baa0c5c514e2b6aae90c8fd823cfd1d03f1 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 12 Jun 2008 12:36:10 +0000 Subject: [PATCH] [auth] support Feebee hardware authentication --- ChangeLog | 2 + contrib/feebees.sample.conf | 9 + lang/afrikaans-utf-8.inc.php | 4 + lang/albanian-utf-8.inc.php | 4 + lang/arabic-utf-8.inc.php | 4 + lang/azerbaijani-utf-8.inc.php | 4 + lang/bangla-utf-8.inc.php | 4 + lang/basque-utf-8.inc.php | 4 + lang/belarusian_cyrillic-utf-8.inc.php | 4 + lang/belarusian_latin-utf-8.inc.php | 4 + lang/bosnian-utf-8.inc.php | 4 + lang/brazilian_portuguese-utf-8.inc.php | 4 + lang/bulgarian-utf-8.inc.php | 4 + lang/catalan-utf-8.inc.php | 4 + lang/chinese_simplified-utf-8.inc.php | 4 + lang/chinese_traditional-utf-8.inc.php | 4 + lang/croatian-utf-8.inc.php | 4 + lang/czech-utf-8.inc.php | 4 + lang/danish-utf-8.inc.php | 4 + lang/dutch-utf-8.inc.php | 4 + lang/english-utf-8.inc.php | 4 + lang/estonian-utf-8.inc.php | 4 + lang/finnish-utf-8.inc.php | 4 + lang/french-utf-8.inc.php | 4 + lang/galician-utf-8.inc.php | 4 + lang/georgian-utf-8.inc.php | 4 + lang/german-utf-8.inc.php | 4 + lang/greek-utf-8.inc.php | 4 + lang/hebrew-utf-8.inc.php | 4 + lang/hindi-utf-8.inc.php | 4 + lang/hungarian-utf-8.inc.php | 4 + lang/indonesian-utf-8.inc.php | 4 + lang/italian-utf-8.inc.php | 4 + lang/japanese-utf-8.inc.php | 4 + lang/korean-utf-8.inc.php | 4 + lang/latvian-utf-8.inc.php | 4 + lang/lithuanian-utf-8.inc.php | 4 + lang/macedonian_cyrillic-utf-8.inc.php | 4 + lang/malay-utf-8.inc.php | 4 + lang/mongolian-utf-8.inc.php | 4 + lang/norwegian-utf-8.inc.php | 4 + lang/persian-utf-8.inc.php | 4 + lang/polish-utf-8.inc.php | 4 + lang/portuguese-utf-8.inc.php | 4 + lang/romanian-utf-8.inc.php | 4 + lang/russian-utf-8.inc.php | 4 + lang/serbian_cyrillic-utf-8.inc.php | 4 + lang/serbian_latin-utf-8.inc.php | 4 + lang/sinhala-utf-8.inc.php | 4 + lang/slovak-utf-8.inc.php | 4 + lang/slovenian-utf-8.inc.php | 4 + lang/spanish-utf-8.inc.php | 4 + lang/swedish-utf-8.inc.php | 4 + lang/tatarish-utf-8.inc.php | 4 + lang/thai-utf-8.inc.php | 4 + lang/turkish-utf-8.inc.php | 4 + lang/ukrainian-utf-8.inc.php | 4 + libraries/auth/cookie.auth.lib.php | 35 ++- libraries/auth/feebee/authentication.inc.php | 122 ++++++++++ libraries/auth/feebee/fbauth.php | 224 +++++++++++++++++++ libraries/auth/feebee/feebee.auth.lib.php | 103 +++++++++ libraries/auth/feebee/unplugged.php | 9 + libraries/config.default.php | 8 + 63 files changed, 731 insertions(+), 1 deletion(-) create mode 100644 contrib/feebees.sample.conf create mode 100644 libraries/auth/feebee/authentication.inc.php create mode 100644 libraries/auth/feebee/fbauth.php create mode 100644 libraries/auth/feebee/feebee.auth.lib.php create mode 100644 libraries/auth/feebee/unplugged.php diff --git a/ChangeLog b/ChangeLog index b3ea5006b..8b9c58522 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,8 @@ danbarry + [interface] Display options (work in progress); thanks to Dave Grijalva for the idea about showing the display field while browsing - bug #1910621 [display] part 2: do not display a BINARY content as text ++ [auth] support Feebee hardware authentication (todo: Documentation.html, + improve code formatting) 2.11.7.0 (not yet released) - bug #1908719 [interface] New field cannot be auto-increment and primary key diff --git a/contrib/feebees.sample.conf b/contrib/feebees.sample.conf new file mode 100644 index 000000000..7a4242198 --- /dev/null +++ b/contrib/feebees.sample.conf @@ -0,0 +1,9 @@ +# This is a typical file used to enable Feebee hardware authentication. +# Each line must contain the Feebee Id and the user associated with it +# Hardware authentication is enabled only if the file 'feebees.conf' exists. +# To get the id of your feebee just go on the http://auth-sample.musbe.com while +# your feebee is connected + +0000000000000000000000000000763A:root +000000000000000000000000000089E4:steve +0000000000000000000000000000231E:scott diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php index 996067866..2a604cd29 100644 --- a/lang/afrikaans-utf-8.inc.php +++ b/lang/afrikaans-utf-8.inc.php @@ -1075,4 +1075,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php index e6ccee353..ff93b57f2 100644 --- a/lang/albanian-utf-8.inc.php +++ b/lang/albanian-utf-8.inc.php @@ -1074,4 +1074,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php index 7b1a4884d..625eb674d 100644 --- a/lang/arabic-utf-8.inc.php +++ b/lang/arabic-utf-8.inc.php @@ -1076,4 +1076,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php index be6703c3e..8ba0583ad 100644 --- a/lang/azerbaijani-utf-8.inc.php +++ b/lang/azerbaijani-utf-8.inc.php @@ -1071,4 +1071,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/bangla-utf-8.inc.php b/lang/bangla-utf-8.inc.php index be8b29d9e..24ca0dc86 100644 --- a/lang/bangla-utf-8.inc.php +++ b/lang/bangla-utf-8.inc.php @@ -1050,4 +1050,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php index 8fe101fc3..17d6ea990 100644 --- a/lang/basque-utf-8.inc.php +++ b/lang/basque-utf-8.inc.php @@ -1068,4 +1068,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php index 33c35c889..53082e643 100644 --- a/lang/belarusian_cyrillic-utf-8.inc.php +++ b/lang/belarusian_cyrillic-utf-8.inc.php @@ -1051,4 +1051,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php index e516df164..399607187 100644 --- a/lang/belarusian_latin-utf-8.inc.php +++ b/lang/belarusian_latin-utf-8.inc.php @@ -1050,4 +1050,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php index 5fe95f7b8..7cc78423d 100644 --- a/lang/bosnian-utf-8.inc.php +++ b/lang/bosnian-utf-8.inc.php @@ -1074,4 +1074,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php index 6c05d4350..ecc8c38a4 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php +++ b/lang/brazilian_portuguese-utf-8.inc.php @@ -1048,4 +1048,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php index 2d1efc432..7a2481eac 100644 --- a/lang/bulgarian-utf-8.inc.php +++ b/lang/bulgarian-utf-8.inc.php @@ -1071,4 +1071,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php index 7050a1861..19729eda2 100644 --- a/lang/catalan-utf-8.inc.php +++ b/lang/catalan-utf-8.inc.php @@ -1046,4 +1046,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php index 8b149e469..de98706a8 100644 --- a/lang/chinese_simplified-utf-8.inc.php +++ b/lang/chinese_simplified-utf-8.inc.php @@ -1076,4 +1076,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php index 437a64359..113d3f0ab 100644 --- a/lang/chinese_traditional-utf-8.inc.php +++ b/lang/chinese_traditional-utf-8.inc.php @@ -1055,4 +1055,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php index ec1eb8440..2ed4bfff9 100644 --- a/lang/croatian-utf-8.inc.php +++ b/lang/croatian-utf-8.inc.php @@ -1049,4 +1049,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php index d00c98713..5f1c63277 100644 --- a/lang/czech-utf-8.inc.php +++ b/lang/czech-utf-8.inc.php @@ -1050,4 +1050,8 @@ $strZip = '„zazipováno“'; $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php index 7f499fbe1..327bfc406 100644 --- a/lang/danish-utf-8.inc.php +++ b/lang/danish-utf-8.inc.php @@ -1050,4 +1050,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index 7f081f7c1..e600dbcf9 100644 --- a/lang/dutch-utf-8.inc.php +++ b/lang/dutch-utf-8.inc.php @@ -1072,4 +1072,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php index 976f91fde..0fbc282c8 100644 --- a/lang/english-utf-8.inc.php +++ b/lang/english-utf-8.inc.php @@ -288,6 +288,10 @@ $strExtendedInserts = 'Extended inserts'; $strExtra = 'Extra'; $strFailedAttempts = 'Failed attempts'; +$strFeebeeAuthenticating = 'Authenticating...'; +$strFeebeeAuthFailed = 'Hardware authentication failed'; +$strFeebeeNoKeyId = 'File %s does not contain any key id'; +$strFeebeeNoKey = 'No valid authentication key plugged'; $strField = 'Field'; $strFieldHasBeenDropped = 'Field %s has been dropped'; $strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php index 8b1a629d5..86ed7fc70 100644 --- a/lang/estonian-utf-8.inc.php +++ b/lang/estonian-utf-8.inc.php @@ -1056,4 +1056,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php index 21140b4dc..07be98d72 100644 --- a/lang/finnish-utf-8.inc.php +++ b/lang/finnish-utf-8.inc.php @@ -1050,4 +1050,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index c9fb0450f..0671096d9 100644 --- a/lang/french-utf-8.inc.php +++ b/lang/french-utf-8.inc.php @@ -1047,4 +1047,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php index 2ae235181..4ad8e4d7c 100644 --- a/lang/galician-utf-8.inc.php +++ b/lang/galician-utf-8.inc.php @@ -1049,4 +1049,8 @@ $strZip = 'comprimido no formato "zip"'; $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php index 518a130b4..e425e8fa8 100644 --- a/lang/georgian-utf-8.inc.php +++ b/lang/georgian-utf-8.inc.php @@ -1076,4 +1076,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php index 9d93a5602..1bc19a7d4 100644 --- a/lang/german-utf-8.inc.php +++ b/lang/german-utf-8.inc.php @@ -1056,4 +1056,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php index 3a247aa5c..9dc2a9234 100644 --- a/lang/greek-utf-8.inc.php +++ b/lang/greek-utf-8.inc.php @@ -1073,4 +1073,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php index a05431e1a..140baebeb 100644 --- a/lang/hebrew-utf-8.inc.php +++ b/lang/hebrew-utf-8.inc.php @@ -1068,4 +1068,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php index 27ee2f912..bc54a97d5 100644 --- a/lang/hindi-utf-8.inc.php +++ b/lang/hindi-utf-8.inc.php @@ -1076,4 +1076,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php index d62289b86..47d7b9df6 100644 --- a/lang/hungarian-utf-8.inc.php +++ b/lang/hungarian-utf-8.inc.php @@ -1067,4 +1067,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php index 92e2b3330..faf83eab3 100644 --- a/lang/indonesian-utf-8.inc.php +++ b/lang/indonesian-utf-8.inc.php @@ -1066,4 +1066,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php index 722c009fa..c220385bd 100644 --- a/lang/italian-utf-8.inc.php +++ b/lang/italian-utf-8.inc.php @@ -1051,4 +1051,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php index d2d46850b..bf0adc106 100644 --- a/lang/japanese-utf-8.inc.php +++ b/lang/japanese-utf-8.inc.php @@ -1067,4 +1067,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php index 6b4414e65..979b31ee8 100644 --- a/lang/korean-utf-8.inc.php +++ b/lang/korean-utf-8.inc.php @@ -1071,4 +1071,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php index 34d509e28..f7e431f39 100644 --- a/lang/latvian-utf-8.inc.php +++ b/lang/latvian-utf-8.inc.php @@ -1073,4 +1073,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php index 380b9c505..43ade2bc1 100644 --- a/lang/lithuanian-utf-8.inc.php +++ b/lang/lithuanian-utf-8.inc.php @@ -1066,4 +1066,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/macedonian_cyrillic-utf-8.inc.php b/lang/macedonian_cyrillic-utf-8.inc.php index b355fc52a..6c3f474ad 100644 --- a/lang/macedonian_cyrillic-utf-8.inc.php +++ b/lang/macedonian_cyrillic-utf-8.inc.php @@ -1051,4 +1051,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php index 5608d5863..4d1acef37 100644 --- a/lang/malay-utf-8.inc.php +++ b/lang/malay-utf-8.inc.php @@ -1088,4 +1088,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php index 16434534e..37e20865d 100644 --- a/lang/mongolian-utf-8.inc.php +++ b/lang/mongolian-utf-8.inc.php @@ -1071,4 +1071,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php index 12d090386..cee665469 100644 --- a/lang/norwegian-utf-8.inc.php +++ b/lang/norwegian-utf-8.inc.php @@ -1048,4 +1048,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php index 45a0c9237..8e3935ac7 100644 --- a/lang/persian-utf-8.inc.php +++ b/lang/persian-utf-8.inc.php @@ -1073,4 +1073,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php index 20aa1674f..06ef31cee 100644 --- a/lang/polish-utf-8.inc.php +++ b/lang/polish-utf-8.inc.php @@ -1044,4 +1044,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php index b5f776c78..fcdb5d62c 100644 --- a/lang/portuguese-utf-8.inc.php +++ b/lang/portuguese-utf-8.inc.php @@ -1077,4 +1077,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php index fb6d96ba0..d8df5bb4e 100644 --- a/lang/romanian-utf-8.inc.php +++ b/lang/romanian-utf-8.inc.php @@ -1065,4 +1065,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php index 8f7a29edd..ca7c4684a 100644 --- a/lang/russian-utf-8.inc.php +++ b/lang/russian-utf-8.inc.php @@ -1052,4 +1052,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php index 4e0d4fd7c..66a7022f2 100644 --- a/lang/serbian_cyrillic-utf-8.inc.php +++ b/lang/serbian_cyrillic-utf-8.inc.php @@ -1050,4 +1050,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php index b466eaf58..c81cb1af0 100644 --- a/lang/serbian_latin-utf-8.inc.php +++ b/lang/serbian_latin-utf-8.inc.php @@ -1050,4 +1050,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/sinhala-utf-8.inc.php b/lang/sinhala-utf-8.inc.php index 5295e8a44..d4838455c 100644 --- a/lang/sinhala-utf-8.inc.php +++ b/lang/sinhala-utf-8.inc.php @@ -1053,4 +1053,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php index a999b6fb7..0ca67bc04 100644 --- a/lang/slovak-utf-8.inc.php +++ b/lang/slovak-utf-8.inc.php @@ -1051,4 +1051,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index 8d1c305a2..28641a67a 100644 --- a/lang/slovenian-utf-8.inc.php +++ b/lang/slovenian-utf-8.inc.php @@ -1070,4 +1070,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php index ad82bdc61..fe50338c1 100644 --- a/lang/spanish-utf-8.inc.php +++ b/lang/spanish-utf-8.inc.php @@ -1046,4 +1046,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php index 9b0ae90b6..996e743dd 100644 --- a/lang/swedish-utf-8.inc.php +++ b/lang/swedish-utf-8.inc.php @@ -1049,4 +1049,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php index 1438a4434..8f1ec2128 100644 --- a/lang/tatarish-utf-8.inc.php +++ b/lang/tatarish-utf-8.inc.php @@ -1062,4 +1062,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php index 772f8357a..2295ee52c 100644 --- a/lang/thai-utf-8.inc.php +++ b/lang/thai-utf-8.inc.php @@ -1072,4 +1072,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php index d58516d69..a4c275ef0 100644 --- a/lang/turkish-utf-8.inc.php +++ b/lang/turkish-utf-8.inc.php @@ -1056,4 +1056,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php index cc10843e9..179af9b12 100644 --- a/lang/ukrainian-utf-8.inc.php +++ b/lang/ukrainian-utf-8.inc.php @@ -1070,4 +1070,8 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strUserDefined = 'User-defined'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate +$strFeebeeNoKey = 'No valid authentication key plugged'; //to translate +$strFeebeeNoKeyId = 'File %s does not contain any key id'; //to translate +$strFeebeeAuthFailed = 'Hardware authentication failed'; //to translate +$strFeebeeAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index 07c37a3b2..603572cd5 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -12,6 +12,8 @@ if (! defined('PMA_COMING_FROM_COMMON')) { exit; } +require './libraries/auth/feebee/feebee.auth.lib.php'; + if (function_exists('mcrypt_encrypt') || PMA_dl('mcrypt')) { /** * Uses faster mcrypt library if available @@ -216,6 +218,32 @@ if (top != self) { echo ''; exit; } + + // BEGIN Feebee Integration + $feebeeErr = Feebee_auth_error(); + if ($feebeeErr != null) { + PMA_Message::error($feebeeErr)->display(); + if ($GLOBALS['error_handler']->hasDisplayErrors()) { + echo '
'; + $GLOBALS['error_handler']->dispErrors(); + echo '
'; + } + echo '' . "\n"; + if (file_exists('./config.footer.inc.php')) { + require './config.footer.inc.php'; + } + echo ''; + exit; + } + + if (isset($_SESSION['PHP_AUTH_FORCE_USER'])) { + $default_user = $_SESSION['PHP_AUTH_FORCE_USER']; + $user_input_disabled = 'readonly="readonly"'; + } + else + $user_input_disabled = ''; + // END Feebee Integration + ?>
@@ -243,7 +271,7 @@ if (top != self) {
- + />
@@ -389,6 +417,11 @@ function PMA_auth_check() return false; } + // BEGIN Feebee Integration + if (! Feebee_auth_check()) + return false; + // END Feebee Integration + if (defined('PMA_CLEAR_COOKIES')) { foreach($GLOBALS['cfg']['Servers'] as $key => $val) { PMA_removeCookie('pmaPass-' . $key); diff --git a/libraries/auth/feebee/authentication.inc.php b/libraries/auth/feebee/authentication.inc.php new file mode 100644 index 000000000..2c349a2b4 --- /dev/null +++ b/libraries/auth/feebee/authentication.inc.php @@ -0,0 +1,122 @@ + +
+ + + diff --git a/libraries/auth/feebee/fbauth.php b/libraries/auth/feebee/fbauth.php new file mode 100644 index 000000000..efb2ff13a --- /dev/null +++ b/libraries/auth/feebee/fbauth.php @@ -0,0 +1,224 @@ += 5.2.1 only) + if (strlen($res) != 32) + { + if (function_exists('sys_get_temp_dir') ) + { + $tempdir = sys_get_temp_dir(); + $modif = filemtime($tempdir."/feebee-rnd-token"); + if ($modif != false) + if (time() - $modif < 30) + { + $res = @file_get_contents($tempdir."/feebee-rnd-token"); + if (strlen($res) != 32) + $res = ""; + else + { + $_SESSION['rnd-token'] = $res; + $_SESSION['rnd-token-date'] = $modif; + } + } + } + } + + // If we don't have a valid RT here we have to get it from the server + if (strlen($res) != 32) + { + $res = substr(FbAuth_GetHalfRndToken(), 0, 32); + $_SESSION['rnd-token'] = $res; + $_SESSION['rnd-token-date'] = time(); + if (isset($tempdir)) + { + $file = fopen ($tempdir."/feebee-rnd-token" , "w"); + @fwrite($file, $res); + @fclose($file); + } + } + + return $res.strtoupper(md5("Musbe Authentication Key" + mt_rand() + date(DATE_ATOM))); +} + + +/** + * Checks the result of an http request + * + * @param res the result of the http request + * @param header the header returned by the http request + * @access private + */ +function FbAuth_CheckForOK($res, $header) +{ + $err = substr($header, 9, 3); //HTTP/1.0 + + if ($res == "OK" && $err == 200) + return true; + + global $gAuthErr; + if ($err != "") + $gAuthErr = $err; + else + $gAuthErr = "Unknown Error"; + + return false; +} + + +/** + * Checks that an OTP generated by a Feebee is valid + * + * @param fbid The id of the feebee + * @param rt The random token used to generate the otp + * @param otp The otp generated by the feebee + * @return true or false + * @access public + */ +function FbAuth_CheckOtp($fbid, $rt, $otp) +{ + global $http_response_header; + $res = file_get_contents('http://auth-check.musbe.net/CHECK-OTP/'.$fbid.'/'.$rt.'/'.$otp); + return FbAuth_CheckForOK($res, $http_response_header[0]); +} + + +/** + * Values that are associated with a key. + * The following values can be returned by the FbAuth_GetStatus() function + */ +define ("FBAUTH_STATUS_OK",0); +define ("FBAUTH_STATUS_NOT_FOUND",1); // The key does not exist in the db +define ("FBAUTH_STATUS_INACTIVE",2); // The key has never been activated +define ("FBAUTH_STATUS_LOST",3); // The user has lost his key +define ("FBAUTH_STATUS_STOLLEN",4); // The key was stollen +define ("FBAUTH_STATUS_FEE_DUE",5); // The annual fee was not paid +define ("FBAUTH_STATUS_OBSOLETE",6); // The hardware is no longer supported +define ("FBAUTH_STATUS_UNKOWN",201); // We could not connect to the authentication server + +/** + * Values that are associated with a key. + * The Javascript Api can also return the following values + */ +define ("FBAUTH_STATUS_REPLACED",100); // This key has been replaced by a backup key +define ("FBAUTH_STATUS_BACKUP_KEY",101); // This key is a backup key that is not activated yet +define ("FBAUTH_STATUS_NOTPLUGGED",200); // This key is not plugged in the computer + + +/** + * Return the text corresponding to the integer status of a key + * + * @param status The status + * @return The text corresponding to the status + * @access public + */ +function FbAuth_GetStatusStr($status) +{ + switch($status) + { + case FBAUTH_STATUS_OK : return 'OK'; + case FBAUTH_STATUS_NOT_FOUND : return 'Key does not exist in the db'; + case FBAUTH_STATUS_INACTIVE : return 'Key not activated'; + case FBAUTH_STATUS_LOST : return 'Key was lost'; + case FBAUTH_STATUS_STOLLEN : return 'Key was stollen'; + case FBAUTH_STATUS_FEE_DUE : return 'The annual fee was not paid'; + case FBAUTH_STATUS_OBSOLETE : return 'Key no longer supported'; + case FBAUTH_STATUS_REPLACED : return 'This key has been replaced by a backup key'; + case FBAUTH_STATUS_BACKUP_KEY : return 'This key is a backup key that is not activated yet'; + case FBAUTH_STATUS_NOTPLUGGED : return 'This key is not plugged in the computer'; + case FBAUTH_STATUS_UNKOWN : return 'Unknow Status, could not connect to the authentication server'; + } + return 'unknown status '.$status; +} + +/** + * If your web site requires a key to login you should check that the key + * is still valid (has not been lost or stolen) before requiring it. + * A key can be authenticated only if its status is FBAUTH_STATUS_OK + * @param fbid The id of the feebee + * @return The status of the feebee + * @access public + */ +function FbAuth_GetStatus($fbid) +{ + global $http_response_header; + $res = file_get_contents('http://auth-status.musbe.net/GET-STATUS/'.$fbid); + + $err = substr($http_response_header[0], 9, 3); //HTTP/1.0 + if ($err == "200") + return intval($res); + + // in case of connection failure we return OK but it should never occurd + return FBAUTH_STATUS_UNKOWN; +} + + +?> diff --git a/libraries/auth/feebee/feebee.auth.lib.php b/libraries/auth/feebee/feebee.auth.lib.php new file mode 100644 index 000000000..574846bb2 --- /dev/null +++ b/libraries/auth/feebee/feebee.auth.lib.php @@ -0,0 +1,103 @@ + + + + + diff --git a/libraries/auth/feebee/unplugged.php b/libraries/auth/feebee/unplugged.php new file mode 100644 index 000000000..c039641e2 --- /dev/null +++ b/libraries/auth/feebee/unplugged.php @@ -0,0 +1,9 @@ + diff --git a/libraries/config.default.php b/libraries/config.default.php index f0b5da960..a39ec24f5 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -153,6 +153,14 @@ $cfg['Servers'][$i]['controlpass'] = ''; */ $cfg['Servers'][$i]['auth_type'] = 'config'; +/** + * File containing Feebee ids and login names (see /contrib); + * leave empty to deactivate Feebee hardware authentication + * + * @global string $cfg['Servers'][$i]['auth_feebee_config'] + */ +$cfg['Servers'][$i]['auth_feebee_config'] = ''; + /** * MySQL user *