diff --git a/contrib/feebees.sample.conf b/contrib/feebees.sample.conf deleted file mode 100644 index 7a4242198..000000000 --- a/contrib/feebees.sample.conf +++ /dev/null @@ -1,9 +0,0 @@ -# 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/contrib/swekey.sample.conf b/contrib/swekey.sample.conf new file mode 100644 index 000000000..2c7088079 --- /dev/null +++ b/contrib/swekey.sample.conf @@ -0,0 +1,24 @@ +# This is a typical file used to enable Swekey hardware authentication. +# +# To activate the Swekey authentication add the following line in your config.inc.php file. +# $cfg['Servers'][$i]['auth_swekey_config'] = './swekey.conf'; +# Then rename this file "swekey.conf" and copy it next to your config.inc.php file. +# Add all the Swekey ids you want to grant access to in the file. +# After each Swekey id put the corresponding user. +# +# If you don't know the id of a Swekey just go on the http://auth-sample.musbe.com +# page while your Swekey is connected. +# +# If you need to purchase a Swekey please visit http://phpmyadmin.net/auth_key +# since this link provides funding to PhpMyAdmin. +# + +0000000000000000000000000000763A:root +000000000000000000000000000089E4:steve +0000000000000000000000000000231E:scott + +# You can also uncomment the following lines if you want to use custom authentication servers + +#SERVER_CHECK=http://auth-check.musbe.net +#SERVER_RNDTOKEN=http://auth-rnd-gen.musbe.net +#SERVER_STATUS=http://auth-status.musbe.net diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php index 2a604cd29..8b40ff6b9 100644 --- a/lang/afrikaans-utf-8.inc.php +++ b/lang/afrikaans-utf-8.inc.php @@ -1075,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php index ff93b57f2..c4b4d6abb 100644 --- a/lang/albanian-utf-8.inc.php +++ b/lang/albanian-utf-8.inc.php @@ -1074,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php index 625eb674d..c4e32ac0e 100644 --- a/lang/arabic-utf-8.inc.php +++ b/lang/arabic-utf-8.inc.php @@ -1076,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php index 8ba0583ad..705f9c9d1 100644 --- a/lang/azerbaijani-utf-8.inc.php +++ b/lang/azerbaijani-utf-8.inc.php @@ -1071,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/bangla-utf-8.inc.php b/lang/bangla-utf-8.inc.php index 24ca0dc86..b81bb59c8 100644 --- a/lang/bangla-utf-8.inc.php +++ b/lang/bangla-utf-8.inc.php @@ -1050,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php index 17d6ea990..c7acb371a 100644 --- a/lang/basque-utf-8.inc.php +++ b/lang/basque-utf-8.inc.php @@ -1068,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php index 53082e643..6981e613c 100644 --- a/lang/belarusian_cyrillic-utf-8.inc.php +++ b/lang/belarusian_cyrillic-utf-8.inc.php @@ -1051,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php index 399607187..0d6f6f287 100644 --- a/lang/belarusian_latin-utf-8.inc.php +++ b/lang/belarusian_latin-utf-8.inc.php @@ -1050,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php index 7cc78423d..c64a213a0 100644 --- a/lang/bosnian-utf-8.inc.php +++ b/lang/bosnian-utf-8.inc.php @@ -1074,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php index ecc8c38a4..76bbe1495 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php +++ b/lang/brazilian_portuguese-utf-8.inc.php @@ -1048,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php index 7a2481eac..b4bbd3f1c 100644 --- a/lang/bulgarian-utf-8.inc.php +++ b/lang/bulgarian-utf-8.inc.php @@ -1071,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php index 19729eda2..f1bb6f34c 100644 --- a/lang/catalan-utf-8.inc.php +++ b/lang/catalan-utf-8.inc.php @@ -1046,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php index de98706a8..05f5765e2 100644 --- a/lang/chinese_simplified-utf-8.inc.php +++ b/lang/chinese_simplified-utf-8.inc.php @@ -1076,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php index 113d3f0ab..f0de52a62 100644 --- a/lang/chinese_traditional-utf-8.inc.php +++ b/lang/chinese_traditional-utf-8.inc.php @@ -1055,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php index 2ed4bfff9..30d17e4bd 100644 --- a/lang/croatian-utf-8.inc.php +++ b/lang/croatian-utf-8.inc.php @@ -1049,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php index 5f1c63277..184eb56aa 100644 --- a/lang/czech-utf-8.inc.php +++ b/lang/czech-utf-8.inc.php @@ -1050,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php index 327bfc406..5483efe05 100644 --- a/lang/danish-utf-8.inc.php +++ b/lang/danish-utf-8.inc.php @@ -1050,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index e600dbcf9..3adebba1a 100644 --- a/lang/dutch-utf-8.inc.php +++ b/lang/dutch-utf-8.inc.php @@ -1072,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php index 0fbc282c8..7723942ff 100644 --- a/lang/english-utf-8.inc.php +++ b/lang/english-utf-8.inc.php @@ -288,10 +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'; +$strSwekeyAuthenticating = 'Authenticating...'; +$strSwekeyAuthFailed = 'Hardware authentication failed'; +$strSwekeyNoKeyId = 'File %s does not contain any key id'; +$strSwekeyNoKey = '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 86ed7fc70..6de9c0069 100644 --- a/lang/estonian-utf-8.inc.php +++ b/lang/estonian-utf-8.inc.php @@ -1056,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php index 07be98d72..39f32a1a6 100644 --- a/lang/finnish-utf-8.inc.php +++ b/lang/finnish-utf-8.inc.php @@ -1050,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index 0671096d9..9e2e79853 100644 --- a/lang/french-utf-8.inc.php +++ b/lang/french-utf-8.inc.php @@ -1047,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php index 4ad8e4d7c..1918cb743 100644 --- a/lang/galician-utf-8.inc.php +++ b/lang/galician-utf-8.inc.php @@ -1049,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php index e425e8fa8..58ece67ce 100644 --- a/lang/georgian-utf-8.inc.php +++ b/lang/georgian-utf-8.inc.php @@ -1076,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php index 1bc19a7d4..62d5e56ac 100644 --- a/lang/german-utf-8.inc.php +++ b/lang/german-utf-8.inc.php @@ -1056,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php index 9dc2a9234..5a3fb5eb9 100644 --- a/lang/greek-utf-8.inc.php +++ b/lang/greek-utf-8.inc.php @@ -1073,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php index 140baebeb..80a84466a 100644 --- a/lang/hebrew-utf-8.inc.php +++ b/lang/hebrew-utf-8.inc.php @@ -1068,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php index bc54a97d5..587e43caa 100644 --- a/lang/hindi-utf-8.inc.php +++ b/lang/hindi-utf-8.inc.php @@ -1076,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php index 47d7b9df6..a63569056 100644 --- a/lang/hungarian-utf-8.inc.php +++ b/lang/hungarian-utf-8.inc.php @@ -1067,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php index faf83eab3..8f28d4679 100644 --- a/lang/indonesian-utf-8.inc.php +++ b/lang/indonesian-utf-8.inc.php @@ -1066,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php index c220385bd..7cbf55d7d 100644 --- a/lang/italian-utf-8.inc.php +++ b/lang/italian-utf-8.inc.php @@ -1051,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php index bf0adc106..c7f610780 100644 --- a/lang/japanese-utf-8.inc.php +++ b/lang/japanese-utf-8.inc.php @@ -1067,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php index 979b31ee8..c58f835e5 100644 --- a/lang/korean-utf-8.inc.php +++ b/lang/korean-utf-8.inc.php @@ -1071,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php index f7e431f39..e6514fde5 100644 --- a/lang/latvian-utf-8.inc.php +++ b/lang/latvian-utf-8.inc.php @@ -1073,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php index 43ade2bc1..a05e99b3e 100644 --- a/lang/lithuanian-utf-8.inc.php +++ b/lang/lithuanian-utf-8.inc.php @@ -1066,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/macedonian_cyrillic-utf-8.inc.php b/lang/macedonian_cyrillic-utf-8.inc.php index 6c3f474ad..df59112ae 100644 --- a/lang/macedonian_cyrillic-utf-8.inc.php +++ b/lang/macedonian_cyrillic-utf-8.inc.php @@ -1051,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php index 4d1acef37..2fc2485e0 100644 --- a/lang/malay-utf-8.inc.php +++ b/lang/malay-utf-8.inc.php @@ -1088,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php index 37e20865d..53bea60b8 100644 --- a/lang/mongolian-utf-8.inc.php +++ b/lang/mongolian-utf-8.inc.php @@ -1071,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php index cee665469..81e57f963 100644 --- a/lang/norwegian-utf-8.inc.php +++ b/lang/norwegian-utf-8.inc.php @@ -1048,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php index 8e3935ac7..d56c48a43 100644 --- a/lang/persian-utf-8.inc.php +++ b/lang/persian-utf-8.inc.php @@ -1073,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php index 06ef31cee..3895f1847 100644 --- a/lang/polish-utf-8.inc.php +++ b/lang/polish-utf-8.inc.php @@ -1044,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php index fcdb5d62c..178301854 100644 --- a/lang/portuguese-utf-8.inc.php +++ b/lang/portuguese-utf-8.inc.php @@ -1077,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php index d8df5bb4e..cb4fd3661 100644 --- a/lang/romanian-utf-8.inc.php +++ b/lang/romanian-utf-8.inc.php @@ -1065,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php index ca7c4684a..0a03ef117 100644 --- a/lang/russian-utf-8.inc.php +++ b/lang/russian-utf-8.inc.php @@ -1052,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php index 66a7022f2..b4d673f65 100644 --- a/lang/serbian_cyrillic-utf-8.inc.php +++ b/lang/serbian_cyrillic-utf-8.inc.php @@ -1050,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php index c81cb1af0..9abba8da1 100644 --- a/lang/serbian_latin-utf-8.inc.php +++ b/lang/serbian_latin-utf-8.inc.php @@ -1050,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/sinhala-utf-8.inc.php b/lang/sinhala-utf-8.inc.php index d4838455c..c2e1139ff 100644 --- a/lang/sinhala-utf-8.inc.php +++ b/lang/sinhala-utf-8.inc.php @@ -1053,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php index 0ca67bc04..ae2e5e5e7 100644 --- a/lang/slovak-utf-8.inc.php +++ b/lang/slovak-utf-8.inc.php @@ -1051,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index 28641a67a..32f11c3cb 100644 --- a/lang/slovenian-utf-8.inc.php +++ b/lang/slovenian-utf-8.inc.php @@ -1070,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php index fe50338c1..a058189f0 100644 --- a/lang/spanish-utf-8.inc.php +++ b/lang/spanish-utf-8.inc.php @@ -1046,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php index 996e743dd..75e82e97b 100644 --- a/lang/swedish-utf-8.inc.php +++ b/lang/swedish-utf-8.inc.php @@ -1049,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php index 8f1ec2128..85caabe13 100644 --- a/lang/tatarish-utf-8.inc.php +++ b/lang/tatarish-utf-8.inc.php @@ -1062,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php index 2295ee52c..088adcadc 100644 --- a/lang/thai-utf-8.inc.php +++ b/lang/thai-utf-8.inc.php @@ -1072,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php index a4c275ef0..183697255 100644 --- a/lang/turkish-utf-8.inc.php +++ b/lang/turkish-utf-8.inc.php @@ -1056,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php index 179af9b12..b5b1e8c55 100644 --- a/lang/ukrainian-utf-8.inc.php +++ b/lang/ukrainian-utf-8.inc.php @@ -1070,8 +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 +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate +$strSwekeyAuthenticating = 'Authenticating...'; //to translate ?> diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index 603572cd5..c82829e35 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -12,7 +12,7 @@ if (! defined('PMA_COMING_FROM_COMMON')) { exit; } -require './libraries/auth/feebee/feebee.auth.lib.php'; +require './libraries/auth/swekey/swekey.auth.lib.php'; if (function_exists('mcrypt_encrypt') || PMA_dl('mcrypt')) { /** @@ -219,10 +219,10 @@ if (top != self) { exit; } - // BEGIN Feebee Integration - $feebeeErr = Feebee_auth_error(); - if ($feebeeErr != null) { - PMA_Message::error($feebeeErr)->display(); + // BEGIN Swekey Integration + $swekeyErr = Swekey_auth_error(); + if ($swekeyErr != null) { + PMA_Message::error($swekeyErr)->display(); if ($GLOBALS['error_handler']->hasDisplayErrors()) { echo '
'; $GLOBALS['error_handler']->dispErrors(); @@ -242,7 +242,7 @@ if (top != self) { } else $user_input_disabled = ''; - // END Feebee Integration + // END Swekey Integration ?>
@@ -417,10 +417,10 @@ function PMA_auth_check() return false; } - // BEGIN Feebee Integration - if (! Feebee_auth_check()) + // BEGIN Swekey Integration + if (! Swekey_auth_check()) return false; - // END Feebee Integration + // END Swekey Integration if (defined('PMA_CLEAR_COOKIES')) { foreach($GLOBALS['cfg']['Servers'] as $key => $val) { diff --git a/libraries/auth/feebee/fbauth.php b/libraries/auth/feebee/fbauth.php deleted file mode 100644 index efb2ff13a..000000000 --- a/libraries/auth/feebee/fbauth.php +++ /dev/null @@ -1,224 +0,0 @@ -= 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 deleted file mode 100644 index 574846bb2..000000000 --- a/libraries/auth/feebee/feebee.auth.lib.php +++ /dev/null @@ -1,103 +0,0 @@ - - - - - diff --git a/libraries/auth/feebee/authentication.inc.php b/libraries/auth/swekey/authentication.inc.php similarity index 51% rename from libraries/auth/feebee/authentication.inc.php rename to libraries/auth/swekey/authentication.inc.php index 2c349a2b4..4c280eaf1 100644 --- a/libraries/auth/feebee/authentication.inc.php +++ b/libraries/auth/swekey/authentication.inc.php @@ -1,92 +1,89 @@
- - diff --git a/libraries/auth/swekey/swekey.auth.lib.php b/libraries/auth/swekey/swekey.auth.lib.php new file mode 100644 index 000000000..3e96c255c --- /dev/null +++ b/libraries/auth/swekey/swekey.auth.lib.php @@ -0,0 +1,122 @@ + + + + + diff --git a/libraries/auth/swekey/swekey.php b/libraries/auth/swekey/swekey.php new file mode 100644 index 000000000..c4e0fd6f1 --- /dev/null +++ b/libraries/auth/swekey/swekey.php @@ -0,0 +1,349 @@ + '3'); + + if (substr($url,0, 6) == "https:") + { + $cert = __FILE__; + $cert = substr($cert, 0, strlen($crt) - 3).'cert'; // replace ending 'php' by "cert" + if (file_exists($cert)) + { + //TOFIX Don't know how to verify the certificate yet + //$options['ssl'] = array('cert' => $cert); + } + } + + $r->setOptions($options); + + try + { + $res = $r->send()->getBody(); + $info = $r->getResponseInfo(); + $response_code = $info['response_code']; + if ($response_code != 200) + { + $gSwekeyLastError = $response_code; + error_log("SWEKEY_ERROR:Error ".$gSwekeyLastError." getting ".$url); + return ""; + } + + return $res; + } + catch (HttpException $e) + { + error_log("SWEKEY_WARNING:HttpException ".$e." getting ".$url); + } + } + + $response_code = 408; // Request Timeout + $gSwekeyLastError = $response_code; + error_log("SWEKEY_ERROR:Error ".$gSwekeyLastError." getting ".$url); + return ""; + } + + global $http_response_header; + $res = @file_get_contents($url); + $response_code = substr($http_response_header[0], 9, 3); //HTTP/1.0 + if ($response_code == 200) + return $res; + + global $gSwekeyLastError; + $gSwekeyLastError = $response_code; + error_log("SWEKEY_ERROR:Error ".$response_code." getting ".$url); + return ""; +} + +/** + * Get a Random Token from a Token Server + * The RT is a 64 vhars hexadecimal value + * You should better use Swekey_GetFastRndToken() for performance + * @access public + */ +function Swekey_GetRndToken() +{ + global $gSwekeyRndTokenServer; + return Swekey_HttpGet($gSwekeyRndTokenServer.'/FULL-RND-TOKEN', $response_code); +} + +/** + * Get a Half Random Token from a Token Server + * The RT is a 64 vhars hexadecimal value + * Use this value if you want to make your own Swekey_GetFastRndToken() + * @access public + */ +function Swekey_GetHalfRndToken() +{ + global $gSwekeyRndTokenServer; + return Swekey_HttpGet($gSwekeyRndTokenServer.'/HALF-RND-TOKEN', $response_code); +} + +/** + * Get a Random Token + * The RT is a 64 vhars hexadecimal value + * This function generates a unique random token for each call but call the + * server only once every 30 seconds. + * You should always use this function to get random token. + * @access public + */ +function Swekey_GetFastRndToken() +{ + $res = ""; + + // We check if we have a valid RT is the session + if (isset($_SESSION['rnd-token-date'])) + if (time() - $_SESSION['rnd-token-date'] < 30) + $res = $_SESSION['rnd-token']; + + // If not we try to get it from a temp file (PHP >= 5.2.1 only) + if (strlen($res) != 32) + { + if (function_exists('sys_get_temp_dir') ) + { + $tempdir = sys_get_temp_dir(); + $modif = filemtime($tempdir."/swekey-rnd-token"); + if ($modif != false) + if (time() - $modif < 30) + { + $res = @file_get_contents($tempdir."/swekey-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(Swekey_GetHalfRndToken(), 0, 32); + $_SESSION['rnd-token'] = $res; + $_SESSION['rnd-token-date'] = time(); + if (isset($tempdir)) + { + $file = fopen ($tempdir."/swekey-rnd-token" , "w"); + @fwrite($file, $res); + @fclose($file); + } + } + + return $res.strtoupper(md5("Musbe Authentication Key" + mt_rand() + date(DATE_ATOM))); +} + +/** + * Checks that an OTP generated by a Swekey is valid + * + * @param id The id of the swekey + * @param rt The random token used to generate the otp + * @param otp The otp generated by the swekey + * @return true or false + * @access public + */ +function Swekey_CheckOtp($id, $rt, $otp) +{ + global $gSwekeyCheckServer; + $res = Swekey_HttpGet($gSwekeyCheckServer.'/CHECK-OTP/'.$id.'/'.$rt.'/'.$otp, $response_code); + return $response_code == 200 && $res == "OK"; +} + +/** + * Values that are associated with a key. + * The following values can be returned by the Swekey_GetStatus() function + */ +define ("SWEKEY_STATUS_OK",0); +define ("SWEKEY_STATUS_NOT_FOUND",1); // The key does not exist in the db +define ("SWEKEY_STATUS_INACTIVE",2); // The key has never been activated +define ("SWEKEY_STATUS_LOST",3); // The user has lost his key +define ("SWEKEY_STATUS_STOLLEN",4); // The key was stollen +define ("SWEKEY_STATUS_FEE_DUE",5); // The annual fee was not paid +define ("SWEKEY_STATUS_OBSOLETE",6); // The hardware is no longer supported +define ("SWEKEY_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 ("SWEKEY_STATUS_REPLACED",100); // This key has been replaced by a backup key +define ("SWEKEY_STATUS_BACKUP_KEY",101); // This key is a backup key that is not activated yet +define ("SWEKEY_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 Swekey_GetStatusStr($status) +{ + switch($status) + { + case SWEKEY_STATUS_OK : return 'OK'; + case SWEKEY_STATUS_NOT_FOUND : return 'Key does not exist in the db'; + case SWEKEY_STATUS_INACTIVE : return 'Key not activated'; + case SWEKEY_STATUS_LOST : return 'Key was lost'; + case SWEKEY_STATUS_STOLLEN : return 'Key was stollen'; + case SWEKEY_STATUS_FEE_DUE : return 'The annual fee was not paid'; + case SWEKEY_STATUS_OBSOLETE : return 'Key no longer supported'; + case SWEKEY_STATUS_REPLACED : return 'This key has been replaced by a backup key'; + case SWEKEY_STATUS_BACKUP_KEY : return 'This key is a backup key that is not activated yet'; + case SWEKEY_STATUS_NOTPLUGGED : return 'This key is not plugged in the computer'; + case SWEKEY_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 SWEKEY_STATUS_OK + * @param id The id of the swekey + * @return The status of the swekey + * @access public + */ +function Swekey_GetStatus($id) +{ + global $gSwekeyStatusServer; + $res = Swekey_HttpGet($gSwekeyStatusServer.'/GET-STATUS/'.$id, $response_code); + if ($response_code == 200) + return intval($res); + + return SWEKEY_STATUS_UNKOWN; +} + +?> diff --git a/libraries/auth/feebee/unplugged.php b/libraries/auth/swekey/unplugged.php similarity index 71% rename from libraries/auth/feebee/unplugged.php rename to libraries/auth/swekey/unplugged.php index c039641e2..504476b56 100644 --- a/libraries/auth/feebee/unplugged.php +++ b/libraries/auth/swekey/unplugged.php @@ -1,6 +1,6 @@