Index: html/pages/device.inc.php =================================================================== --- html/pages/device.inc.php (revision 3582) +++ html/pages/device.inc.php (working copy) @@ -328,7 +328,7 @@ foreach ($config['rancid_configs'] as $configfile) { if ($configfile[strlen($configfile)-1] != '/') { $configfile .= '/' . $device['hostname']; } else { $configfile = $configfile . $device['hostname']; } - if (is_file($configfile)) { $file = $configfile; } else { echo($configfile); } + if (is_file($configfile)) { $device_config_file = $configfile; } } } Index: html/pages/device/showconfig.inc.php =================================================================== --- html/pages/device/showconfig.inc.php (revision 3582) +++ html/pages/device/showconfig.inc.php (working copy) @@ -26,7 +26,7 @@ if (function_exists('svn_log')) { $sep = " | "; - $svnlogs = svn_log($file, SVN_REVISION_HEAD, NULL, 8); + $svnlogs = svn_log($device_config_file, SVN_REVISION_HEAD, NULL, 8); $revlist = array(); foreach ($svnlogs as $svnlog) { @@ -47,7 +47,7 @@ print_optionbar_end(); if (function_exists('svn_log') && in_array($vars['rev'], $revlist)) { - list($diff, $errors) = svn_diff($file, $vars['rev']-1, $file, $vars['rev']); + list($diff, $errors) = svn_diff($device_config_file, $vars['rev']-1, $device_config_file, $vars['rev']); if (!$diff) { $text = "No Difference"; } else { @@ -57,8 +57,8 @@ fclose($errors); } } else { - $fh = fopen($file, 'r') or die("Can't open file"); - $text = fread($fh, filesize($file)); + $fh = fopen($device_config_file, 'r') or die("Can't open file"); + $text = fread($fh, filesize($device_config_file)); fclose($fh); }