From 1602db304aaa6e44bf012d9239600580660b5a13 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Wed, 19 Feb 2014 09:27:22 -0800
Subject: [PATCH] Document password functions

---
 adminer/include/auth.inc.php      | 18 ------------------
 adminer/include/functions.inc.php | 28 ++++++++++++++++++++++++++++
 changes.txt                       |  1 +
 3 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/adminer/include/auth.inc.php b/adminer/include/auth.inc.php
index 5edd0abc..1dea7fa6 100644
--- a/adminer/include/auth.inc.php
+++ b/adminer/include/auth.inc.php
@@ -108,24 +108,6 @@ function auth_error($exception = null) {
 	page_footer("auth");
 }
 
-function set_password($vendor, $server, $username, $password) {
-	$_SESSION["pwds"][$vendor][$server][$username] = ($_COOKIE["adminer_key"] && is_string($password)
-		? array(encrypt_string($password, $_COOKIE["adminer_key"]))
-		: $password
-	);
-}
-
-function get_password() {
-	$return = get_session("pwds");
-	if (is_array($return)) {
-		$return = ($_COOKIE["adminer_key"]
-			? decrypt_string($return[0], $_COOKIE["adminer_key"])
-			: false
-		);
-	}
-	return $return;
-}
-
 if (isset($_GET["username"])) {
 	if (!class_exists("Min_DB")) {
 		unset($_SESSION["pwds"][DRIVER]);
diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 8aac0fb5..a2f804a6 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -249,6 +249,34 @@ function sid() {
 	return $return;
 }
 
+/** Set password to session
+* @param string
+* @param string
+* @param string
+* @param string
+* @return null
+*/
+function set_password($vendor, $server, $username, $password) {
+	$_SESSION["pwds"][$vendor][$server][$username] = ($_COOKIE["adminer_key"] && is_string($password)
+		? array(encrypt_string($password, $_COOKIE["adminer_key"]))
+		: $password
+	);
+}
+
+/** Get password from session
+* @return string
+*/
+function get_password() {
+	$return = get_session("pwds");
+	if (is_array($return)) {
+		$return = ($_COOKIE["adminer_key"]
+			? decrypt_string($return[0], $_COOKIE["adminer_key"])
+			: false
+		);
+	}
+	return $return;
+}
+
 /** Shortcut for $driver->quote($string)
 * @param string
 * @return string
diff --git a/changes.txt b/changes.txt
index 7ef8c7e3..bb87c263 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,5 +1,6 @@
 Adminer 4.0.4-dev:
 SQLite: Display auto-created unique indexes, bug since Adminer 3.5.0
+Editor: Fix login() method, bug since Adminer 4.0.0
 
 Adminer 4.0.3 (released 2014-02-01)
 MongoDB: insert, truncate, indexes