From 2e5b6f3b939478f7ee7f381d50b28d1a6a1dfff1 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Sun, 16 Apr 2006 12:45:22 +0000
Subject: [PATCH] master password can be changed on new general configuration
 page

---
 lam/templates/config/profmanage.php | 68 ++++-------------------------
 1 file changed, 9 insertions(+), 59 deletions(-)

diff --git a/lam/templates/config/profmanage.php b/lam/templates/config/profmanage.php
index 81d880f1..647973bf 100644
--- a/lam/templates/config/profmanage.php
+++ b/lam/templates/config/profmanage.php
@@ -117,16 +117,6 @@ if ($_POST['submit']) {
 		}
 		else $error = _("Profile passwords are different or empty!");
 	}
-	// set master password
-	elseif ($_POST['action'] == "setmasterpass") {
-		if ($_POST['masterpassword'] && $_POST['masterpassword2'] && ($_POST['masterpassword'] == $_POST['masterpassword2'])) {
-			$config = new CfgMain();
-			$config->password = $_POST['masterpassword'];
-			$config->save();
-			$msg = _("New master password set successfully.");
-		}
-		else $error = _("Master passwords are different or empty!");
-	}
 	// set default profile
 	elseif ($_POST['action'] == "setdefault") {
 		$config = new CfgMain();
@@ -163,7 +153,7 @@ if (!isset($cfg->default) && !isset($cfg->password)) {
 			<table cellspacing=0 border=0>
 
 				<!-- add profile -->
-				<tr bgcolor="#dbdbff">
+				<tr>
 					<td>
 						<input type="radio" name="action" value="add" checked>
 					</td>
@@ -185,7 +175,7 @@ if (!isset($cfg->default) && !isset($cfg->password)) {
 					?>
 					</td>
 				</tr>
-				<tr bgcolor="#dbdbff">
+				<tr>
 					<td>&nbsp;</td>
 					<td>&nbsp;</td>
 					<td align="right">
@@ -194,7 +184,7 @@ if (!isset($cfg->default) && !isset($cfg->password)) {
 					</td>
 					<td></td>
 				</tr>
-				<tr bgcolor="#dbdbff">
+				<tr>
 					<td>&nbsp;</td>
 					<td>&nbsp;</td>
 					<td align="right">
@@ -209,7 +199,7 @@ if (!isset($cfg->default) && !isset($cfg->password)) {
 				</tr>
 
 				<!-- rename profile -->
-				<tr bgcolor="#dbdbff">
+				<tr>
 					<td>
 						<input type="radio" name="action" value="rename">
 					</td>
@@ -243,7 +233,7 @@ if (!isset($cfg->default) && !isset($cfg->password)) {
 				</tr>
 
 				<!-- delete profile -->
-				<tr bgcolor="#dbdbff">
+				<tr>
 					<td>
 						<input type="radio" name="action" value="delete">
 					</td>
@@ -273,7 +263,7 @@ if (!isset($cfg->default) && !isset($cfg->password)) {
 				</tr>
 
 				<!-- set profile password -->
-				<tr bgcolor="#dbdbff">
+				<tr>
 					<td>
 						<input type="radio" name="action" value="setpass">
 					</td>
@@ -301,7 +291,7 @@ if (!isset($cfg->default) && !isset($cfg->password)) {
 					?>
 					</td>
 				</tr>
-				<tr bgcolor="#dbdbff">
+				<tr>
 					<td>&nbsp;</td>
 					<td>&nbsp;</td>
 					<td align="right">
@@ -311,15 +301,12 @@ if (!isset($cfg->default) && !isset($cfg->password)) {
 					<td>&nbsp;</td>
 				</tr>
 
-				<tr>
-					<td colspan=4>&nbsp</td>
-				</tr>
 				<tr>
 					<td colspan=4>&nbsp</td>
 				</tr>
 
 				<!-- change default profile -->
-				<tr bgcolor="#dbdbff">
+				<tr>
 					<td>
 						<input type="radio" name="action" value="setdefault">
 					</td>
@@ -350,43 +337,6 @@ if (!isset($cfg->default) && !isset($cfg->password)) {
 					</td>
 				</tr>
 
-				<tr>
-					<td colspan=4>&nbsp</td>
-				</tr>
-
-				<!-- set master password -->
-				<tr bgcolor="#dbdbff">
-					<td>
-						<input type="radio" name="action" value="setmasterpass">
-					</td>
-					<td>
-						<b>
-							<?php echo _("Change master password"); ?>
-						</b>
-					</td>
-					<td align="right">
-						<?php echo _("New master password") . ":"; ?>
-						<input type="password" name="masterpassword">
-					</td>
-					<td>&nbsp;
-					<?PHP
-						// help link
-						echo "<a href=\"../help.php?HelpNumber=235\" target=\"lamhelp\">";
-						echo "<img src=\"../../graphics/help.png\" alt=\"" . _('Help') . "\" title=\"" . _('Help') . "\">";
-						echo "</a>\n";
-					?>
-					</td>
-				</tr>
-				<tr bgcolor="#dbdbff">
-					<td>&nbsp;</td>
-					<td>&nbsp;</td>
-					<td align="right">
-						<?php echo _("Reenter new master password") . ":"; ?>
-						<input type="password" name="masterpassword2">
-					</td>
-					<td>&nbsp;</td>
-				</tr>
-
 			</table>
 			</fieldset>
 			</td></tr>
@@ -395,7 +345,7 @@ if (!isset($cfg->default) && !isset($cfg->password)) {
 
 			<!-- password field and submit button -->
 			<b>
-				<?php echo _("Master Password:"); ?>
+				<?php echo _("Master password:"); ?>
 			</b>
 			&nbsp
 			<input type="password" name="passwd">