[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1883-gea10000 - Git

23 May 2011

The branch, master has been updated
       via  ea10000042cfc3f5cc3415cf17d096b93f290ed4 (commit)
       via  548b62e93f2281805aff12f286e4df011c8791c4 (commit)
       via  181705cbd1a497b809788701e2557b48a36e2788 (commit)
       via  adc6de06850e57cdb0118f9ca6f3d90f4bba47a8 (commit)
       via  05f65f2bca45054912fb5cf3681fd1e293279347 (commit)
       via  6b1dd6caf623085a09b8354feff54aa02f271390 (commit)
       via  bacc729edaa16f87e952c60cd164bb62cd2b0044 (commit)
       via  ededdf64076367b0efc3f9d68963e9722c475e1e (commit)
       via  b8deb3c7b93cb2951a8ff0267456b0ce23615a20 (commit)
       via  f74b49611a46415f0838af35d5aa035d8ae7bcd5 (commit)
       via  a95fe95dc246616319e52b6de68897d4e0ad670e (commit)
       via  c9174049b18adb420a55ec34ee5b5674316c8ce1 (commit)
       via  e61df1134372c8959be7aa6b736384bd159c0b51 (commit)
       via  4072219f1e50b5e6252d4bd1d209f9520999c8e4 (commit)
       via  c32f8efc177599879876f27a85385a2ed29280d4 (commit)
       via  5e4c1d0fa2c939735d583d74d08b1d34c14f71da (commit)
       via  0d54a65512ac49433103e4b6763729cbf094e937 (commit)
       via  4e23a4b33f8d56dc7e2af41c498eff150e9f13c0 (commit)
       via  965425b326691ff245cf4534ab8b71a1a8f07dd4 (commit)
       via  165f6d88e6de92f63495ad1a7eb73215454b49ce (commit)
       via  0658795aa0976273b075fdc3312af0e41d8ca05f (commit)
       via  21f6e699a0b266abc06ae8e247282083a0e8f356 (commit)
       via  99fe3292e972e820c06eb220ef5c9e9cf8ba3eff (commit)
       via  d4b262fa70eb4921495c12f7998a95a5834032df (commit)
       via  651c3e562a421985206217c640855fcd4c1410a8 (commit)
       via  2c5a515ad6be2a21a7500ba4c00cc87ae7ee9885 (commit)
       via  48bb25e66bea212ca87383cd8631890821fe7695 (commit)
       via  8deff43c9436e06550de63efd62a8cfa4f1d2915 (commit)
       via  84817e4c0641dd9386fe7d9c3163fe80fdca8d75 (commit)
       via  30d050cd5125b4a856d3fd6ab222157bdcc1125a (commit)
       via  69e263e24373c1d48370a47954b89a4e4df18fc5 (commit)
       via  387eaf26583fe0499cae22e86d2526499d170884 (commit)
       via  90b76c465373144d1451ce4ea30507ec83934ae8 (commit)
       via  1b0f4a680a7665c7c6f26cbf081ba31d24e097c2 (commit)
       via  77a6618c517139f62bb9965d58a314f8e489429b (commit)
       via  6471e199707ac6e01764f71a191f2a561ff66123 (commit)
       via  836370dc20f4dc6664a747007a4364631ba6c1fd (commit)
       via  d59f9c46dfbce26421a3c5381d1da745e7fa77c6 (commit)
       via  76642eb191cda2299d850b3d0912dbb59edbd4b3 (commit)
       via  15be3999e7883c6f7415af04832d51298b407617 (commit)
       via  814bfe3549865b6d779902e1a8c17975ff135e41 (commit)
       via  a1a89b5d8d11a883d5dd9aabe545bc2b22c1982b (commit)
       via  1e24c60b91dd79e471d7c43c8fa363aa5fc7299e (commit)
       via  fac2dc5490b6f83c531c20ac3adb728fe23b0386 (commit)
       via  fb31a7aa26437039e49486b980cc5e6818b9ed44 (commit)
       via  df37f5d3dcd7eab13f423dfa9ad158b952daa42b (commit)
       via  e837ab44313942a4e372e1676417badd2829c446 (commit)
       via  1adda706ac75a5dbb659bfb8b284a4ce47ce9583 (commit)
       via  7e0c1155b13354794aef8a0c25decd6db366dbb1 (commit)
       via  293fa1c9166ab83dd6dc3bd6806e1a09ba99ebbb (commit)
       via  7898fff63f74d3bfd29d277c247836b15ad25d05 (commit)
       via  01bcd1d08abc182eaca48ddc532cdf0dd29378c7 (commit)
       via  694179cd5af071d1779ea25ed673a8a6dc17d360 (commit)
       via  91f658f2f18befea59de33e7635a0e24f2e9431a (commit)
       via  516b9294d21f9e6a1607c57a3cfa69348f9e586f (commit)
       via  8606177287d2040939d22a8a935a679ea356308f (commit)
       via  8d5e5c5d0beed6073c70ca3b827aa00060712faa (commit)
       via  ca62aa55b8ae674985e695454f13d6c653df84f7 (commit)
       via  7a88287bafc64177e10e6e481dc57aebe7367b1e (commit)
       via  57f96c11635e0ef29e0858ec8a08a5ce1e7b779d (commit)
       via  4846f05f1f392aafbea3fbab4f5c048ec422bc72 (commit)
       via  d727a040e44f91ea0dbd2f881365117ca81101c9 (commit)
       via  6c3ee9e419e037e776be4c03ea2484634e70bb0f (commit)
       via  f3c6c3f76d90f43fa9e2e8cba97157f77b2f2017 (commit)
       via  7aebe026446177813337d1238160c25949f99b3f (commit)
       via  05450347f4fe4dbe3d20b0bce97428b899e0ee9b (commit)
       via  325d65d8fe7be268cecbb81cfa4e0f8d23b89c00 (commit)
       via  bfdc27058bb3ac7affa883f9d4fc548ce859564a (commit)
       via  a9cc7165b0cfe562d47660247e49b02eaba893db (commit)
       via  1e11a70f71af68c095c5bae1a91bea035b30ce4b (commit)
       via  07cdf59d649d274a5a13dd6f658e09ee9f2bfe3a (commit)
       via  4cb91e92c24d5e23d2b73b636c7a9b9b4323f613 (commit)
       via  ba51526222702d8df76b728f0d1720f1805082b0 (commit)
      from  21c3493d3c5564c3dfd5ba9e39596b25e2f6569a (commit)
- Log -----------------------------------------------------------------
commit ea10000042cfc3f5cc3415cf17d096b93f290ed4
Merge: 181705cbd1a497b809788701e2557b48a36e2788 548b62e93f2281805aff12f286e4df011c8791c4
Author: Michal Čihař mcihar@novell.com
Date:   Mon May 23 10:41:11 2011 +0200
Merge remote-tracking branch 'origin/QA_3_4'
commit 181705cbd1a497b809788701e2557b48a36e2788
Merge: 05f65f2bca45054912fb5cf3681fd1e293279347 adc6de06850e57cdb0118f9ca6f3d90f4bba47a8
Author: Michal Čihař mcihar@novell.com
Date:   Mon May 23 10:39:33 2011 +0200
Merge remote-tracking branch 'origin/QA_3_4'
commit 05f65f2bca45054912fb5cf3681fd1e293279347
Merge: 6b1dd6caf623085a09b8354feff54aa02f271390 21c3493d3c5564c3dfd5ba9e39596b25e2f6569a
Author: Pootle server pootle@cihar.com
Date:   Sun May 22 20:40:06 2011 +0200
Merge remote-tracking branch 'origin/master'
commit 6b1dd6caf623085a09b8354feff54aa02f271390
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:33:25 2011 +0200
Translation update done using Pootle.
commit bacc729edaa16f87e952c60cd164bb62cd2b0044
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:32:23 2011 +0200
Translation update done using Pootle.
commit ededdf64076367b0efc3f9d68963e9722c475e1e
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:30:48 2011 +0200
Translation update done using Pootle.
commit b8deb3c7b93cb2951a8ff0267456b0ce23615a20
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:29:32 2011 +0200
Translation update done using Pootle.
commit f74b49611a46415f0838af35d5aa035d8ae7bcd5
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:29:04 2011 +0200
Translation update done using Pootle.
commit a95fe95dc246616319e52b6de68897d4e0ad670e
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:28:35 2011 +0200
Translation update done using Pootle.
commit c9174049b18adb420a55ec34ee5b5674316c8ce1
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:28:25 2011 +0200
Translation update done using Pootle.
commit e61df1134372c8959be7aa6b736384bd159c0b51
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:28:08 2011 +0200
Translation update done using Pootle.
commit 4072219f1e50b5e6252d4bd1d209f9520999c8e4
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:27:45 2011 +0200
Translation update done using Pootle.
commit c32f8efc177599879876f27a85385a2ed29280d4
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:27:05 2011 +0200
Translation update done using Pootle.
commit 5e4c1d0fa2c939735d583d74d08b1d34c14f71da
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:26:01 2011 +0200
Translation update done using Pootle.
commit 0d54a65512ac49433103e4b6763729cbf094e937
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:25:28 2011 +0200
Translation update done using Pootle.
commit 4e23a4b33f8d56dc7e2af41c498eff150e9f13c0
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:25:04 2011 +0200
Translation update done using Pootle.
commit 965425b326691ff245cf4534ab8b71a1a8f07dd4
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:24:21 2011 +0200
Translation update done using Pootle.
commit 165f6d88e6de92f63495ad1a7eb73215454b49ce
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:23:57 2011 +0200
Translation update done using Pootle.
commit 0658795aa0976273b075fdc3312af0e41d8ca05f
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:23:22 2011 +0200
Translation update done using Pootle.
commit 21f6e699a0b266abc06ae8e247282083a0e8f356
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:21:56 2011 +0200
Translation update done using Pootle.
commit 99fe3292e972e820c06eb220ef5c9e9cf8ba3eff
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:20:55 2011 +0200
Translation update done using Pootle.
commit d4b262fa70eb4921495c12f7998a95a5834032df
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:20:34 2011 +0200
Translation update done using Pootle.
commit 651c3e562a421985206217c640855fcd4c1410a8
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:20:23 2011 +0200
Translation update done using Pootle.
commit 2c5a515ad6be2a21a7500ba4c00cc87ae7ee9885
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:19:18 2011 +0200
Translation update done using Pootle.
commit 48bb25e66bea212ca87383cd8631890821fe7695
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:18:55 2011 +0200
Translation update done using Pootle.
commit 8deff43c9436e06550de63efd62a8cfa4f1d2915
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:18:34 2011 +0200
Translation update done using Pootle.
commit 84817e4c0641dd9386fe7d9c3163fe80fdca8d75
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:18:02 2011 +0200
Translation update done using Pootle.
commit 30d050cd5125b4a856d3fd6ab222157bdcc1125a
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:17:31 2011 +0200
Translation update done using Pootle.
commit 69e263e24373c1d48370a47954b89a4e4df18fc5
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:16:51 2011 +0200
Translation update done using Pootle.
commit 387eaf26583fe0499cae22e86d2526499d170884
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:15:49 2011 +0200
Translation update done using Pootle.
commit 90b76c465373144d1451ce4ea30507ec83934ae8
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:14:48 2011 +0200
Translation update done using Pootle.
commit 1b0f4a680a7665c7c6f26cbf081ba31d24e097c2
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:14:34 2011 +0200
Translation update done using Pootle.
commit 77a6618c517139f62bb9965d58a314f8e489429b
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:12:33 2011 +0200
Translation update done using Pootle.
commit 6471e199707ac6e01764f71a191f2a561ff66123
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:11:34 2011 +0200
Translation update done using Pootle.
commit 836370dc20f4dc6664a747007a4364631ba6c1fd
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:11:08 2011 +0200
Translation update done using Pootle.
commit d59f9c46dfbce26421a3c5381d1da745e7fa77c6
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:09:55 2011 +0200
Translation update done using Pootle.
commit 76642eb191cda2299d850b3d0912dbb59edbd4b3
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:09:21 2011 +0200
Translation update done using Pootle.
commit 15be3999e7883c6f7415af04832d51298b407617
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:07:54 2011 +0200
Translation update done using Pootle.
commit 814bfe3549865b6d779902e1a8c17975ff135e41
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:07:31 2011 +0200
Translation update done using Pootle.
commit a1a89b5d8d11a883d5dd9aabe545bc2b22c1982b
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:07:09 2011 +0200
Translation update done using Pootle.
commit 1e24c60b91dd79e471d7c43c8fa363aa5fc7299e
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:06:39 2011 +0200
Translation update done using Pootle.
commit fac2dc5490b6f83c531c20ac3adb728fe23b0386
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:05:50 2011 +0200
Translation update done using Pootle.
commit fb31a7aa26437039e49486b980cc5e6818b9ed44
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:05:27 2011 +0200
Translation update done using Pootle.
commit df37f5d3dcd7eab13f423dfa9ad158b952daa42b
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:04:32 2011 +0200
Translation update done using Pootle.
commit e837ab44313942a4e372e1676417badd2829c446
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:04:14 2011 +0200
Translation update done using Pootle.
commit 1adda706ac75a5dbb659bfb8b284a4ce47ce9583
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:03:50 2011 +0200
Translation update done using Pootle.
commit 7e0c1155b13354794aef8a0c25decd6db366dbb1
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:03:27 2011 +0200
Translation update done using Pootle.
commit 293fa1c9166ab83dd6dc3bd6806e1a09ba99ebbb
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:01:38 2011 +0200
Translation update done using Pootle.
commit 7898fff63f74d3bfd29d277c247836b15ad25d05
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 20:01:06 2011 +0200
Translation update done using Pootle.
commit 01bcd1d08abc182eaca48ddc532cdf0dd29378c7
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 19:58:36 2011 +0200
Translation update done using Pootle.
commit 694179cd5af071d1779ea25ed673a8a6dc17d360
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 19:57:20 2011 +0200
Translation update done using Pootle.
commit 91f658f2f18befea59de33e7635a0e24f2e9431a
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 19:55:41 2011 +0200
Translation update done using Pootle.
commit 516b9294d21f9e6a1607c57a3cfa69348f9e586f
Merge: 8606177287d2040939d22a8a935a679ea356308f 6619e39d639bd994f5efe05e2766836cc1945145
Author: Pootle server pootle@cihar.com
Date:   Sun May 22 10:40:07 2011 +0200
Merge remote-tracking branch 'origin/master'
commit 8606177287d2040939d22a8a935a679ea356308f
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 09:04:33 2011 +0200
Translation update done using Pootle.
commit 8d5e5c5d0beed6073c70ca3b827aa00060712faa
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 09:03:50 2011 +0200
Translation update done using Pootle.
commit ca62aa55b8ae674985e695454f13d6c653df84f7
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 09:01:10 2011 +0200
Translation update done using Pootle.
commit 7a88287bafc64177e10e6e481dc57aebe7367b1e
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 09:00:19 2011 +0200
Translation update done using Pootle.
commit 57f96c11635e0ef29e0858ec8a08a5ce1e7b779d
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 08:59:03 2011 +0200
Translation update done using Pootle.
commit 4846f05f1f392aafbea3fbab4f5c048ec422bc72
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 08:58:33 2011 +0200
Translation update done using Pootle.
commit d727a040e44f91ea0dbd2f881365117ca81101c9
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 08:56:16 2011 +0200
Translation update done using Pootle.
commit 6c3ee9e419e037e776be4c03ea2484634e70bb0f
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 08:55:37 2011 +0200
Translation update done using Pootle.
commit f3c6c3f76d90f43fa9e2e8cba97157f77b2f2017
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 08:55:24 2011 +0200
Translation update done using Pootle.
commit 7aebe026446177813337d1238160c25949f99b3f
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 08:54:56 2011 +0200
Translation update done using Pootle.
commit 05450347f4fe4dbe3d20b0bce97428b899e0ee9b
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 08:44:16 2011 +0200
Translation update done using Pootle.
commit 325d65d8fe7be268cecbb81cfa4e0f8d23b89c00
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 08:42:42 2011 +0200
Translation update done using Pootle.
commit bfdc27058bb3ac7affa883f9d4fc548ce859564a
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 08:41:49 2011 +0200
Translation update done using Pootle.
commit a9cc7165b0cfe562d47660247e49b02eaba893db
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 08:41:17 2011 +0200
Translation update done using Pootle.
commit 1e11a70f71af68c095c5bae1a91bea035b30ce4b
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 08:40:45 2011 +0200
Translation update done using Pootle.
commit 07cdf59d649d274a5a13dd6f658e09ee9f2bfe3a
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 08:40:00 2011 +0200
Translation update done using Pootle.
commit 4cb91e92c24d5e23d2b73b636c7a9b9b4323f613
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 08:39:23 2011 +0200
Translation update done using Pootle.
commit ba51526222702d8df76b728f0d1720f1805082b0
Author: Martin Lacina martin@whistler.sk
Date:   Sun May 22 08:37:40 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
 ChangeLog                          |    1 +
 libraries/auth/signon.auth.lib.php |   41 +++++++---
 po/sk.po                           |  145 ++++++++++++++++++-----------------
 scripts/signon.php                 |   15 ++--
 4 files changed, 113 insertions(+), 89 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 99bc2dc..4ad5111 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@
 - bug #3305606 [interface] Show all button wraps on privileges page
 - bug #3305517 [config] Config for export compression not used
 - bug #3305883 [interface] Table is dropped regardless of confirmation
+- [auth] Fixed error handling for signon auth method.
3.4.1.0 (2011-05-20)
 - bug #3301108 [interface] Synchronize and already configured host
diff --git a/libraries/auth/signon.auth.lib.php b/libraries/auth/signon.auth.lib.php
index 3e0d64b..0735020 100644
--- a/libraries/auth/signon.auth.lib.php
+++ b/libraries/auth/signon.auth.lib.php
@@ -202,18 +202,35 @@ function PMA_auth_set_user()
  */
 function PMA_auth_fails()
 {
-    if (! empty($GLOBALS['login_without_password_is_forbidden'])) {
-        $_SESSION['PMA_single_signon_error_message'] = __('Login without a password is forbidden by configuration (see AllowNoPassword)');
-    } elseif (! empty($GLOBALS['allowDeny_forbidden'])) {
-        $_SESSION['PMA_single_signon_error_message'] = __('Access denied');
-    } elseif (! empty($GLOBALS['no_activity'])) {
-        $_SESSION['PMA_single_signon_error_message'] = sprintf(__('No activity within %s seconds; please log in again'), $GLOBALS['cfg']['LoginCookieValidity']);
-    } elseif (PMA_DBI_getError()) {
-        $_SESSION['PMA_single_signon_error_message'] = PMA_sanitize(PMA_DBI_getError());
-    } elseif (isset($php_errormsg)) {
-        $_SESSION['PMA_single_signon_error_message'] = $php_errormsg;
-    } else {
-        $_SESSION['PMA_single_signon_error_message'] = __('Cannot log in to the MySQL server');
+    /* Session name */
+    $session_name = $GLOBALS['cfg']['Server']['SignonSession'];
+
+    /* Does session exist? */
+    if (isset($_COOKIE[$session_name])) {
+        /* End current session */
+        $old_session = session_name();
+        $old_id = session_id();
+        session_write_close();
+
+        /* Load single signon session */
+        session_name($session_name);
+        session_id($_COOKIE[$session_name]);
+        session_start();
+
+        /* Set error message */
+        if (! empty($GLOBALS['login_without_password_is_forbidden'])) {
+            $_SESSION['PMA_single_signon_error_message'] = __('Login without a password is forbidden by configuration (see AllowNoPassword)');
+        } elseif (! empty($GLOBALS['allowDeny_forbidden'])) {
+            $_SESSION['PMA_single_signon_error_message'] = __('Access denied');
+        } elseif (! empty($GLOBALS['no_activity'])) {
+            $_SESSION['PMA_single_signon_error_message'] = sprintf(__('No activity within %s seconds; please log in again'), $GLOBALS['cfg']['LoginCookieValidity']);
+        } elseif (PMA_DBI_getError()) {
+            $_SESSION['PMA_single_signon_error_message'] = PMA_sanitize(PMA_DBI_getError());
+        } elseif (isset($php_errormsg)) {
+            $_SESSION['PMA_single_signon_error_message'] = $php_errormsg;
+        } else {
+            $_SESSION['PMA_single_signon_error_message'] = __('Cannot log in to the MySQL server');
+        }
     }
     PMA_auth();
 } // end of the 'PMA_auth_fails()' function
diff --git a/po/sk.po b/po/sk.po
index eb8345f..68daedb 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-05-18 07:46-0400\n"
-"PO-Revision-Date: 2011-05-18 13:54+0200\n"
+"PO-Revision-Date: 2011-05-22 20:33+0200\n"
 "Last-Translator: Martin Lacina martin@whistler.sk\n"
 "Language-Team: slovak sk@li.org\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Pootle 2.0.5\n"
@@ -641,7 +641,7 @@ msgstr "Celkom"
 #: db_structure.php:455 libraries/StorageEngine.class.php:351
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
-msgstr "Na tomto MySQL servri je prednastaveným úložným systémom %s."
+msgstr "Na tomto MySQL serveri je prednastaveným úložným systémom %s."
#: db_structure.php:483 db_structure.php:500 db_structure.php:501
 #: libraries/display_tbl.lib.php:2178 libraries/display_tbl.lib.php:2183
@@ -1631,7 +1631,7 @@ msgstr "Úložný systém %s je na tomto MySQL serveri dostupný."
 #: libraries/StorageEngine.class.php:357
 #, php-format
 msgid "%s has been disabled for this MySQL server."
-msgstr "Úložný systém %s bol vypnutý na tomto MySQL servri."
+msgstr "Úložný systém %s na tomto MySQL serveri bol vypnutý."
#: libraries/StorageEngine.class.php:361
 #, php-format
@@ -1891,7 +1891,7 @@ msgstr "Skontrolovať oprávnenia"
#: libraries/chart.lib.php:40
 msgid "Query statistics"
-msgstr "Štatistika dopytu"
+msgstr "Štatistika dopytov"
#: libraries/chart.lib.php:63
 msgid "Query execution time comparison (in microseconds)"
@@ -3859,6 +3859,8 @@ msgid ""
 "Leave blank for no [a@http://wiki.phpmyadmin.net/pma/relation%5Drelation-links"
 "[/a] support, suggested: [kbd]pma_relation[/kbd]"
 msgstr ""
+"Nechajte prázdne pre vypnutie [a@http://wiki.phpmyadmin.net/pma/relation"
+"]relation-links[/a] podpory, navrhované: [kbd]pma_relation[/kbd]"
#: libraries/config/messages.inc.php:404
 msgid "Relation table"
@@ -3977,6 +3979,8 @@ msgid ""
 "Leave blank for no SQL query tracking support, suggested: [kbd]pma_tracking[/"
 "kbd]"
 msgstr ""
+"Nechajte prázdne pre vypnutie podpory pre sledovanie SQL dopytov, "
+"navrhované: [kbd]pma_tracking[/kbd]"
#: libraries/config/messages.inc.php:427
 msgid "SQL query tracking table"
@@ -4016,25 +4020,29 @@ msgstr ""
#: libraries/config/messages.inc.php:435
 msgid "Verbose check"
-msgstr ""
+msgstr "Podrobná kontrola"
#: libraries/config/messages.inc.php:436
 msgid ""
 "A user-friendly description of this server. Leave blank to display the "
 "hostname instead."
 msgstr ""
+"Užívateľsky prívetivý popis tohto servera. Ak necháte prízdne, zobrazí sa "
+"namiesto popisu meno servera."
#: libraries/config/messages.inc.php:437
 msgid "Verbose name of this server"
-msgstr ""
+msgstr "Dlhé meno tohto servera"
#: libraries/config/messages.inc.php:438
 msgid "Whether a user should be displayed a &quot;show all (rows)&quot; button"
 msgstr ""
+"Či sa bude užívateľovi zobrazovať tlačidlo &quot;zobraziť všetky "
+"(riadky)&quot;"
#: libraries/config/messages.inc.php:439
 msgid "Allow to display all the rows"
-msgstr ""
+msgstr "Povoliť zobraziť všetky riadky"
#: libraries/config/messages.inc.php:440
 msgid ""
@@ -4045,11 +4053,11 @@ msgstr ""
#: libraries/config/messages.inc.php:441
 msgid "Show password change form"
-msgstr ""
+msgstr "Zobraziť formulár na zmenu hesla"
#: libraries/config/messages.inc.php:442
 msgid "Show create database form"
-msgstr ""
+msgstr "Zobraziť formulár na vytvorenie databázy"
#: libraries/config/messages.inc.php:443
 msgid ""
@@ -4063,43 +4071,44 @@ msgstr "Zobraziť typy polí"
#: libraries/config/messages.inc.php:445
 msgid "Display the function fields in edit/insert mode"
-msgstr ""
+msgstr "Zobraziť zoznam funkcií v móde úprav"
#: libraries/config/messages.inc.php:446
 msgid "Show function fields"
-msgstr ""
+msgstr "Zobraziť zoznam funkcií"
#: libraries/config/messages.inc.php:447
 msgid ""
 "Shows link to [a@http://php.net/manual/function.phpinfo.php%5Dphpinfo()%5B/a] "
 "output"
 msgstr ""
+"Zobraziť odkaz na výstup "
+"[a@http://php.net/manual/function.phpinfo.php%5Dphpinfo()%5B/a] funkcie"
#: libraries/config/messages.inc.php:448
 msgid "Show phpinfo() link"
-msgstr ""
+msgstr "Zobraziť odkaz na phpinfo()"
#: libraries/config/messages.inc.php:449
 msgid "Show detailed MySQL server information"
-msgstr ""
+msgstr "Zobraziť podrobné informácie o MySQL serveri"
#: libraries/config/messages.inc.php:450
 msgid "Defines whether SQL queries generated by phpMyAdmin should be displayed"
 msgstr ""
#: libraries/config/messages.inc.php:451
-#, fuzzy
 msgid "Show SQL queries"
-msgstr "Zobraziť kompletné dopyty"
+msgstr "Zobraziť SQL dopyty"
#: libraries/config/messages.inc.php:452
 msgid "Allow to display database and table statistics (eg. space usage)"
 msgstr ""
+"Povoliť zobrazenie štatistík o databázach a tabuľkách (napr. využité miesto)"
#: libraries/config/messages.inc.php:453
-#, fuzzy
 msgid "Show statistics"
-msgstr "Štatistika riadku"
+msgstr "Zobraziť štatistiky"
#: libraries/config/messages.inc.php:454
 msgid ""
@@ -4109,7 +4118,7 @@ msgstr ""
#: libraries/config/messages.inc.php:455
 msgid "Display database comment instead of its name"
-msgstr ""
+msgstr "Zobraziť komentár k databáze namiesto mena"
#: libraries/config/messages.inc.php:456
 msgid ""
@@ -4121,7 +4130,7 @@ msgstr ""
#: libraries/config/messages.inc.php:457
 msgid "Display table comment instead of its name"
-msgstr ""
+msgstr "Zobraziť komentár k tabuľke namiesto mena"
#: libraries/config/messages.inc.php:458
 msgid "Display table comments in tooltips"
@@ -4133,9 +4142,8 @@ msgid ""
 msgstr ""
#: libraries/config/messages.inc.php:460
-#, fuzzy
 msgid "Skip locked tables"
-msgstr "Zobraziť otvorené tabuľky"
+msgstr "Preskočiť zamknuté tabuľky"
#: libraries/config/messages.inc.php:465
 msgid "Requires SQL Validator to be enabled"
@@ -4156,10 +4164,12 @@ msgid ""
 "[strong]Warning:[/strong] requires PHP SOAP extension or PEAR SOAP to be "
 "installed"
 msgstr ""
+"[strong]Varovanie:[/strong] vyžaduje nainštalované rozšírenia PHP SOAP alebo "
+"PEAR SOAP"
#: libraries/config/messages.inc.php:469
 msgid "Enable SQL Validator"
-msgstr ""
+msgstr "Povoliť kontrolovanie SQL"
#: libraries/config/messages.inc.php:470
 msgid ""
@@ -4180,7 +4190,7 @@ msgstr ""
#: libraries/config/messages.inc.php:473
 msgid "Suggest new database name"
-msgstr ""
+msgstr "Navrhnúť meno novej databázy"
#: libraries/config/messages.inc.php:474
 msgid "A warning is displayed on the main page if Suhosin is detected"
@@ -4188,7 +4198,7 @@ msgstr ""
#: libraries/config/messages.inc.php:475
 msgid "Suhosin warning"
-msgstr ""
+msgstr "Varovanie Suhosin rozšírenia"
#: libraries/config/messages.inc.php:476
 msgid ""
@@ -4208,15 +4218,15 @@ msgstr ""
#: libraries/config/messages.inc.php:479
 msgid "Textarea rows"
-msgstr ""
+msgstr "Riadkov v textovej oblasti"
#: libraries/config/messages.inc.php:480
 msgid "Title of browser window when a database is selected"
-msgstr ""
+msgstr "Popis okna prehliadača pri výbere databázy"
#: libraries/config/messages.inc.php:482
 msgid "Title of browser window when nothing is selected"
-msgstr ""
+msgstr "Popis okna prehliadača keď nie je nič vybrané"
#: libraries/config/messages.inc.php:483
 msgid "Default title"
@@ -4224,11 +4234,11 @@ msgstr "Východzí popis"
#: libraries/config/messages.inc.php:484
 msgid "Title of browser window when a server is selected"
-msgstr ""
+msgstr "Popis okna prehliadača keď je vybraný server"
#: libraries/config/messages.inc.php:486
 msgid "Title of browser window when a table is selected"
-msgstr ""
+msgstr "Popis okna prehliadača keď je vybraná tabuľka"
#: libraries/config/messages.inc.php:488
 msgid ""
@@ -4244,19 +4254,19 @@ msgstr ""
#: libraries/config/messages.inc.php:490
 msgid "Directory on server where you can upload files for import"
-msgstr ""
+msgstr "Adresár na serveri, kde môžete nahrať súbor pre import"
#: libraries/config/messages.inc.php:491
 msgid "Upload directory"
-msgstr ""
+msgstr "Adresár pre nahrávanie"
#: libraries/config/messages.inc.php:492
 msgid "Allow for searching inside the entire database"
-msgstr ""
+msgstr "Povoliť prehľadávať celú databázu"
#: libraries/config/messages.inc.php:493
 msgid "Use database search"
-msgstr ""
+msgstr "Použiť databázové vyhľadávanie"
#: libraries/config/messages.inc.php:494
 msgid ""
@@ -4266,7 +4276,7 @@ msgstr ""
#: libraries/config/messages.inc.php:495
 msgid "Enable the Developer tab in settings"
-msgstr ""
+msgstr "Povoliť záložku Pre vývojára v nastaveniach"
#: libraries/config/messages.inc.php:496
 msgid ""
@@ -4281,11 +4291,11 @@ msgstr ""
#: libraries/config/messages.inc.php:498 setup/frames/index.inc.php:241
 msgid "Check for latest version"
-msgstr ""
+msgstr "Skontrolovať najnovšiu verziu"
#: libraries/config/messages.inc.php:499
 msgid "Enables check for latest version on main phpMyAdmin page"
-msgstr ""
+msgstr "Povoliť kontrolu poslednej verzie na hlavnej stránke phpMyAdmina"
#: libraries/config/messages.inc.php:500 setup/lib/index.lib.php:118
 #: setup/lib/index.lib.php:125 setup/lib/index.lib.php:142
@@ -4293,7 +4303,7 @@ msgstr ""
 #: setup/lib/index.lib.php:161 setup/lib/index.lib.php:164
 #: setup/lib/index.lib.php:200
 msgid "Version check"
-msgstr ""
+msgstr "Kontrola verzie"
#: libraries/config/messages.inc.php:501
 msgid ""
@@ -4331,14 +4341,14 @@ msgstr "CSV pomocou LOAD DATA"
 #: libraries/config/user_preferences.forms.php:245 libraries/export/xls.php:17
 #: libraries/import/xls.php:20
 msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
+msgstr "Excel 97-2003 XLS pracovný zošit"
#: libraries/config/setup.forms.php:252 libraries/config/setup.forms.php:347
 #: libraries/config/user_preferences.forms.php:155
 #: libraries/config/user_preferences.forms.php:249
 #: libraries/export/xlsx.php:17 libraries/import/xlsx.php:20
 msgid "Excel 2007 XLSX Workbook"
-msgstr ""
+msgstr "Excel 2007 XLSX pracovný zošit"
#: libraries/config/setup.forms.php:255 libraries/config/setup.forms.php:356
 #: libraries/config/user_preferences.forms.php:158
@@ -4380,9 +4390,8 @@ msgid "Open Document Text"
 msgstr "Open Document Text"
#: libraries/config/validate.lib.php:202 libraries/config/validate.lib.php:209
-#, fuzzy
 msgid "Could not connect to MySQL server"
-msgstr "Nepodarilo sa pripojiť k zdroju"
+msgstr "Nepodarilo sa pripojiť k MySQL serveru"
#: libraries/config/validate.lib.php:234
 msgid "Empty username while using config authentication method"
@@ -4407,7 +4416,7 @@ msgstr ""
 #: libraries/config/validate.lib.php:367
 #, php-format
 msgid "Incorrect IP address: %s"
-msgstr ""
+msgstr "Nesprávna IP adresa: %s"
#. l10n: Language to use for PHP documentation, please use only languages which do exist in official documentation.
 #: libraries/core.lib.php:264
@@ -4439,7 +4448,7 @@ msgstr "Databáza vyzerá prázdna!"
 #: libraries/db_links.inc.php:66 libraries/relation.lib.php:143
 #: libraries/tbl_links.inc.php:90
 msgid "Tracking"
-msgstr ""
+msgstr "Sledovanie"
#: libraries/db_links.inc.php:71
 msgid "Query"
@@ -4461,7 +4470,7 @@ msgstr ""
#: libraries/db_routines.inc.php:37
 msgid "Return type"
-msgstr ""
+msgstr "Návratový typ"
#: libraries/db_structure.lib.php:48 libraries/display_tbl.lib.php:1923
 msgid ""
@@ -4486,7 +4495,7 @@ msgstr "(alebo soket lokálneho MySQL servra nie je správne nastavený)"
#: libraries/dbi/mysql.dbi.lib.php:370 tbl_structure.php:703
 msgid "Details..."
-msgstr ""
+msgstr "Podrobnosti..."
#: libraries/display_change_password.lib.php:29 main.php:94
 #: user_password.php:119 user_password.php:137
@@ -4514,10 +4523,9 @@ msgstr "Kompatibilné s MySQL 4.0"
#: libraries/display_create_database.lib.php:21
 #: libraries/display_create_database.lib.php:39
-#, fuzzy
 #| msgid "Create new database"
 msgid "Create database"
-msgstr "Vytvoriť novú databázu"
+msgstr "Vytvoriť databázu"
#: libraries/display_create_database.lib.php:33
 msgid "Create"
@@ -4590,7 +4598,7 @@ msgstr "Počet riadkov:"
#: libraries/display_export.lib.php:162
 msgid "Row to begin at:"
-msgstr ""
+msgstr "Začať od riadku:"
#: libraries/display_export.lib.php:173
 msgid "Dump all rows"
@@ -4598,7 +4606,7 @@ msgstr ""
#: libraries/display_export.lib.php:181 libraries/display_export.lib.php:202
 msgid "Output:"
-msgstr ""
+msgstr "Výstup:"
#: libraries/display_export.lib.php:188 libraries/display_export.lib.php:214
 #, php-format
@@ -4639,7 +4647,7 @@ msgstr ""
#: libraries/display_export.lib.php:275
 msgid "use this for future exports"
-msgstr ""
+msgstr "použiť aj pre budúce exporty"
#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
 #: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:517
@@ -4703,7 +4711,7 @@ msgstr ""
#: libraries/display_import.lib.php:76
 msgid "The file is being processed, please be patient."
-msgstr ""
+msgstr "Súbor sa spracováva, buďte prosím trpezliví."
#: libraries/display_import.lib.php:98
 msgid ""
@@ -4732,7 +4740,7 @@ msgstr "Súbor na importovanie:"
 #: libraries/display_import.lib.php:156
 #, php-format
 msgid "File may be compressed (%s) or uncompressed."
-msgstr ""
+msgstr "Súbor môže byť komprimovaný (%s) alebo nekomprimovaný."
#: libraries/display_import.lib.php:158
 msgid ""
@@ -6375,7 +6383,7 @@ msgstr "Cieľová databáza"
 #: libraries/sql_query_form.lib.php:224
 #, php-format
 msgid "Run SQL query/queries on server %s"
-msgstr "Spustiť SQL príkaz(y) na servri %s"
+msgstr "Spustiť SQL príkaz(y) na serveri %s"
#: libraries/sql_query_form.lib.php:241 libraries/sql_query_form.lib.php:265
 #, php-format
@@ -6384,9 +6392,8 @@ msgstr "Spustiť SQL dopyt/dopyty na databázu %s"
#: libraries/sql_query_form.lib.php:297 navigation.php:276
 #: setup/frames/index.inc.php:231
-#, fuzzy
 msgid "Clear"
-msgstr "Kalendár"
+msgstr "Vyčistiť"
#: libraries/sql_query_form.lib.php:302
 msgid "Columns"
@@ -6570,7 +6577,7 @@ msgstr ""
#: libraries/tbl_properties.inc.php:373
 msgid "Get more editing space"
-msgstr ""
+msgstr "Získať viac miesta pre úpravy"
#: libraries/tbl_properties.inc.php:396
 msgctxt "for default"
@@ -6789,7 +6796,7 @@ msgstr "Overenie MySQL spojenia"
#: main.php:119
 msgid "Appearance Settings"
-msgstr ""
+msgstr "Nastavenia vzhľadu"
#: main.php:146 prefs_manage.php:274
 msgid "More settings"
@@ -6838,9 +6845,8 @@ msgid "Contribute"
 msgstr "Prispejte"
#: main.php:218
-#, fuzzy
 msgid "Get support"
-msgstr "Exportovať"
+msgstr "Získať podporu"
#: main.php:219
 msgid "List of changes"
@@ -7152,7 +7158,7 @@ msgstr "Zmeny boli uložené"
#: prefs_forms.php:78
 msgid "Cannot save settings, submitted form contains errors"
-msgstr ""
+msgstr "Nepodarilo sa uložiť nastavenia, odoslaný formulár obsahuje chyby"
#: prefs_manage.php:80
 msgid "Could not import configuration"
@@ -7164,7 +7170,7 @@ msgstr ""
#: prefs_manage.php:128
 msgid "Do you want to import remaining settings?"
-msgstr ""
+msgstr "Prajete si načítať zostávajúce nastavenia?"
#: prefs_manage.php:225 prefs_manage.php:251
 msgid "Saved on: @DATE@"
@@ -7184,7 +7190,7 @@ msgstr ""
#: prefs_manage.php:254
 msgid "You have no saved settings!"
-msgstr ""
+msgstr "Nemáte žiadne uložené nastavenia!"
#: prefs_manage.php:258 prefs_manage.php:312
 msgid "This feature is not supported by your web browser"
@@ -7212,7 +7218,7 @@ msgstr ""
#: prefs_manage.php:308
 msgid "Existing settings will be overwritten!"
-msgstr ""
+msgstr "Súčasné nastavenia budú prepísané!"
#: prefs_manage.php:323
 msgid "You can reset all your settings and restore them to default values."
@@ -8680,12 +8686,12 @@ msgid ""
 "<b>Server traffic</b>: These tables show the network traffic statistics of "
 "this MySQL server since its startup."
 msgstr ""
-"<b>Traffic serveru</b>: Tieto tabuľky zobrazujú štatistiky sieťového "
-"trafficu na tomto MySQL serveri od jeho štartu."
+"<b>Vyťaženie servera</b>: Tieto tabuľky zobrazujú štatistiky sieťovej "
+"premávky na tomto MySQL serveri od jeho štartu."
#: server_status.php:514
 msgid "Traffic"
-msgstr "Prevádzka"
+msgstr "Vyťaženie"
#: server_status.php:514
 msgid ""
@@ -8745,13 +8751,12 @@ msgid "Query type"
 msgstr "Typ dopytu"
#: server_status.php:725 server_status.php:726
-#, fuzzy
 msgid "Show query chart"
-msgstr "SQL dopyt"
+msgstr "Zobraziť graf dopytov"
#: server_status.php:727
 msgid "Note: Generating the query chart can take a long time."
-msgstr ""
+msgstr "Poznámka: Generovanie grafu dopytov môže trvať dlhý čas."
#: server_status.php:872
 msgid "Replication status"
diff --git a/scripts/signon.php b/scripts/signon.php
index acb5f7d..e585625 100644
--- a/scripts/signon.php
+++ b/scripts/signon.php
@@ -11,14 +11,15 @@
  * @subpackage Example
  */
+/* Need to have cookie visible from parent directory */
+session_set_cookie_params(0, '/', '', 0);
+/* Create signon session */
+$session_name = 'SignonSession';
+session_name($session_name);
+session_start();
+
 /* Was data posted? */
 if (isset($_POST['user'])) {
-    /* Need to have cookie visible from parent directory */
-    session_set_cookie_params(0, '/', '', 0);
-    /* Create signon session */
-    $session_name = 'SignonSession';
-    session_name($session_name);
-    session_start();
     /* Store there credentials */
     $_SESSION['PMA_single_signon_user'] = $_POST['user'];
     $_SESSION['PMA_single_signon_password'] = $_POST['password'];
@@ -47,7 +48,7 @@ if (isset($_POST['user'])) {
 <body>
 <?php
 if (isset($_SESSION['PMA_single_signon_error_message'])) {
-    echo '<p class="error">' . $_SESSION['PMA_single_signon_message'] . '</p>';
+    echo '<p class="error">' . $_SESSION['PMA_single_signon_error_message'] . '</p>';
 }
 ?>
 <form action="signon.php" method="post">
hooks/post-receive
-- 
phpMyAdmin


    