diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php index 2b5d2eab08107cc8176e71701bb06e931f761df0..6b5f031cdca3bc4e6a83edfce4a4964d190cbcf4 100644 --- a/htdocs/admin/agenda_xcal.php +++ b/htdocs/admin/agenda_xcal.php @@ -17,9 +17,9 @@ */ /** - * \file htdocs/admin/agenda.php + * \file htdocs/admin/agenda_xcal.php * \ingroup agenda - * \brief Page de configuration du module agenda + * \brief Page to setup miscellaneous options of agenda module * \version $Id$ */ @@ -121,13 +121,13 @@ print "<br>"; // Show message $message=''; $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',$dolibarr_main_url_root); -$urlvcal='<a href="'.DOL_URL_ROOT.'/comm/action/agendaexport.php?format=vcal&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY):'...').'" target="_blank">'.$urlwithouturlroot.DOL_URL_ROOT.'/comm/action/agendaexport.php?format=vcal&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY):'KEYNOTDEFINED').'</a>'; +$urlvcal='<a href="'.DOL_URL_ROOT.'/public/agenda/agendaexport.php?format=vcal&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY):'...').'" target="_blank">'.$urlwithouturlroot.DOL_URL_ROOT.'/comm/action/agendaexport.php?format=vcal&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY):'KEYNOTDEFINED').'</a>'; $message.=$langs->trans("WebCalUrlForVCalExport",'vcal',$urlvcal); $message.='<br>'; -$urlical='<a href="'.DOL_URL_ROOT.'/comm/action/agendaexport.php?format=ical&type=event&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY):'...').'" target="_blank">'.$urlwithouturlroot.DOL_URL_ROOT.'/comm/action/agendaexport.php?format=ical&type=event&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY):'KEYNOTDEFINED').'</a>'; +$urlical='<a href="'.DOL_URL_ROOT.'/public/agenda/agendaexport.php?format=ical&type=event&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY):'...').'" target="_blank">'.$urlwithouturlroot.DOL_URL_ROOT.'/comm/action/agendaexport.php?format=ical&type=event&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY):'KEYNOTDEFINED').'</a>'; $message.=$langs->trans("WebCalUrlForVCalExport",'ical',$urlical); $message.='<br>'; -$urlrss='<a href="'.DOL_URL_ROOT.'/comm/action/agendaexport.php?format=rss&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY):'...').'" target="_blank">'.$urlwithouturlroot.DOL_URL_ROOT.'/comm/action/agendaexport.php?format=rss&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY):'KEYNOTDEFINED').'</a>'; +$urlrss='<a href="'.DOL_URL_ROOT.'/public/agenda/agendaexport.php?format=rss&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY):'...').'" target="_blank">'.$urlwithouturlroot.DOL_URL_ROOT.'/comm/action/agendaexport.php?format=rss&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY):'KEYNOTDEFINED').'</a>'; $message.=$langs->trans("WebCalUrlForVCalExport",'rss',$urlrss); $message.='<br>'; $message.='<br>'; diff --git a/htdocs/lib/xcal.lib.php b/htdocs/lib/xcal.lib.php index ac009aba34434d6f0f76d16563aa25b8adc72301..3ea52469bc1bdf0d75a6adc2c24a183ace3fc851 100644 --- a/htdocs/lib/xcal.lib.php +++ b/htdocs/lib/xcal.lib.php @@ -261,7 +261,7 @@ function build_rssfile($format='rss',$title,$desc,$events_array,$outputfile,$fil $url=$dolibarr_main_url_root; if (! preg_match('/\/$/',$url)) $url.='/'; - $url.='comm/action/agendaexport.php?format=rss&exportkey='.urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY); + $url.='public/agenda/agendaexport.php?format=rss&exportkey='.urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY); $html.='<link><![CDATA['.$url.']]></link>'."\n"; // '<managingEditor>editor@example.com</managingEditor>'."\n" // '<webMaster>webmaster@example.com</webMaster>'."\n" diff --git a/htdocs/comm/action/agendaexport.php b/htdocs/public/agenda/agendaexport.php similarity index 94% rename from htdocs/comm/action/agendaexport.php rename to htdocs/public/agenda/agendaexport.php index a71a6ac77a5f389450e9e14ad7bcf3025be23d99..17de07683fd8c359002a4303e8d409b5d09d0692 100644 --- a/htdocs/comm/action/agendaexport.php +++ b/htdocs/public/agenda/agendaexport.php @@ -1,5 +1,5 @@ <?php -/* Copyright (C) 2008 Laurent Destailleur <eldy@users.sourceforge.net> +/* Copyright (C) 2008-2009 Laurent Destailleur <eldy@users.sourceforge.net> * * 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 @@ -16,12 +16,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/** \file htdocs/comm/action/agendaexport.php - \ingroup agenda - \brief Page export agenda - http://127.0.0.1/dolibarr/comm/action/agendaexport.php?format=rss&exportkey=cle&filter=mine - \version $Id$ -*/ +/** \file htdocs/public/agenda/agendaexport.php + * \ingroup agenda + * \brief Page to export agenda + * http://127.0.0.1/dolibarr/public/agenda/agendaexport.php?format=rss&exportkey=cle&filter=mine + * \version $Id$ + */ // This is to make Dolibarr working with Plesk set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); diff --git a/htdocs/robots.txt b/htdocs/robots.txt index e57abe49be5f171ab05a095cfb8470d9760f85fb..c77110015588065eb7dab96b5ffa06a0d29b04da 100644 --- a/htdocs/robots.txt +++ b/htdocs/robots.txt @@ -1,5 +1,5 @@ User-agent: * -Allow: /comm/action/agendaexport.php +Allow: /public/agenda/agendaexport.php Allow: /public/demo/ Allow: /index.php Disallow: / \ No newline at end of file