Minor - format code

pull/3075/head
Julio Montoya 6 years ago
parent f60c943a29
commit 758dd1a585
  1. 17
      main/admin/system_announcements.php
  2. 9
      main/inc/lib/system_announcements.lib.php

@ -1,4 +1,5 @@
<?php
/* For licensing terms, see /license.txt */
/**
@ -25,8 +26,8 @@ api_protect_admin_script(true);
// Setting breadcrumbs.
$interbreadcrumb[] = [
"url" => 'index.php',
"name" => get_lang('PlatformAdmin'),
'url' => 'index.php',
'name' => get_lang('PlatformAdmin'),
];
$visibleList = SystemAnnouncementManager::getVisibilityList();
@ -38,17 +39,17 @@ if (empty($_GET['lang'])) {
if (!empty($action)) {
$interbreadcrumb[] = [
"url" => "system_announcements.php",
"name" => get_lang('SystemAnnouncements'),
'url' => 'system_announcements.php',
'name' => get_lang('SystemAnnouncements'),
];
if ($action == 'add') {
$interbreadcrumb[] = [
"url" => '#',
"name" => get_lang('AddAnnouncement'),
'url' => '#',
'name' => get_lang('AddAnnouncement'),
];
}
if ($action == 'edit') {
$interbreadcrumb[] = ["url" => '#', "name" => get_lang('Edit')];
$interbreadcrumb[] = ['url' => '#', 'name' => get_lang('Edit')];
}
} else {
$tool_name = get_lang('SystemAnnouncements');
@ -144,7 +145,7 @@ if ($action_todo) {
$url = api_get_self().'?id='.intval($_GET['id']);
}
$form = new FormValidator('system_announcement', 'post', $url);
$form->addElement('header', '', $form_title);
$form->addHeader($form_title);
$form->addText('title', get_lang('Title'), true);
$extraOption = [];

@ -1,4 +1,5 @@
<?php
/* For licensing terms, see /license.txt */
/**
@ -393,7 +394,7 @@ class SystemAnnouncementManager
);
//first delete all group associations for this announcement
$res = Database::query(
"DELETE FROM $tbl_announcement_group
"DELETE FROM $tbl_announcement_group
WHERE announcement_id=".intval($announcement_id)
);
@ -682,17 +683,17 @@ class SystemAnnouncementManager
}
if ($teacher != 0 && $student == 0) {
$sql = "SELECT DISTINCT u.user_id FROM $user_table u $urlJoin
$sql = "SELECT DISTINCT u.user_id FROM $user_table u $urlJoin
WHERE status = '1' $urlCondition";
}
if ($teacher == 0 && $student != 0) {
$sql = "SELECT DISTINCT u.user_id FROM $user_table u $urlJoin
$sql = "SELECT DISTINCT u.user_id FROM $user_table u $urlJoin
WHERE status = '5' $urlCondition";
}
if ($teacher != 0 && $student != 0) {
$sql = "SELECT DISTINCT u.user_id FROM $user_table u $urlJoin
$sql = "SELECT DISTINCT u.user_id FROM $user_table u $urlJoin
WHERE 1 = 1 $urlCondition";
}

Loading…
Cancel
Save