The branch, master has been updated via 675dee3761bae8e88ed4a80be107e92faaaa0c50 (commit) via 973096dc7c2103905e6add95d8282492fbafe115 (commit) via fcef36d1fcc4bf60d33c16ed8775746d4ca89305 (commit) via 54cf26644a465a9a4d0c184d8f9282f54ba3021c (commit) via 4f2251417ce9944a22cef94ae72c6fa88f6037e2 (commit) from d14a6876cf75ecd1fa6375aa8a7d0da81a10b7a9 (commit)

- Log ----------------------------------------------------------------- commit 675dee3761bae8e88ed4a80be107e92faaaa0c50 Author: Michal Čihař mcihar@novell.com Date: Tue Jun 7 13:28:13 2011 +0200

Add forgotted example for signon script

commit 973096dc7c2103905e6add95d8282492fbafe115 Merge: fcef36d1fcc4bf60d33c16ed8775746d4ca89305 54cf26644a465a9a4d0c184d8f9282f54ba3021c Author: Michal Čihař mcihar@novell.com Date: Tue Jun 7 13:27:52 2011 +0200

Merge remote-tracking branch 'origin/QA_3_4'

commit fcef36d1fcc4bf60d33c16ed8775746d4ca89305 Author: Michal Čihař mcihar@novell.com Date: Tue Jun 7 13:27:38 2011 +0200

Fixup merge

-----------------------------------------------------------------------

Summary of changes: po/fr.po | 5 ----- scripts/signon-script.php | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 scripts/signon-script.php

diff --git a/po/fr.po b/po/fr.po index cf99204..f4b2828 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8079,13 +8079,8 @@ msgstr "passepartout"

#: server_privileges.php:2295 #| msgid "View %s has been dropped" -<<<<<<< HEAD msgid "User has been added." msgstr "La vue %s a été supprimée" -======= -msgid "New user has been added." -msgstr "Un utilisateur a été ajouté" ->>>>>>> pootle/master

#: server_processlist.php:29 #, php-format diff --git a/scripts/signon-script.php b/scripts/signon-script.php new file mode 100644 index 0000000..95efff2 --- /dev/null +++ b/scripts/signon-script.php @@ -0,0 +1,24 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Single signon for phpMyAdmin + * + * This is just example how to use script based single signon with + * phpMyAdmin, it is not intended to be perfect code and look, only + * shows how you can integrate this functionality in your application. + * + * @package phpMyAdmin + * @subpackage Example + */ + + +/** + * This function returns username and password. + * + * It can optionally use configured username as parameter. + */ +function get_login_credentials($user) { + return array('root', ''); +} + +?>

hooks/post-receive