Merge branch 'bug-1008' into release

2 files changed, 62 insertions, 1 deletions

diff --git a/pages/account/43.php b/pages/account/43.php
index 11fe593..d34362d 100644
--- a/pages/account/43.php
+++ b/pages/account/43.php
@@ -666,7 +666,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
 	</tr>
 
 	<tr>
-		<td class="DataTD"><?=_("Org Server")?>:</td>
+		<td class="DataTD"><a href="account.php?id=58&amp;userid=<?=intval($row['id'])?>"><?=_("Org Server")?></a>:</td>
 	<?
 	$query = "select COUNT(*) as `total`,
 	                 MAX(`orgcerts`.`expire`) as `maxexpire`
diff --git a/pages/account/58.php b/pages/account/58.php
new file mode 100644
index 0000000..1f6b1a0
--- /dev/null
+++ b/pages/account/58.php
@@ -0,0 +1,61 @@
+<? /*
+    LibreSSL - CAcert web application
+    Copyright (C) 2004-2008  CAcert Inc.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; version 2 of the License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+if ($_SESSION['profile']['admin'] != 1 || !array_key_exists('userid',$_REQUEST) || intval($_REQUEST['userid']) < 1) {
+	echo _('You do not have access to this page');
+} else {
+	$user_id = intval($_REQUEST['userid']);
+	$query = "select `users`.`fname`, `users`.`mname`, `users`.`lname` from `users` where `id`='$user_id' and `users`.`deleted`=0";
+	$res = mysql_query($query);
+	if(mysql_num_rows($res) != 1){
+		echo _("I'm sorry, the user you were looking for seems to have disappeared! Bad things are a foot!");
+	} else {
+		if ($row = mysql_fetch_assoc($res)){
+			$username=sanitizeHTML($row['fname']).' '.sanitizeHTML($row['mname']).' '.sanitizeHTML($row['lname']);
+			$query = "select `orginfo`.`o`, `org`.`masteracc`
+				FROM `orginfo`, `org`
+				WHERE `orginfo`.`id` = `org`.`orgid`
+				AND `org`.`memid`='$user_id' order by `orginfo`.`o`";
+			$res1 = mysql_query($query);?>
+			<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"><?
+			if (mysql_num_rows($res1) <= 0) {?>
+				<tr>
+					<td colspan="2" class="title"><?=sprintf(_('%s is not listed as Organisation Administrator'), $username)?></td>
+				</tr>
+			<?}else{?>
+				<tr>
+					<td colspan="2" class="title"><?=sprintf(_('%s is listed as Organisation Administrator for:'), $username)?></td>
+				</tr>
+				<tr>
+					<td class="DataTD"><b><?=_('Organisation')?></b></td>
+					<td class="DataTD"><b><?=_('Masteraccount')?></b></td>
+				</tr><?
+				while($drow = mysql_fetch_assoc($res1)){?>
+					<tr>
+						<td class="DataTD"><?=$drow['o']?></td>
+						<td class="DataTD"><?=$drow['masteracc'] ? _("Yes") : _("No") ?></td>
+					</tr>
+				<?}
+			}
+			?></table>
+<?		}else{
+				echo _("I'm sorry, the user you were looking for seems to have disappeared! Bad things are a foot!");
+		}
+	}
+}
+?>