Minor - format code, use INNER JOIN

pull/2733/head
Julio Montoya 7 years ago
parent acfe51efd1
commit 8947e18e85
  1. 19
      main/announcements/announcements.php

@ -41,7 +41,6 @@ $allowToEdit = (
$sessionId = api_get_session_id(); $sessionId = api_get_session_id();
$drhHasAccessToSessionContent = api_drh_can_access_all_session_content(); $drhHasAccessToSessionContent = api_drh_can_access_all_session_content();
if (!empty($sessionId) && $drhHasAccessToSessionContent) { if (!empty($sessionId) && $drhHasAccessToSessionContent) {
$allowToEdit = $allowToEdit || api_is_drh(); $allowToEdit = $allowToEdit || api_is_drh();
} }
@ -66,12 +65,12 @@ $isTutor = false;
if (!empty($group_id)) { if (!empty($group_id)) {
$groupProperties = GroupManager:: get_group_properties($group_id); $groupProperties = GroupManager:: get_group_properties($group_id);
$interbreadcrumb[] = [ $interbreadcrumb[] = [
"url" => api_get_path(WEB_CODE_PATH)."group/group.php?".api_get_cidreq(), 'url' => api_get_path(WEB_CODE_PATH)."group/group.php?".api_get_cidreq(),
"name" => get_lang('Groups'), 'name' => get_lang('Groups'),
]; ];
$interbreadcrumb[] = [ $interbreadcrumb[] = [
"url" => api_get_path(WEB_CODE_PATH)."group/group_space.php?".api_get_cidreq(), 'url' => api_get_path(WEB_CODE_PATH)."group/group_space.php?".api_get_cidreq(),
"name" => get_lang('GroupSpace').' '.$groupProperties['name'], 'name' => get_lang('GroupSpace').' '.$groupProperties['name'],
]; ];
if ($allowToEdit === false) { if ($allowToEdit === false) {
@ -86,7 +85,7 @@ if (!empty($group_id)) {
/* Tracking */ /* Tracking */
Event::event_access_tool(TOOL_ANNOUNCEMENT); Event::event_access_tool(TOOL_ANNOUNCEMENT);
$announcement_id = isset($_GET['id']) ? intval($_GET['id']) : null; $announcement_id = isset($_GET['id']) ? (int) $_GET['id'] : null;
$action = isset($_GET['action']) ? Security::remove_XSS($_GET['action']) : 'list'; $action = isset($_GET['action']) ? Security::remove_XSS($_GET['action']) : 'list';
$announcement_number = AnnouncementManager::getNumberAnnouncements(); $announcement_number = AnnouncementManager::getNumberAnnouncements();
@ -118,8 +117,9 @@ switch ($action) {
$announcementInfo = AnnouncementManager::get_by_id($courseId, $thisAnnouncementId); $announcementInfo = AnnouncementManager::get_by_id($courseId, $thisAnnouncementId);
$sql = "SELECT DISTINCT announcement.id, announcement.display_order $sql = "SELECT DISTINCT announcement.id, announcement.display_order
FROM $tbl_announcement announcement, FROM $tbl_announcement announcement
$tbl_item_property itemproperty INNER JOIN $tbl_item_property itemproperty
ON (announcement.c_id = itemproperty.c_id)
WHERE WHERE
announcement.c_id = $courseId AND announcement.c_id = $courseId AND
itemproperty.c_id = $courseId AND itemproperty.c_id = $courseId AND
@ -555,7 +555,8 @@ switch ($action) {
if (!isset($parts[1]) || empty($parts[1])) { if (!isset($parts[1]) || empty($parts[1])) {
continue; continue;
} }
$form->addHtml(" $form->addHtml(
"
<script> <script>
$(document).on('ready', function () { $(document).on('ready', function () {
$('#choose_recipients').click(); $('#choose_recipients').click();

Loading…
Cancel
Save