Index: html/includes/functions.inc.php
===================================================================
--- html/includes/functions.inc.php	(revision 5326)
+++ html/includes/functions.inc.php	(working copy)
@@ -75,7 +75,7 @@
       case 'URI':
       case 'URL':
         // Parse URI into $vars
-        $segments = explode('/', trim($_SERVER['REQUEST_URI'], '/'));
+        $segments = explode('/', trim($_SERVER['PATH_INFO'], '/'));
         foreach ($segments as $pos => $segment)
         {
           $segment = urldecode($segment);
@@ -138,9 +138,9 @@
 // Detect if current URI is link to graph
 function is_graph()
 {
-  $is_graph = isset($_GET['type']); // All graphs always use 'type' variable
-  if ($is_graph && strpos(trim($_SERVER['REQUEST_URI'], '/'), 'graph.php') === 0) { $is_graph = TRUE; };
-  return $is_graph;
+  global $config;
+
+  return ($_SERVER['SCRIPT_FILENAME'] === $config['html_dir'].'/graph.php');
 }
 
 function generate_alert_graph($graph_array)