Rename 'configure' access to 'admin' access

This commit is contained in:
Andreas Öman 2008-05-04 13:52:48 +00:00
parent 82261c5eb5
commit 9501938d48
4 changed files with 13 additions and 13 deletions

View file

@ -255,9 +255,9 @@ access_save(void)
access_save_right(fp, ae, "streaming", ACCESS_STREAMING);
access_save_right(fp, ae, "rec", ACCESS_RECORDER_VIEW);
access_save_right(fp, ae, "recedit", ACCESS_RECORDER_CHANGE);
access_save_right(fp, ae, "conf", ACCESS_CONFIGURE);
access_save_right(fp, ae, "admin", ACCESS_ADMIN);
access_save_right(fp, ae, "webui", ACCESS_WEB_INTERFACE);
access_save_right(fp, ae, "access", ACCESS_ACCESSCONTROL);
access_save_right(fp, ae, "access", ACCESS_ADMIN_ACCESS);
fprintf(fp, "}\n");
}
@ -318,8 +318,8 @@ access_load(void)
access_load_right(&ce->ce_sub, ae, "streaming", ACCESS_STREAMING);
access_load_right(&ce->ce_sub, ae, "rec", ACCESS_RECORDER_VIEW);
access_load_right(&ce->ce_sub, ae, "recedit", ACCESS_RECORDER_CHANGE);
access_load_right(&ce->ce_sub, ae, "conf", ACCESS_CONFIGURE);
access_load_right(&ce->ce_sub, ae, "admin", ACCESS_ADMIN);
access_load_right(&ce->ce_sub, ae, "webui", ACCESS_WEB_INTERFACE);
access_load_right(&ce->ce_sub, ae, "access", ACCESS_ACCESSCONTROL);
access_load_right(&ce->ce_sub, ae, "access", ACCESS_ADMIN_ACCESS);
}
}

View file

@ -45,9 +45,9 @@ typedef struct access_entry {
#define ACCESS_STREAMING 0x1
#define ACCESS_RECORDER_VIEW 0x2
#define ACCESS_RECORDER_CHANGE 0x4
#define ACCESS_CONFIGURE 0x8
#define ACCESS_ADMIN 0x8
#define ACCESS_WEB_INTERFACE 0x10
#define ACCESS_ACCESSCONTROL 0x20
#define ACCESS_ADMIN_ACCESS 0x20
#define ACCESS_FULL 0x3f

View file

@ -21,9 +21,9 @@
#include "access.h"
#define AJAX_ACCESS_CONFIG (ACCESS_WEB_INTERFACE | ACCESS_CONFIGURE)
#define AJAX_ACCESS_CONFIG (ACCESS_WEB_INTERFACE | ACCESS_ADMIN)
#define AJAX_ACCESS_ACCESSCTRL \
(ACCESS_WEB_INTERFACE | ACCESS_CONFIGURE | ACCESS_ACCESSCONTROL)
(ACCESS_WEB_INTERFACE | ACCESS_ADMIN | ACCESS_ADMIN_ACCESS)
typedef enum {
AJAX_BOX_FILLED,

View file

@ -39,9 +39,9 @@ static struct strtab accesstypetab[] = {
{ "stream", ACCESS_STREAMING },
{ "rec", ACCESS_RECORDER_VIEW },
{ "recedit", ACCESS_RECORDER_CHANGE },
{ "conf", ACCESS_CONFIGURE },
{ "admin", ACCESS_ADMIN },
{ "webui", ACCESS_WEB_INTERFACE },
{ "access", ACCESS_ACCESSCONTROL },
{ "access", ACCESS_ADMIN_ACCESS },
};
@ -120,7 +120,7 @@ ajax_accesslist(http_connection_t *hc, http_reply_t *hr,
"Streaming",
"Recorder",
"Recorder edit",
"Configure",
"Admin",
"Web UI",
"Accessedit",
"",
@ -148,9 +148,9 @@ ajax_accesslist(http_connection_t *hc, http_reply_t *hr,
ajax_access_checkbox(&ta, ae, ACCESS_RECORDER_VIEW, "rec");
ajax_access_checkbox(&ta, ae, ACCESS_RECORDER_CHANGE, "recedit");
ajax_access_checkbox(&ta, ae, ACCESS_CONFIGURE, "conf");
ajax_access_checkbox(&ta, ae, ACCESS_ADMIN, "admin");
ajax_access_checkbox(&ta, ae, ACCESS_WEB_INTERFACE, "webui");
ajax_access_checkbox(&ta, ae, ACCESS_ACCESSCONTROL, "access");
ajax_access_checkbox(&ta, ae, ACCESS_ADMIN_ACCESS, "access");
ajax_table_cell(&ta, NULL,