From 592090d48ac4a1f0a77f1017786e477f820ea0a1 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Wed, 25 Mar 2015 12:16:11 +0100 Subject: [PATCH] affected_rows() function now needs a parameter. --- main/admin/resume_session.php | 4 +- main/admin/session_course_list.php | 6 +- main/admin/session_course_user.php | 10 +- main/admin/session_course_user_list.php | 4 +- main/admin/user_fields.php | 12 +-- main/exercice/testcategory.class.php | 11 ++- main/inc/lib/api.lib.php | 10 +- main/inc/lib/attendance.lib.php | 77 +++++++++------- main/inc/lib/auth.lib.php | 34 +++---- main/inc/lib/classmanager.lib.php | 8 +- main/inc/lib/course.lib.php | 12 ++- main/inc/lib/course_description.lib.php | 19 ++-- main/inc/lib/dashboard.lib.php | 11 ++- main/inc/lib/display.lib.php | 2 +- main/inc/lib/glossary.lib.php | 2 +- main/inc/lib/myspace.lib.php | 4 +- main/inc/lib/notebook.lib.php | 11 ++- main/inc/lib/sessionmanager.lib.php | 45 +++++---- main/inc/lib/thematic.lib.php | 48 +++++----- main/inc/lib/usermanager.lib.php | 4 +- main/newscorm/learnpath.class.php | 4 +- main/newscorm/storageapi.php | 2 +- main/user/resume_session.php | 112 +++++++++++------------ main/user/userInfoLib.php | 21 +---- main/webservices/registration.soap.php | 52 ++++++----- plugin/buycourses/src/buy_course.lib.php | 60 ++++++------ plugin/buycourses/src/function.php | 14 +-- plugin/ticket/src/ticket.class.php | 12 +-- 28 files changed, 314 insertions(+), 297 deletions(-) diff --git a/main/admin/resume_session.php b/main/admin/resume_session.php index cbf69c1703..55968661d3 100755 --- a/main/admin/resume_session.php +++ b/main/admin/resume_session.php @@ -115,9 +115,9 @@ switch ($action) { } if (!empty($_GET['class'])) { - Database::query("DELETE FROM $tbl_session_rel_class + $result = Database::query("DELETE FROM $tbl_session_rel_class WHERE session_id='$sessionId' AND class_id=".intval($_GET['class'])); - $nbr_affected_rows=Database::affected_rows(); + $nbr_affected_rows = Database::affected_rows($result); Database::query("UPDATE $tbl_session SET nbr_classes=nbr_classes-$nbr_affected_rows WHERE id='$sessionId'"); } diff --git a/main/admin/session_course_list.php b/main/admin/session_course_list.php index 2c03a81295..e3b9857497 100755 --- a/main/admin/session_course_list.php +++ b/main/admin/session_course_list.php @@ -47,8 +47,8 @@ if ($action == 'delete') { } $idChecked = $my_temp; $idChecked="'".implode("','", $idChecked)."'"; - Database::query("DELETE FROM $tbl_session_rel_course WHERE id_session='$id_session' AND course_code IN($idChecked)"); - $nbr_affected_rows=Database::affected_rows(); + $result = Database::query("DELETE FROM $tbl_session_rel_course WHERE id_session='$id_session' AND course_code IN($idChecked)"); + $nbr_affected_rows=Database::affected_rows($result); Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND course_code IN($idChecked)"); Database::query("UPDATE $tbl_session SET nbr_courses=nbr_courses-$nbr_affected_rows WHERE id='$id_session'"); } @@ -97,4 +97,4 @@ echo ' '; -Display::display_footer(); \ No newline at end of file +Display::display_footer(); diff --git a/main/admin/session_course_user.php b/main/admin/session_course_user.php index 2b77f7e6e6..c6e7e3313c 100755 --- a/main/admin/session_course_user.php +++ b/main/admin/session_course_user.php @@ -84,8 +84,8 @@ if (isset($_POST['formSent']) && $_POST['formSent']) { $enreg_course = Database::escape_string($enreg_course); $sql_delete = "DELETE FROM $tbl_session_rel_course_rel_user WHERE id_user='".$id_user."' AND course_code='".$enreg_course."' AND id_session=$id_session"; - Database::query($sql_delete); - if (Database::affected_rows()) { + $result = Database::query($sql_delete); + if (Database::affected_rows($result)) { //update session rel course table $sql_update = "UPDATE $tbl_session_rel_course SET nbr_users= nbr_users - 1 WHERE id_session='$id_session' AND course_code='$enreg_course'"; Database::query($sql_update); @@ -94,11 +94,11 @@ if (isset($_POST['formSent']) && $_POST['formSent']) { } foreach($existingCourses as $existingCourse) { //$sql_insert_rel_course= "INSERT INTO $tbl_session_rel_course(id_session,course_code, id_coach) VALUES('$id_session','$enreg_course','$id_coach')"; - if(!in_array($existingCourse['code'], $CourseList)){ + if (!in_array($existingCourse['code'], $CourseList)){ $existingCourse = Database::escape_string($existingCourse['code']); $sql_insert = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user(id_session,course_code,id_user) VALUES('$id_session','$existingCourse','$id_user')"; - Database::query($sql_insert); - if(Database::affected_rows()) { + $result = Database::query($sql_insert); + if (Database::affected_rows($result)) { //update session rel course table $sql_update = "UPDATE $tbl_session_rel_course SET nbr_users= nbr_users + 1 WHERE id_session='$id_session' AND course_code='$existingCourse'"; Database::query($sql_update); diff --git a/main/admin/session_course_user_list.php b/main/admin/session_course_user_list.php index 5837d7a1ef..27dd995428 100755 --- a/main/admin/session_course_user_list.php +++ b/main/admin/session_course_user_list.php @@ -59,8 +59,8 @@ switch ($action) { $idChecked = implode(',',$idChecked); } if (!empty($idChecked)) { - Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND course_code='".$course_code."' AND id_user IN($idChecked)"); - $nbr_affected_rows = Database::affected_rows(); + $result = Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND course_code='".$course_code."' AND id_user IN($idChecked)"); + $nbr_affected_rows = Database::affected_rows($result); Database::query("UPDATE $tbl_session_rel_course SET nbr_users=nbr_users-$nbr_affected_rows WHERE id_session='$id_session' AND course_code='".$course_code."'"); } header('Location: '.api_get_self().'?id_session='.$id_session.'&course_code='.urlencode($course_code).'&sort='.$sort); diff --git a/main/admin/user_fields.php b/main/admin/user_fields.php index 824c7762ac..68fa4d3157 100755 --- a/main/admin/user_fields.php +++ b/main/admin/user_fields.php @@ -356,25 +356,23 @@ function delete_user_fields($field_id) // delete the fields $sql = "DELETE FROM $table_user_field WHERE id = ".intval($field_id)." "; $result = Database::query($sql); - if (Database::affected_rows() == 1) - { + if (Database::affected_rows($result) == 1) { // delete the field options $sql = "DELETE FROM $table_user_field_options WHERE field_id = ".intval($field_id).""; - $result = Database::query($sql); + Database::query($sql); // delete the field values $sql = "DELETE FROM $table_user_field_values WHERE field_id = ".intval($field_id).""; - $result = Database::query($sql); + Database::query($sql); // recalculate the field_order because the value is used to show/hide the up/down icon // and the field_order value cannot be bigger than the number of fields $sql = "SELECT * FROM $table_user_field ORDER BY field_order ASC"; $result = Database::query($sql); $i = 1; - while($row = Database::fetch_array($result)) - { + while($row = Database::fetch_array($result)){ $sql_reorder = "UPDATE $table_user_field SET field_order = '".Database::escape_string($i)."' WHERE id = ".intval($row['id']).""; - $result_reorder = Database::query($sql_reorder); + Database::query($sql_reorder); $i++; } diff --git a/main/exercice/testcategory.class.php b/main/exercice/testcategory.class.php index be536e0f3b..e0e2f09181 100755 --- a/main/exercice/testcategory.class.php +++ b/main/exercice/testcategory.class.php @@ -106,12 +106,13 @@ class Testcategory $tbl_question_rel_cat = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY); $v_id = intval($this->id); $sql = "DELETE FROM $t_cattable WHERE id=$v_id AND c_id=".api_get_course_int_id(); - Database::query($sql); - if (Database::affected_rows() <= 0) { + $result = Database::query($sql); + if (Database::affected_rows($result) <= 0) { return false; } else { // remove link between question and category - $sql2 = "DELETE FROM $tbl_question_rel_cat WHERE category_id=$v_id AND c_id=".api_get_course_int_id(); + $sql2 = "DELETE FROM $tbl_question_rel_cat + WHERE category_id=$v_id AND c_id=".api_get_course_int_id(); Database::query($sql2); // item_property update $course_code = api_get_course_id(); @@ -132,8 +133,8 @@ class Testcategory $v_description = Database::escape_string($this->description); $sql = "UPDATE $t_cattable SET title='$v_name', description='$v_description' WHERE id = $v_id AND c_id=".api_get_course_int_id(); - Database::query($sql); - if (Database::affected_rows() <= 0) { + $result = Database::query($sql); + if (Database::affected_rows($result) <= 0) { return false; } else { // item_property update diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php index b1e26e5ca4..3096598c78 100644 --- a/main/inc/lib/api.lib.php +++ b/main/inc/lib/api.lib.php @@ -3777,9 +3777,9 @@ function api_item_property_update( lastedit_user_id='$user_id' $set_type WHERE $filter"; } - Database::query($sql); + $result = Database::query($sql); // Insert if no entries are found (can only happen in case of $lastedit_type switch is 'default'). - if (Database::affected_rows() == 0) { + if (Database::affected_rows($result) == 0) { $sql = "INSERT INTO $TABLE_ITEMPROPERTY (c_id, tool,ref,insert_date,insert_user_id,lastedit_date,lastedit_type, lastedit_user_id, $to_field, visibility, start_visible, end_visible, id_session) VALUES ($course_id, '$tool', '$item_id', '$time', '$user_id', '$time', '$lastedit_type', '$user_id', '$to_value', '$visibility', '$start_visible', '$end_visible', '$session_id')"; $res = Database::query($sql); @@ -3912,10 +3912,12 @@ function api_track_item_property_update($tool, $ref, $title, $content, $progress lastedit_date = '".api_get_utc_datetime()."', lastedit_user_id = '".api_get_user_id()."', session_id = '".api_get_session_id()."'"; - Database::query($sql); - $affected_rows = Database::affected_rows(); + $result = Database::query($sql); + $affected_rows = Database::affected_rows($result); + return $affected_rows; } + return false; } diff --git a/main/inc/lib/attendance.lib.php b/main/inc/lib/attendance.lib.php index 7f096e3f0b..2577a19956 100755 --- a/main/inc/lib/attendance.lib.php +++ b/main/inc/lib/attendance.lib.php @@ -305,8 +305,8 @@ class Attendance attendance_qualify_title = '$title_gradebook', attendance_weight = '$weight_calification', session_id = '$session_id'"; - Database::query($sql); - $affected_rows = Database::affected_rows(); + $result = Database::query($sql); + $affected_rows = Database::affected_rows($result); $last_id = 0; if (!empty($affected_rows)) { // save inside item property table @@ -412,8 +412,8 @@ class Attendance $id = intval($id); $sql = "UPDATE $tbl_attendance SET active = 1 WHERE c_id = $course_id AND id = '$id'"; - Database::query($sql); - $affected_rows = Database::affected_rows(); + $result = Database::query($sql); + $affected_rows = Database::affected_rows($result); if (!empty($affected_rows)) { // update row item property table api_item_property_update($_course, TOOL_ATTENDANCE, $id,"restore", $user_id); @@ -423,8 +423,8 @@ class Attendance $attendance_id = intval($attendance_id); $sql = "UPDATE $tbl_attendance SET active = 1 WHERE c_id = $course_id AND id = '$attendance_id'"; - Database::query($sql); - $affected_rows = Database::affected_rows(); + $result = Database::query($sql); + $affected_rows = Database::affected_rows($result); if (!empty($affected_rows)) { // update row item property table api_item_property_update($_course, TOOL_ATTENDANCE, $attendance_id,"restore", $user_id); @@ -450,8 +450,8 @@ class Attendance $id = intval($id); $sql = "UPDATE $tbl_attendance SET active = 2 WHERE c_id = $course_id AND id = '$id'"; - Database::query($sql); - $affected_rows = Database::affected_rows(); + $result = Database::query($sql); + $affected_rows = Database::affected_rows($result); if (!empty($affected_rows)) { // update row item property table api_item_property_update($_course, TOOL_ATTENDANCE, $id, "delete", $user_id); @@ -461,9 +461,8 @@ class Attendance $attendance_id = intval($attendance_id); $sql = "UPDATE $tbl_attendance SET active = 2 WHERE c_id = $course_id AND id = '$attendance_id'"; - - Database::query($sql); - $affected_rows = Database::affected_rows(); + $result = Database::query($sql); + $affected_rows = Database::affected_rows($result); if (!empty($affected_rows)) { // update row item property table api_item_property_update( @@ -502,8 +501,8 @@ class Attendance $id = intval($id); $sql = "UPDATE $tbl_attendance SET active = $status WHERE c_id = $course_id AND id = '$id'"; - Database::query($sql); - $affected_rows = Database::affected_rows(); + $result = Database::query($sql); + $affected_rows = Database::affected_rows($result); if (!empty($affected_rows)) { // update row item property table api_item_property_update($_course, TOOL_ATTENDANCE, $id, $action, $user_id); @@ -513,8 +512,8 @@ class Attendance $attendanceId = intval($attendanceId); $sql = "UPDATE $tbl_attendance SET active = $status WHERE c_id = $course_id AND id = '$attendanceId'"; - Database::query($sql); - $affected_rows = Database::affected_rows(); + $result = Database::query($sql); + $affected_rows = Database::affected_rows($result); if (!empty($affected_rows)) { // update row item property table api_item_property_update( @@ -543,8 +542,8 @@ class Attendance $locked = ($lock)?1:0; $upd = "UPDATE $tbl_attendance SET locked = $locked WHERE c_id = $course_id AND id = $attendance_id"; - Database::query($upd); - $affected_rows = Database::affected_rows(); + $result = Database::query($upd); + $affected_rows = Database::affected_rows($result); if ($affected_rows && $lock) { //save attendance sheet log $lastedit_date = Date('Y-m-d H:i:s'); @@ -709,13 +708,17 @@ class Attendance user_id = '$uid', attendance_calendar_id = '$calendar_id', presence = 1"; - Database::query($sql); - $affected_rows += Database::affected_rows(); + $result = Database::query($sql); + $affected_rows += Database::affected_rows($result); } else { $sql = "UPDATE $tbl_attendance_sheet SET presence = 1 - WHERE c_id = $course_id AND user_id ='$uid' AND attendance_calendar_id = '$calendar_id'"; - Database::query($sql); - $affected_rows += Database::affected_rows(); + WHERE + c_id = $course_id AND + user_id ='$uid' AND + attendance_calendar_id = '$calendar_id' + "; + $result = Database::query($sql); + $affected_rows += Database::affected_rows($result); } } @@ -732,13 +735,16 @@ class Attendance user_id ='$uid', attendance_calendar_id = '$calendar_id', presence = 0"; - Database::query($sql); - $affected_rows += Database::affected_rows(); + $result = Database::query($sql); + $affected_rows += Database::affected_rows($result); } else { $sql = "UPDATE $tbl_attendance_sheet SET presence = 0 - WHERE c_id = $course_id AND user_id ='$uid' AND attendance_calendar_id = '$calendar_id'"; - Database::query($sql); - $affected_rows += Database::affected_rows(); + WHERE + c_id = $course_id AND + user_id ='$uid' AND + attendance_calendar_id = '$calendar_id'"; + $result = Database::query($sql); + $affected_rows += Database::affected_rows($result); } } @@ -878,9 +884,9 @@ class Attendance $ins = "INSERT INTO $tbl_attendance_sheet_log (c_id, attendance_id, lastedit_date, lastedit_type, lastedit_user_id, calendar_date_value) VALUES ($course_id, $attendance_id, '$lastedit_date', '$lastedit_type', $lastedit_user_id, '$calendar_date_value')"; - Database::query($ins); + $result = Database::query($ins); - return Database::affected_rows(); + return Database::affected_rows($result); } /** @@ -1388,7 +1394,10 @@ class Attendance 'attendance_id' => $attendance_id ); $id = Database::insert($tbl_attendance_calendar, $params); - $affected_rows = Database::affected_rows(); + + if ($id) { + $affected_rows++; + } $this->addAttendanceCalendarToGroup($id, $course_id, $groupList); } @@ -1595,8 +1604,8 @@ class Attendance $sql = "UPDATE $tbl_attendance_calendar SET date_time='".Database::escape_string($this->date_time)."' WHERE c_id = $course_id AND id = '".intval($calendar_id)."'"; - Database::query($sql); - $affected_rows = Database::affected_rows(); + $result = Database::query($sql); + $affected_rows = Database::affected_rows($result); } // update locked attendance @@ -1606,6 +1615,7 @@ class Attendance } else { self::lock_attendance($attendance_id); } + return $affected_rows; } @@ -1642,6 +1652,7 @@ class Attendance Database::query($sql); $this->deleteAttendanceCalendarGroup($cal['id'], $course_id); + $affected_rows++; } } } else { @@ -1655,9 +1666,9 @@ class Attendance Database::query($sql); $this->deleteAttendanceCalendarGroup($calendar_id, $course_id); + $affected_rows++; } - $affected_rows = Database::affected_rows(); // update users' results $this->update_users_results($user_ids, $attendance_id); diff --git a/main/inc/lib/auth.lib.php b/main/inc/lib/auth.lib.php index 6631562ca7..16140df546 100755 --- a/main/inc/lib/auth.lib.php +++ b/main/inc/lib/auth.lib.php @@ -170,14 +170,14 @@ class Auth $course_code = Database::escape_string($course_code); $newcategory = intval($newcategory); $current_user = api_get_user_id(); - $result = false; + $TABLECOURSUSER = Database::get_main_table(TABLE_MAIN_COURSE_USER); - // max_sort_value($newcategory); $max_sort_value = api_max_sort_value($newcategory, $current_user); - Database::query("UPDATE $TABLECOURSUSER SET user_course_cat='" . $newcategory . "', sort='" . ($max_sort_value + 1) . "' WHERE course_code='" . $course_code . "' AND user_id='" . $current_user . "' AND relation_type<>" . COURSE_RELATION_TYPE_RRHH . " "); + $resultQuery = Database::query("UPDATE $TABLECOURSUSER SET user_course_cat='" . $newcategory . "', sort='" . ($max_sort_value + 1) . "' WHERE course_code='" . $course_code . "' AND user_id='" . $current_user . "' AND relation_type<>" . COURSE_RELATION_TYPE_RRHH . " "); - if (Database::affected_rows()) { + $result = false; + if (Database::affected_rows($resultQuery)) { $result = true; } @@ -228,9 +228,9 @@ class Auth WHERE course_code='" . $source_course['code'] . "' AND user_id='" . $current_user_id . "' AND relation_type<>" . COURSE_RELATION_TYPE_RRHH . " "; $sql_update2 = "UPDATE $TABLECOURSUSER SET sort='" . $source_course['sort'] . "' WHERE course_code='" . $target_course['code'] . "' AND user_id='" . $current_user_id . "' AND relation_type<>" . COURSE_RELATION_TYPE_RRHH . " "; - Database::query($sql_update2); - Database::query($sql_update1); - if (Database::affected_rows()) { + $result1 = Database::query($sql_update2); + $result2 = Database::query($sql_update1); + if (Database::affected_rows($result1) && Database::affected_rows($result2)) { $result = true; } } @@ -272,9 +272,10 @@ class Auth WHERE id='" . intval($source_category['id']) . "' AND user_id='" . $current_user_id . "'"; $sql_update2 = "UPDATE $table_user_defined_category SET sort='" . Database::escape_string($source_category['sort']) . "' WHERE id='" . intval($target_category['id']) . "' AND user_id='" . $current_user_id . "'"; - Database::query($sql_update2); - Database::query($sql_update1); - if (Database::affected_rows()) { + + $result1 = Database::query($sql_update2); + $result2 = Database::query($sql_update1); + if (Database::affected_rows($result1) && Database::affected_rows($result2)) { $result = true; } } @@ -315,8 +316,8 @@ class Auth $sql = "UPDATE $tucc SET title='" . api_htmlentities($title, ENT_QUOTES, api_get_system_encoding()) . "' WHERE id='" . $category_id . "'"; - Database::query($sql); - if (Database::affected_rows()) { + $resultQuery = Database::query($sql); + if (Database::affected_rows($resultQuery)) { $result = true; } return $result; @@ -336,14 +337,15 @@ class Auth $result = false; $sql_delete = "DELETE FROM $tucc WHERE id='" . $category_id . "' and user_id='" . $current_user_id . "'"; - Database::query($sql_delete); - if (Database::affected_rows()) { + $resultQuery = Database::query($sql_delete); + if (Database::affected_rows($resultQuery)) { $result = true; } $sql = "UPDATE $TABLECOURSUSER SET user_course_cat='0' WHERE user_course_cat='" . $category_id . "' AND user_id='" . $current_user_id . "' AND relation_type<>" . COURSE_RELATION_TYPE_RRHH . " "; Database::query($sql); + return $result; } @@ -402,8 +404,8 @@ class Auth if (Database::num_rows($rs) == 0) { $sql_insert = "INSERT INTO $tucc (user_id, title,sort) VALUES ('" . $current_user_id . "', '" . api_htmlentities($category_title, ENT_QUOTES, api_get_system_encoding()) . "', '" . $nextsort . "')"; - Database::query($sql_insert); - if (Database::affected_rows()) { + $resultQuery = Database::query($sql_insert); + if (Database::affected_rows($resultQuery)) { $result = true; } } else { diff --git a/main/inc/lib/classmanager.lib.php b/main/inc/lib/classmanager.lib.php index 65f97cf3a3..c1eb0e4f75 100755 --- a/main/inc/lib/classmanager.lib.php +++ b/main/inc/lib/classmanager.lib.php @@ -33,12 +33,14 @@ class ClassManager * Create a class * @param string $name */ - public static function create_class($name) { + public static function create_class($name) + { $table_class = Database :: get_main_table(TABLE_MAIN_CLASS); $sql = "INSERT INTO $table_class SET name='".Database::escape_string($name)."'"; - Database::query($sql); - return Database::affected_rows() == 1; + $result = Database::query($sql); + return Database::affected_rows($result) == 1; } + /** * Check if a classname is allready in use * @param string $name diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php index 29819eaf40..26464d03d6 100755 --- a/main/inc/lib/course.lib.php +++ b/main/inc/lib/course.lib.php @@ -3003,10 +3003,10 @@ class CourseManager if (is_array($courses_list)) { foreach ($courses_list as $course_code) { $course_code = Database::escape_string($course_code); - $insert_sql = "INSERT IGNORE INTO $tbl_course_rel_user(course_code, user_id, status, relation_type) - VALUES('$course_code', $hr_manager_id, '" . DRH . "', '" . COURSE_RELATION_TYPE_RRHH . "')"; - Database::query($insert_sql); - if (Database::affected_rows()) { + $sql = "INSERT IGNORE INTO $tbl_course_rel_user(course_code, user_id, status, relation_type) + VALUES('$course_code', $hr_manager_id, '" . DRH . "', '" . COURSE_RELATION_TYPE_RRHH . "')"; + $result = Database::query($sql); + if (Database::affected_rows($result)) { $affected_rows++; } } @@ -3626,7 +3626,9 @@ class CourseManager // Browse through all courses. while ($course = Database::fetch_array($result)) { $course_info = api_get_course_info($course['code']); - if ($course_info['visibility'] == COURSE_VISIBILITY_HIDDEN) { + if (isset($course_info['visibility']) && + $course_info['visibility'] == COURSE_VISIBILITY_HIDDEN + ) { continue; } $course_info['id_session'] = null; diff --git a/main/inc/lib/course_description.lib.php b/main/inc/lib/course_description.lib.php index 7bdeb961d8..7b77fc5bb5 100755 --- a/main/inc/lib/course_description.lib.php +++ b/main/inc/lib/course_description.lib.php @@ -207,9 +207,9 @@ class CourseDescription content = '".Database::escape_string($this->content)."', progress = '".intval($this->progress)."', session_id = '".intval($this->session_id)."' "; - Database::query($sql); + $result = Database::query($sql); $last_id = Database::insert_id(); - $affected_rows = Database::affected_rows(); + $affected_rows = Database::affected_rows($result); if ($last_id > 0) { //insert into item_property api_item_property_update(api_get_course_info(), TOOL_COURSE_DESCRIPTION, $last_id, 'CourseDescriptionAdded', api_get_user_id()); @@ -241,8 +241,8 @@ class CourseDescription lastedit_date = '".date('Y-m-d H:i:s')."', lastedit_user_id = '".api_get_user_id()."', session_id = '".intval($this->session_id)."'"; - Database::query($sql); - $affected_rows = Database::affected_rows(); + $result = Database::query($sql); + $affected_rows = Database::affected_rows($result); return $affected_rows; } @@ -262,8 +262,8 @@ class CourseDescription session_id = '".$this->session_id."' AND c_id = ".api_get_course_int_id()." "; - Database::query($sql); - $affected_rows = Database::affected_rows(); + $result = Database::query($sql); + $affected_rows = Database::affected_rows($result); if ($this->id > 0) { //insert into item_property @@ -280,9 +280,10 @@ class CourseDescription { $tbl_course_description = Database::get_course_table(TABLE_COURSE_DESCRIPTION); $course_id = api_get_course_int_id(); - $sql = "DELETE FROM $tbl_course_description WHERE c_id = $course_id AND id = '".intval($this->id)."' AND session_id = '".intval($this->session_id)."'"; - Database::query($sql); - $affected_rows = Database::affected_rows(); + $sql = "DELETE FROM $tbl_course_description + WHERE c_id = $course_id AND id = '".intval($this->id)."' AND session_id = '".intval($this->session_id)."'"; + $result = Database::query($sql); + $affected_rows = Database::affected_rows($result); if ($this->id > 0) { //insert into item_property api_item_property_update(api_get_course_info(), TOOL_COURSE_DESCRIPTION, $this->id, 'CourseDescriptionDeleted', api_get_user_id()); diff --git a/main/inc/lib/dashboard.lib.php b/main/inc/lib/dashboard.lib.php index 0f85d117c9..4ee0668a70 100755 --- a/main/inc/lib/dashboard.lib.php +++ b/main/inc/lib/dashboard.lib.php @@ -204,7 +204,8 @@ class DashboardManager if (Database::num_rows($rs) > 0) { // update $upd = "UPDATE $tbl_block SET active = 1 WHERE path = '$selected_path'"; - Database::query($upd); + $result = Database::query($upd); + $affected_rows = Database::affected_rows($result); } else { // insert $plugin_info_file = $dashboard_pluginpath.$testplugin."/$testplugin.info"; @@ -232,10 +233,12 @@ class DashboardManager $plugin_controller = Database::escape_string($plugin_info['controller']); } - $ins = "INSERT INTO $tbl_block(name, description, path, controller) VALUES ('$plugin_name', '$plugin_description', '$plugin_path', '$plugin_controller')"; - Database::query($ins); + $ins = "INSERT INTO $tbl_block(name, description, path, controller) + VALUES ('$plugin_name', '$plugin_description', '$plugin_path', '$plugin_controller')"; + $result = Database::query($ins); + $affected_rows = Database::affected_rows($result); } - $affected_rows = Database::affected_rows(); + } } diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php index 9063cc367d..a17bfdf301 100755 --- a/main/inc/lib/display.lib.php +++ b/main/inc/lib/display.lib.php @@ -1284,7 +1284,7 @@ class Display $course_code = Database::escape_string($course_info['code']); $user_id = api_get_user_id(); - $course_id = $course_info['real_id']; + $course_id = intval($course_info['real_id']); $course_info['id_session'] = intval($course_info['id_session']); // Get the user's last access dates to all tools of this course diff --git a/main/inc/lib/glossary.lib.php b/main/inc/lib/glossary.lib.php index ac2a2b0aec..779a33ceac 100755 --- a/main/inc/lib/glossary.lib.php +++ b/main/inc/lib/glossary.lib.php @@ -289,7 +289,7 @@ class GlossaryManager $sql = "DELETE FROM $t_glossary WHERE c_id = $course_id AND glossary_id='".intval($glossary_id)."'"; $result = Database::query($sql); - if ($result === false or Database::affected_rows() < 1) { return false; } + if ($result === false or Database::affected_rows($result) < 1) { return false; } //update item_property (delete) api_item_property_update(api_get_course_info(), TOOL_GLOSSARY, intval($glossary_id), 'delete', api_get_user_id()); diff --git a/main/inc/lib/myspace.lib.php b/main/inc/lib/myspace.lib.php index 7af2518591..f78a878a72 100644 --- a/main/inc/lib/myspace.lib.php +++ b/main/inc/lib/myspace.lib.php @@ -2475,8 +2475,8 @@ class MySpace $sql = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user(id_session,course_code,id_user) VALUES('$id_session','$enreg_course','$userid')"; $course_session = array('course' => $enreg_course, 'added' => 1); //$user['added_at_session'] = $course_session; - Database::query($sql); - if (Database::affected_rows()) { + $result = Database::query($sql); + if (Database::affected_rows($result)) { $nbr_users++; } $new_users[] = $user; diff --git a/main/inc/lib/notebook.lib.php b/main/inc/lib/notebook.lib.php index 4fc19dabc6..a70f2a1815 100755 --- a/main/inc/lib/notebook.lib.php +++ b/main/inc/lib/notebook.lib.php @@ -66,12 +66,14 @@ class NotebookManager '" . Database::escape_string(date('Y-m-d H:i:s')) . "', '0')"; $result = Database::query($sql); + $affected_rows = Database::affected_rows($result); + $id = Database::insert_id(); if ($id > 0) { //insert into item_property api_item_property_update(api_get_course_info(), TOOL_NOTEBOOK, $id, 'NotebookAdded', api_get_user_id()); } - $affected_rows = Database::affected_rows(); + if (!empty($affected_rows)) { return $id; } @@ -125,10 +127,10 @@ class NotebookManager update_date = '" . Database::escape_string(date('Y-m-d H:i:s')) . "' WHERE c_id = $course_id AND notebook_id = '" . Database::escape_string($values['notebook_id']) . "'"; $result = Database::query($sql); + $affected_rows = Database::affected_rows($result); //update item_property (update) api_item_property_update(api_get_course_info(), TOOL_NOTEBOOK, $values['notebook_id'], 'NotebookUpdated', api_get_user_id()); - $affected_rows = Database::affected_rows(); if (!empty($affected_rows)) { return true; } @@ -144,9 +146,10 @@ class NotebookManager $course_id = api_get_course_int_id(); - $sql = "DELETE FROM $t_notebook WHERE c_id = $course_id AND notebook_id='" . intval($notebook_id) . "' AND user_id = '" . api_get_user_id() . "'"; + $sql = "DELETE FROM $t_notebook + WHERE c_id = $course_id AND notebook_id='" . intval($notebook_id) . "' AND user_id = '" . api_get_user_id() . "'"; $result = Database::query($sql); - $affected_rows = Database::affected_rows(); + $affected_rows = Database::affected_rows($result); if ($affected_rows != 1) { return false; } diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php index 14d80a9749..e0dff7460c 100755 --- a/main/inc/lib/sessionmanager.lib.php +++ b/main/inc/lib/sessionmanager.lib.php @@ -1628,8 +1628,8 @@ class SessionManager if (!in_array($existing_user, $user_list)) { $sql = "DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND course_code='$enreg_course' AND id_user='$existing_user' AND status = 0"; - Database::query($sql); - if (Database::affected_rows()) { + $result = Database::query($sql); + if (Database::affected_rows($result)) { $nbr_users--; } } @@ -1643,8 +1643,8 @@ class SessionManager $enreg_user = Database::escape_string($enreg_user); $sql = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user(id_session, course_code, id_user, visibility, status) VALUES('$id_session','$enreg_course','$enreg_user','$session_visibility', '0')"; - Database::query($sql); - if (Database::affected_rows()) { + $result = Database::query($sql); + if (Database::affected_rows($result)) { $nbr_users++; } } @@ -1870,8 +1870,8 @@ class SessionManager if ($count == 0) { $sql = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user (id_session, course_code, id_user, visibility) VALUES ('$session_id','$course_code','$enreg_user','$session_visibility')"; - Database::query($sql); - if (Database::affected_rows()) { + $result = Database::query($sql); + if (Database::affected_rows($result)) { $nbr_users++; } } @@ -1934,8 +1934,8 @@ class SessionManager id_session = '$session_id' AND id_user ='$user_id' AND relation_type <> " . SESSION_RELATION_TYPE_RRHH . ""; - Database::query($delete_sql); - $return = Database::affected_rows(); + $result = Database::query($delete_sql); + $return = Database::affected_rows($result); // Update number of users $sql = "UPDATE $tbl_session @@ -1952,8 +1952,8 @@ class SessionManager // Delete user from course $sql = "DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$session_id' AND course_code='$course_code' AND id_user='$user_id'"; - Database::query($sql); - if (Database::affected_rows()) { + $result = Database::query($sql); + if (Database::affected_rows($result)) { // Update number of users in this relation $sql = "UPDATE $tbl_session_rel_course SET nbr_users = nbr_users - 1 WHERE id_session='$session_id' AND course_code='$course_code'"; @@ -2058,8 +2058,8 @@ class SessionManager $enreg_user_id = intval($enreg_user['id_user']); $sql = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user (id_session, course_code, id_user) VALUES ($sessionId,'$enreg_course',$enreg_user_id)"; - Database::query($sql); - if (Database::affected_rows()) { + $result = Database::query($sql); + if (Database::affected_rows($result)) { $nbr_users++; } } @@ -2102,9 +2102,8 @@ class SessionManager // Unsubscribe course $sql = "DELETE FROM $tbl_session_rel_course WHERE course_code='$course_code' AND id_session='$session_id'"; - Database::query($sql); - - $nb_affected = Database::affected_rows(); + $result = Database::query($sql); + $nb_affected = Database::affected_rows($result); $sql = "DELETE FROM $tbl_session_rel_course_rel_user WHERE course_code='$course_code' AND id_session='$session_id'"; @@ -2627,8 +2626,8 @@ class SessionManager // and then exit $sql = "UPDATE $tbl_session_rel_course_rel_user SET status = 0 WHERE id_session = '$session_id' AND course_code = '$course_code' AND id_user = '$user_id' "; - Database::query($sql); - if (Database::affected_rows() > 0) + $result = Database::query($sql); + if (Database::affected_rows($result) > 0) return true; else return false; @@ -2638,8 +2637,8 @@ class SessionManager // and then exit $sql = "DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session = '$session_id' AND course_code = '$course_code' AND id_user = '$user_id' "; - Database::query($sql); - if (Database::affected_rows() > 0) + $result = Database::query($sql); + if (Database::affected_rows($result) > 0) return true; else return false; @@ -2655,8 +2654,8 @@ class SessionManager if (Database::num_rows($rs_check) > 0) { $sql = "UPDATE $tbl_session_rel_course_rel_user SET status = 2 WHERE id_session = '$session_id' AND course_code = '$course_code' AND id_user = '$user_id' "; - Database::query($sql); - if (Database::affected_rows() > 0) { + $result = Database::query($sql); + if (Database::affected_rows($result) > 0) { return true; } else { return false; @@ -2664,8 +2663,8 @@ class SessionManager } else { $sql = "INSERT INTO $tbl_session_rel_course_rel_user(id_session, course_code, id_user, status) VALUES('$session_id', '$course_code', '$user_id', 2)"; - Database::query($sql); - if (Database::affected_rows() > 0) { + $result = Database::query($sql); + if (Database::affected_rows($result) > 0) { return true; } else { return false; diff --git a/main/inc/lib/thematic.lib.php b/main/inc/lib/thematic.lib.php index c5762d8203..e8aed54d2f 100755 --- a/main/inc/lib/thematic.lib.php +++ b/main/inc/lib/thematic.lib.php @@ -294,9 +294,9 @@ class Thematic // insert $sql = "INSERT INTO $tbl_thematic (c_id, title, content, active, display_order, session_id) VALUES ($this->course_int_id, '$title', '$content', 1, ".(intval($max_thematic_item)+1).", $session_id) "; - Database::query($sql); + $result = Database::query($sql); $last_id = Database::insert_id(); - if (Database::affected_rows()) { + if (Database::affected_rows($result)) { // save inside item property table $last_id = Database::insert_id(); api_item_property_update($_course, 'thematic', $last_id,"ThematicAdded", $user_id); @@ -305,9 +305,9 @@ class Thematic // update $sql = "UPDATE $tbl_thematic SET title = '$title', content = '$content', session_id = $session_id WHERE id = $id AND c_id = {$this->course_int_id}"; - Database::query($sql); + $result = Database::query($sql); $last_id = $id; - if (Database::affected_rows()) { + if (Database::affected_rows($result)) { // save inside item property table api_item_property_update( $_course, @@ -339,8 +339,8 @@ class Thematic $id = intval($id); $sql = "UPDATE $tbl_thematic SET active = 0 WHERE c_id = $course_id AND id = $id"; - Database::query($sql); - $affected_rows += Database::affected_rows(); + $result = Database::query($sql); + $affected_rows += Database::affected_rows($result); if (!empty($affected_rows)) { // update row item property table api_item_property_update($_course, 'thematic', $id,"ThematicDeleted", $user_id); @@ -349,8 +349,8 @@ class Thematic } else { $thematic_id = intval($thematic_id); $sql = "UPDATE $tbl_thematic SET active = 0 WHERE c_id = $course_id AND id = $thematic_id"; - Database::query($sql); - $affected_rows = Database::affected_rows(); + $result = Database::query($sql); + $affected_rows = Database::affected_rows($result); if (!empty($affected_rows)) { // update row item property table api_item_property_update($_course, 'thematic', $thematic_id,"ThematicDeleted", $user_id); @@ -673,18 +673,18 @@ class Thematic // Insert $sql = "INSERT INTO $tbl_thematic_advance (c_id, thematic_id, attendance_id, content, start_date, duration) VALUES ($this->course_int_id, $tematic_id, $attendance_id, '$content', '".api_get_utc_datetime($start_date)."', '$duration') "; - Database::query($sql); + $result = Database::query($sql); $last_id = Database::insert_id(); - if (Database::affected_rows()) { + if (Database::affected_rows($result)) { api_item_property_update($_course, 'thematic_advance', $last_id,"ThematicAdvanceAdded", $user_id); } } else { // update $sql = "UPDATE $tbl_thematic_advance SET thematic_id = '$tematic_id', attendance_id = '$attendance_id', content = '$content', start_date = '".api_get_utc_datetime($start_date)."', duration = '$duration' WHERE c_id = {$this->course_int_id} AND id = $id "; - Database::query($sql); - if (Database::affected_rows()) { + $result = Database::query($sql); + if (Database::affected_rows($result)) { api_item_property_update($_course, 'thematic_advance', $id, "ThematicAdvanceUpdated", $user_id); } } @@ -711,8 +711,8 @@ class Thematic $sql = "DELETE FROM $tbl_thematic_advance WHERE c_id = $course_id AND id = $thematic_advance_id "; - Database::query($sql); - $affected_rows = Database::affected_rows(); + $result = Database::query($sql); + $affected_rows = Database::affected_rows($result); if ($affected_rows) { api_item_property_update( $_course, @@ -857,8 +857,8 @@ class Thematic if ($update) { // update $upd = "UPDATE $tbl_thematic_plan SET title = '$title', description = '$description' WHERE c_id = $course_id AND id = $thematic_plan_id"; - Database::query($upd); - $affected_rows = Database::affected_rows(); + $result = Database::query($upd); + $affected_rows = Database::affected_rows($result); if ($affected_rows) { api_item_property_update($_course, 'thematic_plan', $thematic_plan_id, "ThematicPlanUpdated", $user_id); } @@ -866,9 +866,9 @@ class Thematic // insert $ins = "INSERT INTO $tbl_thematic_plan (c_id, thematic_id, title, description, description_type) VALUES ($this->course_int_id, $thematic_id, '$title', '$description', $description_type) "; - Database::query($ins); + $result = Database::query($ins); $last_id = Database::insert_id(); - $affected_rows = Database::affected_rows(); + $affected_rows = Database::affected_rows($result); if ($affected_rows) { api_item_property_update($_course, 'thematic_plan', $last_id,"ThematicPlanAdded", $user_id); } @@ -877,9 +877,9 @@ class Thematic // insert $ins = "INSERT INTO $tbl_thematic_plan (c_id, thematic_id, title, description, description_type) VALUES($this->course_int_id, $thematic_id, '$title', '$description', $description_type) "; - Database::query($ins); + $result = Database::query($ins); $last_id = Database::insert_id(); - $affected_rows = Database::affected_rows(); + $affected_rows = Database::affected_rows($result); if ($affected_rows) { api_item_property_update($_course, 'thematic_plan', $last_id,"ThematicPlanAdded", $user_id); } @@ -914,8 +914,8 @@ class Thematic // delete $sql = "DELETE FROM $tbl_thematic_plan WHERE c_id = $course_id AND thematic_id = $thematic_id AND description_type = $description_type "; - Database::query($sql); - $affected_rows = Database::affected_rows(); + $result = Database::query($sql); + $affected_rows = Database::affected_rows($result); if ($affected_rows) { api_item_property_update( $_course, @@ -1008,8 +1008,8 @@ class Thematic // update done thematic for previous advances ((done_advance = 1)) $upd = "UPDATE $tbl_thematic_advance SET done_advance = 1 WHERE c_id = $course_id AND id = ".$thematic_advance['id']." "; - Database::query($upd); - $my_affected_rows = Database::affected_rows(); + $result = Database::query($upd); + $my_affected_rows = Database::affected_rows($result); $affected_rows += $my_affected_rows; //if ($my_affected_rows) { api_item_property_update($_course, 'thematic_advance', $thematic_advance['id'], "ThematicAdvanceDone", $user_id); diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php index b24815ad87..696df174d0 100755 --- a/main/inc/lib/usermanager.lib.php +++ b/main/inc/lib/usermanager.lib.php @@ -2146,8 +2146,8 @@ class UserManager // deleting the answer of the user who has chosen this option $sql_delete_option_value = "DELETE FROM $table_field_options_values WHERE field_id = '".intval($fieldid)."' AND field_value = '".Database::escape_string($row['option_value'])."'"; - Database::query($sql_delete_option_value); - $return['deleted_option_values'] = $return['deleted_option_values'] + Database::affected_rows(); + $result = Database::query($sql_delete_option_value); + $return['deleted_option_values'] = $return['deleted_option_values'] + Database::affected_rows($result); } // we now try to find the field options that are newly added diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php index e9c4b5c612..0b29d83749 100755 --- a/main/newscorm/learnpath.class.php +++ b/main/newscorm/learnpath.class.php @@ -4493,9 +4493,9 @@ class learnpath if ($this->debug > 2) { error_log('New LP - lp updated with new name : ' . $this->name, 0); } - Database::query($sql); + $result = Database::query($sql); // If the lp is visible on the homepage, change his name there. - if (Database::affected_rows()) { + if (Database::affected_rows($result)) { $session_id = api_get_session_id(); $session_condition = api_get_session_condition($session_id); $tbl_tool = Database :: get_course_table(TABLE_TOOL_LIST); diff --git a/main/newscorm/storageapi.php b/main/newscorm/storageapi.php index 25feea5bb9..bdcf02f8fa 100755 --- a/main/newscorm/storageapi.php +++ b/main/newscorm/storageapi.php @@ -155,7 +155,7 @@ function storage_set($sv_user, $sv_course, $sv_sco, $sv_key, $sv_value) { values ('$sv_user','$sv_sco','$sv_course','$sv_key','$sv_value')"; $res = Database::query($sql); - return Database::affected_rows(); + return Database::affected_rows($res); } function storage_getall($sv_user, $sv_course, $sv_sco) { diff --git a/main/user/resume_session.php b/main/user/resume_session.php index ac2c153831..ccd3598042 100755 --- a/main/user/resume_session.php +++ b/main/user/resume_session.php @@ -31,31 +31,31 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') { $tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER); $tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER); $tbl_session_category = Database::get_main_table(TABLE_MAIN_SESSION_CATEGORY); - + $table_access_url_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); - + $sql = 'SELECT name, nbr_courses, nbr_users, nbr_classes, DATE_FORMAT(date_start,"%d-%m-%Y") as date_start, DATE_FORMAT(date_end,"%d-%m-%Y") as date_end, lastname, firstname, username, session_admin_id, nb_days_access_before_beginning, nb_days_access_after_end, session_category_id, visibility FROM '.$tbl_session.' LEFT JOIN '.$tbl_user.' ON id_coach = user_id WHERE '.$tbl_session.'.id='.$id_session; - + $rs = Database::query($sql); $session = Database::store_result($rs); $session = $session[0]; - + $sql = 'SELECT name FROM '.$tbl_session_category.' WHERE id = "'.intval($session['session_category_id']).'"'; $rs = Database::query($sql); $session_category = ''; - + if (Database::num_rows($rs)>0) { $rows_session_category = Database::store_result($rs); $rows_session_category = $rows_session_category[0]; $session_category = $rows_session_category['name']; } - + $action = isset($_GET['action']) ? $_GET['action'] : null; - + $url_id = api_get_current_access_url_id(); - + switch ($action) { case 'add_user_to_url': $user_id = $_REQUEST['user_id']; @@ -73,50 +73,50 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') { $my_temp[]= Database::escape_string($id);// forcing the escape_string } $idChecked = $my_temp; - + $idChecked="'".implode("','",$idChecked)."'"; - - Database::query("DELETE FROM $tbl_session_rel_course WHERE id_session='$id_session' AND course_code IN($idChecked)"); - $nbr_affected_rows=Database::affected_rows(); - + + $result = Database::query("DELETE FROM $tbl_session_rel_course WHERE id_session='$id_session' AND course_code IN($idChecked)"); + $nbr_affected_rows=Database::affected_rows($result); + Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND course_code IN($idChecked)"); Database::query("UPDATE $tbl_session SET nbr_courses=nbr_courses-$nbr_affected_rows WHERE id='$id_session'"); } - + if (!empty($_GET['class'])){ - Database::query("DELETE FROM $tbl_session_rel_class WHERE session_id='$id_session' AND class_id=".intval($_GET['class'])); - $nbr_affected_rows=Database::affected_rows(); + $result = Database::query("DELETE FROM $tbl_session_rel_class WHERE session_id='$id_session' AND class_id=".intval($_GET['class'])); + $nbr_affected_rows=Database::affected_rows($result); Database::query("UPDATE $tbl_session SET nbr_classes=nbr_classes-$nbr_affected_rows WHERE id='$id_session'"); } - + if (!empty($_GET['user'])) { - Database::query("DELETE FROM $tbl_session_rel_user WHERE relation_type<>".SESSION_RELATION_TYPE_RRHH." AND id_session='$id_session' AND id_user=".intval($_GET['user'])); - $nbr_affected_rows=Database::affected_rows(); - + $result = Database::query("DELETE FROM $tbl_session_rel_user WHERE relation_type<>".SESSION_RELATION_TYPE_RRHH." AND id_session='$id_session' AND id_user=".intval($_GET['user'])); + $nbr_affected_rows = Database::affected_rows($result); + Database::query("UPDATE $tbl_session SET nbr_users=nbr_users-$nbr_affected_rows WHERE id='$id_session'"); - - Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND id_user=".intval($_GET['user'])); - $nbr_affected_rows=Database::affected_rows(); - + + $result = Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND id_user=".intval($_GET['user'])); + $nbr_affected_rows=Database::affected_rows($result); + Database::query("UPDATE $tbl_session_rel_course SET nbr_users=nbr_users-$nbr_affected_rows WHERE id_session='$id_session'"); } break; } Display::display_header($tool_name); - + if (!empty($_GET['warn'])) { Display::display_warning_message(urldecode($_GET['warn'])); } - + if (!empty($message)) { echo $message; } - + echo Display::page_header(Display::return_icon('session.png', get_lang('Session')).' '.$session['name']); - - + + echo Display::page_subheader(get_lang('GeneralProperties').$url); - + ?> @@ -179,11 +179,11 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') { - +
'; echo 'URL'; @@ -198,13 +198,13 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') { ?>

- + - + @@ -228,20 +228,20 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') { $courses=Database::store_result($result); foreach ($courses as $course) { //select the number of users - + $sql = " SELECT count(*) FROM $tbl_session_rel_user sru, $tbl_session_rel_course_rel_user srcru WHERE srcru.id_user = sru.id_user AND srcru.id_session = sru.id_session AND srcru.course_code = '".Database::escape_string($course['code'])."' AND sru.relation_type<>".SESSION_RELATION_TYPE_RRHH." AND srcru.id_session = '".intval($id_session)."'"; - + $rs = Database::query($sql); $course['nbr_users'] = Database::result($rs,0,0); - + // Get coachs of the courses in session - + $sql = "SELECT user.lastname,user.firstname,user.username FROM $tbl_session_rel_course_rel_user session_rcru, $tbl_user user WHERE session_rcru.id_user = user.user_id AND session_rcru.id_session = '".intval($id_session)."' AND session_rcru.course_code ='".Database::escape_string($course['code'])."' AND session_rcru.status=2"; $rs = Database::query($sql); - + $coachs = array(); if (Database::num_rows($rs) > 0) { while($info_coach = Database::fetch_array($rs)) { @@ -250,13 +250,13 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') { } else { $coach = get_lang('None'); } - + if (count($coachs) > 0) { $coach = implode('
',$coachs); } else { $coach = get_lang('None'); } - + $orig_param = '&origin=resume_session'; //hide_course_breadcrumb the parameter has been added to hide the name of the course, that appeared in the default $interbreadcrumb echo ' @@ -264,22 +264,22 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') { - + '; } } ?>
'.Display::url($course['title'].' ('.$course['visual_code'].')', api_get_path(WEB_COURSE_PATH).$course['code'].'/?id_session='.$id_session),' '.$coach.' '.$course['nbr_users'].'

- + - + - + '; } else { $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname'; - + if ($multiple_url_is_on) { $sql = "SELECT u.user_id, lastname, firstname, username, access_url_id FROM $tbl_user u @@ -313,7 +313,7 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') { ON u.user_id = su.id_user AND su.relation_type<>".SESSION_RELATION_TYPE_RRHH." AND su.id_session = ".$id_session.$order_clause; } - + $result = Database::query($sql); $users = Database::store_result($result); $orig_param = '&origin=resume_session&id_session='.$id_session; // change breadcrumb in destination page @@ -322,9 +322,9 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') { if (!empty($user['user_id'])) { $user_link = ''.api_htmlentities(api_get_person_name($user['firstname'], $user['lastname']),ENT_QUOTES,$charset).' ('.$user['username'].')'; } - + $link_to_add_user_in_url = ''; - + if ($multiple_url_is_on) { if ($user['access_url_id'] != $url_id) { $user_link .= ' '.Display::return_icon('warning.png', get_lang('UserNotAddedInURL'), array(), ICON_SIZE_SMALL); @@ -352,4 +352,4 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') { api_not_allowed(); } // footer -Display :: display_footer(); \ No newline at end of file +Display :: display_footer(); diff --git a/main/user/userInfoLib.php b/main/user/userInfoLib.php index ace9d30e4e..4384eef96b 100755 --- a/main/user/userInfoLib.php +++ b/main/user/userInfoLib.php @@ -250,28 +250,13 @@ function update_user_course_properties($user_id, $course_code, $properties) $result = Database::query($sql); - if (Database::affected_rows() > 0) - { + if (Database::affected_rows($result) > 0) { return true; - } - else - { + } else { return false; } } - - - - -/*---------------------------------------- - CATEGORIES CONTENT TREATMENT - --------------------------------------*/ - - - - - /** * fill a bloc for information category * @@ -598,4 +583,4 @@ function htmlize($phrase) { global $charset; return nl2br(htmlspecialchars($phrase,ENT_QUOTES,$charset)); -} \ No newline at end of file +} diff --git a/main/webservices/registration.soap.php b/main/webservices/registration.soap.php index 45f048f402..bea69b9d29 100755 --- a/main/webservices/registration.soap.php +++ b/main/webservices/registration.soap.php @@ -4300,8 +4300,8 @@ function WSUnsubscribeUserFromCourse($params) { foreach($usersList as $user_id) { $course_code = Database::escape_string($course_code); $sql = "DELETE FROM $table_course_user WHERE user_id = '$user_id' AND course_code = '".$course_code."'"; - Database::query($sql); - $return = Database::affected_rows(); + $result = Database::query($sql); + $return = Database::affected_rows($result); } $results[] = 1; continue; @@ -4482,8 +4482,8 @@ function WSSuscribeUsersToSession($params){ if(!in_array($enreg_user, $existingUsers)) { $enreg_user = Database::escape_string($enreg_user); $insert_sql = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user(id_session,course_code,id_user) VALUES('$id_session','$enreg_course','$enreg_user')"; - Database::query($insert_sql); - if (Database::affected_rows()) { + $result = Database::query($insert_sql); + if (Database::affected_rows($result)) { $nbr_users++; } } @@ -4508,8 +4508,8 @@ function WSSuscribeUsersToSession($params){ // update number of users in the session $nbr_users = count($usersList); $update_sql = "UPDATE $tbl_session SET nbr_users= $nbr_users WHERE id='$id_session' "; - Database::query($update_sql); - $return = Database::affected_rows(); + $result = Database::query($update_sql); + $return = Database::affected_rows($result); $results[] = 1; continue; @@ -4753,30 +4753,34 @@ function WSUnsuscribeUsersFromSession($params) { foreach ($existingUsers as $existing_user) { if (!in_array($existing_user, $usersList)) { - $sql = "DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND course_code='$enreg_course' AND id_user='$existing_user'"; - Database::query($sql); + $sql = "DELETE FROM $tbl_session_rel_course_rel_user + WHERE id_session='$id_session' AND course_code='$enreg_course' AND id_user='$existing_user'"; + $result = Database::query($sql); - if (Database::affected_rows()) { + if (Database::affected_rows($result)) { $nbr_users--; } } } // Count users in this session-course relation. - $sql = "SELECT COUNT(id_user) as nbUsers FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND course_code='$enreg_course'"; + $sql = "SELECT COUNT(id_user) as nbUsers + FROM $tbl_session_rel_course_rel_user + WHERE id_session='$id_session' AND course_code='$enreg_course'"; $rs = Database::query($sql); list($nbr_users) = Database::fetch_array($rs); // update the session-course relation to add the users total - $update_sql = "UPDATE $tbl_session_rel_course SET nbr_users=$nbr_users WHERE id_session='$id_session' AND course_code='$enreg_course'"; + $update_sql = "UPDATE $tbl_session_rel_course SET nbr_users=$nbr_users + WHERE id_session='$id_session' AND course_code='$enreg_course'"; Database::query($update_sql); } // Insert missing users into session. - foreach ($usersList as $enreg_user) { $enreg_user = Database::escape_string($enreg_user); - $delete_sql = "DELETE FROM $tbl_session_rel_user WHERE id_session = '$id_session' AND id_user ='$enreg_user' AND relation_type<>".SESSION_RELATION_TYPE_RRHH.""; - Database::query($delete_sql); - $return = Database::affected_rows(); + $delete_sql = "DELETE FROM $tbl_session_rel_user + WHERE id_session = '$id_session' AND id_user ='$enreg_user' AND relation_type<>".SESSION_RELATION_TYPE_RRHH.""; + $result = Database::query($delete_sql); + $return = Database::affected_rows($result); } $nbr_users = 0; $sql = "SELECT nbr_users FROM $tbl_session WHERE id = '$id_session'"; @@ -4789,8 +4793,8 @@ function WSUnsuscribeUsersFromSession($params) { // Update number of users in the session. $update_sql = "UPDATE $tbl_session SET nbr_users= $nbr_users WHERE id='$id_session' "; - Database::query($update_sql); - $return = Database::affected_rows(); + $result = Database::query($update_sql); + $return = Database::affected_rows($result); $results[] = 1; continue; @@ -4799,7 +4803,11 @@ function WSUnsuscribeUsersFromSession($params) { $count_results = count($results); $output = array(); for ($i = 0; $i < $count_results; $i++) { - $output[] = array('original_user_id_values' => $orig_user_id_value[$i], 'original_session_id_value' => $orig_session_id_value[$i], 'result' => $results[$i]); + $output[] = array( + 'original_user_id_values' => $orig_user_id_value[$i], + 'original_session_id_value' => $orig_session_id_value[$i], + 'result' => $results[$i] + ); } return $output; @@ -5052,8 +5060,8 @@ function WSSuscribeCoursesToSession($params) { foreach ($user_list as $enreg_user) { $enreg_user_id = Database::escape_string($enreg_user['id_user']); $sql_insert = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user (id_session,course_code,id_user) VALUES ('$id_session','$enreg_course','$enreg_user_id')"; - Database::query($sql_insert); - if (Database::affected_rows()) { + $result = Database::query($sql_insert); + if (Database::affected_rows($result)) { $nbr_users++; } } @@ -5229,8 +5237,8 @@ function WSUnsuscribeCoursesFromSession($params) { foreach ($course_list as $enreg_course) { $enreg_course = Database::escape_string($enreg_course); Database::query("DELETE FROM $tbl_session_rel_course WHERE course_code='$enreg_course' AND id_session='$id_session'"); - Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE course_code='$enreg_course' AND id_session='$id_session'"); - $return = Database::affected_rows(); + $result = Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE course_code='$enreg_course' AND id_session='$id_session'"); + $return = Database::affected_rows($result); } $nbr_courses = 0; diff --git a/plugin/buycourses/src/buy_course.lib.php b/plugin/buycourses/src/buy_course.lib.php index 433e0db12d..3d723ad3ce 100644 --- a/plugin/buycourses/src/buy_course.lib.php +++ b/plugin/buycourses/src/buy_course.lib.php @@ -26,8 +26,8 @@ function sync() $res = Database::query($sql); while ($row = Database::fetch_assoc($res)) { $sql = "SELECT 1 FROM $tableBuySessionRelCourse WHERE id_session='" . $row['id_session'] . "';"; - Database::query($sql); - if (Database::affected_rows() > 0) { + $result = Database::query($sql); + if (Database::affected_rows($result) > 0) { $sql = "UPDATE $tableBuySessionRelCourse SET sync = 1 WHERE id_session='" . $row['id_session'] . "';"; Database::query($sql); } else { @@ -56,8 +56,8 @@ function sync() } $sql = "SELECT 1 FROM $tableBuyCourse WHERE course_id='" . $row['id'] . "';"; - Database::query($sql); - if (Database::affected_rows() > 0) { + $result = Database::query($sql); + if (Database::affected_rows($result) > 0) { $sql = "UPDATE $tableBuyCourse SET sync = 1, session_id = $courseIdSession WHERE course_id='" . $row['id'] . "';"; Database::query($sql); } else { @@ -80,8 +80,8 @@ function sync() $res = Database::query($sql); while ($row = Database::fetch_assoc($res)) { $sql = "SELECT 1 FROM $tableBuySession WHERE session_id='" . $row['id'] . "';"; - Database::query($sql); - if (Database::affected_rows() > 0) { + $result = Database::query($sql); + if (Database::affected_rows($result) > 0) { $sql = "UPDATE $tableBuySession SET sync = 1 WHERE session_id='" . $row['id'] . "';"; Database::query($sql); } else { @@ -198,15 +198,15 @@ function userSessionList() $sql = "SELECT 1 FROM $tableSessionRelUser WHERE id_session ='".$rowSession['session_id']."' AND id_user = $currentUserId"; - Database::query($sql); - if (Database::affected_rows() > 0) { + $result = Database::query($sql); + if (Database::affected_rows($result) > 0) { $rowSession['enrolled'] = "YES"; } else { $sql = "SELECT 1 FROM $tableBuySessionTemporal WHERE session_id ='".$rowSession['session_id']."' AND user_id='" . $currentUserId . "';"; - Database::query($sql); - if (Database::affected_rows() > 0) { + $result = Database::query($sql); + if (Database::affected_rows($result) > 0) { $rowSession['enrolled'] = "TMP"; } else { $rowSession['enrolled'] = "NO"; @@ -216,8 +216,8 @@ function userSessionList() $sql = "SELECT 1 FROM $tableBuySessionTemporal WHERE session_id ='".$rowSession['session_id']."' AND user_id='" . $currentUserId . "';"; - Database::query($sql); - if (Database::affected_rows() > 0) { + $result = Database::query($sql); + if (Database::affected_rows($result) > 0) { $rowSession['enrolled'] = "TMP"; } else { $rowSession['enrolled'] = "NO"; @@ -263,15 +263,15 @@ function userCourseList() $sql = "SELECT 1 FROM $tableCourseRelUser WHERE course_code='" . $row['code'] . "' AND user_id='" . $currentUserId . "';"; - Database::query($sql); - if (Database::affected_rows() > 0) { + $result = Database::query($sql); + if (Database::affected_rows($result) > 0) { $row['enrolled'] = "YES"; } else { $sql = "SELECT 1 FROM $tableBuyCourseTemporal WHERE course_code='" . $row['code'] . "' AND user_id='" . $currentUserId . "';"; - Database::query($sql); - if (Database::affected_rows() > 0) { + $result = Database::query($sql); + if (Database::affected_rows($result) > 0) { $row['enrolled'] = "TMP"; } else { $row['enrolled'] = "NO"; @@ -281,8 +281,8 @@ function userCourseList() $sql = "SELECT 1 FROM $tableBuyCourseTemporal WHERE course_code='" . $row['code'] . "' AND user_id='" . $currentUserId . "';"; - Database::query($sql); - if (Database::affected_rows() > 0) { + $result = Database::query($sql); + if (Database::affected_rows($result) > 0) { $row['enrolled'] = "TMP"; } else { $row['enrolled'] = "NO"; @@ -313,8 +313,8 @@ function checkUserBuy($parameter, $user, $type = 'COURSE') $sql = $type === 'SESSION' ? sprintf($sql, Database::get_main_table(TABLE_MAIN_SESSION_USER), 'id_session', 'id_user') : sprintf($sql, Database::get_main_table(TABLE_MAIN_COURSE_USER), 'course_code', 'user_id'); - Database::query($sql); - if (Database::affected_rows() > 0) { + $result = Database::query($sql); + if (Database::affected_rows($result) > 0) { return true; } else { return false; @@ -334,8 +334,8 @@ function checkUserBuyTransfer($parameter, $user, $type = 'COURSE') $sql = $type === 'SESSION' ? sprintf($sql, Database::get_main_table(TABLE_BUY_SESSION_TEMPORARY), 'session_id') : sprintf($sql, Database::get_main_table(TABLE_BUY_COURSE_TEMPORAL), 'course_code'); - Database::query($sql); - if (Database::affected_rows() > 0) { + $result = Database::query($sql); + if (Database::affected_rows($result) > 0) { return true; } else { return false; @@ -522,14 +522,14 @@ function sessionInfo($code) if ($currentUserId > 0) { $sql = "SELECT 1 FROM $tableSessionRelUser WHERE id_user = $currentUserId"; - Database::query($sql); - if (Database::affected_rows() > 0) { + $result = Database::query($sql); + if (Database::affected_rows($result) > 0) { $rowSession['enrolled'] = "YES"; } else { $sql = "SELECT 1 FROM $tableBuySessionTemporal WHERE user_id='".$currentUserId."';"; - Database::query($sql); - if (Database::affected_rows() > 0) { + $result = Database::query($sql); + if (Database::affected_rows($result) > 0) { $rowSession['enrolled'] = "TMP"; } else { $rowSession['enrolled'] = "NO"; @@ -538,8 +538,8 @@ function sessionInfo($code) } else { $sql = "SELECT 1 FROM $tableBuySessionTemporal WHERE user_id='".$currentUserId."';"; - Database::query($sql); - if (Database::affected_rows() > 0) { + $result = Database::query($sql); + if (Database::affected_rows($result) > 0) { $rowSession['enrolled'] = "TMP"; } else { $rowSession['enrolled'] = "NO"; @@ -583,8 +583,8 @@ function courseInfo($code) $sql = "SELECT 1 FROM $tableCourseRelUser WHERE course_code='" . $row['code'] . "' AND user_id='" . $currentUserId . "';"; - Database::query($sql); - if (Database::affected_rows() > 0) { + $result = Database::query($sql); + if (Database::affected_rows($result) > 0) { $row['enrolled'] = "YES"; } else { $row['enrolled'] = "NO"; diff --git a/plugin/buycourses/src/function.php b/plugin/buycourses/src/function.php index dca74d124d..db7244e8d3 100644 --- a/plugin/buycourses/src/function.php +++ b/plugin/buycourses/src/function.php @@ -121,15 +121,15 @@ if ($_REQUEST['tab'] == 'sessions_filter') { $sql = "SELECT 1 FROM $tableSessionRelUser WHERE id_session='".$rowSession['session_id']."' AND id_user ='" . $_SESSION['_user']['user_id'] . "';"; - Database::query($sql); - if (Database::affected_rows() > 0) { + $result = Database::query($sql); + if (Database::affected_rows($result) > 0) { $rowSession['enrolled'] = "YES"; } else { $sql = "SELECT 1 FROM $tableBuySessionTemporal WHERE session_id ='".$rowSession['session_id']."' AND user_id='" . $_SESSION['_user']['user_id'] . "';"; - Database::query($sql); - if (Database::affected_rows() > 0) { + $result = Database::query($sql); + if (Database::affected_rows($result) > 0) { $rowSession['enrolled'] = "TMP"; } else { $rowSession['enrolled'] = "NO"; @@ -139,8 +139,8 @@ if ($_REQUEST['tab'] == 'sessions_filter') { $sql = "SELECT 1 FROM $tableBuySessionTemporal WHERE session_id ='".$rowSession['session_id']."' AND user_id='" . $_SESSION['_user']['user_id'] . "';"; - Database::query($sql); - if (Database::affected_rows() > 0) { + $result = Database::query($sql); + if (Database::affected_rows($result) > 0) { $rowSession['enrolled'] = "TMP"; } else { $rowSession['enrolled'] = "NO"; @@ -279,7 +279,7 @@ if ($_REQUEST['tab'] == 'courses_filter') { AND user_id = " . intval($_SESSION['_user']['user_id']) . ";"; $tmp = Database::query($sql); - if (Database::affected_rows() > 0) { + if (Database::affected_rows($tmp) > 0) { $row['enrolled'] = "YES"; } else { $row['enrolled'] = "NO"; diff --git a/plugin/ticket/src/ticket.class.php b/plugin/ticket/src/ticket.class.php index eac50441b0..f5dece4692 100755 --- a/plugin/ticket/src/ticket.class.php +++ b/plugin/ticket/src/ticket.class.php @@ -226,8 +226,8 @@ class TicketManager $sql_update = "UPDATE $table_support_tickets SET assigned_last_user = '$user_id' WHERE ticket_id = '$ticket_id'"; - Database::query($sql_update); - if (Database::affected_rows() > 0) { + $result = Database::query($sql_update); + if (Database::affected_rows($result) > 0) { $insert_id = api_get_user_id(); $sql = "INSERT INTO $table_support_assigned_log ( ticket_id, @@ -1057,8 +1057,8 @@ class TicketManager $sql .= " AND sys_insert_user_id != '$user_id'"; } - Database::query($sql); - if (Database::affected_rows() > 0) { + $result = Database::query($sql); + if (Database::affected_rows($result) > 0) { Database::query( "UPDATE $table_support_tickets SET status_id = 'PND' WHERE ticket_id ='$ticket_id' AND status_id = 'NAT'" @@ -1092,8 +1092,8 @@ class TicketManager sys_lastedit_user_id ='$user_id', sys_lastedit_datetime ='" . $now . "' WHERE ticket_id ='$ticket_id'"; - Database::query($sql); - if (Database::affected_rows() > 0) { + $result = Database::query($sql); + if (Database::affected_rows($result) > 0) { return true; } else { return false;
@@ -290,14 +290,14 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
'.get_lang('NoUsersForThisSession').'