chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor - Format code, add docs, remove unused code.

Browse Source
1.10.x
Julio Montoya 10 years ago
parent 67907bd35f
commit 20dd96739d
5 changed files with 153 additions and 76 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 123
      main/inc/lib/AnnouncementManager.php
  2. 27
      main/inc/lib/agenda.lib.php
  3. 68
      main/inc/lib/message.lib.php
  4. 1
      main/inc/lib/model.lib.php
  5. 10
      main/inc/lib/myspace.lib.php

123
main/inc/lib/AnnouncementManager.php
Unescape View File

@ -9,8 +9,12 @@
*/
class AnnouncementManager
{
/**
* Constructor
*/
public function __construct()
{
}
/**
@ -71,8 +75,8 @@ class AnnouncementManager
/**
* Gets all announcements from a course
* @param string course db
* @param int session id
* @param array $course_info
* @param int $session_id
* @return array html with the content and count of announcements or false otherwise
*/
public static function get_all_annoucement_by_course($course_info, $session_id = 0)
@ -85,11 +89,12 @@ class AnnouncementManager
$sql = "SELECT DISTINCT announcement.id, announcement.title, announcement.content
FROM $tbl_announcement announcement, $tbl_item_property toolitemproperties
WHERE announcement.id = toolitemproperties.ref AND
toolitemproperties.tool='announcement' AND
announcement.session_id = '$session_id' AND
announcement.c_id = $course_id AND
toolitemproperties.c_id = $course_id
WHERE
announcement.id = toolitemproperties.ref AND
toolitemproperties.tool='announcement' AND
announcement.session_id = '$session_id' AND
announcement.c_id = $course_id AND
toolitemproperties.c_id = $course_id
ORDER BY display_order DESC";
$rs = Database::query($sql);
$num_rows = Database::num_rows($rs);
@ -98,8 +103,10 @@ class AnnouncementManager
while ($row = Database::fetch_array($rs)) {
$list[] = $row;
}
return $list;
}
return false;
}
@ -113,11 +120,28 @@ class AnnouncementManager
public static function change_visibility_announcement($_course, $id)
{
$session_id = api_get_session_id();
$item_visibility = api_get_item_visibility($_course, TOOL_ANNOUNCEMENT, $id, $session_id);
$item_visibility = api_get_item_visibility(
$_course,
TOOL_ANNOUNCEMENT,
$id,
$session_id
);
if ($item_visibility == '1') {
api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, 'invisible', api_get_user_id());
api_item_property_update(
$_course,
TOOL_ANNOUNCEMENT,
$id,
'invisible',
api_get_user_id()
);
} else {
api_item_property_update($_course, TOOL_ANNOUNCEMENT, $id, 'visible', api_get_user_id());
api_item_property_update(
$_course,
TOOL_ANNOUNCEMENT,
$id,
'visible',
api_get_user_id()
);
}
return true;
@ -142,7 +166,13 @@ class AnnouncementManager
$announcements = self::get_all_annoucement_by_course($_course, api_get_session_id());
if (!empty($announcements)) {
foreach ($announcements as $annon) {
api_item_property_update($_course, TOOL_ANNOUNCEMENT, $annon['id'], 'delete', api_get_user_id());
api_item_property_update(
$_course,
TOOL_ANNOUNCEMENT,
$annon['id'],
'delete',
api_get_user_id()
);
}
}
}
@ -295,14 +325,17 @@ class AnnouncementManager
{
$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
$course_id = api_get_course_int_id();
$sql_max = "SELECT MAX(display_order) FROM $tbl_announcement WHERE c_id = $course_id ";
$res_max = Database::query($sql_max);
$sql = "SELECT MAX(display_order)
FROM $tbl_announcement
WHERE c_id = $course_id ";
$res_max = Database::query($sql);
$order = 0;
if (Database::num_rows($res_max)) {
$row_max = Database::fetch_array($res_max);
$order = intval($row_max[0])+1;
$order = intval($row_max[0])+1;
}
return $order;
}
@ -331,14 +364,8 @@ class AnnouncementManager
$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
// filter data
$emailTitle = Database::escape_string($emailTitle);
$newContent = Database::escape_string($newContent);
if (empty($end_date)) {
$end_date = api_get_utc_datetime();
} else {
$end_date = Database::escape_string($end_date);
}
$order = self::get_last_announcement_order();
@ -447,16 +474,12 @@ class AnnouncementManager
// Database definitions
$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
$emailTitle = Database::escape_string($emailTitle);
$newContent = Database::escape_string($newContent);
$order = self::get_last_announcement_order();
$now = api_get_utc_datetime();
$course_id = api_get_course_int_id();
// store in the table announcement
$params = [
'c_id' => $course_id,
'content' => $newContent,
@ -549,16 +572,18 @@ class AnnouncementManager
$tbl_item_property = Database::get_course_table(TABLE_ITEM_PROPERTY);
$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
$emailTitle = Database::escape_string($emailTitle);
$newContent = Database::escape_string($newContent);
$id = intval($id);
// store the modifications in the table announcement
$sql = "UPDATE $tbl_announcement SET
content = '$newContent',
title = '$emailTitle'
WHERE c_id = $course_id AND id='$id'";
Database::query($sql);
$params = [
'title' => $emailTitle,
'content' => $newContent
];
Database::update(
$tbl_announcement,
$params,
['c_id = ? AND id = ?' => [$course_id, $id]]
);
// save attachment file
$row_attach = self::get_attachment($id);
@ -684,7 +709,8 @@ class AnnouncementManager
$insert_id = intval($insert_id);
$course_id = api_get_course_int_id();
// store the modifications in the table tbl_annoucement
$sql = "UPDATE $tbl_announcement SET email_sent='1' WHERE c_id = $course_id AND id = $insert_id";
$sql = "UPDATE $tbl_announcement SET email_sent='1'
WHERE c_id = $course_id AND id = $insert_id";
Database::query($sql);
}
@ -733,10 +759,13 @@ class AnnouncementManager
}
$result['content'] = $content;
$result['count'] = $i;
return $result;
}
return false;
}
return false;
}
@ -1008,9 +1037,17 @@ class AnnouncementManager
{
$session_id = api_get_session_id();
if ($session_id != 0) {
$new_group_list = CourseManager::get_group_list_of_course(api_get_course_id(), $session_id, 1);
$new_group_list = CourseManager::get_group_list_of_course(
api_get_course_id(),
$session_id,
1
);
} else {
$new_group_list = CourseManager::get_group_list_of_course(api_get_course_id(), 0, 1);
$new_group_list = CourseManager::get_group_list_of_course(
api_get_course_id(),
0,
1
);
}
return $new_group_list;
}
@ -1225,7 +1262,8 @@ class AnnouncementManager
$course_id = api_get_course_int_id();
if (is_array($file) && $file['error'] == 0) {
$courseDir = $_course['path'] . '/upload/announcements'; // TODO: This path is obsolete. The new document repository scheme should be kept in mind here.
// TODO: This path is obsolete. The new document repository scheme should be kept in mind here.
$courseDir = $_course['path'] . '/upload/announcements';
$sys_course_path = api_get_path(SYS_COURSE_PATH);
$updir = $sys_course_path . $courseDir;
@ -1279,7 +1317,8 @@ class AnnouncementManager
$course_id = api_get_course_int_id();
if (is_array($file) && $file['error'] == 0) {
$courseDir = $_course['path'] . '/upload/announcements'; // TODO: This path is obsolete. The new document repository scheme should be kept in mind here.
// TODO: This path is obsolete. The new document repository scheme should be kept in mind here.
$courseDir = $_course['path'] . '/upload/announcements';
$sys_course_path = api_get_path(SYS_COURSE_PATH);
$updir = $sys_course_path . $courseDir;
@ -1294,7 +1333,7 @@ class AnnouncementManager
} else {
$new_file_name = uniqid('');
$new_path = $updir . '/' . $new_file_name;
$result = @move_uploaded_file($file['tmp_name'], $new_path);
@move_uploaded_file($file['tmp_name'], $new_path);
$safe_file_comment = Database::escape_string($file_comment);
$safe_file_name = Database::escape_string($file_name);
$safe_new_file_name = Database::escape_string($new_file_name);
@ -1323,7 +1362,9 @@ class AnnouncementManager
$tbl_announcement_attachment = Database::get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
$id = intval($id);
$course_id = api_get_course_int_id();
$sql = "DELETE FROM $tbl_announcement_attachment WHERE c_id = $course_id AND id = $id";
$sql = "DELETE FROM $tbl_announcement_attachment
WHERE c_id = $course_id AND id = $id";
Database::query($sql);
}
@ -1574,7 +1615,7 @@ class AnnouncementManager
$ths .= Display::tag('th', get_lang('By') );
$ths .= Display::tag('th', get_lang('LastUpdateDate') );
if (api_is_allowed_to_edit(false,true) OR (api_is_course_coach() &&
api_is_element_in_the_session(TOOL_ANNOUNCEMENT,$myrow['id']))
api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $myrow['id']))
OR (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) {
$ths .= Display::tag('th', get_lang('Modify'));
}
@ -1811,7 +1852,7 @@ class AnnouncementManager
$condition_session
GROUP BY ip.ref
ORDER BY display_order DESC
LIMIT 0,$maximum";
LIMIT 0, $maximum";
}
}
}

