diff -ruBbd cacti-0.8.6b/include/config_arrays.php cacti-0.8.6b-new/include/config_arrays.php --- cacti-0.8.6b/include/config_arrays.php 2004-10-06 22:20:35.000000000 -0400 +++ cacti-0.8.6b-new/include/config_arrays.php 2004-11-17 17:54:48.000000000 -0500 @@ -45,6 +45,18 @@ "type" => "error"), 7 => array( "message" => 'XML parse error.', + "type" => "error"), + 15 => array( + "message" => 'XML: Cacti version does not exist.', + "type" => "error"), + 16 => array( + "message" => 'XML: Hash version does not exist.', + "type" => "error"), + 17 => array( + "message" => 'XML: Generated with a newer version of Cacti.', + "type" => "error"), + 18 => array( + "message" => 'XML: Cannot locate type code.', "type" => "error") ); diff -ruBbd cacti-0.8.6b/lib/import.php cacti-0.8.6b-new/lib/import.php --- cacti-0.8.6b/lib/import.php 2004-10-06 22:20:35.000000000 -0400 +++ cacti-0.8.6b-new/lib/import.php 2004-11-17 17:55:28.000000000 -0500 @@ -821,7 +821,7 @@ } if (!isset($current_type)) { - // error: cannot find type + raise_message(18); /* error: cannot find type */ return false; } @@ -848,13 +848,13 @@ } if (!isset($current_version_index)) { - // error: current cacti version does not exist! + raise_message(15); /* error: current cacti version does not exist! */ return false; }elseif (!isset($hash_version_index)) { - // error: hash version does not exist! + raise_message(16); /* error: hash version does not exist! */ return false; }elseif ($hash_version_index > $current_version_index) { - // error: hash made with a newer version of cacti + raise_message(17); /* error: hash made with a newer version of cacti */ return false; }