public static final String AAF_URL_CADI_HELP = "aaf_url.cadi_help";
public static final String PERM_CA_TYPE = "certman";
public static final String PERM_NS = Define.ROOT_NS();
+ public static final String HREF = "href=";
+ public static final String TARGET_BLANK = "target=_blank";
- public static enum BROWSER {iPhone,html5,ie,ieOld};
+ public enum BROWSER {IPHONE, HTML5, IE, IEOLD};
public static final int MAX_LINE = 20;
protected static final String[] NO_FIELDS = new String[0];
private static final String BROWSER_TYPE = "BROWSER_TYPE";
- private final String bcName, bcUrl;
+ private final String bcName;
+ private final String bcUrl;
private final String[] fields;
- public final boolean no_cache;
+ public final boolean noCache;
// Note: Only access is synchronized in "getPerm"
- private final static Map<String,Map<String,Permission>> perms = new HashMap<>();
+ private static final Map<String,Map<String,Permission>> perms = new HashMap<>();
/*
* Relative path, Menu Name, Full Path
{"ns","My Namespaces","/gui/ns"},
{"approve","My Approvals","/gui/approve"},
{"myrequests","My Pending Requests","/gui/myrequests"},
- // Enable later
- // {"onboard","Onboarding"},
+ // Enable later
+ //{"onboard","Onboarding"},
{"passwd","Password Management","/gui/passwd"},
{"cui","Command Prompt","/gui/cui"},
{"api","AAF API","/gui/api"},
bcName = name;
bcUrl = url;
// Mark which fields must be "no_cache"
- boolean no_cacheTemp=false;
+ boolean noCacheTemp=false;
for (NamedCode nc : content) {
- if (nc.no_cache()) {
- no_cacheTemp=true;
+ if (nc.noCache()) {
+ noCacheTemp=true;
break;
}
}
- no_cache=no_cacheTemp;
+ noCache =noCacheTemp;
}
public Page(AuthzEnv env, String name, String url, String [] fields, final NamedCode ... content) throws APIException,IOException {
this(env,name,url,1,fields,content);
bcName = name;
bcUrl = url;
// Mark which fields must be "no_cache"
- boolean no_cacheTemp=false;
+ boolean noCacheTemp=false;
for (NamedCode nc : content) {
- if (nc.no_cache()) {
- no_cacheTemp=true;
+ if (nc.noCache()) {
+ noCacheTemp=true;
break;
}
}
- no_cache=no_cacheTemp;
+ noCache =noCacheTemp;
}
imp.js(prefix + f);
} else if(f.endsWith(".css")) {
if(f.endsWith("iPhone.css")) {
- if(BROWSER.iPhone.equals(browser)) {
+ if(BROWSER.IPHONE.equals(browser)) {
imp.css(prefix + f);
}
} else if (f.endsWith("Desktop.css")){
- if(!BROWSER.iPhone.equals(browser)) {
+ if(!BROWSER.IPHONE.equals(browser)) {
imp.css(prefix + f);
}
// Make Console specific to Console page
@Override
public void code(AAF_GUI state, AuthzTrans trans, final Cache<HTMLGen> cache, final HTMLGen hgen) throws APIException, IOException {
switch(browser(trans,browserSlot)) {
- case ieOld:
- case ie:
+ case IEOLD:
+ case IE:
hgen.directive("!DOCTYPE html");
hgen.directive("meta", "http-equiv=X-UA-Compatible","content=IE=11");
default:
hgen.imports(getImports(env,theme,backdots,browser));
switch(browser) {
- case ie:
- case ieOld:
+ case IE:
+ case IEOLD:
hgen.js().text("document.createElement('header');")
.text("document.createElement('nav');")
.done();
// Obtain User Info, and print
TaggedPrincipal p = trans.getUserPrincipal();
- String user,secured;
+ String user;
+ String secured;
if (p==null) {
user = "please choose a Login Authority";
secured = "NOT Secure!";
.text("</sup>").end();
switch(browser(trans,browserSlot)) {
- case ieOld:
- case ie:
+ case IEOLD:
+ case IE:
xgen.incr("h5").text("This app is Mobile First HTML5. Internet Explorer "
+ " does not support all HTML5 standards. Old, non TSS-Standard versions may not function correctly.").br()
.text(" For best results, use a highly compliant HTML5 browser like Firefox.")
props = themeProps==null?null:themeProps.get(theme);
}
- if(props!=null) {
- if("TRUE".equalsIgnoreCase(props.getProperty("main_menu_in_nav"))) {
+ if((props!=null) && ("TRUE".equalsIgnoreCase(props.getProperty("main_menu_in_nav")))) {
xgen.incr("h2").text("Navigation").end();
Mark mark = new Mark();
boolean selected = isSelected(trans.path(),Home.HREF);
- //trans.path().endsWith("home");
xgen.incr(mark,HTMLGen.UL)
.incr(HTMLGen.LI,selected?"class=selected":"")
.incr(HTMLGen.A, "href=home")
.end(2);
boolean noSelection = !selected;
for(String[] mi : MENU_ITEMS) {
- //selected = trans.path().endsWith(mi[0]);
if(noSelection) {
selected = isSelected(trans.path(),mi[2]);
noSelection = !selected;
selected = false;
}
xgen.incr(HTMLGen.LI,selected?"class=selected":"")
- .incr(HTMLGen.A, "href="+mi[2])
+ .incr(HTMLGen.A, HREF+mi[2])
.text(mi[1])
.end(2);
}
xgen.end(mark);
- }
}
}
});
hgen.incr("h2").text("Related Links").end();
hgen.incr(UL);
- String aaf_help = env.getProperty(AAF_URL_AAF_HELP,null);
- if (aaf_help!=null) {
- hgen.leaf(LI).leaf(A,"href="+env.getProperty(AAF_URL_AAF_HELP),"target=_blank").text("AAF WIKI").end(2);
+ String aafHelp = env.getProperty(AAF_URL_AAF_HELP,null);
+ if (aafHelp!=null) {
+ hgen.leaf(LI).leaf(A,HREF+env.getProperty(AAF_URL_AAF_HELP),TARGET_BLANK).text("AAF WIKI").end(2);
String sub = env.getProperty(AAF_URL_AAF_HELP+".sub");
if (sub!=null) {
hgen.incr(UL,"style=margin-left:5%");
for (String s : Split.splitTrim(',', sub)) {
- hgen.leaf(LI).leaf(A,"href="+env.getProperty(AAF_URL_AAF_HELP+".sub."+s),"target=_blank").text(s.replace('+', ' ')).end(2);
+ hgen.leaf(LI).leaf(A,HREF+env.getProperty(AAF_URL_AAF_HELP+".sub."+s),TARGET_BLANK).text(s.replace('+', ' ')).end(2);
}
hgen.end();
}
}
- aaf_help = env.getProperty(AAF_URL_CADI_HELP,null);
- if (aaf_help!=null) {
- hgen.leaf(LI).leaf(A,"href="+aaf_help,"target=_blank").text("CADI WIKI").end(2);
+ aafHelp = env.getProperty(AAF_URL_CADI_HELP,null);
+ if (aafHelp!=null) {
+ hgen.leaf(LI).leaf(A,HREF+aafHelp,TARGET_BLANK).text("CADI WIKI").end(2);
}
String tools = env.getProperty(AAFURL_TOOLS);
if (tools!=null) {
.leaf(HTMLGen.H3).text("Related Tools").end();
for (String tool : Split.splitTrim(',',tools)) {
- hgen.leaf(LI).leaf(A,"href="+env.getProperty(AAF_URL_TOOL_DOT+tool),"target=_blank").text(tool.replace('+', ' ')).end(2);
+ hgen.leaf(LI).leaf(A,HREF+env.getProperty(AAF_URL_TOOL_DOT+tool),TARGET_BLANK).text(tool.replace('+', ' ')).end(2);
}
hgen.end();
}
String agent = trans.agent();
int msie;
if (agent.contains("iPhone") /* other phones? */) {
- br=BROWSER.iPhone;
+ br=BROWSER.IPHONE;
} else if ((msie = agent.indexOf("MSIE"))>=0) {
msie+=5;
- int end = agent.indexOf(";",msie);
+ int end = agent.indexOf(';',msie);
float ver;
try {
ver = Float.valueOf(agent.substring(msie,end));
- br = ver<8f?BROWSER.ieOld:BROWSER.ie;
+ br = ver<8f?BROWSER.IEOLD :BROWSER.IE;
} catch (Exception e) {
- br = BROWSER.ie;
+ br = BROWSER.IE;
}
} else {
- br = BROWSER.html5;
+ br = BROWSER.HTML5;
}
trans.put(slot,br);
}
}
protected static String getSingleParam(HttpServletRequest req, String tag) {
- String values[] = req.getParameterValues(tag);
+ String[] values = req.getParameterValues(tag);
return values.length<1?null:values[0];
}
Code Review / aaf / authz.git / blobdiff