Further corrections for #2645

Changes to description of base_url usage and to automatically add url_path.  Also, correct missing variable issue when generating a report.

Closes #2645

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'),

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

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 = "<a href='" . $prefix . html_escape(read_config_option('base_url', true) . '/graph.php?action=view&local_graph_id='.$item['local_graph_id']."&rra_id=0") . "'>" . $out . '</a>';
+		$out = "<a href='" . html_escape(read_config_option('base_url', true) . '/graph.php?action=view&local_graph_id='.$item['local_graph_id']."&rra_id=0") . "'>" . $out . '</a>';
 	}
 
 	return $out . PHP_EOL;