diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 08e7d071cab..05e52bded62 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -24,7 +24,7 @@ * \file htdocs/comm/action/index.php * \ingroup agenda * \brief Home page of calendar events - * \version $Id$ + * \version $Id: index.php,v 1.183 2011/07/22 06:51:31 simnandez Exp $ */ require("../../main.inc.php"); @@ -487,24 +487,23 @@ if ($showbirthday) //Exernal Calendars $listofextcals=array(); -if ($conf->global->MAIN_FEATURES_LEVEL>=2) + +if (empty($conf->global->AGENDA_DISABLE_EXT) && $conf->global->AGENDA_EXT_NB > 0) { - if (empty($conf->global->AGENDA_DISABLE_EXT) && $conf->global->AGENDA_EXT_NB > 0) - { - $i=0; - while($i < $conf->global->AGENDA_EXT_NB) - { - $i++; - $paramkey='AGENDA_EXT_SRC'.$i; - $url=$conf->global->$paramkey; - $paramkey='AGENDA_EXT_NAME'.$i; - $namecal = $conf->global->$paramkey; - $paramkey='AGENDA_EXT_COLOR'.$i; - $colorcal = $conf->global->$paramkey; - if ($url && $namecal) $listofextcals[]=array('src'=>$url,'name'=>$namecal,'color'=>$colorcal); - } - } + $i=0; + while($i < $conf->global->AGENDA_EXT_NB) + { + $i++; + $paramkey='AGENDA_EXT_SRC'.$i; + $url=$conf->global->$paramkey; + $paramkey='AGENDA_EXT_NAME'.$i; + $namecal = $conf->global->$paramkey; + $paramkey='AGENDA_EXT_COLOR'.$i; + $colorcal = $conf->global->$paramkey; + if ($url && $namecal) $listofextcals[]=array('src'=>$url,'name'=>$namecal,'color'=>$colorcal); + } } + if (sizeof($listofextcals)) { require_once(DOL_DOCUMENT_ROOT."/comm/action/class/ical.class.php"); @@ -787,7 +786,7 @@ $("#actionagenda_vcal_link").attr("href","/public/agenda/agendaexport.php?format '; */ -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/22 06:51:31 $ - $Revision: 1.183 $'); /** diff --git a/htdocs/lib/agenda.lib.php b/htdocs/lib/agenda.lib.php index 91a96d0e6e2..d47b327541d 100644 --- a/htdocs/lib/agenda.lib.php +++ b/htdocs/lib/agenda.lib.php @@ -22,7 +22,7 @@ /** * \file htdocs/lib/agenda.lib.php * \brief Set of function for the agenda module - * \version $Id$ + * \version $Id: agenda.lib.php,v 1.42 2011/07/22 06:51:30 simnandez Exp $ */ @@ -324,13 +324,11 @@ function agenda_prepare_head() $head[$h][2] = 'xcal'; $h++; - if ($conf->global->MAIN_FEATURES_LEVEL >= 2) // In dev version only for the moment - { - $head[$h][0] = DOL_URL_ROOT."/admin/agenda_extsites.php"; - $head[$h][1] = $langs->trans("ExtSites"); - $head[$h][2] = 'extsites'; - $h++; - } + $head[$h][0] = DOL_URL_ROOT."/admin/agenda_extsites.php"; + $head[$h][1] = $langs->trans("ExtSites"); + $head[$h][2] = 'extsites'; + $h++; + return $head; }