From 902f70dac3f19b54f4fa2699e2a90bb4bf413ecb Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Tue, 7 Jun 2011 11:05:20 +0000
Subject: [PATCH] task #9747: Can show content of external calendar (ical) into
 agenda

---
 htdocs/admin/agenda_extsites.php | 4 ++--
 htdocs/comm/action/index.php     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index 27b63e569b4..e6d4ffe6f7b 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -44,8 +44,8 @@ $actionsave=GETPOST("save");
 if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB=5;
 $MAXAGENDA=empty($conf->global->AGENDA_EXT_NB)?5:$conf->global->AGENDA_EXT_NB;
 
-// List of Google colors (A lot of colors are ignored by Google)
-$colorlist=array('29527A','5229A3','A32929','7A367A','B1365F','0D7813');
+// List of aviable colors
+$colorlist=array('BECEDD','DDBECE','BFDDBE','F598B4','F68654','CBF654','9FAF9');
 
 /*
  * Actions
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 38d8e2f6b3f..536b9e5f7ca 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -514,7 +514,7 @@ if ($conf->global->ENABLE_AGENDA_EXT==1 && $conf->global->AGENDA_EXT_NB>0)
 				$event->datep=$icalevent[DTSTART];
 				$event->datef=$icalevent[DTEND];
 				$event->type_code="ICALEVENT";
-				$event->libelle='<b>'.$icalevent[SUMMARY].'</b><br>'.str_replace("\\n", "<br>", "$icalevent[DESCRIPTION]");; 
+				$event->libelle='<b>'.$icalevent[SUMMARY].'</b><br>'.str_replace("\\n", "<br>", "$icalevent[DESCRIPTION]"); 
 	        	//$event->fulldayevent=$obj->fulldayevent;
 	        	
 				$event->date_start_in_calendar=$event->datep;