diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index c366b0f6ac..595fb55b8f 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,9 +1,18 @@ +2013-06-12 Miguel de Dios + + * extensions/insert_data.php: fixed the label of notice about the + directory data_in. + + Fixes: #2271 + + MERGED FROM THE BRANCH PANDORA_4.0 + 2013-06-12 Miguel de Dios * include/functions_reporting.php: fixed the empty serialize vars. Fixes: #2276 - + MERGED FROM THE BRANCH PANDORA_4.0 2013-06-12 Miguel de Dios diff --git a/pandora_console/extensions/insert_data.php b/pandora_console/extensions/insert_data.php index e8a71c603a..1b662765f0 100644 --- a/pandora_console/extensions/insert_data.php +++ b/pandora_console/extensions/insert_data.php @@ -137,7 +137,8 @@ function mainInsertData() { } echo '
'; - echo __("Please check that the directory \"/var/spool/pandora/data_in\" is writeable by the apache user.

The CSV file format is date;value<newline>date;value<newline>... The date in CSV is in format Y/m/d H:i:s."); + echo sprintf(__("Please check that the directory \"%s\" is writeable by the apache user.

The CSV file format is date;value<newline>date;value<newline>... The date in CSV is in format Y/m/d H:i:s."), + $config['remote_config']); echo '
'; $table = null;