completed the transition to the new security architecture - the old stuff
has now been removed completely; the VeniceEngine is managing the conference level SecurityMonitor for now
This commit is contained in:
@@ -61,14 +61,14 @@ public class ConfOperations extends VeniceServlet
|
||||
|
||||
} // end makeCreateConferenceDialog
|
||||
|
||||
private EditConferenceDialog makeEditConferenceDialog() throws ServletException
|
||||
private EditConferenceDialog makeEditConferenceDialog(SecurityInfo sinf) throws ServletException
|
||||
{
|
||||
final String desired_name = "EditConferenceDialog";
|
||||
DialogCache cache = DialogCache.getDialogCache(getServletContext());
|
||||
|
||||
if (!(cache.isCached(desired_name)))
|
||||
{ // create a template and save it off
|
||||
EditConferenceDialog template = new EditConferenceDialog();
|
||||
EditConferenceDialog template = new EditConferenceDialog(sinf);
|
||||
cache.saveTemplate(template);
|
||||
|
||||
} // end if
|
||||
@@ -416,7 +416,7 @@ public class ConfOperations extends VeniceServlet
|
||||
on_error);
|
||||
|
||||
// create and return the Edit Conference dialog
|
||||
EditConferenceDialog dlg = makeEditConferenceDialog();
|
||||
EditConferenceDialog dlg = makeEditConferenceDialog(conf.getSecurityInfo());
|
||||
try
|
||||
{ // set up and return the dialog
|
||||
dlg.setupDialog(comm,conf);
|
||||
@@ -825,7 +825,7 @@ public class ConfOperations extends VeniceServlet
|
||||
on_error);
|
||||
|
||||
// create the dialog class
|
||||
EditConferenceDialog dlg = makeEditConferenceDialog();
|
||||
EditConferenceDialog dlg = makeEditConferenceDialog(conf.getSecurityInfo());
|
||||
|
||||
if (dlg.isButtonClicked(request,"cancel"))
|
||||
throw new RedirectResult(on_error); // they chickened out - go back to the conference list
|
||||
|
||||
@@ -63,7 +63,7 @@ public class ConferenceMembership implements JSPRender, SearchMode
|
||||
this.engine = engine;
|
||||
this.comm = comm;
|
||||
this.conf = conf;
|
||||
this.role_choices = Role.getConferenceMemberLevelChoices();
|
||||
this.role_choices = conf.getSecurityInfo().getRoleList("Conference.UserLevels");
|
||||
|
||||
} // end constructor
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ public class EditConferenceDialog extends ContentDialog
|
||||
*--------------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
public EditConferenceDialog()
|
||||
public EditConferenceDialog(SecurityInfo sinf)
|
||||
{
|
||||
super("Edit Conference:",null,"editconfform","confops");
|
||||
setHiddenField("cmd","E");
|
||||
@@ -51,26 +51,26 @@ public class EditConferenceDialog extends ContentDialog
|
||||
null,YES));
|
||||
addFormField(new CDFormCategoryHeader("Security Information"));
|
||||
addFormField(new CDRoleListFormField("read_lvl","Security level required to read conference",null,true,
|
||||
Role.getConferenceReadList()));
|
||||
sinf.getRoleList("Conference.Read")));
|
||||
addFormField(new CDRoleListFormField("post_lvl","Security level required to post to conference",null,true,
|
||||
Role.getConferencePostList()));
|
||||
sinf.getRoleList("Conference.Post")));
|
||||
addFormField(new CDRoleListFormField("create_lvl",
|
||||
"Security level required to create new topics in conference",null,
|
||||
true,Role.getConferenceCreateList()));
|
||||
true,sinf.getRoleList("Conference.Create")));
|
||||
addFormField(new CDRoleListFormField("hide_lvl",
|
||||
"Security level required to archive or freeze topics",
|
||||
"(or to hide posts of which you are not the owner)",true,
|
||||
Role.getConferenceHideList()));
|
||||
sinf.getRoleList("Conference.Hide")));
|
||||
addFormField(new CDRoleListFormField("nuke_lvl",
|
||||
"Security level required to delete topics or nuke posts",
|
||||
"(or to scribble posts of which you are not the owner)",true,
|
||||
Role.getConferenceNukeList()));
|
||||
sinf.getRoleList("Conference.Nuke")));
|
||||
addFormField(new CDRoleListFormField("change_lvl",
|
||||
"Security level required to change conference attributes",null,true,
|
||||
Role.getConferenceChangeList()));
|
||||
sinf.getRoleList("Conference.Change")));
|
||||
addFormField(new CDRoleListFormField("delete_lvl",
|
||||
"Security level required to delete conference",null,true,
|
||||
Role.getConferenceDeleteList()));
|
||||
sinf.getRoleList("Conference.Delete")));
|
||||
addFormField(new CDFormCategoryHeader("Conference Properties"));
|
||||
addFormField(new CDCheckBoxFormField("pic_in_post","Display users' pictures next to their posts",
|
||||
"(user can override)",YES));
|
||||
|
||||
Reference in New Issue
Block a user