27
main/inc/lib/agenda.lib.php
Unescape View File

@ -2459,8 +2459,8 @@ class Agenda
*/
public function displayActions($view, $filter = 0)
{
$courseInfo = api_get_course_info();
$courseInfo = api_get_course_info();
$toolbar = '';
$toolbar .= "<a href='".api_get_path(WEB_CODE_PATH)."calendar/agenda_js.php?type={$this->type}'>".
Display::return_icon('calendar.png', get_lang('Calendar'), '', ICON_SIZE_MEDIUM)."</a>";
@ -2469,11 +2469,12 @@ class Agenda
if (!empty($courseInfo)) {
$courseCondition = api_get_cidreq();
}
$toolbar .= "<a href='".api_get_path(WEB_CODE_PATH)."calendar/agenda_list.php?type={$this->type}&".$courseCondition."'>".
Display::return_icon('week.png', get_lang('AgendaList'), '', ICON_SIZE_MEDIUM)."</a>";
$form = '';
if (api_is_allowed_to_edit(false, true) ||
(api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous()) && api_is_allowed_to_session_edit(false, true) ||
GroupManager::user_has_access(api_get_user_id(), api_get_group_id(), GroupManager::GROUP_TOOL_CALENDAR) &&
@ -2483,9 +2484,9 @@ class Agenda
Display::return_icon('new_event.png', get_lang('AgendaAdd'), '', ICON_SIZE_MEDIUM)."</a>";
$toolbar .= "<a href='".api_get_path(WEB_CODE_PATH)."calendar/agenda.php?".api_get_cidreq()."&action=importical&type=course'>".
Display::return_icon('import_calendar.png', get_lang('ICalFileImport'), '', ICON_SIZE_MEDIUM)."</a>";
if ($this->type == 'course') {
$form = null;
if (!isset($_GET['action'])) {
$form = new FormValidator(
@ -2503,10 +2504,10 @@ class Agenda
$selectedValues = $this->parseAgendaFilter($filter);
$this->showToForm($form, $selectedValues, $attributes);
$form = $form->returnForm();
}
}
}
}
if (api_is_platform_admin() ||
api_is_teacher() ||
api_is_student_boss() ||
@ -2544,7 +2545,7 @@ class Agenda
}
}
}
$actions = '<div class="row">';
$actions .= '<div class="col-md-9">';
if ($view == 'calendar') {
@ -2552,7 +2553,7 @@ class Agenda
}
$actions .= '</div>';
$actions .= '<div class="col-md-3 right">';
$actions .= $toolbar;
$actions .= $toolbar;
$actions .= '</div>';
$actions .= '</div>';
@ -2573,7 +2574,7 @@ class Agenda
$form->addElement('header', get_lang('ICalFileImport'));
$form->addElement('file', 'ical_import', get_lang('ICalFileImport'));
$form->addRule('ical_import', get_lang('ThisFieldIsRequired'), 'required');
$form->addElement('button', 'ical_submit', get_lang('Import'));
$form->addButtonImport(get_lang('Import'), 'ical_submit');
return $form;
}
@ -3370,6 +3371,4 @@ class Agenda
{
$this->isAllowedToEdit = $isAllowedToEdit;
}
}

