From d21cd9e9eeef7ee01297de7e02e2568bd8b4cc66 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Sat, 26 Feb 2005 22:38:14 +0000
Subject: [PATCH] =?UTF-8?q?derniers=20r=C3=A9glages=20pour=20calendrier=20?=
=?UTF-8?q?appelable=20de=20l'espace=20public?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/inc_calendrier.php | 5 +++--
ecrire/inc_presentation.php3 | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ecrire/inc_calendrier.php b/ecrire/inc_calendrier.php
index 7bc999eec1..a98464ef5f 100644
--- a/ecrire/inc_calendrier.php
+++ b/ecrire/inc_calendrier.php
@@ -608,7 +608,7 @@ function http_calendrier_clics($annee, $mois, $jour, $clic)
{
global $bleu, $jaune, $vert;
$href = "message_edit.php3?rv=$annee-$mois-$jour&new=oui";
- $script = 'calendrier.php3' ; // ok pour espace de redac, pas pour public
+ $script = $GLOBALS['PHP_SELF'] ;
return "\n" .
http_href("$script?type=jour&jour=$jour&mois=$mois&annee=$annee", $clic) .
"\n" .
@@ -735,7 +735,8 @@ function http_calendrier_suite_heures($jour_today,$mois_today,$annee_today,
function http_calendrier_agenda ($mois, $annee, $jour_ved, $mois_ved, $annee_ved, $semaine = false, $script='', $ancre='') {
- if (!$script) $script = 'calendrier.php3?' ;
+ if (!$script) $script = $GLOBALS['PHP_SELF'] ;
+ if (!strpos($script, '?')) $script .= '?';
if (!$mois) {$mois = 12; $annee--;}
elseif ($mois==13) {$mois = 1; $annee++;}
return
diff --git a/ecrire/inc_presentation.php3 b/ecrire/inc_presentation.php3
index f05d0f6cf3..7b74a519dc 100644
--- a/ecrire/inc_presentation.php3
+++ b/ecrire/inc_presentation.php3
@@ -2576,7 +2576,7 @@ document.write(\"" . addslashes(str_replace("\n", " ", $html))."\")");
$gadget .= "<table><tr>";
$gadget .= "<td valign='top' width='200'>";
$gadget .= "<div>";
- $gadget .= http_calendrier_agenda($mois_today, $annee_today, $jour_today, $mois_today, $annee_today);
+ $gadget .= http_calendrier_agenda($mois_today, $annee_today, $jour_today, $mois_today, $annee_today, false, 'calendrier.php3');
$gadget .= "</div>";
$gadget .= "</td>";
if ($afficher_cal) {
--
GitLab