diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp index 67da245f4..8ebe9021f 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp @@ -224,14 +224,12 @@ $(document).ready(function(){ <%-- ${log.url } http://${log.url } --%> - + ${log.url } - + ${log.url } - - ${fns:stringFormat(url,30)} - + @@ -240,14 +238,15 @@ $(document).ready(function(){ - - ${fns:stringFormat(logUri,30)} + + ${fn:substring(logUri,0,20) } <%-- ${log.logUri } http://${log.logUri }'>http://${log.logUri } --%> - ${fns:stringFormat(log.refer,30)} - ${log.level} + ${log.refer } + ${log.level } @@ -278,7 +277,7 @@ $(document).ready(function(){ - <%-- ${fns:stringFormat(log.addrList,30)} --%> + <%-- ${log.addrList } --%> ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp index 600a51668..03835a168 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp @@ -288,9 +288,7 @@ http://${fn:substring(log.logUri,0,20) } - - ${fns:stringFormat(log.refer,30)} - + ${log.refer } ${log.level} @@ -323,11 +321,9 @@ - <%-- - ${fns:stringFormat(log.addrList,30)} - --%> - ${fns:abbr(log.serverLocate,20)} - ${fns:abbr(log.clientLocate,20)} + <%-- ${log.addrList } --%> + ${log.serverLocate } + ${log.clientLocate } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp index 9475890c1..909e74308 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp @@ -227,10 +227,8 @@ $(document).ready(function(){ http://${fn:substring(log.logUri,0,20) } - - ${fns:stringFormat(log.refer,30)} - - ${log.level} + ${log.refer } + ${log.level } @@ -260,11 +258,9 @@ $(document).ready(function(){ - <%-- - ${fns:stringFormat(log.addrList,30)} - --%> - ${fns:abbr(log.serverLocate,20)} - ${fns:abbr(log.clientLocate,20)} + <%-- ${log.addrList } --%> + ${log.serverLocate } + ${log.clientLocate } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp index bce14cc74..6ac85b5e4 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp @@ -227,9 +227,7 @@ $(document).ready(function(){ http://${fn:substring(log.logUri,0,20) } - - ${fns:stringFormat(log.refer,30)} - + ${log.refer } ${log.level} @@ -262,11 +260,9 @@ $(document).ready(function(){ - <%-- - ${fns:stringFormat(log.addrList,30)} - --%> - ${fns:abbr(log.serverLocate,20)} - ${fns:abbr(log.clientLocate,20)} + <%-- ${log.addrList } --%> + ${log.serverLocate } + ${log.clientLocate } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp index 0a0689a39..19b34820f 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp @@ -180,10 +180,10 @@ $(document).ready(function(){ - + <%-- - + --%> @@ -196,8 +196,8 @@ $(document).ready(function(){ - - + <%-- + --%> <%-- --%> @@ -228,14 +228,14 @@ $(document).ready(function(){ ${log.duation} ${log.voipProtocol} - ${fn:substring(log.callingAccount,0,30) } - ${fn:substring(log.calledAccount,0,30) } - ${fn:substring(log.callingNumber,0,30) } - ${fn:substring(log.calledNumber,0,30) } + ${log.callingAccount } + ${log.calledAccount } + ${log.callingNumber } + ${log.calledNumber } <%-- ${log.fromToStoreIp} - ${fn:substring(log.fromToStoreUrl,0,30) } + ${log.fromToStoreUrl } ${log.toFromStoreIp} - ${fn:substring(log.toFromStoreUrl,0,30) } --%> + ${log.toFromStoreUrl } --%> ${log.pid} @@ -244,8 +244,9 @@ $(document).ready(function(){ - - ${fns:stringFormat(logUri,30)} + + ${fn:substring(logUri,0,20) } ${log.level} @@ -278,7 +279,7 @@ $(document).ready(function(){ - <%-- ${fns:stringFormat(log.addrList,30)} --%> + <%-- ${log.addrList} --%> ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp index b436235e4..8553b1aa9 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp @@ -226,11 +226,8 @@ $(document).ready(function(){ ${log.duation} ${log.voipProtocol} - - ${fns:stringFormat(log.callingAccount,30)} - - - ${fns:stringFormat(log.calledAccount,30)} + ${log.callingAccount } + ${log.calledAccount } ${log.callingNumber} ${log.calledNumber} @@ -275,8 +272,8 @@ $(document).ready(function(){ -<%-- --%> -<%-- ${fns:stringFormat(log.addrList,30)} --%> +<%-- --%> +<%-- ${log.addrList } --%> ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp index c857531fc..6ca970115 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp @@ -226,12 +226,8 @@ $(document).ready(function(){ ${log.duation} ${log.voipProtocol} - - ${fns:stringFormat(log.callingAccount,30)} - - - ${fns:stringFormat(log.calledAccount,30)} - + ${log.callingAccount } + ${log.calledAccount } ${log.callingNumber} ${log.calledNumber} <%-- ${log.fromToStoreIp} --%> @@ -275,9 +271,7 @@ $(document).ready(function(){ - <%-- - ${fns:stringFormat(log.addrList,30)} - --%> + <%-- ${log.addrList } --%> ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp index 72067a5ba..215988d2c 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp @@ -189,7 +189,7 @@ $(document).ready(function(){ -<%-- --%> +<%-- --%> @@ -251,11 +251,9 @@ $(document).ready(function(){ -<%-- --%> -<%-- ${fns:stringFormat(log.addrList,30)} --%> - - ${fns:abbr(log.serverLocate,20)} - ${fns:abbr(log.clientLocate,20)} + <%-- ${log.addrList } --%> + ${log.serverLocate } + ${log.clientLocate } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp index ec4211507..0aff593b9 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp @@ -235,11 +235,9 @@ - <%-- - ${fns:stringFormat(log.addrList,30)} - --%> - ${fns:abbr(log.serverLocate,20)} - ${fns:abbr(log.clientLocate,20)} + <%-- ${log.addrList } --%> + ${log.serverLocate } + ${log.clientLocate } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp index 77875dfcf..a0caae0b6 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp @@ -216,21 +216,11 @@ $(document).ready(function(){ - <%-- - ${fns:stringFormat(log.version,30)} - --%> - - ${fns:stringFormat(log.hostKey,30)} - - <%-- - ${fns:stringFormat(log.hostCookie,30)} - - - ${fns:stringFormat(log.encryptMode,30)} - - - ${fns:stringFormat(log.mac,30)} - --%> + <%-- ${log.version } --%> + ${log.hostKey } + <%-- ${log.hostCookie } + ${log.encryptMode } + ${log.mac } --%> <%-- SSH SSHD @@ -259,11 +249,9 @@ $(document).ready(function(){ - <%-- - ${fns:stringFormat(log.addrList,30)} - --%> - ${fns:abbr(log.serverLocate,20)} - ${fns:abbr(log.clientLocate,20)} + <%-- ${log.addrList } --%> + ${log.serverLocate } + ${log.clientLocate } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp index ea337255c..f968cb3eb 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp @@ -214,18 +214,10 @@ - - ${fns:stringFormat(log.version,30)} - - - ${fns:stringFormat(log.sni,30)} - - - ${fns:stringFormat(log.san,30)} - - - ${fns:stringFormat(log.cn,30)} - + ${log.version } + ${log.sni } + ${log.san } + ${log.cn } ${log.capIp} ${log.transProto } @@ -249,11 +241,9 @@ - <%-- - ${fns:stringFormat(log.addrList,30)} - --%> - ${fns:abbr(log.serverLocate,20)} - ${fns:abbr(log.clientLocate,20)} + <%-- ${log.addrList } --%> + ${log.serverLocate } + ${log.clientLocate } diff --git a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp index e172c0d48..3c8aa291b 100644 --- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp @@ -180,7 +180,7 @@ - ${fns:stringFormat(_log.url,30)} + ${_log.url } ${_log.capIp } ${_log.transProto } ${_log.dIp } @@ -202,9 +202,9 @@ ${streamType.itemValue} - <%-- ${fns:stringFormat(_log.addrList,30)} --%> - ${fns:abbr(_log.serverLocate,20)} - ${fns:abbr(_log.clientLocate,20)} + <%-- ${_log.addrList } --%> + ${_log.serverLocate } + ${_log.clientLocate }