From d8e4c3f343d9a521f8cb4f767ead1523f8046f69 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Wed, 25 Feb 2009 16:27:48 +0100
Subject: [PATCH] [svn r18692] Fixing agenda links when multiple URL feature is
 enabled see FS#3462

---
 main/calendar/agenda.inc.php   | 14 ++++++++++++--
 main/calendar/myagenda.inc.php | 13 ++++++++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/main/calendar/agenda.inc.php b/main/calendar/agenda.inc.php
index abbda1b265..4944a31b63 100644
--- a/main/calendar/agenda.inc.php
+++ b/main/calendar/agenda.inc.php
@@ -1,4 +1,4 @@
-<?php //$Id: agenda.inc.php 18440 2009-02-11 18:39:40Z herodoto $
+<?php //$Id: agenda.inc.php 18692 2009-02-25 15:27:48Z juliomontoya $
 
 /*
 ==============================================================================
@@ -3044,11 +3044,21 @@ function get_agendaitems($month, $year)
 
 	$mycourse = api_get_course_info();
     $result = api_sql_query($sqlquery, __FILE__, __LINE__);
+    global $_configuration;
+   	$root_url = $_configuration['root_web'];
+	if ($_configuration['multiple_access_urls']==true) {
+		$access_url_id = api_get_current_access_url_id();				
+		if ($access_url_id != -1 ){
+			$url = api_get_access_url($access_url_id); 				
+			$root_url = $url['url'];
+		}		
+	}
+		
 	while ($item = Database::fetch_array($result))
 	{
 		$agendaday = date('j',strtotime($item['start_date']));
 		$time= date('H:i',strtotime($item['start_date']));
-		$URL = $_configuration['root_web'].'main/calendar/agenda.php?cidReq='.$mycourse['id']."&amp;day=$agendaday&amp;month=$month&amp;year=$year#$agendaday"; // RH  //Patrick Cool: to highlight the relevant agenda item
+		$URL = $root_url.'main/calendar/agenda.php?cidReq='.$mycourse['id']."&amp;day=$agendaday&amp;month=$month&amp;year=$year#$agendaday"; // RH  //Patrick Cool: to highlight the relevant agenda item
 		$items[$agendaday][$item['start_time']] .= '<i>'.$time.'</i> <a href="'.$URL.'" title="'.$mycourse['name'].'">'.$mycourse['official_code'].'</a> '.$item['title'].'<br />';
 	}
 
diff --git a/main/calendar/myagenda.inc.php b/main/calendar/myagenda.inc.php
index 0fe3797c7c..2abc24a97e 100644
--- a/main/calendar/myagenda.inc.php
+++ b/main/calendar/myagenda.inc.php
@@ -564,6 +564,17 @@ function get_personal_agenda_items($agendaitems, $day = "", $month = "", $year =
 	//echo "week:".$week."/";
 	//echo $type."<p>";
 	//echo "<pre>".$sql."</pre>";
+	
+	global $_configuration;
+   	$root_url = $_configuration['root_web'];
+	if ($_configuration['multiple_access_urls']==true) {
+		$access_url_id = api_get_current_access_url_id();				
+		if ($access_url_id != -1 ){
+			$url = api_get_access_url($access_url_id); 				
+			$root_url = $url['url'];
+		}		
+	}
+	
 	$result = api_sql_query($sql, __FILE__, __LINE__);
 	while ($item = Database::fetch_array($result))
 	{
@@ -584,7 +595,7 @@ function get_personal_agenda_items($agendaitems, $day = "", $month = "", $year =
 		// if the student has specified a course we a add a link to that course
 		if ($item['course'] <> "")
 		{
-			$url = $_configuration['root_web']."main/calendar/agenda.php?cidReq=".urlencode($item['course'])."&amp;day=$day&amp;month=$month&amp;year=$year#$day"; // RH  //Patrick Cool: to highlight the relevant agenda item
+			$url = $root_url."main/calendar/agenda.php?cidReq=".urlencode($item['course'])."&amp;day=$day&amp;month=$month&amp;year=$year#$day"; // RH  //Patrick Cool: to highlight the relevant agenda item
 			$course_link = "<a href=\"$url\" title=\"".$item['course']."\">".$item['course']."</a>";
 		}
 		else