Added the url base to the cache key for the headers. If reports have …

…two urls (or ports) to access them, it will work correctly and not pull from the cache which may have the wrong urls. Also fixed edge case with a 500 error that happens when you move a report, but it still exists in the recently run.

lib/PhpReports/PhpReports.php

@@ -352,13 +352,18 @@ public static function getReportListJSON($reports=null) {
 	}
 
 	protected static function getReportHeaders($report) {
-		$cacheKey = FileSystemCache::generateCacheKey($report,'report_headers');
+		$cacheKey = FileSystemCache::generateCacheKey(array(self::$request->base, $report),'report_headers');
 
 		//check if report data is cached and newer than when the report file was created
 		//the url parameter ?nocache will bypass this and not use cache
 		$data =false;
+
+		$loc = Report::getFileLocation($report);
+		if(!file_exists($loc)) {
+			return false;
+		}
 		if(!isset($_REQUEST['nocache'])) {
-			$data = FileSystemCache::retrieve($cacheKey, filemtime(Report::getFileLocation($report)));
+			$data = FileSystemCache::retrieve($cacheKey, filemtime($loc));
 		}
 
 		//report data not cached, need to parse it