diff --git a/ChangeLog b/ChangeLog index 65bbd2cee..95a55c0d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,8 +57,6 @@ danbarry + [interface] Display options; 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 SweKey hardware authentication - see http://phpmyadmin.net/auth_key + rfe #1962383 [designer] Option to create a PDF page - patch #2007196, Typos in comments, thanks to knittl - knittl - bug #1982315 [GUI] Comma and quote in ENUM, thanks to Joshua Hogendorn diff --git a/Documentation.html b/Documentation.html index 59593227a..144082b3c 100644 --- a/Documentation.html +++ b/Documentation.html @@ -507,28 +507,6 @@ GRANT ALL PRIVILEGES ON user_base.* TO 'real_user'@localhost IDENTIFIED BY 'real one’s router or firewall will suffice (both of which are beyond the scope of this manual but easily searchable with Google). -

Swekey authentication

-

-The Swekey is a low cost authentication USB key that can be used in -web applications.

-When Swekey authentication is activated, phpMyAdmin requires the -users's Swekey to be plugged before entering the login page (currently -supported for cookie authentication mode only). Swekey Authentication is -disabled by default.

-To enable it, add the following line to config.inc.php: -

-
-$cfg['Servers'][$i]['auth_swekey_config'] = './swekey.conf';
-
-

-You then have to create the swekey.conf file that will associate -each user with their Swekey Id. A self documented sample file is provided -in the contrib directory. Feel free to use it with your own -users' information.

-If you want to purchase a Swekey please visit -http://phpmyadmin.net/auth_key -since this link provides funding for phpMyAdmin. -

Configuration

