From 293ec596297d8d0518f5b0af474583f8ce03b356 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Sun, 25 Jul 2010 18:05:16 +0000
Subject: [PATCH] fixes to last update, and a missing file

git-svn-id: http://www.observium.org/svn/observer/trunk@1474 61d68cd4-352d-0410-923a-c4978735b2b8
---
 database-update.sql                    |  3 +++
 html/includes/print-quadgraphs.inc.php | 22 ++++++++++++++++++++++
 includes/defaults.inc.php              |  9 ++++++++-
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 html/includes/print-quadgraphs.inc.php

diff --git a/database-update.sql b/database-update.sql
index 9c1cf2feab..42e3e64711 100644
--- a/database-update.sql
+++ b/database-update.sql
@@ -40,3 +40,6 @@ CREATE TABLE IF NOT EXISTS `ports_adsl` (  `interface_id` int(11) NOT NULL,  `po
 ## 0.10.7
 ALTER TABLE `devices` ADD  `last_polled_timetaken` DOUBLE( 5, 2 ) NOT NULL AFTER  `last_polled` , ADD  `last_discovered_timetaken` DOUBLE( 5, 2 ) NOT NULL AFTER  `last_polled_timetaken`;
 CREATE TABLE IF NOT EXISTS `perf_times` (  `type` varchar(8) NOT NULL,  `doing` varchar(64) NOT NULL,  `start` int(11) NOT NULL,  `duration` double(5,2) NOT NULL,  `devices` int(11) NOT NULL,  KEY `type` (`type`)) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+## 0.10.7.1
+ALTER TABLE `bills` ADD `bill_autoadded` BOOLEAN NOT NULL DEFAULT '0'
+ALTER TABLE `bill_ports` ADD `bill_port_autoadded` BOOLEAN NOT NULL DEFAULT '0'
diff --git a/html/includes/print-quadgraphs.inc.php b/html/includes/print-quadgraphs.inc.php
new file mode 100644
index 0000000000..2bbd06075a
--- /dev/null
+++ b/html/includes/print-quadgraphs.inc.php
@@ -0,0 +1,22 @@
+<?php
+
+  global $config;
+
+  $graph_array['height'] = "100";
+  $graph_array['width']  = "215";
+  $graph_array['to']     = $now;
+
+  $periods = array('day', 'week', 'month', 'year');
+
+  foreach($periods as $period) {
+    $graph_array['from']        = $config[$period];
+    $graph_array_zoom           = $graph_array;
+    $graph_array_zoom['height'] = "150";
+    $graph_array_zoom['width']  = "400";
+
+    $link = $config['base_url'] . "/graphs/" . $graph_array['id'] . "/" . $graph_array['type'] . "/" . $graph_array['from'] . "/" . $config['now'] . "/";
+
+    echo(overlib_link($link, generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom),  NULL));
+  }
+
+?>
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index 7132aef59f..07f2f5b59d 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -117,7 +117,6 @@ $config['overview_show_sysDescr'] = true;
 
 $config['enable_bgp']           	= 1; # Enable BGP session collection and display
 $config['enable_syslog']        	= 0; # Enable Syslog
-$config['enable_billing']       	= 0; # Enable Billing
 $config['enable_inventory']     	= 1; # Enable Inventory
 $config['enable_pseudowires']   	= 1; # Enable Pseudowires
 $config['enable_printers']  		= 0;  # Enable Printer support
@@ -130,6 +129,14 @@ $config['enable_ports_etherlike']       = 0; # Enable Polling EtherLike-MIB (dou
 $config['enable_ports_junoseatmvp']     = 0; # Enable JunOSe ATM VC Discovery/Poller
 $config['enable_ports_adsl']            = 1; # Enable ADSL-LINE-MIB
 
+### Billing System Configuration
+
+$config['enable_billing']               = 0; # Enable Billing
+$config['billing']['customer_autoadd']	= 0; # Enable Auto-add bill per customer
+$config['billing']['circuit_autoadd']	= 0; # Enable Auto-add bill per circuit_id
+$config['billing']['bill_autoadd']	= 0; # Enable Auto-add bill per bill_id
+
+
 ### External Integration
 
 #$config['rancid_configs']       	= '/var/lib/rancid/network/configs/';