|
@@ -216,8 +216,8 @@ discard block |
|
|
block discarded – undo |
|
216
|
216
|
announcement.id = '$announcement_id' AND |
|
217
|
217
|
toolitemproperties.tool='announcement' AND |
|
218
|
218
|
( |
|
219
|
|
- toolitemproperties.to_user_id='" . api_get_user_id() . "' OR |
|
220
|
|
- toolitemproperties.to_group_id IN ('0', '" . implode("', '", $group_list) . "') OR |
|
|
219
|
+ toolitemproperties.to_user_id='".api_get_user_id()."' OR |
|
|
220
|
+ toolitemproperties.to_group_id IN ('0', '" . implode("', '", $group_list)."') OR |
|
221
|
221
|
toolitemproperties.to_group_id IS NULL |
|
222
|
222
|
) AND |
|
223
|
223
|
toolitemproperties.visibility='1' AND |
|
@@ -246,13 +246,13 @@ discard block |
|
|
block discarded – undo |
|
246
|
246
|
$title = $result['title']; |
|
247
|
247
|
$content = $result['content']; |
|
248
|
248
|
$html .= "<table height=\"100\" width=\"100%\" cellpadding=\"5\" cellspacing=\"0\" class=\"data_table\">"; |
|
249
|
|
- $html .= "<tr><td><h2>" . $title . "</h2></td></tr>"; |
|
|
249
|
+ $html .= "<tr><td><h2>".$title."</h2></td></tr>"; |
|
250
|
250
|
|
|
251
|
251
|
if (api_is_allowed_to_edit(false, true) || |
|
252
|
252
|
(api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous()) |
|
253
|
253
|
) { |
|
254
|
|
- $modify_icons = "<a href=\"" . api_get_self() . "?" . api_get_cidreq() . "&action=modify&id=" . $announcement_id . "\">" . |
|
255
|
|
- Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL) . "</a>"; |
|
|
254
|
+ $modify_icons = "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=modify&id=".$announcement_id."\">". |
|
|
255
|
+ Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL)."</a>"; |
|
256
|
256
|
if ($result['visibility'] == 1) { |
|
257
|
257
|
$image_visibility = "visible"; |
|
258
|
258
|
$alt_visibility = get_lang('Hide'); |
|
@@ -262,12 +262,12 @@ discard block |
|
|
block discarded – undo |
|
262
|
262
|
} |
|
263
|
263
|
global $stok; |
|
264
|
264
|
|
|
265
|
|
- $modify_icons .= "<a href=\"" . api_get_self() . "?" . api_get_cidreq() . "&origin=" . (!empty($_GET['origin']) ? Security::remove_XSS($_GET['origin']) : '') . "&action=showhide&id=" . $announcement_id . "&sec_token=" . $stok . "\">" . |
|
266
|
|
- Display::return_icon($image_visibility . '.png', $alt_visibility, '', ICON_SIZE_SMALL) . "</a>"; |
|
|
265
|
+ $modify_icons .= "<a href=\"".api_get_self()."?".api_get_cidreq()."&origin=".(!empty($_GET['origin']) ? Security::remove_XSS($_GET['origin']) : '')."&action=showhide&id=".$announcement_id."&sec_token=".$stok."\">". |
|
|
266
|
+ Display::return_icon($image_visibility.'.png', $alt_visibility, '', ICON_SIZE_SMALL)."</a>"; |
|
267
|
267
|
|
|
268
|
268
|
if (api_is_allowed_to_edit(false, true)) { |
|
269
|
|
- $modify_icons .= "<a href=\"" . api_get_self() . "?" . api_get_cidreq() . "&action=delete&id=" . $announcement_id . "&sec_token=" . $stok . "\" onclick=\"javascript:if(!confirm('" . addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)) . "')) return false;\">" . |
|
270
|
|
- Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL) . |
|
|
269
|
+ $modify_icons .= "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=delete&id=".$announcement_id."&sec_token=".$stok."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset))."')) return false;\">". |
|
|
270
|
+ Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL). |
|
271
|
271
|
"</a>"; |
|
272
|
272
|
} |
|
273
|
273
|
$html .= "<tr><th style='text-align:right'>$modify_icons</th></tr>"; |
|
@@ -276,7 +276,7 @@ discard block |
|
|
block discarded – undo |
|
276
|
276
|
$content = self::parse_content($result['to_user_id'], $content, api_get_course_id(), api_get_session_id()); |
|
277
|
277
|
|
|
278
|
278
|
$html .= "<tr><td>$content</td></tr>"; |
|
279
|
|
- $html .= "<tr><td class=\"announcements_datum\">" . get_lang('LastUpdateDate') . " : " . api_convert_and_format_date($result['insert_date'], DATE_TIME_FORMAT_LONG) . "</td></tr>"; |
|
|
279
|
+ $html .= "<tr><td class=\"announcements_datum\">".get_lang('LastUpdateDate')." : ".api_convert_and_format_date($result['insert_date'], DATE_TIME_FORMAT_LONG)."</td></tr>"; |
|
280
|
280
|
|
|
281
|
281
|
// User or group icon |
|
282
|
282
|
$sent_to_icon = ''; |
|
@@ -288,7 +288,7 @@ discard block |
|
|
block discarded – undo |
|
288
|
288
|
$sent_to_form = self::sent_to_form($sent_to); |
|
289
|
289
|
$html .= Display::tag( |
|
290
|
290
|
'td', |
|
291
|
|
- get_lang('SentTo') . ' : ' . $sent_to_form, |
|
|
291
|
+ get_lang('SentTo').' : '.$sent_to_form, |
|
292
|
292
|
array('class' => 'announcements_datum') |
|
293
|
293
|
); |
|
294
|
294
|
} |
|
@@ -298,15 +298,15 @@ discard block |
|
|
block discarded – undo |
|
298
|
298
|
$html .= "<tr><td>"; |
|
299
|
299
|
$realname = $attachment_list['path']; |
|
300
|
300
|
$user_filename = $attachment_list['filename']; |
|
301
|
|
- $full_file_name = 'download.php?'.api_get_cidreq().'&file=' . $realname; |
|
|
301
|
+ $full_file_name = 'download.php?'.api_get_cidreq().'&file='.$realname; |
|
302
|
302
|
$html .= '<br/>'; |
|
303
|
303
|
$html .= Display::return_icon('attachment.gif', get_lang('Attachment')); |
|
304
|
|
- $html .= '<a href="' . $full_file_name . ' "> ' . $user_filename . ' </a>'; |
|
305
|
|
- $html .= ' - <span class="forum_attach_comment" >' . $attachment_list['comment'] . '</span>'; |
|
|
304
|
+ $html .= '<a href="'.$full_file_name.' "> '.$user_filename.' </a>'; |
|
|
305
|
+ $html .= ' - <span class="forum_attach_comment" >'.$attachment_list['comment'].'</span>'; |
|
306
|
306
|
if (api_is_allowed_to_edit(false, true)) { |
|
307
|
307
|
$html .= Display::url( |
|
308
|
308
|
Display::return_icon('delete.png', get_lang('Delete'), '', 16), |
|
309
|
|
- api_get_self() . "?" . api_get_cidreq() . "&action=delete_attachment&id_attach=" . $attachment_list['id'] . "&sec_token=" . $stok |
|
|
309
|
+ api_get_self()."?".api_get_cidreq()."&action=delete_attachment&id_attach=".$attachment_list['id']."&sec_token=".$stok |
|
310
|
310
|
); |
|
311
|
311
|
} |
|
312
|
312
|
$html .= '</td></tr>'; |
|
@@ -334,7 +334,7 @@ discard block |
|
|
block discarded – undo |
|
334
|
334
|
$order = 0; |
|
335
|
335
|
if (Database::num_rows($res_max)) { |
|
336
|
336
|
$row_max = Database::fetch_array($res_max); |
|
337
|
|
- $order = intval($row_max[0])+1; |
|
|
337
|
+ $order = intval($row_max[0]) + 1; |
|
338
|
338
|
} |
|
339
|
339
|
|
|
340
|
340
|
return $order; |
|
@@ -754,8 +754,8 @@ discard block |
|
|
block discarded – undo |
|
754
|
754
|
$result = array(); |
|
755
|
755
|
if ($num_rows > 0) { |
|
756
|
756
|
while ($myrow = Database::fetch_array($rs)) { |
|
757
|
|
- $content.= '<strong>' . $myrow['title'] . '</strong><br /><br />'; |
|
758
|
|
- $content.= $myrow['content']; |
|
|
757
|
+ $content .= '<strong>'.$myrow['title'].'</strong><br /><br />'; |
|
|
758
|
+ $content .= $myrow['content']; |
|
759
|
759
|
$i++; |
|
760
|
760
|
} |
|
761
|
761
|
$result['content'] = $content; |
|
@@ -786,7 +786,7 @@ discard block |
|
|
block discarded – undo |
|
786
|
786
|
echo "<table id=\"recipient_list\" >"; |
|
787
|
787
|
echo '<tr>'; |
|
788
|
788
|
echo '<td>'; |
|
789
|
|
- echo '<label><input type="checkbox" id="send_to_all_users">'.get_lang('SendToAllUsers') . "</label>"; |
|
|
789
|
+ echo '<label><input type="checkbox" id="send_to_all_users">'.get_lang('SendToAllUsers')."</label>"; |
|
790
|
790
|
echo "</td>"; |
|
791
|
791
|
echo '</tr>'; |
|
792
|
792
|
echo '<tr>'; |
|
@@ -794,7 +794,7 @@ discard block |
|
|
block discarded – undo |
|
794
|
794
|
|
|
795
|
795
|
// the form containing all the groups and all the users of the course |
|
796
|
796
|
echo '<td>'; |
|
797
|
|
- echo "<strong>" . get_lang('Users') . "</strong><br />"; |
|
|
797
|
+ echo "<strong>".get_lang('Users')."</strong><br />"; |
|
798
|
798
|
|
|
799
|
799
|
self::construct_not_selected_select_form($groupList, $userList, $to_already_selected); |
|
800
|
800
|
echo "</td>"; |
|
@@ -809,7 +809,7 @@ discard block |
|
|
block discarded – undo |
|
809
|
809
|
echo "<td>"; |
|
810
|
810
|
|
|
811
|
811
|
// the form containing the selected groups and users |
|
812
|
|
- echo "<strong>" . get_lang('DestinationUsers') . "</strong><br />"; |
|
|
812
|
+ echo "<strong>".get_lang('DestinationUsers')."</strong><br />"; |
|
813
|
813
|
self::construct_selected_select_form($groupList, $userList, $to_already_selected); |
|
814
|
814
|
echo "</td>"; |
|
815
|
815
|
echo "</tr>"; |
|
@@ -827,8 +827,8 @@ discard block |
|
|
block discarded – undo |
|
827
|
827
|
echo "<select id=\"not_selected_form\" name=\"not_selected_form[]\" size=5 style=\"width:200px\" multiple>"; |
|
828
|
828
|
$group_users = GroupManager::getStudentsAndTutors($group_id); |
|
829
|
829
|
foreach ($group_users as $user) { |
|
830
|
|
- echo '<option value="' . $user['user_id'] . '" title="' . sprintf(get_lang('LoginX'), $user['username']) . '" >' . |
|
831
|
|
- api_get_person_name($user['firstname'], $user['lastname']) . |
|
|
830
|
+ echo '<option value="'.$user['user_id'].'" title="'.sprintf(get_lang('LoginX'), $user['username']).'" >'. |
|
|
831
|
+ api_get_person_name($user['firstname'], $user['lastname']). |
|
832
|
832
|
'</option>'; |
|
833
|
833
|
} |
|
834
|
834
|
echo '</select>'; |
|
@@ -866,12 +866,12 @@ discard block |
|
|
block discarded – undo |
|
866
|
866
|
if (!empty($groupList)) { |
|
867
|
867
|
foreach ($groupList as $this_group) { |
|
868
|
868
|
if (is_array($to_already_selected)) { |
|
869
|
|
- if (!in_array("GROUP:" . $this_group['id'], $to_already_selected)) { |
|
|
869
|
+ if (!in_array("GROUP:".$this_group['id'], $to_already_selected)) { |
|
870
|
870
|
// $to_already_selected is the array containing the groups (and users) that are already selected |
|
871
|
|
- $user_label = ($this_group['userNb'] > 0) ? get_lang('Users') : get_lang('LowerCaseUser') ; |
|
872
|
|
- $user_disabled = ($this_group['userNb'] > 0) ? "" : "disabled=disabled" ; |
|
873
|
|
- echo "<option $user_disabled value=\"GROUP:" . $this_group['id'] . "\">", |
|
874
|
|
- "G: ", $this_group['name'], " - " . $this_group['userNb'] . " " . $user_label . |
|
|
871
|
+ $user_label = ($this_group['userNb'] > 0) ? get_lang('Users') : get_lang('LowerCaseUser'); |
|
|
872
|
+ $user_disabled = ($this_group['userNb'] > 0) ? "" : "disabled=disabled"; |
|
|
873
|
+ echo "<option $user_disabled value=\"GROUP:".$this_group['id']."\">", |
|
|
874
|
+ "G: ", $this_group['name'], " - ".$this_group['userNb']." ".$user_label. |
|
875
|
875
|
"</option>"; |
|
876
|
876
|
} |
|
877
|
877
|
} |
|
@@ -885,15 +885,15 @@ discard block |
|
|
block discarded – undo |
|
885
|
885
|
if (!empty($userList)) { |
|
886
|
886
|
foreach ($userList as $user) { |
|
887
|
887
|
if (is_array($to_already_selected)) { |
|
888
|
|
- if (!in_array("USER:" . $user['user_id'], $to_already_selected)) { |
|
|
888
|
+ if (!in_array("USER:".$user['user_id'], $to_already_selected)) { |
|
889
|
889
|
// $to_already_selected is the array containing the users (and groups) that are already selected |
|
890
|
|
- echo "<option value=\"USER:" . $user['user_id'] . "\" title='" . sprintf(get_lang('LoginX'), $user['username']) . "'>", |
|
|
890
|
+ echo "<option value=\"USER:".$user['user_id']."\" title='".sprintf(get_lang('LoginX'), $user['username'])."'>", |
|
891
|
891
|
"", api_get_person_name($user['firstname'], $user['lastname']), |
|
892
|
892
|
"</option>"; |
|
893
|
893
|
|
|
894
|
894
|
if (isset($user['drh_list']) && !empty($user['drh_list'])) { |
|
895
|
895
|
foreach ($user['drh_list'] as $drh) { |
|
896
|
|
- echo "<option value=\"USER:" . $drh['user_id'] . "\" title='" . sprintf(get_lang('LoginX'), $drh['username']) . "'> ", |
|
|
896
|
+ echo "<option value=\"USER:".$drh['user_id']."\" title='".sprintf(get_lang('LoginX'), $drh['username'])."'> ", |
|
897
|
897
|
"", api_get_person_name($drh['firstname'], $drh['lastname']), |
|
898
|
898
|
"</option>"; |
|
899
|
899
|
} |
|
@@ -925,16 +925,16 @@ discard block |
|
|
block discarded – undo |
|
925
|
925
|
foreach ($to_already_selected as $groupuser) { |
|
926
|
926
|
list($type, $id) = explode(":", $groupuser); |
|
927
|
927
|
if ($type == "GROUP") { |
|
928
|
|
- echo "<option value=\"" . $groupuser . "\">G: " . $ref_array_groups[$id]['name'] . "</option>"; |
|
|
928
|
+ echo "<option value=\"".$groupuser."\">G: ".$ref_array_groups[$id]['name']."</option>"; |
|
929
|
929
|
} else { |
|
930
|
930
|
foreach ($ref_array_users as $key => $value) { |
|
931
|
931
|
if ($value['user_id'] == $id) { |
|
932
|
|
- echo "<option value=\"" . $groupuser . "\" title='" . sprintf(get_lang('LoginX'), $value['username']) . "'>" . |
|
933
|
|
- api_get_person_name($value['firstname'], $value['lastname']) . "</option>"; |
|
|
932
|
+ echo "<option value=\"".$groupuser."\" title='".sprintf(get_lang('LoginX'), $value['username'])."'>". |
|
|
933
|
+ api_get_person_name($value['firstname'], $value['lastname'])."</option>"; |
|
934
|
934
|
|
|
935
|
935
|
if (isset($value['drh_list']) && !empty($value['drh_list'])) { |
|
936
|
936
|
foreach ($value['drh_list'] as $drh) { |
|
937
|
|
- echo "<option value=\"USER:" . $drh['user_id'] . "\" title='" . sprintf(get_lang('LoginX'), $drh['username']) . "'> ", |
|
|
937
|
+ echo "<option value=\"USER:".$drh['user_id']."\" title='".sprintf(get_lang('LoginX'), $drh['username'])."'> ", |
|
938
|
938
|
"", api_get_person_name($drh['firstname'], $drh['lastname']), |
|
939
|
939
|
"</option>"; |
|
940
|
940
|
} |
|
@@ -950,17 +950,17 @@ discard block |
|
|
block discarded – undo |
|
950
|
950
|
if (is_array($ref_array_groups)) { |
|
951
|
951
|
foreach ($ref_array_groups as $this_group) { |
|
952
|
952
|
//api_display_normal_message("group " . $thisGroup[id] . $thisGroup[name]); |
|
953
|
|
- if (!is_array($to_already_selected) || !in_array("GROUP:" . $this_group['id'], $to_already_selected)) { // $to_already_selected is the array containing the groups (and users) that are already selected |
|
954
|
|
- echo "<option value=\"GROUP:" . $this_group['id'] . "\">", |
|
955
|
|
- "G: ", $this_group['name'], " – " . $this_group['userNb'] . " " . get_lang('Users') . |
|
|
953
|
+ if (!is_array($to_already_selected) || !in_array("GROUP:".$this_group['id'], $to_already_selected)) { // $to_already_selected is the array containing the groups (and users) that are already selected |
|
|
954
|
+ echo "<option value=\"GROUP:".$this_group['id']."\">", |
|
|
955
|
+ "G: ", $this_group['name'], " – ".$this_group['userNb']." ".get_lang('Users'). |
|
956
|
956
|
"</option>"; |
|
957
|
957
|
} |
|
958
|
958
|
} |
|
959
|
959
|
} |
|
960
|
960
|
// adding the individual users to the select form |
|
961
|
961
|
foreach ($ref_array_users as $this_user) { |
|
962
|
|
- if (!is_array($to_already_selected) || !in_array("USER:" . $this_user['user_id'], $to_already_selected)) { // $to_already_selected is the array containing the users (and groups) that are already selected |
|
963
|
|
- echo "<option value=\"USER:", $this_user['user_id'], "\" title='" . sprintf(get_lang('LoginX'), $this_user['username']) . "'>", |
|
|
962
|
+ if (!is_array($to_already_selected) || !in_array("USER:".$this_user['user_id'], $to_already_selected)) { // $to_already_selected is the array containing the users (and groups) that are already selected |
|
|
963
|
+ echo "<option value=\"USER:", $this_user['user_id'], "\" title='".sprintf(get_lang('LoginX'), $this_user['username'])."'>", |
|
964
|
964
|
"", api_get_person_name($this_user['firstname'], $this_user['lastname']), |
|
965
|
965
|
"</option>"; |
|
966
|
966
|
} |
|
@@ -1073,14 +1073,14 @@ discard block |
|
|
block discarded – undo |
|
1073
|
1073
|
switch ($to_group) { |
|
1074
|
1074
|
// it was send to one specific user |
|
1075
|
1075
|
case null: |
|
1076
|
|
- $to[] = "USER:" . $row['to_user_id']; |
|
|
1076
|
+ $to[] = "USER:".$row['to_user_id']; |
|
1077
|
1077
|
break; |
|
1078
|
1078
|
// it was sent to everyone |
|
1079
|
1079
|
case 0: |
|
1080
|
1080
|
return "everyone"; |
|
1081
|
1081
|
break; |
|
1082
|
1082
|
default: |
|
1083
|
|
- $to[] = "GROUP:" . $row['to_group_id']; |
|
|
1083
|
+ $to[] = "GROUP:".$row['to_group_id']; |
|
1084
|
1084
|
} |
|
1085
|
1085
|
} |
|
1086
|
1086
|
return $to; |
|
@@ -1161,10 +1161,10 @@ discard block |
|
|
block discarded – undo |
|
1161
|
1161
|
$sent_to_array['groups'][0] !== 0 |
|
1162
|
1162
|
) { |
|
1163
|
1163
|
$group_id = $sent_to_array['groups'][0]; |
|
1164
|
|
- $output[] = " " . $group_names[$group_id]['name']; |
|
|
1164
|
+ $output[] = " ".$group_names[$group_id]['name']; |
|
1165
|
1165
|
} |
|
1166
|
1166
|
if (empty($sent_to_array['groups']) and empty($sent_to_array['users'])) { |
|
1167
|
|
- $output[] = " " . get_lang('Everybody'); |
|
|
1167
|
+ $output[] = " ".get_lang('Everybody'); |
|
1168
|
1168
|
} |
|
1169
|
1169
|
} |
|
1170
|
1170
|
|
|
@@ -1199,7 +1199,7 @@ discard block |
|
|
block discarded – undo |
|
1199
|
1199
|
|
|
1200
|
1200
|
$sql = "SELECT to_group_id, to_user_id |
|
1201
|
1201
|
FROM $tbl_item_property |
|
1202
|
|
- WHERE c_id = $course_id AND tool = '$tool' AND ref=" . $id; |
|
|
1202
|
+ WHERE c_id = $course_id AND tool = '$tool' AND ref=".$id; |
|
1203
|
1203
|
$result = Database::query($sql); |
|
1204
|
1204
|
|
|
1205
|
1205
|
while ($row = Database::fetch_array($result)) { |
|
@@ -1238,8 +1238,8 @@ discard block |
|
|
block discarded – undo |
|
1238
|
1238
|
$announcement_id = intval($announcement_id); |
|
1239
|
1239
|
$course_id = api_get_course_int_id(); |
|
1240
|
1240
|
$row = array(); |
|
1241
|
|
- $sql = 'SELECT id, path, filename, comment FROM ' . $tbl_announcement_attachment . ' |
|
1242
|
|
- WHERE c_id = ' . $course_id . ' AND announcement_id = ' . $announcement_id . ''; |
|
|
1241
|
+ $sql = 'SELECT id, path, filename, comment FROM '.$tbl_announcement_attachment.' |
|
|
1242
|
+ WHERE c_id = ' . $course_id.' AND announcement_id = '.$announcement_id.''; |
|
1243
|
1243
|
$result = Database::query($sql); |
|
1244
|
1244
|
if (Database::num_rows($result) != 0) { |
|
1245
|
1245
|
$row = Database::fetch_array($result, 'ASSOC'); |
|
@@ -1264,9 +1264,9 @@ discard block |
|
|
block discarded – undo |
|
1264
|
1264
|
|
|
1265
|
1265
|
if (is_array($file) && $file['error'] == 0) { |
|
1266
|
1266
|
// TODO: This path is obsolete. The new document repository scheme should be kept in mind here. |
|
1267
|
|
- $courseDir = $_course['path'] . '/upload/announcements'; |
|
|
1267
|
+ $courseDir = $_course['path'].'/upload/announcements'; |
|
1268
|
1268
|
$sys_course_path = api_get_path(SYS_COURSE_PATH); |
|
1269
|
|
- $updir = $sys_course_path . $courseDir; |
|
|
1269
|
+ $updir = $sys_course_path.$courseDir; |
|
1270
|
1270
|
|
|
1271
|
1271
|
// Try to add an extension to the file if it hasn't one |
|
1272
|
1272
|
$new_file_name = add_ext_on_mime(stripslashes($file['name']), $file['type']); |
|
@@ -1278,7 +1278,7 @@ discard block |
|
|
block discarded – undo |
|
1278
|
1278
|
Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension')); |
|
1279
|
1279
|
} else { |
|
1280
|
1280
|
$new_file_name = uniqid(''); |
|
1281
|
|
- $new_path = $updir . '/' . $new_file_name; |
|
|
1281
|
+ $new_path = $updir.'/'.$new_file_name; |
|
1282
|
1282
|
move_uploaded_file($file['tmp_name'], $new_path); |
|
1283
|
1283
|
|
|
1284
|
1284
|
$params = [ |
|
@@ -1319,9 +1319,9 @@ discard block |
|
|
block discarded – undo |
|
1319
|
1319
|
|
|
1320
|
1320
|
if (is_array($file) && $file['error'] == 0) { |
|
1321
|
1321
|
// TODO: This path is obsolete. The new document repository scheme should be kept in mind here. |
|
1322
|
|
- $courseDir = $_course['path'] . '/upload/announcements'; |
|
|
1322
|
+ $courseDir = $_course['path'].'/upload/announcements'; |
|
1323
|
1323
|
$sys_course_path = api_get_path(SYS_COURSE_PATH); |
|
1324
|
|
- $updir = $sys_course_path . $courseDir; |
|
|
1324
|
+ $updir = $sys_course_path.$courseDir; |
|
1325
|
1325
|
|
|
1326
|
1326
|
// Try to add an extension to the file if it hasn't one |
|
1327
|
1327
|
$new_file_name = add_ext_on_mime(stripslashes($file['name']), $file['type']); |
|
@@ -1333,13 +1333,13 @@ discard block |
|
|
block discarded – undo |
|
1333
|
1333
|
Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension')); |
|
1334
|
1334
|
} else { |
|
1335
|
1335
|
$new_file_name = uniqid(''); |
|
1336
|
|
- $new_path = $updir . '/' . $new_file_name; |
|
|
1336
|
+ $new_path = $updir.'/'.$new_file_name; |
|
1337
|
1337
|
@move_uploaded_file($file['tmp_name'], $new_path); |
|
1338
|
1338
|
$safe_file_comment = Database::escape_string($file_comment); |
|
1339
|
1339
|
$safe_file_name = Database::escape_string($file_name); |
|
1340
|
1340
|
$safe_new_file_name = Database::escape_string($new_file_name); |
|
1341
|
1341
|
$id_attach = intval($id_attach); |
|
1342
|
|
- $sql = "UPDATE $tbl_announcement_attachment SET filename = '$safe_file_name', comment = '$safe_file_comment', path = '$safe_new_file_name', size ='" . intval($file['size']) . "' |
|
|
1342
|
+ $sql = "UPDATE $tbl_announcement_attachment SET filename = '$safe_file_name', comment = '$safe_file_comment', path = '$safe_new_file_name', size ='".intval($file['size'])."' |
|
1343
|
1343
|
WHERE c_id = $course_id AND id = '$id_attach'"; |
|
1344
|
1344
|
$result = Database::query($sql); |
|
1345
|
1345
|
if ($result === false) { |
|
@@ -1441,7 +1441,7 @@ discard block |
|
|
block discarded – undo |
|
1441
|
1441
|
|
|
1442
|
1442
|
//if (!empty($user_id)) { |
|
1443
|
1443
|
if (0) { |
|
1444
|
|
- if (is_array($group_memberships) && count($group_memberships) > 0 ) { |
|
|
1444
|
+ if (is_array($group_memberships) && count($group_memberships) > 0) { |
|
1445
|
1445
|
$sql = "SELECT $select |
|
1446
|
1446
|
FROM $tbl_announcement announcement, $tbl_item_property ip |
|
1447
|
1447
|
WHERE |
|
@@ -1524,7 +1524,7 @@ discard block |
|
|
block discarded – undo |
|
1524
|
1524
|
} |
|
1525
|
1525
|
} else { |
|
1526
|
1526
|
// STUDENT |
|
1527
|
|
- if (is_array($group_memberships) && count($group_memberships)>0) { |
|
|
1527
|
+ if (is_array($group_memberships) && count($group_memberships) > 0) { |
|
1528
|
1528
|
if ($allowUserEditSetting && !api_is_anonymous()) { |
|
1529
|
1529
|
if (api_get_group_id() == 0) { |
|
1530
|
1530
|
// No group |
|
@@ -1651,8 +1651,8 @@ discard block |
|
|
block discarded – undo |
|
1651
|
1651
|
$attachment_list = AnnouncementManager::get_attachment($myrow['id']); |
|
1652
|
1652
|
|
|
1653
|
1653
|
$attachment_icon = ''; |
|
1654
|
|
- if (count($attachment_list)>0) { |
|
1655
|
|
- $attachment_icon = ' '.Display::return_icon('attachment.gif',get_lang('Attachment')); |
|
|
1654
|
+ if (count($attachment_list) > 0) { |
|
|
1655
|
+ $attachment_icon = ' '.Display::return_icon('attachment.gif', get_lang('Attachment')); |
|
1656
|
1656
|
} |
|
1657
|
1657
|
|
|
1658
|
1658
|
/* TITLE */ |
|
@@ -1671,16 +1671,16 @@ discard block |
|
|
block discarded – undo |
|
1671
|
1671
|
|| (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous()) |
|
1672
|
1672
|
) { |
|
1673
|
1673
|
$modify_icons = "<a href=\"".$actionUrl."&action=modify&id=".$myrow['id']."\">". |
|
1674
|
|
- Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL)."</a>"; |
|
1675
|
|
- if ($myrow['visibility']==1) { |
|
1676
|
|
- $image_visibility="visible"; |
|
1677
|
|
- $alt_visibility=get_lang('Hide'); |
|
|
1674
|
+ Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL)."</a>"; |
|
|
1675
|
+ if ($myrow['visibility'] == 1) { |
|
|
1676
|
+ $image_visibility = "visible"; |
|
|
1677
|
+ $alt_visibility = get_lang('Hide'); |
|
1678
|
1678
|
} else { |
|
1679
|
|
- $image_visibility="invisible"; |
|
1680
|
|
- $alt_visibility=get_lang('Visible'); |
|
|
1679
|
+ $image_visibility = "invisible"; |
|
|
1680
|
+ $alt_visibility = get_lang('Visible'); |
|
1681
|
1681
|
} |
|
1682
|
|
- $modify_icons .= "<a href=\"".$actionUrl."&origin=".$origin."&action=showhide&id=".$myrow['id']."&sec_token=".$stok."\">". |
|
1683
|
|
- Display::return_icon($image_visibility.'.png', $alt_visibility,'',ICON_SIZE_SMALL)."</a>"; |
|
|
1682
|
+ $modify_icons .= "<a href=\"".$actionUrl."&origin=".$origin."&action=showhide&id=".$myrow['id']."&sec_token=".$stok."\">". |
|
|
1683
|
+ Display::return_icon($image_visibility.'.png', $alt_visibility, '', ICON_SIZE_SMALL)."</a>"; |
|
1684
|
1684
|
|
|
1685
|
1685
|
// DISPLAY MOVE UP COMMAND only if it is not the top announcement |
|
1686
|
1686
|
if ($iterator != 1) { |
|
@@ -1695,12 +1695,12 @@ discard block |
|
|
block discarded – undo |
|
1695
|
1695
|
} else { |
|
1696
|
1696
|
$modify_icons .= Display::return_icon('down_na.gif', get_lang('Down')); |
|
1697
|
1697
|
} |
|
1698
|
|
- if (api_is_allowed_to_edit(false,true)) { |
|
1699
|
|
- $modify_icons .= "<a href=\"".$actionUrl."&action=delete&id=".$myrow['id']."&sec_token=".$stok."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,api_get_system_encoding()))."')) return false;\">". |
|
1700
|
|
- Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL). |
|
|
1698
|
+ if (api_is_allowed_to_edit(false, true)) { |
|
|
1699
|
+ $modify_icons .= "<a href=\"".$actionUrl."&action=delete&id=".$myrow['id']."&sec_token=".$stok."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, api_get_system_encoding()))."')) return false;\">". |
|
|
1700
|
+ Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL). |
|
1701
|
1701
|
"</a>"; |
|
1702
|
1702
|
} |
|
1703
|
|
- $iterator ++; |
|
|
1703
|
+ $iterator++; |
|
1704
|
1704
|
} else { |
|
1705
|
1705
|
$modify_icons = Display::url( |
|
1706
|
1706
|
Display::return_icon('default.png'), |
|
@@ -1730,7 +1730,7 @@ discard block |
|
|
block discarded – undo |
|
1730
|
1730
|
public static function getNumberAnnouncements() |
|
1731
|
1731
|
{ |
|
1732
|
1732
|
// Maximum title messages to display |
|
1733
|
|
- $maximum = '12'; |
|
|
1733
|
+ $maximum = '12'; |
|
1734
|
1734
|
// Database Table Definitions |
|
1735
|
1735
|
$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT); |
|
1736
|
1736
|
$tbl_item_property = Database::get_course_table(TABLE_ITEM_PROPERTY); |
|
@@ -1741,7 +1741,7 @@ discard block |
|
|
block discarded – undo |
|
1741
|
1741
|
$userId = api_get_user_id(); |
|
1742
|
1742
|
$condition_session = api_get_session_condition($session_id, true, true, 'announcement.session_id'); |
|
1743
|
1743
|
|
|
1744
|
|
- if (api_is_allowed_to_edit(false,true)) { |
|
|
1744
|
+ if (api_is_allowed_to_edit(false, true)) { |
|
1745
|
1745
|
// check teacher status |
|
1746
|
1746
|
if (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath') { |
|
1747
|
1747
|
|
|
@@ -1804,7 +1804,7 @@ discard block |
|
|
block discarded – undo |
|
1804
|
1804
|
} |
|
1805
|
1805
|
|
|
1806
|
1806
|
// the user is member of several groups => display personal announcements AND his group announcements AND the general announcements |
|
1807
|
|
- if (is_array($group_memberships) && count($group_memberships)>0) { |
|
|
1807
|
+ if (is_array($group_memberships) && count($group_memberships) > 0) { |
|
1808
|
1808
|
$sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id |
|
1809
|
1809
|
FROM $tbl_announcement announcement, $tbl_item_property ip |
|
1810
|
1810
|
WHERE |
|
@@ -1854,7 +1854,7 @@ discard block |
|
|
block discarded – undo |
|
1854
|
1854
|
} |
|
1855
|
1855
|
|
|
1856
|
1856
|
// the user is not identiefied => show only the general announcements |
|
1857
|
|
- $sql="SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id |
|
|
1857
|
+ $sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id |
|
1858
|
1858
|
FROM $tbl_announcement announcement, $tbl_item_property ip |
|
1859
|
1859
|
WHERE |
|
1860
|
1860
|
announcement.c_id = $course_id AND |