From 311d7e65d976086c612017454afc622b9b97432c Mon Sep 17 00:00:00 2001
From: Lars Kneschke <lkeschke@alumni.egroupware.org>
Date: Tue, 17 Apr 2001 15:30:08 +0000
Subject: [PATCH] changed the code, to not rely on english language

It was not possible to delete users.
---
 admin/deleteaccount.php                      | 8 ++++----
 admin/templates/default/delete_account.tpl   | 2 +-
 admin/templates/idsociety/delete_account.tpl | 2 +-
 admin/templates/verdilak/delete_account.tpl  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/admin/deleteaccount.php b/admin/deleteaccount.php
index 58869481f0..9d36bd22fb 100755
--- a/admin/deleteaccount.php
+++ b/admin/deleteaccount.php
@@ -13,7 +13,7 @@
 
 	$phpgw_info = array();
 
-	if ($submit || !$account_id)
+	if ($delete_account || !$account_id)
 	{
 		$phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True);
 	}
@@ -22,13 +22,13 @@
 	include("../header.inc.php");
 	// Make sure they are not attempting to delete their own account, or they have cancelled.
 	// If they are, they should not reach this point anyway.
-	if($submit=='Cancel' || $phpgw_info['user']['account_id'] == $account_id)
+	if($cancel || $phpgw_info['user']['account_id'] == $account_id)
 	{
 		Header('Location: '.$phpgw->link('/admin/accounts.php'));
 		$phpgw->common->phpgw_exit();
 	}
 	
-	if (($account_id) && ($submit<>'Delete'))
+	if ($account_id && !$delete_account)
 	{
 		$phpgw->template->set_file(array("form" => "delete_account.tpl"));
 		
@@ -55,7 +55,7 @@
 
 		$phpgw->common->phpgw_footer();
 	}
-	if($submit=='Delete')
+	if($delete_account)
 	{
 		$accountid = $account_id;
 		settype($account_id,'integer');
diff --git a/admin/templates/default/delete_account.tpl b/admin/templates/default/delete_account.tpl
index e31bc74130..c73f799b3f 100755
--- a/admin/templates/default/delete_account.tpl
+++ b/admin/templates/default/delete_account.tpl
@@ -10,7 +10,7 @@
     <td align="center">{new_owner_select}</td>
    </tr>
    <tr>
-    <td align="center"><input type="submit" name="submit" value="{cancel}">&nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" name="submit" value="{delete}"></td>
+    <td align="center"><input type="submit" name="cancel" value="{cancel}">&nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" name="delete_account" value="{delete}"></td>
    </tr>
   </table>
  </center>
diff --git a/admin/templates/idsociety/delete_account.tpl b/admin/templates/idsociety/delete_account.tpl
index e31bc74130..c73f799b3f 100755
--- a/admin/templates/idsociety/delete_account.tpl
+++ b/admin/templates/idsociety/delete_account.tpl
@@ -10,7 +10,7 @@
     <td align="center">{new_owner_select}</td>
    </tr>
    <tr>
-    <td align="center"><input type="submit" name="submit" value="{cancel}">&nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" name="submit" value="{delete}"></td>
+    <td align="center"><input type="submit" name="cancel" value="{cancel}">&nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" name="delete_account" value="{delete}"></td>
    </tr>
   </table>
  </center>
diff --git a/admin/templates/verdilak/delete_account.tpl b/admin/templates/verdilak/delete_account.tpl
index e31bc74130..c73f799b3f 100755
--- a/admin/templates/verdilak/delete_account.tpl
+++ b/admin/templates/verdilak/delete_account.tpl
@@ -10,7 +10,7 @@
     <td align="center">{new_owner_select}</td>
    </tr>
    <tr>
-    <td align="center"><input type="submit" name="submit" value="{cancel}">&nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" name="submit" value="{delete}"></td>
+    <td align="center"><input type="submit" name="cancel" value="{cancel}">&nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" name="delete_account" value="{delete}"></td>
    </tr>
   </table>
  </center>