68
main/inc/lib/message.lib.php
Unescape View File

@ -60,14 +60,15 @@ class MessageManager
/**
* Get the new messages for the current user from the database.
* @return int
*/
public static function get_new_messages()
{
$table_message = Database::get_main_table(TABLE_MESSAGE);
$table = Database::get_main_table(TABLE_MESSAGE);
if (!api_get_user_id()) {
return false;
}
$sql = "SELECT * FROM $table_message
$sql = "SELECT * FROM $table
WHERE user_receiver_id=".api_get_user_id()." AND msg_status=".MESSAGE_STATUS_UNREAD;
$result = Database::query($sql);
$i = Database::num_rows($result);
@ -527,9 +528,9 @@ class MessageManager
// delete attachment file
self::delete_message_attachment_file($id, $user_sender_id);
// delete message
$query = "UPDATE $table_message SET msg_status=3
$sql = "UPDATE $table_message SET msg_status=3
WHERE user_sender_id='$user_sender_id' AND id='$id'";
$result = Database::query($query);
$result = Database::query($sql);
return $result;
}
@ -626,9 +627,16 @@ class MessageManager
if (!empty($group_id)) {
$userGroup = new UserGroup();
$path_user_info = $userGroup->get_group_picture_path_by_id($group_id, 'system', true);
$path_user_info = $userGroup->get_group_picture_path_by_id(
$group_id,
'system',
true
);
} else {
$path_user_info['dir'] = UserManager::getUserPathById($message_uid, 'system');
$path_user_info['dir'] = UserManager::getUserPathById(
$message_uid,
'system'
);
}
$path_message_attach = $path_user_info['dir'].'message_attachments/';
@ -643,8 +651,8 @@ class MessageManager
/**
* update messages by user id and message id
* @param int user id
* @param int message id
* @param int $user_id
* @param int $message_id
* @return resource
*/
public static function update_message($user_id, $message_id)
@ -681,8 +689,8 @@ class MessageManager
/**
* get messages by user id and message id
* @param int user id
* @param int message id
* @param int $user_id
* @param int $message_id
* @return array
*/
public static function get_message_by_user($user_id, $message_id)
@ -752,6 +760,7 @@ class MessageManager
}
}
}
return $data;
}
@ -902,6 +911,7 @@ class MessageManager
WHERE msg_status=".MESSAGE_STATUS_OUTBOX." AND user_sender_id=".api_get_user_id();
$sql_result = Database::query($sql);
$result = Database::fetch_array($sql_result);
return $result['number_messages'];
}
@ -1221,6 +1231,7 @@ class MessageManager
false
);
}
return $html_messages;
}
@ -1248,8 +1259,6 @@ class MessageManager
$query_vars = array('id' => $group_id, 'topic_id' => $topic_id, 'topics_page_nr' => 0);
// Main message
$user_link = '';
$links = '';
$main_content = '';
@ -1406,9 +1415,22 @@ class MessageManager
$options = array('hide_navigation' => false, 'per_page' => $items_per_page);
$visibility = array(true, true, true, false);
$style_class = array('item' => array('class' => 'group_social_item'), 'main' => array('class' => 'group_social_grid'));
$style_class = array(
'item' => array('class' => 'group_social_item'),
'main' => array('class' => 'group_social_grid'),
);
if (!empty($array_html_items)) {
$html .= Display::return_sortable_grid('items_'.$topic['id'], array(), $array_html_items, $options, $query_vars, null, $visibility, false, $style_class);
$html .= Display::return_sortable_grid(
'items_'.$topic['id'],
array(),
$array_html_items,
$options,
$query_vars,
null,
$visibility,
false,
$style_class
);
}
}
return $html;
@ -1430,6 +1452,7 @@ class MessageManager
$sorted_rows = array(0 => array());
self::message_recursive_sort($rows, $sorted_rows, $first_seed);
unset($sorted_rows[0]);
return $sorted_rows;
}
@ -1592,7 +1615,14 @@ class MessageManager
}
// display sortable table with messages of the current user
$table = new SortableTable('message_inbox', array('MessageManager', 'get_number_of_messages'), array('MessageManager', 'get_message_data'), 3, 20, 'DESC');
$table = new SortableTable(
'message_inbox',
array('MessageManager', 'get_number_of_messages'),
array('MessageManager', 'get_message_data'),
3,
20,
'DESC'
);
$table->set_header(0, '', false, array('style' => 'width:15px;'));
$table->set_header(1, get_lang('Messages'), false);
$table->set_header(2, get_lang('Date'), true, array('style' => 'width:180px;'));
@ -1602,7 +1632,13 @@ class MessageManager
$parameters['f'] = 'social';
$table->set_additional_parameters($parameters);
}
$table->set_form_actions(array('delete' => get_lang('DeleteSelectedMessages'),'mark_as_unread' => get_lang('MailMarkSelectedAsUnread'),'mark_as_read' => get_lang('MailMarkSelectedAsRead')));
$table->set_form_actions(
array(
'delete' => get_lang('DeleteSelectedMessages'),
'mark_as_unread' => get_lang('MailMarkSelectedAsUnread'),
'mark_as_read' => get_lang('MailMarkSelectedAsRead'),
)
);
$html .= $table->return_table();
return $html;
}

