From c5fafeb00da6f806bbc1ca5b69c18744d23e599a Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Sat, 15 Mar 2008 04:56:32 +0100 Subject: [PATCH] [svn r14599] Added iCal export function for personal agenda items Split myagenda process and functions definitions --- main/calendar/ical_export.php | 99 ++- main/calendar/myagenda.inc.php | 1113 ++++++++++++++++++++++++++++++++ main/calendar/myagenda.php | 1077 +----------------------------- 3 files changed, 1215 insertions(+), 1074 deletions(-) create mode 100644 main/calendar/myagenda.inc.php diff --git a/main/calendar/ical_export.php b/main/calendar/ical_export.php index 58fa0d9bc1..3552f816f6 100644 --- a/main/calendar/ical_export.php +++ b/main/calendar/ical_export.php @@ -11,11 +11,104 @@ $language_file = 'agenda'; // we are not inside a course, so we reset the course id $cidReset = true; // setting the global file that gets the general configuration, the databases, the languages, ... -require ('../inc/global.inc.php'); +require_once ('../inc/global.inc.php'); $this_section = SECTION_MYAGENDA; api_block_anonymous_users(); -require (api_get_path(LIBRARY_PATH).'groupmanager.lib.php'); +require_once (api_get_path(LIBRARY_PATH).'groupmanager.lib.php'); +require_once (api_get_path(LIBRARY_PATH).'icalcreator/iCalcreator.class.php'); +require_once (api_get_path(SYS_CODE_PATH).'calendar/myagenda.inc.php'); // setting the name of the tool $nameTools = get_lang('MyAgenda'); - + +// setting the database variables +$TABLECOURS = Database :: get_main_table(TABLE_MAIN_COURSE); +$TABLECOURSUSER = Database :: get_main_table(TABLE_MAIN_COURSE_USER); +$TABLEAGENDA = Database :: get_course_table(TABLE_AGENDA); +$TABLE_ITEMPROPERTY = Database :: get_course_table(TABLE_ITEM_PROPERTY); +$tbl_personal_agenda = Database :: get_user_personal_table(TABLE_PERSONAL_AGENDA); + +// the variables for the days and the months +// Defining the shorts for the days +$DaysShort = array (get_lang("SundayShort"), get_lang("MondayShort"), get_lang("TuesdayShort"), get_lang("WednesdayShort"), get_lang("ThursdayShort"), get_lang("FridayShort"), get_lang("SaturdayShort")); +// Defining the days of the week to allow translation of the days +$DaysLong = array (get_lang("SundayLong"), get_lang("MondayLong"), get_lang("TuesdayLong"), get_lang("WednesdayLong"), get_lang("ThursdayLong"), get_lang("FridayLong"), get_lang("SaturdayLong")); +// Defining the months of the year to allow translation of the months +$MonthsLong = array (get_lang("JanuaryLong"), get_lang("FebruaryLong"), get_lang("MarchLong"), get_lang("AprilLong"), get_lang("MayLong"), get_lang("JuneLong"), get_lang("JulyLong"), get_lang("AugustLong"), get_lang("SeptemberLong"), get_lang("OctoberLong"), get_lang("NovemberLong"), get_lang("DecemberLong")); + +if(!empty($_GET['id']) && $_GET['id']==strval(intval($_GET['id']))) +{ + define('ICAL_LANG',api_get_language_isocode()); + switch($_GET['type']) + { + case 'personal': + $ical = new vcalendar(); + $ai = get_personal_agenda_item($_GET['id']); + $ical->setConfig('unique_id',api_get_path(WEB_PATH)); + $ical->setProperty( 'method', 'PUBLISH' ); + $vevent = new vevent(); + if(empty($ai['date'])){header('location:'.$_SERVER['REFERER_URI']);} + list($y,$m,$d,$h,$M,$s) = preg_split('/[\s:-]/',$ai['date']); + $vevent->setProperty('dtstart',array('year'=>$y,'month'=>$m,'day'=>$d,'hour'=>$h,'min'=>$M,'sec'=>$s)); + if(empty($ai['enddate'])) + { + $y2=$y;$m2=$m;$d2=$d;$h2=$h;$M2=$M+15;$s2=$s; + if($M2>60){$M2=$M2-60;$h2+=1;} + } + else + { + list($y2,$m2,$d2,$h2,$M2,$s2) = preg_split('/[\s:-]/',$ai['enddate']); + } + $vevent->setProperty('dtend',array('year'=>$y2,'month'=>$m2,'day'=>$d2,'hour'=>$h2,'min'=>$M2,'sec'=>$s2)); + //$vevent->setProperty( 'LOCATION', get_lang('Unknown') ); // property name - case independent + $vevent->setProperty( 'summary', mb_convert_encoding($ai['title'],'UTF-8',$charset)); + $vevent->setProperty( 'description', mb_convert_encoding($ai['text'],'UTF-8',$charset)); + //$vevent->setProperty( 'comment', 'This is a comment' ); + $user = api_get_user_info($ai['user']); + $vevent->setProperty('organizer',$user['mail']); + $vevent->setProperty('attendee',$user['mail']); + $ical->setComponent ($vevent); // add event to calendar + $err = $ical->setConfig('url',api_get_path(WEB_PATH)); + $err = $ical->setConfig('filename',$y.$m.$d.$h.$M.$s.'-'.rand(1,1000).'.ics'); + $ical->returnCalendar(); + break; + case 'public': + $ical = new vcalendar(); + $ai = get_agenda_item($_GET['id']); + $ical->setConfig('unique_id',api_get_path(WEB_PATH)); + $ical->setProperty( 'method', 'PUBLISH' ); + $vevent = new vevent(); + if(empty($ai['start_date'])){header('location:'.$_SERVER['REFERER_URI']);} + list($y,$m,$d,$h,$M,$s) = preg_split('/[\s:-]/',$ai['start_date']); + $vevent->setProperty('dtstart',array('year'=>$y,'month'=>$m,'day'=>$d,'hour'=>$h,'min'=>$M,'sec'=>$s)); + if(empty($ai['end_date'])) + { + $y2=$y;$m2=$m;$d2=$d;$h2=$h;$M2=$M+15;$s2=$s; + if($M2>60){$M2=$M2-60;$h2+=1;} + } + else + { + list($y2,$m2,$d2,$h2,$M2,$s2) = preg_split('/[\s:-]/',$ai['end_date']); + } + $vevent->setProperty('dtend',array('year'=>$y2,'month'=>$m2,'day'=>$d2,'hour'=>$h2,'min'=>$M2,'sec'=>$s2)); + $vevent->setProperty( 'summary', mb_convert_encoding($ai['title'],'UTF-8',$charset)); + $vevent->setProperty( 'description', mb_convert_encoding($ai['content'],'UTF-8',$charset)); + //$vevent->setProperty( 'comment', 'This is a comment' ); + $user = api_get_user_info($ai['user']); + $vevent->setProperty('organizer',$user['mail']); + $vevent->setProperty('attendee',$user['mail']); + $course = api_get_course_info(); + $vevent->setProperty( 'LOCATION', $course['name'] ); // property name - case independent + $ical->setComponent ($vevent); // add event to calendar + $ical->returnCalendar(); + break; + default: + header('location:'.$_SERVER['REFERER_URI']); + die(); + } +} +else +{ + header('location:'.$_SERVER['REFERER_URI']); + die(); +} ?> \ No newline at end of file diff --git a/main/calendar/myagenda.inc.php b/main/calendar/myagenda.inc.php new file mode 100644 index 0000000000..8a94ae7ec3 --- /dev/null +++ b/main/calendar/myagenda.inc.php @@ -0,0 +1,1113 @@ +, Ghent University + @author: Toon Van Hoecke , Ghent University + @author: Eric Remy (initial version) + @version: 2.2 alpha + @description: this file generates a general agenda of all items of the + courses the user is registered for +============================================================================== + version info: + ------------- + -> version 2.2 : Patrick Cool, patrick.cool@ugent.be, november 2004 + Personal Agenda added. The user can add personal agenda items. The items + are stored in a dokeos_user database because it is not course or platform + based. A personal agenda view was also added. This lists all the personal + agenda items of that user. + + -> version 2.1 : Patrick Cool, patrick.cool@ugent.be, , oktober 2004 + This is the version that works with the Group based Agenda tool. + + -> version 2.0 (alpha): Patrick Cool, patrick.cool@ugent.be, , oktober 2004 + The 2.0 version introduces besides the month view also a week- and day view. + In the 2.5 (final) version it will be possible for the student to add his/her + own agenda items. The platform administrator can however decide if the students + are allowed to do this or not. + The alpha version only contains the three views. The personal agenda feature is + not yet completely finished. There are however already some parts of the code + for adding a personal agenda item present. + this code was not released in an official dokeos but was only used in the offical + server of the Ghent University where it underwent serious testing + + -> version 1.5: Toon Van Hoecke, toon.vanhoecke@ugent.be, december 2003 + + -> version 1.0: Eric Remy, eremy@rmwc.edu, 6 Oct 2003 + The tool was initially called master-calendar as it collects all the calendar + items of all the courses one is subscribed to. It was very soon integrated in + Dokeos as this was a really basic and very usefull tool. +*/ +/** + * This function retrieves all the agenda items of all the course of the user + */ +function get_agendaitems($courses_dbs, $month, $year) +{ + global $_user; + global $_configuration; + + $items = array (); + // get agenda-items for every course + foreach ($courses_dbs as $key => $array_course_info) + { + //databases of the courses + $TABLEAGENDA = Database :: get_course_table(TABLE_AGENDA, $array_course_info["db"]); + $TABLE_ITEMPROPERTY = Database :: get_course_table(TABLE_ITEM_PROPERTY, $array_course_info["db"]); + + $group_memberships = GroupManager :: get_group_ids($array_course_info["db"], $_user['user_id']); + // if the user is administrator of that course we show all the agenda items + if ($array_course_info['status'] == '1') + { + //echo "course admin"; + $sqlquery = "SELECT + DISTINCT agenda.*, item_property.* + FROM ".$TABLEAGENDA." agenda, + ".$TABLE_ITEMPROPERTY." item_property + WHERE agenda.id = item_property.ref ".$show_all_current." + AND MONTH(agenda.start_date)='".$month."' + AND YEAR(agenda.start_date)='".$year."' + AND item_property.tool='".TOOL_CALENDAR_EVENT."' + AND item_property.visibility='1' + GROUP BY agenda.id + ORDER BY start_date ".$sort; + } + // if the user is not an administrator of that course + else + { + //echo "GEEN course admin"; + if (is_array($group_memberships)) + { + $sqlquery = "SELECT + agenda.*, item_property.* + FROM ".$TABLEAGENDA." agenda, + ".$TABLE_ITEMPROPERTY." item_property + WHERE `agenda`.`id` = `item_property`.`ref` ".$show_all_current." + AND MONTH(`agenda`.`start_date`)='".$month."' + AND YEAR(`agenda`.`start_date`)='".$year."' + AND `item_property`.`tool`='".TOOL_CALENDAR_EVENT."' + AND ( `item_property`.`to_user_id`='".$_user['user_id']."' OR `item_property`.`to_group_id` IN (0, ".implode(", ", $group_memberships).") ) + AND `item_property`.`visibility`='1' + ORDER BY start_date ".$sort; + } + else + { + $sqlquery = "SELECT + agenda.*, item_property.* + FROM ".$TABLEAGENDA." agenda, + ".$TABLE_ITEMPROPERTY." item_property + WHERE `agenda`.`id` = `item_property`.`ref` ".$show_all_current." + AND MONTH(`agenda`.`start_date`)='".$month."' + AND YEAR(`agenda`.`start_date`)='".$year."' + AND `item_property`.`tool`='".TOOL_CALENDAR_EVENT."' + AND ( `item_property`.`to_user_id`='".$_user['user_id']."' OR `item_property`.`to_group_id`='0') + AND `item_property`.`visibility`='1' + ORDER BY start_date ".$sort; + } + } + + $result = api_sql_query($sqlquery, __FILE__, __LINE__); + while ($item = mysql_fetch_array($result)) + { + $agendaday = date("j",strtotime($item['start_date'])); + $time= date("H:i",strtotime($item['start_date'])); + $URL = api_get_path(WEB_PATH)."main/calendar/agenda.php?cidReq=".urlencode($array_course_info["code"])."&day=$agendaday&month=$month&year=$year#$agendaday"; // RH //Patrick Cool: to highlight the relevant agenda item + $items[$agendaday][$item['start_time']] .= "".$time." ".$array_course_info["visual_code"]." ".$item['title']."
"; + } + } + // sorting by hour for every day + $agendaitems = array (); + while (list ($agendaday, $tmpitems) = each($items)) + { + sort($tmpitems); + while (list ($key, $val) = each($tmpitems)) + { + $agendaitems[$agendaday] .= $val; + } + } + //print_r($agendaitems); + return $agendaitems; +} +/** + * Show the monthcalender of the given month + */ +function display_monthcalendar($agendaitems, $month, $year, $weekdaynames, $monthName) +{ + global $DaysShort,$course_path; + //Handle leap year + $numberofdays = array (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31); + if (($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0)) + $numberofdays[2] = 29; + //Get the first day of the month + $dayone = getdate(mktime(0, 0, 0, $month, 1, $year)); + //Start the week on monday + $startdayofweek = $dayone['wday'] <> 0 ? ($dayone['wday'] - 1) : 6; + $backwardsURL = api_get_self()."?coursePath=".urlencode($course_path)."&courseCode=".Security::remove_XSS($_GET['courseCode'])."&action=view&view=month&month=". ($month == 1 ? 12 : $month -1)."&year=". ($month == 1 ? $year -1 : $year); + $forewardsURL = api_get_self()."?coursePath=".urlencode($course_path)."&courseCode=".Security::remove_XSS($_GET['courseCode'])."&action=view&view=month&month=". ($month == 12 ? 1 : $month +1)."&year=". ($month == 12 ? $year +1 : $year); + + echo "\n", "\n", "\n", "\n", "\n", "\n"; + + echo "\n"; + for ($ii = 1; $ii < 8; $ii ++) + { + echo "\n"; + } + echo "\n"; + $curday = -1; + $today = getdate(); + while ($curday <= $numberofdays[$month]) + { + echo "\n"; + for ($ii = 0; $ii < 7; $ii ++) + { + if (($curday == -1) && ($ii == $startdayofweek)) + { + $curday = 1; + } + if (($curday > 0) && ($curday <= $numberofdays[$month])) + { + $bgcolor = $ii < 5 ? $class = "class=\"days_week\"" : $class = "class=\"days_weekend\""; + $dayheader = "$curday"; + if (($curday == $today[mday]) && ($year == $today[year]) && ($month == $today[mon])) + { + $dayheader = "$curday - ".get_lang("Today")."
"; + $class = "class=\"days_today\""; + } + echo "\n"; + $curday ++; + } + else + { + echo "\n"; + } + } + echo "\n"; + } + echo "
«", $monthName, " ", $year, "»
", $DaysShort[$ii % 7], "
", "".$dayheader; + if (!empty($agendaitems[$curday])) + { + echo "".$agendaitems[$curday].""; + } + echo " 
\n"; +} +/** + * Show the mini calender of the given month + */ +function display_minimonthcalendar($agendaitems, $month, $year, $monthName) +{ + global $DaysShort,$course_path; + //Handle leap year + $numberofdays = array (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31); + if (($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0)) + $numberofdays[2] = 29; + //Get the first day of the month + $dayone = getdate(mktime(0, 0, 0, $month, 1, $year)); + //Start the week on monday + $startdayofweek = $dayone['wday'] <> 0 ? ($dayone['wday'] - 1) : 6; + $backwardsURL = api_get_self()."?coursePath=".urlencode($course_path)."&courseCode=".Security::remove_XSS($_GET['courseCode'])."&month=". ($month == 1 ? 12 : $month -1)."&year=". ($month == 1 ? $year -1 : $year); + $forewardsURL = api_get_self()."?coursePath=".urlencode($course_path)."&courseCode=".Security::remove_XSS($_GET['courseCode'])."&month=". ($month == 12 ? 1 : $month +1)."&year=". ($month == 12 ? $year +1 : $year); + + echo "\n", "\n", "\n", "\n", "\n", "\n"; + + echo "\n"; + for ($ii = 1; $ii < 8; $ii ++) + { + echo "\n"; + } + echo "\n"; + $curday = -1; + $today = getdate(); + while ($curday <= $numberofdays[$month]) + { + echo "\n"; + for ($ii = 0; $ii < 7; $ii ++) + { + if (($curday == -1) && ($ii == $startdayofweek)) + { + $curday = 1; + } + if (($curday > 0) && ($curday <= $numberofdays[$month])) + { + $bgcolor = $ii < 5 ? $class = "class=\"days_week\"" : $class = "class=\"days_weekend\""; + $dayheader = "$curday"; + if (($curday == $today[mday]) && ($year == $today[year]) && ($month == $today[mon])) + { + $dayheader = "$curday"; + $class = "class=\"days_today\""; + } + echo "\t\n"; + $curday ++; + } + else + { + echo "\n"; + } + } + echo "\n"; + } + echo "
«", $monthName, " ", $year, "»
", $DaysShort[$ii % 7], "
"; + if ($agendaitems[$curday] <> "") + { + echo "".$dayheader.""; + } + else + { + echo $dayheader; + } + // "a".$dayheader." ".$agendaitems[$curday]."\n"; + echo " 
\n"; +} +/** + * Display the weekly view of the calendar + */ +function display_weekcalendar($agendaitems, $month, $year, $weekdaynames, $monthName) +{ + global $DaysShort,$course_path; + global $MonthsLong; + // timestamp of today + $today = time(); + $day_of_the_week = date("w", $today); + $thisday_of_the_week = date("w", $today); + // the week number of the year + $week_number = date("W", $today); + $thisweek_number = $week_number; + // if we moved to the next / previous week we have to recalculate the $today variable + if ($_GET['week']) + { + $today = mktime(0, 0, 0, 1, 1, $year); + $today = $today + (((int)$_GET['week']-1) * (7 * 24 * 60 * 60)); + $week_number = date("W", $today); + } + // calculating the start date of the week + // the date of the monday of this week is the timestamp of today minus + // number of days that have already passed this week * 24 hours * 60 minutes * 60 seconds + $current_day = date("j", $today); // Day of the month without leading zeros (1 to 31) of today + $day_of_the_week = date("w", $today); // Numeric representation of the day of the week 0 (for Sunday) through 6 (for Saturday) of today + $timestamp_first_date_of_week = $today - (($day_of_the_week -1) * 24 * 60 * 60); // timestamp of the monday of this week + $timestamp_last_date_of_week = $today + ((7 - $day_of_the_week) * 24 * 60 * 60); // timestamp of the sunday of this week + $backwardsURL = api_get_self()."?coursePath=".urlencode($course_path)."&courseCode=".Security::remove_XSS($_GET['courseCode'])."&action=view&view=week&week=". ($week_number -1); + $forewardsURL = api_get_self()."?coursePath=".urlencode($course_path)."&courseCode=".Security::remove_XSS($_GET['courseCode'])."&action=view&view=week&week=". ($week_number +1); + echo "\n"; + // The title row containing the the week information (week of the year (startdate of week - enddate of week) + echo "\n"; + echo "\n"; + echo ""; + echo "\n", "\n"; + // The second row containing the short names of the days of the week + echo "\n"; + // this is the Day of the month without leading zeros (1 to 31) of the monday of this week + $tmp_timestamp = $timestamp_first_date_of_week; + for ($ii = 1; $ii < 8; $ii ++) + { + $is_today = ($ii == $thisday_of_the_week AND (!isset($_GET['week']) OR $_GET['week']==$thisweek_number)); + echo "\t\n"; + // we 24 hours * 60 minutes * 60 seconds to the $tmp_timestamp + $array_tmp_timestamp[] = $tmp_timestamp; + $tmp_timestamp = $tmp_timestamp + (24 * 60 * 60); + } + echo "\n"; + // the table cells containing all the entries for that day + echo "\n"; + $counter = 0; + foreach ($array_tmp_timestamp as $key => $value) + { + if ($counter < 5) + { + $class = "class=\"days_week\""; + } + else + { + $class = "class=\"days_weekend\""; + } + if ($counter == $thisday_of_the_week -1 AND (!isset($_GET['week']) OR $_GET['week']==$thisweek_number)) + { + $class = "class=\"days_today\""; + } + + echo "\t\n"; + $counter ++; + } + echo "\n"; + echo "
«".get_lang("Week")." ".$week_number; + echo " (".$DaysShort['1']." ".date("j", $timestamp_first_date_of_week)." ".$MonthsLong[date("n", $timestamp_first_date_of_week) - 1]." ".date("Y", $timestamp_first_date_of_week)." - ".$DaysShort['0']." ".date("j", $timestamp_last_date_of_week)." ".$MonthsLong[date("n", $timestamp_last_date_of_week) - 1]." ".date("Y", $timestamp_last_date_of_week).')'; + echo "»
"; + if ($is_today) + { + echo ""; + } + echo $DaysShort[$ii % 7]." ".date("j", $tmp_timestamp)." ".$MonthsLong[date("n", $tmp_timestamp) - 1]; + if ($is_today) + { + echo ""; + } + echo "
"; + echo "".$agendaitems[date("j", $value)]."  "; + echo "
\n"; +} +/** + * Show the mini calender of the given month + */ +function display_daycalendar($agendaitems, $day, $month, $year, $weekdaynames, $monthName) +{ + global $DaysShort, $DaysLong, $course_path; + global $MonthsLong; + global $query; + + // timestamp of today + $today = mktime(); + $nextday = $today + (24 * 60 * 60); + $previousday = $today - (24 * 60 * 60); + // the week number of the year + $week_number = date("W", $today); + // if we moved to the next / previous day we have to recalculate the $today variable + if ($_GET['day']) + { + $today = mktime(0, 0, 0, $month, $day, $year); + $nextday = $today + (24 * 60 * 60); + $previousday = $today - (24 * 60 * 60); + $week_number = date("W", $today); + } + // calculating the start date of the week + // the date of the monday of this week is the timestamp of today minus + // number of days that have already passed this week * 24 hours * 60 minutes * 60 seconds + $current_day = date("j", $today); // Day of the month without leading zeros (1 to 31) of today + $day_of_the_week = date("w", $today); // Numeric representation of the day of the week 0 (for Sunday) through 6 (for Saturday) of today + //$timestamp_first_date_of_week=$today-(($day_of_the_week-1)*24*60*60); // timestamp of the monday of this week + //$timestamp_last_date_of_week=$today+((7-$day_of_the_week)*24*60*60); // timestamp of the sunday of this week + // we are loading all the calendar items of all the courses for today + echo "\n"; + // the forward and backwards url + $backwardsURL = api_get_self()."?coursePath=".urlencode($course_path)."&courseCode=".Security::remove_XSS($_GET['courseCode'])."&action=view&view=day&day=".date("j", $previousday)."&month=".date("n", $previousday)."&year=".date("Y", $previousday); + $forewardsURL = api_get_self()."?coursePath=".urlencode($course_path)."&courseCode=".Security::remove_XSS($_GET['courseCode'])."&action=view&view=day&day=".date("j", $nextday)."&month=".date("n", $nextday)."&year=".date("Y", $nextday); + // The title row containing the day + echo "\n", "\n", ""; + echo "\n"; + echo "\n"; + // the rows for each half an hour + for ($i = 10; $i < 48; $i ++) + { + echo "\n"; + echo "\t"; + if ($i % 2 == 0) + { + $class = "class=\"alternativeBgLight\""; + echo ("\n"); + } + else + { + $class = ""; + echo ("\n"); + } + echo "\t\n"; + echo "\n"; + } + echo "
«"; + echo $DaysLong[$day_of_the_week]." ".date("j", $today)." ".$MonthsLong[date("n", $today) - 1]." ".date("Y", $today); + echo "»
". (($i) / 2)." ".get_lang("HourShort")." 00". ((($i) / 2) - (1 / 2))." ".get_lang("HourShort")." 30\n"; + if (is_array($agendaitems[$i])) + { + foreach ($agendaitems[$i] as $key => $value) + { + echo $value; + } + } + else + { + echo $agendaitems[$i]; + } + echo "\t
\n"; +} +/** + * Show the monthcalender of the given month + */ +function get_day_agendaitems($courses_dbs, $month, $year, $day) +{ + global $_user; + global $_configuration; + + $items = array (); + + // get agenda-items for every course + //$query=api_sql_query($sql_select_courses); + foreach ($courses_dbs as $key => $array_course_info) + { + //databases of the courses + $TABLEAGENDA = Database :: get_course_table(TABLE_AGENDA, $array_course_info["db"]); + $TABLE_ITEMPROPERTY = Database :: get_course_table(TABLE_ITEM_PROPERTY, $array_course_info["db"]); + + // getting all the groups of the user for the current course + $group_memberships = GroupManager :: get_group_ids($array_course_info["db"], $_user['user_id']); + // if the user is administrator of that course we show all the agenda items + if ($array_course_info['status'] == '1') + { + //echo "course admin"; + $sqlquery = "SELECT + DISTINCT agenda.*, item_property.* + FROM ".$TABLEAGENDA." agenda, + ".$TABLE_ITEMPROPERTY." item_property + WHERE `agenda`.`id` = `item_property`.`ref` ".$show_all_current." + AND DAYOFMONTH(start_date)='".$day."' AND MONTH(start_date)='".$month."' AND YEAR(start_date)='".$year."' + AND `item_property`.`tool`='".TOOL_CALENDAR_EVENT."' + AND `item_property`.`visibility`='1' + GROUP BY agenda.id + ORDER BY start_date ".$sort; + } + // if the user is not an administrator of that course + else + { + //echo "GEEN course admin"; + if (is_array($group_memberships)) + { + $sqlquery = "SELECT + agenda.*, item_property.* + FROM ".$TABLEAGENDA." agenda, + ".$TABLE_ITEMPROPERTY." item_property + WHERE `agenda`.`id` = `item_property`.`ref` ".$show_all_current." + AND DAYOFMONTH(start_date)='".$day."' AND MONTH(start_date)='".$month."' AND YEAR(start_date)='".$year."' + AND `item_property`.`tool`='".TOOL_CALENDAR_EVENT."' + AND ( `item_property`.`to_user_id`='".$_user['user_id']."' OR `item_property`.`to_group_id` IN (0, ".implode(", ", $group_memberships).") ) + AND `item_property`.`visibility`='1' + ORDER BY start_date ".$sort; + } + else + { + $sqlquery = "SELECT + agenda.*, item_property.* + FROM ".$TABLEAGENDA." agenda, + ".$TABLE_ITEMPROPERTY." item_property + WHERE `agenda`.`id` = `item_property`.`ref` ".$show_all_current." + AND DAYOFMONTH(start_date)='".$day."' AND MONTH(start_date)='".$month."' AND YEAR(start_date)='".$year."' + AND `item_property`.`tool`='".TOOL_CALENDAR_EVENT."' + AND ( `item_property`.`to_user_id`='".$_user['user_id']."' OR `item_property`.`to_group_id`='0') + AND `item_property`.`visibility`='1' + ORDER BY start_date ".$sort; + } + } + //$sqlquery = "SELECT * FROM $agendadb WHERE DAYOFMONTH(day)='$day' AND month(day)='$month' AND year(day)='$year'"; + //echo "abc"; + //echo $sqlquery; + $result = api_sql_query($sqlquery, __FILE__, __LINE__); + //echo mysql_num_rows($result); + while ($item = mysql_fetch_array($result)) + { + // in the display_daycalendar function we use $i (ranging from 0 to 47) for each halfhour + // we want to know for each agenda item for this day to wich halfhour it must be assigned + list ($datepart, $timepart) = split(" ", $item['start_date']); + list ($year, $month, $day) = explode("-", $datepart); + list ($hours, $minutes, $seconds) = explode(":", $timepart); + + $halfhour = 2 * $hours; + if ($minutes >= '30') + { + $halfhour = $halfhour +1; + } + //$URL = $_configuration['root_web'].$mycours["dir"]."/"; + $URL = $_configuration['root_web']."main/calendar/agenda.php?cidReq=".urlencode($array_course_info["code"])."&day=$day&month=$month&year=$year#$day"; // RH //Patrick Cool: to highlight the relevant agenda item + $items[$halfhour][] .= "".$hours.":".$minutes." ".$array_course_info['visual_code']." ".$item['title']."
"; + } + } + // sorting by hour for every day + /*$agendaitems = array(); + while (list($agendaday, $tmpitems) = each($items)) + { + sort($tmpitems); + while (list($key,$val) = each($tmpitems)) + { + $agendaitems[$agendaday].=$val; + } + }*/ + $agendaitems = $items; + //print_r($agendaitems); + return $agendaitems; +} +/** + * Return agenda items of the week + */ +function get_week_agendaitems($courses_dbs, $month, $year, $week = '') +{ + global $TABLEAGENDA, $TABLE_ITEMPROPERTY; + global $_user; + global $_configuration; + + $items = array (); + // The default value of the week + if ($week == '') + { + $week_number = date("W", time()); + } + else + { + $week_number = $week; + } + $start_end = calculate_start_end_of_week($week_number, $year); + $start_filter = $start_end['start']['year']."-".$start_end['start']['month']."-".$start_end['start']['day']; + $end_filter = $start_end['end']['year']."-".$start_end['end']['month']."-".$start_end['end']['day']; + // get agenda-items for every course + foreach ($courses_dbs as $key => $array_course_info) + { + //databases of the courses + $TABLEAGENDA = Database :: get_course_table(TABLE_AGENDA, $array_course_info["db"]); + $TABLE_ITEMPROPERTY = Database :: get_course_table(TABLE_ITEM_PROPERTY, $array_course_info["db"]); + + // getting all the groups of the user for the current course + $group_memberships = GroupManager :: get_group_ids($array_course_info["db"], $_user['user_id']); + + // if the user is administrator of that course we show all the agenda items + if ($array_course_info['status'] == '1') + { + //echo "course admin"; + $sqlquery = "SELECT + DISTINCT a.*, i.* + FROM ".$TABLEAGENDA." a, + ".$TABLE_ITEMPROPERTY." i + WHERE a.id = i.ref + AND a.start_date>='".$start_filter."' AND a.start_date<='".$end_filter."' + AND i.tool='".TOOL_CALENDAR_EVENT."' + AND i.visibility='1' + GROUP BY a.id + ORDER BY a.start_date"; + } + // if the user is not an administrator of that course + else + { + //echo "GEEN course admin"; + if (is_array($group_memberships)) + { + $sqlquery = "SELECT + a.*, i.* + FROM ".$TABLEAGENDA." a, + ".$TABLE_ITEMPROPERTY." i + WHERE a.id = i.`ref` + AND a.start_date>='".$start_filter."' AND a.start_date<='".$end_filter."' + AND i.tool='".TOOL_CALENDAR_EVENT."' + AND ( i.to_user_id='".$_user['user_id']."' OR i.to_group_id IN (0, ".implode(", ", $group_memberships).") ) + AND i.visibility='1' + ORDER BY a.start_date"; + } + else + { + $sqlquery = "SELECT + a.*, i.* + FROM ".$TABLEAGENDA." a, + ".$TABLE_ITEMPROPERTY." i + WHERE a.id = i.ref + AND a.start_date>='".$start_filter."' AND a.start_date<='".$end_filter."' + AND i.tool='".TOOL_CALENDAR_EVENT."' + AND ( i.to_user_id='".$_user['user_id']."' OR i.to_group_id='0') + AND i.visibility='1' + ORDER BY a.start_date"; + } + } + //echo "
".$sqlquery."
"; + // $sqlquery = "SELECT * FROM $agendadb WHERE (DAYOFMONTH(day)>='$start_day' AND DAYOFMONTH(day)<='$end_day') + // AND (MONTH(day)>='$start_month' AND MONTH(day)<='$end_month') + // AND (YEAR(day)>='$start_year' AND YEAR(day)<='$end_year')"; + $result = api_sql_query($sqlquery, __FILE__, __LINE__); + while ($item = mysql_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=".urlencode($array_course_info["code"])."&day=$agendaday&month=$month&year=$year#$agendaday"; // RH //Patrick Cool: to highlight the relevant agenda item + $items[$agendaday][$item['start_time']] .= "$time ".$array_course_info["visual_code"]." ".$item['title']."
"; + } + } + // sorting by hour for every day + $agendaitems = array (); + while (list ($agendaday, $tmpitems) = each($items)) + { + sort($tmpitems); + while (list ($key, $val) = each($tmpitems)) + { + $agendaitems[$agendaday] .= $val; + } + } + //print_r($agendaitems); + return $agendaitems; +} +/** + * This function shows all the forms that are needed form adding /editing a new personal agenda item + * when there is no $id passed in the function we are adding a new agenda item, if there is a $id + * we are editing + * attention: we have to check that the student is editing an item that belongs to him/her + */ +function show_new_item_form($id = "") +{ + global $year, $MonthsLong; + global $tbl_personal_agenda; + global $_user; + // we construct the default time and date data (used if we are not editing a personal agenda item) + $today = getdate(); + $day = $today['mday']; + $month = $today['mon']; + $year = $today['year']; + $hours = $today['hours']; + $minutes = $today['minutes']; + // if an $id is passed to this function this means we are editing an item + // we are loading the information here (we do this after everything else + // to overwrite the default information) + if ($id <> "") + { + $sql = "SELECT * FROM ".$tbl_personal_agenda." WHERE user='".$_user['user_id']."' AND id='".$id."'"; + $result = api_sql_query($sql, __FILE__, __LINE__); + $aantal = mysql_num_rows($result); + if ($aantal <> 0) + { + $row = mysql_fetch_array($result); + $year = substr($row['date'], 0, 4); + $month = substr($row['date'], 5, 2); + $day = substr($row['date'], 8, 2); + $hours = substr($row['date'], 11, 2); + $minutes = substr($row['date'], 14, 2); + $title = $row['title']; + $text = $row['text']; + } + else + { + return false; + } + } + echo "
\n"; + echo "\n"; + echo "\t\n\t\t\n\t\n"; + echo "\t\n\t\t"; + // ********** The title field ********** \\ + echo ""; + // ********** The text field ********** \\ + echo ""; + // ********** The Submit button********** \\ + echo ""; + echo "

