diff --git a/www/include/common/javascript/color_picker.php b/www/include/common/javascript/color_picker.php index e685b332498..871ac05a61b 100644 --- a/www/include/common/javascript/color_picker.php +++ b/www/include/common/javascript/color_picker.php @@ -3,38 +3,38 @@ * Copyright 2005-2015 Centreon * Centreon is developped by : Julien Mathis and Romain Le Merlus under * GPL Licence 2.0. - * - * This program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software * Foundation ; either version 2 of the License. - * + * * This program is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A * PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with + * + * You should have received a copy of the GNU General Public License along with * this program; if not, see . - * - * Linking this program statically or dynamically with other modules is making a - * combined work based on this program. Thus, the terms and conditions of the GNU + * + * Linking this program statically or dynamically with other modules is making a + * combined work based on this program. Thus, the terms and conditions of the GNU * General Public License cover the whole combination. - * - * As a special exception, the copyright holders of this program give Centreon - * permission to link this program with independent modules to produce an executable, - * regardless of the license terms of these independent modules, and to copy and - * distribute the resulting executable under terms of Centreon choice, provided that - * Centreon also meet, for each linked independent module, the terms and conditions - * of the license of that module. An independent module is a module which is not - * derived from this program. If you modify this program, you may extend this + * + * As a special exception, the copyright holders of this program give Centreon + * permission to link this program with independent modules to produce an executable, + * regardless of the license terms of these independent modules, and to copy and + * distribute the resulting executable under terms of Centreon choice, provided that + * Centreon also meet, for each linked independent module, the terms and conditions + * of the license of that module. An independent module is a module which is not + * derived from this program. If you modify this program, you may extend this * exception to your version of the program, but you are not obliged to do so. If you * do not wish to do so, delete this exception statement from your version. - * + * * For more information : contact@centreon.com - * + * * SVN : $URL$ * SVN : $Id$ - * */ +require_once __DIR__ . '/../../../class/HtmlAnalyzer.php'; $n = ""; $name = ""; @@ -64,15 +64,19 @@ function filter_get($str) $hcolor = filter_get($_GET["hcolor"]); } } - $name1 = $n.""; - $name2 = $n."_color"; +$n = htmlspecialchars($n, ENT_QUOTES, 'UTF-8'); +$name = htmlspecialchars($name, ENT_QUOTES, 'UTF-8'); +$title = htmlspecialchars($title, ENT_QUOTES, 'UTF-8'); +$hcolor = htmlspecialchars($hcolor, ENT_QUOTES, 'UTF-8'); +$name1 = $n . ""; +$name2 = $n . "_color"; ?> Color Picker @@ -204,8 +208,8 @@ function send_color()
-

-

+

+

diff --git a/www/include/views/componentTemplates/formComponentTemplate.ihtml b/www/include/views/componentTemplates/formComponentTemplate.ihtml index ede927f9029..e81d9509ec5 100644 --- a/www/include/views/componentTemplates/formComponentTemplate.ihtml +++ b/www/include/views/componentTemplates/formComponentTemplate.ihtml @@ -157,7 +157,8 @@ function activate_color_selection(e) { jQuery(document).ready(function() { jQuery('input[name$="_color"]').click(function(e) { - popup_color_picker(jQuery(this).attr('name').replace(/_color$/g, ''), 'Line color'); + let name = jQuery(this).attr('name'); + popup_color_picker(name.replace(/_color$/g, ''), name); }); jQuery('input[name$="_color"]').click(activate_color_selection); activate_color_selection.apply(jQuery('input[name$="_color"]:checked')); diff --git a/www/include/views/componentTemplates/formComponentTemplate.php b/www/include/views/componentTemplates/formComponentTemplate.php index db5431907ff..3308545c15d 100644 --- a/www/include/views/componentTemplates/formComponentTemplate.php +++ b/www/include/views/componentTemplates/formComponentTemplate.php @@ -371,7 +371,8 @@ function popup_color_picker(t,name) { var width = 400; var height = 300; - window.open('./include/common/javascript/color_picker.php?n=' + t + '&name=' + name, + var title = name.includes("area") ? "Area color" : "Line color"; + window.open('./include/common/javascript/color_picker.php?n=' + t + '&name=' + name + "&title=" + title, 'cp', 'resizable=no, location=no, width=' + width + ', height=' + height + ', menubar=no, status=yes, scrollbars=no, menubar=no'