From 0d230706fcbea0cbc3664348470dba684850c55f Mon Sep 17 00:00:00 2001
From: Wytze van der Raay <wytze@cacert.org>
Date: Wed, 15 Jan 2014 15:50:40 +0000
Subject: [PATCH] Fix for https://bugs.cacert.org/view.php?id=1195 "Take out
 change ability on pages/account/6.php"

---
 includes/account.php | 18 ------------------
 pages/account/5.php  |  2 +-
 pages/account/6.php  | 22 ++--------------------
 3 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/includes/account.php b/includes/account.php
index 36793f0..5be932b 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -1189,24 +1189,6 @@
 		exit;
 	}
 
-
-	if($oldid == 6 && $_REQUEST['certid'] != "")
-	{
-		if(trim($_REQUEST['description']) != ""){
-			$description= trim(mysql_real_escape_string(stripslashes($_REQUEST['description'])));
-		}else{
-			$description= "";
-		}
-
-		if(trim($_REQUEST['disablelogin']) == "1"){
-			$disablelogin = 1;
-		}else{
-			$disablelogin = 0;
-		}
-
-		mysql_query("update `emailcerts` set `disablelogin`='$disablelogin', `description`='$description' where `id`='".$_REQUEST['certid']."' and `memid`='".$_SESSION['profile']['id']."'");
-	}
-
 	if($oldid == 13 && $process != "" && $showdetails!="")
 	{
 		csrf_check("perschange");
diff --git a/pages/account/5.php b/pages/account/5.php
index 44763e2..934ca0c 100644
--- a/pages/account/5.php
+++ b/pages/account/5.php
@@ -91,7 +91,7 @@
     <td class="DataTD"><?=$row['revoke']?></td>
     <td class="DataTD"><?=$row['expires']?></td>
     <td class="DataTD">
-      <input type="checkbox" name="disablelogin_<?=$row['id']?>" value="1" <?=$row['disablelogin']?"":"checked='checked'"?>/>
+      <input type="checkbox" name="disablelogin_<?=$row['id']?>" value="1" <?=$row['disablelogin']?"":'checked="checked"'?>/>
       <input type="hidden" name="cert_<?=$row['id']?>" value="1" />
     </td>
     <td class="DataTD"><input name="comment_<?=$row['id']?>" type="text" value="<?=htmlspecialchars($row['description'])?>" /></td>
diff --git a/pages/account/6.php b/pages/account/6.php
index 0054b7a..8455499 100644
--- a/pages/account/6.php
+++ b/pages/account/6.php
@@ -115,7 +115,6 @@ if (array_key_exists('format', $_REQUEST)) {
 	echo "<pre>$cert</pre>";
 
 	?>
-<form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
 	<tr>
 		<td colspan="2" class="title"><?=_("Information about the certificate")?></td>
@@ -132,16 +131,6 @@ if (array_key_exists('format', $_REQUEST)) {
 	if($row['revoked'] == 0)
 		$row['revoke'] = _("Not Revoked");
 ?>
-	<tr>
-		<td class="DataTD"><?=_("Renew/Revoke/Delete")?></td>
-<? if($verified != _("Pending") && $verified != _("Revoked")) { ?>
-		<td class="DataTD"><input type="checkbox" name="revokeid[<?=$row['id']?>]" ></td>
-<? } else if($verified != _("Revoked")) { ?>
-		<td class="DataTD"><input type="checkbox" name="delid[<?=$row['id']?>]"></td>
-<? } else { ?>
-		<td class="DataTD">&nbsp;</td>
-<? } ?>
-	</tr>
 	<tr>
 		<td class="DataTD"><?=_("Status")?></td>
 		<td class="DataTD"><?=$verified?></td>
@@ -165,21 +154,14 @@ if (array_key_exists('format', $_REQUEST)) {
 	<tr>
 		<td class="DataTD"><?=_("Login")?></td>
 		<td class="DataTD">
-			<input type="checkbox" name="disablelogin" value="1" <?=$row['disablelogin']?"":"checked='checked'"?>/>
+			<input type="checkbox" name="disablelogin" disabled="disabled" value="1" <?=$row['disablelogin']?"":"checked='checked'"?>/>
 		</td>
 	</tr>
 	<tr>
 		<td class="DataTD"><?=_("Comment")?></td>
-		<td class="DataTD"><input type="text" name="description" maxlength="100" size=100 value="<?=htmlspecialchars($row['description'])?>"></td>
-	</tr>
-	<tr>
-		<td class="DataTD" colspan="2"><input type="submit" name="change" value="<?=_("Change settings")?>"> </td>
+		<td class="DataTD"><?=htmlspecialchars($row['description'])?></td>
 	</tr>
 </table>
-<input type="hidden" name="oldid" value="6">
-<input type="hidden" name="certid" value="<?=$certid?>">
-</form>
-
 <?
 	showfooter();
 	exit;