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

More minor corrections, not important.

Browse Source
skala
Ivan Tcholakov 15 years ago
parent c522a8bf9d
commit b81b576864
11 changed files with 782 additions and 782 deletions
  1. 2
      main/coursecopy/classes/CourseBuilder.class.php
  2. 8
      main/forum/forumfunction.inc.php
  3. 2
      main/inc/lib/course.lib.php
  4. 10
      main/inc/lib/document.lib.php
  5. 6
      main/inc/lib/tracking.lib.php
  6. 20
      main/inc/lib/usermanager.lib.php
  7. 6
      main/inc/local.inc.php
  8. 2
      main/install/update-db-1.8.6.2-1.8.7.inc.php
  9. 16
      main/tracking/exams.php
  10. 1490
      main/user/subscribe_user.php
  11. 2
      user_portal.php

2
main/coursecopy/classes/CourseBuilder.class.php
Unescape View File

@ -717,7 +717,7 @@ class CourseBuilder {
$tbl_wiki = Database::get_course_table(TABLE_WIKI);
$sql = 'SELECT * FROM ' . $tbl_wiki . ' WHERE session_id = 0';
}
$db_result = api_sql_query($sql);
$db_result = Database::query($sql);
while ($obj = Database::fetch_object($db_result))
{
$wiki = new Wiki($obj->id, $obj->page_id, $obj->reflink, $obj->title, $obj->content, $obj->user_id, $obj->group_id, $obj->dtime, $obj->progress, $obj->version);

8
main/forum/forumfunction.inc.php
Unescape View File

@ -718,10 +718,10 @@ function delete_post($post_id) {
$thread_id_of_deleted_post = $tab_post_info['thread_id'];
$forum_if_of_deleted_post = $tab_post_info['forum_id'];
$sql = "UPDATE $table_posts SET post_parent_id=$post_parent_id_of_deleted_post WHERE post_parent_id=$post_id AND thread_id=$thread_id_of_deleted_post AND forum_id=$forum_if_of_deleted_post;";
api_sql_query($sql);
Database::query($sql);
$sql="DELETE FROM $table_posts WHERE post_id='".Database::escape_string($post_id)."'"; // note: this has to be a recursive function that deletes all of the posts in this block.
api_sql_query($sql);
Database::query($sql);
//delete attachment file about this post id
delete_attachment($post_id);
@ -734,13 +734,13 @@ function delete_post($post_id) {
thread_last_post='".Database::escape_string($last_post_of_thread['post_id'])."',
thread_date='".Database::escape_string($last_post_of_thread['post_date'])."'
WHERE thread_id='".intval($_GET['thread'])."'";
api_sql_query($sql);
Database::query($sql);
return 'PostDeleted';
}
if (!$last_post_of_thread) {
// we deleted the very single post of the thread so we need to delete the entry in the thread table also.
$sql="DELETE FROM $table_threads WHERE thread_id='".intval($_GET['thread'])."'";
api_sql_query($sql);
Database::query($sql);
return 'PostDeletedSpecial';
}
}

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

@ -1821,7 +1821,7 @@ class CourseManager {
WHERE $with_special_courses
GROUP BY course.code
ORDER BY user_course_category.sort,course.title,course_rel_user.sort ASC";
$rs_special_course = api_sql_query($sql);
$rs_special_course = Database::query($sql);
if (Database::num_rows($rs_special_course) > 0) {
while ($result_row = Database::fetch_array($rs_special_course)) {
$result_row['special_course'] = 1;

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

@ -998,7 +998,7 @@ class DocumentManager {
}
$sql='UPDATE '.$tbl_category.' SET document_id="'.Database::escape_string($document_id).'"
WHERE course_code="'.Database::escape_string($course_id).'" '.$sql_session;
$rs=Database::query($sql,__FILE__,__LINE__);
$rs=Database::query($sql);
}
/**
@ -1018,7 +1018,7 @@ class DocumentManager {
}
$sql='SELECT document_id FROM '.$tbl_category.'
WHERE course_code="'.Database::escape_string($course_id).'" '.$sql_session;
$rs=Database::query($sql,__FILE__,__LINE__);
$rs=Database::query($sql);
$row=Database::fetch_array($rs);
return $row['document_id'];
}
@ -1037,7 +1037,7 @@ class DocumentManager {
$sql='SELECT path FROM '.$tbl_document.' WHERE id="'.Database::escape_string($document_id).'" ';
$rs=Database::query($sql,__FILE__,__LINE__);
$rs=Database::query($sql);
$new_content = '';
if (Database::num_rows($rs)) {
$row=Database::fetch_array($rs);
@ -1127,7 +1127,7 @@ class DocumentManager {
$sql='UPDATE '.$tbl_category.' SET document_id=null
WHERE course_code="'.Database::escape_string($course_id).'" AND document_id="'.$default_certificate_id.'" '.$sql_session;
$rs=Database::query($sql,__FILE__,__LINE__);
$rs=Database::query($sql);
}
}
@ -1164,7 +1164,7 @@ class DocumentManager {
global $_course;
$tbl_document=Database::get_course_table(TABLE_DOCUMENT);
$sql='SELECT id FROM '.$tbl_document.' WHERE path="/certificates" ';
$rs=Database::query($sql,__FILE__,__LINE__);
$rs=Database::query($sql);
$row=Database::fetch_array($rs);
return $row['id'];
}

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

@ -1595,7 +1595,7 @@ class Tracking {
AND stats_login.login_course_date IS NULL
GROUP BY course_user.user_id';
}
$rs = api_sql_query($sql);
$rs = Database::query($sql);
$inactive_users = array();
while($user = Database::fetch_array($rs))
{
@ -2174,7 +2174,7 @@ class TrackingCourseLog {
$sql = "SELECT user.user_id, field.field_value FROM $table_user user, $table_user_field_values field
WHERE user.user_id = field.user_id
AND field.field_id='".intval($field_id)."'";
$result = api_sql_query($sql);
$result = Database::query($sql);
while($row = Database::fetch_array($result)) {
$return[$row['user_id']][] = $row['field_value'];
}
@ -2219,7 +2219,7 @@ class TrackingCourseLog {
ON (user.user_id = field.user_id)
WHERE field.field_id=".intval($field_id)." AND user.user_id IN ($users)";
$result = api_sql_query($sql);
$result = Database::query($sql);
while($row = Database::fetch_array($result)) {
// get option value for field type double select by id
if (!empty($row['field_value'])) {

20
main/inc/lib/usermanager.lib.php
Unescape View File

@ -1849,7 +1849,7 @@ class UserManager
WHERE course_rel_user.user_id = '".$user_id."' AND course_rel_user.relation_type<>".COURSE_RELATION_TYPE_RRHH." $where_access_url
ORDER BY user_course_category.sort, course_rel_user.sort, course.title ASC";
$course_list_sql_result = api_sql_query($personal_course_list_sql);
$course_list_sql_result = Database::query($personal_course_list_sql);
$personal_course_list = array();
if (Database::num_rows($course_list_sql_result) > 0 ) {
@ -2938,7 +2938,7 @@ class UserManager
WHERE $code_special_courses $where_access_url
GROUP BY course.code
ORDER BY user_course_category.sort,course.title,course_rel_user.sort ASC";
$course_list_sql_result = api_sql_query($course_list_sql);
$course_list_sql_result = Database::query($course_list_sql);
while ($result_row = Database::fetch_array($course_list_sql_result)) {
$course_list[] = $result_row;
}
@ -3097,11 +3097,11 @@ class UserManager
} else {
$sql = "SELECT user_id FROM $tbl_user_rel_user WHERE friend_user_id = $hr_dept_id AND relation_type = '".USER_RELATION_TYPE_RRHH."' ";
}
$result = Database::query($sql,__FILE__,__LINE__);
$result = Database::query($sql);
if (Database::num_rows($result) > 0) {
while ($row = Database::fetch_array($result)) {
$sql = "DELETE FROM $tbl_user_rel_user WHERE user_id = '{$row['user_id']}' AND friend_user_id = $hr_dept_id AND relation_type = '".USER_RELATION_TYPE_RRHH."' ";
Database::query($sql,__FILE__,__LINE__);
Database::query($sql);
}
}
@ -3110,7 +3110,7 @@ class UserManager
foreach ($users_id as $user_id) {
$user_id = intval($user_id);
$insert_sql = "INSERT IGNORE INTO $tbl_user_rel_user(user_id, friend_user_id, relation_type) VALUES('$user_id', $hr_dept_id, '".USER_RELATION_TYPE_RRHH."')";
Database::query($insert_sql,__FILE__,__LINE__);
Database::query($insert_sql);
$affected_rows = Database::affected_rows();
}
}
@ -3156,7 +3156,7 @@ class UserManager
$sql='SELECT u.user_id FROM '.$table_user.' u
INNER JOIN '.$table_course_user.' ru ON ru.user_id=u.user_id
WHERE ru.status=1 AND ru.course_code="'.Database::escape_string($course_id).'" ';
$rs=Database::query($sql,__FILE__,__LINE__);
$rs=Database::query($sql);
$num_rows=Database::num_rows($rs);
if ($num_rows==1) {
$row=Database::fetch_array($rs);
@ -3170,7 +3170,7 @@ class UserManager
$sql='SELECT u.user_id FROM '.$table_user.' u
INNER JOIN '.$table_session_course_user.' sru
ON sru.id_user=u.user_id WHERE sru.course_code="'.Database::escape_string($course_id).'" ';
$rs=Database::query($sql,__FILE__,__LINE__);
$rs=Database::query($sql);
$row=Database::fetch_array($rs);
return $row['user_id'];
@ -3186,7 +3186,7 @@ class UserManager
public function is_user_certified($cat_id,$user_id) {
$table_certificate = Database::get_main_table(TABLE_MAIN_GRADEBOOK_CERTIFICATE);
$sql='SELECT path_certificate FROM '.$table_certificate.' WHERE cat_id="'.Database::escape_string($cat_id).'" AND user_id="'.Database::escape_string($user_id).'" ';
$rs=Database::query($sql,__FILE__,__LINE__);
$rs=Database::query($sql);
$row=Database::fetch_array($rs);
if ($row['path_certificate']=='' || is_null($row['path_certificate'])) {
return false;
@ -3205,7 +3205,7 @@ class UserManager
$tbl_grade_certificate = Database::get_main_table(TABLE_MAIN_GRADEBOOK_CERTIFICATE);
$tbl_grade_category = Database::get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
$sql='SELECT * FROM '.$tbl_grade_certificate.' WHERE cat_id= (SELECT id FROM '.$tbl_grade_category.' WHERE course_code = "'.Database::escape_string($course_code).'" ) AND user_id="'.Database::escape_string($user_id).'" ';
$rs = Database::query($sql,__FILE__,__LINE__);
$rs = Database::query($sql);
$row= Database::fetch_array($rs);
if (Database::num_rows($rs) > 0)
return $row;
@ -3235,7 +3235,7 @@ class UserManager
$sql= "SELECT tc.path_certificate,tc.cat_id,tgc.course_code,tgc.name FROM $table_certificate tc, $table_gradebook_category tgc
WHERE tgc.id = tc.cat_id AND tc.user_id='$user_id' ORDER BY tc.date_certificate DESC limit 5";
$rs=Database::query($sql,__FILE__,__LINE__);
$rs=Database::query($sql);
while ($row=Database::fetch_array($rs)) {
$my_certificate[]=$row;
}

6
main/inc/local.inc.php
Unescape View File

@ -892,7 +892,7 @@ if (isset($cidReset) && $cidReset) { // course session data refresh requested or
AND course_code='$course_code'
AND login_course_date > now() - INTERVAL $session_lifetime SECOND
ORDER BY login_course_date DESC LIMIT 0,1";
$result=Database::query($sql,__FILE__,__LINE__);
$result=Database::query($sql);
if (Database::num_rows($result)>0) {
@ -903,12 +903,12 @@ if (isset($cidReset) && $cidReset) { // course session data refresh requested or
"SET logout_course_date = '$time', " .
"counter = counter+1 " .
"WHERE course_access_id=".intval($i_course_access_id);
Database::query($sql,__FILE__,__LINE__);
Database::query($sql);
} else {
$sql="INSERT INTO $course_tracking_table
(course_code, user_id, login_course_date, logout_course_date, counter)" .
"VALUES('".$course_code."', '".$_user['user_id']."', '$time', '$time', '1')";
Database::query($sql,__FILE__,__LINE__);
Database::query($sql);
}
}
}

2
main/install/update-db-1.8.6.2-1.8.7.inc.php
Unescape View File

@ -462,7 +462,7 @@ if (defined('SYSTEM_INSTALLATION')) {
$sql = 'SELECT id, url, parent_id FROM '.$t_student_publication;
$result = Database::query($sql);
if (Database::num_rows($result) > 0) {
$items = api_store_result($result);
$items = Database::store_result($result);
$directory_list = $file_list=array();
foreach($items as $item) {

16
main/tracking/exams.php
Unescape View File

@ -50,7 +50,7 @@ if ($global) {
//Get exam lists
$t_quiz = Database::get_course_table(TABLE_QUIZ_TEST,$_course['db_name']);
$sqlExercices = " SELECT quiz.title,id FROM ".$t_quiz." AS quiz WHERE active='1' ORDER BY quiz.title ASC";
$resultExercices = api_sql_query($sqlExercices,__FILE__,__LINE__);
$resultExercices = Database::query($sqlExercices);
$exercise_list[0] = get_lang('All');
while($a_exercices = Database::fetch_array($resultExercices)) {
$exercise_list[$a_exercices['id']] = $a_exercices['title'];
@ -131,8 +131,8 @@ foreach($course_list as $current_course ) {
$t_quiz = Database::get_course_table(TABLE_QUIZ_TEST,$current_course['db_name']);
$sqlExercices = "SELECT count(id) as count FROM ".$t_quiz." AS quiz WHERE active='1' ";
$resultExercices = api_sql_query($sqlExercices,__FILE__,__LINE__);
$data_exercises = api_store_result($resultExercices);
$resultExercices = Database::query($sqlExercices);
$data_exercises = Database::store_result($resultExercices);
$exercise_count = $data_exercises[0]['count'];
if ($global) {
if ($exercise_count == 0) {
@ -145,7 +145,7 @@ foreach($course_list as $current_course ) {
}
$sql='SELECT visibility FROM '.$current_course['db_name'].'.'.TABLE_TOOL_LIST.' WHERE name="quiz" ';
$resultVisibilityQuizz = api_sql_query($sql,__FILE__,__LINE__);
$resultVisibilityQuizz = Database::query($sql);
if (Database::result($resultVisibilityQuizz, 0 ,'visibility') == 1) {
$sqlExercices = " SELECT quiz.title,id FROM ".$t_quiz." AS quiz WHERE active='1' ORDER BY quiz.title ASC";
@ -155,7 +155,7 @@ foreach($course_list as $current_course ) {
$sqlExercices = " SELECT quiz.title,id FROM ".$t_quiz." AS quiz WHERE active='1' AND id = $exercise_id ORDER BY quiz.title ASC";
}
}
$resultExercices = api_sql_query($sqlExercices,__FILE__,__LINE__);
$resultExercices = Database::query($sqlExercices);
$i = 0;
if (Database::num_rows($resultExercices) > 0) {
@ -195,7 +195,7 @@ foreach($course_list as $current_course ) {
AND exe_user_id='".$current_student_id."'";
$resultEssais = api_sql_query($sqlEssais,__FILE__,__LINE__);
$resultEssais = Database::query($sqlEssais);
$a_essais = Database::fetch_array($resultEssais);
$sqlScore = "SELECT exe_id, exe_result,exe_weighting
@ -206,7 +206,7 @@ foreach($course_list as $current_course ) {
ORDER BY exe_result DESC LIMIT 1"; // we take the higher value
//ORDER BY exe_date DESC LIMIT 1";
$resultScore = api_sql_query($sqlScore,__FILE__,__LINE__);
$resultScore = Database::query($sqlScore);
$score = 0;
while($a_score = Database::fetch_array($resultScore)) {
@ -263,7 +263,7 @@ foreach($course_list as $current_course ) {
/*
$sql_last_attempt='SELECT exe_id FROM '.$tbl_stats_exercices.' WHERE exe_exo_id="'.$a_exercices['id'].'" AND exe_user_id="'.$current_student_id.'" AND exe_cours_id="'.$current_course['code'].'" ORDER BY exe_date DESC LIMIT 1';
$resultLastAttempt = api_sql_query($sql_last_attempt,__FILE__,__LINE__);
$resultLastAttempt = Database::query($sql_last_attempt);
if(Database::num_rows($resultLastAttempt)>0) {
$id_last_attempt=Database::result($resultLastAttempt,0,0);
if($a_essais['essais']>0) {

1490
main/user/subscribe_user.php
View File

File diff suppressed because it is too large Load Diff

2
user_portal.php
Unescape View File

@ -279,7 +279,7 @@ function display_special_courses ($user_id) {
LEFT JOIN $TABLECOURSUSER course_rel_user ON course.code = course_rel_user.course_code AND course_rel_user.user_id = '$user_id'
WHERE $with_special_courses";
$rs_special_course = api_sql_query($sql);
$rs_special_course = Database::query($sql);
$number_of_courses = Database::num_rows($rs_special_course);
$key = 0;
$status_icon = '';

Write Preview
Loading…
Cancel
Save