From eea4371eb5fee85921318ddb1a2be491e508cd0d Mon Sep 17 00:00:00 2001 From: Andre Lorbach Date: Mon, 21 Apr 2008 17:48:07 +0200 Subject: [PATCH] Added few new icons, and added predefined searches. Predefined searches can be easily reached by the Button left to the search box. For now I have created a bunch of usefull samples. I hope users are going to contribute more. A predefined search is simply the querystring from url for now. The popup is done as css menu, so it works without javascript as well. Fixed minor bugs I noticed while developing. --- .../logstreamlineparsersyslog.class.php | 16 ++-- .../logstreamlineparserwinsyslog.class.php | 15 +-- src/config.php | 15 ++- src/css/defaults.css | 12 ++- src/css/menu.css | 55 +++++++++++ src/images/icons/link_view.png | Bin 0 -> 899 bytes src/images/icons/navigate_check.png | Bin 0 -> 747 bytes src/images/icons/navigate_close.png | Bin 0 -> 501 bytes src/images/icons/navigate_cross.png | Bin 0 -> 966 bytes src/images/icons/navigate_left.png | Bin 0 -> 728 bytes src/images/icons/navigate_open.png | Bin 0 -> 476 bytes src/images/icons/navigate_right.png | Bin 0 -> 724 bytes src/images/icons/navigate_up.png | Bin 0 -> 701 bytes src/images/icons/text_find.png | Bin 0 -> 890 bytes src/include/constants_logstream.php | 2 +- src/include/functions_common.php | 42 ++++++++- src/include/functions_frontendhelpers.php | 15 ++- src/index.php | 3 +- src/lang/en/main.php | 2 + src/templates/index.html | 88 +++++++++++------- src/themes/default/main.css | 2 +- 21 files changed, 203 insertions(+), 64 deletions(-) create mode 100644 src/css/menu.css create mode 100644 src/images/icons/link_view.png create mode 100644 src/images/icons/navigate_check.png create mode 100644 src/images/icons/navigate_close.png create mode 100644 src/images/icons/navigate_cross.png create mode 100644 src/images/icons/navigate_left.png create mode 100644 src/images/icons/navigate_open.png create mode 100644 src/images/icons/navigate_right.png create mode 100644 src/images/icons/navigate_up.png create mode 100644 src/images/icons/text_find.png diff --git a/src/classes/logstreamlineparsersyslog.class.php b/src/classes/logstreamlineparsersyslog.class.php index 0de415f..8bb67e9 100644 --- a/src/classes/logstreamlineparsersyslog.class.php +++ b/src/classes/logstreamlineparsersyslog.class.php @@ -82,6 +82,14 @@ class LogStreamLineParsersyslog extends LogStreamLineParser { $arrArguments[SYSLOG_SYSLOGTAG] = $out[3]; $arrArguments[SYSLOG_MESSAGE] = $out[4]; } + // Sample (Syslog): Mar 7 17:18:35 debandre exiting on signal 15 + else if ( preg_match("/(... [0-9]{1,2} [0-9]{1,2}:[0-9]{1,2}:[0-9]{1,2}) (.*?) (.*?)$/", $szLine, $out ) ) + { + // Copy parsed properties! + $arrArguments[SYSLOG_DATE] = GetEventTime($out[1]); + $arrArguments[SYSLOG_HOST] = $out[2]; + $arrArguments[SYSLOG_MESSAGE] = $out[3]; + } // Sample (RSyslog): 2008-03-28T11:07:40+01:00 localhost rger: test 1 else if ( preg_match("/([0-9]{4,4}-[0-9]{1,2}-[0-9]{1,2}T[0-9]{1,2}:[0-9]{1,2}:[0-9]{1,2}\+[0-9]{1,2}:[0-9]{1,2}) (.*?) (.*?):(.*?)$/", $szLine, $out ) ) { @@ -107,14 +115,10 @@ class LogStreamLineParsersyslog extends LogStreamLineParser { $arrArguments[SYSLOG_DATE] = GetEventTime($out[1]); $arrArguments[SYSLOG_MESSAGE] = $out[2]; } - else { - if ( strlen($arrArguments[SYSLOG_MESSAGE]) > 0 ) - { - // TODO: Cannot Parse Syslog message with this pattern! - echo ("wtf syslog - '" . $arrArguments[SYSLOG_MESSAGE] . "'
"); - } + if ( isset($arrArguments[SYSLOG_MESSAGE]) && strlen($arrArguments[SYSLOG_MESSAGE]) > 0 ) + OutputDebugMessage("Unparseable syslog msg - '" . $arrArguments[SYSLOG_MESSAGE] . "'"); } // If SyslogTag is set, we check for MessageType! diff --git a/src/classes/logstreamlineparserwinsyslog.class.php b/src/classes/logstreamlineparserwinsyslog.class.php index 90bc72f..35eb8ee 100644 --- a/src/classes/logstreamlineparserwinsyslog.class.php +++ b/src/classes/logstreamlineparserwinsyslog.class.php @@ -75,10 +75,6 @@ class LogStreamLineParserwinsyslog extends LogStreamLineParser { $arrArguments[SYSLOG_SEVERITY] = $out[5]; $arrArguments[SYSLOG_SYSLOGTAG] = $out[6]; $arrArguments[SYSLOG_MESSAGE] = $out[7]; - -// // Expand SYSLOG_FACILITY and SYSLOG_SEVERITY -// $arrArguments[SYSLOG_FACILITY_TEXT] = GetFacilityDisplayName( $arrArguments[SYSLOG_FACILITY] ); -// $arrArguments[SYSLOG_SEVERITY_TEXT] = GetSeverityDisplayName( $arrArguments[SYSLOG_SEVERITY] ); } else if ( preg_match("/([0-9]{4,4}-[0-9]{1,2}-[0-9]{1,2},[0-9]{1,2}:[0-9]{1,2}:[0-9]{1,2}),([0-9]{4,4}-[0-9]{1,2}-[0-9]{1,2},[0-9]{1,2}:[0-9]{1,2}:[0-9]{1,2}),(.*?),([0-9]{1,2}),([0-9]{1,2}),(.*?)$/", $szLine, $out ) ) { @@ -88,18 +84,11 @@ class LogStreamLineParserwinsyslog extends LogStreamLineParser { $arrArguments[SYSLOG_FACILITY] = $out[4]; $arrArguments[SYSLOG_SEVERITY] = $out[5]; $arrArguments[SYSLOG_MESSAGE] = $out[6]; - -// // Expand SYSLOG_FACILITY and SYSLOG_SEVERITY -// $arrArguments[SYSLOG_FACILITY_TEXT] = GetFacilityDisplayName( $arrArguments[SYSLOG_FACILITY] ); -// $arrArguments[SYSLOG_SEVERITY_TEXT] = GetSeverityDisplayName( $arrArguments[SYSLOG_SEVERITY] ); } else { - if ( strlen($arrArguments[SYSLOG_MESSAGE]) > 0 ) - { - // TODO: Cannot Parse Syslog message with this pattern! - die ("wtf winsyslog - '" . $arrArguments[SYSLOG_MESSAGE] . "'"); - } + if ( isset($arrArguments[SYSLOG_MESSAGE]) && strlen($arrArguments[SYSLOG_MESSAGE]) > 0 ) + OutputDebugMessage("Unparseable Winsyslog message - '" . $arrArguments[SYSLOG_MESSAGE] . "'"); } // If SyslogTag is set, we check for MessageType! diff --git a/src/config.php b/src/config.php index 4f5ba78..a581908 100644 --- a/src/config.php +++ b/src/config.php @@ -74,6 +74,17 @@ $CFG['Columns'][] = SYSLOG_MESSAGETYPE; $CFG['Columns'][] = SYSLOG_MESSAGE; // --- +// --- Predefined Searches! +$CFG['Search'][] = array ( "DisplayName" => "Syslog Warnings and Errors", "SearchQuery" => "filter=severity%3A0%2C1%2C2%2C3%2C4&search=Search" ); +$CFG['Search'][] = array ( "DisplayName" => "Syslog Errors", "SearchQuery" => "filter=severity%3A0%2C1%2C2%2C3&search=Search" ); +$CFG['Search'][] = array ( "DisplayName" => "All messages from the last hour", "SearchQuery" => "filter=datelastx%3A1&search=Search" ); +$CFG['Search'][] = array ( "DisplayName" => "All messages from last 12 hours", "SearchQuery" => "filter=datelastx%3A2&search=Search" ); +$CFG['Search'][] = array ( "DisplayName" => "All messages from last 24 hours", "SearchQuery" => "filter=datelastx%3A3&search=Search" ); +$CFG['Search'][] = array ( "DisplayName" => "All messages from last 7 days", "SearchQuery" => "filter=datelastx%3A4&search=Search" ); +$CFG['Search'][] = array ( "DisplayName" => "All messages from last 31 days", "SearchQuery" => "filter=datelastx%3A5&search=Search" ); +// $CFG['Search'][] = array ( "DisplayName" => "", "SearchQuery" => "" ); +// --- + // --- Source Options $CFG['Sources'][Source1]['ID'] = "Source1"; $CFG['Sources'][Source1]['Name'] = "Syslog Disk File"; @@ -120,6 +131,6 @@ $CFG['Sources'][Source6]['DBName'] = "syslogng"; $CFG['Sources'][Source6]['DBUser'] = "root"; $CFG['Sources'][Source6]['DBPassword'] = ""; $CFG['Sources'][Source6]['DBTableName'] = "logs"; - // --- -?> + +?> \ No newline at end of file diff --git a/src/css/defaults.css b/src/css/defaults.css index 40a10af..d633a33 100644 --- a/src/css/defaults.css +++ b/src/css/defaults.css @@ -22,6 +22,13 @@ display: none; } +.SelectSavedFilter +{ + margin-top: 3px; + border: 1px solid; + border-color: #233B51 #124A7C #124A7C #233B51; +} + .syslogdetails, a.syslogdetails, a.syslogdetails:link, a.syslogdetails:active, a.syslogdetails:visited { font-weight:normal; @@ -30,13 +37,12 @@ .syslogdetails { position:relative; /*this is the key*/ - z-index:24; + z-index:4; } .syslogdetails:hover { - z-index:25; -/* font-weight:normal;*/ + z-index:5; } .syslogdetails span {display: none} /*the span will display just on :hover state*/ diff --git a/src/css/menu.css b/src/css/menu.css new file mode 100644 index 0000000..c604f23 --- /dev/null +++ b/src/css/menu.css @@ -0,0 +1,55 @@ +#menu { + width: 16px; /* set width of menu */ +} + +#menu ul { /* remove bullets and list indents */ + list-style: none; + margin: 0; + padding: 0; +} + +/* style, color and size links and headings to suit */ +#menu a, #menu h2 { + display: block; + border-width: 1px; + border-style: solid; + margin: 0; + padding: 2px 3px; +} + +#menu h2 { + font: bold 11px/16px; + text-align: center; +} + +#menu a { + text-decoration: none; + border-color: #44617D #203040 #203040 #44617D; +} + +#menu a:hover { + border-style: invert; + text-decoration: none; + border-color: #44617D #203040 #203040 #44617D; +} + +#menu li { + z-index:10; + /* make the list elements a containing block for the nested lists */ + position: relative; +} + +#menu ul ul { + position: absolute; + top: 16px; + left: 0px; /* to position them to the right of their containing block */ + width: 300; /* width is based on the containing block */ +} + +div#menu ul ul, +div#menu ul li:hover ul ul +{display: none;} + +div#menu ul li:hover ul, +div#menu ul ul li:hover ul +{display: block;} \ No newline at end of file diff --git a/src/images/icons/link_view.png b/src/images/icons/link_view.png new file mode 100644 index 0000000000000000000000000000000000000000..08184bf295f0382c7da8d935aa27a8e4192ca98a GIT binary patch literal 899 zcmV-}1AP36P)WdKueATc%|MrC3kGB7YRATlsIF*rIiGaxH4F)%RJmRz3z000McNliru z)&&<0G98OE9zOs8010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00P@d zL_t(|+KrQ6Oj2XFK=(}{2~&GYFAd4 z35ud5IPPGWq~GV;bD~RXO&h()8(aH^|o?%}=$IYk~9 zX)>8C`+?Anmt*66isXV+LNhv@j(zP`RNP1C@#nJl_iB4wp15dMQm(`5|KVx5zTG^C?RAe*|&BH?gl zOH1p`&CM;a+wH5xPUQax3=bR5Pfku5Jf5E(CY|B09{||=4EVwsh!sRK=t&Ue3Weg@ z!ooZ_9CkZ~?G=hhj*N_Swzb`UOVbizB9Q<-mjl}4#;F4w9|N^>ER6oh40xfy~2xsZa${1{L?lBjZ; z!N-$-U0Pb&#$YSr=Qy3tid-%S{rx&`I?e84o-T3x2g|%4g5YaCIA1-1Trvus%{izI ze9rgMemMqWX(5i}xH6eci8*P@%SC6kTCF-54Alq(LY`PmL&a$sE0s#)4Xl%_U;B{f zJ-EY>uP;k402`d$N!U=}fHa%UPgN>)Y-3}sgU6#T=JUC9G#dTp^?L0-pO0Z#7Mlra zW9vETW9DO*=;2-2E-CGTg-4%o{TGRa3)pPS&vCMdTtOs-t04ho2XPnPz0v9uDtL_F z`9^TxJU6p|Yt@M0=ra`_lo$~q{9=!pVxBQ1Q}j85G$6{N_+sgAES={|=0^t!3vU34 Z{02?gII8&T46y(J002ovPDHLkV1kzGh)Mte literal 0 HcmV?d00001 diff --git a/src/images/icons/navigate_check.png b/src/images/icons/navigate_check.png new file mode 100644 index 0000000000000000000000000000000000000000..8fc0a6a5ee6d5cd317c326811ee380662d0488b6 GIT binary patch literal 747 zcmVWdKBJAT}UMb!;FqFfcSAF*Q0cH99mlAS*C2Ffcka{wn|g00(qQO+^RR z1s4r6C8IH>p#T5?32;bRa{vGe@Bjb`@Bu=sG?)MY00d`2O+f$vv5yP(_)dLMOzfmh=hh%oeG_{GwnQYn_`6cL1MhgZ}Hx}=f3;iJHS7N zu;a=T<1L(f=q|L~uaJKs(~h?D27RM8zNz%o>hC^XmXrakJ)c6gAW=sBdxK*MGjGd9 z_653n)TUif+PzL}*!@@;k5X3R>qVE7Ex0%pMqtE4D-*%h_s`CXoNX!O_8;+S1_M;a z!>km*KF_UE)<-l8I2UcUnAGG2zqR*c**;v7)fB$G&cb^goLLNd0-lpKagi4RS;qR< zy*TD?e<1M!@lMe9Uy2R(Iu5J!BnMh8mSuJCfGTA(y!Xr7-}xt d;>!OO-vPPC=!S#^ZPNe%002ovPDHLkV1h4qN}vD$ literal 0 HcmV?d00001 diff --git a/src/images/icons/navigate_close.png b/src/images/icons/navigate_close.png new file mode 100644 index 0000000000000000000000000000000000000000..9ae5563c2d41ae6d778f1c6df241a88699c344ec GIT binary patch literal 501 zcmVWdKBJAT}UMb!;FqFfcSAF*Q0fI65^qAS*C2Ffcsz7_a~U00(qQO+^RR z1s4r6C8IH>p#T5?32;bRa{vGe@Bjb`@Bu=sG?)MY00d`2O+f$vv5yPyPXMVMTaF_U3MU00000NkvXXu0mjf^}5qQ literal 0 HcmV?d00001 diff --git a/src/images/icons/navigate_cross.png b/src/images/icons/navigate_cross.png new file mode 100644 index 0000000000000000000000000000000000000000..4f1e288f5f5a1165b6225c7c8514328438ff6d05 GIT binary patch literal 966 zcmV;%13CPOP)WdKBJAT}UMb!;FqFfcSAF*G_gI65*iAS*C2FfdUoEyw@>00(qQO+^RR z1s4r6C8IH>p#T5?32;bRa{vGe@Bjb`@Bu=sG?)MY00d`2O+f$vv5yP7SpElKPs!LAeAQXJx68+-k>^OB7kb)-+)_h!C% zJM+x|(uVFC7@l~5PkuT>rvn59|F;kC9>?jQ#}OFlrjx#R&GBW@fToNMMfG#G-u_jg zEdE9@ktN?Y!QP2F_wcyZsXx~vy+@k0wv#B$O~Wd0lE>n#f9U?zxc-r$Dd;$$vZ_CJ zv9wuRz(#U)C&|YTPPjVMXDk@x+o~G~zIg~G<0y&~ljMKR(Q~%wZtEEC@~Ui$-t>8O zR%?$BR!W--hz$F+Q14?F?B)%d0fqsrtO`tBAE!U4P=YMS;@y0<>|U}u`!00)HCAp= zfqoA&{qaErLRWYwsF;%M@c@g90{1SDz+5X5`2``vWgS?5mMOfpQdZad=iAyntYR@J zZ9XQvepV9c&PT)uJSZ-^c1gp-YZ!uE9>H z1%4fp=ZTM6uEuzF?99{ii)7Lu$gJZKWkthZRqS0_qVm2!le!Mt>T5iqh z_7tk=zpPAd$rXs6ck4Q9+`RD=OFvK_?ELN^RnpsbJ~2I;3q%XQd^3*ftAeAml&VCi zp|Y@Qt-MM#k|`e+zkdn4HBa}?33=vdKr@O6Axe;1C-+O`Y-hmnzv1|oWe*tsGr6K( or@QriWb8{qBMCVeRcBlAFN>f)w{pvF2><{907*qoM6N<$g0+XV#sB~S literal 0 HcmV?d00001 diff --git a/src/images/icons/navigate_left.png b/src/images/icons/navigate_left.png new file mode 100644 index 0000000000000000000000000000000000000000..9c39da6c7f9055abfa0bed9b17d122857885746e GIT binary patch literal 728 zcmV;}0w?{6P)WdKBJATc-~MrC3kGB7YRATl#LF*Q0dFd!>1F)%ROt<&ZJ000McNliru z)&&<0G9{xirl9};010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00J;c zL_t(|+J#czPf~Fd|9meNKLj>R5l}BM%!t`WTCLVYZ?)BvJ@nF3>!pXbUdp$&daK9& zfZkeLZEkJ#&@$%2)K(M40>oKOg$Z)Ugt#L2UZ`^wOc3>KpOyfauCTc?h)d#pK-d~Nb3-@{&9z2b8$6f8q!?XeXkCYEU;5&j-5aQX9Xw^Mn3 z*6(Qfk&=)lL6i+L;;7|O|L6z}hRqiGKz zN+>iJIR9?=BriSTyW3dk*E$j+1J>r}5V#kHvhkBPVl}c_td2Y|^0?opeb{a@vPi0g z%%)0?g)lK3LAmsuHUfk=VWakg{}&9re0utf`GMZ7V>3w+xj*#m^z2tmKZ>KGgsbEQ zLa|1!7hsY(D}f1_3Pgq4I*#5Xs>@4+U^8;P3#)IYawVTt)>-_pwlf$EKxdx|##2Bx z`Vmqt-I#$!8x;tFFt}bF%(g*vkVq?u*j!E+PV^)DJA`5?OMB)01S$j(!lyZKJO`uw z9J(AN(h4}--OzgmkzJgHxGL>Q>hGx%_S3`Ietd7}EzeWP62@;WshhkS(6l;`pG)+q8z zDe9|HP7>t3LE2lY%~pb+;HaiBLdezZJWQZ=rIDb+c7%6QsMbGy%FFIGAi;kC0000< KMNUMnLSTZ8ojt1n literal 0 HcmV?d00001 diff --git a/src/images/icons/navigate_open.png b/src/images/icons/navigate_open.png new file mode 100644 index 0000000000000000000000000000000000000000..b22b2da10563f14c73c1dcb070391686fc84afcb GIT binary patch literal 476 zcmV<20VDp2P)WdKBJAT}UMb!;FqFfcSAF*Q0gG&(akAS*C2FfhrTp#T5?32;bRa{vGe@Bjb`@Bu=sG?)MY00d`2O+f$vv5yPG0OIR8IeqF`L_=n-&weD<&Zx7xAMSo&b%8V)0!^9xPywt-* zJ%mqMT;utB0ab=q$Ime^{QU%!{7cvXr_31+=92M@oSY0V88{g}^UJ9JW0DnNc)tHU zQ1&yrA*crU9qO<&5X|Qm;AXfBwD0kEW`b(8V9$FfhD$3Jh)_Us}fnsPrHZgTmuIdMt{B z0Wk-b82S&yKY;iu5bp!xSLgWdKBJATc-~MrC3kGB7YRATl#LF*Q0dFd!>1F)%ROt<&ZJ000McNliru z)&&<0G9{xirl9};010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00JyY zL_t(|+J%$LYZFlv#=ptrou)2=)rn;%r*j6xTV`(vBqbQh!ggn}$nLH-Rc&ZbdPHKDL2lw7{zV99m_p<1YYf%?Q zCgw4CaSPv{{iKs7Az`0j|E=!EeKvD_?*18z`$tK2rKECIke>fanHteP*kJU=^qrGN zZ&j3Fvl`fJ({ff|h8xI4;*_oa&t%6yYgvkJTE`t+-$0ofH}Gbr4E}TjZXo++jVgq_ zOm+-X?*wGN#MWD$6Ma1Ith8B({XA1u^8rZ5^vJzkrK*b3gzZ|lAf)ps#9|rIJ)*MM zkCqudnpP_Vlf#et5Qlu^lhTA$bksz(m_sJIEHs?1Hg|X!CNprv$-qA3L&@$SlaExl z)iF^i45U9(cLWm99TFLh2GD5<9iXPWnne@keT2CqQ1^`W{09@%>CnK~@pC03hpI*o ztS2OdpM;T|N+~bhZE$OagOGhO78pHMGxk$EdemcasXhB>2FYN7Dx$?H?0Y ziNQUGEeE6Mh9kU$N4|0U;bigmR~~54*_&i)@`GvZ*YWdKBJATc-~MrC3kGB7YRATl#LF*Q0dFd!>1F)%ROt<&ZJ000McNliru z)&&<0G9{xirl9};010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00I?B zL_t(|+Rc(ZOcP-k$NzWN%5mHUX!UZXEn)#%U2GsWY1GBhn3yoIGil<&q>GDjW^r*d zPR7MV6B0j2iLnF)qadx8wwkn<7Rr?hwDjw)J)g!iR)c}jC;468Jn#Sc<<0vZ@c-7? zhf^52f0tG^!uqcmw{JJ_^p5wGbc5-Z0_CQ!8~ND?b@zzo!Gd$sH$AS#ZHpu@8Qsbl zf^8J+aSmH^(fuTU3ND7O_sg{@u~%Rc`8pa53&_V9h;jgMXvojUC{=Ek{1#k#J>j(1 z?%CxoHcrEuZqTj;5IO-xVZb|rFl@qq$ zL7W&min*|g=T}3}_O@w1#Ub^gV2JVt8vHP(C&H)~6XtN-ym1|+Zz@Wg5oppGJe!=s z?%F!_7l}27J}r6)Kj9`m6EXA64fBm!nJ&Udc!@O8I^_;y23RvdZ-ydKZ5u|Lgg0~5 jzyF8!&_Q*W%;DWdKHUATlu^MrC3kGB7YRATcpIF*iChG9W83F)%Q{Dd!0Q000McNliru z)&&<0Gdn;fs)GOk010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00PoU zL_t(|+KrQ4NK;`P#-DA+Cd_8J6>`u_r7{$f73Ec?HXM<3p*MMBy7D5r zNQ|82jnynsA26eSd< z9+dIXJqd(U%nCuk^%Nfv@VIZV4#kTQdpJ3Xw3!4C#l!-(;gz|O6;cE~5fv2c(Q0aB zdqIdnX-N_MJ|EM@6GQ<6;KF4+L}7sx0xpTJM9-Oq81VdF1T|wr8CYI6BU%y( zd2|%gHODbD&I$h9!U8PcDD9p^v;9TxWOip};^Wzv^n4cjbVIT7I zFG8VEAhgIm1`XJvy3O@i|K)*Nt%gV>Ld>4sh?YvghPpqWezGZ-+>L#2si*Qpru{bt>((7dq zM~ZQ`u9~O?xTMX(sACq(p0DFX%fz6Wx0ILP>FU}pmL%nB;?Umm2;Y`gkq{$AiaHPD zpXQOCMuyJs!{E>q?8Bqu&!60I5M4i^jWG}s5(BfXFc=Inl}aV;=;&B9nM^cUTN4Nb zK0crC_j@|Z^;tOkGQKYck+v8sju QTL1t607*qoM6N<$f $mySearch) + { + // Copy configured searches into content array! + $content['Search'][$mykey]["ID"] = $mykey; + $content['Search'][$mykey]["Selected"] = false; + + // --- Set CSS Class + if ( $mykey % 2 == 0 ) + $content['Search'][$mykey]['cssclass'] = "line1"; + else + $content['Search'][$mykey]['cssclass'] = "line2"; + // --- + + } + } + else // Disable predefined searches + $content['EnablePredefinedSearches'] = false; +} + function InitPhpDebugMode() { global $content; @@ -233,6 +264,15 @@ function InitFrontEndVariables() $content['MENU_SEARCH'] = "image=" . $content['BASEPATH'] . "images/icons/view.png"; $content['MENU_SELECTION_DISABLED'] = "image=" . $content['BASEPATH'] . "images/icons/selection.png"; $content['MENU_SELECTION_ENABLED'] = "image=" . $content['BASEPATH'] . "images/icons/selection_delete.png"; + + $content['MENU_PAGER_BEGIN'] = $content['BASEPATH'] . "images/icons/media_beginning.png"; + $content['MENU_PAGER_PREVIOUS'] = $content['BASEPATH'] . "images/icons/media_rewind.png"; + $content['MENU_PAGER_NEXT'] = $content['BASEPATH'] . "images/icons/media_fast_forward.png"; + $content['MENU_PAGER_END'] = $content['BASEPATH'] . "images/icons/media_end.png"; + $content['MENU_NAV_LEFT'] = $content['BASEPATH'] . "images/icons/navigate_left.png"; + $content['MENU_NAV_RIGHT'] = $content['BASEPATH'] . "images/icons/navigate_right.png"; + $content['MENU_NAV_CLOSE'] = $content['BASEPATH'] . "images/icons/navigate_close.png"; + $content['MENU_NAV_OPEN'] = $content['BASEPATH'] . "images/icons/navigate_open.png"; } // Lang Helper for Strings with ONE variable diff --git a/src/include/functions_frontendhelpers.php b/src/include/functions_frontendhelpers.php index 5cfebf6..c889664 100644 --- a/src/include/functions_frontendhelpers.php +++ b/src/include/functions_frontendhelpers.php @@ -145,4 +145,17 @@ function GetFormatedDate($evttimearray) return $szDateFormatted = date("Y-m-d H:i:s", $evttimearray[EVTIME_TIMESTAMP] ); } -?> +function OutputDebugMessage($szDbg) +{ + global $CFG; + + if ( $CFG['MiscShowDebugMsg'] == 1 ) + { + print(""); + print(""); + print(""); + print("
Debugmessage: " . $szDbg . "

