From 4150e2968dcab0f72b7b61b0f2b877c704859602 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 13 Feb 2007 21:50:01 +0000 Subject: [PATCH] Fixed the OU bug, which caused organisations without the OU field filled in the database not to be able to get OU fields in their certificate with the webform Duane fixed the orga-admin bug that prevented orga-assurers to view/add/modify admins to their organisations --- includes/account.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/account.php b/includes/account.php index bc941df..034f2d8 100644 --- a/includes/account.php +++ b/includes/account.php @@ -1174,7 +1174,7 @@ } if($_SESSION['_config']['name'] != "") $emails .= "commonName = ".$_SESSION['_config']['name']."\n"; - if($org['OU']) + if($_SESSION['_config']['OU']) $emails .= "organizationalUnitName = ".$_SESSION['_config']['OU']."\n"; if($org['O']) $emails .= "organizationName = ".$org['O']."\n"; @@ -1220,7 +1220,7 @@ $defaultemail = $_REQUEST['email']; $csrsubject .= "/emailAddress=$_REQUEST[email]"; } - if($org['OU']) + if($_SESSION['_config']['OU']) $csrsubject .= "/organizationalUnitName=".$_SESSION['_config']['OU']; if($org['O']) $csrsubject .= "/organizationName=".$org['O']; @@ -1469,7 +1469,7 @@ $org = mysql_fetch_assoc(mysql_query($query)); $csrsubject = ""; - if($org['OU']) + if($_SESSION['_config']['OU']) $csrsubject .= "/organizationalUnitName=".$_SESSION['_config']['OU']; if($org['O']) $csrsubject .= "/organizationName=".$org['O']; @@ -1865,7 +1865,7 @@ } } - if($id == 33 && $_SESSION['profile']['admin'] != 1) + if($id == 33 && $_SESSION['profile']['orgadmin'] != 1) { $orgid = intval($_SESSION['_config']['orgid']); $query = "select * from `org` where `orgid`='$orgid' and `memid`='".$_SESSION['profile']['id']."' and `masteracc`='1'";