"; + echo ($_GET['action'] == 'edit_personal_agenda_item') ? get_lang("ModifyPersonalCalendarItem") : get_lang("AddPersonalCalendarItem"); + echo "

\n"; + echo "\n"; + echo "\t\t".get_lang("Date").": \n"; + // ********** The form containing the days (0->31) ********** \\ + echo "\n\n"; + // ********** The form containing the months (jan->dec) ********** \\ + echo "\n"; + echo "\n\n"; + // ********** The form containing the years ********** \\ + echo "\n"; + echo ""; + echo ""; + echo ""; + // ********** The form containing the hours (00->23) ********** \\ + echo "\n"; + echo get_lang("Time").": \n"; + echo ""; + // ********** The form containing the minutes ********** \\ + echo ""; + echo "
"; + echo get_lang('Title').': '; + echo "
"; + //api_disp_html_area('frm_content', $text, '300px'); + echo''; + echo "
"; + echo ''; + echo "
\n
\n"; +} +/** + * This function shows all the forms that are needed form adding a new personal agenda item + */ +function store_personal_item($day, $month, $year, $hour, $minute, $title, $content, $id = "") +{ + global $tbl_personal_agenda; + global $_user; + //constructing the date + $date = $year."-".$month."-".$day." ".$hour.":".$minute.":00"; + if ($id <> "") + { // we are updating + $sql = "UPDATE ".$tbl_personal_agenda." SET user='".$_user['user_id']."', title='".$title."', text='".$content."', date='".$date."' WHERE id='".$id."'"; + } + else + { // we are adding a new item + $sql = "INSERT INTO $tbl_personal_agenda (user, title, text, date) VALUES ('".$_user['user_id']."','$title', '$content', '$date')"; + } + $result = api_sql_query($sql, __FILE__, __LINE__); +} +/** + * This function finds all the courses of the user and returns an array containing the + * database name of the courses. + */ +function get_courses_of_user() +{ + global $TABLECOURS; + global $TABLECOURSUSER; + global $_user; + $sql_select_courses = "SELECT course.code k, course.visual_code vc, + course.title i, course.tutor_name t, course.db_name db, course.directory dir, course_rel_user.status status + FROM $TABLECOURS course, + $TABLECOURSUSER course_rel_user + WHERE course.code = course_rel_user.course_code + AND course_rel_user.user_id = '".$_user['user_id']."'"; + $result = api_sql_query($sql_select_courses); + while ($row = mysql_fetch_array($result)) + { + // we only need the database name of the course + $courses[] = array ("db" => $row['db'], "code" => $row['k'], "visual_code" => $row['vc'], "title" => $row['i'], "directory" => $row['dir'], "status" => $row['status']); + } + return $courses; +} +/** + * This function retrieves all the personal agenda items and add them to the agenda items found by the other functions. + */ +function get_personal_agenda_items($agendaitems, $day = "", $month = "", $year = "", $week = "", $type) +{ + global $tbl_personal_agenda; + global $_user; + global $_configuration; + // 1. creating the SQL statement for getting the personal agenda items in MONTH view + if ($type == "month_view" or $type == "") // we are in month view + { + $sql = "SELECT * FROM ".$tbl_personal_agenda." WHERE user='".$_user['user_id']."' and MONTH(date)='".$month."' AND YEAR(date) = '".$year."' ORDER BY date ASC"; + } + // 2. creating the SQL statement for getting the personal agenda items in WEEK view + if ($type == "week_view") // we are in week view + { + $start_end_day_of_week = calculate_start_end_of_week($week, $year); + $start_day = $start_end_day_of_week['start']['day']; + $start_month = $start_end_day_of_week['start']['month']; + $start_year = $start_end_day_of_week['start']['year']; + $end_day = $start_end_day_of_week['end']['day']; + $end_month = $start_end_day_of_week['end']['month']; + $end_year = $start_end_day_of_week['end']['year']; + // in sql statements you have to use year-month-day for date calculations + $start_filter = $start_year."-".$start_month."-".$start_day." 00:00:00"; + $end_filter = $end_year."-".$end_month."-".$end_day." 23:59:59"; + $sql = " SELECT * FROM ".$tbl_personal_agenda." WHERE user='".$_user['user_id']."' + AND date>='".$start_filter."' AND date<='".$end_filter."'"; + } + // 3. creating the SQL statement for getting the personal agenda items in DAY view + if ($type == "day_view") // we are in day view + { + // we could use mysql date() function but this is only available from 4.1 and higher + $start_filter = $year."-".$month."-".$day." 00:00:00"; + $end_filter = $year."-".$month."-".$day." 23:59:59"; + $sql = " SELECT * FROM ".$tbl_personal_agenda." WHERE user='".$_user['user_id']."' AND date>='".$start_filter."' AND date<='".$end_filter."'"; + } + //echo "day:".$day."/"; + //echo "month:".$month."/"; + //echo "year:".$year."/"; + //echo "week:".$week."/"; + //echo $type."

