From 787623882312d836daa11a499bc9b8efbaf44151 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Mon, 2 Mar 2015 01:36:27 +0100
Subject: [PATCH 1/2] Fixed bug with hide/show checkboxes reported by Ruben
 Almeida (aruben) When an external calendar was called "mytasks", Dolibarr
 events were also hidden too.

---
 htdocs/comm/action/index.php   | 2 +-
 htdocs/core/lib/agenda.lib.php | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 38e8ab24bb1..82e6818a250 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -1038,7 +1038,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                     		$numicals[dol_string_nospecial($event->icalname)]++;
                     	}
                     	$color=$event->icalcolor;
-                    	$cssclass=(! empty($event->icalname)?'family_'.dol_string_nospecial($event->icalname):'family_other');
+                    	$cssclass=(! empty($event->icalname)?'family_ext'.dol_string_nospecial($event->icalname):'family_other');
                     }
                     else if ($event->type_code == 'BIRTHDAY')  { $numbirthday++; $colorindex=2; $cssclass='family_birthday'; }
                     else { $numother++; $cssclass='family_other'; }
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 5bd0bc5ee95..219b69015a0 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -130,7 +130,6 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 		print '<td align="center" valign="middle" class="nowrap">';
 		print '<script type="text/javascript">' . "\n";
 		print 'jQuery(document).ready(function () {' . "\n";
-		print 'jQuery("#check_mytasks").click(function() { jQuery(".family_mytasks").toggle(); jQuery(".family_other").toggle(); });' . "\n";
 		print 'jQuery("#check_birthday").click(function() { jQuery(".family_birthday").toggle(); });' . "\n";
 		print 'jQuery(".family_birthday").toggle();' . "\n";
 		print '});' . "\n";
@@ -162,7 +161,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 					$htmlname = dol_string_nospecial($val['name']);
 
 					print '<tr><td>';
-					print '<input type="checkbox" id="check_' . $htmlname . '" name="check_' . $htmlname . '" checked="true"> ' . $val ['name'];
+					print '<input type="checkbox" id="check_' . $htmlname . '" name="check_ext' . $htmlname . '" checked="true"> ' . $val ['name'];
 					print '</td></tr>';
 				}
 			}

From 41c55d1913c80ef56a7c95e2550b23919071ae14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Wed, 4 Mar 2015 11:55:17 +0100
Subject: [PATCH 2/2] Better fix for bug-1825. There are actually a lot to
 things to escape and escaped methods can make conflict with similar names so
 it is better to make a md5 to have a unique value

---
 htdocs/comm/action/index.php   | 2 +-
 htdocs/core/lib/agenda.lib.php | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 82e6818a250..ba697538de7 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -1038,7 +1038,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                     		$numicals[dol_string_nospecial($event->icalname)]++;
                     	}
                     	$color=$event->icalcolor;
-                    	$cssclass=(! empty($event->icalname)?'family_ext'.dol_string_nospecial($event->icalname):'family_other');
+                    	$cssclass=(! empty($event->icalname)?'family_ext'.md5($event->icalname):'family_other');
                     }
                     else if ($event->type_code == 'BIRTHDAY')  { $numbirthday++; $colorindex=2; $cssclass='family_birthday'; }
                     else { $numother++; $cssclass='family_other'; }
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 219b69015a0..e4885245675 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -140,25 +140,20 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 			if (count($showextcals) > 0)
 			{
 				print '<tr><td>';
-				//jQuery Learning "How do I select an element by an ID that has characters used in CSS notation?"
-				//http://learn.jquery.com/using-jquery-core/faq/how-do-i-select-an-element-by-an-id-that-has-characters-used-in-css-notation/
 				print '<script type="text/javascript">
-					function jq( myid ) {
-						return myid.replace( /(:|\.|\[|\]|,|@)/g, "\\\\$1" );
-					}
 					jQuery(document).ready(function () {
 
 						jQuery("form.listactionsfilter input[name^=\"check_\"]").click(function() {
 							var name = $(this).attr("name");
 
-							jQuery(".family_" + jq(name.replace("check_", ""))).toggle();
+							jQuery(".family_" + name.replace("check_", "")).toggle();
 						});
 				    });
 				</script>';
 				print '<input type="checkbox" id="check_mytasks" name="check_mytasks" checked="true" disabled="disabled"> ' . $langs->trans("LocalAgenda") . '</td></tr>';
 				foreach ($showextcals as $val)
 				{
-					$htmlname = dol_string_nospecial($val['name']);
+					$htmlname = md5($val['name']);
 
 					print '<tr><td>';
 					print '<input type="checkbox" id="check_' . $htmlname . '" name="check_ext' . $htmlname . '" checked="true"> ' . $val ['name'];