diff options
| -rw-r--r-- | frontends/php/include/defines.inc.php | 2 | ||||
| -rw-r--r-- | frontends/php/include/forms.inc.php | 4 | ||||
| -rw-r--r-- | frontends/php/triggers.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php index fdae9bf1..295fb00d 100644 --- a/frontends/php/include/defines.inc.php +++ b/frontends/php/include/defines.inc.php @@ -383,7 +383,7 @@ define('ZBX_EREG_ITEM_KEY_FORMAT', '([]\[0-9a-zA-Z!\_\*\/\.\,\:\(\)\+ [.-.]\$]+)'); define('ZBX_EREG_SIMPLE_EXPRESSION_FORMAT', - '^\{'.ZBX_EREG_HOST_FORMAT.'\:('.ZBX_EREG_ITEM_KEY_FORMAT.'\.([a-z]{3,11})\(([#0-9a-zA-Z\_\/\.\,[:space:]]+)\)\}$'); + '^\{'.ZBX_EREG_HOST_FORMAT.'\:'.ZBX_EREG_ITEM_KEY_FORMAT.'\.([a-z]{3,11})\(([#0-9a-zA-Z\_\/\.\,[:space:]]+)\)\}$'); define('ZBX_SIMPLE_EXPRESSION_HOST_ID', 1); define('ZBX_SIMPLE_EXPRESSION_KEY_ID', 2); diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php index 2ced8bb9..af2449d1 100644 --- a/frontends/php/include/forms.inc.php +++ b/frontends/php/include/forms.inc.php @@ -2210,7 +2210,7 @@ $frmTrig->AddVar("triggerid",$_REQUEST["triggerid"]); $trigger=get_trigger_by_triggerid($_REQUEST["triggerid"]); - $frmTrig->SetTitle(S_TRIGGER." \"".htmlspecialchars(stripslashes($trigger["description"]))."\""); + $frmTrig->SetTitle(S_TRIGGER." \"".htmlspecialchars($trigger["description"])."\""); $limited = $trigger['templateid'] ? 'yes' : null; } @@ -2224,7 +2224,7 @@ if((isset($_REQUEST["triggerid"]) && !isset($_REQUEST["form_refresh"])) || isset($limited)) { - $description = stripslashes($trigger["description"]); + $description = $trigger["description"]; $expression = explode_exp($trigger["expression"],0); if(!isset($limited) || !isset($_REQUEST["form_refresh"])) diff --git a/frontends/php/triggers.php b/frontends/php/triggers.php index 15862837..47c97ac3 100644 --- a/frontends/php/triggers.php +++ b/frontends/php/triggers.php @@ -427,7 +427,7 @@ include_once "include/page_header.php"; $description[] = ':'; } - $description[] = new CLink(expand_trigger_description($row["triggerid"]), + $description[] = new CLink(addslashes(expand_trigger_description($row["triggerid"])), "triggers.php?form=update&triggerid=".$row["triggerid"]. "&hostid=".$row["hostid"], 'action'); |