';
echo '| '.Display::return_icon('action_prev.png',get_lang('Previous')).' | ';
echo '
'.$monthName." ".$year.' | ';
echo ''.Display::return_icon('action_next.png',get_lang('Next')).' | ';
@@ -190,7 +187,7 @@ function display_mymonthcalendar($agendaitems, $month, $year, $weekdaynames=arra
$dayheader = "$curday
";
$class = "class=\"days_today\" style=\"width:10%;\"";
}
- echo "", "".$dayheader;
+ echo " | ".$dayheader;
if (!empty($agendaitems[$curday])) {
echo "".$agendaitems[$curday]."";
}
@@ -275,7 +272,6 @@ function display_myminimonthcalendar($agendaitems, $month, $year, $monthName) {
*/
function show_new_personal_item_form($id = "") {
global $year, $MonthsLong;
- global $_user;
$tbl_personal_agenda = Database :: get_user_personal_table(TABLE_PERSONAL_AGENDA);
@@ -297,7 +293,7 @@ function show_new_personal_item_form($id = "") {
}
if ($id != "") {
- $sql = "SELECT date, title, text FROM ".$tbl_personal_agenda." WHERE user='".intval($_user['user_id'])."' AND id='".$id."'";
+ $sql = "SELECT date, title, text FROM ".$tbl_personal_agenda." WHERE user='".intval(api_get_user_id())."' AND id='".$id."'";
$result = Database::query($sql);
$aantal = Database::num_rows($result);
if ($aantal != 0) {
@@ -473,7 +469,6 @@ function show_new_personal_item_form($id = "") {
* @param int is the id this param is optional, but is necessary if the item require be edited
*/
function store_personal_item($day, $month, $year, $hour, $minute, $title, $content, $id = "") {
- global $_user;
$tbl_personal_agenda = Database :: get_user_personal_table(TABLE_PERSONAL_AGENDA);
@@ -490,11 +485,11 @@ function store_personal_item($day, $month, $year, $hour, $minute, $title, $conte
if ($id != "")
{ // we are updating
- $sql = "UPDATE ".$tbl_personal_agenda." SET user='".$_user['user_id']."', title='".$title."', text='".$content."', date='".$date."' WHERE id='".$id."'";
+ $sql = "UPDATE ".$tbl_personal_agenda." SET user='".api_get_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')";
+ $sql = "INSERT INTO $tbl_personal_agenda (user, title, text, date) VALUES ('".api_get_user_id()."','$title', '$content', '$date')";
}
$result = Database::query($sql);
}
@@ -502,11 +497,10 @@ function store_personal_item($day, $month, $year, $hour, $minute, $title, $conte
* This function finds all the courses (also those of sessions) of the user and returns an array containing the
* database name of the courses.
* Xritten by Noel Dieschburg
+ * @todo remove this function and use the CourseManager get_courses_list_by_user_id
*/
function get_all_courses_of_user() {
- global $_user;
-
$TABLECOURS = Database :: get_main_table(TABLE_MAIN_COURSE);
$TABLECOURSUSER = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
$tbl_session_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE);
@@ -515,19 +509,18 @@ function get_all_courses_of_user() {
$sql_select_courses = "SELECT c.code k, c.visual_code vc, c.title i, c.tutor_name t,
c.db_name db, c.directory dir, '5' as status
FROM $TABLECOURS c, $tbl_session_course_user srcu
- WHERE srcu.id_user='".$_user['user_id']."'
+ WHERE srcu.id_user='".api_get_user_id()."'
AND c.code=srcu.course_code
UNION
SELECT c.code k, c.visual_code vc, c.title i, c.tutor_name t,
c.db_name db, c.directory dir, cru.status status
FROM $TABLECOURS c, $TABLECOURSUSER cru
- WHERE cru.user_id='".$_user['user_id']."'
+ WHERE cru.user_id='".api_get_user_id()."'
AND c.code=cru.course_code";
$result = Database::query($sql_select_courses);
- while ($row = Database::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']);
+ while ($row = Database::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;
}
@@ -540,8 +533,6 @@ function get_all_courses_of_user() {
* database name of the courses.
*/
function get_courses_of_user() {
- global $_user;
-
$TABLECOURS = Database :: get_main_table(TABLE_MAIN_COURSE);
$TABLECOURSUSER = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
$sql_select_courses = "SELECT course.code k, course.visual_code vc,
@@ -549,7 +540,7 @@ function get_courses_of_user() {
FROM $TABLECOURS course,
$TABLECOURSUSER course_rel_user
WHERE course.code = course_rel_user.course_code
- AND course_rel_user.user_id = '".$_user['user_id']."'";
+ AND course_rel_user.user_id = '".api_get_user_id()."'";
$result = Database::query($sql_select_courses);
while ($row = Database::fetch_array($result))
{
@@ -562,14 +553,13 @@ function get_courses_of_user() {
* 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 $_user;
global $_configuration;
$tbl_personal_agenda = Database :: get_user_personal_table(TABLE_PERSONAL_AGENDA);
// 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";
+ $sql = "SELECT * FROM ".$tbl_personal_agenda." WHERE user='".api_get_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
// we are in week view
@@ -584,7 +574,7 @@ function get_personal_agenda_items($agendaitems, $day = "", $month = "", $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']."'
+ $sql = " SELECT * FROM ".$tbl_personal_agenda." WHERE user='".api_get_user_id()."'
AND date>='".$start_filter."' AND date<='".$end_filter."'";
}
// 3. creating the SQL statement for getting the personal agenda items in DAY view
@@ -593,7 +583,7 @@ function get_personal_agenda_items($agendaitems, $day = "", $month = "", $year =
// 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."'";
+ $sql = " SELECT * FROM ".$tbl_personal_agenda." WHERE user='".api_get_user_id()."' AND date>='".$start_filter."' AND date<='".$end_filter."'";
}
//echo "day:".$day."/";
//echo "month:".$month."/";
@@ -654,7 +644,6 @@ function get_personal_agenda_items($agendaitems, $day = "", $month = "", $year =
}
}
- //print_r($agendaitems);
return $agendaitems;
}
/**
@@ -855,8 +844,6 @@ function show_simple_personal_agenda($user_id) {
* does not belong to him/her
*/
function delete_personal_agenda($id) {
- global $_user;
-
$tbl_personal_agenda = Database :: get_user_personal_table(TABLE_PERSONAL_AGENDA);
if ($id != strval(intval($id))) {
@@ -865,12 +852,12 @@ function delete_personal_agenda($id) {
if ($id <> '')
{
- $sql = "SELECT * FROM ".$tbl_personal_agenda." WHERE user='".$_user['user_id']."' AND id='".$id."'";
+ $sql = "SELECT * FROM ".$tbl_personal_agenda." WHERE user='".api_get_user_id()."' AND id='".$id."'";
$result = Database::query($sql);
$aantal = Database::num_rows($result);
if ($aantal <> 0)
{
- $sql = "DELETE FROM ".$tbl_personal_agenda." WHERE user='".$_user['user_id']."' AND id='".$id."'";
+ $sql = "DELETE FROM ".$tbl_personal_agenda." WHERE user='".api_get_user_id()."' AND id='".$id."'";
$result = Database::query($sql);
}
}
diff --git a/main/calendar/myagenda.php b/main/calendar/myagenda.php
index 37b585b36b..f85c7ffc38 100755
--- a/main/calendar/myagenda.php
+++ b/main/calendar/myagenda.php
@@ -115,12 +115,15 @@ if (!empty($_GET['action']) && $_GET['action'] == "delete" AND $_GET['id']) {
}
// OUTPUT
-if (isset ($_user['user_id'])) {
+if (isset($_user['user_id'])) {
// getting all the courses that this user is subscribed to
- $courses_dbs = get_all_courses_of_user();
- if (!is_array($courses_dbs)) {
+ //$courses_dbs = get_all_courses_of_user();
+ $my_course_list = CourseManager::get_courses_list_by_user_id(api_get_user_id(), true);
+
+ print_r($course_list);
+ if (!is_array($my_course_list)) {
// this is for the special case if the user has no courses (otherwise you get an error)
- $courses_dbs = array ();
+ $my_course_list = array();
}
// setting and/or getting the year, month, day, week
$today = getdate();
@@ -156,8 +159,7 @@ if (isset ($_user['user_id'])) {
}
echo "";
-
- $agendaitems = get_myagendaitems($courses_dbs, $month, $year);
+ $agendaitems = get_myagendaitems($my_course_list, $month, $year);
$agendaitems = get_global_agenda_items($agendaitems, $day, $month, $year, $week, "month_view");
if (api_get_setting('allow_personal_agenda') == 'true') {
$agendaitems = get_personal_agenda_items($agendaitems, $day, $month, $year, $week, "month_view");
@@ -178,7 +180,7 @@ if (isset ($_user['user_id'])) {
switch ($process) {
case 'month_view' :
- $agendaitems = get_myagendaitems($courses_dbs, $month, $year);
+ $agendaitems = get_myagendaitems($my_course_list, $month, $year);
$agendaitems = get_global_agenda_items($agendaitems, $day, $month, $year, $week, "month_view");
if (api_get_setting("allow_personal_agenda") == "true") {
@@ -187,7 +189,7 @@ if (isset ($_user['user_id'])) {
display_mymonthcalendar($agendaitems, $month, $year, array(), $monthName);
break;
case 'week_view' :
- $agendaitems = get_week_agendaitems($courses_dbs, $month, $year, $week);
+ $agendaitems = get_week_agendaitems($my_course_list, $month, $year, $week);
$agendaitems = get_global_agenda_items($agendaitems, $day, $month, $year, $week, "week_view");
if (api_get_setting("allow_personal_agenda") == "true") {
$agendaitems = get_personal_agenda_items($agendaitems, $day, $month, $year, $week, "week_view");
@@ -195,7 +197,7 @@ if (isset ($_user['user_id'])) {
display_weekcalendar($agendaitems, $month, $year, array(), $monthName);
break;
case 'day_view' :
- $agendaitems = get_day_agendaitems($courses_dbs, $month, $year, $day);
+ $agendaitems = get_day_agendaitems($my_course_list, $month, $year, $day);
$agendaitems = get_global_agenda_items($agendaitems, $day, $month, $year, $week, "day_view");
if (api_get_setting('allow_personal_agenda') == 'true') {
$agendaitems = get_personal_agenda_items($agendaitems, $day, $month, $year, $week, "day_view");
diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php
index 8f51fca9a6..8433e7dfee 100755
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@@ -220,7 +220,7 @@ class CourseManager {
*/
public static function get_user_in_course_status($user_id, $course_code) {
$result = Database::fetch_array(Database::query(
- "SELECT * FROM ".Database::get_main_table(TABLE_MAIN_COURSE_USER)."
+ "SELECT status FROM ".Database::get_main_table(TABLE_MAIN_COURSE_USER)."
WHERE course_code = '".Database::escape_string($course_code)."' AND user_id = ".Database::escape_string($user_id))
);
return $result['status'];
|