1
main/inc/lib/model.lib.php
Unescape View File

@ -214,7 +214,6 @@ class Model
{
$params = $this->clean_parameters($params);
if ($this->is_course_model) {
if (!isset($params['c_id']) || empty($params['c_id'])) {
$params['c_id'] = api_get_course_int_id();

10
main/inc/lib/myspace.lib.php
Unescape View File

@ -133,8 +133,8 @@ class MySpace
}
// protect data
$user_id = intval($user_id);
$session_id = intval($session_id);
$user_id = intval($user_id);
$session_id = intval($session_id);
$new_course_list = array();
foreach ($course_list as $course_item) {
$courseInfo = api_get_course_info($course_item['code']);
@ -1023,10 +1023,12 @@ class MySpace
}
/**
* Display a sortable table that contains an overview off all the access to a session
* @deprecated seem not to be used
* @author César Perales <cesar.perales@beeznest.com>, Beeznest Team
* @version Chamilo 1.9.6
*/
static function display_tracking_access_overview($sessionId = 0, $courseId = 0, $studentId = '', $profile = '', $date_from, $date_to) {
static function display_tracking_access_overview($sessionId = 0, $courseId = 0, $studentId = '', $profile = '', $date_from, $date_to)
{
//The order is important you need to check the the $column variable in the model.ajax.php file
$columns = array(
get_lang('LoginDate'),
@ -1239,7 +1241,7 @@ class MySpace
* Fills in course reporting data
*
* @param integer course code
* @param array $url_params additonal url parameters
* @param array $url_params additional url parameters
* @param array $row the row information (the other columns)
* @return string html code
*/

Write Preview
Loading…
Cancel
Save