From 373d4bd90b939b65e2562f0f343412a7e865fd49 Mon Sep 17 00:00:00 2001
From: root <root@www.cacert.org>
Date: Mon, 27 Nov 2006 02:02:09 +0000
Subject: [PATCH] #355

---
 includes/account.php       | 11 ++++++++++-
 includes/account_stuff.php |  6 +++---
 pages/account/43.php       |  4 ++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/includes/account.php b/includes/account.php
index 96ec483..bda1673 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -1644,7 +1644,7 @@
 	if(($id == 24 || $oldid == 24 || $id == 25 || $oldid == 25 || $id == 26 || $oldid == 26 ||
 		$id == 27 || $oldid == 27 || $id == 28 || $oldid == 28 || $id == 29 || $oldid == 29 ||
 		$id == 30 || $oldid == 30 || $id == 31 || $oldid == 31) &&
-		$_SESSION['profile']['admin'] != 1)
+		$_SESSION['profile']['orgadmin'] != 1)
 	{
 		showheader(_("My CAcert.org Account!"));
 		echo _("You don't have access to this area.");
@@ -2266,6 +2266,15 @@
 		mysql_query("update `users` set `codesign`='$ver' where `id`='$memid'");
 	}
 
+	if($id == 43 && $_REQUEST['orgadmin'] > 0)
+	{
+		$memid = $_REQUEST['userid'] = intval($_REQUEST['orgadmin']);
+		$query = "select * from `users` where `id`='$memid'";
+		$row = mysql_fetch_assoc(mysql_query($query));
+		$ver = !$row['orgadmin'];
+		mysql_query("update `users` set `orgadmin`='$ver' where `id`='$memid'");
+	}
+
 	if($id == 43 && $_REQUEST['ttpadmin'] > 0)
 	{
 		$memid = $_REQUEST['userid'] = intval($_REQUEST['ttpadmin']);
diff --git a/includes/account_stuff.php b/includes/account_stuff.php
index 6fe65b7..e193f62 100644
--- a/includes/account_stuff.php
+++ b/includes/account_stuff.php
@@ -177,7 +177,7 @@ function hideall() {
       <h3 onclick="explode('servercert')">+ <?=_("Server Certificates")?></h3>
       <ul class="menu" id="servercert"><li><a href="account.php?id=10"><?=_("New")?></a></li><li><a href="account.php?id=12"><?=_("View")?></a></li></ul>
     </div>
-<? if(mysql_num_rows(mysql_query("select * from `org` where `memid`='".$_SESSION['profile']['id']."'")) > 0 || $_SESSION['profile']['admin'] == 1) { ?>
+<? if(mysql_num_rows(mysql_query("select * from `org` where `memid`='".$_SESSION['profile']['id']."'")) > 0 || $_SESSION['profile']['orgadmin'] == 1) { ?>
     <div class="relatedLinks">
       <h3 onclick="explode('clientorg')">+ <?=_("Org Client Certs")?></h3>
       <ul class="menu" id="clientorg"><li><a href="account.php?id=16"><?=_("New")?></a></li><li><a href="account.php?id=18"><?=_("View")?></a></li></ul>
@@ -187,10 +187,10 @@ function hideall() {
       <ul class="menu" id="serverorg"><li><a href="account.php?id=20"><?=_("New")?></a></li><li><a href="account.php?id=22"><?=_("View")?></a></li></ul>
     </div>
 <? } ?>
-<? if(mysql_num_rows(mysql_query("select * from `org` where `memid`='".$_SESSION['profile']['id']."' and `masteracc`='1'")) > 0 || $_SESSION['profile']['admin'] == 1) { ?>
+<? if(mysql_num_rows(mysql_query("select * from `org` where `memid`='".$_SESSION['profile']['id']."' and `masteracc`='1'")) > 0 || $_SESSION['profile']['orgadmin'] == 1) { ?>
     <div class="relatedLinks">
       <h3 onclick="explode('orgadmin')">+ <?=_("Org Admin")?></h3>
-      <ul class="menu" id="orgadmin"><? if($_SESSION['profile']['admin'] == 1) { ?><li><a href="account.php?id=24"><?=_("New Organisation")?></a></li><li><a href="account.php?id=25"><?=_("View Organisations")?></a></li><? } ?><li><a href="account.php?id=35"><?=_("View")?></a></li></ul>
+      <ul class="menu" id="orgadmin"><? if($_SESSION['profile']['orgadmin'] == 1) { ?><li><a href="account.php?id=24"><?=_("New Organisation")?></a></li><li><a href="account.php?id=25"><?=_("View Organisations")?></a></li><? } ?><li><a href="account.php?id=35"><?=_("View")?></a></li></ul>
     </div>
 <? } ?>
     <div class="relatedLinks">
diff --git a/pages/account/43.php b/pages/account/43.php
index c1ab964..a560e15 100644
--- a/pages/account/43.php
+++ b/pages/account/43.php
@@ -150,6 +150,10 @@
     <td class="DataTD"><?=_("Code Signing")?>:</td>
     <td class="DataTD"><a href="account.php?id=43&codesign=<?=$row['id']?>"><?=$row['codesign']?></a></td>
   </tr>
+  <tr>
+    <td class="DataTD"><?=_("Org Admin")?>:</td>
+    <td class="DataTD"><a href="account.php?id=43&orgadmin=<?=$row['id']?>"><?=$row['orgadmin']?></a></td>
+  </tr>
   <tr>
     <td class="DataTD"><?=_("TTP Admin")?>:</td>
     <td class="DataTD"><a href="account.php?id=43&ttpadmin=<?=$row['id']?>"><?=$row['ttpadmin']?></a></td>