diff --git a/include/global_settings.php b/include/global_settings.php index 55589028e8..7f8f5d00fa 100644 --- a/include/global_settings.php +++ b/include/global_settings.php @@ -1443,11 +1443,11 @@ ), 'base_url' => array( 'friendly_name' => __('Server Base URL'), - 'description' => __('This is a the server location that will be used for links to the Cacti site.'), + 'description' => __('This is a the server location that will be used for links to the Cacti site. This should include the subdirectory if Cacti does not run from root folder.'), 'method' => 'textbox', 'max_length' => 255, 'size' => '60', - 'default' => 'http://' . gethostname() + 'default' => 'http://' . gethostname() . $config['url_path'] ), 'settings_email_header' => array( 'friendly_name' => __('Emailing Options'), diff --git a/lib/html.php b/lib/html.php index 9c1c3444ff..7455e50c16 100644 --- a/lib/html.php +++ b/lib/html.php @@ -478,7 +478,7 @@ function graph_drilldown_icons($local_graph_id, $type = 'graph_buttons') { /* html_nav_bar - draws a navigation bar which includes previous/next links as well as current page information - @arg $base_url - the base URL will all filter options except page# + @arg $base_url - the base URL will all filter options except page (should include url_path) @arg $max_pages - the maximum number of pages to display @arg $current_page - the current page in the navigation system @arg $rows_per_page - the number of rows that are displayed on a single page diff --git a/lib/reports.php b/lib/reports.php index 73bccdebdb..f87eaae98a 100644 --- a/lib/reports.php +++ b/lib/reports.php @@ -863,7 +863,7 @@ function reports_graph_image($report, $item, $timespan, $output, $theme = 'class set_config_option('base_url', $prefix . read_config_option('base_url')); } - $out = "" . $out . ''; + $out = "" . $out . ''; } return $out . PHP_EOL;