tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-06-12 Miguel de Dios <miguel.dedios@artica.es> 

* extensions/insert_data.php: fixed the label of notice about the
	directory data_in.
	
	Fixes: #2271
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8309 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-06-12 16:47:16 +00:00
parent b4dc1d57e1
commit 881cc6340d
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/ChangeLog
View File

@ -1,9 +1,18 @@
2013-06-12 Miguel de Dios <miguel.dedios@artica.es>
* 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 <miguel.dedios@artica.es> 2013-06-12 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_reporting.php: fixed the empty serialize vars. * include/functions_reporting.php: fixed the empty serialize vars.
Fixes: #2276 Fixes: #2276
MERGED FROM THE BRANCH PANDORA_4.0 MERGED FROM THE BRANCH PANDORA_4.0
2013-06-12 Miguel de Dios <miguel.dedios@artica.es> 2013-06-12 Miguel de Dios <miguel.dedios@artica.es>

3
pandora_console/extensions/insert_data.php
View File

@ -137,7 +137,8 @@ function mainInsertData() {
} }
echo '<div class="notify">'; echo '<div class="notify">';
echo __("Please check that the directory \"/var/spool/pandora/data_in\" is writeable by the apache user. <br /><br />The CSV file format is date;value&lt;newline&gt;date;value&lt;newline&gt;... 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. <br /><br />The CSV file format is date;value&lt;newline&gt;date;value&lt;newline&gt;... The date in CSV is in format Y/m/d H:i:s."),
$config['remote_config']);
echo '</div>'; echo '</div>';
$table = null; $table = null;