Add variables where needed to get corresponding image field for session - refs #7539

main/inc/lib/sessionmanager.lib.php

@@ -3083,19 +3083,27 @@ class SessionManager
         }
 
         $sessions = array();
-        $imagenSession = '';
         if (Database::num_rows($result) > 0) {
+            $sessionImage = '';
+            $sysUploadPath = api_get_path(SYS_UPLOAD_PATH). 'sessions/';
+            $webUploadPath = api_get_path(WEB_UPLOAD_PATH). 'sessions/';
+            $imgPath = api_get_path(WEB_IMG_PATH) . 'session_default_small.png';
+
+            $tableExtraFields = Database::get_main_table(TABLE_EXTRA_FIELD);
+            $sql = "SELECT id FROM " . $tableExtraFields . " WHERE extra_field_type = 3 AND variable='image'";
+            $resultField = Database::query($sql);
+            $imageFieldId = Database::fetch_assoc($resultField);
+
             while ($row = Database::fetch_array($result)) {
                 
-                array_push ($row['image']);
                 $row['image'] =  null;
-                $imagenSession = api_get_path(SYS_UPLOAD_PATH). 'sessions/'.'16_' .$row['id']. '.png';
+                $sessionImage = $sysUploadPath . $imageFieldId['id'] . '_' . $row['id'] . '.png';
                 
-                if (is_file($imagenSession)) {
-                    $imagenSession = api_get_path(WEB_UPLOAD_PATH). 'sessions/'.'16_' .$row['id']. '.png';
-                    $row['image'] = $imagenSession;
+                if (is_file($sessionImage)) {
+                    $sessionImage = $webUploadPath . $imageFieldId['id'] . '_' . $row['id'] . '.png';
+                    $row['image'] = $sessionImage;
                 } else {
-                    $row['image'] =  api_get_path(WEB_IMG_PATH). 'session_default_small.png';
+                    $row['image'] =  $imgPath;
                 }
                 
                 $sessions[$row['id']] = $row;