From 5bdb0f31e4a7f03a71dcc506526b6bcf5c5c7ccf Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Sun, 20 Jun 2010 17:21:35 +0000 Subject: [PATCH] some more icons, changes to device editing system git-svn-id: http://www.observium.org/svn/observer/trunk@1221 61d68cd4-352d-0410-923a-c4978735b2b8 --- html/images/icons/apache.png | Bin 0 -> 689 bytes html/images/icons/bind.png | Bin 0 -> 673 bytes html/images/icons/device.png | Bin 0 -> 530 bytes html/images/icons/greyscale/apache.png | Bin 0 -> 605 bytes html/images/icons/greyscale/apps.png | Bin 0 -> 545 bytes html/images/icons/greyscale/bind.png | Bin 0 -> 653 bytes html/images/icons/greyscale/device.png | Bin 0 -> 530 bytes html/images/icons/greyscale/mysql.png | Bin 0 -> 630 bytes html/images/icons/greyscale/postfix.png | Bin 0 -> 601 bytes html/images/icons/greyscale/services.png | Bin 0 -> 776 bytes html/images/icons/mysql.png | Bin 0 -> 673 bytes html/images/icons/postfix.png | Bin 0 -> 725 bytes html/images/icons/services.png | Bin 0 -> 790 bytes html/includes/graphs/generic_simplex.inc.php | 3 +- html/pages/device.php | 2 +- html/pages/device/applications.inc.php | 73 ------------- html/pages/device/apps.inc.php | 34 ++++++ html/pages/device/edit.inc.php | 109 +++++-------------- html/pages/device/edit/apps.inc.php | 17 +++ html/pages/device/edit/device.inc.php | 93 ++++++++++++++++ html/pages/device/edit/services.inc.php | 91 ++++++++++++++++ html/pages/device/srv.inc.php | 6 +- poll-device.php | 1 + scripts/{posfix-queues => postfix-queues} | 0 24 files changed, 266 insertions(+), 163 deletions(-) create mode 100644 html/images/icons/apache.png create mode 100644 html/images/icons/bind.png create mode 100755 html/images/icons/device.png create mode 100644 html/images/icons/greyscale/apache.png create mode 100644 html/images/icons/greyscale/apps.png create mode 100644 html/images/icons/greyscale/bind.png create mode 100755 html/images/icons/greyscale/device.png create mode 100644 html/images/icons/greyscale/mysql.png create mode 100644 html/images/icons/greyscale/postfix.png create mode 100644 html/images/icons/greyscale/services.png create mode 100644 html/images/icons/mysql.png create mode 100644 html/images/icons/postfix.png create mode 100644 html/images/icons/services.png delete mode 100644 html/pages/device/applications.inc.php create mode 100644 html/pages/device/apps.inc.php create mode 100644 html/pages/device/edit/apps.inc.php create mode 100644 html/pages/device/edit/device.inc.php create mode 100644 html/pages/device/edit/services.inc.php rename scripts/{posfix-queues => postfix-queues} (100%) diff --git a/html/images/icons/apache.png b/html/images/icons/apache.png new file mode 100644 index 0000000000000000000000000000000000000000..1d65f1bbeaecf65831022ccd6c2f06d6b62ad1c5 GIT binary patch literal 689 zcmV;i0#5yjP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+$tiu~XJ00JRNL_t(IPh)trGNS(KLeISqceffmJJiO? zKq`2=Jh=1G%;5irn}bij=+C=+#HGlEBr{GG^qSm=tp2^%FZcgG{aODnt1oza-fe~o z(T3a(*~xs$VBMu_Hh2C{5?lBGqQvsM7iXkc>&WIg`!orbPxVtD6#ARcAZQApKC1oe_b#2?WOoqW1 z?3i|s@_HbL)P z_sw-WX<7N^Wz^aKhrCbxKOTDY|GT2Y{~uVS|G(&){OWvlqdY-FPCMkOT{P=B{VMCq z|LviN{vYt)`~Pdfq5roGV*Z~_&tE~%0FZ(;x>c;(oo9vbjNLmgU%&RpLYu1p>y0w5 z?aORSCdvSqqPZ=bbmF~=R>at(=KGt3@2X5`pTA(j22GL-fho=ijg@mXv5GHB$kGD< Xka`Yh-3nD|00000NkvXXu0mjfMpJ9i literal 0 HcmV?d00001 diff --git a/html/images/icons/bind.png b/html/images/icons/bind.png new file mode 100644 index 0000000000000000000000000000000000000000..785f66c837f6073cd8a627f3bf29670452c633c9 GIT binary patch literal 673 zcmV;S0$%-zP)pF8FWQhbW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE;UJt{NMlp0v<_3K~y+TV_+C`pt*m}qa_>m{BNB&_dm#SlNYQ5vqNK3ZxQ9# zisrsY>vkLlX#g9LQB?E4Z}y7+K!cy)H6SUwT|2_P}{=0Yu{Ld+C z_#c~=_dg=1>3{9SW&cZBrhw(Rxp}JC*x4Du227Z{nq|tu^$!=V+x0)Uya|k}C$9QG zW%;iEeM`3gYMj2|e{Jvl|IxY4|HG3D!7gNGVR-=5$_zFD=v-Ei&C?cd{GVM~{~zS% zl-%_L?h5@Pppaf!IVhIjB zpr8K(ZT>GUtMDHfh*CiR-sa@u{tt|IQ1pQ`!Z3;>295&&Te2d>DeD#R00000NkvXX Hu0mjfGOIVW literal 0 HcmV?d00001 diff --git a/html/images/icons/device.png b/html/images/icons/device.png new file mode 100755 index 0000000000000000000000000000000000000000..720a237c73a9809be48ffa5ad1c1b90205b7f025 GIT binary patch literal 530 zcmV+t0`2{YP)8!PM!jse+otDvXRhleu>w{(hr=P& zTV2;rBMofZo=3rrs;YWAJqHeofOC+HNSe*6&}=qN@aeaKWm$(L&gF8enM?+{FRwu9 zoD1NBqmclHW{%@Tw}6Wqg+f989t^&~Me(EkfChX#56VZfjYtFPF_lU|uh;XF8H4TO zj!YM$blUKV1mw(6M2qNP2;H{su`-!X|7n%u=>+~>3AvaIiltqd9#DvgJ&1=10t0D6 z$;|KlP3c1Y-2fh17umvCJQ4=!_2+B&{P5)SL<2$#ZY7EM2$|!%^Ti9`3q;4qtws{i zDI^jJKbdhUAOoMo-`t-B@esjXtJQ*jzYmI{z|3qKZ(vLsG2zn?;Y5OJwYqN@My1o~ zTxy!Ox4y9nOZhb^2wGcN&dWOz9Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+$tiu~XJ00GTOL_t(IPnD88NJ3#0$E_4v8X8(_i6Dvy zYH^bY!p9&fiugjs_X{8Rz(=6?LJ$Rqi%2PPMOzfXB?w#`qOG9TAZUmjg`nbez6-A1 z>s`*hm&5P-o&WiGgTdgU)9Kue$K%7vWFp`#`t=7qOC=@aojYbHE!yp!mA(2Qh z<3yv;SBj!GSRvT7hJY7T2aCnRnB?<$aJgJiDwVE#z1}J-1hvmqD%B6F1F<2sSS&IS z3_Cg+jrjjUYPH%DLMV+!!;C`0Bo*%nV91b8r|IEvxc)DsTrTr5%)G&1nBn~(833s` zB9jSb^WJDQ_E^V>$Kxk>>L*$Oxg)p@Xti3*b|R6;N4;L(Vukp8z8xInq1kK_eMqHJ z&~CTEZnr}&m+P_uNP||Z72v6AG`N&XrC%nK3G{mXGXgA}0P`jca$l)bb|n&tUnCOU rqTLndvbzvu-i%h8LZQ%zYd-h`G??@1(!+iu00000NkvXXu0mjfpD+ew literal 0 HcmV?d00001 diff --git a/html/images/icons/greyscale/apps.png b/html/images/icons/greyscale/apps.png new file mode 100644 index 0000000000000000000000000000000000000000..76d43a6550c7161568d78ace3823e7efbfc49d23 GIT binary patch literal 545 zcmV++0^a?JP)pF8FWQhbW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE;UJt{NMlp0iH=jK~y+T#gf~qK~WTj_amZ+h!Tn|xo{}tkaD^d%AuT+R&hfv z+;{<3UcjMvgOyWO|Mrj7+V|QQd)C*i*%;p#bIkem_19%GnZDcYwpy#zKq{3AN~IEt z#UcuY0`mDhve_&$nG8~?6q3m#a=Dz!JgHr;*R|nrh);>dVwwny%AfAxa2O(B%a_aL zV}ik;E-07Fl02DAWCrgm$#weuK6os<}9k$!8oHO3<_v-=<%n)#Jkw^sb zcpQyJLy}vqmL$z)Gb|Ph3^Bp7>!2gcDu4O-sN)X0#@X~`F#H6bUMM{cs#=3a5!MU z-%Gs1;m`%?bQ+qb;q`h6&*xKkJRZ2;@4wt`H>j$L>-8$}R;yJP@MrO$TCEC{Y&IK# zl4i3hP{vsh##<~FUBHR+;8V literal 0 HcmV?d00001 diff --git a/html/images/icons/greyscale/bind.png b/html/images/icons/greyscale/bind.png new file mode 100644 index 0000000000000000000000000000000000000000..8da97cba716fc97409aa5cdef35d3ff86f683afb GIT binary patch literal 653 zcmV;80&@L{P)pF8FWQhbW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE;UJt{NMlp0t!h)K~y+T&62x|T2T>Yh-je}qF87l z+9(JjB9>NyiVu9?3$@6qg@w;T1-ak@ti-j5pvjUn7Ta%FGC6a?4cLTq$$+r_-S^i9`|+3Wc{6z%b04)oS%+zu!ZxR-+q}x7#hO z*X!@o=@k0?K4i05h{xl!Lq4DXnakzArU23|2Pmz&fHUWEIht%Xn`uStggs9t zlRz&2Ae%!0g+hT7jYgl{Za0L(VQ@N~V6|F7r_+5?C=_=Zjb^A)sesH4N~IE{QYr9w zye9(qr2(!;B*LI@m&*l?$0N+=a}?|zV>2#tobVMeTF;|WRgTa@2y-oq7 zBS@uEV7J>JFo{%tKnDj1LGCP)wW624w#CMx$|$0Cb6s5e=>Z_&^*E2NjRZ45Tt>wOSw|ejxK6 n#bPlK-_bsFfbOdf{^`$8x}0VDH%-Zy00000NkvXXu0mjfLQE8M literal 0 HcmV?d00001 diff --git a/html/images/icons/greyscale/device.png b/html/images/icons/greyscale/device.png new file mode 100755 index 0000000000000000000000000000000000000000..720a237c73a9809be48ffa5ad1c1b90205b7f025 GIT binary patch literal 530 zcmV+t0`2{YP)8!PM!jse+otDvXRhleu>w{(hr=P& zTV2;rBMofZo=3rrs;YWAJqHeofOC+HNSe*6&}=qN@aeaKWm$(L&gF8enM?+{FRwu9 zoD1NBqmclHW{%@Tw}6Wqg+f989t^&~Me(EkfChX#56VZfjYtFPF_lU|uh;XF8H4TO zj!YM$blUKV1mw(6M2qNP2;H{su`-!X|7n%u=>+~>3AvaIiltqd9#DvgJ&1=10t0D6 z$;|KlP3c1Y-2fh17umvCJQ4=!_2+B&{P5)SL<2$#ZY7EM2$|!%^Ti9`3q;4qtws{i zDI^jJKbdhUAOoMo-`t-B@esjXtJQ*jzYmI{z|3qKZ(vLsG2zn?;Y5OJwYqN@My1o~ zTxy!Ox4y9nOZhb^2wGcN&dWOz9JP)pF8FWQhbW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE;UJt{NMlp0rN>jK~y+Tt&=&6T45B12U1LxHchIu(}WcH3sa=e?+`=sT!II~tAt3Wvi}ihL*(dJF^tZxnNq_<@Aq%jGhr(-D~uK}g)}_xreBuejZAig7xfP%4$+cDs{G0O@cz{1q^p z&ERsmBpHDEmG=8RCX)%4%O&{E8IQ*!R;v}d-7a#u9LD1@oKB}45Q#(tfHUyN^?F@I zrBV?>@(7ts2BXmk4u?YyAeW`xZimHUA+ihx197r1#bQwy$T1uaVYAtk0o(0XRKTK6 zrz1Y*Y6^t{QmGWu>9hb_tyVc87z|20I`)9Y&1O@KuGMNGpU;E#0yHTBw^%H4fZy+z z*6X#%&}cM7|Lt~L+_`sZ5oEN0noK4+fR;mgcDq)qp<1nq>9m_(Jpj$&T~tvY|W`K6x*=HTHnSPb!t_v*Q0i^Zj7A z+oLq5A9TXw@$lBcXf#5n(>Te`|_fJ2t*=&AG!cPW+;iFcoy?;&g2Tlw5p@?<3 Q;{X5v07*qoM6N<$f>%Qt_5c6? literal 0 HcmV?d00001 diff --git a/html/images/icons/greyscale/postfix.png b/html/images/icons/greyscale/postfix.png new file mode 100644 index 0000000000000000000000000000000000000000..f3cccf7afebd40823375b983e66bb325b0c41302 GIT binary patch literal 601 zcmV-f0;c_mP)pF8FWQhbW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE;UJt{NMlp0oF-GK~y+T)ly4~fngN>{+_jsHHnhsnoE+MjqEHaY_JeYQYaJ) zN|D?@_xr787E{VMpEK_{6Em}z^)zoiy>;IAJm)#jIUM)r$LsZ${eJ(e$Kw&)Znx-i zxd=|DQ*<~SqTOy6tyU|+Y&MHVqw$^Ls?liH5{abDg+igp@p!y%HXAsf&%fewxxfS4 z?H1J$8utG2zjUX5dLbuxm zrs~cy>2Nxopja#t2`27#yB~?G)ryjNo`-Na42eVnFvbXgV|^0=GCoMK%HeRJPpAmr zQAs2cfpj_zwOZ|q09o)uzu$*muLrqYjwE6=jH55p=@bHi03?%1sMqU+rvklRPam=G zcDoIQLIJYbEX3n+BE@(t7K2PCLvc)QHk(9Xv)O=S;~;`grvs%@iAYch%1otFB)M9x zQVbLG`8+fl4OlLhp9Bhp;*R}RDi!hprK9@@^x^?D7ZtTyEmDc^GzFUP>u{2l>b000000NkvXXu0mjf?H&IZ literal 0 HcmV?d00001 diff --git a/html/images/icons/greyscale/services.png b/html/images/icons/greyscale/services.png new file mode 100644 index 0000000000000000000000000000000000000000..0f52207266dfe004833af935623a6a07019f8707 GIT binary patch literal 776 zcmV+j1NZ!iP)pF8FWQhbW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE;UJt{NMlp0)%v zK0e^>?G3K3t`r1Is0o?v&CLy%Os3xQ^0Hts82CvR zDAA5VvY_aTg9H~B7l3_dd)QXU=ksjOYPJ4`NDP;km*%sxGv)pLoq?%cI9MzbA|ge! zUn~~cncZ$zEEdae8oA)`NWdwW}pBqCKK1?%hU;>ya37JZ9)ypF8FWQhbW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE;UJt{NMlp0v<_3K~y+Tt&_`76Hye#NnEgU>&BH^H^znkf(!TVjERrvLKj9O zpayL;iVQ}1w1RyguPOzc%A+u)6&%n$um#4U1?d2NU`g)Eg&X7I^PFo;Om2-XY;toa z>3qL)&Ue14tNWin&rr19J!qWl8Z`9I{+WD7-}LwP=aFxZ{FB)>|5QlxO&ovt?Df8y zHA#G!#MY~sB+|=y|6oy zcNPL8b4X^^(A-`F@T7N2uqaCv_~ps?5+-6x(2bN7l1K0j$C3D8Y;je-%-saTCVGNVcwfdO_;s$1vE00000NkvXX Hu0mjfbZpF8FWQhbW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE;UJt{NMlp0#ZptK~y+T)sov!6G0S*_s{W#Cm%?>hM+=7Bqqc}jnPLEeK4R# zgA~g}NJNYpLX1Yiq(DTBC<<0+w=I=hDJ_-DLc80RZrk12vg3mZ3G4Rf>{ddn=N#|77*Sfkg_^LTROsV9T8DSOwzHIq7b$za)e?fPH<;HKxjRK>JDF# ztM8eEs_nq#lhHjQAhJb}&hJl*%M^K*yebknT>|dE&mti!mH^zP&Y&&$xmn2q| ztV&@ein7l3Db^)|wm|_;KFJtaq>yB_B&cig+k*K`9kT*O|CcoG4#ezgR-$zW8%YAk z%NQPwr|}`I+x!*O+~RG)0_!{QO~bG^iRbPVdfo_F78FD_6+B?^)5#QGxFvjCBKW-W zTX2t^prXM8g$aUd8b$+2CLx#;bd1gC(K{}pk1;lzw@)_}RpDX!-Z_9_dkO+H32z8;5RA8AonU z8^@cbjf!TEQR(y;Cm1JNOPp%;>{U7@e;mFxoVI`B|37{KlpF8FWQhbW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE;UJt{NMlp0+UHZK~y+TbyH1CGGP=Ie}H@cfo%fAl~}7GTu34+xGKU$P=+Ch zLIoO#f=EO~g;a}bVIg8@iDlXcV})O!h_;CsVnD)`+nM{``#^>-2 z{PBBye01L3-4$sYy5Rv}o4;GQ4|@bU2hM@L7!^Ye4%+1Z)u z`1pA2S26_05iC7CJcxxtL7mIx#J9IM=ytn+K=JhSRE z@b&ct?RFawJji4+a--3JTCD~rCnqw32dE4_KR@B(;sSg=-|CPAyRM^GnMerGYPA^A zHv#>xR4PCOrBVsz=jUaI!?8Z1;`a77MBt~VC%C`Ahg2#B(P$L5wzfzSpe?w*zGmIM zUT_0z0GZM-n7K`!WaF`1QgUkZ?Cu_-M z5{yP;U$55-I-RaM%mO8bFh~{@eQ}W>9*+agoz-xxkVqt0ZDwZXCq!a6JUm?A+uM`t z^*RI7xNxypCPYMvsD62Q$(k#DQjDkEq> zXXJfxaS`mjIQ!` z5J)g)Hk(yWr&Ec9J(7&?0466Vdq|+1nwnA}!S9dh{}+a`o!GIc)oP0<_s{424}|&v Uh_hv5oB#j-07*qoM6N<$f=fPSRR910 literal 0 HcmV?d00001 diff --git a/html/includes/graphs/generic_simplex.inc.php b/html/includes/graphs/generic_simplex.inc.php index 549dc4639..b72bdbc0c 100644 --- a/html/includes/graphs/generic_simplex.inc.php +++ b/html/includes/graphs/generic_simplex.inc.php @@ -1,12 +1,13 @@ '0') { echo('
  • - Services + Services
    • '); diff --git a/html/pages/device/applications.inc.php b/html/pages/device/applications.inc.php deleted file mode 100644 index 267643b7f..000000000 --- a/html/pages/device/applications.inc.php +++ /dev/null @@ -1,73 +0,0 @@ -"); - echo(''); - } else { - echo(''); - } - echo(" " . $type_text[$type] ."\n"); - if ($_GET['opta'] == $type) { echo(""); } - $sep = " | "; -} - -print_optionbar_end(); - -if (is_file("pages/device/health/".mres($_GET['opta']).".inc.php")) -{ - include("pages/device/health/".mres($_GET['opta']).".inc.php"); -} else { - foreach ($datas as $type) { - if($type != "overview") { - $graph_title = $type_text[$type]; - $graph_type = "device_".$type; - include ("includes/print-device-graph.php"); - } - } -} - - -?> diff --git a/html/pages/device/apps.inc.php b/html/pages/device/apps.inc.php new file mode 100644 index 000000000..a31dede3e --- /dev/null +++ b/html/pages/device/apps.inc.php @@ -0,0 +1,34 @@ +"); + echo(''); + } else { + echo(''); + } + echo(" " . $app['app_type'] ."\n"); + if ($_GET['opta'] == $app['app_type']) { echo(""); } + $sep = " | "; +} + +print_optionbar_end(); + +$app = mysql_fetch_array(mysql_query("SELECT * FROM `applications` WHERE `device_id` = '".$device['device_id']."' AND `app_type` = '".$_GET['opta']."'")); + +if (is_file("pages/device/apps/".mres($_GET['opta']).".inc.php")) +{ + include("pages/device/apps/".mres($_GET['opta']).".inc.php"); +} + +?> diff --git a/html/pages/device/edit.inc.php b/html/pages/device/edit.inc.php index 0af229efd..7e0f0def5 100644 --- a/html/pages/device/edit.inc.php +++ b/html/pages/device/edit.inc.php @@ -4,96 +4,37 @@ if($_SESSION['userlevel'] < '7') { print_error("Insufficient Privileges"); } else { -if($_POST['editing']) { - if($_SESSION['userlevel'] > "7") { - include("includes/device-edit.inc.php"); + +$panes = array('device' => 'Device Settings', + 'apps' => 'Applications', + 'services' => 'Services'); + +print_optionbar_start(); + +unset($sep); +foreach($panes as $type => $text) { + + if(!isset($_GET['opta'])) { $_GET['opta'] = $type; } + echo($sep); + if ($_GET['opta'] == $type) + { + echo(""); + echo(''); + } else { + echo(''); } + echo(" " . $text ."\n"); + if ($_GET['opta'] == $type) { echo(""); } + $sep = " | "; } -$device = mysql_fetch_array(mysql_query("SELECT * FROM `devices` WHERE `device_id` = '$_GET[id]'")); -$descr = $device['purpose']; +print_optionbar_end(); -if($updated && $update_message) { - print_message($update_message); -} elseif ($update_message) { - print_error($update_message); -} - -$device_types = array('server','network','firewall','workstation','printer','power'); - -echo(" -
    - -

    Edit Device

    - -
    - - - Delete - -
    - -
    - - - - - - - - - - - - - - - - - - - - "); - -echo(' -
    Description
    SNMP Community
    		 - -
    - Type - - -
    Disable
    Ignore
    - - -
    - -
    '); } diff --git a/html/pages/device/edit/apps.inc.php b/html/pages/device/edit/apps.inc.php new file mode 100644 index 000000000..00fc4a268 --- /dev/null +++ b/html/pages/device/edit/apps.inc.php @@ -0,0 +1,17 @@ +$file"; + } + } + closedir($handle); +} + +echo("$servicesform"); + + + +?> diff --git a/html/pages/device/edit/device.inc.php b/html/pages/device/edit/device.inc.php new file mode 100644 index 000000000..6140f73e6 --- /dev/null +++ b/html/pages/device/edit/device.inc.php @@ -0,0 +1,93 @@ + "7") { + include("includes/device-edit.inc.php"); + } +} + +$device = mysql_fetch_array(mysql_query("SELECT * FROM `devices` WHERE `device_id` = '".$device['device_id']."'")); +$descr = $device['purpose']; + +if($updated && $update_message) { + print_message($update_message); +} elseif ($update_message) { + print_error($update_message); +} + +$device_types = array('server','network','firewall','workstation','printer','power'); + +echo(" +
    + +
    + + + Delete + +
    + +
    + + + + + + + + + + + + + + + + + + + + "); + +echo(' +
    Description
    SNMP Community
    		 + +
    + Type + + +
    Disable
    Ignore
    + + +
    + +
    '); + + +?> diff --git a/html/pages/device/edit/services.inc.php b/html/pages/device/edit/services.inc.php new file mode 100644 index 000000000..47b77c3b4 --- /dev/null +++ b/html/pages/device/edit/services.inc.php @@ -0,0 +1,91 @@ +'); + +if($_POST['addsrv']) { + if($_SESSION['userlevel'] == '10') { + include("includes/service-add.inc.php"); + } +} + +if ($handle = opendir($config['install_dir'] . "/includes/services/")) { + while (false !== ($file = readdir($handle))) { + if ($file != "." && $file != ".." && !strstr($file, ".")) { + $servicesform .= ""; + } + } + closedir($handle); +} + +$query = mysql_query("SELECT * FROM `devices` ORDER BY `hostname`"); +while($device = mysql_fetch_array($query)) { + $devicesform .= ""; +} + +if($updated) { print_message("Device Settings Saved"); } + + +echo('
    '); + +if(mysql_result(mysql_query("SELECT COUNT(*) from `services` WHERE `device_id` = '".$device['device_id']."'"), 0) > '0') { + $i = "1"; + $service_query = mysql_query("select * from services WHERE device_id = '".$device['device_id']."' ORDER BY service_type"); + while($service = mysql_fetch_array($service_query)) { + $existform .= ""; + + } + +} + +echo(" +
    + + + + + + +
    + Type + + +
    + + +
    "); + + +echo('
    '); + +echo('
    '); + +echo(" +
    + + + + + + +
    + Type + + +
    + + +
    "); + +echo('
    '); + +echo(''); + +?> diff --git a/html/pages/device/srv.inc.php b/html/pages/device/srv.inc.php index b9d1db15e..1e0d2e5c1 100644 --- a/html/pages/device/srv.inc.php +++ b/html/pages/device/srv.inc.php @@ -1,12 +1,10 @@ '0') { +if(mysql_result(mysql_query("select count(service_id) from services WHERE device_id = '".$device['device_id']."'"), 0) > '0') { echo("
    "); $i = "1"; - $service_query = mysql_query("select * from services WHERE device_id = '$_GET[id]' ORDER BY service_type"); + $service_query = mysql_query("select * from services WHERE device_id = '".$device['device_id']."' ORDER BY service_type"); while($service = mysql_fetch_array($service_query)) { include("includes/print-service.inc"); diff --git a/poll-device.php b/poll-device.php index f5908ed1e..f299d285e 100755 --- a/poll-device.php +++ b/poll-device.php @@ -180,6 +180,7 @@ while ($device = mysql_fetch_array($device_query)) { include("includes/polling/bgpPeer.inc.php"); include("includes/polling/toner.inc.php"); include("includes/polling/ucd-diskio.inc.php"); + include("includes/polling/applications.inc.php"); unset( $update ) ; unset( $seperator) ; diff --git a/scripts/posfix-queues b/scripts/postfix-queues similarity index 100% rename from scripts/posfix-queues rename to scripts/postfix-queues