"); + } +} + +?> \ No newline at end of file diff --git a/src/index.php b/src/index.php index f9c80be..befa04c 100644 --- a/src/index.php +++ b/src/index.php @@ -53,7 +53,8 @@ InitFilterHelpers(); // Helpers for frontend filtering! // --- // --- Define Extra Stylesheet! -$content['EXTRA_STYLESHEET'] = ''; +$content['EXTRA_STYLESHEET'] = '' . "\r\n"; +$content['EXTRA_STYLESHEET'] .= ''; // --- // --- CONTENT Vars diff --git a/src/lang/en/main.php b/src/lang/en/main.php index e7f4005..2e7c580 100644 --- a/src/lang/en/main.php +++ b/src/lang/en/main.php @@ -40,6 +40,8 @@ $content['LN_GEN_PREVIOUSPAGE'] = "Previous Page"; $content['LN_GEN_RECORDCOUNT'] = "Total records found"; $content['LN_GEN_PAGERSIZE'] = "Records per page"; $content['LN_GEN_PAGE'] = "Page"; +$content['LN_GEN_PREDEFINEDSEARCHES'] = "Predefined Searches"; + // Main Index Site $content['LN_ERROR_INSTALLFILEREMINDER'] = "Warning! You still have NOT removed the 'install.php' from your phpLogCon main directory!"; diff --git a/src/templates/index.html b/src/templates/index.html index 92c349a..72e5a04 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -3,11 +3,26 @@ - + + + + - @@ -86,18 +104,18 @@ - + - + - + - + diff --git a/src/themes/default/main.css b/src/themes/default/main.css index a0b655c..9ce5f62 100644 --- a/src/themes/default/main.css +++ b/src/themes/default/main.css @@ -385,7 +385,7 @@ A.cellmenu1_link:hover } /* Form elements */ -select, input, button, textarea, .SelectSavedFilter +select, input, button, textarea { background-color: #E8E7E2; color:#000000;
 {LN_SEARCH_FILTER} - - + + +
@@ -17,40 +32,43 @@
+ {LN_SEARCH_ADVANCED}
(sample: faciliy:local0 severity:warning)
- - - - - - - - - - - - - -
- {LN_HIGHLIGHT_WORDS}
- - -
- - - - - - -
{highlight_raw}
-
- + 		+ + + + + + + + + + + + + + +
+ {LN_HIGHLIGHT_WORDS}
+ + +
+ + + + + + +
{highlight_raw}
+
+ +
{ViewEntriesPerPage} Pager:         {mypagenumber}