Răsfoiți Sursa

remove debug output
fix some mistakes

root 3 ani în urmă
părinte
comite
fa2a1f7352

+ 1 - 1
html/admin/devices/mactable.php

@@ -6,7 +6,7 @@ require_once ($_SERVER['DOCUMENT_ROOT']."/inc/idfilter.php");
 <html>
 <head>
 <title>Панель администратора</title>
-<link rel="stylesheet" type="text/css"	href=<?php echo "\"/HTML_STYLE.css\""; ?>>
+<link rel="stylesheet" type="text/css"	href="/<?php echo HTML_STYLE.".css"; ?>">
 <meta http-equiv="content-type" content="application/xhtml+xml">
 <meta charset="UTF-8">
 </head>

+ 1 - 1
html/admin/devices/portmactable.php

@@ -6,7 +6,7 @@ require_once ($_SERVER['DOCUMENT_ROOT']."/inc/idfilter.php");
 <html>
 <head>
 <title>Панель администратора</title>
-<link rel="stylesheet" type="text/css"	href=<?php echo "\"/HTML_STYLE.css\""; ?>>
+<link rel="stylesheet" type="text/css"	href="/<?php echo HTML_STYLE.".css"; ?>">
 <meta http-equiv="content-type" content="application/xhtml+xml">
 <meta charset="UTF-8">
 </head>

+ 1 - 1
html/admin/devices/snmpwalk.php

@@ -6,7 +6,7 @@ require_once ($_SERVER['DOCUMENT_ROOT']."/inc/idfilter.php");
 <html>
 <head>
 <title>Панель администратора</title>
-<link rel="stylesheet" type="text/css" href=<?php echo "\"/HTML_STYLE.css\""; ?>>
+<link rel="stylesheet" type="text/css" href="/<?php echo HTML_STYLE.".css"; ?>">
 <meta http-equiv="content-type" content="application/xhtml+xml">
 <meta charset="UTF-8">
 </head>

+ 2 - 2
html/admin/devices/switchport.php

