| @@ 1790-1797 (lines=8) @@ | ||
| 1787 | // the user is not member of any group |
|
| 1788 | // this is an identified user => show the general announcements AND his personal announcements |
|
| 1789 | if ($userId) { |
|
| 1790 | if ((api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) { |
|
| 1791 | $cond_user_id = " AND ( |
|
| 1792 | ip.lastedit_user_id = '".$userId."' OR |
|
| 1793 | ( ip.to_user_id='".$userId."' OR ip.to_group_id='0' OR ip.to_group_id IS NULL) |
|
| 1794 | ) "; |
|
| 1795 | } else { |
|
| 1796 | $cond_user_id = " AND ( ip.to_user_id='".$userId."' OR ip.to_group_id='0' OR ip.to_group_id IS NULL) "; |
|
| 1797 | } |
|
| 1798 | $sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id |
|
| 1799 | FROM $tbl_announcement announcement |
|
| 1800 | INNER JOIN $tbl_item_property ip |
|
| @@ 145-152 (lines=8) @@ | ||
| 142 | // the user is not member of any group |
|
| 143 | // this is an identified user => show the general announcements AND his personal announcements |
|
| 144 | if ($user_id) { |
|
| 145 | if ((api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) { |
|
| 146 | $cond_user_id = " AND ( |
|
| 147 | ip.lastedit_user_id = '".api_get_user_id()."' OR |
|
| 148 | ( ip.to_user_id='".$user_id."' OR ip.to_group_id='0' OR ip.to_group_id IS NULL) |
|
| 149 | ) "; |
|
| 150 | } else { |
|
| 151 | $cond_user_id = " AND ( ip.to_user_id='".$user_id."' OR ip.to_group_id='0' OR ip.to_group_id IS NULL) "; |
|
| 152 | } |
|
| 153 | ||
| 154 | $sql = "SELECT |
|
| 155 | announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id |
|