Internal - Fix queries, fix installation, format code.

public/main/inc/lib/system_announcements.lib.php

@@ -828,17 +828,17 @@ class SystemAnnouncementManager
         }
 
         if (0 != $teacher && 0 == $student) {
-            $sql = "SELECT DISTINCT u.user_id FROM $user_table u $urlJoin
+            $sql = "SELECT DISTINCT u.id as user_id FROM $user_table u $urlJoin
                     WHERE status = '1' $urlCondition";
         }
 
         if (0 == $teacher && 0 != $student) {
-            $sql = "SELECT DISTINCT u.user_id FROM $user_table u $urlJoin
+            $sql = "SELECT DISTINCT u.id as user_id FROM $user_table u $urlJoin
                     WHERE status = '5' $urlCondition";
         }
 
         if (0 != $teacher && 0 != $student) {
-            $sql = "SELECT DISTINCT u.user_id FROM $user_table u $urlJoin
+            $sql = "SELECT DISTINCT u.id as user_id FROM $user_table u $urlJoin
                     WHERE 1 = 1 $urlCondition";
         }
 

public/main/install/install.lib.php

@@ -3126,7 +3126,7 @@ function finishInstallationWithContainer(
     if ($executeResult) {
         error_log('data.sql Ok');
     }
-    $result->free();
+    $result->closeCursor();
 
     UserManager::setPasswordEncryption($encryptPassForm);
 

public/main/mySpace/myStudents.php

@@ -1841,7 +1841,7 @@ if (empty($details)) {
         if ($exerciseList) {
             //while ($exercices = Database::fetch_array($result_exercices)) {
             /** @var CQuiz $exercise */
-            foreach($exerciseList as $exercise) {
+            foreach ($exerciseList as $exercise) {
                 $exercise_id = (int) $exercise->getIid();
                 $count_attempts = Tracking::count_student_exercise_attempts(
                     $studentId,

public/main/session/add_users_to_session.php

@@ -583,8 +583,8 @@ echo '</div>';
           ); ?>?page=<?php echo $page; ?>&id_session=<?php echo $id_session; ?><?php if (!empty($addProcess)) {
               echo '&add=true';
           } ?>" <?php if ($ajax_search) {
-        echo ' onsubmit="valide();"';
-    } ?>>
+              echo ' onsubmit="valide();"';
+          } ?>>
         <?php echo '<legend>'.$tool_name.' ('.$session_info['name'].') </legend>'; ?>
         <?php
         if ('multiple' === $add_type) {
@@ -658,7 +658,7 @@ echo '</div>';
                                     $selected = in_array($uid, $UserList) ? 'selected="selected"' : '';
                                     $personName = $enreg['ln'].' '.$enreg['fn'].' ('.$enreg['un'].')';
                                     if (!empty($enreg['official_code'])) {
-                                        $personName.= ' '.$enreg['official_code'];
+                                        $personName .= ' '.$enreg['official_code'];
                                     }
                                     if ($showOfficialCode) {
                                         $officialCode = !empty($enreg['official_code']) ? $enreg['official_code'].' - ' : '? - ';
@@ -683,7 +683,7 @@ echo '</div>';
 
             <div class="col-md-4">
                 <?php if ('multiple' === $add_type) {
-                    ?>
+                        ?>
                     <?php echo get_lang('First letter (last name)'); ?> :
                     <select id="first_letter_user" name="firstLetterUser" onchange="change_select(this.value);">
                         <option value="%">--</option>
@@ -693,7 +693,7 @@ echo '</div>';
                     <br/>
                     <br/>
                     <?php
-                } ?>
+                    } ?>
                 <div class="control-course">
                     <?php
                     if ($ajax_search) {

public/main/session/session_course_edit.php

@@ -113,17 +113,17 @@ $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, usern
 if (api_is_multiple_url_enabled()) {
     $tbl_access_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
     $access_url_id = api_get_current_access_url_id();
-    $sql = "SELECT u.user_id,lastname,firstname,username
+    $sql = "SELECT u.id as user_id,lastname,firstname,username
             FROM $tbl_user u
             LEFT JOIN $tbl_access_rel_user  a
-            ON(u.user_id= a.user_id)
+            ON(u.id= a.user_id)
             WHERE
                 status='1' AND
                 active = 1 AND
                 access_url_id = $access_url_id ".
             $order_clause;
 } else {
-    $sql = "SELECT user_id,lastname,firstname,username
+    $sql = "SELECT id as user_id,lastname,firstname,username
             FROM $tbl_user
             WHERE
                 status = '1' AND

public/main/session/session_course_user_list.php

@@ -88,7 +88,7 @@ $urlTable = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 $urlId = api_get_current_access_url_id();
 
 $sql = "
-    SELECT DISTINCT u.user_id,"
+    SELECT DISTINCT u.id as user_id,"
         .($is_western_name_order ? 'u.firstname, u.lastname' : 'u.lastname, u.firstname')
         .", u.username, scru.user_id as is_subscribed
     FROM $tbl_session_rel_user s

public/main/session/session_edit.php

@@ -70,10 +70,10 @@ if (api_is_multiple_url_enabled()) {
     $table_access_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
     $access_url_id = api_get_current_access_url_id();
     if (-1 != $access_url_id) {
-        $sql = "SELECT DISTINCT u.user_id,lastname,firstname,username
+        $sql = "SELECT DISTINCT u.id as user_id,lastname,firstname,username
                 FROM $tbl_user u
                 INNER JOIN $table_access_url_rel_user url_rel_user
-                ON (url_rel_user.user_id = u.user_id)
+                ON (url_rel_user.user_id = u.id)
                 WHERE status='1' AND access_url_id = '$access_url_id' $order_clause";
     }
 }