diff --git a/html/includes/graphs/device_cpu_windows.inc.php b/html/includes/graphs/device_cpu_windows.inc.php
new file mode 100644
index 0000000000..31ca5c0050
--- /dev/null
+++ b/html/includes/graphs/device_cpu_windows.inc.php
@@ -0,0 +1,34 @@
+
diff --git a/html/includes/graphs/device_load_windows.inc.php b/html/includes/graphs/device_load_windows.inc.php
new file mode 100644
index 0000000000..2ae0f911ec
--- /dev/null
+++ b/html/includes/graphs/device_load_windows.inc.php
@@ -0,0 +1,29 @@
+
diff --git a/html/includes/graphs/device_memory_windows.inc.php b/html/includes/graphs/device_memory_windows.inc.php
new file mode 100644
index 0000000000..2d3ef2c9e0
--- /dev/null
+++ b/html/includes/graphs/device_memory_windows.inc.php
@@ -0,0 +1,64 @@
+
diff --git a/html/php.php b/html/php.php
new file mode 100644
index 0000000000..554a22c8bb
--- /dev/null
+++ b/html/php.php
@@ -0,0 +1,5 @@
+
diff --git a/includes/osdiscovery/discover-windows.php b/includes/osdiscovery/discover-windows.php
new file mode 100644
index 0000000000..100e888fba
--- /dev/null
+++ b/includes/osdiscovery/discover-windows.php
@@ -0,0 +1,8 @@
+
+
diff --git a/includes/polling/hr-mib.inc.php b/includes/polling/hr-mib.inc.php
new file mode 100755
index 0000000000..934aa85e65
--- /dev/null
+++ b/includes/polling/hr-mib.inc.php
@@ -0,0 +1,36 @@
+
diff --git a/includes/polling/hr-mib_storage.inc.php b/includes/polling/hr-mib_storage.inc.php
new file mode 100755
index 0000000000..5d5b576435
--- /dev/null
+++ b/includes/polling/hr-mib_storage.inc.php
@@ -0,0 +1,43 @@
+= '40') {
+ if($device['sysContact']) { $email = $device['sysContact']; } else { $email = $config['email_default']; }
+ $msg = "Disk Alarm: " . $device['hostname'] . " " . $dr['hrStorageDescr'] . " is " . $perc;
+ $msg .= " at " . date('l dS F Y h:i:s A');
+ mail($email, "Disk Alarm: " . $device['hostname'] . " " . $dr['hrStorageDescr'], $msg, $config['email_headers']);
+ echo("Alerting for " . $device['hostname'] . " " . $dr['hrStorageDescr'] . "/n");
+ }
+}
diff --git a/includes/polling/ucd-mib.inc.php b/includes/polling/ucd-mib.inc.php
new file mode 100755
index 0000000000..54dd9a9055
--- /dev/null
+++ b/includes/polling/ucd-mib.inc.php
@@ -0,0 +1,97 @@
+ " . $this['ifTrunk'] . "')");
- }
-
-
- if ( $interface['ifVlan'] != $this['ifVlan']) {
- $update .= $seperator . "`ifVlan` = '" . $this['ifVlan'] . "'";
- #echo($update);
- $seperator = ", ";
- mysql_query("INSERT INTO eventlog (`host`, `interface`, `datetime`, `message`) VALUES ('" . $interface['device_id'] . "', '" . $interface['interface_id'] . "', NOW(), 'VLAN Vlan -> " . $this['ifVlan'] . "')");
- }
-
- if($this['ifTrunk']) { echo("Interface is a " . $this['ifTrunk'] . " trunk\n"); }
- if($this['ifVlan']) { echo("Interface is a member of vlan " . $this['ifVlan'] . " \n"); }
-
- }
-
- list($ifName, $ifDescr, $ifAdminStatus, $ifOperStatus, $ifAlias, $ifSpeed, $ifType, $ifMtu, $ifPhysAddress) = explode("\n", $snmp_output);
- $ifDescr = trim(str_replace("\"", "", $ifDescr));
- if ($ifDuplex == 3) { $ifDuplex = "half"; } elseif ($ifDuplex == 2) { $ifDuplex = "full"; } else { $ifDuplex = "unknown"; }
- $ifDescr = strtolower($ifDescr);
- if ($ifAlias == " ") { $ifAlias = str_replace(" ", "", $ifAlias); }
- $ifAlias = trim(str_replace("\"", "", $ifAlias));
- $ifAlias = trim($ifAlias);
-
- #echo("\n$ifName\n");
- $ifDescr = fixifname($ifDescr);
-
- $ifPhysAddress = strtolower(str_replace("\"", "", $ifPhysAddress));
- $ifPhysAddress = str_replace(" ", ":", $ifPhysAddress);
-
-# if ( $interface['ifDescr'] != $ifDescr && $ifDescr != "" ) {
-# $update .= $seperator . "`ifDescr` = '$ifDescr'";
-# $seperator = ", ";
-# mysql_query("INSERT INTO eventlog (`host`, `interface`, `datetime`, `message`) VALUES ('" . $interface['device_id'] . "', '" . $interface['interface_id'] . "', NOW(), 'Name -> " . $ifDescr . "')");
-# }
-# if ( $interface['ifAlias'] != $ifAlias ) {
-# $update .= $seperator . "`ifAlias` = '$ifAlias'";
-# $seperator = ", ";
-# mysql_query("INSERT INTO eventlog (`host`, `interface`, `datetime`, `message`) VALUES ('" . $interface['device_id'] . "', '" . $interface['interface_id'] . "', NOW(), 'Desc -> $ifAlias')");
-# }
-
-# if ( $interface['ifOperStatus'] != $ifOperStatus && $ifOperStatus != "" ) {
-# $update .= $seperator . "`ifOperStatus` = '$ifOperStatus'";
-# $seperator = ", ";
-# mysql_query("INSERT INTO eventlog (`host`, `interface`, `datetime`, `message`) VALUES ('" . $interface['device_id'] . "', '" . $interface['interface_id'] . "', NOW(), 'Interface went $ifOperStatus')");
-# }
-# if ( $interface['ifAdminStatus'] != $ifAdminStatus && $ifAdminStatus != "" ) {
-# $update .= $seperator . "`ifAdminStatus` = '$ifAdminStatus'";
-# $seperator = ", ";
-# if($ifAdminStatus == "up") { $admin = "enabled"; } else { $admin = "disabled"; }
-# mysql_query("INSERT INTO eventlog (`host`, `interface`, `datetime`, `message`) VALUES ('" . $interface['device_id'] . "', '" . $interface['interface_id'] . "', NOW(), 'Interface $admin')");
-# }
-
- if ( $interface['ifDuplex'] != $ifDuplex && $ifDuplex != "" ) {
- $update .= $seperator . "`ifDuplex` = '$ifDuplex'";
- $seperator = ", ";
- mysql_query("INSERT INTO eventlog (`host`, `interface`, `datetime`, `message`) VALUES ('" . $interface['device_id'] . "', '" . $interface['interface_id'] . "', NOW(), 'Duplex -> $ifDuplex')");
- }
- if ( $interface['ifType'] != $ifType && $ifType != "" ) {
- $update .= $seperator . "`ifType` = '$ifType'";
- $seperator = ", ";
- mysql_query("INSERT INTO eventlog (`host`, `interface`, `datetime`, `message`) VALUES ('" . $interface['device_id'] . "', '" . $interface['interface_id'] . "', NOW(), 'Type -> $ifType')");
- }
- if ( $interface['ifMtu'] != $ifMtu && $ifMtu != "" ) {
- $update .= $seperator . "`ifMtu` = '$ifMtu'";
- $seperator = ", ";
- mysql_query("INSERT INTO eventlog (`host`, `interface`, `datetime`, `message`) VALUES ('" . $interface['device_id'] . "', '" . $interface['interface_id'] . "', NOW(), 'MTU -> $ifMtu')");
- }
- if ( $interface['ifPhysAddress'] != $ifPhysAddress && $ifPhysAddress != "" ) {
- $update .= $seperator . "`ifPhysAddress` = '$ifPhysAddress'";
- $seperator = ", ";
- mysql_query("INSERT INTO eventlog (`host`, `interface`, `datetime`, `message`) VALUES ('" . $interface['device_id'] . "', '" . $interface['interface_id'] . "', NOW(), 'MAC -> $ifPhysAddress')");
- }
-
- if ( $interface['ifHardType'] != $this['ifHardType']) {
- $update .= $seperator . "`ifHardType` = '" . $this['ifHardType'] . "'";
- $seperator = ", ";
- mysql_query("INSERT INTO eventlog (`host`, `interface`, `datetime`, `message`) VALUES ('" . $interface['device_id'] . "', '" .$interface['interface_id'] . "', NOW(), 'HW Type -> " . $this['ifHardType']. "')");
- }
-
-
- if ( $interface['ifSpeed'] != $ifSpeed && $ifSpeed != "" ) {
- $update .= $seperator . "`ifSpeed` = '$ifSpeed'";
- $seperator = ", ";
- $prev = humanspeed($interface['ifSpeed']);
- $now = humanspeed($ifSpeed);
- mysql_query("INSERT INTO eventlog (`host`, `interface`, `datetime`, `message`) VALUES ('" . $interface['device_id'] . "', '" . $interface['interface_id'] . "', NOW(), 'Speed -> $now')");
- }
-
- if ($update) {
- $update_query = "UPDATE `interfaces` SET ";
- $update_query .= $update;
- $update_query .= " WHERE `interface_id` = '" . $interface['interface_id'] . "'";
- $update_result = mysql_query($update_query);
- } else {
- }
-
- }
-}
-
-mysql_query("UPDATE interfaces set ifPhysAddress = '' WHERE ifPhysAddress = 'No Such Instance currently exists at this OID'");
-
-?>
-