"; + //echo "

".$sql."
"; + $result = api_sql_query($sql, __FILE__, __LINE__); + while ($item = mysql_fetch_array($result)) + { + // we break the date field in the database into a date and a time part + $agenda_db_date = explode(" ", $item[date]); + $date = $agenda_db_date[0]; + $time = $agenda_db_date[1]; + // we divide the date part into a day, a month and a year + $agendadate = explode("-", $date); + $year = intval($agendadate[0]); + $month = intval($agendadate[1]); + $day = intval($agendadate[2]); + // we divide the time part into hour, minutes, seconds + $agendatime = explode(":", $time); + $hour = $agendatime[0]; + $minute = $agendatime[1]; + $second = $agendatime[2]; + // 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'])."&day=$day&month=$month&year=$year#$day"; // RH //Patrick Cool: to highlight the relevant agenda item + $course_link = "".$item['course'].""; + } + else + { + $course_link = ""; + } + // Creating the array that will be returned. If we have week or month view we have an array with the date as the key + // if we have a day_view we use a half hour as index => key 33 = 16h30 + if ($type !== "day_view") // This is the array construction for the WEEK or MONTH view + { + $agendaitems[$day] .= "
$hour:$minute $course_link ".$item['title']."
"; + } + else // this is the array construction for the DAY view + { + $halfhour = 2 * $agendatime['0']; + if ($agendatime['1'] >= '30') + { + $halfhour = $halfhour +1; + } + $agendaitems[$halfhour] .= "
$hour:$minute $course_link ".$item['title']."
"; + } + } + //print_r($agendaitems); + return $agendaitems; +} +/** + * This function retrieves all the personal agenda items and add them to the agenda items found by the other functions. + * @param int The agenda item ID + * @return array The results of the database query, or null if not found + */ +function get_personal_agenda_item($id) +{ + $tbl_personal_agenda = Database :: get_user_personal_table(TABLE_PERSONAL_AGENDA); + $id = Database::escape_string($id); + $sql = " SELECT * FROM ".$tbl_personal_agenda." WHERE id=".$id; + $result = api_sql_query($sql, __FILE__, __LINE__); + if(Database::num_rows($result)==1) + { + $item = Database::fetch_array($result); + } + else + { + $item = null; + } + return $item; +} +/** + * This function retrieves all the personal agenda items of the user and shows + * these items in one list (ordered by date and grouped by month (the month_bar) + */ +function show_personal_agenda() +{ + global $tbl_personal_agenda; + global $MonthsLong, $charset; + global $_user; + // The SQL statement that retrieves all the personal agenda items of this user + $sql = "SELECT * FROM ".$tbl_personal_agenda." WHERE user='".$_user['user_id']."' ORDER BY date DESC"; + $result = api_sql_query($sql, __FILE__, __LINE__); + // variable initialisation + $month_bar = ""; + // starting the table output + echo "\n"; + // setting the default day, month and year + if (!$_GET['day'] AND !$_GET['month'] AND !$_GET['year']) + { + $today = getdate(); + $year = $today['year']; + $month = $today['mon']; + $day = $today['mday']; + } + $export_icon = api_get_path('WEB_IMG_PATH').'export.png'; + if (Database::num_rows($result) > 0) + { + while ($myrow = Database::fetch_array($result)) + { + /*-------------------------------------------------- + display: the month bar + --------------------------------------------------*/ + if ($month_bar != date("m", strtotime($myrow["date"])).date("Y", strtotime($myrow["date"]))) + { + $month_bar = date("m", strtotime($myrow["date"])).date("Y", strtotime($myrow["date"])); + echo "\n"; + } + // highlight: if a date in the small calendar is clicked we highlight the relevant items + $db_date = (int) date("d", strtotime($myrow["date"])).date("n", strtotime($myrow["date"])).date("Y", strtotime($myrow["date"])); + if ($_GET["day"].$_GET["month"].$_GET["year"] <> $db_date) + { + $style = "data"; + $text_style = "text"; + } + else + { + $style = "datanow"; + $text_style = "text"; + } + /*-------------------------------------------------- + display: date and time + --------------------------------------------------*/ + echo "\t\n\t\t"; + echo '"; + echo "\n\t"; + echo ""; + /*-------------------------------------------------- + display: the title + --------------------------------------------------*/ + echo ""; + echo '\n\t"; + echo "\n"; + /*-------------------------------------------------- + display: the content + --------------------------------------------------*/ + $content = $myrow['text']; + $content = make_clickable($content); + $content = text_filter($content); + echo "\t\n\t\t"; + /*-------------------------------------------------- + display: the edit / delete icons + --------------------------------------------------*/ + echo "\t\n\t\t"; + } + } + else + { + echo ''; + } + echo "
".$MonthsLong[date("n", strtotime($myrow["date"])) - 1]." ".date("Y", strtotime($myrow["date"]))."
'; + // adding an internal anchor + echo ""; + echo date("d", strtotime($myrow["date"]))." ".$MonthsLong[date("n", strtotime($myrow["date"])) - 1]." ".date("Y", strtotime($myrow["date"]))." "; + echo ucfirst(strftime(get_lang("timeNoSecFormat"), strtotime($myrow["date"]))); + echo ""; + echo ''.get_lang('ExportiCal').''; + echo "\n\t\t
'; + echo $myrow['title']; + echo "\n\t\t
"; + echo $content; + echo "
"; + echo "\"".get_lang('Edit')."\""; + echo "\"".get_lang('Delete')."\""; + echo "
'.get_lang('NoAgendaItems').'
\n"; +} +/** + * This function deletes a personal agenda item + * There is an additional check to make sure that one cannot delete an item that + * does not belong to him/her + */ +function delete_personal_agenda($id) +{ + global $tbl_personal_agenda; + global $_user; + if ($id <> '') + { + $sql = "SELECT * FROM ".$tbl_personal_agenda." WHERE user='".$_user['user_id']."' AND id='".$id."'"; + $result = api_sql_query($sql, __FILE__, __LINE__); + $aantal = mysql_num_rows($result); + if ($aantal <> 0) + { + $sql = "DELETE FROM ".$tbl_personal_agenda." WHERE user='".$_user['user_id']."' AND id='".$id."'"; + $result = api_sql_query($sql, __FILE__, __LINE__); + } + } +} +/** + * This function calculates the startdate of the week (monday) + * and the enddate of the week (sunday) + * and returns it as an array + */ +function calculate_start_end_of_week($week_number, $year) +{ + // determine the start and end date + // step 1: we calculate a timestamp for a day in this week + $random_day_in_week = mktime(0, 0, 0, 1, 1, $year) + ($week_number-1) * (7 * 24 * 60 * 60); // we calculate a random day in this week + // step 2: we which day this is (0=sunday, 1=monday, ...) + $number_day_in_week = date('w', $random_day_in_week); + // step 3: we calculate the timestamp of the monday of the week we are in + $start_timestamp = $random_day_in_week - (($number_day_in_week -1) * 24 * 60 * 60); + // step 4: we calculate the timestamp of the sunday of the week we are in + $end_timestamp = $random_day_in_week + ((7 - $number_day_in_week +1) * 24 * 60 * 60) - 3600; + // step 5: calculating the start_day, end_day, start_month, end_month, start_year, end_year + $start_day = date('j', $start_timestamp); + $start_month = date('n', $start_timestamp); + $start_year = date('Y', $start_timestamp); + $end_day = date('j', $end_timestamp); + $end_month = date('n', $end_timestamp); + $end_year = date('Y', $end_timestamp); + $start_end_array['start']['day'] = $start_day; + $start_end_array['start']['month'] = $start_month; + $start_end_array['start']['year'] = $start_year; + $start_end_array['end']['day'] = $end_day; + $start_end_array['end']['month'] = $end_month; + $start_end_array['end']['year'] = $end_year; + return $start_end_array; +} +?> \ No newline at end of file diff --git a/main/calendar/myagenda.php b/main/calendar/myagenda.php index decb26131f..6166feef23 100644 --- a/main/calendar/myagenda.php +++ b/main/calendar/myagenda.php @@ -67,7 +67,8 @@ $cidReset = true; require ('../inc/global.inc.php'); $this_section = SECTION_MYAGENDA; api_block_anonymous_users(); -require (api_get_path(LIBRARY_PATH).'groupmanager.lib.php'); +require_once(api_get_path(LIBRARY_PATH).'groupmanager.lib.php'); +require_once('myagenda.inc.php'); // setting the name of the tool $nameTools = get_lang('MyAgenda'); @@ -100,31 +101,6 @@ $DaysLong = array (get_lang("SundayLong"), get_lang("MondayLong"), get_lang("Tue // Defining the months of the year to allow translation of the months $MonthsLong = array (get_lang("JanuaryLong"), get_lang("FebruaryLong"), get_lang("MarchLong"), get_lang("AprilLong"), get_lang("MayLong"), get_lang("JuneLong"), get_lang("JulyLong"), get_lang("AugustLong"), get_lang("SeptemberLong"), get_lang("OctoberLong"), get_lang("NovemberLong"), get_lang("DecemberLong")); -/* ============================================================================== - SANITY CHECK -============================================================================== */ -// You can delete this if you have manually added the new database and tables -// this piece of code was added to avoid having to explain to non sys-admin -// what has to be done in order to get this tool working -if (get_setting("allow_personal_agenda") == "true") -{ - // I use a separate database for storing all the information of user driven tools - // as the Personal Agenda tool has the potential to create a large database. - // If you do not want a separate database for the personal agenda tool you can add the table to - // the main dokeos database by changing $DATABASE_USER_TOOLS above to $_configuration['main_database'] - $sql_create_database = "CREATE DATABASE IF NOT EXISTS `$DATABASE_USER_TOOLS`"; - $result = api_sql_query($sql_create_database); - $sql_create_table = "CREATE TABLE IF NOT EXISTS $tbl_personal_agenda ( - `id` int(11) NOT NULL auto_increment, - `user` int(11), - `title` text, - `text` text, - `date` datetime default NULL, - `course` varchar(255), - UNIQUE KEY `id` (`id`)) - TYPE=MyISAM AUTO_INCREMENT=1"; - $result = api_sql_query($sql_create_table); -} /*============================================================================== TREATING THE URL PARAMETERS 1. The default values @@ -237,7 +213,7 @@ if (isset ($_user['user_id'])) $agendaitems = get_agendaitems($courses_dbs, $month, $year); if (get_setting('allow_personal_agenda') == 'true') { - $agendaitems = get_personal_agendaitems($agendaitems, $day, $month, $year, $week, "month_view"); + $agendaitems = get_personal_agenda_items($agendaitems, $day, $month, $year, $week, "month_view"); } display_minimonthcalendar($agendaitems, $month, $year, $monthName); echo "\n