chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor - format code, remove unused code, move code in repo + add test

Browse Source
pull/3984/head
Julio 4 years ago
parent 64f930ecf9
commit d33da76823
7 changed files with 22 additions and 419 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 341
      public/main/forum/forumfunction.inc.php
  2. 22
      public/main/forum/index.php
  3. 61
      public/main/forum/viewthread.php
  4. 2
      public/main/lp/learnpath.class.php
  5. 2
      public/main/lp/lp_edit.php
  6. 8
      src/CourseBundle/Repository/CForumThreadRepository.php
  7. 5
      tests/CourseBundle/Repository/CForumThreadRepositoryTest.php

341
public/main/forum/forumfunction.inc.php
Unescape View File

@ -35,8 +35,6 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
*
* @todo convert into a class
*/
/*define('FORUM_NEW_POST', 0);
getNotificationsPerUser();*/
function handleForum($url)
{
@ -415,33 +413,6 @@ function forumForm(CForum $forum = null, $lp_id)
// Forum image
$form->addProgress();
/*
if ($forum) {
$baseImagePath = api_get_course_path().'/upload/forum/images/'.$inputvalues['forum_image'];
$image_path = api_get_path(WEB_COURSE_PATH).$baseImagePath;
$sysImagePath = api_get_path(SYS_COURSE_PATH).$baseImagePath;
if (file_exists($sysImagePath)) {
$show_preview_image = Display::img(
$image_path,
null,
['class' => 'img-responsive']
);
$form->addElement('label', get_lang('Preview image'), $show_preview_image);
$form->addElement('checkbox', 'remove_picture', null, get_lang('Remove picture'));
}
}
$forum_image = isset($inputvalues['forum_image']) ? $inputvalues['forum_image'] : '';
$form->addElement('file', 'picture', ('' != $forum_image ? get_lang('Update Image') : get_lang('Add image')));
$form->addRule(
'picture',
get_lang('Only PNG, JPG or GIF images allowed'),
'filetype',
['jpg', 'jpeg', 'png', 'gif']
);*/
//$forumId = isset($_GET['id']) ? (int) $_GET['id'] : 0;
//$skillList = SkillModel::addSkillsToForm($form, ITEM_TYPE_FORUM, $forumId);
$form->addElement('html', '</div>');
@ -646,7 +617,7 @@ function store_forumcategory($values, $courseInfo = [], $showMessage = true)
/** @var CForumCategory $category */
$category = $repo->find($values['forum_category_id']);
$category
->setCatComment(isset($values['forum_category_comment']) ? $values['forum_category_comment'] : '')
->setCatComment($values['forum_category_comment'] ?? '')
->setCatTitle($values['forum_category_title'])
;
$repo->update($category);
@ -665,10 +636,9 @@ function store_forumcategory($values, $courseInfo = [], $showMessage = true)
$course = api_get_course_entity($course_id);
$session = api_get_session_entity($session_id);
$category = new CForumCategory();
$category
$category = (new CForumCategory())
->setCatTitle($clean_cat_title)
->setCatComment(isset($values['forum_category_comment']) ? $values['forum_category_comment'] : '')
->setCatComment($values['forum_category_comment'] ?? '')
->setCatOrder($new_max)
->setParent($course)
->addCourseLink($course, $session)
@ -939,22 +909,6 @@ function store_forum($values, $courseInfo = [], $returnId = false)
}
}
/*api_item_property_update(
$courseInfo,
TOOL_FORUM,
$forumId,
'ForumAdded',
api_get_user_id(),
$groupInfo
);
api_set_default_visibility(
$forumId,
TOOL_FORUM,
$group_id,
$courseInfo
);*/
$logInfo = [
'tool' => TOOL_FORUM,
'tool_id' => $forumId,
@ -1045,7 +999,6 @@ function deletePost(CForumPost $post)
function check_if_last_post_of_thread($thread_id)
{
$table_posts = Database::get_course_table(TABLE_FORUM_POST);
$course_id = api_get_course_int_id();
$sql = "SELECT * FROM $table_posts
WHERE thread_id = ".(int) $thread_id.'
ORDER BY post_date DESC';
@ -1279,7 +1232,6 @@ function move_up_down($content, $direction, $id)
$next_sort = '';
$this_sort = '';
while ($row = Database::fetch_array($result, 'ASSOC')) {
//var_dump($content, $row, $id_column, $sort_column);
if ($found) {
$next_id = $row[$id_column];
$next_sort = $row[$sort_column];
@ -1543,19 +1495,6 @@ function getPosts(
'entity' => $post,
];
/*$posterId = $post->getPosterId();
if (!empty($posterId)) {
$user = api_get_user_entity($posterId);
if ($user) {
$postInfo['user_id'] = $user->getId();
$postInfo['username'] = $user->getUsername();
$postInfo['username_canonical'] = $user->getUsernameCanonical();
$postInfo['lastname'] = $user->getLastname();
$postInfo['firstname'] = $user->getFirstname();
$postInfo['complete_name'] = UserManager::formatUserFullName($user);
}
}*/
$list[] = $postInfo;
if (!$recursive) {
@ -1943,8 +1882,7 @@ function saveThread(
$session = api_get_session_entity($sessionId);
// We first store an entry in the forum_thread table because the thread_id is used in the forum_post table.
$thread = new CForumThread();
$thread
$thread = (new CForumThread())
->setThreadTitle($clean_post_title)
->setForum($forum)
->setUser($user)
@ -1991,36 +1929,6 @@ function saveThread(
);
}
/*api_item_property_update(
$courseInfo,
TOOL_FORUM_THREAD,
$thread->getIid(),
'ForumThreadAdded',
$userId,
$groupInfo,
null,
null,
null,
$sessionId
);*/
// If the forum properties tell that the posts have to be approved
// we have to put the whole thread invisible,
// because otherwise the students will see the thread and not the post
// in the thread.
// We also have to change $visible because the post itself has to be
// visible in this case (otherwise the teacher would have
// to make the thread visible AND the post.
// Default behaviour
/*api_set_default_visibility(
$thread->getIid(),
TOOL_FORUM_THREAD,
$groupId,
$courseInfo,
$sessionId,
$userId
);*/
$logInfo = [
'tool' => TOOL_FORUM,
'tool_id' => $values['forum_id'],
@ -2031,15 +1939,12 @@ function saveThread(
Event::registerLog($logInfo);
// We now store the content in the table_post table.
$post = new CForumPost();
$post
//->setCId($course_id)
$post = (new CForumPost())
->setPostTitle($clean_post_title)
->setPostText($values['post_text'])
->setThread($thread)
->setForum($forum)
->setUser(api_get_user_entity($userId))
//->setPosterName(isset($values['poster_name']) ? $values['poster_name'] : null)
->setPostDate($post_date)
->setPostNotification(isset($values['post_notification']) ? (bool) $values['post_notification'] : false)
->setVisible($visible)
@ -2959,8 +2864,6 @@ function current_qualify_of_thread($threadId, $sessionId, $userId)
function store_reply(CForum $forum, CForumThread $thread, $values, $courseId = 0, $userId = 0)
{
$courseId = !empty($courseId) ? $courseId : api_get_course_int_id();
$_course = api_get_course_info_by_id($courseId);
$table_posts = Database::get_course_table(TABLE_FORUM_POST);
$post_date = api_get_utc_datetime();
$userId = $userId ?: api_get_user_id();
@ -2991,7 +2894,6 @@ function store_reply(CForum $forum, CForumThread $thread, $values, $courseId = 0
$repo = Container::getForumPostRepository();
$post = new CForumPost();
$post
//->setCId($courseId)
->setPostTitle($values['post_title'])
->setPostText(isset($values['post_text']) ?: null)
->setThread($thread)
@ -3030,24 +2932,6 @@ function store_reply(CForum $forum, CForumThread $thread, $values, $courseId = 0
// Update the thread.
updateThreadInfo($values['thread_id'], $new_post_id, $post_date);
// Update the forum.
/*api_item_property_update(
$_course,
TOOL_FORUM,
$values['forum_id'],
'NewMessageInForum',
$userId
);
// Insert post
api_item_property_update(
$_course,
TOOL_FORUM_POST,
$new_post_id,
'NewPost',
$userId
);*/
if ('1' == $forum->getApprovalDirectPost() &&
!api_is_allowed_to_edit(null, true)
) {
@ -3283,7 +3167,6 @@ function store_edit_post(CForum $forum, $values)
Event::registerLog($logInfo);
$threadTable = Database::get_course_table(TABLE_FORUM_THREAD);
$course_id = api_get_course_int_id();
//check if this post is the first of the thread
// First we check if the change affects the thread and if so we commit
@ -3348,7 +3231,6 @@ function store_edit_post(CForum $forum, $values)
if (!empty($values['remove_attach'])) {
throw new Exception('remove_attach');
//delete_attachment($post->getIid());
}
if (empty($values['id_attach'])) {
@ -3356,12 +3238,6 @@ function store_edit_post(CForum $forum, $values)
isset($values['file_comment']) ? $values['file_comment'] : null,
$post
);
} else {
/*edit_forum_attachment_file(
isset($values['file_comment']) ? $values['file_comment'] : null,
$values['post_id'],
$values['id_attach']
);*/
}
$message = get_lang('The post has been modified').'<br />';
@ -3395,27 +3271,6 @@ function displayUserImage(User $user)
return '<div class="thumbnail"><img src="'.$url.'?w=100"/></div>';
}
/**
* The thread view counter gets increased every time someone looks at the thread.
*
* @param int $thread_id
*
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
*
* @version february 2006, dokeos 1.8
*/
function increase_thread_view($thread_id)
{
$table_threads = Database::get_course_table(TABLE_FORUM_THREAD);
$course_id = api_get_course_int_id();
$sql = "UPDATE $table_threads
SET thread_views = thread_views + 1
WHERE
iid = '".(int) $thread_id."'";
Database::query($sql);
}
/**
* The relies counter gets increased every time somebody replies to the thread.
*
@ -3442,64 +3297,6 @@ function updateThreadInfo($threadId, $lastPostId, $post_date)
Database::query($sql);
}
/**
* This function is used to find all the information about what's new in the forum tool.
*
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
*
* @deprecated
*
* @version february 2006, dokeos 1.8
*/
function get_whats_new()
{
return;
$userId = api_get_user_id();
$course_id = api_get_course_int_id();
if (empty($course_id) || empty($userId)) {
return false;
}
$table_posts = Database::get_course_table(TABLE_FORUM_POST);
$tracking_last_tool_access = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LASTACCESS);
$tool = TOOL_FORUM;
$lastForumAccess = Session::read('last_forum_access');
if (!$lastForumAccess) {
$sql = "SELECT * FROM $tracking_last_tool_access
WHERE
access_user_id = $userId AND
c_id = $course_id AND
access_tool = '".Database::escape_string($tool)."'";
$result = Database::query($sql);
$row = Database::fetch_array($result);
if ($row) {
Session::write('last_forum_access', $row['access_date']);
$lastForumAccess = $row['access_date'];
}
}
$whatsNew = Session::read('whatsnew_post_info');
if (!$whatsNew) {
if ('' != $lastForumAccess) {
$postInfo = [];
$sql = "SELECT * FROM $table_posts
WHERE
c_id = $course_id AND
visible = 1 AND
post_date > '".Database::escape_string($lastForumAccess)."'";
$result = Database::query($sql);
while ($row = Database::fetch_array($result)) {
$postInfo[$row['forum_id']][$row['thread_id']][$row['iid']] = $row['post_date'];
}
Session::write('whatsnew_post_info', $postInfo);
}
}
}
function approvePost(CForumPost $post, $action)
{
if ('invisible' === $action) {
@ -3891,9 +3688,7 @@ function store_move_post($values)
$forumId = $post->getForum()->getIid();
$threadId = $post->getThread()->getIid();
$thread = new CForumThread();
$thread
//->setCId($course_id)
$thread = (new CForumThread())
->setThreadTitle($post->getPostTitle())
->setForum($post->getForum())
->setUser($post->getUser())
@ -3910,27 +3705,6 @@ function store_move_post($values)
$repo->create($thread);
$new_thread_id = $thread->getIid();
// Storing a new thread.
/*$params = [
'c_id' => $course_id,
'thread_title' => $current_post['post_title'],
'forum_id' => $current_post['forum_id'],
'thread_poster_id' => $current_post['poster_id'],
'thread_poster_name' => $current_post['poster_name'],
'thread_last_post' => $values['post_id'],
'thread_date' => $current_post['post_date'],
];
$new_thread_id = Database::insert($table_threads, $params);
api_item_property_update(
$_course,
TOOL_FORUM_THREAD,
$new_thread_id,
'visible',
$current_post['poster_id']
);*/
// Moving the post to the newly created thread.
$sql = "UPDATE $table_posts SET thread_id='".$new_thread_id."', post_parent_id = NULL
WHERE c_id = $course_id AND iid ='".(int) ($values['post_id'])."'";
@ -4387,8 +4161,7 @@ function add_forum_attachment_file($file_comment, CForumPost $post)
$course = api_get_course_entity(api_get_course_int_id());
$session = api_get_session_entity(api_get_session_id());
$attachment = new CForumAttachment();
$attachment
$attachment = (new CForumAttachment())
->setCId(api_get_course_int_id())
->setComment($safe_file_comment)
->setFilename($file_name)
@ -4405,21 +4178,6 @@ function add_forum_attachment_file($file_comment, CForumPost $post)
$repo->create($attachment);
$repo->addFile($attachment, $file);
$repo->update($attachment);
/*$last_id_file = Database::insert(
$agenda_forum_attachment,
[
'path' => $safe_new_file_name,
]
);*/
/*api_item_property_update(
$_course,
TOOL_FORUM_ATTACH,
$last_id_file,
'ForumAttachmentAdded',
api_get_user_id()
);*/
}
}
@ -4572,48 +4330,6 @@ function delete_attachment($postId, $attachmentId)
}
return true;
$forum_table_attachment = Database::get_course_table(TABLE_FORUM_ATTACHMENT);
$course_id = api_get_course_int_id();
$cond = !empty($id_attach) ? ' iid = '.(int) $id_attach.'' : ' post_id = '.(int) $post_id.'';
$sql = "SELECT path FROM $forum_table_attachment WHERE c_id = $course_id AND $cond";
$res = Database::query($sql);
$row = Database::fetch_array($res);
$course_dir = $_course['path'].'/upload/forum';
$sys_course_path = api_get_path(SYS_COURSE_PATH);
$updir = $sys_course_path.$course_dir;
$my_path = isset($row['path']) ? $row['path'] : null;
$file = $updir.'/'.$my_path;
if (Security::check_abs_path($file, $updir)) {
@unlink($file);
}
// Delete from forum_attachment table.
$sql = "DELETE FROM $forum_table_attachment
WHERE c_id = $course_id AND $cond ";
$result = Database::query($sql);
if (false !== $result) {
$affectedRows = Database::affected_rows($result);
} else {
$affectedRows = 0;
}
// Update item_property.
api_item_property_update(
$_course,
TOOL_FORUM_ATTACH,
$id_attach,
'ForumAttachmentDelete',
api_get_user_id()
);
if (!empty($result) && !empty($id_attach)) {
Display::addFlash(Display::return_message(get_lang('The attached file has been deleted'), 'confirmation'));
}
return $affectedRows;
}
/**
@ -5549,49 +5265,6 @@ function getForumCategoryByTitle($title, $courseId, $sessionId = 0)
$course,
$session
);
/*$sessionId = (int) $sessionId;
$courseId = (int) $courseId;
$forumCategoryTable = Database::get_course_table(TABLE_FORUM_CATEGORY);
$itemProperty = Database::get_course_table(TABLE_ITEM_PROPERTY);
$fakeFrom = "$forumCategoryTable fc
INNER JOIN $itemProperty ip ";
if (0 === $sessionId) {
$fakeFrom .= '
ON (
fc.cat_id = ip.ref AND fc.c_id = ip.c_id AND (fc.session_id = ip.session_id OR ip.session_id IS NULL)
)
';
} else {
$fakeFrom .= '
ON (
fc.cat_id = ip.ref AND fc.c_id = ip.c_id AND fc.session_id = ip.session_id
)
';
}
$resultData = Database::select(
'fc.*',
$fakeFrom,
[
'where' => [
'ip.visibility != ? AND ' => 2,
'ip.tool = ? AND ' => TOOL_FORUM_CATEGORY,
'fc.session_id = ? AND ' => $sessionId,
'fc.cat_title = ? AND ' => $title,
'fc.c_id = ?' => $courseId,
],
],
'first'
);
if (empty($resultData)) {
return false;
}
return $resultData;*/
}
function getPostStatus(CForum $forum, array $row, bool $addWrapper = true): string

22
public/main/forum/index.php
Unescape View File

@ -157,8 +157,6 @@ $form_count = 0;
$url = api_get_path(WEB_CODE_PATH).'forum/index.php?'.api_get_cidreq();
$formContent = handleForum($url);
//get_whats_new();
$whatsnew_post_info = Session::read('whatsnew_post_info');
Event::event_access_tool(TOOL_FORUM);
$logInfo = [
@ -400,23 +398,6 @@ if (is_array($forumCategories)) {
foreach ($forumsInCategory as $forum) {
$forumId = $forum->getIid();
// Here we clean the whatnew_post_info array a little bit because to display the icon we
// test if $whatsnew_post_info[$forum['forum_id']] is empty or not.
/*if ($forum) {
if (!empty($whatsnew_post_info)) {
if (isset($whatsnew_post_info[$forum['forum_id']]) &&
is_array($whatsnew_post_info[$forum['forum_id']])
) {
foreach ($whatsnew_post_info[$forum['forum_id']] as $key_thread_id => $new_post_array) {
if (empty($whatsnew_post_info[$forum['forum_id']][$key_thread_id])) {
unset($whatsnew_post_info[$forum['forum_id']][$key_thread_id]);
unset($_SESSION['whatsnew_post_info'][$forum['forum_id']][$key_thread_id]);
}
}
}
}
}*/
// Note: This can be speed up if we transform the $allCourseForums
// to an array that uses the forum_category as the key.
if (true) {
@ -443,9 +424,6 @@ if (is_array($forumCategories)) {
if ($show_forum) {
$form_count++;
/*$mywhatsnew_post_info = isset($whatsnew_post_info[$forum['forum_id']])
? $whatsnew_post_info[$forum['forum_id']]
: null;*/
$forumInfo['id'] = $forumId;
$forumInfo['forum_of_group'] = $forum->getForumOfGroup();
$forumInfo['title'] = $forum->getForumTitle();

61
public/main/forum/viewthread.php
Unescape View File

@ -106,7 +106,6 @@ $courseEntity = api_get_course_entity(api_get_course_int_id());
$sessionEntity = api_get_session_entity(api_get_session_id());
$current_forum_category = $forumEntity->getForumCategory();
$whatsnew_post_info = isset($_SESSION['whatsnew_post_info']) ? $_SESSION['whatsnew_post_info'] : null;
if (api_is_in_gradebook()) {
$interbreadcrumb[] = [
@ -283,8 +282,7 @@ if (!api_is_allowed_to_edit(false, true) &&
) {
api_not_allowed();
}
// this increases the number of times the thread has been viewed
increase_thread_view($threadId);
$repoThread->increaseView($threadEntity);
if ('learnpath' === $origin) {
$template = new Template('', false, false, true, true, false);
@ -395,46 +393,10 @@ foreach ($posts as $post) {
$username = sprintf(get_lang('Login: %s'), $post['username']);
}
/*$name = $post['complete_name'];
if (empty($posterId)) {
$name = $post['poster_name'];
}*/
$post['user_data'] = '';
$post['author'] = $postEntity->getUser();
$posterId = $postEntity->getUser()->getId();
/*if ('learnpath' !== $origin) {
if ($allowUserImageForum) {
$post['user_data'] = '<div class="thumbnail">'.
display_user_image($posterId, $name, $origin).'</div>';
}
$post['user_data'] .= Display::tag(
'h4',
display_user_link($posterId, $name, $origin, $username),
['class' => 'title-username']
);
$_user = api_get_user_info($posterId);
$iconStatus = $_user['icon_status'];
$post['user_data'] .= '<div class="user-type text-center">'.$iconStatus.'</div>';
} else {
if ($allowUserImageForum) {
$post['user_data'] .= '<div class="thumbnail">'.
display_user_image($posterId, $name, $origin).'</div>';
}
$post['user_data'] .= Display::tag(
'p',
$name,
[
'title' => api_htmlentities($username, ENT_QUOTES),
'class' => 'lead',
]
);
}*/
if ('learnpath' !== $origin) {
$post['post_date_to_display'] = Display::tag(
'p',
@ -682,23 +644,6 @@ foreach ($posts as $post) {
$post['user_data'] .= $closedPost;
}
// note: this can be removed here because it will be displayed in the tree
/*if (isset($whatsnew_post_info[$forumId][$threadId][$post['post_id']]) &&
!empty($whatsnew_post_info[$forumId][$threadId][$post['post_id']]) &&
!empty($whatsnew_post_info[$forumId][$post['thread_id']])
) {
$post_image = Display::return_icon('forumpostnew.gif');
} else {
$post_image = Display::return_icon('forumpost.gif');
}
if ('1' == $post['post_notification'] && $post['poster_id'] == $userId) {
$post_image .= Display::return_icon(
'forumnotification.gif',
get_lang('You will be notified')
);
}*/
$post['current'] = false;
if (isset($_GET['post_id']) && $_GET['post_id'] == $post['post_id']) {
$post['current'] = true;
@ -750,10 +695,6 @@ foreach ($posts as $post) {
$post['post_buttons'] = "$askForRevision $editButton $reportButton $buttonReply $buttonQuote $waitingValidation";
$postList[] = $post;
// The post has been displayed => it can be removed from the what's new array
//unset($whatsnew_post_info[$current_forum['forum_id']][$current_thread['thread_id']][$post['post_id']]);
//unset($_SESSION['whatsnew_post_info'][$current_forum['forum_id']][$current_thread['thread_id']][$post['post_id']]);
$count++;
}

2
public/main/lp/learnpath.class.php
Unescape View File

@ -8866,8 +8866,6 @@ class learnpath
if ($flush) {
$em->flush();
}
//$em->flush();
//var_dump($lpItemRepo->verify());
return true;
}

2
public/main/lp/lp_edit.php
Unescape View File

@ -346,7 +346,7 @@ if ($form->validate()) {
$lp
->setName($_REQUEST['lp_name'])
->setAuthor($_REQUEST['lp_author'])
->setAuthor($_REQUEST['lp_author'] ?? '')
->setTheme($_REQUEST['lp_theme'])
->setHideTocFrame($hide_toc_frame)
->setPrerequisite($_POST['prerequisites'] ?? 0)

8
src/CourseBundle/Repository/CForumThreadRepository.php
Unescape View File

@ -33,6 +33,14 @@ class CForumThreadRepository extends ResourceRepository
return $qb;
}
public function increaseView(CForumThread $thread): void
{
$thread->setThreadViews($thread->getThreadViews() + 1);
$em = $this->getEntityManager();
$em->persist($thread);
$em->flush();
}
public function delete(ResourceInterface $resource): void
{
/** @var CForumThread $resource */

5
tests/CourseBundle/Repository/CForumThreadRepositoryTest.php
Unescape View File

@ -49,6 +49,11 @@ class CForumThreadRepositoryTest extends AbstractApiTest
$this->assertSame(1, $forumRepo->count([]));
$this->assertSame(1, $forum->getThreads()->count());
$this->assertSame(0, $thread->getThreadViews());
$threadRepo->increaseView($thread);
$this->assertSame(1, $thread->getThreadViews());
$forumRepo->delete($forum);
$this->assertSame(0, $threadRepo->count([]));

Write Preview
Loading…
Cancel
Save