lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Can disable string encoding (if already done)

Browse Source
This commit is contained in:
Laurent Destailleur 2011-07-21 22:55:06 +00:00
parent b0f8d11a28
commit 904263e5f0
2 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
htdocs/comm/action/index.php
View File

@ -24,7 +24,7 @@
* \file htdocs/comm/action/index.php * \file htdocs/comm/action/index.php
* \ingroup agenda * \ingroup agenda
* \brief Home page of calendar events * \brief Home page of calendar events
* \version $Id: index.php,v 1.183 2011/07/22 06:51:31 simnandez Exp $ * \version $Id$
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
@ -487,23 +487,24 @@ if ($showbirthday)
//Exernal Calendars //Exernal Calendars
$listofextcals=array(); $listofextcals=array();
if ($conf->global->MAIN_FEATURES_LEVEL>=2)
if (empty($conf->global->AGENDA_DISABLE_EXT) && $conf->global->AGENDA_EXT_NB > 0)
{ {
$i=0; if (empty($conf->global->AGENDA_DISABLE_EXT) && $conf->global->AGENDA_EXT_NB > 0)
while($i < $conf->global->AGENDA_EXT_NB) {
{ $i=0;
$i++; while($i < $conf->global->AGENDA_EXT_NB)
$paramkey='AGENDA_EXT_SRC'.$i; {
$url=$conf->global->$paramkey; $i++;
$paramkey='AGENDA_EXT_NAME'.$i; $paramkey='AGENDA_EXT_SRC'.$i;
$namecal = $conf->global->$paramkey; $url=$conf->global->$paramkey;
$paramkey='AGENDA_EXT_COLOR'.$i; $paramkey='AGENDA_EXT_NAME'.$i;
$colorcal = $conf->global->$paramkey; $namecal = $conf->global->$paramkey;
if ($url && $namecal) $listofextcals[]=array('src'=>$url,'name'=>$namecal,'color'=>$colorcal); $paramkey='AGENDA_EXT_COLOR'.$i;
} $colorcal = $conf->global->$paramkey;
if ($url && $namecal) $listofextcals[]=array('src'=>$url,'name'=>$namecal,'color'=>$colorcal);
}
}
} }
if (sizeof($listofextcals)) if (sizeof($listofextcals))
{ {
require_once(DOL_DOCUMENT_ROOT."/comm/action/class/ical.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/ical.class.php");
@ -786,7 +787,7 @@ $("#actionagenda_vcal_link").attr("href","/public/agenda/agendaexport.php?format
'; ';
*/ */
llxFooter('$Date: 2011/07/22 06:51:31 $ - $Revision: 1.183 $'); llxFooter('$Date$ - $Revision$');
/** /**

14
htdocs/lib/agenda.lib.php
View File

@ -22,7 +22,7 @@
/** /**
* \file htdocs/lib/agenda.lib.php * \file htdocs/lib/agenda.lib.php
* \brief Set of function for the agenda module * \brief Set of function for the agenda module
* \version $Id: agenda.lib.php,v 1.42 2011/07/22 06:51:30 simnandez Exp $ * \version $Id$
*/ */
@ -324,11 +324,13 @@ function agenda_prepare_head()
$head[$h][2] = 'xcal'; $head[$h][2] = 'xcal';
$h++; $h++;
$head[$h][0] = DOL_URL_ROOT."/admin/agenda_extsites.php"; if ($conf->global->MAIN_FEATURES_LEVEL >= 2) // In dev version only for the moment
$head[$h][1] = $langs->trans("ExtSites"); {
$head[$h][2] = 'extsites'; $head[$h][0] = DOL_URL_ROOT."/admin/agenda_extsites.php";
$h++; $head[$h][1] = $langs->trans("ExtSites");
$head[$h][2] = 'extsites';
$h++;
}
return $head; return $head;
} }