forked from atutor/ATutor
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Issue-4953: Fixed the issue that "Things Current" displays some activ…
…ities from the courses that the login user is not enrolled in.
- Loading branch information
Showing
2 changed files
with
58 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,56 +1,56 @@ | ||
| <?php | ||
| /***********************************************************************/ | ||
| /* ATutor */ | ||
| /***********************************************************************/ | ||
| /* Copyright (c) 2002-2010 */ | ||
| /* Inclusive Design Institute */ | ||
| /* http://atutor.ca */ | ||
| /* */ | ||
| /* 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 the Free Software Foundation. */ | ||
| /***********************************************************************/ | ||
| /****************************************************************************/ | ||
| /* ATutor */ | ||
| /****************************************************************************/ | ||
| /* Copyright (c) 2002-2010 */ | ||
| /* Inclusive Design Institute */ | ||
| /* http://atutor.ca */ | ||
| /* */ | ||
| /* 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 the Free Software Foundation. */ | ||
| /****************************************************************************/ | ||
| // $Id$ | ||
| /* | ||
| * Get the latest updates of this module | ||
| * @return list of news, [timestamp]=> | ||
| */ | ||
| function forums_news() { | ||
| require_once(AT_INCLUDE_PATH.'../mods/_standard/forums/lib/forums.inc.php'); | ||
| global $db, $enrolled_courses, $system_courses; | ||
| $news = array(); | ||
| require_once(AT_INCLUDE_PATH.'../mods/_standard/forums/lib/forums.inc.php'); | ||
| global $db, $enrolled_courses, $system_courses; | ||
| $news = array(); | ||
|
|
||
| if ($enrolled_courses == ''){ | ||
| return $news; | ||
| } | ||
| if ($enrolled_courses == ''){ | ||
| return $news; | ||
| } | ||
|
|
||
| $sql = 'SELECT E.approved, E.last_cid, C.* FROM '.TABLE_PREFIX.'course_enrollment E, '.TABLE_PREFIX.'courses C WHERE E.member_id=1 AND E.course_id=C.course_id ORDER BY C.title'; | ||
| $result = mysql_query($sql, $db); | ||
| if ($result) { | ||
| while($row = mysql_fetch_assoc($result)){ | ||
| $all_forums = get_forums($row['course_id']); | ||
| if (is_array($all_forums)){ | ||
| foreach($all_forums as $forums){ | ||
| if (is_array($forums)){ | ||
| $sql = 'SELECT E.approved, E.last_cid, C.* FROM '.TABLE_PREFIX.'course_enrollment E, '.TABLE_PREFIX.'courses C WHERE C.courses in '. $enrolled_courses . ' AND E.member_id=1 AND E.course_id=C.course_id ORDER BY C.title'; | ||
| $result = mysql_query($sql, $db); | ||
| if ($result) { | ||
| while($row = mysql_fetch_assoc($result)){ | ||
| $all_forums = get_forums($row['course_id']); | ||
| if (is_array($all_forums)){ | ||
| foreach($all_forums as $forums){ | ||
| if (is_array($forums)){ | ||
|
|
||
| foreach ($forums as $forum_obj){ | ||
| $forum_obj['course_id'] = $row['course_id']; | ||
| $link_title = $forum_obj['title']; | ||
| $news[] = array('time'=>$forum_obj['last_post'], | ||
| 'object'=>$forum_obj, | ||
| 'alt'=>_AT('forum'), | ||
| 'thumb'=>'images/pin.png', | ||
| 'course'=>$system_courses[$row['course_id']]['title'], | ||
| 'link'=>'<a href="bounce.php?course='.$row['course_id'].SEP.'p='.urlencode('mods/_standard/forums/forum/index.php?fid='.$forum_obj['forum_id']).'"'. | ||
| (strlen($link_title) > SUBLINK_TEXT_LEN ? ' title="'.AT_print($link_title, 'forums.title').'"' : '') .'>'. | ||
| AT_print(validate_length($link_title, SUBLINK_TEXT_LEN, VALIDATE_LENGTH_FOR_DISPLAY), 'forums.title') .'</a>'); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| return $news; | ||
| foreach ($forums as $forum_obj){ | ||
| $forum_obj['course_id'] = $row['course_id']; | ||
| $link_title = $forum_obj['title']; | ||
| $news[] = array('time'=>$forum_obj['last_post'], | ||
| 'object'=>$forum_obj, | ||
| 'alt'=>_AT('forum'), | ||
| 'thumb'=>'images/pin.png', | ||
| 'course'=>$system_courses[$row['course_id']]['title'], | ||
| 'link'=>'<a href="bounce.php?course='.$row['course_id'].SEP.'p='.urlencode('mods/_standard/forums/forum/index.php?fid='.$forum_obj['forum_id']).'"'. | ||
| (strlen($link_title) > SUBLINK_TEXT_LEN ? ' title="'.AT_print($link_title, 'forums.title').'"' : '') .'>'. | ||
| AT_print(validate_length($link_title, SUBLINK_TEXT_LEN, VALIDATE_LENGTH_FOR_DISPLAY), 'forums.title') .'</a>'); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| return $news; | ||
| } | ||
|
|
||
| ?> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters