From 9a16c803e69ec34a67ff3bd2999b82e79289fdc3 Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Wed, 12 Aug 2009 15:01:01 +0000 Subject: [PATCH] updates git-svn-id: http://www.observium.org/svn/observer/trunk@454 61d68cd4-352d-0410-923a-c4978735b2b8 --- html/images/no-48.png | Bin 0 -> 3328 bytes html/includes/error-no-perm.inc.php | 32 +++++++++++++++ html/includes/print-menubar.php | 2 +- html/pages/edituser.php | 20 +++++----- html/pages/ipv4.php | 30 +++++++++++--- html/pages/ipv6.php | 28 +++++++++++-- html/pages/pseudowires.php | 18 +++++---- html/pages/vrfs.php | 60 ++++++++++++++++++---------- 8 files changed, 143 insertions(+), 47 deletions(-) create mode 100644 html/images/no-48.png create mode 100644 html/includes/error-no-perm.inc.php diff --git a/html/images/no-48.png b/html/images/no-48.png new file mode 100644 index 0000000000000000000000000000000000000000..ddcef31188ac55bf3a669c7a1f2a9eb185a8721b GIT binary patch literal 3328 zcmV+b4gd0qP)WLKdxhr6Z5$-h0mXdw!4edyG&@@kK8oL(MNrav9WF5D!C{1!W%&DAV&C0#1Yc7>2~A?? zmI(+UHUf`-4K~$4(;lE+1J47o%1Tyz_q&A3%kgb{Ht2;XMVKaLG>SJp&E;SJnp`qT zL=(9RybO%Oxr>2dey)@{cGCnj_#d^w)}>JUs1~`c_598a8>rc`1uvULy6)!#FG0kx zEJ9^vjK1>@e|Yab!a!83r%aOBPhl7bP{>|55TLU!x zKxXLGL zVOVxOnDw%ue?Io^N31` zbR4`)hO&kRLWVK3c{$*|AUtV^LZc34J|mz5vz>QC$0lt+1>YipJ6c+hnGEGpawVB$ z*P%mTSxkofV-gs*r_qkNT59mb!AZ7t$ls5Z(7pOK-~AaIyJ?v{(i75 zl;h0YFL<);hYvG0Jx#d~GwNh2#T}+e??)f;)alb~*tChGZ@&#deO(s(a{C{d4a@(0|QJgD5{X&Qy1<&i9;!r;dbAqA>Sa(@uj2|?9A|_=pcK;gnRZ=F zpnv^(03w!!`#B_@y?mLq9UYuJRyr2jw|_r9+qctVS^Q%CdQ$m3InSGMyC@Z4DAI_K zcB{(*J6LT1l@`P+wY94vk%i)MeA^Cm(s4-Va^U+MY-=nckkx?6DJk~ z|KN@ttT9dgeeGH%vRN{EE$OZBBXO-%sAqEYM;o~hLJ+umNjwR0zH41*WftRd+* zx?R0+XPDk=bY z_~C~aCGgNg4*~FxD_7#XF8Lz$TxbX>7o9T%q&&!_pmO<~o1SfBL?WmXlZ1eB!{F8N zasDBlrt6-2=#1(F7ka!L>=ltW4-BNbBe=EMZgWHNN!a}R@Wy>(L=Sb@Zz@$rC!?;{pcqd8e$ zfq)Ybn2|sxsnw#GtYfXkf&?yIgHNvNL!wv;QYob8p>+DUL`n{)(>&|Ci-O;O@E|=s zJpjbxadLC?crJ;*$Yz;voIsrlDl28+jf!%1Lu0%OTnoyPmki*Hf}{fzALvB7n6Yo$ z2+t$#dGx2#JnQ>x{>C>J1pmf?1MK+bH@OQq5RC#*7K?p8iCm6x+a_A%<$T+or4bhJ zfv&6S;_w+m7gNus;L2H@IEcA+;JO@l9G(H%w`}3R4<9Za9`yCG^MMCw1YR&rr0?^e z+K=A|iN`#TY~e&MRQHNDGpy^WDYychRZ8Ux8gps{E)VH=W7grV&w@Yoed>Wz@4Un5 zvuEdr2mAN);P&kScp&BbeCoP{q~sO-%t9po>SsR#;Lnw!yvT7-M|5FH%sKt?z`q5_1Z!Jb7<})&nft%%?d4lLcF+j?E08YA>au$079#P( zAODztdirU;1AL#rGUwL#gvNA4SF&|E{xbr)xzKwaP7dnCp*R95q;ylji@;J~^Tv(* z&j%lH_{b5y-P1!O@Gtt1$?10rNqI)=@2`qT0Q~65Cwbwy=lBlrI545tE_G-+x`KTk zP6EA!hDb5aJ{#_vg5g8Z(4*71f)GRTI4T^*k&>5zA7(PNH8%(OXeh)#$Ky=u=ffpH zctAO@S4tkvW`okZlsp!R@K`iTO7C>UFlMR~g&mFo`*itT_YnH#)kc+4c_GAW=b(NG ztY`ycX^|?pnGEGMHAtnfrR3)o6+CGe#HHkKg&?iLTZJX>f&tu@C|y5+U{b-{WO682Y}gRr5m_7=eSp-xqgpLUY`iFNAo0 z1QJW2>Lp#=wX_bpnGE@{G0Io13hJ3fUc$PGP@-_Q+M1AM7?_a=(;t3_tHE2^^Sq>c z1w{=Hf6?-~Qffj7@%%+7k3r&>y1Z^^NlXq6Va8%4T3c^Rg}P9gPMtZ!o$PRNz#ksBQ)J3P#_-d>VJ zL&UzUHtWqcy7SsCdPN?h@VQ{1UwWhakK(5We>6Y#`2Y5EoBsu9{=rtFr@|@#0000< KMNUMnLSTXbr#!3x literal 0 HcmV?d00001 diff --git a/html/includes/error-no-perm.inc.php b/html/includes/error-no-perm.inc.php new file mode 100644 index 000000000..482d99890 --- /dev/null +++ b/html/includes/error-no-perm.inc.php @@ -0,0 +1,32 @@ + + + + + + + +
+
+ + + + +
+ + Error: + You have insufficent permissions to view this page. + +
+
+
+ + + + + + +"); + +?> diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php index 6572ebde5..fb3850ea6 100644 --- a/html/includes/print-menubar.php +++ b/html/includes/print-menubar.php @@ -132,7 +132,7 @@ if($config['enable_pseudowires']) { echo("
  • IPv4 Search
    • -
  • IPv6 Search
    • +
  • IPv6 Search
    • "); // Display devices this users has access to echo("

    Device Access

    "); - $device_perm_data = mysql_query("SELECT * from devices_perms as P, devices as D WHERE `user_id` = '" . $_GET['user_id'] . "' AND D.device_id = P.device_id"); - while($device_perm = mysql_fetch_array($device_perm_data)) { - echo($device_perm['hostname'] . "
    "); - $access_list[] = $device_perm['device_id']; - $permdone = "yes"; - } - - if(!$permdone) { echo("None Configured"); } - // Display devices this user doesn't have access to echo("

    Grant access to new device

    "); echo("
    @@ -93,6 +84,17 @@ echo(" +
    + + + + + + +
    +
    +
    "); } echo(" "); + + + $device_perm_data = mysql_query("SELECT * from devices_perms as P, devices as D WHERE `user_id` = '" . $_GET['user_id'] . "' AND D.device_id = P.device_id"); + while($device_perm = mysql_fetch_array($device_perm_data)) { + echo($device_perm['hostname'] . "
    "); + $access_list[] = $device_perm['device_id']; + $permdone = "yes"; + } + + if(!$permdone) { echo("None Configured"); } + echo("    		"); echo("

    Interface Access

    "); diff --git a/html/pages/ipv4.php b/html/pages/ipv4.php index 195be1f66..e15f0f192 100644 --- a/html/pages/ipv4.php +++ b/html/pages/ipv4.php @@ -1,7 +1,17 @@ - - +
    + + + + + + +
    +
    + +
    + - - -
    + +
    + + + + + + + + + + + -
    + - -
    + +
    + + + + + + + + + + + "); diff --git a/html/pages/pseudowires.php b/html/pages/pseudowires.php index cbc7f5e5b..ab9cf4b40 100644 --- a/html/pages/pseudowires.php +++ b/html/pages/pseudowires.php @@ -9,20 +9,24 @@ while($pw_a = mysql_fetch_array($query)) { $i = 0; while ($i < count($linkdone)) { $thislink = $pw_a['device_id'] . $pw_a['interface_id']; - if ($linkdone[$i] == $thislink) { $dupe = "yes"; } + if ($linkdone[$i] == $thislink) { $skip = "yes"; } $i++; } - - if($dupe) { - unset($dupe); - } else { - if($bg == "#ffffff") { $bg = "#e5e5e5"; } else { $bg="#ffffff"; } - $pw_b = mysql_fetch_array(mysql_query("SELECT * from `devices` AS D, `interfaces` AS I, `pseudowires` AS P WHERE D.device_id = '".$pw_a['peer_device_id']."' AND + $pw_b = mysql_fetch_array(mysql_query("SELECT * from `devices` AS D, `interfaces` AS I, `pseudowires` AS P WHERE D.device_id = '".$pw_a['peer_device_id']."' AND D.device_id = I.device_id AND P.cpwVcID = '".$pw_a['cpwVcID']."' AND P.interface_id = I.interface_id")); + if(!interfacepermitted($pw_a['interface_id'])) { $skip = "yes"; } + if(!interfacepermitted($pw_b['interface_id'])) { $skip = "yes"; } + + + if($skip) { + unset($skip); + } else { + if($bg == "#ffffff") { $bg = "#e5e5e5"; } else { $bg="#ffffff"; } + echo("".$pw_a['cpwVcID']."".generatedevicelink($pw_a)."".generateiflink($pw_a)." => ".generatedevicelink($pw_b)."".generateiflink($pw_b).""); diff --git a/html/pages/vrfs.php b/html/pages/vrfs.php index 801e44d52..61cb4b854 100644 --- a/html/pages/vrfs.php +++ b/html/pages/vrfs.php @@ -1,13 +1,32 @@ = '5') { + echo(" -
    +
    + + + + + + +
    +
    Basic | Graphs : Bits | Packets | NU Packets | Errors -
    "); +
    +
    + + + + + + +
    +"); echo("
    "); @@ -16,45 +35,38 @@ echo(" while($vrf = mysql_fetch_array($vrf_query)) { if(!is_integer($i/2)) { $bg_colour = $list_colour_a; } else { $bg_colour = $list_colour_b; } - echo(""); - echo(""); echo(""); - -# echo(""); - + #echo(""); echo(""); @@ -63,5 +75,11 @@ echo(" } echo("
    " . $vrf['vrf_name'] . "
    " . $vrf['mplsVpnVrfDescription'] . "    		" . $vrf['mplsVpnVrfRouteDistinguisher'] . "" . $vrf['mplsVpnVrfDescription'] . "" . $vrf['mplsVpnVrfDescription'] . ""); - $devices = mysql_query("SELECT * FROM `vrfs` AS V, `devices` AS D WHERE `mplsVpnVrfRouteDistinguisher` = '".$vrf['mplsVpnVrfRouteDistinguisher']."' AND D.device_id = V.device_id"); $x=1; while($device = mysql_fetch_array($devices)) { + if(!is_integer($i/2)) { if(!is_integer($x/2)) { $dev_colour = $list_colour_a_a; } else { $dev_colour = $list_colour_a_b; } } else { if(!is_integer($x/2)) { $dev_colour = $list_colour_b_b; } else { $dev_colour = $list_colour_b_a; } } - echo(""); $x++; - } + } // End While echo("
    ".generatedevicelink($device)); + echo("
    ".generatedevicelink($device, shorthost($device['hostname']))); if($device['vrf_name'] != $vrf['vrf_name']) { echo("Configured : ".$device['vrf_name']."', CAPTION, 'VRF Inconsistency' ,FGCOLOR,'#e5e5e5', BGCOLOR, '#c0c0c0', BORDER, 5, CELLPAD, 4, CAPCOLOR, '#050505');\" onmouseout=\"return nd();\"> "); } echo(""); $interfaces = mysql_query("SELECT * FROM `interfaces` WHERE `ifVrf` = '".$device['vrf_id']."' and device_id = '".$device['device_id']."'"); unset($seperator); while($port = mysql_fetch_array($interfaces)) { - - if($_GET['opta']) { - $graph_type = $_GET['opta']; - include("includes/print-port-thumbs.inc.php"); - - } else { - - $port = array_merge ($device, $port); - echo($seperator.generateiflink($port,makeshortif($port['ifDescr']))); - $seperator = ", "; - } + if($_GET['opta']) { + $graph_type = $_GET['opta']; + include("includes/print-port-thumbs.inc.php"); + } else { + $port = array_merge ($device, $port); + echo($seperator.generateiflink($port,makeshortif($port['ifDescr']))); + $seperator = ", "; + } } echo("
    "); +} else { + +include("includes/error-no-perm.inc.php"); + +} ## End Permission if + ?>