Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-08 17:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed problem that admin user of top group could change global section

Browse Source 
SVN revision: 947
This commit is contained in:
Stefan Ritt 2004-07-09 08:13:39 +00:00
parent 4a082cdfa0
commit bffbeed5fc
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/elogd.c
View File

@ -6,6 +6,9 @@
Contents: Web server program for Electronic Logbook ELOG Contents: Web server program for Electronic Logbook ELOG
$Log$ $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 Revision 1.375 2004/07/08 19:53:14 midas
Fixed wrong link with 'show top groups' flag 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); LBLIST get_logbook_hierarchy(void);
int is_logbook_in_group(LBLIST pgrp, char *logbook); int is_logbook_in_group(LBLIST pgrp, char *logbook);
BOOL is_admin_user(char *logbook, char *user); BOOL is_admin_user(char *logbook, char *user);
BOOL is_admin_user_global(char *user);
void free_logbook_hierarchy(LBLIST root); void free_logbook_hierarchy(LBLIST root);
void show_top_text(LOGBOOK * lbs); void show_top_text(LOGBOOK * lbs);
void show_bottom_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_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]"); sprintf(str, loc("Change %s"), "[global]");
rsprintf("<input type=submit name=cmd value=\"%s\">\n", str); 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) BOOL check_user_password(LOGBOOK * lbs, char *user, char *password, char *redir)
{ {
char str[1000], str2[256], upwd[256], full_name[256], email[256]; char str[1000], str2[256], upwd[256], full_name[256], email[256];