From f368019e8591a48eaf3cf928bf95c5d6ac03a045 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 4 Mar 2021 14:21:15 +0100
Subject: [PATCH] Fix legacy code, PHP errors

---
 public/main/exercise/exercise.class.php       |  1 -
 public/main/inc/lib/database.lib.php          |  2 +-
 public/main/inc/lib/document.lib.php          | 12 +++++++-----
 public/main/webservices/registration.soap.php | 12 ++++++------
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/public/main/exercise/exercise.class.php b/public/main/exercise/exercise.class.php
index 64ce7a5530..c0bede7ac3 100644
--- a/public/main/exercise/exercise.class.php
+++ b/public/main/exercise/exercise.class.php
@@ -759,7 +759,6 @@ class Exercise
                 INNER JOIN $TBL_QUESTIONS q
                 ON (e.question_id = q.iid AND e.c_id = q.c_id)
                 WHERE
-                    e.c_id = {$this->course_id} AND
                     e.quiz_id = ".$this->getId();
         $result = Database::query($sql);
 
diff --git a/public/main/inc/lib/database.lib.php b/public/main/inc/lib/database.lib.php
index 497440bd97..946f50fe0d 100644
--- a/public/main/inc/lib/database.lib.php
+++ b/public/main/inc/lib/database.lib.php
@@ -589,7 +589,7 @@ class Database
                             }
                         } else {
                             $value_array = self::escape_string($value_array);
-                            $clean_values = $value_array;
+                            $clean_values = [$value_array];
                         }
 
                         if (!empty($condition) && '' != $clean_values) {
diff --git a/public/main/inc/lib/document.lib.php b/public/main/inc/lib/document.lib.php
index 4c11e3bcf3..281a04a8d2 100644
--- a/public/main/inc/lib/document.lib.php
+++ b/public/main/inc/lib/document.lib.php
@@ -4216,7 +4216,7 @@ class DocumentManager
             $courseData,
             $saveFilePath,
             $fileType,
-            '',
+            0,
             $title,
             $comment,
             0, //$readonly = 0,
@@ -6086,13 +6086,13 @@ This folder contains all sessions that have been opened in the chat. Although th
      */
     public static function addFileToDocument(CDocument $document, $realPath, $content, $visibility, $group)
     {
+        if (!$document->hasResourceNode()) {
+            return $document;
+        }
+
         $fileType = $document->getFiletype();
         $resourceNode = $document->getResourceNode();
 
-        if (!$resourceNode) {
-            return false;
-        }
-
         $em = Database::getManager();
         $title = $document->getTitle();
 
@@ -6243,6 +6243,8 @@ This folder contains all sessions that have been opened in the chat. Although th
 
         $em = Database::getManager();
         $em->persist($document);
+        $em->flush();
+
         $document = self::addFileToDocument($document, $realPath, $content, $visibility, $group);
 
         if ($document) {
diff --git a/public/main/webservices/registration.soap.php b/public/main/webservices/registration.soap.php
index 6dd96d0ddb..3d39317d8d 100644
--- a/public/main/webservices/registration.soap.php
+++ b/public/main/webservices/registration.soap.php
@@ -252,7 +252,7 @@ function WSCreateUsers($params)
     $results = [];
     $orig_user_id_value = [];
 
-    $userManager = UserManager::getManager();
+    $userManager = UserManager::getRepository();
     $userRepository = UserManager::getRepository();
 
     foreach ($users_params as $user_param) {
@@ -515,7 +515,7 @@ function WSCreateUser($params)
         $original_user_id_name
     );
 
-    $userManager = UserManager::getManager();
+    $userManager = UserManager::getRepository();
     $userRepository = UserManager::getRepository();
 
     if ($user_id > 0) {
@@ -1604,7 +1604,7 @@ function WSEditUserCredentials($params)
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
-    $userManager = UserManager::getManager();
+    $userManager = UserManager::getRepository();
     $userRepository = UserManager::getRepository();
     $table_user = Database::get_main_table(TABLE_MAIN_USER);
     $original_user_id_value = $params['original_user_id_value'];
@@ -1711,7 +1711,7 @@ function WSEditUsers($params)
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
-    $userManager = UserManager::getManager();
+    $userManager = UserManager::getRepository();
     $userRepository = UserManager::getRepository();
     $table_user = Database::get_main_table(TABLE_MAIN_USER);
 
@@ -1898,7 +1898,7 @@ function WSEditUser($params)
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
-    $userManager = UserManager::getManager();
+    $userManager = UserManager::getRepository();
     $userRepository = UserManager::getRepository();
 
     $table_user = Database::get_main_table(TABLE_MAIN_USER);
@@ -2069,7 +2069,7 @@ function WSEditUserWithPicture($params)
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
-    $userManager = UserManager::getManager();
+    $userManager = UserManager::getRepository();
     $userRepository = UserManager::getRepository();
 
     $table_user = Database::get_main_table(TABLE_MAIN_USER);