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

2012-08-27 Sergio Martin <sergio.martin@artica.es> 

* godmode/alerts/alert_commands.php: Fixed a little bugs
	of presentation in the command descriptions



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6915 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2012-08-27 09:25:59 +00:00
parent 86165905a4
commit fedec9bdc2
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2012-08-27 Sergio Martin <sergio.martin@artica.es>
* godmode/alerts/alert_commands.php: Fixed a little bugs
of presentation in the command descriptions
2012-08-24 Sergio Martin <sergio.martin@artica.es>
* extensions/plugin_registration.php: Modified the plugin

8
pandora_console/godmode/alerts/alert_commands.php
View File

@ -33,6 +33,12 @@ if (is_ajax ()) {
if ($get_alert_command) {
$id = (int) get_parameter ('id');
$command = alerts_get_alert_command ($id);
// If is setted a description, we change the carriage return by <br> tags
if(isset($command['description'])) {
$command['description'] = io_safe_input(str_replace("\r\n","<br>", io_safe_output($command['description'])));
}
echo json_encode ($command);
}
return;
@ -165,7 +171,7 @@ foreach ($commands as $command) {
$data[0] .= $command['name'];
$data[0] .= '</span>';
$data[1] = $command['id'];
$data[2] = $command['description'];
$data[2] = str_replace("\r\n","<br>",io_safe_output($command['description']));
$data[3] = '';
if (! $command['internal'])
$data[3] = '<a href="index.php?sec=galertas&sec2=godmode/alerts/alert_commands&delete_command=1&id='.$command['id'].'"