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 int casting

Browse Source
pull/3173/head
Julio Montoya 7 years ago
parent 0b994ddc1e
commit 70138a2cae
4 changed files with 48 additions and 50 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. 74
      main/inc/lib/message.lib.php
  2. 19
      main/inc/lib/notebook.lib.php
  3. 2
      main/inc/lib/online.inc.php
  4. 3
      main/inc/lib/promotion.lib.php

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

@ -92,6 +92,7 @@ class MessageManager
* @param int $number_of_items
* @param string $column
* @param string $direction
* @param int $userId
*
* @return array
*/
@ -106,12 +107,12 @@ class MessageManager
$number_of_items = (int) $number_of_items;
$userId = empty($userId) ? api_get_user_id() : (int) $userId;
//forcing this order
// Forcing this order.
if (!isset($direction)) {
$column = 2;
$direction = 'DESC';
} else {
$column = intval($column);
$column = (int) $column;
if (!in_array($direction, ['ASC', 'DESC'])) {
$direction = 'ASC';
}
@ -144,7 +145,7 @@ class MessageManager
LIMIT $from, $number_of_items";
$result = Database::query($sql);
$message_list = [];
$messageList = [];
$newMessageLink = api_get_path(WEB_CODE_PATH).'messages/new_message.php';
while ($row = Database::fetch_array($result, 'ASSOC')) {
$messageId = $row['col0'];
@ -156,10 +157,9 @@ class MessageManager
$title = Security::remove_XSS($title, STUDENT, true);
$title = cut($title, 80, true);
$class = 'class = "read"';
if ($status == 1) {
$class = 'class = "unread"';
} else {
$class = 'class = "read"';
}
$userInfo = api_get_user_info($senderId);
@ -201,10 +201,10 @@ class MessageManager
foreach ($message as $key => $value) {
$message[$key] = api_xml_http_response_encode($value);
}
$message_list[] = $message;
$messageList[] = $message;
}
return $message_list;
return $messageList;
}
/**
@ -1117,9 +1117,10 @@ class MessageManager
/**
* Gets information about messages sent.
*
* @param int
* @param int
* @param string
* @param int
* @param int
* @param string
* @param string
*
* @return array
*/
@ -1129,13 +1130,13 @@ class MessageManager
$column,
$direction
) {
$from = intval($from);
$number_of_items = intval($number_of_items);
$from = (int) $from;
$number_of_items = (int) $number_of_items;
if (!isset($direction)) {
$column = 2;
$direction = 'DESC';
} else {
$column = intval($column);
$column = (int) $column;
if (!in_array($direction, ['ASC', 'DESC'])) {
$direction = 'ASC';
}
@ -1168,13 +1169,12 @@ class MessageManager
ORDER BY col$column $direction
LIMIT $from, $number_of_items";
$result = Database::query($sql);
$i = 0;
$message_list = [];
while ($row = Database::fetch_array($result, 'ASSOC')) {
$messageId = $row['col0'];
$title = $row['col1'];
$sendDate = $row['col2'];
$status = $row['msg_status'];
$senderId = $row['user_sender_id'];
if ($request === true) {
@ -1212,7 +1212,6 @@ class MessageManager
}
$message_list[] = $message;
$i++;
}
return $message_list;
@ -1281,14 +1280,14 @@ class MessageManager
msg_status = '".MESSAGE_STATUS_NEW."'
WHERE
user_receiver_id=".$currentUserId." AND
id='".$messageId."'";
id = '".$messageId."'";
Database::query($query);
$query = "SELECT * FROM $table
WHERE
msg_status<> ".MESSAGE_STATUS_OUTBOX." AND
user_receiver_id=".$currentUserId." AND
id='".$messageId."'";
user_receiver_id = ".$currentUserId." AND
id = '".$messageId."'";
$result = Database::query($query);
}
}
@ -1331,7 +1330,7 @@ class MessageManager
}
$message_content .= '<tr>';
if (api_get_setting('allow_social_tool') == 'true') {
if (api_get_setting('allow_social_tool') === 'true') {
$message_content .= '<div class="row">';
if ($source == 'outbox') {
$message_content .= '<div class="col-md-12">';
@ -1419,16 +1418,17 @@ class MessageManager
*/
public static function get_user_id_by_email($user_email)
{
$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
$sql = 'SELECT user_id FROM '.$tbl_user.'
$table = Database::get_main_table(TABLE_MAIN_USER);
$sql = 'SELECT user_id
FROM '.$table.'
WHERE email="'.Database::escape_string($user_email).'";';
$rs = Database::query($sql);
$row = Database::fetch_array($rs, 'ASSOC');
if (isset($row['user_id'])) {
return $row['user_id'];
} else {
return null;
}
return null;
}
/**
@ -1566,12 +1566,10 @@ class MessageManager
*
* @param $groupId
* @param $topic_id
* @param $is_member
* @param $messageId
*
* @return string
*/
public static function display_message_for_group($groupId, $topic_id, $is_member, $messageId)
public static function display_message_for_group($groupId, $topic_id)
{
global $my_group_role;
$main_message = self::get_message_by_id($topic_id);
@ -2055,12 +2053,9 @@ class MessageManager
}
/**
* @param $id
* @param array $params
*
* @return string
*/
public static function generate_invitation_form($id, $params = [])
public static function generate_invitation_form()
{
$form = new FormValidator('send_invitation');
$form->addTextarea(
@ -2072,8 +2067,6 @@ class MessageManager
return $form->returnForm();
}
//@todo this functions should be in the message class
/**
* @param string $keyword
*
@ -2242,8 +2235,8 @@ class MessageManager
*/
public static function getMessagesFromLastReceivedMessage($userId, $lastId = 0)
{
$userId = intval($userId);
$lastId = intval($lastId);
$userId = (int) $userId;
$lastId = (int) $lastId;
if (empty($userId)) {
return [];
@ -2446,13 +2439,13 @@ class MessageManager
$i = 1;
while (!feof($file)) {
$line = fgets($file);
//$line = trim($line);
// $line = trim($line);
if (trim($line) == '') {
continue;
}
//Get the mail code, something like 1WBumL-0002xg-FF
// Get the mail code, something like 1WBumL-0002xg-FF
if (preg_match('/(.*)\s((.*)-(.*)-(.*))\s<(.*)$/', $line, $codeMatches)) {
$mail_queue[$i]['code'] = $codeMatches[2];
}
@ -2460,9 +2453,8 @@ class MessageManager
$fullMail = $base.$mail_queue[$i]['code'];
$mailFile = fopen($fullMail, 'r');
//Get the reason of mail fail
// Get the reason of mail fail
$iX = 1;
while (!feof($mailFile)) {
$mailLine = fgets($mailFile);
//if ($iX == 4 && preg_match('/(.*):\s(.*)$/', $mailLine, $matches)) {
@ -2471,13 +2463,12 @@ class MessageManager
) {
$mail_queue[$i]['reason'] = $detailsMatches[3];
}
$iX++;
}
fclose($mailFile);
//Get the time of mail fail
// Get the time of mail fail
if (preg_match('/^\s?(\d+)(\D+)\s+(.*)$/', $line, $timeMatches)) {
$mail_queue[$i]['time'] = $timeMatches[1].$timeMatches[2];
} elseif (preg_match('/^(\s+)((.*)@(.*))\s+(.*)$/', $line, $emailMatches)) {
@ -2569,6 +2560,7 @@ class MessageManager
if (empty($courseInfo)) {
return false;
}
$senderId = api_get_user_id();
if (empty($senderId)) {
return false;

19
main/inc/lib/notebook.lib.php
Unescape View File

@ -116,6 +116,7 @@ class NotebookManager
// Database table definition
$table = Database::get_course_table(TABLE_NOTEBOOK);
$course_id = api_get_course_int_id();
$notebook_id = (int) $notebook_id;
$sql = "SELECT
notebook_id AS notebook_id,
@ -123,7 +124,7 @@ class NotebookManager
description AS note_comment,
session_id AS session_id
FROM $table
WHERE c_id = $course_id AND notebook_id = '".intval($notebook_id)."' ";
WHERE c_id = $course_id AND notebook_id = '".$notebook_id."' ";
$result = Database::query($sql);
if (Database::num_rows($result) != 1) {
return [];
@ -146,9 +147,10 @@ class NotebookManager
*/
public static function update_note($values)
{
if (!is_array($values) or empty($values['note_title'])) {
if (!is_array($values) || empty($values['note_title'])) {
return false;
}
// Database table definition
$table = Database::get_course_table(TABLE_NOTEBOOK);
@ -194,7 +196,9 @@ class NotebookManager
*/
public static function delete_note($notebook_id)
{
if (empty($notebook_id) || $notebook_id != strval(intval($notebook_id))) {
$notebook_id = (int) $notebook_id;
if (empty($notebook_id)) {
return false;
}
@ -205,10 +209,11 @@ class NotebookManager
$sql = "DELETE FROM $table
WHERE
c_id = $course_id AND
notebook_id='".intval($notebook_id)."' AND
notebook_id='".$notebook_id."' AND
user_id = '".api_get_user_id()."'";
$result = Database::query($sql);
$affected_rows = Database::affected_rows($result);
if ($affected_rows != 1) {
return false;
}
@ -217,7 +222,7 @@ class NotebookManager
api_item_property_update(
api_get_course_info(),
TOOL_NOTEBOOK,
intval($notebook_id),
$notebook_id,
'delete',
api_get_user_id()
);
@ -271,12 +276,12 @@ class NotebookManager
// Database table definition
$table = Database::get_course_table(TABLE_NOTEBOOK);
$order_by = " ORDER BY ".$notebookView." $sort_direction ";
$order_by = ' ORDER BY '.$notebookView." $sort_direction ";
// Condition for the session
$condition_session = api_get_session_condition($sessionId);
$cond_extra = $notebookView == 'update_date' ? " AND update_date <> ''" : " ";
$cond_extra = $notebookView == 'update_date' ? " AND update_date <> ''" : ' ';
$course_id = api_get_course_int_id();
$sql = "SELECT * FROM $table

2
main/inc/lib/online.inc.php
Unescape View File

@ -207,7 +207,7 @@ function user_is_online($user_id)
$online_time = time() - $time_limit * 60;
$limit_date = api_get_utc_datetime($online_time);
$user_id = intval($user_id);
$user_id = (int) $user_id;
$query = " SELECT login_user_id, login_date
FROM $track_online_table track

3
main/inc/lib/promotion.lib.php
Unescape View File

@ -226,7 +226,8 @@ class Promotion extends Model
if ($action == 'edit') {
$header = get_lang('Modify');
}
$id = isset($_GET['id']) ? intval($_GET['id']) : '';
$id = isset($_GET['id']) ? (int) $_GET['id'] : '';
$form->addElement('header', '', $header);
$form->addElement('hidden', 'id', $id);

Write Preview
Loading…
Cancel
Save