diff --git a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp index 941788494..c70731bcf 100644 --- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp +++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp @@ -212,8 +212,8 @@ $(document).ready(function(){ - - ${fns:stringFormat(log.appLabel,30)} + + ${log.appLabel} ${log.c2sPktNum} ${log.s2cPktNum} @@ -242,11 +242,11 @@ $(document).ready(function(){ - <%-- - ${fns:stringFormat(log.addrList,30)} + <%-- + ${log.addrList} --%> - ${fns:abbr(log.serverLocate,20)} - ${fns:abbr(log.clientLocate,20)} + ${log.serverLocate} + ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp index 21094be84..21f935186 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp @@ -229,11 +229,11 @@ $(document).ready(function(){ - <%-- - ${fns:stringFormat(log.addrList,30)} + <%-- + ${log.addrList} --%> - ${fns:abbr(log.serverLocate,20)} - ${fns:abbr(log.clientLocate,20)} + ${log.serverLocate} + ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp index 17687e23f..3c0747f88 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp @@ -248,8 +248,8 @@ $(document).ready(function(){ <%-- --%> <%-- ${fns:stringFormat(log.addrList,30)} --%> - ${fns:abbr(log.serverLocate,20)} - ${fns:abbr(log.clientLocate,20)} + ${log.serverLocate} + ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp index 0d18f4b53..a6e255c8c 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp @@ -285,8 +285,8 @@ <%-- ${_log.addrList } --%> - ${fns:abbr(_log.serverLocate,20)} - ${fns:abbr(_log.clientLocate,20)} + ${_log.serverLocate} + ${_log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp index 32696255e..2bd42f296 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp @@ -219,8 +219,8 @@ $(document).ready(function(){ - - ${fns:stringFormat(log.ftpContent,30)} + + ${log.ftpContent} ${log.capIp} @@ -246,8 +246,8 @@ $(document).ready(function(){ <%-- ${log.addrList} --%> - ${fns:abbr(log.serverLocate,20)} - ${fns:abbr(log.clientLocate,20)} + ${log.serverLocate} + ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp index a3ff80163..d6cd0aefa 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp @@ -215,7 +215,7 @@ - ${fns:abbr(_log.url, 30)} + ${_log.url} ${_log.reqHdrFile} ${_log.reqBodyFile} ${_log.resHdrFile} @@ -248,8 +248,8 @@ <%-- ${_log.addrList } --%> - ${fns:abbr(_log.serverLocate,20)} - ${fns:abbr(_log.clientLocate,20)} + ${_log.serverLocate} + ${_log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp index c97673b08..81007c4ce 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp @@ -225,8 +225,8 @@ <%-- ${_log.addrList } --%> - ${fns:abbr(_log.serverLocate,20)} - ${fns:abbr(_log.clientLocate,20)} + ${_log.serverLocate} + ${_log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp index 054f28474..e3a26179c 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp @@ -237,11 +237,11 @@ $(document).ready(function(){ -<%-- --%> -<%-- ${fns:stringFormat(log.addrList,30)} --%> +<%-- --%> +<%-- ${log.addrList} --%> - ${fns:abbr(log.serverLocate,20)} - ${fns:abbr(log.clientLocate,20)} + ${log.serverLocate} + ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp index f7f5342c6..66bb7ca2e 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp @@ -213,8 +213,8 @@ IPSEC - - ${fns:stringFormat(log.chapName,30)} + + ${log.chapName} ${log.capIp} @@ -239,11 +239,11 @@ - <%-- - ${fns:stringFormat(log.addrList,30)} + <%-- + ${log.addrList} --%> - ${fns:abbr(log.serverLocate,20)} - ${fns:abbr(log.clientLocate,20)} + ${log.serverLocate} + ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp index c870ea711..0c9bf33a7 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp @@ -205,18 +205,26 @@ ${_log.mailProto } - - ${fns:stringFormat(_log.mailFrom,30)} + + ${_log.mailFrom} - - ${fns:stringFormat(_log.mailTo,30)} + + ${_log.mailTo} ${_log.subject } - + + ${fn:substring(_log.emlFile,0,20) } + + + + http://${fn:substring(_log.emlFile,0,20) } - + + ${_log.capIp } @@ -245,11 +253,11 @@ ${streamType.itemValue} -<%-- --%> -<%-- ${fns:stringFormat(_log.addrList,30)} --%> +<%-- --%> +<%-- ${_log.addrList } --%> - ${fns:abbr(_log.serverLocate,20)} - ${fns:abbr(_log.clientLocate,20)} + ${_log.serverLocate} + ${_log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp index 8ed7cae1c..b701c325a 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp @@ -226,8 +226,8 @@ $(document).ready(function(){ http://${fn:substring(log.logUri,0,20) } - - ${fns:stringFormat(log.refer,30)} + + ${log.refer} ${log.level} @@ -260,11 +260,11 @@ $(document).ready(function(){ - <%-- - ${fns:stringFormat(log.addrList,30)} + <%-- + ${log.addrList} --%> - ${fns:abbr(log.serverLocate,20)} - ${fns:abbr(log.clientLocate,20)} + ${log.serverLocate} + ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp index 7415cbec9..1684a9e57 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp @@ -226,8 +226,8 @@ $(document).ready(function(){ http://${fn:substring(log.logUri,0,20) } - - ${fns:stringFormat(log.refer,30)} + + ${log.refer} ${log.level} @@ -260,11 +260,11 @@ $(document).ready(function(){ - <%-- - ${fns:stringFormat(log.addrList,30)} + <%-- + ${log.addrList} --%> - ${fns:abbr(log.serverLocate,20)} - ${fns:abbr(log.clientLocate,20)} + ${log.serverLocate} + ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp index 2b8ba5abd..68976bf4d 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp @@ -263,8 +263,8 @@ $(document).ready(function(){ <%-- ${fns:stringFormat(log.addrList,30)} --%> - ${fns:abbr(log.serverLocate,20)} - ${fns:abbr(log.clientLocate,20)} + ${log.serverLocate} + ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp index 163add66b..8eeedd7f2 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp @@ -227,8 +227,8 @@ $(document).ready(function(){ http://${fn:substring(log.logUri,0,20) } - - ${fns:stringFormat(log.refer,30)} + + ${log.refer} ${log.level} @@ -260,11 +260,11 @@ $(document).ready(function(){ - <%-- - ${fns:stringFormat(log.addrList,30)} + <%-- + ${log.addrList} --%> - ${fns:abbr(log.serverLocate,20)} - ${fns:abbr(log.clientLocate,20)} + ${log.serverLocate} + ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp index 1b7313a2d..3f988bb56 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp @@ -224,14 +224,12 @@ $(document).ready(function(){ <%-- ${log.url } http://${log.url } --%> - + ${log.url} - + http://${log.url} - - ${fns:stringFormat(url,30)} - + @@ -240,13 +238,17 @@ $(document).ready(function(){ - - ${fns:stringFormat(logUri,30)} +<%-- --%> +<%-- ${fn:substring(logUri,0,20)} --%> + + + ${fn:substring(logUri,0,20) } <%-- ${log.logUri } http://${log.logUri }'>http://${log.logUri } --%> - ${fns:stringFormat(log.refer,30)} + ${log.refer} ${log.level} @@ -278,7 +280,7 @@ $(document).ready(function(){ - <%-- ${fns:stringFormat(log.addrList,30)} --%> + <%-- ${log.addrList} --%> ${log.serverLocate} ${log.clientLocate}