From 3da7f59d1e94cfe8d7a82b7227731764b23d1221 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Fri, 29 Mar 2024 01:06:28 +0100 Subject: [PATCH] Internal: Update Database::fetch_array((.*), 'ASSOC') to Databse::fetch_assoc($1) --- public/main/admin/configure_extensions.php | 2 +- public/main/admin/gradebook_list.php | 2 +- public/main/admin/statistics/index.php | 2 +- public/main/admin/user_edit.php | 2 +- public/main/admin/user_export.php | 2 +- public/main/admin/user_move_stats.php | 28 ++++----- public/main/cron/fix_lp_total_time.php | 8 +-- public/main/cron/hosting_total_size_limit.php | 4 +- public/main/cron/import_csv.php | 6 +- public/main/cron/request_removal_reminder.php | 2 +- public/main/dropbox/dropbox_class.inc.php | 4 +- public/main/exercise/TestCategory.php | 4 +- public/main/exercise/answer.class.php | 2 +- public/main/exercise/exercise.class.php | 20 +++---- .../main/exercise/exercise_global_report.php | 2 +- public/main/exercise/exercise_report.php | 2 +- .../main/exercise/exercise_result.class.php | 2 +- public/main/forum/forumfunction.inc.php | 10 ++-- public/main/gradebook/lib/GradebookUtils.php | 2 +- .../gradebook/lib/be/attendancelink.class.php | 6 +- .../gradebook/lib/be/evaluation.class.php | 2 +- .../gradebook/lib/be/exerciselink.class.php | 4 +- .../lib/be/forumthreadlink.class.php | 4 +- public/main/gradebook/lib/be/result.class.php | 2 +- public/main/group/group_space.php | 2 +- public/main/inc/ajax/admin.ajax.php | 2 +- public/main/inc/ajax/exercise.ajax.php | 2 +- public/main/inc/lib/AnnouncementManager.php | 4 +- public/main/inc/lib/SkillModel.php | 2 +- public/main/inc/lib/SkillRelProfileModel.php | 2 +- public/main/inc/lib/agenda.lib.php | 14 ++--- public/main/inc/lib/api.lib.php | 14 ++--- public/main/inc/lib/attendance.lib.php | 6 +- public/main/inc/lib/chat.lib.php | 10 ++-- public/main/inc/lib/course.lib.php | 10 ++-- public/main/inc/lib/course_category.lib.php | 8 +-- public/main/inc/lib/document.lib.php | 12 ++-- public/main/inc/lib/exercise.lib.php | 14 ++--- public/main/inc/lib/extra_field.lib.php | 8 +-- .../main/inc/lib/extra_field_option.lib.php | 4 +- public/main/inc/lib/extra_field_value.lib.php | 6 +- public/main/inc/lib/glossary.lib.php | 2 +- public/main/inc/lib/groupmanager.lib.php | 6 +- public/main/inc/lib/legal.lib.php | 4 +- public/main/inc/lib/link.lib.php | 4 +- public/main/inc/lib/message.lib.php | 6 +- public/main/inc/lib/myspace.lib.php | 14 ++--- public/main/inc/lib/sessionmanager.lib.php | 32 +++++----- public/main/inc/lib/social.lib.php | 14 ++--- public/main/inc/lib/statistics.lib.php | 2 +- public/main/inc/lib/sub_language.class.php | 4 +- public/main/inc/lib/tracking.lib.php | 60 +++++++++---------- public/main/inc/lib/urlmanager.lib.php | 4 +- public/main/inc/lib/usergroup.lib.php | 26 ++++---- public/main/inc/lib/usermanager.lib.php | 32 +++++----- public/main/my_space/myStudents.php | 2 +- public/main/my_space/ti_report.php | 4 +- .../main/plagiarism/compilatio/download.php | 4 +- public/main/social/new_promoted_message.php | 2 +- public/main/survey/fillsurvey.php | 24 ++++---- public/main/survey/meeting.php | 2 +- public/main/survey/survey.php | 6 +- public/main/survey/surveyUtil.class.php | 18 +++--- public/main/survey/survey_list.php | 4 +- public/main/survey/survey_question.php | 2 +- public/main/user/user.php | 6 +- public/main/user/user_export.php | 2 +- public/main/work/work.lib.php | 28 ++++----- .../plugin/courselegal/CourseLegalPlugin.php | 2 +- .../block_daily/block_daily.class.php | 2 +- public/plugin/dictionary/terms.php | 2 +- public/plugin/h5pimport/H5pImportPlugin.php | 2 +- public/plugin/justification/Justification.php | 4 +- .../LearningCalendarPlugin.php | 24 ++++---- public/plugin/positioning/src/Positioning.php | 4 +- .../plugin/redirection/RedirectionPlugin.php | 2 +- .../Component/CourseCopy/CourseBuilder.php | 6 +- .../Component/CourseCopy/CourseRestorer.php | 2 +- .../Component/CourseCopy/CourseSelectForm.php | 2 +- tests/scripts/fix_lp_id_to_iid.php | 42 ++++++------- tests/scripts/fix_lp_id_to_iid_v2.php | 42 ++++++------- tests/scripts/migrate_item_property.php | 2 +- 82 files changed, 348 insertions(+), 348 deletions(-) diff --git a/public/main/admin/configure_extensions.php b/public/main/admin/configure_extensions.php index b9975a7a5f..b88e471df1 100644 --- a/public/main/admin/configure_extensions.php +++ b/public/main/admin/configure_extensions.php @@ -181,7 +181,7 @@ Display::display_header($nameTool); WHERE variable = "service_ppt2lp" AND subkey <> "active"'; $rs = Database::query($sql); - while ($row = Database::fetch_array($rs, 'ASSOC')) { + while ($row = Database::fetch_assoc($rs)) { $defaults[$row['subkey']] = $row['selected_value']; } $form->addButtonSave(get_lang('Reconfigure extension'), 'activeExtension'); diff --git a/public/main/admin/gradebook_list.php b/public/main/admin/gradebook_list.php index cd132e3bba..d31ddd89fd 100644 --- a/public/main/admin/gradebook_list.php +++ b/public/main/admin/gradebook_list.php @@ -188,7 +188,7 @@ switch ($action) { gradebooks_to_validate_in_dependence FROM $table WHERE id = ".$categoryId; $result = Database::query($sql); - $categoryData = Database::fetch_array($result, 'ASSOC'); + $categoryData = Database::fetch_assoc($result); $options = []; if (!empty($categoryData['depends'])) { diff --git a/public/main/admin/statistics/index.php b/public/main/admin/statistics/index.php index 3474ba2057..4a328c0dd1 100644 --- a/public/main/admin/statistics/index.php +++ b/public/main/admin/statistics/index.php @@ -399,7 +399,7 @@ switch ($report) { $sessionCount = 0; $numberUsers = 0; - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $sessions[] = $row; $numberUsers += $row['nbr_users']; $sessionCount++; diff --git a/public/main/admin/user_edit.php b/public/main/admin/user_edit.php index d0305f792f..9029627f38 100644 --- a/public/main/admin/user_edit.php +++ b/public/main/admin/user_edit.php @@ -86,7 +86,7 @@ if (1 != Database::num_rows($res)) { exit; } -$user_data = Database::fetch_array($res, 'ASSOC'); +$user_data = Database::fetch_assoc($res); $user_data['platform_admin'] = is_null($user_data['is_admin']) ? 0 : 1; $user_data['send_mail'] = 0; diff --git a/public/main/admin/user_export.php b/public/main/admin/user_export.php index e318ca3cd1..583a996be2 100644 --- a/public/main/admin/user_export.php +++ b/public/main/admin/user_export.php @@ -170,7 +170,7 @@ if ($form->validate()) { } $res = Database::query($sql); - while ($user = Database::fetch_array($res, 'ASSOC')) { + while ($user = Database::fetch_assoc($res)) { $student_data = UserManager:: get_extra_user_data( $user['UserId'], true, diff --git a/public/main/admin/user_move_stats.php b/public/main/admin/user_move_stats.php index 75e81ca400..3fc7ff7680 100644 --- a/public/main/admin/user_move_stats.php +++ b/public/main/admin/user_move_stats.php @@ -149,7 +149,7 @@ if (isset($_REQUEST['load_ajax'])) { WHERE c_id = $course_id AND exe_user_id = $user_id $sessionCondition"; $res = Database::query($sql); $list = []; - while ($row = Database::fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { $list[$row['exe_id']] = $row; } @@ -180,7 +180,7 @@ if (isset($_REQUEST['load_ajax'])) { "; $res = Database::query($sql); $list = []; - while ($row = Database::fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { $list[$row['exe_id']] = $row; } @@ -211,7 +211,7 @@ if (isset($_REQUEST['load_ajax'])) { WHERE c_id = $course_id AND session_id = $origin_session_id AND user_id = $user_id "; $res = Database::query($sql); $list = []; - while ($row = Database::fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { $list[$row['course_access_id']] = $row; } @@ -237,7 +237,7 @@ if (isset($_REQUEST['load_ajax'])) { AND access_user_id = $user_id "; $res = Database::query($sql); $list = []; - while ($row = Database::fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { $list[] = $row['access_id']; } @@ -268,7 +268,7 @@ if (isset($_REQUEST['load_ajax'])) { $flat_list = $lp_list->get_flat_list(); $list = []; - while ($row = Database::fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { //Checking if the LP exist in the new session //if (in_array($row['lp_id'], array_keys($flat_list))) { $list[$row['id']] = $row; @@ -321,7 +321,7 @@ if (isset($_REQUEST['load_ajax'])) { $flat_list = $lp_list->get_flat_list(); $list = []; - while ($row = Database::fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { //Checking if the LP exist in the new session //if (in_array($row['lp_id'], array_keys($flat_list))) { $list[$row['id']] = $row; @@ -356,7 +356,7 @@ if (isset($_REQUEST['load_ajax'])) { $sql = "SELECT ref FROM $TBL_ITEM_PROPERTY WHERE tool = 'calendar_event' AND insert_user_id = $user_id AND c_id = $course_id "; $res = Database::query($sql); - while ($row = Database::fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { $id = $row['ref']; if ($update_database) { $sql = "UPDATE $TBL_AGENDA SET session_id = $new_session_id WHERE c_id = $course_id AND id = $id "; @@ -379,7 +379,7 @@ if (isset($_REQUEST['load_ajax'])) { echo $sql; } $res = Database::query($sql); - while ($row = Database::fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { $id = $row['ref']; $sql = "SELECT * FROM $TBL_STUDENT_PUBLICATION WHERE id = $id AND session_id = $origin_session_id AND c_id = $course_id"; if ($debug) { @@ -387,7 +387,7 @@ if (isset($_REQUEST['load_ajax'])) { } $sub_res = Database::query($sql); if (Database::num_rows($sub_res) > 0) { - $data = Database::fetch_array($sub_res, 'ASSOC'); + $data = Database::fetch_assoc($sub_res); if ($debug) { var_dump($data); } @@ -422,7 +422,7 @@ if (isset($_REQUEST['load_ajax'])) { $num_rows = Database::num_rows($sub_res); if ($num_rows > 0) { - $new_result = Database::fetch_array($sub_res, 'ASSOC'); + $new_result = Database::fetch_assoc($sub_res); $created_dir = $new_result['url']; $new_parent_id = $new_result['id']; } else { @@ -465,7 +465,7 @@ if (isset($_REQUEST['load_ajax'])) { $rest_select = Database::query($sql); if (Database::num_rows($rest_select) > 0) { if ($update_database) { - $assignment_data = Database::fetch_array($rest_select, 'ASSOC'); + $assignment_data = Database::fetch_assoc($rest_select); $sql_add_publication = "INSERT INTO ".$TBL_STUDENT_PUBLICATION_ASSIGNMENT." SET c_id = '$course_id', expires_on = '".$assignment_data['expires_on']."', @@ -550,7 +550,7 @@ if (isset($_REQUEST['load_ajax'])) { var_dump($sql); } $res = Database::query($sql); - while ($row = Database::fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { $id = $row['id']; if ($update_database) { $sql = "UPDATE $TBL_DROPBOX_FILE SET session_id = $new_session_id WHERE c_id = $course_id AND id = $id"; @@ -582,7 +582,7 @@ if (isset($_REQUEST['load_ajax'])) { var_dump($sql); } $res = Database::query($sql); - while ($row = Database::fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { $id = $row['notebook_id']; if ($update_database) { $sql = "UPDATE $TBL_NOTEBOOK @@ -685,7 +685,7 @@ function get_courses_list_by_user_id_based_in_exercises($user_id) $res = Database::query($sql); $course_list = []; - while ($row = Database::fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { $course_list[] = $row; } diff --git a/public/main/cron/fix_lp_total_time.php b/public/main/cron/fix_lp_total_time.php index 0ec0f6f85b..58d77913d4 100644 --- a/public/main/cron/fix_lp_total_time.php +++ b/public/main/cron/fix_lp_total_time.php @@ -18,15 +18,15 @@ $sendMessage = true; $userId = 1; // User id that will receive a report $update = false; -$sql = "SELECT iid, total_time FROM c_lp_item_view - WHERE total_time > $maxSeconds - order by total_time desc +$sql = "SELECT iid, total_time FROM c_lp_item_view + WHERE total_time > $maxSeconds + order by total_time desc LIMIT $limit "; $result = Database::query($sql); $log = ''; -while ($row = Database::fetch_array($result, 'ASSOC')) { +while ($row = Database::fetch_assoc($result)) { $id = $row['iid']; $oldTotalTime = $row['total_time']; $sql = "UPDATE c_lp_item_view SET total_time = '$valueToUpdate' WHERE iid = $id;"; diff --git a/public/main/cron/hosting_total_size_limit.php b/public/main/cron/hosting_total_size_limit.php index a504b9456a..46e286c9e5 100644 --- a/public/main/cron/hosting_total_size_limit.php +++ b/public/main/cron/hosting_total_size_limit.php @@ -94,7 +94,7 @@ function calculateTotalPortalSize($debug) $sql = "SELECT SUM(size) total FROM $table WHERE filetype = 'file' AND c_id <> ''"; $result = Database::query($sql); - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); $totalSize = $row['total']; if ($debug) { @@ -104,7 +104,7 @@ function calculateTotalPortalSize($debug) $table = Database::get_course_table(TABLE_FORUM_ATTACHMENT); $sql = "SELECT SUM(size) total FROM $table WHERE c_id <> ''"; $result = Database::query($sql); - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); $subTotal = $row['total']; $totalSize += $subTotal; if ($debug) { diff --git a/public/main/cron/import_csv.php b/public/main/cron/import_csv.php index 87cfc8bc35..43d5581228 100644 --- a/public/main/cron/import_csv.php +++ b/public/main/cron/import_csv.php @@ -3017,7 +3017,7 @@ class ImportCsv $result = Database::query($sql); $rows = Database::num_rows($result); if ($rows > 0) { - $userCourseData = Database::fetch_array($result, 'ASSOC'); + $userCourseData = Database::fetch_assoc($result); if (!empty($userCourseData)) { $teacherBackup[$userId][$courseInfo['code']] = $userCourseData; } @@ -3030,7 +3030,7 @@ class ImportCsv "; $result = Database::query($sql); - while ($groupData = Database::fetch_array($result, 'ASSOC')) { + while ($groupData = Database::fetch_assoc($result)) { $groupBackup['user'][$userId][$courseInfo['code']][$groupData['group_id']] = $groupData; } @@ -3041,7 +3041,7 @@ class ImportCsv "; $result = Database::query($sql); - while ($groupData = Database::fetch_array($result, 'ASSOC')) { + while ($groupData = Database::fetch_assoc($result)) { $groupBackup['tutor'][$userId][$courseInfo['code']][$groupData['group_id']] = $groupData; } diff --git a/public/main/cron/request_removal_reminder.php b/public/main/cron/request_removal_reminder.php index 0d3ad2823e..b2da3af7e8 100644 --- a/public/main/cron/request_removal_reminder.php +++ b/public/main/cron/request_removal_reminder.php @@ -62,7 +62,7 @@ foreach ($urlList as $url) { $message = 'Checking requests from '.strip_tags(Display::dateToStringAgoAndLongDate($dateToString))."\n"; $result = Database::query($sql); - while ($user = Database::fetch_array($result, 'ASSOC')) { + while ($user = Database::fetch_assoc($result)) { $userId = $user['id']; $userInfo = api_get_user_info($userId); if ($userInfo) { diff --git a/public/main/dropbox/dropbox_class.inc.php b/public/main/dropbox/dropbox_class.inc.php index 004ce81f7f..07f0c1c59f 100644 --- a/public/main/dropbox/dropbox_class.inc.php +++ b/public/main/dropbox/dropbox_class.inc.php @@ -188,7 +188,7 @@ class Dropbox_Work FROM '.Database::get_course_table(TABLE_DROPBOX_FILE)." WHERE c_id = $course_id AND id = ".$id.''; $result = Database::query($sql); - $res = Database::fetch_array($result, 'ASSOC'); + $res = Database::fetch_assoc($result); // Check if uploader is still in Chamilo system $uploader_id = stripslashes($res['uploader_id']); @@ -404,7 +404,7 @@ class Dropbox_SentWork extends Dropbox_Work FROM '.Database::get_course_table(TABLE_DROPBOX_POST)." WHERE c_id = $course_id AND file_id = ".intval($id); $result = Database::query($sql); - while ($res = Database::fetch_array($result, 'ASSOC')) { + while ($res = Database::fetch_assoc($result)) { // Check for deleted users $dest_user_id = $res['dest_user_id']; $user_info = api_get_user_info($dest_user_id); diff --git a/public/main/exercise/TestCategory.php b/public/main/exercise/TestCategory.php index f6dadeced9..e7451a8847 100644 --- a/public/main/exercise/TestCategory.php +++ b/public/main/exercise/TestCategory.php @@ -215,7 +215,7 @@ class TestCategory WHERE question_id = $questionId"; $res = Database::query($sql); if (Database::num_rows($res) > 0) { - return Database::fetch_array($res, 'ASSOC'); + return Database::fetch_assoc($res); } return []; @@ -842,7 +842,7 @@ class TestCategory $categories = []; $result = Database::query($sql); if (Database::num_rows($result)) { - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { if ($excludeCategoryWithNoQuestions && 0 == $row['count_questions']) { continue; } diff --git a/public/main/exercise/answer.class.php b/public/main/exercise/answer.class.php index 332441f7f8..87adfd0f39 100644 --- a/public/main/exercise/answer.class.php +++ b/public/main/exercise/answer.class.php @@ -372,7 +372,7 @@ class Answer $rs = Database::query($sql); if (Database::num_rows($rs) > 0) { - return Database::fetch_array($rs, 'ASSOC'); + return Database::fetch_assoc($rs); } return false; diff --git a/public/main/exercise/exercise.class.php b/public/main/exercise/exercise.class.php index 362a9c8ebe..69f4dc8845 100644 --- a/public/main/exercise/exercise.class.php +++ b/public/main/exercise/exercise.class.php @@ -692,7 +692,7 @@ class Exercise if (!empty($extraFields)) { $extraFieldValue = new ExtraFieldValue('question'); } - while ($question = Database::fetch_array($result, 'ASSOC')) { + while ($question = Database::fetch_assoc($result)) { /** @var Question $objQuestionTmp */ $objQuestionTmp = Question::read($question['iid']); $category_labels = ''; @@ -3090,7 +3090,7 @@ class Exercise $result = Database::query($sql_track); $new_array = []; if (Database::num_rows($result) > 0) { - $new_array = Database::fetch_array($result, 'ASSOC'); + $new_array = Database::fetch_assoc($result); $new_array['num_exe'] = Database::num_rows($result); } @@ -4349,7 +4349,7 @@ class Exercise exe_id = $exeId AND question_id = $questionId "; $result = Database::query($sql); - $resultData = Database::fetch_array($result, 'ASSOC'); + $resultData = Database::fetch_assoc($result); $answer = $resultData['answer']; $questionScore = $resultData['marks']; } @@ -4462,7 +4462,7 @@ class Exercise $result = Database::query($sql); $options = []; $correctAnswers = []; - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $options[] = $row; $correctAnswers[$row['correct']] = $row['answer']; } @@ -4844,7 +4844,7 @@ class Exercise hotspot_answer_id = '1'"; // By default we take 1 because it's a delineation $resq = Database::query($query); - $row = Database::fetch_array($resq, 'ASSOC'); + $row = Database::fetch_assoc($resq); $choice = $row['hotspot_correct']; $user_answer = $row['hotspot_coordinate']; @@ -7115,7 +7115,7 @@ class Exercise $result = Database::query($sql_track); $new_array = []; if (Database::num_rows($result) > 0) { - $new_array = Database::fetch_array($result, 'ASSOC'); + $new_array = Database::fetch_assoc($result); $start_date = api_get_utc_datetime($new_array['start_date'], true); $end_date = api_get_utc_datetime($new_array['exe_date'], true); $new_array['duration_formatted'] = ''; @@ -7314,7 +7314,7 @@ class Exercise $result = Database::query($sql); $list = []; if (Database::num_rows($result)) { - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $list[$row['category_id']] = $row; } @@ -8035,7 +8035,7 @@ class Exercise $result = Database::query($sql); $rows = []; - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $rows[] = $row; } @@ -8084,7 +8084,7 @@ class Exercise } $result = Database::query($sql); $rows = []; - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $rows[] = $row; } @@ -8674,7 +8674,7 @@ class Exercise $bestResult = 0; $sumResult = 0; $result = Database::query($sql); - while ($data = Database::fetch_array($result, 'ASSOC')) { + while ($data = Database::fetch_assoc($result)) { // Only take into account users in the current student list. if (!empty($studentIdList)) { if (!in_array($data['exe_user_id'], $studentIdList)) { diff --git a/public/main/exercise/exercise_global_report.php b/public/main/exercise/exercise_global_report.php index 7360aa3598..d233439949 100644 --- a/public/main/exercise/exercise_global_report.php +++ b/public/main/exercise/exercise_global_report.php @@ -71,7 +71,7 @@ foreach ($students as $studentInfo) { status = '' LIMIT 1"; $result = Database::query($sql); - $attempt = Database::fetch_array($result, 'ASSOC'); + $attempt = Database::fetch_assoc($result); if (empty($attempt)) { $userExerciseData[$exerciseId] = null; continue; diff --git a/public/main/exercise/exercise_report.php b/public/main/exercise/exercise_report.php index 237bbbc979..e2356a35db 100644 --- a/public/main/exercise/exercise_report.php +++ b/public/main/exercise/exercise_report.php @@ -272,7 +272,7 @@ if (isset($_REQUEST['comments']) && GROUP BY question_id'; $res = Database::query($qry); $tot = 0; - while ($row = Database :: fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { $marks = $row['marks']; if (!$objExerciseTmp->propagate_neg && $marks < 0) { continue; diff --git a/public/main/exercise/exercise_result.class.php b/public/main/exercise/exercise_result.class.php index 134cd3505e..e5a3e1e50c 100644 --- a/public/main/exercise/exercise_result.class.php +++ b/public/main/exercise/exercise_result.class.php @@ -138,7 +138,7 @@ class ExerciseResult $results = []; $resx = Database::query($sql); $bestAttemptPerUser = []; - while ($rowx = Database::fetch_array($resx, 'ASSOC')) { + while ($rowx = Database::fetch_assoc($resx)) { if ($this->onlyBestAttempts) { if (!isset($bestAttemptPerUser[$rowx['excruid']])) { $bestAttemptPerUser[$rowx['excruid']] = $rowx; diff --git a/public/main/forum/forumfunction.inc.php b/public/main/forum/forumfunction.inc.php index c64d3e29e3..e67adfe33d 100644 --- a/public/main/forum/forumfunction.inc.php +++ b/public/main/forum/forumfunction.inc.php @@ -2588,7 +2588,7 @@ function getThreadScoreHistory($user_id, $thread_id, $opt) } $rs = Database::query($sql); $log = []; - while ($row = Database::fetch_array($rs, 'ASSOC')) { + while ($row = Database::fetch_assoc($rs)) { $log[] = $row; } @@ -2678,7 +2678,7 @@ function current_qualify_of_thread($threadId, $sessionId, $userId) user_id = $userId "; $res = Database::query($sql); - $row = Database::fetch_array($res, 'ASSOC'); + $row = Database::fetch_assoc($res); if ($row) { return $row['qualify']; @@ -3852,7 +3852,7 @@ function display_forum_search_results($search_term) $result = Database::query($sql); $search_results = []; - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $forumId = $row['forum_id']; $forumData = get_forums($forumId); $category = isset($forum_categories_list[$forumData['forum_category']]) ? $forum_categories_list[$forumData['forum_category']] : null; @@ -4959,7 +4959,7 @@ function getAttachedFiles( $json = []; if (Database::num_rows($result) > 0) { $repo = Container::getForumAttachmentRepository(); - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { /** @var CForumAttachment $attachment */ $attachment = $repo->find($row['iid']); $downloadUrl = $repo->getResourceFileDownloadUrl($attachment); @@ -5071,7 +5071,7 @@ function getAttachmentIdsByPostId($postId, $courseId = 0) WHERE c_id = $courseId AND post_id = $postId"; $result = Database::query($sql); if (false !== $result && Database::num_rows($result) > 0) { - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $array[] = $row['iid']; } } diff --git a/public/main/gradebook/lib/GradebookUtils.php b/public/main/gradebook/lib/GradebookUtils.php index 8a47d3a765..75989bebba 100644 --- a/public/main/gradebook/lib/GradebookUtils.php +++ b/public/main/gradebook/lib/GradebookUtils.php @@ -519,7 +519,7 @@ class GradebookUtils ON c.id = l.c_id WHERE l.id='.intval($id_link).' OR l.category_id='.intval($id_link); $res = Database::query($sql); - $array = Database::fetch_array($res, 'ASSOC'); + $array = Database::fetch_assoc($res); return $array['id']; } diff --git a/public/main/gradebook/lib/be/attendancelink.class.php b/public/main/gradebook/lib/be/attendancelink.class.php index 4204b5668b..44861fd739 100644 --- a/public/main/gradebook/lib/be/attendancelink.class.php +++ b/public/main/gradebook/lib/be/attendancelink.class.php @@ -108,7 +108,7 @@ class AttendanceLink extends AbstractLink WHERE iid = '.$this->get_ref_id(); $query = Database::query($sql); - $attendance = Database::fetch_array($query, 'ASSOC'); + $attendance = Database::fetch_assoc($query); // Get results $sql = 'SELECT * @@ -120,7 +120,7 @@ class AttendanceLink extends AbstractLink $scores = Database::query($sql); // for 1 student if (isset($studentId)) { - if ($data = Database::fetch_array($scores, 'ASSOC')) { + if ($data = Database::fetch_assoc($scores)) { return [ $data['score'], $attendance['attendance_qualify_max'], @@ -232,7 +232,7 @@ class AttendanceLink extends AbstractLink $sql = 'SELECT * FROM '.$this->get_attendance_table().' WHERE iid = '.$this->get_ref_id(); $result = Database::query($sql); - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); $id = $row['iid']; return api_get_path(WEB_CODE_PATH). diff --git a/public/main/gradebook/lib/be/evaluation.class.php b/public/main/gradebook/lib/be/evaluation.class.php index d90d25d450..0b8ea12509 100644 --- a/public/main/gradebook/lib/be/evaluation.class.php +++ b/public/main/gradebook/lib/be/evaluation.class.php @@ -357,7 +357,7 @@ class Evaluation implements GradebookItem $sql = 'SELECT weight from '.$tbl_grade_evaluations.' WHERE id='.$arreval['id']; $rs = Database::query($sql); - $row_old_weight = Database::fetch_array($rs, 'ASSOC'); + $row_old_weight = Database::fetch_assoc($rs); $current_date = api_get_utc_datetime(); $params = [ 'id_linkeval_log' => $arreval['id'], diff --git a/public/main/gradebook/lib/be/exerciselink.class.php b/public/main/gradebook/lib/be/exerciselink.class.php index c6d0de8314..fdb005480b 100644 --- a/public/main/gradebook/lib/be/exerciselink.class.php +++ b/public/main/gradebook/lib/be/exerciselink.class.php @@ -280,7 +280,7 @@ class ExerciseLink extends AbstractLink if (isset($studentId) && empty($type)) { // for 1 student - if ($data = Database::fetch_array($scores, 'ASSOC')) { + if ($data = Database::fetch_assoc($scores)) { $attempts = Database::query($sql); $counter = 0; while ($attempt = Database::fetch_array($attempts)) { @@ -319,7 +319,7 @@ class ExerciseLink extends AbstractLink $studentIdList = array_column($studentList, 'user_id'); } - while ($data = Database::fetch_array($scores, 'ASSOC')) { + while ($data = Database::fetch_assoc($scores)) { // Only take into account users in the current student list. if (!empty($studentIdList)) { if (!in_array($data['exe_user_id'], $studentIdList)) { diff --git a/public/main/gradebook/lib/be/forumthreadlink.class.php b/public/main/gradebook/lib/be/forumthreadlink.class.php index 385667e360..91a0f4fd27 100644 --- a/public/main/gradebook/lib/be/forumthreadlink.class.php +++ b/public/main/gradebook/lib/be/forumthreadlink.class.php @@ -167,7 +167,7 @@ class ForumThreadLink extends AbstractLink $score = 0; $counter = 0; if (Database::num_rows($scores)) { - while ($data = Database::fetch_array($scores, 'ASSOC')) { + while ($data = Database::fetch_assoc($scores)) { $score += $data['qualify']; $counter++; } @@ -289,7 +289,7 @@ class ForumThreadLink extends AbstractLink iid = '".$this->get_ref_id()."' AND session_id = $sessionId "; $result = Database::query($sql); - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); if ($row) { $forum_id = $row['forum_id']; diff --git a/public/main/gradebook/lib/be/result.class.php b/public/main/gradebook/lib/be/result.class.php index 60632cd50b..c0c3779efb 100644 --- a/public/main/gradebook/lib/be/result.class.php +++ b/public/main/gradebook/lib/be/result.class.php @@ -122,7 +122,7 @@ class Result } $res_course_rel_user = Database::query($sql); - while ($row_course_rel_user = Database::fetch_array($res_course_rel_user, 'ASSOC')) { + while ($row_course_rel_user = Database::fetch_assoc($res_course_rel_user)) { $list_user_course_list[] = $row_course_rel_user; } $current_date = api_get_utc_datetime(); diff --git a/public/main/group/group_space.php b/public/main/group/group_space.php index c8bdb7953a..fbd5623816 100644 --- a/public/main/group/group_space.php +++ b/public/main/group/group_space.php @@ -412,7 +412,7 @@ function get_number_of_group_users() c_id = $course_id AND group_id = '".(int) ($groupInfo['iid'])."'"; $result = Database::query($sql); - $return = Database::fetch_array($result, 'ASSOC'); + $return = Database::fetch_assoc($result); return $return['number_of_users']; } diff --git a/public/main/inc/ajax/admin.ajax.php b/public/main/inc/ajax/admin.ajax.php index ab2f5145eb..7a41aeb97e 100644 --- a/public/main/inc/ajax/admin.ajax.php +++ b/public/main/inc/ajax/admin.ajax.php @@ -98,7 +98,7 @@ function version_check() $tbl_settings = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT); $sql = 'SELECT selected_value FROM '.$tbl_settings.' WHERE variable = "registered" '; $result = Database::query($sql); - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); // The site has not been registered yet. $return = ''; diff --git a/public/main/inc/ajax/exercise.ajax.php b/public/main/inc/ajax/exercise.ajax.php index d8003e8b51..a00aa02a4c 100644 --- a/public/main/inc/ajax/exercise.ajax.php +++ b/public/main/inc/ajax/exercise.ajax.php @@ -242,7 +242,7 @@ switch ($action) { $result = Database::query($sql); $results = []; - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $results[] = $row; } diff --git a/public/main/inc/lib/AnnouncementManager.php b/public/main/inc/lib/AnnouncementManager.php index a567430f67..9c267c779e 100644 --- a/public/main/inc/lib/AnnouncementManager.php +++ b/public/main/inc/lib/AnnouncementManager.php @@ -1000,7 +1000,7 @@ class AnnouncementManager $num_rows = Database::num_rows($rs); $result = []; if ($num_rows > 0) { - while ($row = Database::fetch_array($rs, 'ASSOC')) { + while ($row = Database::fetch_assoc($rs)) { if (empty($row['c_id'])) { continue; } @@ -1155,7 +1155,7 @@ class AnnouncementManager $result = Database::query($sql); $repo = Container::getAnnouncementAttachmentRepository(); if (0 != Database::num_rows($result)) { - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); } return $row; diff --git a/public/main/inc/lib/SkillModel.php b/public/main/inc/lib/SkillModel.php index 643b5b8247..04577ac322 100644 --- a/public/main/inc/lib/SkillModel.php +++ b/public/main/inc/lib/SkillModel.php @@ -330,7 +330,7 @@ class SkillModel extends Model $result = Database::query($sql); $skills = []; if (Database::num_rows($result)) { - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $skillId = $row['id']; $skill = $skillRepo->find($skillId); diff --git a/public/main/inc/lib/SkillRelProfileModel.php b/public/main/inc/lib/SkillRelProfileModel.php index f4e1162cbd..a37ca2cece 100644 --- a/public/main/inc/lib/SkillRelProfileModel.php +++ b/public/main/inc/lib/SkillRelProfileModel.php @@ -49,7 +49,7 @@ class SkillRelProfileModel extends Model ON (pr.id = p.profile_id) WHERE p.profile_id = ".$profileId; $result = Database::query($sql); - $profileData = Database::fetch_array($result, 'ASSOC'); + $profileData = Database::fetch_assoc($result); return $profileData; } diff --git a/public/main/inc/lib/agenda.lib.php b/public/main/inc/lib/agenda.lib.php index 83446afe28..21fee4d446 100644 --- a/public/main/inc/lib/agenda.lib.php +++ b/public/main/inc/lib/agenda.lib.php @@ -1179,7 +1179,7 @@ class Agenda WHERE id = $id AND user = ".api_get_user_id(); $result = Database::query($sql); if (Database::num_rows($result)) { - $event = Database::fetch_array($result, 'ASSOC'); + $event = Database::fetch_assoc($result); $event['description'] = $event['text']; $event['content'] = $event['text']; $event['start_date'] = $event['date']; @@ -1250,7 +1250,7 @@ class Agenda $result = Database::query($sql); $my_events = []; if (Database::num_rows($result)) { - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $event = []; $event['id'] = 'personal_'.$row['id']; $event['title'] = $row['title']; @@ -1757,7 +1757,7 @@ class Agenda $result = Database::query($sql); $my_events = []; if (Database::num_rows($result)) { - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $event = []; $event['id'] = 'platform_'.$row['id']; $event['title'] = $row['title']; @@ -2315,7 +2315,7 @@ class Agenda "; $result = Database::query($sql); if (0 != Database::num_rows($result)) { - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); } return $row; @@ -2441,7 +2441,7 @@ class Agenda parent_event_id = ".$eventId; $result = Database::query($sql); if (Database::num_rows($result)) { - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $events[] = $row; } } @@ -2833,7 +2833,7 @@ class Agenda } $result = Database::query($sqlquery); - while ($item = Database::fetch_array($result, 'ASSOC')) { + while ($item = Database::fetch_assoc($result)) { $agendaday = -1; if (!empty($item['start_date'])) { $item['start_date'] = api_get_local_time( @@ -3072,7 +3072,7 @@ class Agenda } $result = Database::query($sql); - while ($item = Database::fetch_array($result, 'ASSOC')) { + while ($item = Database::fetch_assoc($result)) { $time_minute = api_convert_and_format_date( $item['date'], TIME_NO_SEC_FORMAT diff --git a/public/main/inc/lib/api.lib.php b/public/main/inc/lib/api.lib.php index 3fa6110b17..a948d812a7 100644 --- a/public/main/inc/lib/api.lib.php +++ b/public/main/inc/lib/api.lib.php @@ -1983,7 +1983,7 @@ function api_get_anonymous_id() $login ); } else { - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); return $row['id']; } @@ -1995,7 +1995,7 @@ function api_get_anonymous_id() WHERE status = ".ANONYMOUS." "; $res = Database::query($sql); if (Database::num_rows($res) > 0) { - $row = Database::fetch_array($res, 'ASSOC'); + $row = Database::fetch_assoc($res); return $row['id']; } @@ -2490,7 +2490,7 @@ function api_get_session_visibility( return SESSION_INVISIBLE; } - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); $visibility = $row['visibility']; // I don't care the session visibility. @@ -3616,7 +3616,7 @@ function api_get_languages() ORDER BY original_name ASC"; $result = Database::query($sql); $languages = []; - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $languages[$row['isocode']] = $row['original_name']; } @@ -4420,7 +4420,7 @@ function api_get_settings_options($var) ORDER BY id"; $result = Database::query($sql); $settings_options_array = []; - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $settings_options_array[] = $row; } @@ -5184,7 +5184,7 @@ function api_get_access_url_from_user($user_id) WHERE user_id = ".$user_id; $result = Database::query($sql); $list = []; - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $list[] = $row['access_url_id']; } @@ -5395,7 +5395,7 @@ function api_get_tool_information_by_name($name) WHERE c_id = $course_id AND tool_id = '".$tool."' "; $rs = Database::query($sql); - return Database::fetch_array($rs, 'ASSOC'); + return Database::fetch_assoc($rs); } return []; diff --git a/public/main/inc/lib/attendance.lib.php b/public/main/inc/lib/attendance.lib.php index a11d3f8c66..6a0c0fbfcb 100644 --- a/public/main/inc/lib/attendance.lib.php +++ b/public/main/inc/lib/attendance.lib.php @@ -58,7 +58,7 @@ class Attendance $result = Database::query($sql); $data = []; if (Database::num_rows($result) > 0) { - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $data[$row['iid']] = $row; } } @@ -1450,7 +1450,7 @@ class Attendance $rs = Database::query($sql); $data = []; if (Database::num_rows($rs) > 0) { - while ($row = Database::fetch_array($rs, 'ASSOC')) { + while ($row = Database::fetch_assoc($rs)) { $row['db_date_time'] = $row['date_time']; $row['date_time'] = api_get_local_time($row['date_time']); $row['date'] = api_format_date($row['date_time'], DATE_FORMAT_SHORT); @@ -2263,7 +2263,7 @@ class Attendance $rs = Database::query($sql); // get info from sessions - while ($row = Database::fetch_array($rs, 'ASSOC')) { + while ($row = Database::fetch_assoc($rs)) { $courseId = $row['c_id']; $sessionId = $row['session_id']; $courseItem = api_get_course_info_by_id($courseId); diff --git a/public/main/inc/lib/chat.lib.php b/public/main/inc/lib/chat.lib.php index 5307aeb369..6af6a9aad8 100644 --- a/public/main/inc/lib/chat.lib.php +++ b/public/main/inc/lib/chat.lib.php @@ -236,16 +236,16 @@ class Chat extends Model } $sql = "SELECT * FROM ".$this->table." - WHERE + WHERE ( - to_user = $toUserId AND + to_user = $toUserId AND from_user = $fromUserId ) OR ( - from_user = $toUserId AND + from_user = $toUserId AND to_user = $fromUserId - ) + ) $orderBy LIMIT $start, $end "; @@ -305,7 +305,7 @@ class Chat extends Model $result = Database::query($sql); $chatList = []; - while ($chat = Database::fetch_array($result, 'ASSOC')) { + while ($chat = Database::fetch_assoc($result)) { $chatList[$chat['from_user']][] = $chat; } diff --git a/public/main/inc/lib/course.lib.php b/public/main/inc/lib/course.lib.php index ed8aee0138..4b97d7ded6 100644 --- a/public/main/inc/lib/course.lib.php +++ b/public/main/inc/lib/course.lib.php @@ -238,7 +238,7 @@ class CourseManager $data = []; $res = Database::query($sql); if (Database::num_rows($res) > 0) { - while ($row = Database::fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { $data[] = $row; } } @@ -2909,7 +2909,7 @@ class CourseManager "; $result = Database::query($sql); if (Database::num_rows($result) > 0) { - while ($result_row = Database::fetch_array($result, 'ASSOC')) { + while ($result_row = Database::fetch_assoc($result)) { $result_row['special_course'] = 1; $course_list[] = $result_row; $codes[] = $result_row['real_id']; @@ -2940,7 +2940,7 @@ class CourseManager $result = Database::query($sql); if (Database::num_rows($result)) { - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { if (!empty($skipCourseList)) { if (in_array($row['real_id'], $skipCourseList)) { continue; @@ -2963,7 +2963,7 @@ class CourseManager ON (s.id = scu.session_id) WHERE user_id = $user_id "; $r = Database::query($sql); - while ($row = Database::fetch_array($r, 'ASSOC')) { + while ($row = Database::fetch_assoc($r)) { if (!empty($skipCourseList)) { if (in_array($row['real_id'], $skipCourseList)) { continue; @@ -5516,7 +5516,7 @@ class CourseManager $result = Database::query($sql); $courseAccess = []; if (Database::num_rows($result)) { - $courseAccess = Database::fetch_array($result, 'ASSOC'); + $courseAccess = Database::fetch_assoc($result); } return $courseAccess; diff --git a/public/main/inc/lib/course_category.lib.php b/public/main/inc/lib/course_category.lib.php index cc18b1af56..3c96594892 100644 --- a/public/main/inc/lib/course_category.lib.php +++ b/public/main/inc/lib/course_category.lib.php @@ -26,7 +26,7 @@ class CourseCategory $result = Database::query($sql); if (Database::num_rows($result)) { - $category = Database::fetch_array($result, 'ASSOC'); + $category = Database::fetch_assoc($result); if ($category) { // Get access url id $table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE_CATEGORY); @@ -59,7 +59,7 @@ class CourseCategory $sql = "SELECT * FROM $table WHERE id = $categoryId"; $result = Database::query($sql); if (Database::num_rows($result)) { - $category = Database::fetch_array($result, 'ASSOC'); + $category = Database::fetch_assoc($result); if ($category) { // Get access url id $table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE_CATEGORY); @@ -301,7 +301,7 @@ class CourseCategory WHERE parent_id = '$categoryCode'"; $result = Database::query($sql); $children = []; - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $children[] = $row; $subChildren = self::getChildren($row['code']); $children = array_merge($children, $subChildren); @@ -351,7 +351,7 @@ class CourseCategory $result = Database::query($sql); $children = []; - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $parent = self::getCategory($row['parent_id']); $children[] = $row; $subChildren = self::getParents($parent ? $parent['code'] : null); diff --git a/public/main/inc/lib/document.lib.php b/public/main/inc/lib/document.lib.php index 488e79f913..35f75f5c8a 100644 --- a/public/main/inc/lib/document.lib.php +++ b/public/main/inc/lib/document.lib.php @@ -592,7 +592,7 @@ class DocumentManager $result = Database::query($sql); if ($result && 0 != Database::num_rows($result)) { - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { if (self::is_folder_to_avoid($row['path'])) { continue; } @@ -647,7 +647,7 @@ class DocumentManager l.c_id = $courseId "; $result = Database::query($sql); $visibleFolders = []; - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $visibleFolders[$row['id']] = $row['path']; } @@ -670,7 +670,7 @@ class DocumentManager l.c_id = $courseId "; $result = Database::query($sql); $invisibleFolders = []; - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { //get visible folders in the invisible ones -> they are invisible too $sql = "SELECT DISTINCT docs.iid, n.path FROM resource_node AS n @@ -685,7 +685,7 @@ class DocumentManager $condition_session AND l.c_id = $courseId "; $folder_in_invisible_result = Database::query($sql); - while ($folders_in_invisible_folder = Database::fetch_array($folder_in_invisible_result, 'ASSOC')) { + while ($folders_in_invisible_folder = Database::fetch_assoc($folder_in_invisible_result)) { $invisibleFolders[$folders_in_invisible_folder['id']] = $folders_in_invisible_folder['path']; } } @@ -899,7 +899,7 @@ class DocumentManager $result = Database::query($sql); $courseParam = '&cid='.$course_id.'&id='.$id.'&sid='.$session_id.'&gid='.$groupId; if ($result && 1 == Database::num_rows($result)) { - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); //@todo need to clarify the name of the URLs not nice right now $url_path = urlencode($row['path']); @@ -1069,7 +1069,7 @@ class DocumentManager $result = Database::query($sql); $is_visible = false; if (Database::num_rows($result) > 0) { - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); $em = Database::getManager(); diff --git a/public/main/inc/lib/exercise.lib.php b/public/main/inc/lib/exercise.lib.php index 983709d500..e52d25a21a 100644 --- a/public/main/inc/lib/exercise.lib.php +++ b/public/main/inc/lib/exercise.lib.php @@ -1651,7 +1651,7 @@ HOTSPOT; $sqlResult = Database::query($sql); if (0 != Database::num_rows($sqlResult)) { - while ($row = Database::fetch_array($sqlResult, 'ASSOC')) { + while ($row = Database::fetch_assoc($sqlResult)) { $tmp = []; $tmp[0] = $row['course_title']; $tmp[1] = $row['session_name']; @@ -1709,7 +1709,7 @@ HOTSPOT; $sqlResult = Database::query($sql); if (Database::num_rows($sqlResult)) { - $result = Database::fetch_array($sqlResult, 'ASSOC'); + $result = Database::fetch_assoc($sqlResult); $result['duration_formatted'] = ''; if (!empty($result['exe_duration'])) { $time = api_format_time($result['exe_duration'], 'js'); @@ -2141,7 +2141,7 @@ HOTSPOT; $results = []; $resx = Database::query($sql); - while ($rowx = Database::fetch_array($resx, 'ASSOC')) { + while ($rowx = Database::fetch_assoc($resx)) { $results[] = $rowx; } @@ -3580,7 +3580,7 @@ EOT; $result = Database::query($sql); $return = []; if ($result) { - $return = Database::fetch_array($result, 'ASSOC'); + $return = Database::fetch_assoc($result); } return $return; @@ -3869,7 +3869,7 @@ EOT; $good_answers = 0; switch ($question_type) { case FILL_IN_BLANKS: - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $fill_blank = self::check_fill_in_blanks( $correct_answer, $row['answer'], @@ -5523,7 +5523,7 @@ EOT; $studentsWhere "; $queryTotal = Database::query($sql); - $totalRow = Database::fetch_array($queryTotal, 'ASSOC'); + $totalRow = Database::fetch_assoc($queryTotal); $total = 0; if ($totalRow) { $total = (int) $totalRow['total']; @@ -5610,7 +5610,7 @@ EOT; $sessionCondition "; $result = Database::query($sql); - $totalRow = Database::fetch_array($result, 'ASSOC'); + $totalRow = Database::fetch_assoc($result); $total = 0; if ($totalRow) { $total = (int) $totalRow['count']; diff --git a/public/main/inc/lib/extra_field.lib.php b/public/main/inc/lib/extra_field.lib.php index 7d9fb06fba..1e60409021 100644 --- a/public/main/inc/lib/extra_field.lib.php +++ b/public/main/inc/lib/extra_field.lib.php @@ -629,7 +629,7 @@ class ExtraField extends Model $result = Database::query($sql); $extraFieldRepo = Container::getExtraFieldRepository(); if (Database::num_rows($result)) { - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); $extraFieldId = $row['id']; /** @var \Chamilo\CoreBundle\Entity\ExtraField $extraField */ $extraField = $extraFieldRepo->find($extraFieldId); @@ -640,7 +640,7 @@ class ExtraField extends Model WHERE field_id='".$extraFieldId."' ORDER BY id ASC"; $result = Database::query($sql); - while ($option = Database::fetch_array($result, 'ASSOC')) { + while ($option = Database::fetch_assoc($result)) { $row['options'][$option['id']] = $option; } @@ -664,7 +664,7 @@ class ExtraField extends Model item_type = $this->itemType"; $result = Database::query($sql); if (Database::num_rows($result)) { - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); // All the options of the field $sql = "SELECT * FROM $this->table_field_options @@ -2055,7 +2055,7 @@ class ExtraField extends Model $result = Database::query($sql); if (Database::num_rows($result)) { $extraFieldRepo = Container::getExtraFieldRepository(); - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); if ($row) { $extraFieldId = $row['id']; /** @var \Chamilo\CoreBundle\Entity\ExtraField $extraField */ diff --git a/public/main/inc/lib/extra_field_option.lib.php b/public/main/inc/lib/extra_field_option.lib.php index bbef4a6c12..29cd9e8bf2 100644 --- a/public/main/inc/lib/extra_field_option.lib.php +++ b/public/main/inc/lib/extra_field_option.lib.php @@ -454,7 +454,7 @@ class ExtraFieldOption extends Model "; $result = Database::query($sql); if (Database::num_rows($result) > 0) { - return Database::fetch_array($result, 'ASSOC'); + return Database::fetch_assoc($result); } return false; @@ -491,7 +491,7 @@ class ExtraFieldOption extends Model "; $result = Database::query($sql); if (Database::num_rows($result) > 0) { - return Database::fetch_array($result, 'ASSOC'); + return Database::fetch_assoc($result); } return false; diff --git a/public/main/inc/lib/extra_field_value.lib.php b/public/main/inc/lib/extra_field_value.lib.php index 718d3cd153..1f4f542fe7 100644 --- a/public/main/inc/lib/extra_field_value.lib.php +++ b/public/main/inc/lib/extra_field_value.lib.php @@ -571,7 +571,7 @@ class ExtraFieldValue extends Model ORDER BY id"; $result = Database::query($sql); if (Database::num_rows($result)) { - $result = Database::fetch_array($result, 'ASSOC'); + $result = Database::fetch_assoc($result); if ($transform) { if (!empty($result['field_value'])) { switch ($result['value_type']) { @@ -724,7 +724,7 @@ class ExtraFieldValue extends Model $result = Database::query($sql); if (Database::num_rows($result)) { - $result = Database::fetch_array($result, 'ASSOC'); + $result = Database::fetch_assoc($result); $result['value'] = $result['field_value']; if ($transform) { $fieldType = $result['value_type']; @@ -836,7 +836,7 @@ class ExtraFieldValue extends Model if ($all) { $result = Database::store_result($result, 'ASSOC'); } else { - $result = Database::fetch_array($result, 'ASSOC'); + $result = Database::fetch_assoc($result); } return $result; diff --git a/public/main/inc/lib/glossary.lib.php b/public/main/inc/lib/glossary.lib.php index 8fcfd2cb12..65263ab8fe 100644 --- a/public/main/inc/lib/glossary.lib.php +++ b/public/main/inc/lib/glossary.lib.php @@ -150,7 +150,7 @@ class GlossaryManager $rs = Database::query($sql); if (Database::num_rows($rs) > 0) { - return Database::fetch_array($rs, 'ASSOC'); + return Database::fetch_assoc($rs); } return []; diff --git a/public/main/inc/lib/groupmanager.lib.php b/public/main/inc/lib/groupmanager.lib.php index 4018b4851d..dc3709cd11 100644 --- a/public/main/inc/lib/groupmanager.lib.php +++ b/public/main/inc/lib/groupmanager.lib.php @@ -588,7 +588,7 @@ class GroupManager $res = Database::query($sql); $group = []; if (Database::num_rows($res)) { - $group = Database::fetch_array($res, 'ASSOC'); + $group = Database::fetch_assoc($res); } return $group; @@ -783,7 +783,7 @@ class GroupManager $res = Database::query($sql); $category = []; if (Database::num_rows($res)) { - $category = Database::fetch_array($res, 'ASSOC'); + $category = Database::fetch_assoc($res); } return $category; @@ -2079,7 +2079,7 @@ class GroupManager $res = Database::query($sql); $groups = []; - while ($group = Database::fetch_array($res, 'ASSOC')) { + while ($group = Database::fetch_assoc($res)) { $groups[] = $group; } diff --git a/public/main/inc/lib/legal.lib.php b/public/main/inc/lib/legal.lib.php index dfc4ab58d4..f30fc0d623 100644 --- a/public/main/inc/lib/legal.lib.php +++ b/public/main/inc/lib/legal.lib.php @@ -164,7 +164,7 @@ class LegalManager ORDER BY version DESC LIMIT 1 "; $result = Database::query($sql); - $result = Database::fetch_array($result, 'ASSOC'); + $result = Database::fetch_assoc($result); if (isset($result['content'])) { $result['content'] = self::replaceTags($result['content']); @@ -351,7 +351,7 @@ class LegalManager FROM $table ORDER BY id DESC "; $result = Database::query($sql); - $url = Database::fetch_array($result, 'ASSOC'); + $url = Database::fetch_assoc($result); $result = $url['count_result']; return $result; diff --git a/public/main/inc/lib/link.lib.php b/public/main/inc/lib/link.lib.php index 4dc25efbdd..cc9b578aa4 100644 --- a/public/main/inc/lib/link.lib.php +++ b/public/main/inc/lib/link.lib.php @@ -791,7 +791,7 @@ class Link extends Model $categoryInItemProperty = []; if (Database::num_rows($result)) { - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $categoryInItemProperty[$row['id']] = $row; } } @@ -1673,7 +1673,7 @@ Do you really want to delete this category and its links ?')."')) return false;\ WHERE iid = $id"; $result = Database::query($sql); - return Database::fetch_array($result, 'ASSOC'); + return Database::fetch_assoc($result); } /** diff --git a/public/main/inc/lib/message.lib.php b/public/main/inc/lib/message.lib.php index ff225bc44d..0c0398ae75 100644 --- a/public/main/inc/lib/message.lib.php +++ b/public/main/inc/lib/message.lib.php @@ -576,7 +576,7 @@ class MessageManager $rs = Database::query($sql); $data = []; if (Database::num_rows($rs) > 0) { - while ($row = Database::fetch_array($rs, 'ASSOC')) { + while ($row = Database::fetch_assoc($rs)) { $data[] = $row; } } @@ -611,7 +611,7 @@ class MessageManager $data = []; $parents = []; if (Database::num_rows($rs) > 0) { - while ($row = Database::fetch_array($rs, 'ASSOC')) { + while ($row = Database::fetch_assoc($rs)) { if ($message_id == $row['parent_id'] || in_array($row['parent_id'], $parents)) { $parents[] = $row['id']; $data[] = $row; @@ -822,7 +822,7 @@ class MessageManager $res = Database::query($sql); $item = []; if (Database::num_rows($res) > 0) { - $item = Database::fetch_array($res, 'ASSOC'); + $item = Database::fetch_assoc($res); } return $item; diff --git a/public/main/inc/lib/myspace.lib.php b/public/main/inc/lib/myspace.lib.php index 25896e5ee6..fc9e388d99 100644 --- a/public/main/inc/lib/myspace.lib.php +++ b/public/main/inc/lib/myspace.lib.php @@ -955,7 +955,7 @@ class MySpace "; $queryResult = Database::query($query); $data = []; - while ($row = Database::fetch_array($queryResult, 'ASSOC')) { + while ($row = Database::fetch_assoc($queryResult)) { $lp_id = (int) $row['lp_id']; $registeredUsers = self::getCompanyLearnpathSubscription($startDate, $endDate, $lp_id); if (!empty($registeredUsers)) { @@ -1164,7 +1164,7 @@ class MySpace " group by lp_item_id"; $queryResult = Database::query($cLpItemsQuery); $cLpItems = []; - while ($row = Database::fetch_array($queryResult, 'ASSOC')) { + while ($row = Database::fetch_assoc($queryResult)) { $cLpItems[] = (int) $row['lp_item_id']; } if (0 == count($cLpItems)) { @@ -1188,7 +1188,7 @@ class MySpace " where field_id IN ( $queryExtraFieldPrice ) and item_id in ($cLpItems)"; $queryResult = Database::query($cLpItemsPriceQuery); $lpItemPrice = []; - while ($row = Database::fetch_array($queryResult, 'ASSOC')) { + while ($row = Database::fetch_assoc($queryResult)) { $lpItemPrice[$row['lp_item_id']] = $row['price']; } // search authors of lp @@ -1198,7 +1198,7 @@ class MySpace " where field_id IN ( $queryExtraFieldValue ) ". " group by users_id "; $queryResult = Database::query($autorsQuery); - while ($row = Database::fetch_array($queryResult, 'ASSOC')) { + while ($row = Database::fetch_assoc($queryResult)) { $autorsStr .= " ".str_replace(';', ' ', $row['users_id']); $autorsStr = trim($autorsStr); } @@ -1221,7 +1221,7 @@ class MySpace " from c_lp_item ". " where iid in ($cLpItems)"; $queryResult = Database::query($query); - while ($row = Database::fetch_array($queryResult, 'ASSOC')) { + while ($row = Database::fetch_assoc($queryResult)) { $row['price'] = isset($lpItemPrice[$row['iid']]) ? $lpItemPrice[$row['iid']] : 0; $cLpItemsData[$row['iid']] = $row; } @@ -1232,7 +1232,7 @@ class MySpace " where field_id IN ( $queryExtraFieldValue )"; $queryResult = Database::query($query); $printData = []; - while ($row = Database::fetch_array($queryResult, 'ASSOC')) { + while ($row = Database::fetch_assoc($queryResult)) { $cLpItem = (int) $row['lp_item_id']; // get full lp data $cLpItemData = isset($cLpItemsData[$cLpItem]) ? $cLpItemsData[$cLpItem] : []; @@ -3812,7 +3812,7 @@ class MySpace $query .= $whereCondition; } $queryResult = Database::query($query); - while ($row = Database::fetch_array($queryResult, 'ASSOC')) { + while ($row = Database::fetch_assoc($queryResult)) { // $courseId = (int)$row['c_id']; $studentId = (int) $row['to_user_id']; $company = isset($row['company']) ? $row['company'] : ''; diff --git a/public/main/inc/lib/sessionmanager.lib.php b/public/main/inc/lib/sessionmanager.lib.php index 834b109a61..ddb2ce82a9 100644 --- a/public/main/inc/lib/sessionmanager.lib.php +++ b/public/main/inc/lib/sessionmanager.lib.php @@ -3497,7 +3497,7 @@ class SessionManager $plugin = BuyCoursesPlugin::create(); $checker = $plugin->isEnabled(); $sessions = []; - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { if (!isset($row['image'])) { $row['image'] = ''; } @@ -3806,7 +3806,7 @@ class SessionManager $result = Database::query($sql); if (Database::num_rows($result)) { - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); $row['course_list'] = self::get_course_list_by_session_id($sessionId); return $row; @@ -4118,7 +4118,7 @@ class SessionManager return (int) $count['count']; } - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $courses[$row['real_id']] = $row; } } @@ -4189,7 +4189,7 @@ class SessionManager "; if ($getCount) { $result = Database::query($sql); - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); return $row['count']; } @@ -4205,7 +4205,7 @@ class SessionManager $courses = []; if ($num_rows > 0) { - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $courses[$row['id']] = $row; } } @@ -4248,7 +4248,7 @@ class SessionManager $num_rows = Database::num_rows($result); $courses = []; if ($num_rows > 0) { - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $courses[$row['id']] = $row; } } @@ -4287,7 +4287,7 @@ class SessionManager $result = Database::query($sql); $num_rows = Database::num_rows($result); if ($num_rows > 0) { - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); return $row['count']; } @@ -4384,7 +4384,7 @@ class SessionManager } $return = []; - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $return[] = $row; } @@ -5676,7 +5676,7 @@ class SessionManager $result = Database::query($sql); $rows = Database::num_rows($result); if ($rows > 0) { - $userCourseData = Database::fetch_array($result, 'ASSOC'); + $userCourseData = Database::fetch_assoc($result); if (!empty($userCourseData)) { $teacherBackupList[$teacher['user_id']][$course_code] = $userCourseData; } @@ -5689,7 +5689,7 @@ class SessionManager "; $result = Database::query($sql); - while ($groupData = Database::fetch_array($result, 'ASSOC')) { + while ($groupData = Database::fetch_assoc($result)) { $groupBackup['user'][$teacher['user_id']][$course_code][$groupData['group_id']] = $groupData; } @@ -5700,7 +5700,7 @@ class SessionManager "; $result = Database::query($sql); - while ($groupData = Database::fetch_array($result, 'ASSOC')) { + while ($groupData = Database::fetch_assoc($result)) { $groupBackup['tutor'][$teacher['user_id']][$course_code][$groupData['group_id']] = $groupData; } @@ -5808,7 +5808,7 @@ class SessionManager $result = Database::query($sql); $rows = Database::num_rows($result); if ($rows > 0) { - $userCourseData = Database::fetch_array($result, 'ASSOC'); + $userCourseData = Database::fetch_assoc($result); if (!empty($userCourseData)) { $teacherBackupList[$teacher['user_id']][$course_code] = $userCourseData; } @@ -5821,7 +5821,7 @@ class SessionManager "; $result = Database::query($sql); - while ($groupData = Database::fetch_array($result, 'ASSOC')) { + while ($groupData = Database::fetch_assoc($result)) { $groupBackup['user'][$teacher['user_id']][$course_code][$groupData['group_id']] = $groupData; } @@ -5832,7 +5832,7 @@ class SessionManager "; $result = Database::query($sql); - while ($groupData = Database::fetch_array($result, 'ASSOC')) { + while ($groupData = Database::fetch_assoc($result)) { $groupBackup['tutor'][$teacher['user_id']][$course_code][$groupData['group_id']] = $groupData; } @@ -6634,7 +6634,7 @@ class SessionManager ON (cu.c_id = c.id) WHERE src.session_id IN ('$sessionToString') AND cu.status = 1"; $result = Database::query($sql); - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $teacherListId[$row['user_id']] = $row['user_id']; } } else { @@ -7074,7 +7074,7 @@ class SessionManager $result = Database::query($sql); $values = []; if (Database::num_rows($result)) { - $values = Database::fetch_array($result, 'ASSOC'); + $values = Database::fetch_assoc($result); } return $values; diff --git a/public/main/inc/lib/social.lib.php b/public/main/inc/lib/social.lib.php index d866dbbc07..40f8aea1c4 100644 --- a/public/main/inc/lib/social.lib.php +++ b/public/main/inc/lib/social.lib.php @@ -48,7 +48,7 @@ class SocialManager extends UserManager ORDER BY id ASC'; $result = Database::query($sql); $friend_relation_list = []; - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $friend_relation_list[] = $row; } $count_list = count($friend_relation_list); @@ -100,7 +100,7 @@ class SocialManager extends UserManager } $res = Database::query($sql); if (Database::num_rows($res) > 0) { - $row = Database::fetch_array($res, 'ASSOC'); + $row = Database::fetch_assoc($res); return (int) $row['id']; } else { @@ -176,7 +176,7 @@ class SocialManager extends UserManager $res = Database::query($sql); $list = []; - while ($row = Database::fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { if ($load_extra_info) { $userInfo = api_get_user_info($row['friend_user_id']); $list[] = [ @@ -295,7 +295,7 @@ class SocialManager extends UserManager } $res = Database::query($sql); $list = []; - while ($row = Database::fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { $list[] = $row; } @@ -327,7 +327,7 @@ class SocialManager extends UserManager msg_status = '.MESSAGE_STATUS_INVITATION_PENDING; $res = Database::query($sql); $list = []; - while ($row = Database::fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { $list[$row['user_receiver_id']] = $row; } @@ -359,7 +359,7 @@ class SocialManager extends UserManager msg_status = '.MESSAGE_STATUS_INVITATION_PENDING; $res = Database::query($sql); if (Database::num_rows($res)) { - $row = Database::fetch_array($res, 'ASSOC'); + $row = Database::fetch_assoc($res); return (int) $row['count']; } @@ -853,7 +853,7 @@ class SocialManager extends UserManager $groups = []; $userGroup = new UserGroupModel(); $urlGroup = api_get_path(WEB_CODE_PATH).'social/group_view.php?id='; - while ($row = Database::fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { $row['group_info'] = []; if (!empty($row['group_id'])) { if (!in_array($row['group_id'], $groups)) { diff --git a/public/main/inc/lib/statistics.lib.php b/public/main/inc/lib/statistics.lib.php index 80de9205f1..7697caaeef 100644 --- a/public/main/inc/lib/statistics.lib.php +++ b/public/main/inc/lib/statistics.lib.php @@ -739,7 +739,7 @@ class Statistics GROUP BY date(login_date)"; $res = Database::query($sql); - while ($row = Database::fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { $monthAndDay = substr($row['login_date'], 5, 5); $totalLogin[$monthAndDay] = $row['number']; } diff --git a/public/main/inc/lib/sub_language.class.php b/public/main/inc/lib/sub_language.class.php index ff1ae4ed8f..35339f0c8c 100644 --- a/public/main/inc/lib/sub_language.class.php +++ b/public/main/inc/lib/sub_language.class.php @@ -32,7 +32,7 @@ class SubLanguageManager } $rs = Database::query($sql); $all_languages = []; - while ($row = Database::fetch_array($rs, 'ASSOC')) { + while ($row = Database::fetch_assoc($rs)) { $all_languages[$row['english_name']] = $row; } @@ -83,7 +83,7 @@ class SubLanguageManager $sql = 'SELECT * FROM '.$table.' WHERE id = "'.intval($parent_id).'"'; $rs = Database::query($sql); $all_information = []; - while ($row = Database::fetch_array($rs, 'ASSOC')) { + while ($row = Database::fetch_assoc($rs)) { $all_information = $row; } diff --git a/public/main/inc/lib/tracking.lib.php b/public/main/inc/lib/tracking.lib.php index bef53dfde0..4d59fb0bcf 100644 --- a/public/main/inc/lib/tracking.lib.php +++ b/public/main/inc/lib/tracking.lib.php @@ -730,7 +730,7 @@ class Tracking } while ($row = Database::fetch_array($result)); } elseif ($num > 0) { // Not extended. - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); $my_id = $row['myid']; $my_lp_id = $row['mylpid']; $my_lp_view_id = $row['mylpviewid']; @@ -903,7 +903,7 @@ class Tracking session_id = '.$sessionId.' ORDER BY exe_date DESC '; $sumScoreResult = Database::query($sql); - $durationRow = Database::fetch_array($sumScoreResult, 'ASSOC'); + $durationRow = Database::fetch_assoc($sumScoreResult); if (!empty($durationRow['exe_duration'])) { $exeDuration = $durationRow['exe_duration']; if ($exeDuration != $subtotal_time && @@ -1802,7 +1802,7 @@ class Tracking FROM $tbl_track_login u $url_table WHERE $userCondition $condition_time $url_condition"; $rs = Database::query($sql); - $row = Database::fetch_array($rs, 'ASSOC'); + $row = Database::fetch_assoc($rs); $diff = $row['diff']; if ($diff >= 0) { @@ -1842,7 +1842,7 @@ class Tracking FROM $tbl_track_login u $url_table WHERE $condition_time $url_condition"; $rs = Database::query($sql); - $row = Database::fetch_array($rs, 'ASSOC'); + $row = Database::fetch_assoc($rs); $diff = $row['diff']; if ($diff >= 0) { @@ -2794,7 +2794,7 @@ class Tracking $progress = []; $viewCount = []; - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { if (!isset($viewCount[$row['lp_id']])) { $progress[$row['lp_id']] = $row['progress']; } @@ -2981,7 +2981,7 @@ class Tracking ORDER BY lp_item_id"; $res_lp_item = Database::query($sql); - while ($row_lp_item = Database::fetch_array($res_lp_item, 'ASSOC')) { + while ($row_lp_item = Database::fetch_assoc($res_lp_item)) { $my_lp_item_id = $row_lp_item['lp_item_id']; $order = ' view_count DESC'; if ($getOnlyBestAttempt) { @@ -3010,7 +3010,7 @@ class Tracking LIMIT 1"; $res_lp_item_result = Database::query($sql); - while ($row_max_score = Database::fetch_array($res_lp_item_result, 'ASSOC')) { + while ($row_max_score = Database::fetch_assoc($res_lp_item_result)) { $list[] = $row_max_score; } } @@ -3033,7 +3033,7 @@ class Tracking (lp_i.item_type='sco' OR lp_i.item_type='".TOOL_QUIZ."') "; $res_max_score = Database::query($sql); - while ($row_max_score = Database::fetch_array($res_max_score, 'ASSOC')) { + while ($row_max_score = Database::fetch_assoc($res_max_score)) { $list[] = $row_max_score; } } @@ -3107,7 +3107,7 @@ class Tracking $result_last_attempt = Database::query($sql); $num = Database::num_rows($result_last_attempt); if ($num > 0) { - $attemptResult = Database::fetch_array($result_last_attempt, 'ASSOC'); + $attemptResult = Database::fetch_assoc($result_last_attempt); $id_last_attempt = $attemptResult['exe_id']; // We overwrite the score with the best one not the one saved in the LP (latest) if ($getOnlyBestAttempt && false == $get_only_latest_attempt_results) { @@ -3190,7 +3190,7 @@ class Tracking lp_id = ".$lp_id; $result_have_quiz = Database::query($sql); if (Database::num_rows($result_have_quiz) > 0) { - $row = Database::fetch_array($result_have_quiz, 'ASSOC'); + $row = Database::fetch_assoc($result_have_quiz); if (is_numeric($row['count']) && 0 != $row['count']) { $lp_with_quiz++; } @@ -3301,7 +3301,7 @@ class Tracking $conditionsToString "; $result = Database::query($sql); - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); if (empty($row['sum_max_score'])) { return 0; @@ -3419,7 +3419,7 @@ class Tracking ORDER BY exe_date DESC '; $sumScoreResult = Database::query($sql); - $durationRow = Database::fetch_array($sumScoreResult, 'ASSOC'); + $durationRow = Database::fetch_assoc($sumScoreResult); if (!empty($durationRow['exe_duration'])) { $exeDuration = $durationRow['exe_duration']; if ($exeDuration != $totalTimeInLpItemView && @@ -4636,7 +4636,7 @@ class Tracking $rs = Database::query($sql); $courses = $course_in_session = $temp_course_in_session = []; $courseIdList = []; - while ($row = Database::fetch_array($rs, 'ASSOC')) { + while ($row = Database::fetch_assoc($rs)) { $courses[$row['id']] = $row['title']; $courseIdList[] = $row['id']; } @@ -4688,7 +4688,7 @@ class Tracking $rs = Database::query($sql); $simple_session_array = []; - while ($row = Database::fetch_array($rs, 'ASSOC')) { + while ($row = Database::fetch_assoc($rs)) { $course_info = api_get_course_info($row['code']); $temp_course_in_session[$row['session_id']]['course_list'][$course_info['real_id']] = $course_info; $temp_course_in_session[$row['session_id']]['title'] = $row['title']; @@ -7039,7 +7039,7 @@ class Tracking WHERE c_id = $course_id AND exe_user_id = $user_id $sessionCondition"; $res = Database::query($sql); $list = []; - while ($row = Database::fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { $list[$row['exe_id']] = $row; } @@ -7088,7 +7088,7 @@ class Tracking exe_user_id = $user_id "; $res = Database::query($sql); $list = []; - while ($row = Database::fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { $list[$row['exe_id']] = $row; } @@ -7118,7 +7118,7 @@ class Tracking WHERE c_id = $course_id AND session_id = $origin_session_id AND user_id = $user_id "; $res = Database::query($sql); $list = []; - while ($row = Database::fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { $list[$row['course_access_id']] = $row; } @@ -7148,7 +7148,7 @@ class Tracking access_user_id = $user_id "; $res = Database::query($sql); $list = []; - while ($row = Database::fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { $list[] = $row['access_id']; } @@ -7180,7 +7180,7 @@ class Tracking $lp_list = new LearnpathList($user_id, $course_info, $new_session_id); $flat_list = $lp_list->get_flat_list(); $list = []; - while ($row = Database::fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { // Checking if the LP exist in the new session //if (in_array($row['lp_id'], array_keys($flat_list))) { $list[$row['id']] = $row; @@ -7237,7 +7237,7 @@ class Tracking $flat_list = $lp_list->get_flat_list(); $list = []; - while ($row = Database::fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { //Checking if the LP exist in the new session //if (in_array($row['lp_id'], array_keys($flat_list))) { $list[$row['id']] = $row; @@ -7272,7 +7272,7 @@ class Tracking $sql = "SELECT ref FROM $TBL_ITEM_PROPERTY WHERE tool = 'calendar_event' AND insert_user_id = $user_id AND c_id = $course_id "; $res = Database::query($sql); - while ($row = Database::fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { $id = $row['ref']; if ($update_database) { $sql = "UPDATE $TBL_AGENDA SET session_id = $new_session_id WHERE c_id = $course_id AND iid = $id "; @@ -7298,13 +7298,13 @@ class Tracking echo $sql; } $res = Database::query($sql); - while ($row = Database::fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { $id = $row['ref']; $sql = "SELECT * FROM $TBL_STUDENT_PUBLICATION WHERE iid = $id AND session_id = $origin_session_id AND c_id = $course_id"; $sub_res = Database::query($sql); if (Database::num_rows($sub_res) > 0) { - $data = Database::fetch_array($sub_res, 'ASSOC'); + $data = Database::fetch_assoc($sub_res); if ($debug) { var_dump($data); } @@ -7313,7 +7313,7 @@ class Tracking $sql = "SELECT * FROM $TBL_STUDENT_PUBLICATION WHERE iid = $parent_id AND c_id = $course_id"; $select_res = Database::query($sql); - $parent_data = Database::fetch_array($select_res, 'ASSOC'); + $parent_data = Database::fetch_assoc($select_res); if ($debug) { var_dump($parent_data); } @@ -7340,7 +7340,7 @@ class Tracking $new_parent_id = 0; if ($num_rows > 0) { - $new_result = Database::fetch_array($sub_res, 'ASSOC'); + $new_result = Database::fetch_assoc($sub_res); $created_dir = $new_result['url']; $new_parent_id = $new_result['id']; } else { @@ -7394,7 +7394,7 @@ class Tracking $rest_select = Database::query($sql); if (Database::num_rows($rest_select) > 0) { if ($update_database && $new_parent_id) { - $assignment_data = Database::fetch_array($rest_select, 'ASSOC'); + $assignment_data = Database::fetch_assoc($rest_select); $sql_add_publication = "INSERT INTO ".$TBL_STUDENT_PUBLICATION_ASSIGNMENT." SET c_id = '$course_id', expires_on = '".$assignment_data['expires_on']."', @@ -7507,7 +7507,7 @@ class Tracking var_dump($sql); } $res = Database::query($sql); - while ($row = Database::fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { $id = (int) $row['id']; if ($update_database) { $sql = "UPDATE $TBL_DROPBOX_FILE SET session_id = $new_session_id WHERE c_id = $course_id AND iid = $id"; @@ -7545,7 +7545,7 @@ class Tracking var_dump($sql); } $res = Database::query($sql); - while ($row = Database::fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { $id = $row['notebook_id']; if ($update_database) { $sql = "UPDATE $TBL_NOTEBOOK @@ -8779,7 +8779,7 @@ class TrackingCourseLog } } } - while ($user = Database::fetch_array($res, 'ASSOC')) { + while ($user = Database::fetch_assoc($res)) { $userId = $user['user_id']; $userIdList[] = $userId; $userEntity = api_get_user_entity($userId); @@ -9092,7 +9092,7 @@ class TrackingCourseLog $sortByFirstName = api_sort_by_first_name(); $course = api_get_course_entity($courseId); - while ($user = Database::fetch_array($res, 'ASSOC')) { + while ($user = Database::fetch_assoc($res)) { $user['official_code'] = $user['col0']; $user['lastname'] = $user['col1']; $user['firstname'] = $user['col2']; diff --git a/public/main/inc/lib/urlmanager.lib.php b/public/main/inc/lib/urlmanager.lib.php index 167d63e670..d948d9a2a5 100644 --- a/public/main/inc/lib/urlmanager.lib.php +++ b/public/main/inc/lib/urlmanager.lib.php @@ -158,7 +158,7 @@ class UrlManager $table = Database::get_main_table(TABLE_MAIN_ACCESS_URL); $sql = "SELECT count(id) as count_result FROM $table"; $res = Database::query($sql); - $url = Database::fetch_array($res, 'ASSOC'); + $url = Database::fetch_assoc($res); $result = $url['count_result']; return $result; @@ -1258,7 +1258,7 @@ class UrlManager $result = Database::query($sql); if ($result) { - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); return (int) $row['count']; } diff --git a/public/main/inc/lib/usergroup.lib.php b/public/main/inc/lib/usergroup.lib.php index 99bd119ec5..035349e79c 100644 --- a/public/main/inc/lib/usergroup.lib.php +++ b/public/main/inc/lib/usergroup.lib.php @@ -607,14 +607,14 @@ class UserGroupModel extends Model } if (!empty($result)) { if (Database::num_rows($result) > 0) { - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $data[] = $row; } } } if (!empty($sqlClasses)) { if (Database::num_rows($resultClasess) > 0) { - while ($row = Database::fetch_array($resultClasess, 'ASSOC')) { + while ($row = Database::fetch_assoc($resultClasess)) { $data[] = $row; } } @@ -735,7 +735,7 @@ class UserGroupModel extends Model if ($getCount) { if (!empty($result)) { $result = Database::query($sql); - $array = Database::fetch_array($result, 'ASSOC'); + $array = Database::fetch_assoc($result); return $array['count']; } @@ -749,14 +749,14 @@ class UserGroupModel extends Model } if (!empty($result)) { if (Database::num_rows($result) > 0) { - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $data[] = $row; } } } if (!empty($sqlClasses)) { if (Database::num_rows($resultClasess) > 0) { - while ($row = Database::fetch_array($resultClasess, 'ASSOC')) { + while ($row = Database::fetch_assoc($resultClasess)) { $data[] = $row; } } @@ -2042,7 +2042,7 @@ class UserGroupModel extends Model user_id = $user_id "; $result = Database::query($sql); if (Database::num_rows($result) > 0) { - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); $return_value = $row['relation_type']; } } @@ -2268,7 +2268,7 @@ class UserGroupModel extends Model $result = Database::query($sql); $array = []; if (Database::num_rows($result) > 0) { - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { if ($with_image) { $picture = $this->get_picture_group($row['id'], $row['picture'], 80); $img = ''; @@ -2330,7 +2330,7 @@ class UserGroupModel extends Model $result = Database::query($sql); $array = []; - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { if ($with_image) { $picture = $this->get_picture_group($row['id'], $row['picture'], 80); $img = ''; @@ -2402,7 +2402,7 @@ class UserGroupModel extends Model $result = Database::query($sql); $array = []; - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { if ($withImage) { $picture = $this->get_picture_group($row['id'], $row['picture'], 80); $img = ''; @@ -2483,7 +2483,7 @@ class UserGroupModel extends Model $result = Database::query($sql); $array = []; - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { if ($withImage) { $userInfo = api_get_user_info($row['id']); $userPicture = UserManager::getUserPicture($row['id']); @@ -2525,7 +2525,7 @@ class UserGroupModel extends Model $result = Database::query($sql); $array = []; - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $array[$row['id']] = $row; } @@ -2683,7 +2683,7 @@ class UserGroupModel extends Model $result = Database::query($sql); if (Database::num_rows($result) > 0) { - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); return $row['count']; } @@ -2738,7 +2738,7 @@ class UserGroupModel extends Model $res = Database::query($sql); if (Database::num_rows($res) > 0) { - while ($row = Database::fetch_array($res, 'ASSOC')) { + while ($row = Database::fetch_assoc($res)) { if (!in_array($row['id'], $return)) { $return[$row['id']] = $row; } diff --git a/public/main/inc/lib/usermanager.lib.php b/public/main/inc/lib/usermanager.lib.php index 46e19ad2ce..1f9aa59bb9 100644 --- a/public/main/inc/lib/usermanager.lib.php +++ b/public/main/inc/lib/usermanager.lib.php @@ -2730,7 +2730,7 @@ class UserManager $course_list_sql_result = Database::query($sql); $personal_course_list = []; if (Database::num_rows($course_list_sql_result) > 0) { - while ($result_row = Database::fetch_array($course_list_sql_result, 'ASSOC')) { + while ($result_row = Database::fetch_assoc($course_list_sql_result)) { $course_info = api_get_course_info($result_row['code']); $result_row['course_info'] = $course_info; $personal_course_list[] = $result_row; @@ -2888,7 +2888,7 @@ class UserManager ORDER BY i"; $course_list_sql_result = Database::query($sql); - while ($result_row = Database::fetch_array($course_list_sql_result, 'ASSOC')) { + while ($result_row = Database::fetch_assoc($course_list_sql_result)) { $result_row['course_info'] = api_get_course_info($result_row['code']); $key = $result_row['session_id'].' - '.$result_row['code']; if (!isset($personal_course_list[$key])) { @@ -2962,7 +2962,7 @@ class UserManager $courses = []; $result = Database::query($sql); if (Database::num_rows($result) > 0) { - while ($result_row = Database::fetch_array($result, 'ASSOC')) { + while ($result_row = Database::fetch_assoc($result)) { $result_row['status'] = 5; if (!in_array($result_row['real_id'], $courses)) { $position = $result_row['position']; @@ -3296,7 +3296,7 @@ class UserManager $res = Database::query($sql); $num = Database::num_rows($res); if (1 == $num) { - $id_key = Database::fetch_array($res, 'ASSOC'); + $id_key = Database::fetch_assoc($res); self::delete_api_key($id_key['id']); $num = self::add_api_key($user_id, $api_service); } elseif (0 == $num) { @@ -3331,7 +3331,7 @@ class UserManager if (Database::num_rows($res) < 1) { return false; } - $row = Database::fetch_array($res, 'ASSOC'); + $row = Database::fetch_assoc($res); return $row['id']; } @@ -3437,7 +3437,7 @@ class UserManager $result = Database::query($sql); $return = []; if (Database::num_rows($result) > 0) { - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $return[] = ['id' => $row['tag'], 'text' => $row['tag']]; } } @@ -3472,7 +3472,7 @@ class UserManager $result = Database::query($sql); $return = []; if (Database::num_rows($result) > 0) { - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $return[] = $row; } } @@ -3506,7 +3506,7 @@ class UserManager $result = Database::query($sql); $return = []; if (Database::num_rows($result) > 0) { - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $return[$row['id']] = ['tag' => $row['tag'], 'count' => $row['count']]; } } @@ -3541,7 +3541,7 @@ class UserManager $result = Database::query($sql); $return = []; if (Database::num_rows($result) > 0) { - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $return[$row['id']] = ['tag' => $row['tag'], 'count' => $row['count']]; } } @@ -3582,7 +3582,7 @@ class UserManager WHERE tag LIKE '$tag' AND field_id = $field_id"; $result = Database::query($sql); if (Database::num_rows($result) > 0) { - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); return $row['id']; } else { @@ -3607,7 +3607,7 @@ class UserManager WHERE id = '$tag_id' AND field_id = $field_id"; $result = Database::query($sql); if (Database::num_rows($result) > 0) { - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); return $row['id']; } else { @@ -3751,7 +3751,7 @@ class UserManager $result = Database::query($sql); $return = []; if (Database::num_rows($result) > 0) { - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $return[$row['user_id']] = $row; } } @@ -3833,11 +3833,11 @@ class UserManager if (Database::num_rows($result) > 0) { if ($getCount) { - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); return $row['count']; } - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $return[$row['id']] = $row; } } @@ -4645,7 +4645,7 @@ class UserManager $rs = Database::query($sql); if (Database::num_rows($rs) > 0) { - $row = Database::fetch_array($rs, 'ASSOC'); + $row = Database::fetch_assoc($rs); $score = $row['score_certificate']; $category_id = $row['cat_id']; $cat = Category::load($category_id); @@ -5968,7 +5968,7 @@ SQL; $sql = "SELECT * FROM $table WHERE user_id = $userId AND career_id = $careerId"; $result = Database::query($sql); - return Database::fetch_array($result, 'ASSOC'); + return Database::fetch_assoc($result); } /** diff --git a/public/main/my_space/myStudents.php b/public/main/my_space/myStudents.php index 44324b5791..40172a2a0d 100644 --- a/public/main/my_space/myStudents.php +++ b/public/main/my_space/myStudents.php @@ -672,7 +672,7 @@ $sql = 'SELECT session_id, c_id WHERE user_id='.$studentId; $rs = Database::query($sql); $tmp_sessions = []; -while ($row = Database::fetch_array($rs, 'ASSOC')) { +while ($row = Database::fetch_assoc($rs)) { $tmp_sessions[] = $row['session_id']; if ($drh_can_access_all_courses) { if (in_array($row['session_id'], $tmp_sessions)) { diff --git a/public/main/my_space/ti_report.php b/public/main/my_space/ti_report.php index e24b6aba7b..1491d8fd44 100644 --- a/public/main/my_space/ti_report.php +++ b/public/main/my_space/ti_report.php @@ -84,14 +84,14 @@ if ($form->validate()) { $sql = "SELECT sru.user_id, s.name, s.id as session_id, s.display_start_date, s.display_end_date FROM $tblSession s - LEFT JOIN $tblSessionRelUser sru + LEFT JOIN $tblSessionRelUser sru ON (sru.session_id = s.id AND sru.relation_type = ".Session::GENERAL_COACH.") WHERE s.display_start_date BETWEEN '$startDate' AND '$endDate' ORDER BY sru.user_id"; $result = Database::query($sql); $coachList = []; - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $coachId = $row['user_id']; if (!isset($coachList[$coachId])) { $userInfo = api_get_user_info($coachId); diff --git a/public/main/plagiarism/compilatio/download.php b/public/main/plagiarism/compilatio/download.php index d95e350fa0..c29e4196dc 100644 --- a/public/main/plagiarism/compilatio/download.php +++ b/public/main/plagiarism/compilatio/download.php @@ -32,11 +32,11 @@ $tbl_student_publication = Database::get_course_table(TABLE_STUDENT_PUBLICATION) if (!empty($courseInfo['real_id'])) { $courseId = $courseInfo['real_id']; - $sql = "SELECT * FROM $tbl_student_publication + $sql = "SELECT * FROM $tbl_student_publication WHERE c_id = $courseId AND id = $id"; $result = Database::query($sql); if ($result && Database::num_rows($result)) { - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); $full_file_name = $courseInfo['course_sys_path'].$row['url']; $item_info = api_get_item_property_info($courseId, 'work', $row['id']); diff --git a/public/main/social/new_promoted_message.php b/public/main/social/new_promoted_message.php index b9f060173b..1313e79382 100644 --- a/public/main/social/new_promoted_message.php +++ b/public/main/social/new_promoted_message.php @@ -69,7 +69,7 @@ function show_compose_reply_to_message($message_id, $receiver_id, $tpl) FROM $table WHERE user_receiver_id = ".$receiver_id." AND id = ".$message_id; $result = Database::query($query); - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); $userInfo = api_get_user_info($row['user_sender_id']); if (empty($row['user_sender_id']) || empty($userInfo)) { $html = get_lang('The id of the message to reply to is not valid.'); diff --git a/public/main/survey/fillsurvey.php b/public/main/survey/fillsurvey.php index 0bf94c030e..09f687a626 100644 --- a/public/main/survey/fillsurvey.php +++ b/public/main/survey/fillsurvey.php @@ -95,7 +95,7 @@ if ('' != $surveyCode) { $sql = "SELECT anonymous FROM $table_survey WHERE c_id = $courseId AND code ='".$surveyCode."'"; $resultAnonymous = Database::query($sql); - $rowAnonymous = Database::fetch_array($resultAnonymous, 'ASSOC'); + $rowAnonymous = Database::fetch_assoc($resultAnonymous); // If is anonymous and is not allowed to take the survey to anonymous users, forbid access: if (!isset($rowAnonymous['anonymous']) || (0 == $rowAnonymous['anonymous'] && api_is_anonymous()) || @@ -171,7 +171,7 @@ if (Database::num_rows($result) < 1) { api_not_allowed(true, get_lang('Wrong invitation code')); } -$survey_invitation = Database::fetch_array($result, 'ASSOC'); +$survey_invitation = Database::fetch_assoc($result); $surveyUserFromSession = Session::read('surveyuser'); // Now we check if the user already filled the survey if (!isset($_POST['finish_survey']) && @@ -213,7 +213,7 @@ if (Database::num_rows($result) > 1) { echo '
'; echo ''; @@ -311,7 +311,7 @@ if (count($_POST) > 0) { WHERE iid='".intval($value)."'"; $result = Database::query($sql); - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); if ($row) { $option_value = $row['option_text']; } @@ -354,7 +354,7 @@ if (count($_POST) > 0) { $result = Database::query($sql);*/ // There is only one question type for conditional surveys $types = []; - //while ($row = Database::fetch_array($result, 'ASSOC')) { + //while ($row = Database::fetch_assoc($result)) { $questions = $survey->getQuestions(); $questionList = []; foreach ($questions as $question) { @@ -377,7 +377,7 @@ if (count($_POST) > 0) { $sql = "SELECT value FROM $table_survey_question_option WHERE iid='".intval($value)."'"; $result = Database::query($sql); - $row = Database::fetch_array($result, 'ASSOC'); + $row = Database::fetch_assoc($result); $option_value = $row['value']; $survey_question_answer = $value; @@ -687,7 +687,7 @@ if ((isset($_GET['show']) && '' != $_GET['show']) || survey_id = '".$surveyId."' ORDER BY sort ASC"; $result = Database::query($sql); - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { if (1 == $survey->getOneQuestionPerPage()) { if ('pagebreak' !== $row['type']) { $paged_questions[$counter][] = $row['iid']; @@ -777,7 +777,7 @@ if ((isset($_GET['show']) && '' != $_GET['show']) || $counter = 0; $limit = 0; $questions = []; - while ($row = Database :: fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { // If the type is not a pagebreak we store it in the $questions array if ('pagebreak' !== $row['type']) { $sort = $row['sort']; @@ -985,7 +985,7 @@ if ((isset($_GET['show']) && '' != $_GET['show']) || ORDER BY sort ASC"; $result = Database::query($sql); $counter = 0; - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { if (1 == $survey->getOneQuestionPerPage()) { $paged_questions_sec[$counter][] = $row['question_id']; $counter++; @@ -1035,7 +1035,7 @@ if ((isset($_GET['show']) && '' != $_GET['show']) || $counter = 0; $limit = 0; $questions = []; - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { // If the type is not a pagebreak we store it in the $questions array if ('pagebreak' !== $row['type']) { $questions[$row['sort']]['question_id'] = $row['question_id']; @@ -1086,7 +1086,7 @@ if ((isset($_GET['show']) && '' != $_GET['show']) || ORDER ".$order_sql." "; $result = Database::query($sql); $counter = 0; - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { if (1 == $survey->getOneQuestionPerPage()) { $paged_questions[$counter][] = $row['question_id']; $counter++; @@ -1149,7 +1149,7 @@ if ((isset($_GET['show']) && '' != $_GET['show']) || $counter = 0; $limit = 0; $questions = []; - while ($row = Database :: fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { // If the type is not a pagebreak we store it in the $questions array if ('pagebreak' !== $row['type']) { $questions[$row['sort']]['question_id'] = $row['question_id']; diff --git a/public/main/survey/meeting.php b/public/main/survey/meeting.php index f5abedbca3..7d43e21599 100644 --- a/public/main/survey/meeting.php +++ b/public/main/survey/meeting.php @@ -36,7 +36,7 @@ if (!empty($invitationcode) || !api_is_allowed_to_edit()) { api_not_allowed(true, get_lang('Wrong invitation code')); } - $survey_invitation = Database::fetch_array($result, 'ASSOC'); + $survey_invitation = Database::fetch_assoc($result); if ($survey_invitation) { $surveyId = (int) $survey_invitation['survey_id']; } diff --git a/public/main/survey/survey.php b/public/main/survey/survey.php index 14d97e2cc5..c97c05d82a 100644 --- a/public/main/survey/survey.php +++ b/public/main/survey/survey.php @@ -275,7 +275,7 @@ $sql = "SELECT survey_question.*, count(survey_question_option.iid) as number_of $result = Database::query($sql); $question_counter_max = Database::num_rows($result); $questionsGroupClass = ''; -while ($row = Database::fetch_array($result, 'ASSOC')) { +while ($row = Database::fetch_assoc($result)) { $questionId = $row['iid']; $breakClass = ''; @@ -397,7 +397,7 @@ if ($is_survey_type_1) { WHERE id = '.intval($_GET['gid']).' AND survey_id = '.$survey_id.' LIMIT 1'; $rs = Database::query($sql); - $editedrow = Database::fetch_array($rs, 'ASSOC'); + $editedrow = Database::fetch_assoc($rs); echo ''; echo ''; echo ''; @@ -428,7 +428,7 @@ if ($is_survey_type_1) { $rs = Database::query($sql); $grouplist = ''; - while ($row = Database::fetch_array($rs, 'ASSOC')) { + while ($row = Database::fetch_assoc($rs)) { $grouplist .= ''.$row['title'].''.$row['description'].''. ''. Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Edit')).' '. diff --git a/public/main/survey/surveyUtil.class.php b/public/main/survey/surveyUtil.class.php index b4bb06db3e..4cf9d839b2 100644 --- a/public/main/survey/surveyUtil.class.php +++ b/public/main/survey/surveyUtil.class.php @@ -48,7 +48,7 @@ class SurveyUtil $total = Database::num_rows($result); $counter = 1; $error = false; - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { if (1 == $counter && 'pagebreak' === $row['type']) { echo Display::return_message(get_lang('The page break cannot be the first'), 'error', false); $error = true; @@ -367,7 +367,7 @@ class SurveyUtil survey_question.survey_id = '".$surveyId."' ORDER BY survey_question.sort, survey_question_option.sort ASC"; $result = Database::query($sql); - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { if ('pagebreak' !== $row['type']) { $questions[$row['sort']]['question_id'] = $row['question_id']; $questions[$row['sort']]['survey_id'] = $row['survey_id']; @@ -385,7 +385,7 @@ class SurveyUtil survey_id = '".$surveyId."' AND user = '".$userId."'"; $result = Database::query($sql); - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $answers[$row['question_id']][] = $row['option_id']; $all_answers[$row['question_id']][] = $row; } @@ -630,7 +630,7 @@ class SurveyUtil survey_id= $surveyId AND question_id = $questionId "; $result = Database::query($sql); - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { echo $row['option_id'].'
'; } echo ''; @@ -642,7 +642,7 @@ class SurveyUtil question_id = $questionId ORDER BY sort ASC"; $result = Database::query($sql); - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { $options[$row['iid']] = $row; } // Getting the answers @@ -655,7 +655,7 @@ class SurveyUtil $result = Database::query($sql); $number_of_answers = []; $data = []; - while ($row = Database::fetch_array($result, 'ASSOC')) { + while ($row = Database::fetch_assoc($result)) { if (!isset($number_of_answers[$row['question_id']])) { $number_of_answers[$row['question_id']] = 0; } @@ -784,7 +784,7 @@ class SurveyUtil $sql_restriction"; $result = Database::query($sql); echo '