@@ -107,10 +107,10 @@ foreach ($ports as $row) {
         $vlan = $row['vlan'];
         $ifname= compact_port_name($row['ifName']);
         $f_cacti_url = get_cacti_graph($switch['ip'], $row['snmp_index']);
-        if (! isset(get_const('torrus_url')) and (! isset($f_cacti_url))) {  $snmp_url=$ifname; }
+        if (empty(get_const('torrus_url')) and (empty($f_cacti_url))) {  $snmp_url=$ifname; }
                 else {
                 if (isset($f_cacti_url)) { $snmp_url = "<a href=\"$f_cacti_url\">" . $ifname . "</a>"; }
-                if (isset(get_const('torrus_url'))) {
+                if (!empty(get_const('torrus_url'))) {
                     $normed_ifname = str_replace("/", "_", $ifname);
                     $normed_ifname = str_replace(".", "_", $normed_ifname);
                     $normed_ifname = trim(str_replace(" ", "_", $normed_ifname));

+ 0 - 1
html/admin/iplist/nagios.php

@@ -145,7 +145,6 @@ foreach ($users as $user) {
         }
 
     if (!empty($user['nagios']) and $user['nagios']) {
-        get_const('nagios_url') = rtrim(get_option($db_link, 57),'/');
         if (preg_match('/127.0.0.1/', get_const('nagios_url'))) { print "<td class=\"$cl\" >". get_qa($user['nagios']) ."</td>\n"; } else {
             $nagios_link = get_const('nagios_url').'/cgi-bin/status.cgi?host='.get_nagios_name($user);
             print "<td class=\"$cl\" >"; print_url(get_qa($user['nagios']),$nagios_link); print "</td>\n";

+ 0 - 1
html/inc/common.php

@@ -1686,7 +1686,6 @@ function get_mac_port_table($ip, $port_index, $community, $version, $oid, $index
         $version = '2';
     }
     $mac_table = walk_snmp($ip, $community, $version, $oid);
-var_dump($mac_table);
     if (isset($mac_table) and count($mac_table) > 0) {
         foreach ($mac_table as $key => $value) {
             $key = trim($key);

+ 10 - 75
html/inc/config.php.sample

@@ -2,85 +2,20 @@
 
 if (!defined("CONFIG"))die("Not defined");
 
+$language="russian";
 setlocale(LC_ALL, 'ru_RU.UTF8');
 
-define("HTML_LANG","russian");
-define("HTML_STYLE","white");
+$style="white"; #css ctyle
 
-#changeme!!!
+/* MySQL settings */
+$dbhost="localhost";
+$dbname="database";
+$dbuser="username";
+$dbpass="password";
 
-define("DB_HOST","localhost");
-define("DB_NAME","stat");
-define("CACTI_DB_HOST","localhost");
-define("CACTI_DB_NAME","cacti");
-define("DB_USER","user");
-define("DB_PASS","password");
+#$cacti_dbhost="cacti_host";
+#$cacti_dbname="cacti";
 
-define("IPCAM_GROUP_ID","5");
-
-############################ CONSTANTES ############################
-
-define("PORT_STATUS_OID",".1.3.6.1.2.1.2.2.1.8.");
-define("PORT_ADMIN_STATUS_OID",".1.3.6.1.2.1.2.2.1.7.");
-define("PORT_SPEED_OID",".1.3.6.1.2.1.2.2.1.5.");
-define("PORT_ERRORS_OID",".1.3.6.1.2.1.2.2.1.14.");
-define("PORT_VLAN_OID",".1.3.6.1.2.1.17.7.1.4.5.1.1.");
-
-define("MAC_TABLE_OID",".1.3.6.1.2.1.17.7.1.2.2.1.2");
-define("MAC_TABLE_OID2",".1.3.6.1.2.1.17.4.3.1.2");
-define("MAC_TABLE_STR_OID",".1.3.6.1.2.1.17.4.3.1.2");
-define("MAC_TABLE_STR_OID2","1.3.6.1.2.1.17.7.1.2.2.1.2");
-
-define("ELTEX_SFP_STATUS",".1.3.6.1.4.1.89.90.1.2.1.3");
-define("ELTEX_SFP_VENDOR",".1.3.6.1.4.1.35265.1.23.53.1.1.1.5");
-define("ELTEX_SFP_SN",".1.3.6.1.4.1.35265.1.23.53.1.1.1.6");
-define("ELTEX_SFP_FREQ",".1.3.6.1.4.1.35265.1.23.53.1.1.1.4");
-define("ELTEX_SFP_LENGTH",".1.3.6.1.4.1.35265.1.23.53.1.1.1.8");
-
-define("CISCO_DESCR",".1.3.6.1.2.1.1.1.0");
-define("CISCO_MODULES",".1.3.6.1.2.1.47.1.1.1.1.7");
-define("CISCO_SFP_SENSORS",".1.3.6.1.4.1.9.9.91.1.1.1.1.4");
-define("CISCO_SFP_PRECISION",".1.3.6.1.4.1.9.9.91.1.1.1.1.3");
-define("CISCO_VLAN_OID",".1.3.6.1.4.1.9.9.9.46.1.3.1.1.2");
-
-define("IFMIB_IFINDEX",".1.3.6.1.2.1.2.2.1.1");
-define("IFMIB_IFINDEX_MAP",".1.3.6.1.2.1.17.1.4.1.2");
-define("IFMIB_IFDESCR",".1.3.6.1.2.1.2.2.1.2");
-define("IFMIB_IFNAME",".1.3.6.1.2.1.31.1.1.1.1");
-
-define("HUAWEI_SFP_VENDOR",".1.3.6.1.4.1.2011.5.25.31.1.1.2.1.11");
-define("HUAWEI_SFP_SPEED",".1.3.6.1.4.1.2011.5.25.31.1.1.2.1.2");
-define("HUAWEI_SFP_VOLT",".1.3.6.1.4.1.2011.5.25.31.1.1.3.1.6");
-define("HUAWEI_SFP_OPTRX",".1.3.6.1.4.1.2011.5.25.31.1.1.3.1.32");
-define("HUAWEI_SFP_OPTTX",".1.3.6.1.4.1.2011.5.25.31.1.1.3.1.33");
-define("HUAWEI_SFP_BIASCURRENT",".1.3.6.1.4.1.2011.5.25.31.1.1.3.1.31");
-define("HUAWEI_SFP_RX",".1.3.6.1.4.1.2011.5.25.31.1.1.3.1.8");
-define("HUAWEI_SFP_TX",".1.3.6.1.4.1.2011.5.25.31.1.1.3.1.9");
-
-define("PETH_PSE_PORT_ADMIN_ENABLE",".1.3.6.1.2.1.105.1.1.1.3.1");
-define("HUAWEI_POE_OID",".1.3.6.1.4.1.2011.5.25.195.3.1.3");
-define("ALLIED_POE_OID",".1.3.6.1.2.1.105.1.1.1.3.1");
-define("HP_POE_OID",".1.3.6.1.2.1.105.1.1.1.3.1");
-define("NETGEAR_POE_OID",".1.3.6.1.4.1.4526.11.15.1.1.1.6.1");
-define("MIKROTIK_POE_OID",".1.3.6.1.4.1.14988.1.1.15.1.1.3");
-
-//INTERFACE ID
-define("MIKROTIK_POE_INT",".1.3.6.1.4.1.14988.1.1.15.1.1.1");
-// INTERFACE NAMES
-define("MIKROTIK_POE_INT_NAMES",".1.3.6.1.4.1.14988.1.1.15.1.1.2");
-// VOLTAGE IN DV (DECIVOLT)
-define("MIKROTIK_POE_VOLT",".1.3.6.1.4.1.14988.1.1.15.1.1.4");
-// CURRENT IN MA
-define("MIKROTIK_POE_CURRENT",".1.3.6.1.4.1.14988.1.1.15.1.1.5");
-// POWER USAGE IN DW (DEVIWATT)
-define("MIKROTIK_POE_USAGE",".1.3.6.1.4.1.14988.1.1.15.1.1.6");
-
-define("SYSINFO_MIB",".1.3.6.1.2.1.1");
-
-define("L_ERROR",0);
-define("L_WARNING",1);
-define("L_INFO",2);
-define("L_VERBOSE",3);
-define("L_DEBUG",255);
+$ipcam_group_id=5;
 
 ?>

+ 1 - 1
html/inc/header_public.php

@@ -19,7 +19,7 @@ $page_url = $page_url_array[0];
 <html>
 <head>
 <title>Панель статистики</title>
-<link rel="stylesheet" type="text/css" href=<? echo "\"../HTML_STYLE.css\""; ?>>
+<link rel="stylesheet" type="text/css" href="/<?php echo HTML_STYLE.".css"; ?>">
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 </head>
 <body>