summaryrefslogtreecommitdiff
path: root/includes/account.php
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2012-04-25 00:55:05 +0200
committerMichael Tänzer <neo@nhng.de>2012-04-25 00:55:05 +0200
commit9094c433a7b0f2d290d02afff90ce1fef686c220 (patch)
tree9cf22add6989ccbb6f3d8a1f0c36e1bb378fc6cc /includes/account.php
parent2f25d338d1f7ffe9b0b1e843fa5650f284b0c52a (diff)
downloadcacert-devel-9094c433a7b0f2d290d02afff90ce1fef686c220.tar.gz
cacert-devel-9094c433a7b0f2d290d02afff90ce1fef686c220.tar.xz
cacert-devel-9094c433a7b0f2d290d02afff90ce1fef686c220.zip
bug 981: Commit changes from INOPIAEbug-981
- wot/35 now accessible by all Org Admins, not only master accounts - more info on wot/35 Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'includes/account.php')
-rw-r--r--includes/account.php16
1 files changed, 14 insertions, 2 deletions
diff --git a/includes/account.php b/includes/account.php
index 554713e..db30329 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -2246,8 +2246,7 @@
$orgid = 0;
}
- if($id == 32 || $oldid == 32 || $id == 33 || $oldid == 33 || $id == 34 || $oldid == 34 ||
- $id == 35 || $oldid == 35)
+ if($id == 32 || $oldid == 32 || $id == 33 || $oldid == 33 || $id == 34 || $oldid == 34)
{
$query = "select * from `org` where `memid`='".intval($_SESSION['profile']['id'])."' and `masteracc`='1'";
$_macc = mysql_num_rows(mysql_query($query));
@@ -2260,6 +2259,19 @@
}
}
+ if($id == 35 || $oldid == 35)
+ {
+ $query = "select 1 from `org` where `memid`='".intval($_SESSION['profile']['id'])."'";
+ $is_orguser = mysql_num_rows(mysql_query($query));
+ if($_SESSION['profile']['orgadmin'] != 1 && $is_orguser <= 0)
+ {
+ showheader(_("My CAcert.org Account!"));
+ echo _("You don't have access to this area.");
+ showfooter();
+ exit;
+ }
+ }
+
if($id == 33 && $_SESSION['profile']['orgadmin'] != 1)
{
$orgid = intval($_SESSION['_config']['orgid']);