diff --git a/contrib/swekey.sample.conf b/contrib/swekey.sample.conf deleted file mode 100644 index 2c7088079..000000000 --- a/contrib/swekey.sample.conf +++ /dev/null @@ -1,24 +0,0 @@ -# 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 ccdf3a9ed..d181796ef 100644 --- a/lang/afrikaans-utf-8.inc.php +++ b/lang/afrikaans-utf-8.inc.php @@ -1069,10 +1069,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php index 84b3a8994..b3d797f41 100644 --- a/lang/albanian-utf-8.inc.php +++ b/lang/albanian-utf-8.inc.php @@ -1068,10 +1068,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php index 1869490e8..f87512515 100644 --- a/lang/arabic-utf-8.inc.php +++ b/lang/arabic-utf-8.inc.php @@ -1070,10 +1070,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php index daecf6311..2915befae 100644 --- a/lang/azerbaijani-utf-8.inc.php +++ b/lang/azerbaijani-utf-8.inc.php @@ -1065,10 +1065,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/bangla-utf-8.inc.php b/lang/bangla-utf-8.inc.php index a2db0bd35..4c9fc1952 100644 --- a/lang/bangla-utf-8.inc.php +++ b/lang/bangla-utf-8.inc.php @@ -1044,10 +1044,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php index b8d43a89b..2e34ef00f 100644 --- a/lang/basque-utf-8.inc.php +++ b/lang/basque-utf-8.inc.php @@ -1062,10 +1062,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php index 4cf3c06d1..8b9ddca26 100644 --- a/lang/belarusian_cyrillic-utf-8.inc.php +++ b/lang/belarusian_cyrillic-utf-8.inc.php @@ -1045,10 +1045,6 @@ $strInternalAndForeign = 'Унутраная сувязь не зьяўляец $strViewHasAtLeast = 'Гэты прагляд мае толькі такую колькасьць радкоў. Калі ласка, зьвярніцеся да %sдакумэнтацыі%s.'; $strRelationalKey = 'Ключ сувязі'; $strRelationalDisplayField = 'Адлюстраванае поле сувязі'; -$strSwekeyNoKey = 'Дзейны ключ аўтэнтыфікацыі не падключаны'; -$strSwekeyNoKeyId = 'Файл %s ня ўтрымлівае ніякага ідэнтыфікатара ключа'; -$strSwekeyAuthFailed = 'Апаратная аўтэнтыфікацыя скончылася няўдала'; -$strSwekeyAuthenticating = 'Аўтэнтыфікацыя...'; $strPBXTIndexCacheSize = 'Памер кэшу індэксаў'; $strPBXTRecordCacheSize = 'Памер кэшу запісаў'; $strPBXTLogCacheSize = 'Памер кэшу логаў'; diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php index f9a7730ec..6780fa9e2 100644 --- a/lang/belarusian_latin-utf-8.inc.php +++ b/lang/belarusian_latin-utf-8.inc.php @@ -1053,10 +1053,6 @@ $strInternalAndForeign = 'Unutranaja suviaź nie źjaŭlajecca abaviazkovaj, kal $strViewHasAtLeast = 'Hety prahlad maje tolki takuju kolkaść radkoŭ. Kali łaska, źviarniciesia da %sdakumentacyi%s.'; $strRelationalKey = 'Kluč suviazi'; $strRelationalDisplayField = 'Adlustravanaje pole suviazi'; -$strSwekeyNoKey = 'Dziejny kluč aŭtentyfikacyi nie padklučany'; -$strSwekeyNoKeyId = 'Fajł %s nia ŭtrymlivaje nijakaha identyfikatara kluča'; -$strSwekeyAuthFailed = 'Aparatnaja aŭtentyfikacyja skončyłasia niaŭdała'; -$strSwekeyAuthenticating = 'Aŭtentyfikacyja...'; $strPBXTIndexCacheSize = 'Pamier kešu indeksaŭ'; $strPBXTRecordCacheSize = 'Pamier kešu zapisaŭ'; $strPBXTLogCacheSize = 'Pamier kešu łogaŭ'; diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php index bcc6f26d3..b021511cc 100644 --- a/lang/bosnian-utf-8.inc.php +++ b/lang/bosnian-utf-8.inc.php @@ -1068,10 +1068,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php index 88755006b..4babc11de 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php +++ b/lang/brazilian_portuguese-utf-8.inc.php @@ -1042,10 +1042,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php index 365472110..05a1ecc98 100644 --- a/lang/bulgarian-utf-8.inc.php +++ b/lang/bulgarian-utf-8.inc.php @@ -1065,10 +1065,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php index e6bcb83a6..dbc325acd 100644 --- a/lang/catalan-utf-8.inc.php +++ b/lang/catalan-utf-8.inc.php @@ -1040,10 +1040,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php index a8229f830..f5cb64e77 100644 --- a/lang/chinese_simplified-utf-8.inc.php +++ b/lang/chinese_simplified-utf-8.inc.php @@ -1070,10 +1070,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php index a86f38acb..b67b75075 100644 --- a/lang/chinese_traditional-utf-8.inc.php +++ b/lang/chinese_traditional-utf-8.inc.php @@ -1049,10 +1049,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php index a994ecb83..abc89784c 100644 --- a/lang/croatian-utf-8.inc.php +++ b/lang/croatian-utf-8.inc.php @@ -1043,10 +1043,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php index 46f1259d2..35ce1cd82 100644 --- a/lang/czech-utf-8.inc.php +++ b/lang/czech-utf-8.inc.php @@ -919,10 +919,6 @@ $strSuccess = 'Váš SQL-dotaz byl úspěšně vykonán'; $strSuhosin = 'Server používá Suhosin. Prosím podívejte se do %sdokumentace%s pro popis problémů, které tím mohou být způsobeny.'; $strSum = 'Celkem'; $strSwedish = 'Švédština'; -$strSwekeyAuthenticating = 'Authentizuji...'; -$strSwekeyAuthFailed = 'Hardwarová autentizace selhala'; -$strSwekeyNoKeyId = 'Soubor %s neobsahuje ID klíče'; -$strSwekeyNoKey = 'Nebyl připojen autentizační klíč'; $strSwitchToDatabase = 'Přepnout na zkopírovanou databázi'; $strSwitchToTable = 'Přepnout na zkopírovanou tabulku'; diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php index 9f3010ed3..86cbfe077 100644 --- a/lang/danish-utf-8.inc.php +++ b/lang/danish-utf-8.inc.php @@ -1044,10 +1044,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index 0a0d3d68f..13c6c9d5b 100644 --- a/lang/dutch-utf-8.inc.php +++ b/lang/dutch-utf-8.inc.php @@ -1066,10 +1066,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php index 45855f3d4..527b3836c 100644 --- a/lang/english-utf-8.inc.php +++ b/lang/english-utf-8.inc.php @@ -939,10 +939,6 @@ $strSuccess = 'Your SQL query has been executed successfully'; $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; $strSum = 'Sum'; $strSwedish = 'Swedish'; -$strSwekeyAuthenticating = 'Authenticating...'; -$strSwekeyAuthFailed = 'Hardware authentication failed'; -$strSwekeyNoKeyId = 'File %s does not contain any key id'; -$strSwekeyNoKey = 'No valid authentication key plugged'; $strSwitchToDatabase = 'Switch to copied database'; $strSwitchToTable = 'Switch to copied table'; diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php index 59b2835b6..cf34bb145 100644 --- a/lang/estonian-utf-8.inc.php +++ b/lang/estonian-utf-8.inc.php @@ -1050,10 +1050,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php index 642921da1..978bb17db 100644 --- a/lang/finnish-utf-8.inc.php +++ b/lang/finnish-utf-8.inc.php @@ -1044,10 +1044,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index bc430bf76..2779c9fc4 100644 --- a/lang/french-utf-8.inc.php +++ b/lang/french-utf-8.inc.php @@ -936,10 +936,6 @@ $strSuccess = 'Votre requête SQL a été exécutée avec succès'; $strSuhosin = 'Ce serveur utilise Suhosin. Veuillez vous référer à la %sdocumentation%s pour en connaître les conséquences possibles.'; $strSum = 'Somme'; $strSwedish = 'suédois'; -$strSwekeyAuthenticating = 'Authentification en cours...'; -$strSwekeyAuthFailed = 'L\'authentification matérielle a échoué'; -$strSwekeyNoKeyId = 'Le fichier %s ne contient pas d\'identifiant de clé'; -$strSwekeyNoKey = 'La clé d\'authentification n\'est pas branchée'; $strSwitchToDatabase = 'Aller à la base de données copiée'; $strSwitchToTable = 'Aller à la table copiée'; diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php index 687446451..419bb69e1 100644 --- a/lang/galician-utf-8.inc.php +++ b/lang/galician-utf-8.inc.php @@ -1043,10 +1043,6 @@ $strZip = 'comprimido no formato "zip"'; $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php index af272c6f5..68bd0ec65 100644 --- a/lang/georgian-utf-8.inc.php +++ b/lang/georgian-utf-8.inc.php @@ -1070,10 +1070,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php index cbf2d62ac..31982eaaa 100644 --- a/lang/german-utf-8.inc.php +++ b/lang/german-utf-8.inc.php @@ -1050,10 +1050,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php index baca237f9..aba580da6 100644 --- a/lang/greek-utf-8.inc.php +++ b/lang/greek-utf-8.inc.php @@ -1067,10 +1067,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php index de9ec3af9..6edca7917 100644 --- a/lang/hebrew-utf-8.inc.php +++ b/lang/hebrew-utf-8.inc.php @@ -1062,10 +1062,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php index d88496767..66c6aa15e 100644 --- a/lang/hindi-utf-8.inc.php +++ b/lang/hindi-utf-8.inc.php @@ -1070,10 +1070,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php index 702ce612e..35fbc43e7 100644 --- a/lang/hungarian-utf-8.inc.php +++ b/lang/hungarian-utf-8.inc.php @@ -1061,10 +1061,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php index 108b370ab..ad5d32db2 100644 --- a/lang/indonesian-utf-8.inc.php +++ b/lang/indonesian-utf-8.inc.php @@ -1060,10 +1060,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php index 730f5f3b4..c24851a97 100644 --- a/lang/italian-utf-8.inc.php +++ b/lang/italian-utf-8.inc.php @@ -939,10 +939,6 @@ $strSuccess = 'La query è stata eseguita con successo'; $strSuhosin = 'Sul server è in esecuzione Suhosin. Controlla la documentazione: %sdocumentation%s per possibili problemi.'; $strSum = 'Totali'; $strSwedish = 'Svedese'; -$strSwekeyAuthenticating = 'Autenticazione in corso...'; -$strSwekeyAuthFailed = 'Autenticazione hardware fallita'; -$strSwekeyNoKeyId = 'Il file %s non contiene nessuna chiave ID'; -$strSwekeyNoKey = 'Nessuna chiave di autenticazione valida inserita'; $strSwitchToDatabase = 'Passare al Database copiato'; $strSwitchToTable = 'Passa alla tabella copiata'; diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php index 003511f7e..431259ae3 100644 --- a/lang/japanese-utf-8.inc.php +++ b/lang/japanese-utf-8.inc.php @@ -1061,10 +1061,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php index b67cb0e36..026b25b86 100644 --- a/lang/korean-utf-8.inc.php +++ b/lang/korean-utf-8.inc.php @@ -1065,10 +1065,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php index a08f65620..07cff9baf 100644 --- a/lang/latvian-utf-8.inc.php +++ b/lang/latvian-utf-8.inc.php @@ -1067,10 +1067,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php index 5614b6556..f1868b8f8 100644 --- a/lang/lithuanian-utf-8.inc.php +++ b/lang/lithuanian-utf-8.inc.php @@ -1060,10 +1060,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/macedonian_cyrillic-utf-8.inc.php b/lang/macedonian_cyrillic-utf-8.inc.php index 8ec6742ad..191de2448 100644 --- a/lang/macedonian_cyrillic-utf-8.inc.php +++ b/lang/macedonian_cyrillic-utf-8.inc.php @@ -1045,10 +1045,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php index 07fff6e25..5f872aecb 100644 --- a/lang/malay-utf-8.inc.php +++ b/lang/malay-utf-8.inc.php @@ -1082,10 +1082,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php index c62a6bdae..8c1176333 100644 --- a/lang/mongolian-utf-8.inc.php +++ b/lang/mongolian-utf-8.inc.php @@ -1065,10 +1065,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php index 4dd8bae57..32db744d3 100644 --- a/lang/norwegian-utf-8.inc.php +++ b/lang/norwegian-utf-8.inc.php @@ -937,10 +937,6 @@ $strSuccess = 'Kommandoen/spørringen er utført'; $strSuhosin = 'Tjeneren kjører med Suhosin. Sjekk %sdokumentasjonen%s for potensielle problemer.'; $strSum = 'Sum'; $strSwedish = 'svensk'; -$strSwekeyAuthenticating = 'Autentiserer...'; -$strSwekeyAuthFailed = 'Maskinvaregodkjenning mislyktes'; -$strSwekeyNoKey = 'Ingen gyldig autentiseringsnøkkel plugget'; -$strSwekeyNoKeyId = 'Fila %s inneholder ingen nøkkel id'; $strSwitchToDatabase = 'Bytt til kopiert database'; $strSwitchToTable = 'Bytt til kopiert tabell'; diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php index b960da898..9d74c72a1 100644 --- a/lang/persian-utf-8.inc.php +++ b/lang/persian-utf-8.inc.php @@ -1067,10 +1067,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php index 9032a397f..ac1a2c8d3 100644 --- a/lang/polish-utf-8.inc.php +++ b/lang/polish-utf-8.inc.php @@ -1038,10 +1038,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php index 9d9c35485..5caa5715d 100644 --- a/lang/portuguese-utf-8.inc.php +++ b/lang/portuguese-utf-8.inc.php @@ -1071,10 +1071,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php index e96834c04..2b2a40304 100644 --- a/lang/romanian-utf-8.inc.php +++ b/lang/romanian-utf-8.inc.php @@ -1059,10 +1059,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php index 012600c53..3c13273b2 100644 --- a/lang/russian-utf-8.inc.php +++ b/lang/russian-utf-8.inc.php @@ -1046,10 +1046,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php index 81d1f6731..717b366dc 100644 --- a/lang/serbian_cyrillic-utf-8.inc.php +++ b/lang/serbian_cyrillic-utf-8.inc.php @@ -1044,10 +1044,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php index 1ac558fd4..545d5962c 100644 --- a/lang/serbian_latin-utf-8.inc.php +++ b/lang/serbian_latin-utf-8.inc.php @@ -1044,10 +1044,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/sinhala-utf-8.inc.php b/lang/sinhala-utf-8.inc.php index 7e9fba0dd..3cc95e555 100644 --- a/lang/sinhala-utf-8.inc.php +++ b/lang/sinhala-utf-8.inc.php @@ -1047,10 +1047,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php index ef3923a51..0564319a4 100644 --- a/lang/slovak-utf-8.inc.php +++ b/lang/slovak-utf-8.inc.php @@ -1045,10 +1045,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index 652dcc8d6..ce149e057 100644 --- a/lang/slovenian-utf-8.inc.php +++ b/lang/slovenian-utf-8.inc.php @@ -1064,10 +1064,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php index 8699dd434..8144f6911 100644 --- a/lang/spanish-utf-8.inc.php +++ b/lang/spanish-utf-8.inc.php @@ -1040,10 +1040,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php index dbc517572..f0ecc0340 100644 --- a/lang/swedish-utf-8.inc.php +++ b/lang/swedish-utf-8.inc.php @@ -937,10 +937,6 @@ $strSuccess = 'Din SQL-fråga utfördes korrekt'; $strSuhosin = 'Server körs med Suhosin. Se %sdokumentation%s för möjliga frågor.'; $strSum = 'Summa'; $strSwedish = 'Svensk'; -$strSwekeyAuthenticating = 'Autenticiering pågår...'; -$strSwekeyAuthFailed = 'Hårdvaruautenticiering misslyckades'; -$strSwekeyNoKeyId = 'Filen %s innehåller inget nyckelid'; -$strSwekeyNoKey = 'Giltig autenticieringsnyckel saknas'; $strSwitchToDatabase = 'Byt till kopierad databas'; $strSwitchToTable = 'Byt till kopierad tabell'; diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php index 9d225dc55..e555c499e 100644 --- a/lang/tatarish-utf-8.inc.php +++ b/lang/tatarish-utf-8.inc.php @@ -1056,10 +1056,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php index 996a0c1ac..7dcfc31c5 100644 --- a/lang/thai-utf-8.inc.php +++ b/lang/thai-utf-8.inc.php @@ -1066,10 +1066,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php index 0121fa930..6a4b845bf 100644 --- a/lang/turkish-utf-8.inc.php +++ b/lang/turkish-utf-8.inc.php @@ -1050,10 +1050,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php index 4e76c559a..3c8a3082f 100644 --- a/lang/ukrainian-utf-8.inc.php +++ b/lang/ukrainian-utf-8.inc.php @@ -1064,10 +1064,6 @@ $strInternalAndForeign = 'An internal relation is not necessary when a correspon $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strRelationalKey = 'Relational key'; //to translate $strRelationalDisplayField = 'Relational display field'; //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 $strPBXTIndexCacheSize = 'Index cache size'; //to translate $strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTLogCacheSize = 'Log cache size'; //to translate diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index 934eade98..f050a44ff 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -12,8 +12,6 @@ if (! defined('PHPMYADMIN')) { exit; } -require './libraries/auth/swekey/swekey.auth.lib.php'; - if (function_exists('mcrypt_encrypt') || PMA_dl('mcrypt')) { /** * Uses faster mcrypt library if available @@ -218,32 +216,6 @@ if (top != self) { echo ''; exit; } - - // 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(); - 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 Swekey Integration - ?>
@@ -265,7 +237,7 @@ if (top != self) {
- /> +
@@ -411,11 +383,6 @@ function PMA_auth_check() return false; } - // BEGIN Swekey Integration - if (! Swekey_auth_check()) - return false; - // END Swekey Integration - if (defined('PMA_CLEAR_COOKIES')) { foreach($GLOBALS['cfg']['Servers'] as $key => $val) { PMA_removeCookie('pmaPass-' . $key); diff --git a/libraries/auth/swekey/authentication.inc.php b/libraries/auth/swekey/authentication.inc.php deleted file mode 100644 index 3b86b881d..000000000 --- a/libraries/auth/swekey/authentication.inc.php +++ /dev/null @@ -1,115 +0,0 @@ - -
- diff --git a/libraries/auth/swekey/swekey.auth.lib.php b/libraries/auth/swekey/swekey.auth.lib.php deleted file mode 100644 index 3e96c255c..000000000 --- a/libraries/auth/swekey/swekey.auth.lib.php +++ /dev/null @@ -1,122 +0,0 @@ - - - - - diff --git a/libraries/auth/swekey/swekey.php b/libraries/auth/swekey/swekey.php deleted file mode 100644 index 9d2b5dbaf..000000000 --- a/libraries/auth/swekey/swekey.php +++ /dev/null @@ -1,397 +0,0 @@ -"; - -/** - * Servers addresses - * Use the Swekey_SetXxxServer($server) functions to set them - */ - -global $gSwekeyCheckServer; -if (! isset($gSwekeyCheckServer)) - $gSwekeyCheckServer = 'http://auth-check.musbe.net'; - -global $gSwekeyRndTokenServer; -if (! isset($gSwekeyRndTokenServer)) - $gSwekeyRndTokenServer = 'http://auth-rnd-gen.musbe.net'; - -global $gSwekeyStatusServer; -if (! isset($gSwekeyStatusServer)) - $gSwekeyStatusServer = 'http://auth-status.musbe.net'; - -/** - * Change the address of the Check server. - * If $server is empty the default value 'http://auth-check.musbe.net' will be used - * - * @param server The protocol and hostname to use - * @access public - */ -function Swekey_SetCheckServer($server) -{ - global $gSwekeyCheckServer; - if (empty($server)) - $gSwekeyCheckServer = 'http://auth-check.musbe.net'; - else - $gSwekeyCheckServer = $server; -} - -/** - * Change the address of the Random Token Generator server. - * If $server is empty the default value 'http://auth-rnd-gen.musbe.net' will be used - * - * @param server The protocol and hostname to use - * @access public - */ -function Swekey_SetRndTokenServer($server) -{ - global $gSwekeyRndTokenServer; - if (empty($server)) - $gSwekeyRndTokenServer = 'http://auth-rnd-gen.musbe.net'; - else - $gSwekeyRndTokenServer = $server; -} - -/** - * Change the address of the Satus server. - * If $server is empty the default value 'http://auth-status.musbe.net' will be used - * - * @param server The protocol and hostname to use - * @access public - */ -function Swekey_SetStatusServer($server) -{ - global $gSwekeyStatusServer; - if (empty($server)) - $gSwekeyStatusServer = 'http://auth-status.musbe.net'; - else - $gSwekeyStatusServer = $server; -} - -/** - * Return the last error. - * - * @return The Last Error - * @access public - */ -function Swekey_GetLastError() -{ - global $gSwekeyLastError; - return $gSwekeyLastError; -} - -/** - * Return the last result. - * - * @return The Last Error - * @access public - */ -function Swekey_GetLastResult() -{ - global $gSwekeyLastResult; - return $gSwekeyLastResult; -} - -/** - * Send a synchronous request to the server. - * This function manages timeout then will not block if one of the server is down - * - * @param url The url to get - * @param response_code The response code - * @return The body of the response or "" in case of error - * @access private - */ -function Swekey_HttpGet($url, &$response_code) -{ - global $gSwekeyLastError; - $gSwekeyLastError = 0; - global $gSwekeyLastResult; - $gSwekeyLastResult = ""; - - // you should install the pecl_http to be able to handle timeouts - if (class_exists('HttpRequest')) - { - // retry if one of the server is down - for ($num=1; $num <= 3; $num++ ) - { - $r = new HttpRequest($url); - $options = array('timeout' => '3'); - - if (substr($url,0, 6) == "https:") - { - $sslOptions = array(); - $sslOptions['verifypeer'] = true; - - $capath = __FILE__; - $name = strrchr($capath, '/'); - if (empty($name)) // windows - $name = strrchr($capath, '\\'); - $capath = substr($capath, 0, strlen($capath) - strlen($name) + 1).'musbe-ca.crt'; - - if (file_exists($capath)) - $sslOptions['capath'] = $capath; - - $options['ssl'] = $sslOptions; - } - - $r->setOptions($options); - - // try - { - $reply = $r->send(); - $res = $reply->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 ""; - } - - - $gSwekeyLastResult = $res; - 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) - { - $gSwekeyLastResult = $res; - return $res; - } - - $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 Half Random Token - * The RT is a 64 vhars hexadecimal value - * This function get a new random token and reuse it. - * Token are refetched from the server only once every 30 seconds. - * You should always use this function to get half random token. - * @access public - */ -function Swekey_GetFastHalfRndToken() -{ - $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."00000000000000000000000000000000"; -} - -/** - * 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 = Swekey_GetFastHalfRndToken(); - if (strlen($res) == 64) - return substr($res, 0, 32).strtoupper(md5("Musbe Authentication Key" + mt_rand() + date(DATE_ATOM))); - - return ""; -} - - -/** - * 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 stolen (typo kept for backward comp) -define ("SWEKEY_STATUS_STOLEN",4); // The key was stolen -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/swekey/unplugged.php b/libraries/auth/swekey/unplugged.php deleted file mode 100644 index 504476b56..000000000 --- a/libraries/auth/swekey/unplugged.php +++ /dev/null @@ -1,9 +0,0 @@ - diff --git a/libraries/config.default.php b/libraries/config.default.php index 750850cf2..293b7ee8d 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -161,14 +161,6 @@ $cfg['Servers'][$i]['controlpass'] = ''; */ $cfg['Servers'][$i]['auth_type'] = 'config'; -/** - * File containing Swekey ids and login names (see /contrib); - * leave empty to deactivate Swekey hardware authentication - * - * @global string $cfg['Servers'][$i]['auth_swekey_config'] - */ -$cfg['Servers'][$i]['auth_swekey_config'] = ''; - /** * MySQL user *