Fix for https://bugs.cacert.org/view.php?id=966 :

Delete Admin for [organization] deletes admin even though cancel button
is pressed.

includes/account.php

@@ -35,6 +35,12 @@
 		exit;
 	}
 
+	if ($process == _("Cancel"))
+	{
+		// General reset CANCEL process requests
+		$process = "";
+	}
+
 
 	if($id == 45 || $id == 46 || $oldid == 45 || $oldid == 46)
 	{
@@ -2198,7 +2204,7 @@
 		$orgid = 0;
 	}
 
-	if($oldid == 31 && $process != _("Cancel"))
+	if($oldid == 31 && $process != "")
 	{
 		$query = "select * from `orgdomains` where `orgid`='".intval($_SESSION['_config']['orgid'])."'";
 		$dres = mysql_query($query);

pages/account/16.php

@@ -57,7 +57,7 @@
   </tr>
 <? } ?>
   <tr>
-    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Another Email")?>">
+    <td class="DataTD" colspan="2"><input type="submit" name="add_email" value="<?=_("Another Email")?>">
 			<input type="submit" name="process" value="<?=_("Next")?>"></td>
   </tr>
 </table>

pages/account/30.php

@@ -34,7 +34,7 @@
     <td class="DataTD" colspan="2"><? printf(_("Are you really sure you want to remove %s and all certificates issued under this domain?"), sanitizeHTML($row['domain'])); ?></td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Cancel")?>">
+    <td class="DataTD" colspan="2"><input type="submit" name="cancel" value="<?=_("Cancel")?>">
     		<input type="submit" name="process" value="<?=_("Delete")?>"></td>
   </tr>
 </table>

pages/account/31.php

@@ -29,7 +29,7 @@
     <td class="DataTD" colspan="2"><? printf(_("Are you really sure you want to remove %s and all certificates issued under this organisation?"), sanitizeHTML($org['O'])); ?></td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Cancel")?>">
+    <td class="DataTD" colspan="2"><input type="submit" name="cancel" value="<?=_("Cancel")?>">
     		<input type="submit" name="process" value="<?=_("Delete")?>"></td>
   </tr>
 </table>

pages/account/34.php

@@ -35,7 +35,7 @@
     <td class="DataTD" colspan="2"><? printf(_("Are you really sure you want to remove %s from administering this organisation?"), sanitizeHTML($user['fname'])." ".sanitizeHTML($user['lname'])); ?></td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Cancel")?>">
+    <td class="DataTD" colspan="2"><input type="submit" name="cancel" value="<?=_("Cancel")?>">
     		<input type="submit" name="process" value="<?=_("Delete")?>"></td>
   </tr>
 </table>