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

Feature #347 - System libraries, second pass: Removing the parameters __FILE__ and __LINE__ in the Database::query() calls.

Browse Source
skala
Ivan Tcholakov 16 years ago
parent 45bc777651
commit 85ba33f5b1
3 changed files with 12 additions and 12 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. 10
      main/inc/lib/blog.lib.php
  2. 2
      main/inc/lib/message.lib.php
  3. 12
      main/inc/lib/tracking.lib.php

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

@ -273,7 +273,7 @@ class Blog {
if ($result) { if ($result) {
$sql='INSERT INTO '.$blog_table_attachment.'(filename,comment, path, post_id,size, blog_id,comment_id) '. $sql='INSERT INTO '.$blog_table_attachment.'(filename,comment, path, post_id,size, blog_id,comment_id) '.
"VALUES ( '".Database::escape_string($file_name)."', '".Database::escape_string($comment)."', '".Database::escape_string($new_file_name)."' , '".$last_post_id."', '".intval($_FILES['user_upload']['size'])."', '".$blog_id."', '0' )"; "VALUES ( '".Database::escape_string($file_name)."', '".Database::escape_string($comment)."', '".Database::escape_string($new_file_name)."' , '".$last_post_id."', '".intval($_FILES['user_upload']['size'])."', '".$blog_id."', '0' )";
$result=Database::query($sql, __LINE__, __FILE__); $result=Database::query($sql);
$message.=' / '.get_lang('AttachmentUpload'); $message.=' / '.get_lang('AttachmentUpload');
} }
} }
@ -399,7 +399,7 @@ class Blog {
{ {
$sql='INSERT INTO '.$blog_table_attachment.'(filename,comment, path, post_id,size,blog_id,comment_id) '. $sql='INSERT INTO '.$blog_table_attachment.'(filename,comment, path, post_id,size,blog_id,comment_id) '.
"VALUES ( '".Database::escape_string($file_name)."', '".Database::escape_string($comment)."', '".Database::escape_string($new_file_name)."' , '".$post_id."', '".$_FILES['user_upload']['size']."', '".$blog_id."', '".$last_id."' )"; "VALUES ( '".Database::escape_string($file_name)."', '".Database::escape_string($comment)."', '".Database::escape_string($new_file_name)."' , '".$post_id."', '".$_FILES['user_upload']['size']."', '".$blog_id."', '".$last_id."' )";
$result=Database::query($sql, __LINE__, __FILE__); $result=Database::query($sql);
$message.=' / '.get_lang('AttachmentUpload'); $message.=' / '.get_lang('AttachmentUpload');
} }
} }
@ -2142,9 +2142,9 @@ class Blog {
// Give this user basic rights // Give this user basic rights
$sql="INSERT INTO $tbl_user_permissions (user_id,tool,action) VALUES ('".(int)$user_id."','BLOG_" . (int)$blog_id."','article_add')"; $sql="INSERT INTO $tbl_user_permissions (user_id,tool,action) VALUES ('".(int)$user_id."','BLOG_" . (int)$blog_id."','article_add')";
$result = Database::query($sql, __LINE__, __FILE__); $result = Database::query($sql);
$sql="INSERT INTO $tbl_user_permissions (user_id,tool,action) VALUES ('".(int)$user_id."','BLOG_" . (int)$blog_id."','article_comments_add')"; $sql="INSERT INTO $tbl_user_permissions (user_id,tool,action) VALUES ('".(int)$user_id."','BLOG_" . (int)$blog_id."','article_comments_add')";
$result = Database::query($sql, __LINE__, __FILE__); $result = Database::query($sql);
} }
/** /**
@ -2165,7 +2165,7 @@ class Blog {
// Remove this user's permissions. // Remove this user's permissions.
$sql = "DELETE FROM $tbl_user_permissions WHERE user_id = '".(int)$user_id."'"; $sql = "DELETE FROM $tbl_user_permissions WHERE user_id = '".(int)$user_id."'";
$result = Database::query($sql, __LINE__, __FILE__); $result = Database::query($sql);
} }
/** /**

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

@ -437,7 +437,7 @@ class MessageManager
// Storing the attachments if any // Storing the attachments if any
$sql="INSERT INTO $tbl_message_attach(filename,comment, path,message_id,size) $sql="INSERT INTO $tbl_message_attach(filename,comment, path,message_id,size)
VALUES ( '$safe_file_name', '$safe_file_comment', '$safe_new_file_name' , '$message_id', '".$file_attach['size']."' )"; VALUES ( '$safe_file_name', '$safe_file_comment', '$safe_new_file_name' , '$message_id', '".$file_attach['size']."' )";
$result=Database::query($sql, __LINE__, __FILE__); $result=Database::query($sql);
} }
} }

12
main/inc/lib/tracking.lib.php
Unescape View File

@ -906,7 +906,7 @@ class Tracking {
$condition_user = " AND insert_user_id = '$student_id' "; $condition_user = " AND insert_user_id = '$student_id' ";
} }
$sql = "SELECT count(tool) FROM $tbl_item_property WHERE tool='work' $condition_user "; $sql = "SELECT count(tool) FROM $tbl_item_property WHERE tool='work' $condition_user ";
$rs = Database::query($sql, __LINE__, __FILE__); $rs = Database::query($sql);
$row = Database::fetch_row($rs); $row = Database::fetch_row($rs);
return $row[0]; return $row[0];
} }
@ -930,7 +930,7 @@ class Tracking {
$condition_user = " WHERE poster_id = '$student_id' "; $condition_user = " WHERE poster_id = '$student_id' ";
} }
$sql = "SELECT count(post_id) FROM $tbl_messages $condition_user "; $sql = "SELECT count(post_id) FROM $tbl_messages $condition_user ";
$rs = Database::query($sql, __LINE__, __FILE__); $rs = Database::query($sql);
$row = Database::fetch_row($rs); $row = Database::fetch_row($rs);
return $row[0]; return $row[0];
} }
@ -1066,7 +1066,7 @@ class Tracking {
$sql = "SELECT access_date FROM $tbl_stats_access $sql = "SELECT access_date FROM $tbl_stats_access
WHERE access_tool='".TOOL_CHAT."' AND access_user_id='$student_id' AND access_cours_code = '$course_code' ORDER BY access_date DESC limit 1"; WHERE access_tool='".TOOL_CHAT."' AND access_user_id='$student_id' AND access_cours_code = '$course_code' ORDER BY access_date DESC limit 1";
$rs = Database::query($sql, __LINE__, __FILE__); $rs = Database::query($sql);
$row = Database::fetch_array($rs); $row = Database::fetch_array($rs);
$last_connection = $row['access_date']; $last_connection = $row['access_date'];
if (!empty($last_connection)) { if (!empty($last_connection)) {
@ -1094,7 +1094,7 @@ class Tracking {
WHERE links_user_id=' . $student_id . ' WHERE links_user_id=' . $student_id . '
AND links_cours_id="' . $course_code . '"'; AND links_cours_id="' . $course_code . '"';
$rs = Database::query($sql, __LINE__, __FILE__); $rs = Database::query($sql);
return Database::num_rows($rs); return Database::num_rows($rs);
} }
@ -1111,7 +1111,7 @@ class Tracking {
WHERE down_user_id=' . $student_id . ' WHERE down_user_id=' . $student_id . '
AND down_cours_id="' . $course_code . '"'; AND down_cours_id="' . $course_code . '"';
$rs = Database::query($sql, __LINE__, __FILE__); $rs = Database::query($sql);
return Database::num_rows($rs); return Database::num_rows($rs);
} }
@ -1120,7 +1120,7 @@ class Tracking {
$id_session = intval($id_session); $id_session = intval($id_session);
$tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER); $tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
$sql = 'SELECT course_code FROM ' . $tbl_session_course_user . ' WHERE id_user="' . $user_id . '" AND id_session="' . $id_session . '"'; $sql = 'SELECT course_code FROM ' . $tbl_session_course_user . ' WHERE id_user="' . $user_id . '" AND id_session="' . $id_session . '"';
$result = Database::query($sql, __LINE__, __FILE__); $result = Database::query($sql);
$a_courses = array (); $a_courses = array ();
while ($row = Database::fetch_array($result)) { while ($row = Database::fetch_array($result)) {
$a_courses[$row['course_code']] = $row['course_code']; $a_courses[$row['course_code']] = $row['course_code'];

Write Preview
Loading…
Cancel
Save