From 24dfcd1f4a2358cf07efef8431421d88965c6aa9 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Fri, 2 Feb 2018 18:58:23 +0100
Subject: [PATCH 1/3] fixed certificate buttons

---
 lam/templates/config/mainmanage.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lam/templates/config/mainmanage.php b/lam/templates/config/mainmanage.php
index 90e0a951..12f1ef28 100644
--- a/lam/templates/config/mainmanage.php
+++ b/lam/templates/config/mainmanage.php
@@ -21,10 +21,11 @@ use \htmlResponsiveSelect;
 use \htmlResponsiveInputCheckbox;
 use \htmlResponsiveInputField;
 use \htmlDiv;
+use \htmlHiddenInput;
 /*
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2003 - 2017  Roland Gruber
+  Copyright (C) 2003 - 2018  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -87,7 +88,7 @@ if (isset($_POST['cancel'])) {
 $errors = array();
 $messages = array();
 // check if submit button was pressed
-if (isset($_POST['submit'])) {
+if (isset($_POST['submitFormData'])) {
 	// set master password
 	if (isset($_POST['masterpassword']) && ($_POST['masterpassword'] != "")) {
 		if ($_POST['masterpassword'] && $_POST['masterpassword2'] && ($_POST['masterpassword'] == $_POST['masterpassword2'])) {
@@ -446,6 +447,7 @@ if ($cfg->isWritable()) {
 	$buttonTable->addElement(new htmlSpacer('1rem', null));
 	$buttonTable->addElement(new htmlButton('cancel', _("Cancel")));
 	$row->add($buttonTable, 12);
+	$row->add(new htmlHiddenInput('submitFormData', '1'), 12);
 }
 
 $box = new htmlDiv(null, $row);

From 93a409babd07f9839068164a20fbcbdaba528afd Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Tue, 16 Jan 2018 18:31:52 +0100
Subject: [PATCH 2/3] #44 fixed login issue # Conflicts: #	lam/HISTORY

---
 lam/templates/login.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lam/templates/login.php b/lam/templates/login.php
index 5a12114f..44342a89 100644
--- a/lam/templates/login.php
+++ b/lam/templates/login.php
@@ -170,12 +170,12 @@ $_SESSION['header'] .= "<meta http-equiv=\"pragma\" content=\"no-cache\">\n		<me
 /**
 * Displays the login window.
 *
-* @param LAMConfig $config_object current active configuration
-* @param LAMCfgMain $cfgMain main configuration
 * @param \LAM\ENV\LAMLicenseValidator $licenseValidator license validator
 * @param string $error_message error message to display
 */
-function display_LoginPage(LAMConfig $config_object, LAMCfgMain $cfgMain, $licenseValidator, $error_message) {
+function display_LoginPage($licenseValidator, $error_message) {
+	$config_object = $_SESSION['config'];
+	$cfgMain = $_SESSION["cfgMain"];
 	logNewMessage(LOG_DEBUG, "Display login page");
 	// generate 256 bit key and initialization vector for user/passwd-encryption
 	if(function_exists('openssl_random_pseudo_bytes') && ($cfgMain->encryptSession == 'true')) {
@@ -489,7 +489,7 @@ if(isset($_POST['checklogin'])) {
 		if($_POST['passwd'] == "") {
 			logNewMessage(LOG_DEBUG, "Empty password for login");
 			$error_message = _("Empty password submitted. Please try again.");
-			display_LoginPage($_SESSION['config'], $_SESSION["cfgMain"], $licenseValidator, $error_message); // Empty password submitted. Return to login page.
+			display_LoginPage($licenseValidator, $error_message); // Empty password submitted. Return to login page.
 			exit();
 		}
 		$username = $_POST['username'];
@@ -547,7 +547,7 @@ if(isset($_POST['checklogin'])) {
 			$error_message = $searchError;
 			logNewMessage(LOG_ERR, 'User ' . $username . ' (' . $clientSource . ') failed to log in. ' . $searchError . '');
 			$searchLDAP->close();
-			display_LoginPage($_SESSION['config'], $_SESSION["cfgMain"], $licenseValidator, $error_message);
+			display_LoginPage($licenseValidator, $error_message);
 			exit();
 		}
 		$searchLDAP->close();
@@ -600,11 +600,11 @@ if(isset($_POST['checklogin'])) {
 			$error_message = _("LDAP error, server says:") .  "\n<br>($result) " . ldap_err2str($result);
 			logNewMessage(LOG_ERR, 'User ' . $username . ' (' . $clientSource . ') failed to log in (LDAP error: ' . ldap_err2str($result) . ').');
 		}
-		display_LoginPage($_SESSION['config'], $_SESSION["cfgMain"], $licenseValidator, $error_message);
+		display_LoginPage($licenseValidator, $error_message);
 		exit();
 	}
 }
 
 //displays the login window
-display_LoginPage($_SESSION["config"], $_SESSION["cfgMain"], $licenseValidator, $error_message);
+display_LoginPage($licenseValidator, $error_message);
 ?>

From c7462fa8622775571d45755bcf8bb97cacd89e6e Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Sun, 4 Feb 2018 17:45:12 +0100
Subject: [PATCH 3/3] 6.2.1

---
 lam-packaging/debian/changelog | 6 ++++++
 lam/HISTORY                    | 7 +++++++
 lam/VERSION                    | 2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/lam-packaging/debian/changelog b/lam-packaging/debian/changelog
index b93d6d03..61d317a5 100644
--- a/lam-packaging/debian/changelog
+++ b/lam-packaging/debian/changelog
@@ -1,3 +1,9 @@
+ldap-account-manager (6.2.1-1) unstable; urgency=medium
+
+  * new upstream release
+
+ -- Roland Gruber <post@rolandgruber.de>  Sun, 04 Feb 2018 17:43:51 +0100
+
 ldap-account-manager (6.2-1) unstable; urgency=medium
 
   * new upstream release
diff --git a/lam/HISTORY b/lam/HISTORY
index 587c5c65..f45ab248 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -1,3 +1,10 @@
+04.02.2018 6.2.1
+  - Fixed bugs:
+   -> Login page not working when no server profile exists (44)
+   -> LAM Pro: Password Self Reset has issues when both security question and confirmation mail are activated.
+   -> LAM main configuration: certificate buttons do not work
+
+
 13.12.2017 6.2
   - License changed from GPL v2 to GPL v3
   - PHP 5.6 and Internet Explorer 11 or later required
diff --git a/lam/VERSION b/lam/VERSION
index 0cda48ac..024b066c 100644
--- a/lam/VERSION
+++ b/lam/VERSION
@@ -1 +1 @@
-6.2
+6.2.1