From 6cc1abf2e53fbced0f4026b62d83ec990314c39c Mon Sep 17 00:00:00 2001 From: Tom Laermans Date: Thu, 21 Apr 2011 13:41:24 +0000 Subject: [PATCH] get rid of base_url, part 1 of ... git-svn-id: http://www.observium.org/svn/observer/trunk@2132 61d68cd4-352d-0410-923a-c4978735b2b8 --- html/includes/functions.inc.php | 10 +++++----- .../javascript-interfacepicker.inc.php | 2 +- html/includes/print-quadgraphs.inc.php | 2 +- html/includes/print-service.inc.php | 4 ++-- html/pages/bills.inc.php | 4 ++-- html/pages/customers.inc.php | 8 ++++---- html/pages/device.inc.php | 2 +- html/pages/device/apps.inc.php | 2 +- html/pages/device/ciscosensors.inc.php | 2 +- html/pages/device/collectd.inc.php | 18 +++++++++--------- html/pages/device/edit.inc.php | 2 +- html/pages/device/entphysical.inc.php | 3 ++- html/pages/device/graphs.inc.php | 2 +- html/pages/device/hrdevice.inc.php | 2 +- html/pages/device/map.inc.php | 2 +- 15 files changed, 33 insertions(+), 32 deletions(-) diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php index e38dceddc..b7b7cee06 100644 --- a/html/includes/functions.inc.php +++ b/html/includes/functions.inc.php @@ -22,7 +22,7 @@ function generate_device_link($device, $text=0, $linksuffix="", $start=0, $end=0 $graphs = $config['os']['default']['over']; } - $url = $config['base_url']."/device/" . $device['device_id'] . "/" . $linksuffix; + $url = "device/" . $device['device_id'] . "/" . $linksuffix; $contents = "
".$device['hostname']; if ($device['hardware']) { $contents .= " - ".$device['hardware']; } $contents .= "
"; @@ -41,8 +41,8 @@ function generate_device_link($device, $text=0, $linksuffix="", $start=0, $end=0 $graphhead = $entry['text']; $contents .= '
'; $contents .= ''.$graphhead.'
'; - $contents .= ''; - $contents .= ''; + $contents .= "'; + $contents .= "'; $contents .= '
'; } @@ -205,7 +205,7 @@ function generate_graph_tag ($args) global $config; $sep = "?"; - $url = $config['base_url'] . "/graph.php"; + $url = "graph.php"; foreach ($args as $key => $arg) { $url .= $sep.$key."=".$arg; @@ -260,7 +260,7 @@ function generate_port_link($args, $text = NULL, $type = NULL) $content .= generate_graph_tag($graph_array); $content .= ""; - $url = $config['base_url']."/device/".$args['device_id']."/port/" . $args['interface_id'] . "/"; + $url = "device/".$args['device_id']."/port/" . $args['interface_id'] . "/"; if (port_permitted($args['interface_id'])) { return overlib_link($url, $text, $content, $class); diff --git a/html/includes/javascript-interfacepicker.inc.php b/html/includes/javascript-interfacepicker.inc.php index 010e2b170..d3011b02a 100644 --- a/html/includes/javascript-interfacepicker.inc.php +++ b/html/includes/javascript-interfacepicker.inc.php @@ -1,4 +1,4 @@ - +