From e5869e3959ba824492ad514768f2859e62577e12 Mon Sep 17 00:00:00 2001
From: root <root@www.cacert.org>
Date: Thu, 4 Sep 2008 11:23:06 +0000
Subject: [PATCH] *** empty log message ***

---
 pages/account/31.php | 3 +--
 pages/account/33.php | 6 +++---
 pages/account/43.php | 2 +-
 pages/account/53.php | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pages/account/31.php b/pages/account/31.php
index f09b49b..d91a77a 100644
--- a/pages/account/31.php
+++ b/pages/account/31.php
@@ -19,7 +19,6 @@
 	$query = "select * from `orginfo` where `id`='".intval($_REQUEST['orgid'])."'";
 	$org = mysql_fetch_assoc(mysql_query($query));
 
-	$_SESSION['_config']['domain'] = $row['domain'];
 ?>
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
@@ -27,7 +26,7 @@
     <td colspan="2" class="title"><? printf(_("Delete Organisation"), ($org['O'])); ?></td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2"><? printf(_("Are you really sure you want to remove %s and all certificates issued under this organisation?"), sanitizeHTML($row['O'])); ?></td>
+    <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")?>">
diff --git a/pages/account/33.php b/pages/account/33.php
index be42470..fa680bf 100644
--- a/pages/account/33.php
+++ b/pages/account/33.php
@@ -27,7 +27,7 @@
   </tr>
   <tr>
     <td class="DataTD"><?=_("Email")?>:</td>
-    <td class="DataTD"><input type="text" name="email" value="<?=sanitizeHTML($_SESSION['_config']['email'])?>"></td>
+    <td class="DataTD"><input type="text" name="email" value="<?=array_key_exists('email',$_SESSION['_config'])?sanitizeHTML($_SESSION['_config']['email']):""?>"></td>
   </tr>
   <tr>
     <td class="DataTD"><?=_("Department")?>:</td>
@@ -38,13 +38,13 @@
     <td class="DataTD"><?=_("Master Account")?>:</td>
     <td class="DataTD"><select name="masteracc">
 		<option value="0">No</option>
-		<option value="1"<? if($_SESSION['_config']['masteracc'] == 1) echo " selected='selected'"; ?>>Yes</option>
+		<option value="1"<? if(array_key_exists('masteracc',$_SESSION['_config']) && $_SESSION['_config']['masteracc'] == 1) echo " selected='selected'"; ?>>Yes</option>
 	</select></td>
   </tr>
 <? } ?>
   <tr>
     <td class="DataTD"><?=_("Comments")?>:</td>
-    <td class="DataTD"><input type="text" name="comments" value="<?=($_SESSION['_config']['comments'])?>"></td>
+    <td class="DataTD"><input type="text" name="comments" value="<?=array_key_exists('comments',$_SESSION['_config'])?$_SESSION['_config']['comments']:""?>"></td>
   </tr>
   <tr>
     <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Add")?>"></td>
diff --git a/pages/account/43.php b/pages/account/43.php
index dea05e6..405a2ce 100644
--- a/pages/account/43.php
+++ b/pages/account/43.php
@@ -332,7 +332,7 @@
     <td class="DataTD"><?=intval($drow['points'])?></td>
     <td class="DataTD"><?=sanitizeHTML($drow['location'])?></td>
     <td class="DataTD"><?=sanitizeHTML($drow['method'])?></td>
-    <td class="DataTD"><a href="account.php?id=43&amp;userid=<?=intval($drow['to')]?>&amp;assurance=<?=intval($drow['id'])?>" onclick="return confirm('<?=_("Are you sure you want to revoke this assurance?")?>');"><?=_("Revoke")?></a></td>
+    <td class="DataTD"><a href="account.php?id=43&amp;userid=<?=intval($drow['to'])?>&amp;assurance=<?=intval($drow['id'])?>" onclick="return confirm('<?=_("Are you sure you want to revoke this assurance?")?>');"><?=_("Revoke")?></a></td>
   </tr>
 <? } ?>
   <tr>
diff --git a/pages/account/53.php b/pages/account/53.php
index f9a4ad8..d5ebca3 100644
--- a/pages/account/53.php
+++ b/pages/account/53.php
@@ -53,7 +53,7 @@
 		$query = "select * from `countries` order by `name`";
 		$res = mysql_query($query);
 		while($row = mysql_fetch_assoc($res))
-			echo "<li><a href='account.php?id=53&amp;ccid=".inval($row['id'])."'>".sanitizeHTML($row['name'])."</a></li>\n";
+			echo "<li><a href='account.php?id=53&amp;ccid=".intval($row['id'])."'>".sanitizeHTML($row['name'])."</a></li>\n";
 
 		echo "</ul>\n</li>\n</ul></div>\n<br>\n";
 	} elseif($regid <= 0) {