From bffbeed5fcdbae91bb9bce254ca12b93846980b2 Mon Sep 17 00:00:00 2001
From: Stefan Ritt <stefan.ritt@psi.ch>
Date: Fri, 9 Jul 2004 08:13:39 +0000
Subject: [PATCH] Fixed problem that admin user of top group could change
 global section

SVN revision: 947
---
 src/elogd.c | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/elogd.c b/src/elogd.c
index 5f604bca..f39fe539 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -6,6 +6,9 @@
    Contents:     Web server program for Electronic Logbook ELOG
   
    $Log$
+   Revision 1.376  2004/07/09 08:13:39  midas
+   Fixed problem that admin user of top group could change global section
+
    Revision 1.375  2004/07/08 19:53:14  midas
    Fixed wrong link with 'show top groups' flag
 
@@ -542,6 +545,7 @@ BOOL check_login_user(LOGBOOK * lbs, char *user);
 LBLIST get_logbook_hierarchy(void);
 int is_logbook_in_group(LBLIST pgrp, char *logbook);
 BOOL is_admin_user(char *logbook, char *user);
+BOOL is_admin_user_global(char *user);
 void free_logbook_hierarchy(LBLIST root);
 void show_top_text(LOGBOOK * lbs);
 void show_bottom_text(LOGBOOK * lbs);
@@ -7944,7 +7948,7 @@ void show_admin_page(LOGBOOK * lbs, char *top_group)
    }
 
    if (is_group("global") && !strieq(top_group, "global")) {
-      if (is_admin_user("global", getparam("unm"))) {
+      if (is_admin_user_global(getparam("unm"))) {
          sprintf(str, loc("Change %s"), "[global]");
          rsprintf("<input type=submit name=cmd value=\"%s\">\n", str);
       }
@@ -16384,6 +16388,26 @@ BOOL is_admin_user(char *logbook, char *user)
 
 /*------------------------------------------------------------------*/
 
+BOOL is_admin_user_global(char *user)
+{
+   int i, n;
+   char str[1000];
+   char list[MAX_N_LIST][NAME_LENGTH];
+
+   if (getcfg_simple("global", "Admin user", str) && user[0]) {
+      n = strbreak(str, list, MAX_N_LIST, ",");
+      for (i = 0; i < n; i++)
+         if (strcmp(user, list[i]) == 0)
+            break;
+
+      if (i == n)
+         return FALSE;
+   }
+   return TRUE;
+}
+
+/*------------------------------------------------------------------*/
+
 BOOL check_user_password(LOGBOOK * lbs, char *user, char *password, char *redir)
 {
    char str[1000], str2[256], upwd[256], full_name[256], email[256];