Fix legacy code, PHP errors

pull/3844/head
Julio Montoya 5 years ago
parent 84845da5de
commit f368019e85
  1. 1
      public/main/exercise/exercise.class.php
  2. 2
      public/main/inc/lib/database.lib.php
  3. 12
      public/main/inc/lib/document.lib.php
  4. 12
      public/main/webservices/registration.soap.php

@ -759,7 +759,6 @@ class Exercise
INNER JOIN $TBL_QUESTIONS q INNER JOIN $TBL_QUESTIONS q
ON (e.question_id = q.iid AND e.c_id = q.c_id) ON (e.question_id = q.iid AND e.c_id = q.c_id)
WHERE WHERE
e.c_id = {$this->course_id} AND
e.quiz_id = ".$this->getId(); e.quiz_id = ".$this->getId();
$result = Database::query($sql); $result = Database::query($sql);

@ -589,7 +589,7 @@ class Database
} }
} else { } else {
$value_array = self::escape_string($value_array); $value_array = self::escape_string($value_array);
$clean_values = $value_array; $clean_values = [$value_array];
} }
if (!empty($condition) && '' != $clean_values) { if (!empty($condition) && '' != $clean_values) {

@ -4216,7 +4216,7 @@ class DocumentManager
$courseData, $courseData,
$saveFilePath, $saveFilePath,
$fileType, $fileType,
'', 0,
$title, $title,
$comment, $comment,
0, //$readonly = 0, 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) public static function addFileToDocument(CDocument $document, $realPath, $content, $visibility, $group)
{ {
if (!$document->hasResourceNode()) {
return $document;
}
$fileType = $document->getFiletype(); $fileType = $document->getFiletype();
$resourceNode = $document->getResourceNode(); $resourceNode = $document->getResourceNode();
if (!$resourceNode) {
return false;
}
$em = Database::getManager(); $em = Database::getManager();
$title = $document->getTitle(); $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 = Database::getManager();
$em->persist($document); $em->persist($document);
$em->flush();
$document = self::addFileToDocument($document, $realPath, $content, $visibility, $group); $document = self::addFileToDocument($document, $realPath, $content, $visibility, $group);
if ($document) { if ($document) {

@ -252,7 +252,7 @@ function WSCreateUsers($params)
$results = []; $results = [];
$orig_user_id_value = []; $orig_user_id_value = [];
$userManager = UserManager::getManager(); $userManager = UserManager::getRepository();
$userRepository = UserManager::getRepository(); $userRepository = UserManager::getRepository();
foreach ($users_params as $user_param) { foreach ($users_params as $user_param) {
@ -515,7 +515,7 @@ function WSCreateUser($params)
$original_user_id_name $original_user_id_name
); );
$userManager = UserManager::getManager(); $userManager = UserManager::getRepository();
$userRepository = UserManager::getRepository(); $userRepository = UserManager::getRepository();
if ($user_id > 0) { if ($user_id > 0) {
@ -1604,7 +1604,7 @@ function WSEditUserCredentials($params)
return returnError(WS_ERROR_SECRET_KEY); return returnError(WS_ERROR_SECRET_KEY);
} }
$userManager = UserManager::getManager(); $userManager = UserManager::getRepository();
$userRepository = UserManager::getRepository(); $userRepository = UserManager::getRepository();
$table_user = Database::get_main_table(TABLE_MAIN_USER); $table_user = Database::get_main_table(TABLE_MAIN_USER);
$original_user_id_value = $params['original_user_id_value']; $original_user_id_value = $params['original_user_id_value'];
@ -1711,7 +1711,7 @@ function WSEditUsers($params)
return returnError(WS_ERROR_SECRET_KEY); return returnError(WS_ERROR_SECRET_KEY);
} }
$userManager = UserManager::getManager(); $userManager = UserManager::getRepository();
$userRepository = UserManager::getRepository(); $userRepository = UserManager::getRepository();
$table_user = Database::get_main_table(TABLE_MAIN_USER); $table_user = Database::get_main_table(TABLE_MAIN_USER);
@ -1898,7 +1898,7 @@ function WSEditUser($params)
return returnError(WS_ERROR_SECRET_KEY); return returnError(WS_ERROR_SECRET_KEY);
} }
$userManager = UserManager::getManager(); $userManager = UserManager::getRepository();
$userRepository = UserManager::getRepository(); $userRepository = UserManager::getRepository();
$table_user = Database::get_main_table(TABLE_MAIN_USER); $table_user = Database::get_main_table(TABLE_MAIN_USER);
@ -2069,7 +2069,7 @@ function WSEditUserWithPicture($params)
return returnError(WS_ERROR_SECRET_KEY); return returnError(WS_ERROR_SECRET_KEY);
} }
$userManager = UserManager::getManager(); $userManager = UserManager::getRepository();
$userRepository = UserManager::getRepository(); $userRepository = UserManager::getRepository();
$table_user = Database::get_main_table(TABLE_MAIN_USER); $table_user = Database::get_main_table(TABLE_MAIN_USER);

Loading…
Cancel
Save