- '.
- get_lang('Student').' : '.api_get_person_name($value['firstname'], $value['lastname']).' ('.$value['username'].') ';
+ '
+ .api_get_person_name($value['firstname'], $value['lastname']).' ('.$value['username'].') ';
echo '';
+ $link = '';
+ if ($allowSkillRelItem) {
+ $url = api_get_path(WEB_CODE_PATH).'gradebook/skill_rel_user.php?'.api_get_cidreq().'&user_id='.$value['user_id'].'&selectcat='.$cat_id;
+ $link = Display::url(
+ get_lang('Skills'),
+ $url,
+ ['class' => 'btn btn-default']
+ ).' ';
+ }
+
$url = api_get_self().'?'.api_get_cidreq().'&action=download&user_id='.$value['user_id'].'&selectcat='.$cat_id;
- $link = Display::url(
+ $link .= Display::url(
get_lang('ExportToPDF'),
$url,
['target' => '_blank', 'class' => 'btn btn-default']
diff --git a/main/gradebook/lib/be/abstractlink.class.php b/main/gradebook/lib/be/abstractlink.class.php
index 026561e3e5..ab006454dd 100755
--- a/main/gradebook/lib/be/abstractlink.class.php
+++ b/main/gradebook/lib/be/abstractlink.class.php
@@ -707,7 +707,32 @@ abstract class AbstractLink implements GradebookItem
*/
public function getSkillsFromItem()
{
- $skillToString = Skill::getSkillRelItemsToString(ITEM_TYPE_EXERCISE, $this->get_ref_id());
+ $toolType = '';
+ switch ($this->type) {
+ case LINK_ATTENDANCE:
+ $toolType = ITEM_TYPE_ATTENDANCE;
+ break;
+ case LINK_EXERCISE:
+ $toolType = ITEM_TYPE_EXERCISE;
+ break;
+ case LINK_FORUM_THREAD:
+ $toolType = ITEM_TYPE_FORUM_THREAD;
+ break;
+ case LINK_LEARNPATH:
+ $toolType = ITEM_TYPE_LEARNPATH;
+ break;
+ case LINK_HOTPOTATOES:
+ $toolType = ITEM_TYPE_HOTPOTATOES;
+ break;
+ case LINK_STUDENTPUBLICATION:
+ $toolType = ITEM_TYPE_STUDENT_PUBLICATION;
+ break;
+ case LINK_SURVEY:
+ $toolType = ITEM_TYPE_SURVEY;
+ break;
+ }
+
+ $skillToString = Skill::getSkillRelItemsToString($toolType, $this->get_ref_id());
return $skillToString;
}
}
diff --git a/main/gradebook/lib/fe/catform.class.php b/main/gradebook/lib/fe/catform.class.php
index 8762953a54..f4b031370c 100755
--- a/main/gradebook/lib/fe/catform.class.php
+++ b/main/gradebook/lib/fe/catform.class.php
@@ -235,7 +235,6 @@ class CatForm extends FormValidator
$skills = $this->category_object->get_skills();
foreach ($skills as $skill) {
$skillsDefaults[] = $skill['id'];
-
$skillSelect->addOption($skill['name'], $skill['id']);
}
}
diff --git a/main/gradebook/lib/fe/evalform.class.php b/main/gradebook/lib/fe/evalform.class.php
index 0d30aa3b42..05e2f24001 100755
--- a/main/gradebook/lib/fe/evalform.class.php
+++ b/main/gradebook/lib/fe/evalform.class.php
@@ -130,9 +130,7 @@ class EvalForm extends FormValidator
{
//extra field for check on maxvalue
$this->addElement('header', get_lang('EditResult'));
-
$renderer = &$this->defaultRenderer();
-
// set new form template
$form_template = '
{content}
@@ -179,7 +177,6 @@ class EvalForm extends FormValidator
foreach ($results_and_users as $result_and_user) {
$user = $result_and_user['user'];
$result = $result_and_user['result'];
-
$renderer = &$this->defaultRenderer();
$this->addFloat(
'score['.$result->get_id().']',
@@ -254,7 +251,7 @@ class EvalForm extends FormValidator
'
);
- $tblusers = GradebookUtils::get_users_in_course($this->evaluation_object->get_course_code());
+ $users = GradebookUtils::get_users_in_course($this->evaluation_object->get_course_code());
$nr_users = 0;
//extra field for check on maxvalue
$this->addElement('hidden', 'maxvalue', $this->evaluation_object->get_max());
@@ -284,7 +281,7 @@ class EvalForm extends FormValidator
}
$firstUser = true;
- foreach ($tblusers as $user) {
+ foreach ($users as $user) {
$element_name = 'score['.$user[0].']';
$scoreColumnProperties = ['maxlength' => 5];
if ($firstUser) {
diff --git a/main/gradebook/lib/fe/gradebooktable.class.php b/main/gradebook/lib/fe/gradebooktable.class.php
index 09f141a6ae..71743039c6 100755
--- a/main/gradebook/lib/fe/gradebooktable.class.php
+++ b/main/gradebook/lib/fe/gradebooktable.class.php
@@ -1073,18 +1073,18 @@ class GradebookTable extends SortableTable
$url = $item->get_link();
+ $text = $item->get_name();
if (isset($url) && $show_message === false) {
$text = ' '
.$item->get_name()
.' ';
- } else {
- $text = $item->get_name();
}
$extra = Display::label($item->get_type_name(), 'info');
if ($type == 'simple') {
$extra = '';
}
+ $extra .= $item->getSkillsFromItem();
$text .= " ".$extra.$show_message;
$cc = $this->currentcat->get_course_code();
diff --git a/main/inc/ajax/course.ajax.php b/main/inc/ajax/course.ajax.php
index be6cd2d29b..795a3ec592 100755
--- a/main/inc/ajax/course.ajax.php
+++ b/main/inc/ajax/course.ajax.php
@@ -1,9 +1,11 @@
api_get_course_int_id(),
'sid' => api_get_session_id()
];
+
$result = (int) Event::courseLogout($logoutInfo);
echo $result;
break;
diff --git a/main/inc/ajax/document.ajax.php b/main/inc/ajax/document.ajax.php
index 116a4fbc0a..7e77d16cc9 100755
--- a/main/inc/ajax/document.ajax.php
+++ b/main/inc/ajax/document.ajax.php
@@ -17,7 +17,7 @@ switch ($action) {
break;
case 'get_document_quota':
// Getting the course quota
- $course_quota = DocumentManager::get_course_quota();
+ $courseQuota = DocumentManager::get_course_quota();
// Calculating the total space
$already_consumed_space_course = DocumentManager::documents_total_space(
@@ -26,7 +26,7 @@ switch ($action) {
// Displaying the quota
echo DocumentManager::displaySimpleQuota(
- $course_quota,
+ $courseQuota,
$already_consumed_space_course
);
@@ -110,11 +110,9 @@ switch ($action) {
api_htmlentities($result['url']),
['target'=>'_blank']
);
-
$json['url'] = $result['url'];
$json['size'] = format_file_size($file['size']);
$json['type'] = api_htmlentities($file['type']);
-
$json['result'] = Display::return_icon(
'accept.png',
get_lang('Uploaded')
diff --git a/main/inc/ajax/model.ajax.php b/main/inc/ajax/model.ajax.php
index d9a5a83fbc..9585218168 100755
--- a/main/inc/ajax/model.ajax.php
+++ b/main/inc/ajax/model.ajax.php
@@ -2195,6 +2195,9 @@ if (in_array($action, $allowed_actions)) {
switch ($exportFormat) {
case 'xls':
+ Export::arrayToXls($array, $fileName);
+ break;
+ case 'xls_html':
//TODO add date if exists
$browser = new Browser();
if ($browser->getPlatform() == Browser::PLATFORM_WINDOWS) {
@@ -2205,7 +2208,6 @@ if (in_array($action, $allowed_actions)) {
break;
case 'csv':
default:
- //TODO add date if exists
Export::arrayToCsv($array, $fileName);
break;
}
diff --git a/main/inc/ajax/skill.ajax.php b/main/inc/ajax/skill.ajax.php
index 5410b96051..32d6821ff4 100755
--- a/main/inc/ajax/skill.ajax.php
+++ b/main/inc/ajax/skill.ajax.php
@@ -53,7 +53,8 @@ switch ($action) {
//Only course gradebook with certificate
if (!empty($gradebooks)) {
foreach ($gradebooks as $gradebook) {
- if ($gradebook['parent_id'] == 0 && !empty($gradebook['certif_min_score']) &&
+ if ($gradebook['parent_id'] == 0 &&
+ !empty($gradebook['certif_min_score']) &&
!empty($gradebook['document_id'])
) {
$gradebook_list[] = $gradebook;
@@ -131,7 +132,6 @@ switch ($action) {
$template = Display::$global_template->get_template('skill/skill_info.tpl');
$html = Display::$global_template->fetch($template);
}
-
echo $html;
break;
case 'get_skills_tree_json':
@@ -171,7 +171,6 @@ switch ($action) {
$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : null;
$load_user_data = isset($_REQUEST['load_user_data']) ? $_REQUEST['load_user_data'] : null;
$skills = $skill->getChildren($id, $load_user_data);
-
$return = [];
foreach ($skills as $skill) {
if (isset($skill['data']) && !empty($skill['data'])) {
@@ -265,10 +264,8 @@ switch ($action) {
Display::$global_template->assign('total_search_skills', $count_skills);
$skill_list = [];
-
if (!empty($total_skills_to_search)) {
$total_skills_to_search = $skill->getSkillsInfo($total_skills_to_search);
-
foreach ($total_skills_to_search as $skill_info) {
$skill_list[$skill_info['id']] = $skill_info;
}
@@ -365,6 +362,68 @@ switch ($action) {
'items' => $returnSkills
]);
break;
+ case 'update_skill_rel_user':
+ $allowSkillInTools = api_get_configuration_value('allow_skill_rel_items');
+ if (empty($allowSkillInTools)) {
+ exit;
+ }
+
+ if (!api_is_allowed_to_edit()) {
+ exit;
+ }
+
+ $creatorId = api_get_user_id();
+ $typeId = isset($_REQUEST['type_id']) ? (int) $_REQUEST['type_id'] : 0;
+ $itemId = isset($_REQUEST['item_id']) ? (int) $_REQUEST['item_id'] : 0;
+ $skillId = isset($_REQUEST['skill_id']) ? (int) $_REQUEST['skill_id'] : 0;
+ $userId = isset($_REQUEST['user_id']) ? (int) $_REQUEST['user_id'] : 0;
+ $courseId = isset($_REQUEST['course_id']) ? (int) $_REQUEST['course_id'] : 0;
+ $sessionId = isset($_REQUEST['session_id']) ? (int) $_REQUEST['session_id'] : 0;
+
+ if (!empty($typeId) && !empty($itemId) && !empty($skillId) && !empty($userId) && !empty($courseId)) {
+ $em = Database::getManager();
+ $user = api_get_user_entity($userId);
+ $skill = $em->getRepository('ChamiloCoreBundle:Skill')->find($skillId);
+ if (empty($user) || empty($skill)) {
+ exit;
+ }
+ $course = api_get_course_entity($courseId);
+ if (empty($course)) {
+ exit;
+ }
+
+ $session = $em->getRepository('ChamiloCoreBundle:Session')->find($sessionId);
+
+ /** @var \Chamilo\SkillBundle\Entity\SkillRelItem $skillRelItem */
+ $skillRelItem = $em->getRepository('ChamiloSkillBundle:SkillRelItem')->findOneBy(
+ ['itemId' => $itemId, 'itemType' => $typeId, 'skill' => $skillId]
+ );
+
+ if ($skillRelItem) {
+ $criteria = [
+ 'user' => $userId,
+ 'skillRelItem' => $skillRelItem
+ ];
+ $skillRelItemRelUser = $em->getRepository('ChamiloSkillBundle:SkillRelItemRelUser')->findOneBy($criteria);
+ if ($skillRelItemRelUser) {
+ $em->remove($skillRelItemRelUser);
+ $em->flush();
+ $skillRelItemRelUser = null;
+ } else {
+ $skillRelItemRelUser = new Chamilo\SkillBundle\Entity\SkillRelItemRelUser();
+ $skillRelItemRelUser
+ ->setUser($user)
+ ->setSkillRelItem($skillRelItem)
+ ->setCreatedBy($creatorId)
+ ->setUpdatedBy($creatorId)
+ ;
+ $em->persist($skillRelItemRelUser);
+ $em->flush();
+ }
+ }
+ echo Skill::getUserSkillStatusLabel($skillRelItem, $skillRelItemRelUser, false);
+ }
+ break;
default:
echo '';
}
diff --git a/main/inc/lib/AnnouncementEmail.php b/main/inc/lib/AnnouncementEmail.php
index 1a9036a8bf..4f6f2128a3 100644
--- a/main/inc/lib/AnnouncementEmail.php
+++ b/main/inc/lib/AnnouncementEmail.php
@@ -12,38 +12,28 @@ class AnnouncementEmail
protected $course = null;
protected $announcement = null;
public $session_id = null;
+ public $logger;
/**
- *
* @param array $courseInfo
* @param int $sessionId
* @param int $announcementId
- *
- * @return AnnouncementEmail
+ * @param \Monolog\Logger $logger
*/
- public static function create($courseInfo, $sessionId, $announcementId)
- {
- return new self($courseInfo, $sessionId, $announcementId);
- }
-
- /**
- * @param array $courseInfo
- * @param int $sessionId
- * @param int $announcementId
- */
- public function __construct($courseInfo, $sessionId, $announcementId)
+ public function __construct($courseInfo, $sessionId, $announcementId, $logger = null)
{
if (empty($courseInfo)) {
$courseInfo = api_get_course_info();
}
$this->course = $courseInfo;
- $this->session_id = !empty($sessionId) ? (int) $sessionId : api_get_session_id();
+ $this->session_id = empty($sessionId) ? api_get_session_id() : (int) $sessionId;
if (is_numeric($announcementId)) {
$announcementId = AnnouncementManager::get_by_id($courseInfo['real_id'], $announcementId);
}
$this->announcement = $announcementId;
+ $this->logger = $logger;
}
/**
@@ -181,6 +171,9 @@ class AnnouncementEmail
}
if (empty($users)) {
+ if (!empty($this->logger)) {
+ $this->logger->addInfo('User list is empty. No users found. Trying all_users()');
+ }
$users = self::all_users();
}
@@ -195,21 +188,6 @@ class AnnouncementEmail
return $newListUsers;
}
- /**
- * Sender info
- *
- * @param string $key
- * @param int $userId
- *
- * @return array
- */
- public function sender($key = '', $userId = 0)
- {
- $_user = api_get_user_info($userId);
-
- return $key ? $_user[$key] : $_user;
- }
-
/**
* Email subject
*
@@ -242,7 +220,6 @@ class AnnouncementEmail
$session_id
);
- $user_email = $this->sender('mail');
// Build the link by hand because api_get_cidreq() doesn't accept course params
$course_param = 'cidReq='.$courseCode.'&id_session='.$session_id.'&gidReq='.api_get_group_id();
$course_name = $this->course('title');
@@ -261,12 +238,10 @@ class AnnouncementEmail
}
$result .= ''.$sender_name.' '.$userInfo['complete_name'].' '.$course_name.'
-
+
-
+
@@ -982,7 +982,7 @@ EOT;
');
$this->addHtml('
+ ';
+ $form->addHtml($html);
+ $form->addLabel(get_lang('Skills'), $skills);
+ }
+ }
+ }
/**
* Add skills select ajax for an item (exercise, lp)
@@ -2365,6 +2460,103 @@ class Skill extends Model
return $skillList;
}
+ /**
+ * @param int $courseId
+ * @param int $sessionId
+ * @return array
+ */
+ public static function getSkillRelItemsPerCourse($courseId, $sessionId = null)
+ {
+ $allowSkillInTools = api_get_configuration_value('allow_skill_rel_items');
+ $skills = [];
+
+ if (empty($sessionId)) {
+ $sessionId = null;
+ }
+
+ if ($allowSkillInTools) {
+ $em = Database::getManager();
+ $skills = $em->getRepository('ChamiloSkillBundle:SkillRelItem')->findBy(
+ ['courseId' => $courseId, 'sessionId' => $sessionId]
+ );
+ }
+
+ return $skills;
+ }
+
+ /**
+ * @param int $itemId
+ * @param int $itemType
+ * @return array
+ */
+ public static function getItemInfo($itemId, $itemType)
+ {
+ $itemInfo = [];
+ $itemId = (int) $itemId;
+ $itemType = (int) $itemType;
+ $em = Database::getManager();
+
+ switch ($itemType) {
+ case ITEM_TYPE_EXERCISE:
+ /** @var \Chamilo\CourseBundle\Entity\CQuiz $item */
+ $item = $em->getRepository('ChamiloCourseBundle:CQuiz')->find($itemId);
+ if ($item) {
+ $itemInfo['name'] = $item->getTitle();
+ }
+ break;
+ case ITEM_TYPE_HOTPOTATOES:
+ break;
+ case ITEM_TYPE_LINK:
+ /** @var \Chamilo\CourseBundle\Entity\CLink $item */
+ $item = $em->getRepository('ChamiloCourseBundle:CLink')->find($itemId);
+ if ($item) {
+ $itemInfo['name'] = $item->getTitle();
+ }
+ break;
+ case ITEM_TYPE_LEARNPATH:
+ /** @var \Chamilo\CourseBundle\Entity\CLp $item */
+ $item = $em->getRepository('ChamiloCourseBundle:CLp')->find($itemId);
+ if ($item) {
+ $itemInfo['name'] = $item->getName();
+ }
+ break;
+ case ITEM_TYPE_GRADEBOOK:
+ break;
+ case ITEM_TYPE_STUDENT_PUBLICATION:
+ /** @var \Chamilo\CourseBundle\Entity\CStudentPublication $item */
+ $item = $em->getRepository('ChamiloCourseBundle:CStudentPublication')->find($itemId);
+ if ($item) {
+ $itemInfo['name'] = $item->getTitle();
+ }
+ break;
+ //ITEM_TYPE_FORUM', 7);
+ case ITEM_TYPE_ATTENDANCE:
+ /** @var \Chamilo\CourseBundle\Entity\CAttendance $item */
+ $item = $em->getRepository('ChamiloCourseBundle:CAttendance')->find($itemId);
+ if ($item) {
+ $itemInfo['name'] = $item->getName();
+ }
+ break;
+ case ITEM_TYPE_SURVEY:
+ /** @var \Chamilo\CourseBundle\Entity\CSurvey $item */
+ $item = $em->getRepository('ChamiloCourseBundle:CSurvey')->find($itemId);
+ if ($item) {
+ $itemInfo['name'] = strip_tags($item->getTitle());
+ }
+ break;
+ case ITEM_TYPE_FORUM_THREAD:
+ /** @var \Chamilo\CourseBundle\Entity\CForumThread $item */
+ $item = $em->getRepository('ChamiloCourseBundle:CForumThread')->find($itemId);
+ if ($item) {
+ $itemInfo['name'] = $item->getThreadTitle();
+ }
+ break;
+ }
+
+ return $itemInfo;
+ }
+
+
/**
* @param int $typeId
* @param int $itemId
@@ -2406,6 +2598,31 @@ class Skill extends Model
return $skillToString;
}
+ /**
+ * @param int $itemId
+ * @param int $typeId
+ */
+ public static function deleteSkillsFromItem($itemId, $typeId)
+ {
+ $allowSkillInTools = api_get_configuration_value('allow_skill_rel_items');
+ if ($allowSkillInTools) {
+ $itemId = (int) $itemId;
+ $typeId = (int) $typeId;
+
+ $em = Database::getManager();
+ // Delete old ones
+ $items = $em->getRepository('ChamiloSkillBundle:SkillRelItem')->findBy(
+ ['itemId' => $itemId, 'itemType' => $typeId]
+ );
+
+ /** @var SkillRelItem $skillRelItem */
+ foreach ($items as $skillRelItem) {
+ $em->remove($skillRelItem);
+ }
+ $em->flush();
+ }
+ }
+
/**
* Relate skill with an item (exercise, gradebook, lp, etc)
* @param FormValidator $form
@@ -2418,6 +2635,15 @@ class Skill extends Model
$allowSkillInTools = api_get_configuration_value('allow_skill_rel_items');
if ($allowSkillInTools) {
$userId = api_get_user_id();
+ $courseId = api_get_course_int_id();
+ if (empty($courseId)) {
+ $courseId = null;
+ }
+ $sessionId = api_get_session_id();
+ if (empty($sessionId)) {
+ $sessionId = null;
+ }
+
$em = Database::getManager();
$skills = (array) $form->getSubmitValue('skills');
@@ -2426,7 +2652,7 @@ class Skill extends Model
['itemId' => $itemId, 'itemType' => $typeId]
);
if (!empty($items)) {
- /** @var \Chamilo\SkillBundle\Entity\SkillRelItem $skillRelItem */
+ /** @var SkillRelItem $skillRelItem */
foreach ($items as $skillRelItem) {
if (!in_array($skillRelItem->getSkill()->getId(), $skills)) {
$em->remove($skillRelItem);
@@ -2442,10 +2668,12 @@ class Skill extends Model
$skill = $em->getRepository('ChamiloCoreBundle:Skill')->find($skillId);
if ($skill) {
if (!$skill->hasItem($typeId, $itemId)) {
- $skillRelItem = new \Chamilo\SkillBundle\Entity\SkillRelItem();
+ $skillRelItem = new SkillRelItem();
$skillRelItem
->setItemType($typeId)
->setItemId($itemId)
+ ->setCourseId($courseId)
+ ->setSessionId($sessionId)
->setCreatedBy($userId)
->setUpdatedBy($userId)
;
diff --git a/main/link/link.php b/main/link/link.php
index 9a7fc91242..1596cc36d5 100755
--- a/main/link/link.php
+++ b/main/link/link.php
@@ -107,7 +107,9 @@ switch ($action) {
$form = Link::getLinkForm(null, 'addlink', $token);
if ($form->validate() && Security::check_token('get')) {
// Here we add a link
- Link::addlinkcategory("link");
+ $linkId = Link::addlinkcategory('link');
+ Skill::saveSkills($form, ITEM_TYPE_LINK, $linkId);
+
Security::clear_token();
header('Location: '.$linkListUrl);
exit;
@@ -119,6 +121,7 @@ switch ($action) {
$form = Link::getLinkForm($id, 'editlink');
if ($form->validate()) {
Link::editLink($id, $form->getSubmitValues());
+ Skill::saveSkills($form, ITEM_TYPE_LINK, $id);
header('Location: '.$linkListUrl);
exit;
}
diff --git a/main/lp/aicc_hacp.php b/main/lp/aicc_hacp.php
index 3b4cdeb53c..a1fd82bccd 100755
--- a/main/lp/aicc_hacp.php
+++ b/main/lp/aicc_hacp.php
@@ -60,7 +60,6 @@ if ($debug > 2) {
}
// Is this needed? This is probabaly done in the header file.
-//$_user = $_SESSION['_user'];
$file = Session::read('file');
$oLP = unserialize(Session::read('lpobject'));
$oItem = & $oLP->items[$oLP->current];
diff --git a/main/lp/learnpath.class.php b/main/lp/learnpath.class.php
index e21d5c37cd..8a02dbaa61 100755
--- a/main/lp/learnpath.class.php
+++ b/main/lp/learnpath.class.php
@@ -1970,8 +1970,8 @@ class learnpath
$idBar = 'control-top';
}
- $navbar = null;
- $lp_id = $this->lp_id;
+ $navbar = '';
+ $lpId = $this->lp_id;
$mycurrentitemid = $this->get_current_item_id();
$reportingText = get_lang('Reporting');
@@ -1979,34 +1979,53 @@ class learnpath
$nextText = get_lang('ScormNext');
$fullScreenText = get_lang('ScormExitFullScreen');
+ $settings = api_get_configuration_value('lp_view_settings');
+ $display = isset($settings['display']) ? $settings['display'] : false;
+ $reportingIcon = '
+
+ '.$reportingText.'
+ ';
+
+ if (!empty($display)) {
+ $showReporting = isset($display['show_reporting_icon']) ? $display['show_reporting_icon'] : true;
+ if ($showReporting == false) {
+ $reportingIcon = '';
+ }
+ }
+
+ $previousIcon = '
+
+ '.$previousText.'
+ ';
+
+ $nextIcon = '
+
+ ' . $nextText.'
+ ';
+
if ($this->mode == 'fullscreen') {
$navbar = '
-
- ' . $reportingText.'
-
-
- ' . $previousText.'
-
-
- ' . $nextText.'
-
-
- ' . $fullScreenText.'
+ '.$reportingIcon.'
+ '.$previousIcon.'
+ '.$nextIcon.'
+
+ '.$fullScreenText.'
';
} else {
$navbar = '
-
- ' . $reportingText.'
-
-
- ' . $previousText.'
-
-
- ' . $nextText.'
-
+ '.$reportingIcon.'
+ '.$previousIcon.'
+ '.$nextIcon.'
';
}
@@ -3439,7 +3458,6 @@ class learnpath
public function get_link($type = 'http', $item_id = null, $provided_toc = false)
{
$course_id = $this->get_course_int_id();
-
if ($this->debug > 0) {
error_log('New LP - In learnpath::get_link('.$type.','.$item_id.')', 0);
}
@@ -3456,7 +3474,7 @@ class learnpath
}
//still empty, this means there was no item_id given and we are not in an object context or
//the object property is empty, return empty link
- $item_id = $this->first();
+ $this->first();
return '';
}
@@ -4205,6 +4223,13 @@ class learnpath
*/
public function prerequisites_match($itemId = null)
{
+ $allow = api_get_configuration_value('allow_teachers_to_access_blocked_lp_by_prerequisite');
+ if ($allow) {
+ if (api_is_allowed_to_edit() || api_is_platform_admin() || api_is_drh()) {
+ return true;
+ }
+ }
+
$debug = $this->debug;
if ($debug > 0) {
error_log('In learnpath::prerequisites_match()', 0);
@@ -6084,10 +6109,13 @@ class learnpath
$edit_icon .= '';
if (!in_array($arrLP[$i]['item_type'], ['forum', 'thread'])) {
- $forumThread = $this->items[$arrLP[$i]['id']]->getForumThread(
- $this->course_int_id,
- $this->lp_session_id
- );
+ $forumThread = null;
+ if (isset($this->items[$arrLP[$i]['id']])) {
+ $forumThread = $this->items[$arrLP[$i]['id']]->getForumThread(
+ $this->course_int_id,
+ $this->lp_session_id
+ );
+ }
if ($forumThread) {
$forumIconUrl = api_get_self().'?'.api_get_cidreq().'&'.http_build_query([
'action' => 'dissociate_forum',
@@ -7704,8 +7732,6 @@ class learnpath
$arrHide = [
$id
];
-
- //$parent_item_id = $_SESSION['parent_item_id'];
for ($i = 0; $i < count($arrLP); $i++) {
if ($action != 'add') {
if ($arrLP[$i]['item_type'] == 'dir' &&
@@ -12308,6 +12334,7 @@ EOD;
$main_course_path = api_get_path(WEB_COURSE_PATH).$course_info['directory'].'/';
$link = '';
$extraParams = api_get_cidreq(true, true, 'learnpath').'&session_id='.$session_id;
+
switch ($type) {
case 'dir':
return $main_dir_path.'lp/blank.php';
diff --git a/main/lp/lp_add.php b/main/lp/lp_add.php
index 5b71506613..ccd23280f1 100755
--- a/main/lp/lp_add.php
+++ b/main/lp/lp_add.php
@@ -151,6 +151,8 @@ $form->addElement('html', '');
$form->addDatePicker('expired_on', get_lang('ExpirationDate'));
$form->addElement('html', '
');
+Skill::addSkillsToForm($form, ITEM_TYPE_LEARNPATH, 0);
+
$form->addElement('html', ' ');
$defaults['activate_start_date_check'] = 1;
diff --git a/main/lp/lp_add_item.php b/main/lp/lp_add_item.php
index 34e36eff79..574ec7ba3d 100755
--- a/main/lp/lp_add_item.php
+++ b/main/lp/lp_add_item.php
@@ -20,14 +20,14 @@ $this_section = SECTION_COURSES;
api_protect_course_script();
$isStudentView = isset($_REQUEST['isStudentView']) ? $_REQUEST['isStudentView'] : null;
-$learnpath_id = isset($_REQUEST['lp_id']) ? intval($_REQUEST['lp_id']) : null;
+$lpId = isset($_REQUEST['lp_id']) ? (int) $_REQUEST['lp_id'] : 0;
$submit = isset($_POST['submit_button']) ? $_POST['submit_button'] : null;
$type = isset($_GET['type']) ? $_GET['type'] : null;
$action = isset($_GET['action']) ? $_GET['action'] : null;
$is_allowed_to_edit = api_is_allowed_to_edit(null, false);
-$listUrl = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?action=view&lp_id='.$learnpath_id.'&'.api_get_cidreq().'&isStudentView=true';
+$listUrl = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?action=view&lp_id='.$lpId.'&'.api_get_cidreq().'&isStudentView=true';
if (!$is_allowed_to_edit) {
header("Location: $listUrl");
exit;
@@ -98,7 +98,7 @@ $interbreadcrumb[] = [
'name' => get_lang('LearningPaths'),
];
$interbreadcrumb[] = [
- 'url' => api_get_self()."?action=build&lp_id=$learnpath_id&".api_get_cidreq(),
+ 'url' => api_get_self()."?action=build&lp_id=$lpId&".api_get_cidreq(),
'name' => $learnPath->get_name(),
];
@@ -192,7 +192,6 @@ $(document).ready(function() {
// hide the current template list for new documment until it tab clicked
$('#frmModel').hide();
-
});
// document template for new document tab handler
diff --git a/main/lp/lp_admin_view.php b/main/lp/lp_admin_view.php
index 3ee08208a5..290d384f14 100755
--- a/main/lp/lp_admin_view.php
+++ b/main/lp/lp_admin_view.php
@@ -1,6 +1,8 @@
api_get_self()."?action=build&lp_id=$learnpath_id&".api_get_cidreq(),
- "name" => stripslashes("{$therow['name']}"),
+ "name" => Security::remove_XSS($learnPath->get_name()),
];
$interbreadcrumb[] = [
'url' => api_get_self()."?action=add_item&type=step&lp_id=$learnpath_id&".api_get_cidreq(),
@@ -66,12 +63,12 @@ if (isset($_REQUEST['updateaudio'])) {
// Theme calls.
$show_learn_path = true;
-$lp_theme_css = $_SESSION['oLP']->get_theme();
+$lp_theme_css = $learnPath->get_theme();
// POST action handling (uploading mp3, deleting mp3)
if (isset($_POST['save_audio'])) {
//Updating the lp.modified_on
- $_SESSION['oLP']->set_modified_on();
+ $learnPath->set_modified_on();
$lp_items_to_remove_audio = [];
$tbl_lp_item = Database::get_course_table(TABLE_LP_ITEM);
@@ -150,7 +147,7 @@ if (isset($_POST['save_audio'])) {
}
}
//echo Display::return_message(get_lang('ItemUpdated'), 'confirm');
- $url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_SESSION['oLP']->lp_id).'&'.api_get_cidreq();
+ $url = api_get_self().'?action=add_item&type=step&lp_id='.$learnPath->get_id().'&'.api_get_cidreq();
header('Location: '.$url);
exit;
}
@@ -162,7 +159,6 @@ $suredel = trim(get_lang('AreYouSureToDeleteJS'));
build_action_menu();
+echo $learnPath->build_action_menu();
echo '
';
echo '
';
-echo $_SESSION['oLP']->return_new_tree(null, true);
+echo $learnPath->return_new_tree(null, true);
echo '
';
echo '
';
@@ -280,7 +276,7 @@ switch ($_GET['action']) {
'confirm'
);
} else {
- echo $_SESSION['oLP']->display_edit_item($_GET['id']);
+ echo $learnPath->display_edit_item($_GET['id']);
}
break;
case 'delete_item':
@@ -294,7 +290,7 @@ switch ($_GET['action']) {
}
if (!empty($_GET['updateaudio'])) {
// list of items to add audio files
- echo $_SESSION['oLP']->overview();
+ echo $learnPath->overview();
}
echo '
';
diff --git a/main/lp/lp_ajax_save_item.php b/main/lp/lp_ajax_save_item.php
index 6018be36a4..26da4fa7a2 100755
--- a/main/lp/lp_ajax_save_item.php
+++ b/main/lp/lp_ajax_save_item.php
@@ -444,7 +444,7 @@ function save_item(
}
$return .= "update_progress_bar('$myComplete', '$myTotal', '$myProgressMode');";
- if (!isset($_SESSION['login_as'])) {
+ if (!Session::read('login_as')) {
// If $_SESSION['login_as'] is set, then the user is an admin logged as the user.
$tbl_track_login = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
diff --git a/main/lp/lp_build.php b/main/lp/lp_build.php
index aebd5b7c8a..7b0a81eae3 100755
--- a/main/lp/lp_build.php
+++ b/main/lp/lp_build.php
@@ -1,6 +1,8 @@
Category::getUrl(),
'name' => get_lang('ToolGradebook')
];
}
-$interbreadcrumb[] = ['url' => 'lp_controller.php?action=list', 'name' => get_lang('LearningPaths')];
-$interbreadcrumb[] = ['url' => '#', "name" => $therow['name']];
+$interbreadcrumb[] = ['url' => 'lp_controller.php?action=list?'.api_get_cidreq(), 'name' => get_lang('LearningPaths')];
+$interbreadcrumb[] = ['url' => '#', "name" => $learnPath->get_name()];
// Theme calls.
-$lp_theme_css = $_SESSION['oLP']->get_theme();
+$lp_theme_css = $learnPath->get_theme();
$show_learn_path = true;
Display::display_header('', 'Path');
$suredel = trim(get_lang('AreYouSureToDeleteJS'));
@@ -87,13 +75,12 @@ function confirmation(name) {
build_action_menu();
+echo $learnPath->build_action_menu();
echo '
';
echo '
';
// Build the tree with the menu items in it.
-echo $_SESSION['oLP']->return_new_tree();
+echo $learnPath->return_new_tree();
echo '
';
echo '
';
@@ -106,13 +93,13 @@ if (isset($is_success) && $is_success === true) {
echo Display::page_subheader(get_lang('LearnPathAddedTitle'));
echo '
';
echo show_block(
- 'lp_controller.php?'.api_get_cidreq().'&action=add_item&type=step&lp_id='.$_SESSION['oLP']->lp_id,
+ 'lp_controller.php?'.api_get_cidreq().'&action=add_item&type=step&lp_id='.$learnPath->get_id(),
get_lang("NewStep"),
get_lang('NewStepComment'),
'tools.png'
);
echo show_block(
- 'lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$_SESSION['oLP']->lp_id,
+ 'lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$learnPath->get_id(),
get_lang("Display"),
get_lang('DisplayComment'),
'view.png'
diff --git a/main/lp/lp_content.php b/main/lp/lp_content.php
index 7c5b889be7..455b18b6f1 100755
--- a/main/lp/lp_content.php
+++ b/main/lp/lp_content.php
@@ -1,6 +1,8 @@
error = '';
-$lp_type = $_SESSION['oLP']->get_type();
-$lp_item_id = $_SESSION['oLP']->get_current_item_id();
+
+/** @var learnpath $learnPath */
+$learnPath = Session::read('oLP');
+$learnPath->error = '';
+$lp_type = $learnPath->get_type();
+$lp_item_id = $learnPath->get_current_item_id();
/**
* Get a link to the corresponding document
@@ -32,7 +37,7 @@ if ($debug > 0) {
error_log('New lp - In lp_content.php - Looking for file url', 0);
}
-$list = $_SESSION['oLP']->get_toc();
+$list = $learnPath->get_toc();
$dir = false;
foreach ($list as $toc) {
@@ -40,18 +45,19 @@ foreach ($list as $toc) {
$dir = true;
}
}
+
if ($dir) {
$src = 'blank.php';
} else {
switch ($lp_type) {
case 1:
- $_SESSION['oLP']->stop_previous_item();
- $prereq_check = $_SESSION['oLP']->prerequisites_match($lp_item_id);
+ $learnPath->stop_previous_item();
+ $prereq_check = $learnPath->prerequisites_match($lp_item_id);
if ($prereq_check === true) {
- $src = $_SESSION['oLP']->get_link('http', $lp_item_id);
- $_SESSION['oLP']->start_current_item(); // starts time counter manually if asset
- $src = $_SESSION['oLP']->fixBlockedLinks($src);
+ $src = $learnPath->get_link('http', $lp_item_id);
+ $learnPath->start_current_item(); // starts time counter manually if asset
+ $src = $learnPath->fixBlockedLinks($src);
break;
}
@@ -59,23 +65,23 @@ if ($dir) {
$src = 'blank.php?error=prerequisites';
break;
case 2:
- $_SESSION['oLP']->stop_previous_item();
- $prereq_check = $_SESSION['oLP']->prerequisites_match($lp_item_id);
+ $learnPath->stop_previous_item();
+ $prereq_check = $learnPath->prerequisites_match($lp_item_id);
if ($prereq_check === true) {
- $src = $_SESSION['oLP']->get_link('http', $lp_item_id);
- $_SESSION['oLP']->start_current_item(); // starts time counter manually if asset
+ $src = $learnPath->get_link('http', $lp_item_id);
+ $learnPath->start_current_item(); // starts time counter manually if asset
} else {
$src = 'blank.php?error=prerequisites';
}
break;
case 3:
// save old if asset
- $_SESSION['oLP']->stop_previous_item(); // save status manually if asset
- $prereq_check = $_SESSION['oLP']->prerequisites_match($lp_item_id);
+ $learnPath->stop_previous_item(); // save status manually if asset
+ $prereq_check = $learnPath->prerequisites_match($lp_item_id);
if ($prereq_check === true) {
- $src = $_SESSION['oLP']->get_link('http', $lp_item_id);
- $_SESSION['oLP']->start_current_item(); // starts time counter manually if asset
+ $src = $learnPath->get_link('http', $lp_item_id);
+ $learnPath->start_current_item(); // starts time counter manually if asset
} else {
$src = 'blank.php';
}
@@ -88,7 +94,7 @@ if ($dir) {
if ($debug > 0) {
error_log('New lp - In lp_content.php - File url is '.$src, 0);
}
-$_SESSION['oLP']->set_previous_item($lp_item_id);
+$learnPath->set_previous_item($lp_item_id);
if (api_is_in_gradebook()) {
$interbreadcrumb[] = [
@@ -97,7 +103,7 @@ if (api_is_in_gradebook()) {
];
}
// Define the 'doc.inc.php' as language file.
-$nameTools = $_SESSION['oLP']->get_name();
+$nameTools = $learnPath->get_name();
$interbreadcrumb[] = [
'url' => api_get_path(WEB_CODE_PATH).'lp/lp_list.php?'.api_get_cidreq(),
'name' => get_lang('Doc'),
@@ -109,5 +115,6 @@ $_setting['show_navigation_menu'] = false;
if ($debug > 0) {
error_log('New LP - In lp_content.php - Loading '.$src, 0);
}
+Session::write('oLP', $learnPath);
header("Location: ".urldecode($src));
exit;
diff --git a/main/lp/lp_controller.php b/main/lp/lp_controller.php
index f7396eb599..0c4e6cb261 100755
--- a/main/lp/lp_controller.php
+++ b/main/lp/lp_controller.php
@@ -283,21 +283,21 @@ if (!$lp_found || (!empty($_REQUEST['lp_id']) && $_SESSION['oLP']->get_id() != $
$lp_table = Database::get_course_table(TABLE_LP_MAIN);
if (is_numeric($lp_id)) {
- $sel = "SELECT lp_type FROM $lp_table WHERE c_id = $course_id AND id = $lp_id";
+ $sel = "SELECT iid, lp_type FROM $lp_table WHERE c_id = $course_id AND id = $lp_id";
if ($debug > 0) {
error_log('New LP - querying '.$sel, 0);
}
$res = Database::query($sel);
-
if (Database::num_rows($res)) {
$row = Database::fetch_array($res);
+ $lpIid = $row['iid'];
$type = $row['lp_type'];
if ($debug > 0) {
error_log('New LP - found row - type '.$type.' - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
}
switch ($type) {
case 1:
- $oLP = new learnpath(api_get_course_id(), $lp_id, api_get_user_id());
+ $oLP = new learnpath(api_get_course_id(), $lpIid, api_get_user_id());
if ($oLP !== false) {
$lp_found = true;
} else {
@@ -305,7 +305,7 @@ if (!$lp_found || (!empty($_REQUEST['lp_id']) && $_SESSION['oLP']->get_id() != $
}
break;
case 2:
- $oLP = new scorm(api_get_course_id(), $lp_id, api_get_user_id());
+ $oLP = new scorm(api_get_course_id(), $lpIid, api_get_user_id());
if ($oLP !== false) {
$lp_found = true;
} else {
@@ -313,7 +313,7 @@ if (!$lp_found || (!empty($_REQUEST['lp_id']) && $_SESSION['oLP']->get_id() != $
}
break;
case 3:
- $oLP = new aicc(api_get_course_id(), $lp_id, api_get_user_id());
+ $oLP = new aicc(api_get_course_id(), $lpIid, api_get_user_id());
if ($oLP !== false) {
$lp_found = true;
} else {
@@ -321,7 +321,7 @@ if (!$lp_found || (!empty($_REQUEST['lp_id']) && $_SESSION['oLP']->get_id() != $
}
break;
default:
- $oLP = new learnpath(api_get_course_id(), $lp_id, api_get_user_id());
+ $oLP = new learnpath(api_get_course_id(), $lpIid, api_get_user_id());
if ($oLP !== false) {
$lp_found = true;
} else {
@@ -605,6 +605,11 @@ switch ($action) {
);
if (is_numeric($new_lp_id)) {
+ // Create temp form validator to save skills
+ $form = new FormValidator('lp_add');
+ $form->addSelect('skills', 'skills');
+ Skill::saveSkills($form, ITEM_TYPE_LEARNPATH, $new_lp_id);
+
// TODO: Maybe create a first directory directly to avoid bugging the user with useless queries
$_SESSION['oLP'] = new learnpath(
api_get_course_id(),
@@ -863,6 +868,9 @@ switch ($action) {
} else {
Session::write('refresh', 1);
$_SESSION['oLP']->delete(null, $_GET['lp_id'], 'remove');
+
+ Skill::deleteSkillsFromItem($_GET['lp_id'], ITEM_TYPE_LEARNPATH);
+
Display::addFlash(Display::return_message(get_lang('Deleted')));
Session::erase('oLP');
require 'lp_list.php';
@@ -1028,6 +1036,10 @@ switch ($action) {
$_SESSION['oLP']->upload_image($_FILES['lp_preview_image']);
}
+ $form = new FormValidator('form1');
+ $form->addSelect('skills', 'skills');
+ Skill::saveSkills($form, ITEM_TYPE_LEARNPATH, $_SESSION['oLP']->get_id());
+
if (api_get_setting('search_enabled') === 'true') {
require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
$specific_fields = get_specific_field_list();
diff --git a/main/lp/lp_edit.php b/main/lp/lp_edit.php
index b19f69c3a9..ae1d4aac55 100755
--- a/main/lp/lp_edit.php
+++ b/main/lp/lp_edit.php
@@ -1,5 +1,8 @@
get_id();
+
if (api_is_in_gradebook()) {
$interbreadcrumb[] = [
'url' => Category::getUrl(),
@@ -26,8 +33,8 @@ $interbreadcrumb[] = [
'name' => get_lang('LearningPaths')
];
$interbreadcrumb[] = [
- 'url' => api_get_self()."?action=build&lp_id=".$_SESSION['oLP']->get_id().'&'.api_get_cidreq(),
- 'name' => $_SESSION['oLP']->get_name()
+ 'url' => api_get_self()."?action=build&lp_id=".$lpId.'&'.api_get_cidreq(),
+ 'name' => $learnPath->get_name()
];
$htmlHeadXtra[] = '
build_action_menu();
+echo $learnPath->build_action_menu();
echo '';
echo '';
@@ -184,17 +189,17 @@ if (isset($is_success) && $is_success === true) {
$msg = '
';
$msg .= 'The item has been edited.';
$msg .= '
';
- echo $_SESSION['oLP']->display_item($_GET['id'], $msg);
+ echo $learnPath->display_item($_GET['id'], $msg);
} else {
- echo $_SESSION['oLP']->display_edit_item($_GET['id']);
- if (isset($_SESSION['finalItem'])) {
+ echo $learnPath->display_edit_item($_GET['id']);
+ $finalItem = Session::read('finalItem');
+ if ($finalItem) {
echo '';
}
- unset($_SESSION['finalItem']);
+ Session::erase('finalItem');
}
echo '
';
-/* FOOTER */
Display::display_footer();
diff --git a/main/lp/lp_list.php b/main/lp/lp_list.php
index 3a42438a17..13d813f690 100755
--- a/main/lp/lp_list.php
+++ b/main/lp/lp_list.php
@@ -385,6 +385,7 @@ foreach ($categories as $item) {
$copy = null;
$lp_auto_launch_icon = null;
$actionSeriousGame = null;
+ $actionUpdateScormFile = '';
if ($is_allowed_to_edit) {
// EDIT LP
@@ -618,7 +619,7 @@ foreach ($categories as $item) {
}
/* DEBUG */
- if ($test_mode == 'test' or api_is_platform_admin()) {
+ if ($test_mode == 'test' || api_is_platform_admin()) {
if ($details['lp_scorm_debug'] == 1) {
$dsp_debug = Display::url(
Display::return_icon(
@@ -769,6 +770,14 @@ foreach ($categories as $item) {
}
}
+ if ($details['lp_type'] == 2) {
+ $url = api_get_path(WEB_CODE_PATH)."lp/lp_update_scorm.php?".api_get_cidreq()."&lp_id=$id";
+ $actionUpdateScormFile = Display::url(
+ Display::return_icon('upload_file.png', get_lang('Update')),
+ $url
+ );
+ }
+
if ($is_allowed_to_edit) {
$start_time = $start_time;
$end_time = $end_time;
@@ -852,6 +861,7 @@ foreach ($categories as $item) {
'action_order' => $dsp_order,
'action_serious_game' => $actionSeriousGame,
'action_subscribe_users' => $subscribeUsers,
+ 'action_update_scorm' => $actionUpdateScormFile
];
$lpIsShown = true;
diff --git a/main/lp/lp_move_item.php b/main/lp/lp_move_item.php
index 7addc7951b..f51c288c5e 100755
--- a/main/lp/lp_move_item.php
+++ b/main/lp/lp_move_item.php
@@ -1,6 +1,8 @@
'.
-$_SESSION['oLP']->get_js_dropdown_array().
+$learnPath->get_js_dropdown_array().
"
function load_cbo(id) {
if (!id) {
@@ -96,7 +100,7 @@ $interbreadcrumb[] = [
// Theme calls
$show_learn_path = true;
-$lp_theme_css = $_SESSION['oLP']->get_theme();
+$lp_theme_css = $learnPath->get_theme();
Display::display_header(get_lang('Move'), 'Path');
@@ -125,10 +129,10 @@ function confirmation(name) {
build_action_menu();
+echo $learnPath->build_action_menu();
echo '
';
echo '
';
- echo $_SESSION['oLP']->return_new_tree();
+ echo $learnPath->return_new_tree();
echo '
';
echo '
';
@@ -137,13 +141,11 @@ if (isset($is_success) && $is_success === true) {
$msg = '
';
$msg .= 'The item has been moved.';
$msg .= '
';
- echo $_SESSION['oLP']->display_item($_GET['id'], $msg);
+ echo $learnPath->display_item($_GET['id'], $msg);
} else {
- echo $_SESSION['oLP']->display_move_item($_GET['id']);
+ echo $learnPath->display_move_item($_GET['id']);
}
echo '
';
echo '
';
-/* FOOTER */
-
Display::display_footer();
diff --git a/main/lp/lp_subscribe_users_to_category.php b/main/lp/lp_subscribe_users_to_category.php
index 910e84b8d2..483bba7d27 100644
--- a/main/lp/lp_subscribe_users_to_category.php
+++ b/main/lp/lp_subscribe_users_to_category.php
@@ -205,8 +205,6 @@ if ($formUsers->validate()) {
get_lang('SubscribeGroupsToLpCategory')
];
$tabs = Display::tabs($headers, [$formUsers->toHtml(), $form->toHtml()]);
- $tpl->assign('tabs', $tabs);
+ $tpl->assign('content', $tabs);
+ $tpl->display_one_col_template();
}
-
-$layout = $tpl->get_template('learnpath/subscribe_users.tpl');
-$tpl->display($layout);
diff --git a/main/lp/lp_upload.php b/main/lp/lp_upload.php
index 8ff70d0b0e..3c47e79da5 100755
--- a/main/lp/lp_upload.php
+++ b/main/lp/lp_upload.php
@@ -65,86 +65,6 @@ if (isset($_POST) && $is_error) {
$manifest = $oScorm->import_package($_FILES['user_file'], $current_dir);
if (!empty($manifest)) {
$oScorm->parse_manifest($manifest);
- $fixTemplate = api_get_configuration_value('learnpath_fix_xerte_template');
- $proxyPath = api_get_configuration_value('learnpath_proxy_url');
- if ($fixTemplate && !empty($proxyPath)) {
- // Check organisations:
- if (isset($oScorm->manifest['organizations'])) {
- foreach ($oScorm->manifest['organizations'] as $data) {
- if (strpos(strtolower($data), 'xerte') !== false) {
- // Check if template.xml exists:
- $templatePath = str_replace('imsmanifest.xml', 'template.xml', $manifest);
- if (file_exists($templatePath) && is_file($templatePath)) {
- $templateContent = file_get_contents($templatePath);
-
- $find = [
- 'href="www.',
- 'href="https://',
- 'href="http://',
- 'url="www.',
- 'pdfs/download.php?'
- ];
-
- $replace = [
- 'href="http://www.',
- 'target = "_blank" href="'.$proxyPath.'?type=link&src=https://',
- 'target = "_blank" href="'.$proxyPath.'?type=link&src=http://',
- 'url="http://www.',
- 'pdfs/download.php&'
- ];
- $templateContent = str_replace($find, $replace, $templateContent);
- file_put_contents($templatePath, $templateContent);
- }
-
- // Fix link generation:
- $linkPath = str_replace('imsmanifest.xml', 'models_html5/links.html', $manifest);
-
- if (file_exists($linkPath) && is_file($linkPath)) {
- $linkContent = file_get_contents($linkPath);
- $find = [
- ':this.getAttribute("url")'
- ];
- $replace = [
- ':"'.$proxyPath.'?type=link&src=" + this.getAttribute("url")'
- ];
- $linkContent = str_replace($find, $replace, $linkContent);
- file_put_contents($linkPath, $linkContent);
- }
-
- // Fix iframe generation
- $framePath = str_replace('imsmanifest.xml', 'models_html5/embedDiv.html', $manifest);
-
- if (file_exists($framePath) && is_file($framePath)) {
- $content = file_get_contents($framePath);
- $find = [
- '$iFrameHolder.html(iFrameTag);'
- ];
- $replace = [
- 'iFrameTag = \'
Open website. \'; $iFrameHolder.html(iFrameTag); '
- ];
- $content = str_replace($find, $replace, $content);
- file_put_contents($framePath, $content);
- }
-
- // Fix new window generation
- $newWindowPath = str_replace('imsmanifest.xml', 'models_html5/newWindow.html', $manifest);
-
- if (file_exists($newWindowPath) && is_file($newWindowPath)) {
- $content = file_get_contents($newWindowPath);
- $find = [
- 'var src = x_currentPageXML'
- ];
- $replace = [
- 'var src = "'.$proxyPath.'?type=link&src=" + x_currentPageXML'
- ];
- $content = str_replace($find, $replace, $content);
- file_put_contents($newWindowPath, $content);
- }
- }
- }
- }
- }
-
$oScorm->import_manifest(api_get_course_id(), $_REQUEST['use_max_score']);
Display::addFlash(Display::return_message(get_lang('UplUploadSucceeded')));
}
diff --git a/main/lp/lp_view.php b/main/lp/lp_view.php
index 450445d149..bcf91bdff2 100755
--- a/main/lp/lp_view.php
+++ b/main/lp/lp_view.php
@@ -140,8 +140,8 @@ if ($lp->mode == 'impress') {
}
// Prepare variables for the test tool (just in case) - honestly, this should disappear later on.
-$_SESSION['scorm_view_id'] = $lp->get_view_id();
-$_SESSION['scorm_item_id'] = $lp_item_id;
+Session::write('scorm_view_id', $lp->get_view_id());
+Session::write('scorm_item_id', $lp_item_id);
// Reinit exercises variables to avoid spacename clashes (see exercise tool)
if (isset($exerciseResult) || isset($_SESSION['exerciseResult'])) {
@@ -328,7 +328,6 @@ if (!empty($_REQUEST['exeId']) &&
score = $score,
total_time = $mytime
WHERE iid = $lp_item_view_id";
-
if ($debug) {
error_log($sql);
}
@@ -361,18 +360,13 @@ $scorm_css_header = true;
$lp_theme_css = $lp->get_theme();
// Sets the css theme of the LP this call is also use at the frames (toc, nav, message).
if ($lp->mode == 'fullscreen') {
- $htmlHeadXtra[] = "";
-}
-
-// Not in fullscreen mode.
-// Check if audio recorder needs to be in studentview.
-$audio_recorder_studentview = false;
-if (isset($_SESSION['status']) && $_SESSION['status'][$course_code] == 5) {
- $audio_recorder_studentview = true;
+ $htmlHeadXtra[] = "";
}
// Set flag to ensure lp_header.php is loaded by this script (flag is unset in lp_header.php).
-$_SESSION['loaded_lp_view'] = true;
+Session::write('loaded_lp_view', true);
$display_none = '';
$margin_left = '340px';
diff --git a/main/lp/lp_view_item.php b/main/lp/lp_view_item.php
index f00680b194..a6fce05212 100755
--- a/main/lp/lp_view_item.php
+++ b/main/lp/lp_view_item.php
@@ -47,8 +47,8 @@ if (empty($lp)) {
}
$mode = isset($_REQUEST['mode']) ? $_REQUEST['mode'] : 'fullpage';
-if (isset($_SESSION['oLP']) && isset($_GET['id'])) {
- $_SESSION['oLP']->current = intval($_GET['id']);
+if (isset($lp) && isset($_GET['id'])) {
+ $lp->current = intval($_GET['id']);
}
$this_section = SECTION_COURSES;
/* Header and action code */
@@ -114,6 +114,7 @@ function confirmation(name) {
debug > 0) {
error_log('In scorm::parse_manifest() - Parsing using PHP5 method');
}
- //$this->manifest_encoding = api_detect_encoding_xml($xml); // This is the usual way for reading the encoding.
- // This method reads the encoding, it tries to be correct even in cases of wrong or missing encoding declarations.
+ // $this->manifest_encoding = api_detect_encoding_xml($xml);
+ // This is the usual way for reading the encoding.
+ // This method reads the encoding, it tries to be correct even in cases
+ // of wrong or missing encoding declarations.
$this->manifest_encoding = self::detect_manifest_encoding($xml);
// UTF-8 is supported by DOMDocument class, this is for sure.
@@ -217,8 +219,8 @@ class scorm extends learnpath
}
}
}
- // End parsing using PHP5 DOMXML methods.
unset($doc);
+ // End parsing using PHP5 DOMXML methods.
} else {
if ($this->debug > 1) {
error_log('New LP - Could not open/read file '.$file);
@@ -227,6 +229,85 @@ class scorm extends learnpath
return null;
}
+ $fixTemplate = api_get_configuration_value('learnpath_fix_xerte_template');
+ $proxyPath = api_get_configuration_value('learnpath_proxy_url');
+ if ($fixTemplate && !empty($proxyPath)) {
+ // Check organisations:
+ if (isset($this->manifest['organizations'])) {
+ foreach ($this->manifest['organizations'] as $data) {
+ if (strpos(strtolower($data), 'xerte') !== false) {
+ // Check if template.xml exists:
+ $templatePath = str_replace('imsmanifest.xml', 'template.xml', $file);
+ if (file_exists($templatePath) && is_file($templatePath)) {
+ $templateContent = file_get_contents($templatePath);
+ $find = [
+ 'href="www.',
+ 'href="https://',
+ 'href="http://',
+ 'url="www.',
+ 'pdfs/download.php?'
+ ];
+
+ $replace = [
+ 'href="http://www.',
+ 'target = "_blank" href="'.$proxyPath.'?type=link&src=https://',
+ 'target = "_blank" href="'.$proxyPath.'?type=link&src=http://',
+ 'url="http://www.',
+ 'pdfs/download.php&'
+ ];
+ $templateContent = str_replace($find, $replace, $templateContent);
+ file_put_contents($templatePath, $templateContent);
+ }
+
+ // Fix link generation:
+ $linkPath = str_replace('imsmanifest.xml', 'models_html5/links.html', $file);
+ if (file_exists($linkPath) && is_file($linkPath)) {
+ $linkContent = file_get_contents($linkPath);
+ $find = [
+ ':this.getAttribute("url")'
+ ];
+ $replace = [
+ ':"'.$proxyPath.'?type=link&src=" + this.getAttribute("url")'
+ ];
+ $linkContent = str_replace($find, $replace, $linkContent);
+ file_put_contents($linkPath, $linkContent);
+ }
+
+ // Fix iframe generation
+ $framePath = str_replace('imsmanifest.xml', 'models_html5/embedDiv.html', $file);
+
+ if (file_exists($framePath) && is_file($framePath)) {
+ $content = file_get_contents($framePath);
+ $find = [
+ '$iFrameHolder.html(iFrameTag);'
+ ];
+ $replace = [
+ 'iFrameTag = \'
Open website. \'; $iFrameHolder.html(iFrameTag); '
+ ];
+ $content = str_replace($find, $replace, $content);
+ file_put_contents($framePath, $content);
+ }
+
+ // Fix new window generation
+ $newWindowPath = str_replace('imsmanifest.xml', 'models_html5/newWindow.html', $file);
+
+ if (file_exists($newWindowPath) && is_file($newWindowPath)) {
+ $content = file_get_contents($newWindowPath);
+ $find = [
+ 'var src = x_currentPageXML'
+ ];
+ $replace = [
+ 'var src = "'.$proxyPath.'?type=link&src=" + x_currentPageXML'
+ ];
+ $content = str_replace($find, $replace, $content);
+ file_put_contents($newWindowPath, $content);
+ }
+ }
+ }
+ }
+ }
+
+
// TODO: Close the DOM handler.
return $this->manifest;
}
@@ -527,28 +608,32 @@ class scorm extends learnpath
* @param string Current path (optional)
* @return string Absolute path to the imsmanifest.xml file or empty string on error
*/
- public function import_local_package($file_path, $current_dir = '')
+ public function import_local_package($file_path, $currentDir = '')
{
// TODO: Prepare info as given by the $_FILES[''] vector.
- $file_info = [];
- $file_info['tmp_name'] = $file_path;
- $file_info['name'] = basename($file_path);
+ $fileInfo = [];
+ $fileInfo['tmp_name'] = $file_path;
+ $fileInfo['name'] = basename($file_path);
// Call the normal import_package function.
- return $this->import_package($file_info, $current_dir);
+ return $this->import_package($fileInfo, $currentDir);
}
/**
* Imports a zip file into the Chamilo structure
- * @param string $zip_file_info Zip file info as given by $_FILES['userFile']
- * @param string
- * @param array
+ * @param string $zip_file_info Zip file info as given by $_FILES['userFile']
+ * @param string $current_dir
+ * @param array $courseInfo
+ * @param bool $updateDirContents
+ * @param learnpath $lpToCheck
*
* @return string $current_dir Absolute path to the imsmanifest.xml file or empty string on error
*/
public function import_package(
$zip_file_info,
$current_dir = '',
- $courseInfo = []
+ $courseInfo = [],
+ $updateDirContents = false,
+ $lpToCheck = null
) {
if ($this->debug > 0) {
error_log('In scorm::import_package('.print_r($zip_file_info, true).',"'.$current_dir.'") method', 0);
@@ -587,15 +672,12 @@ class scorm extends learnpath
}
$zipFile = new PclZip($zip_file_path);
-
// Check the zip content (real size and file extension).
$zipContentArray = $zipFile->listContent();
-
$package_type = '';
$at_root = false;
$manifest = '';
$manifest_list = [];
-
// The following loop should be stopped as soon as we found the right imsmanifest.xml (how to recognize it?).
$realFileSize = 0;
foreach ($zipContentArray as $thisContent) {
@@ -656,6 +738,14 @@ class scorm extends learnpath
return false;
}
+ if ($updateDirContents && $lpToCheck) {
+ $originalPath = str_replace('/.', '', $lpToCheck->path);
+ if ($originalPath != $new_dir) {
+ Display::addFlash(Display::return_message(get_lang('FileError')));
+ return false;
+ }
+ }
+
// It happens on Linux that $new_dir sometimes doesn't start with '/'
if ($new_dir[0] != '/') {
$new_dir = '/'.$new_dir;
@@ -760,7 +850,7 @@ class scorm extends learnpath
}
}
} else {
- return '';
+ return false;
}
return $course_sys_dir.$new_dir.$manifest;
diff --git a/main/mySpace/exercise_category_report.php b/main/mySpace/exercise_category_report.php
index 0defe86c7c..9f5c73d17c 100644
--- a/main/mySpace/exercise_category_report.php
+++ b/main/mySpace/exercise_category_report.php
@@ -54,7 +54,7 @@ if (empty($courseId)) {
$courseInfo = api_get_course_info_by_id($courseId);
if (!empty($courseInfo)) {
$form->addHidden('course_id', $courseId);
- $form->addLabel(get_lang('Course'), $courseInfo['name']);
+ $form->addLabel(get_lang('Course'), $courseInfo['name'].' ('.$courseInfo['code'].')');
$exerciseList = ExerciseLib::get_all_exercises_for_course_id(
$courseInfo,
0,
diff --git a/main/mySpace/myStudents.php b/main/mySpace/myStudents.php
index 1f74a1d47d..c61da709e2 100755
--- a/main/mySpace/myStudents.php
+++ b/main/mySpace/myStudents.php
@@ -1653,6 +1653,37 @@ if ($allowMessages === true) {
$form->display();
}
+$allow = api_get_configuration_value('allow_user_message_tracking');
+if ($allow && api_is_drh() || api_is_platform_admin()) {
+ $users = MessageManager::getUsersThatHadConversationWithUser($student_id);
+
+ echo Display::page_subheader2(get_lang('MessageTracking'));
+
+ $table = new HTML_Table(['class' => 'table']);
+ $column = 0;
+ $row = 0;
+ $headers = [
+ get_lang('User')
+ ];
+ foreach ($headers as $header) {
+ $table->setHeaderContents($row, $column, $header);
+ $column++;
+ }
+ $column = 0;
+ $row++;
+ foreach ($users as $userFollowed) {
+ $followedUserId = $userFollowed['user_id'];
+ $url = api_get_path(WEB_CODE_PATH).'tracking/messages.php?from_user='.$student_id.'&to_user='.$followedUserId;
+ $link = Display::url(
+ $userFollowed['complete_name'],
+ $url
+ );
+ $table->setCellContents($row, $column, $link);
+ $row++;
+ }
+ $table->display();
+}
+
if ($export) {
ob_end_clean();
switch ($export) {
@@ -1666,4 +1697,4 @@ if ($export) {
exit;
}
-Display :: display_footer();
+Display::display_footer();
diff --git a/main/survey/create_new_survey.php b/main/survey/create_new_survey.php
index f815fb8e76..9fc0b97c4f 100755
--- a/main/survey/create_new_survey.php
+++ b/main/survey/create_new_survey.php
@@ -36,7 +36,7 @@ if (!api_is_allowed_to_edit()) {
}
// Getting the survey information
-$survey_id = isset($_GET['survey_id']) ? intval($_GET['survey_id']) : null;
+$survey_id = isset($_GET['survey_id']) ? (int) $_GET['survey_id'] : null;
$survey_data = SurveyManager::get_survey($survey_id);
// Additional information
@@ -160,8 +160,20 @@ if (api_get_configuration_value('hide_survey_reporting_button')) {
$form->addElement('select', 'visible_results', get_lang('ResultsVisibility'), $visibleResults);
}
//$defaults['visible_results'] = 0;
-$form->addElement('html_editor', 'survey_introduction', get_lang('SurveyIntroduction'), null, ['ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '130', 'ToolbarStartExpanded' => false]);
-$form->addElement('html_editor', 'survey_thanks', get_lang('SurveyThanks'), null, ['ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '130', 'ToolbarStartExpanded' => false]);
+$form->addElement(
+ 'html_editor',
+ 'survey_introduction',
+ get_lang('SurveyIntroduction'),
+ null,
+ ['ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '130', 'ToolbarStartExpanded' => false]
+);
+$form->addElement(
+ 'html_editor',
+ 'survey_thanks',
+ get_lang('SurveyThanks'),
+ null,
+ ['ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '130', 'ToolbarStartExpanded' => false]
+);
$extraField = new ExtraField('survey');
$extraField->addElements($form, $survey_id);
@@ -261,20 +273,17 @@ if (isset($_GET['action']) && $_GET['action'] == 'edit' && !empty($survey_id)) {
}
}
}
-
$form->addElement('html', '
');
}
}
+$skillList = Skill::addSkillsToForm($form, ITEM_TYPE_SURVEY, $survey_id);
+
$form->addElement('html', '
');
if (isset($_GET['survey_id']) && $_GET['action'] == 'edit') {
- $class = 'save';
- $text = get_lang('ModifySurvey');
$form->addButtonUpdate(get_lang('ModifySurvey'), 'submit_survey');
} else {
- $class = 'add';
- $text = get_lang('CreateSurvey');
$form->addButtonCreate(get_lang('CreateSurvey'), 'submit_survey');
}
@@ -293,6 +302,8 @@ $form->addRule(
'lte'
);
+$defaults['skills'] = array_keys($skillList);
+
// Setting the default values
$form->setDefaults($defaults);
@@ -302,13 +313,14 @@ if ($form->validate()) {
$values = $form->getSubmitValues();
// Storing the survey
$return = SurveyManager::store_survey($values);
+ Skill::saveSkills($form, ITEM_TYPE_SURVEY, $return['id']);
$values['item_id'] = $return['id'];
$extraFieldValue = new ExtraFieldValue('survey');
$extraFieldValue->saveFieldValues($values);
// Redirecting to the survey page (whilst showing the return message)
- header('location: '.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$return['id'].'&'.api_get_cidreq());
+ header('Location: '.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$return['id'].'&'.api_get_cidreq());
exit;
} else {
// Displaying the header
diff --git a/main/survey/survey.lib.php b/main/survey/survey.lib.php
index e95eacb334..213d2f8671 100755
--- a/main/survey/survey.lib.php
+++ b/main/survey/survey.lib.php
@@ -653,6 +653,8 @@ class SurveyManager
api_get_user_id()
);
+ Skill::deleteSkillsFromItem($survey_id, ITEM_TYPE_SURVEY);
+
return true;
}
diff --git a/main/survey/surveyUtil.class.php b/main/survey/surveyUtil.class.php
index 4c00962259..c308e00e9e 100755
--- a/main/survey/surveyUtil.class.php
+++ b/main/survey/surveyUtil.class.php
@@ -2688,7 +2688,7 @@ class SurveyUtil
if (api_get_configuration_value('allow_mandatory_survey')) {
$table->set_header(9, get_lang('IsMandatory'));
$table->set_header(10, get_lang('Modify'), false, 'width="150"');
- $table->set_column_filter(9, 'anonymous_filter');
+ $table->set_column_filter(8, 'anonymous_filter');
$table->set_column_filter(10, 'modify_filter');
} else {
$table->set_header(9, get_lang('Modify'), false, 'width="150"');
@@ -2726,8 +2726,6 @@ class SurveyUtil
$table->set_header(2, get_lang('SurveyCode'));
$table->set_header(3, get_lang('NumberOfQuestions'));
$table->set_header(4, get_lang('Author'));
- //$table->set_header(5, get_lang('Language'));
- //$table->set_header(6, get_lang('Shared'));
$table->set_header(5, get_lang('AvailableFrom'));
$table->set_header(6, get_lang('AvailableUntil'));
$table->set_header(7, get_lang('Invite'));
@@ -2736,7 +2734,7 @@ class SurveyUtil
if (api_get_configuration_value('allow_mandatory_survey')) {
$table->set_header(9, get_lang('Modify'), false, 'width="130"');
$table->set_header(10, get_lang('Modify'), false, 'width="130"');
- $table->set_column_filter(9, 'anonymous_filter');
+ $table->set_column_filter(8, 'anonymous_filter');
$table->set_column_filter(10, 'modify_filter_for_coach');
} else {
$table->set_header(9, get_lang('Modify'), false, 'width="130"');
@@ -3032,6 +3030,7 @@ class SurveyUtil
ORDER BY col$column $direction
LIMIT $from,$number_of_items
";
+
$res = Database::query($sql);
$surveys = [];
$array = [];
@@ -3067,9 +3066,8 @@ class SurveyUtil
api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=invited&survey_id='.$survey[0].'&'
.api_get_cidreq()
);
-
- $array[8] = $survey[8];
-
+ // Anon
+ $array[8] = $survey['col8'];
if ($mandatoryAllowed) {
$efvMandatory = $efv->get_values_by_handler_and_field_variable(
$survey[9],
@@ -3077,9 +3075,11 @@ class SurveyUtil
);
$array[9] = $efvMandatory ? $efvMandatory['value'] : 0;
- $array[10] = $survey[9];
+ // Survey id
+ $array[10] = $survey['col9'];
} else {
- $array[9] = $survey[9];
+ // Survey id
+ $array[9] = $survey['col9'];
}
if ($isDrh) {
diff --git a/main/work/edit_work.php b/main/work/edit_work.php
index f3d22747d0..b6a663de70 100755
--- a/main/work/edit_work.php
+++ b/main/work/edit_work.php
@@ -119,7 +119,7 @@ if ($form->validate()) {
updateWork($workData['iid'], $params, $courseInfo, $sessionId);
updatePublicationAssignment($workId, $params, $courseInfo, $groupId);
updateDirName($workData, $params['new_dir']);
-
+ Skill::saveSkills($form, ITEM_TYPE_STUDENT_PUBLICATION, $workData['iid']);
Display::addFlash(Display::return_message(get_lang('Updated'), 'success'));
header('Location: '.$currentUrl);
exit;
diff --git a/main/work/view.php b/main/work/view.php
index f5b1078af0..4541ae00f8 100755
--- a/main/work/view.php
+++ b/main/work/view.php
@@ -162,12 +162,10 @@ if ((user_is_author($id) || $isDrhOfCourse || (api_is_allowed_to_edit() || api_i
$commentForm = getWorkCommentForm($work, $my_folder_data);
$tpl = new Template();
-
$tpl->assign('work', $work);
$tpl->assign('comments', $comments);
$actions = '';
-
if (isset($work['contains_file']) && !empty($work['contains_file'])) {
if (isset($work['download_url']) && !empty($work['download_url'])) {
$actions = Display::url(
diff --git a/main/work/work.lib.php b/main/work/work.lib.php
index 062c06a23e..385cc6e20b 100755
--- a/main/work/work.lib.php
+++ b/main/work/work.lib.php
@@ -885,6 +885,8 @@ function deleteDirWork($id)
WHERE c_id = $course_id AND publication_id = $id";
Database::query($sql);
+ Skill::deleteSkillsFromItem($id, ITEM_TYPE_STUDENT_PUBLICATION);
+
Event::addEvent(
LOG_WORK_DIR_DELETE,
LOG_WORK_DATA,
@@ -3590,6 +3592,7 @@ function getWorkCommentForm($work, $workParent)
}
}
+ Skill::addSkillsToUserForm($form, ITEM_TYPE_STUDENT_PUBLICATION, $workParent['id'], $work['user_id']);
$form->addHtmlEditor('comment', get_lang('Comment'), false);
$form->addFile('attachment', get_lang('Attachment'));
$form->addElement('hidden', 'id', $work['id']);
@@ -4795,7 +4798,11 @@ function getFormWork($form, $defaults = [], $workId = 0)
';
$form->addHtml('
');
+
+ $skillList = Skill::addSkillsToForm($form, ITEM_TYPE_STUDENT_PUBLICATION, $workId);
+
if (!empty($defaults)) {
+ $defaults['skills'] = array_keys($skillList);
$form->setDefaults($defaults);
}
diff --git a/main/work/work.php b/main/work/work.php
index 4c9ea8a035..60222a91f1 100755
--- a/main/work/work.php
+++ b/main/work/work.php
@@ -197,6 +197,8 @@ switch ($action) {
);
if ($result) {
+ Skill::saveSkills($form, ITEM_TYPE_STUDENT_PUBLICATION, $result);
+
$message = Display::return_message(get_lang('DirectoryCreated'), 'success');
} else {
$currentUrl = $addUrl;
diff --git a/main/work/work_list.php b/main/work/work_list.php
index 5b867a5448..1bc256779d 100755
--- a/main/work/work_list.php
+++ b/main/work/work_list.php
@@ -1,6 +1,8 @@
getRepository('ChamiloCourseBundle:CStudentPublication')->find($workId);
+ /** @var CStudentPublication $work */
+ $work = $em->getRepository('ChamiloCourseBundle:CStudentPublication')->findOneBy(
+ ['iid' => $workId, 'cId' => $courseInfo['real_id']]
+ );
if ($work) {
$workId = $work->getId();
}
.'img/link-external.png)
![<p>Sorry, your browser does not handle frames</p>'); function resizeIframe() { - var height = window.innerHeight; - //max lower size - if (height<600) { - height=600; - } - document.getElementById('frame').style.height = height +"px"; + var height = window.innerHeight; + //max lower size + if (height<600) { + height=600; + } + document.getElementById('frame').style.height = height +"px"; }; document.getElementById('frame').onload = resizeIframe; window.onresize = resizeIframe; diff --git a/main/document/save_pixlr.php b/main/document/save_pixlr.php index 202714e585..1b7a73a87d 100755 --- a/main/document/save_pixlr.php +++ b/main/document/save_pixlr.php @@ -16,40 +16,42 @@ require_once __DIR__.'/../inc/global.inc.php'; api_protect_course_script(); api_block_anonymous_users(); -if ($_user['user_id'] != api_get_user_id() || api_get_user_id() == 0 || $_user['user_id'] == 0) { - api_not_allowed(); - die(); -} - if (!isset($_GET['title']) || !isset($_GET['type']) || !isset($_GET['image'])) { - api_not_allowed(); - die(); + echo 'No title'; + exit; } $paintDir = Session::read('paint_dir'); if (empty($paintDir)) { - api_not_allowed(); - die(); + echo 'No directory to save'; + exit; } -//pixlr return - -$filename = Security::remove_XSS($_GET['title']); //The user preferred file name of the image. -$extension = Security::remove_XSS($_GET['type']); //The image type, "pdx", "jpg", "bmp" or "png". -$urlcontents = Security::remove_XSS($_GET['image']); //A URL to the image on Pixlr.com server or the raw file post of the saved image. +$courseInfo = api_get_course_info(); +if (empty($courseInfo)) { + echo 'Course not set'; + exit; +} -//make variables +// pixlr return +//The user preferred file name of the image. +$filename = Security::remove_XSS($_GET['title']); +//The image type, "pdx", "jpg", "bmp" or "png". +$extension = Security::remove_XSS($_GET['type']); +//A URL to the image on Pixlr.com server or the raw file post of the saved image. +$urlcontents = Security::remove_XSS($_GET['image']); +// make variables $title = Database::escape_string(str_replace('_', ' ', $filename)); -$current_session_id = api_get_session_id(); +$sessionId = api_get_session_id(); $groupId = api_get_group_id(); $groupInfo = GroupManager::get_group_properties($groupId); -$relativeUrlPath = Session::read('paint_dir'); -$dirBaseDocuments = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'; +$dirBaseDocuments = api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/document'; $saveDir = $dirBaseDocuments.$paintDir; $contents = file_get_contents($urlcontents); -//Security. Verify that the URL is pointing to a file @ pixlr.com domain or an ip @ pixlr.com. Comment because sometimes return a ip number +//Security. Verify that the URL is pointing to a file @ pixlr.com domain or an ip @ pixlr.com. +// Comment because sometimes return a ip number /* if (strpos($urlcontents, "pixlr.com") === 0){ echo "Invalid referrer"; @@ -72,7 +74,8 @@ $filename = api_replace_dangerous_char($filename); $filename = disable_dangerous_file($filename); if (strlen(trim($filename)) == 0) { - echo "The title is empty"; //if title is empty, headers Content-Type = application/octet-stream, then not create a new title here please + echo "The title is empty"; //if title is empty, headers Content-Type = application/octet-stream, + // then not create a new title here please exit; } @@ -87,7 +90,8 @@ if ($extension != 'jpg' && $extension != 'png' && $extension != 'pxd') { die(); } if ($extension == 'pxd') { - echo "pxd file type does not supported"; // not secure because check security headers and finfo() return Content-Type = application/octet-stream + echo "pxd file type does not supported"; + // not secure because check security headers and finfo() return Content-Type = application/octet-stream exit; } @@ -108,13 +112,13 @@ if (strpos($current_mime, 'image') === false) { exit; } - //path, file and title $paintFileName = $filename.'.'.$extension; $title = $title.'.'.$extension; +$temp_file_2delete = Session::read('temp_realpath_image'); -if ($currentTool == 'document/createpaint') { - //check save as and prevent rewrite an older file with same name +if (empty($temp_file_2delete)) { + // Create file if (0 != $groupId) { $group_properties = GroupManager :: get_group_properties($groupId); $groupPath = $group_properties['directory']; @@ -131,79 +135,83 @@ if ($currentTool == 'document/createpaint') { $title = $filename.'_'.$i.'.'.$extension; } - // $documentPath = $saveDir.'/'.$paintFileName; - //add new document to disk + // Add new document to disk file_put_contents($documentPath, $contents); - //add document to database - $doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title); - api_item_property_update( - $_course, - TOOL_DOCUMENT, - $doc_id, - 'DocumentAdded', - $_user['user_id'], - $groupInfo, - null, - null, - null, - $current_session_id - ); -} elseif ($currentTool == 'document/editpaint') { + // Add document to database + $documentId = add_document($courseInfo, $paintDir.$paintFileName, 'file', filesize($documentPath), $title); + if ($documentId) { + api_item_property_update( + $courseInfo, + TOOL_DOCUMENT, + $documentId, + 'DocumentAdded', + api_get_user_id(), + $groupInfo, + null, + null, + null, + $sessionId + ); + Display::addFlash(Display::return_message(get_lang('Saved'))); + } +} else { + // Update $documentPath = $saveDir.'/'.$paintFileName; - //add new document to disk file_put_contents($documentPath, $contents); - $paintFile = Session::read('paint_file'); //check path if (empty($paintFile)) { - api_not_allowed(); - die(); + echo 'No attribute paint_file'; + exit; } if ($paintFile == $paintFileName) { - $document_id = DocumentManager::get_document_id($_course, $relativeUrlPath.'/'.$paintFileName); - update_existing_document($_course, $document_id, filesize($documentPath), null); + $documentId = DocumentManager::get_document_id($courseInfo, $paintDir.$paintFileName); + update_existing_document($courseInfo, $documentId, filesize($documentPath), null); api_item_property_update( - $_course, + $courseInfo, TOOL_DOCUMENT, - $document_id, + $documentId, 'DocumentUpdated', $_user['user_id'], $groupInfo, null, null, null, - $current_session_id + $sessionId ); } else { //add a new document - $doc_id = add_document( - $_course, - $relativeUrlPath.'/'.$paintFileName, + $documentId = add_document( + $courseInfo, + $paintDir.$paintFileName, 'file', filesize($documentPath), $title ); - api_item_property_update( - $_course, - TOOL_DOCUMENT, - $doc_id, - 'DocumentAdded', - $_user['user_id'], - $groupInfo, - null, - null, - null, - $current_session_id - ); + if ($documentId) { + api_item_property_update( + $courseInfo, + TOOL_DOCUMENT, + $documentId, + 'DocumentAdded', + api_get_user_id(), + $groupInfo, + null, + null, + null, + $sessionId + ); + Display::addFlash(Display::return_message(get_lang('Updated'))); + } } } - -//delete temporal file -$temp_file_2delete = Session::read('temp_realpath_image'); -unlink($temp_file_2delete); +if (!empty($temp_file_2delete)) { + // Delete temporal file + unlink($temp_file_2delete); +} //Clean sessions and return to Chamilo file list Session::erase('paint_dir'); @@ -214,7 +222,7 @@ $exit = Session::read('exit_pixlr'); if (empty($exit)) { $location = api_get_path(WEB_CODE_PATH).'document/document.php?'.api_get_cidreq(); echo ''; - api_not_allowed(true); + exit; } else { echo ''.get_lang('PleaseStandBy').''; $location = api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($exit).'&'.api_get_cidreq(); diff --git a/main/document/show_content.php b/main/document/show_content.php index 31a3aea118..7532a64a09 100755 --- a/main/document/show_content.php +++ b/main/document/show_content.php @@ -86,18 +86,16 @@ if (!api_is_allowed_to_edit() && !$is_visible) { } //TODO:clean all code - -/* Main section */ +/* Main section */ header('Expires: Wed, 01 Jan 1990 00:00:00 GMT'); //header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); header('Last-Modified: Wed, 01 Jan 2100 00:00:00 GMT'); header('Cache-Control: no-cache, must-revalidate'); header('Pragma: no-cache'); -$browser_display_title = 'Documents - '.Security::remove_XSS($_GET['cidReq']).' - '.$file; -$file_url_web = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$header_file.'?'.api_get_cidreq(); -$pathinfo = pathinfo($header_file); +$url = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$header_file.'?'.api_get_cidreq(); +$pathInfo = pathinfo($header_file); -if ($pathinfo['extension'] == 'swf') { +if ($pathInfo['extension'] == 'swf') { $width = '83%'; $height = '83%'; } else { @@ -105,4 +103,4 @@ if ($pathinfo['extension'] == 'swf') { $height = '100%'; } -echo ''; +echo ''; diff --git a/main/exercise/admin.php b/main/exercise/admin.php index dae81d263e..a438559f49 100755 --- a/main/exercise/admin.php +++ b/main/exercise/admin.php @@ -254,6 +254,11 @@ if (!empty($clone_question) && !empty($objExercise->id)) { $new_question_obj = Question::read($new_id); $new_question_obj->addToList($exerciseId); + // Save category to the destination course + if (!empty($old_question_obj->category)) { + $new_question_obj->saveCategory($old_question_obj->category, api_get_course_int_id()); + } + // This should be moved to the duplicate function $new_answer_obj = new Answer($clone_question); $new_answer_obj->read(); @@ -329,7 +334,6 @@ function multiple_answer_true_false_onchange(variable) { document.getElementById(weight_id).value = array_result[result]; } - '; $htmlHeadXtra[] = api_get_js('jqueryui-touch-punch/jquery.ui.touch-punch.min.js'); @@ -349,14 +353,6 @@ if (isset($_GET['message'])) { } Display::display_header($nameTools, 'Exercise'); -/* -if ($objExercise->exercise_was_added_in_lp) { - if ($objExercise->force_edit_exercise_in_lp == true) { - Display::addFlash(Display::return_message(get_lang('ForceEditingExerciseInLPWarning'), 'warning')); - } else { - Display::addFlash(Display::return_message(get_lang('EditingExerciseCauseProblemsInLP'), 'warning')); - } -}*/ // If we are in a test $inATest = isset($exerciseId) && $exerciseId > 0; diff --git a/main/exercise/annotation_user.php b/main/exercise/annotation_user.php index 5ca9ba9277..5a19a56f2d 100644 --- a/main/exercise/annotation_user.php +++ b/main/exercise/annotation_user.php @@ -3,15 +3,21 @@ use ChamiloSession as Session; -session_cache_limiter("none"); +session_cache_limiter('none'); require_once __DIR__.'/../inc/global.inc.php'; -$questionId = isset($_GET['question_id']) ? intval($_GET['question_id']) : 0; -$exerciseId = isset($_GET['exe_id']) ? intval($_GET['exe_id']) : 0; +$questionId = isset($_GET['question_id']) ? (int) $_GET['question_id'] : 0; +$exerciseId = isset($_GET['exe_id']) ? (int) $_GET['exe_id'] : 0; +$courseId = isset($_GET['course_id']) ? (int) $_GET['course_id'] : 0; +$courseInfo = api_get_course_info_by_id($courseId); -$objQuestion = Question::read($questionId); -$documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'; +if (empty($courseInfo)) { + return ''; +} + +$objQuestion = Question::read($questionId, $courseId); +$documentPath = api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/document'; $picturePath = $documentPath.'/images'; $pictureSize = getimagesize($picturePath.'/'.$objQuestion->getPictureFilename()); $pictureWidth = $pictureSize[0]; @@ -34,10 +40,8 @@ $attemptList = Event::getAllExerciseEventByExeId($exerciseId); if (!empty($attemptList) && isset($attemptList[$questionId])) { $questionAttempt = $attemptList[$questionId][0]; - if (!empty($questionAttempt['answer'])) { $answers = explode('|', $questionAttempt['answer']); - foreach ($answers as $answer) { $parts = explode(')(', $answer); $type = array_shift($parts); @@ -45,7 +49,6 @@ if (!empty($attemptList) && isset($attemptList[$questionId])) { switch ($type) { case 'P': $points = []; - foreach ($parts as $partPoint) { $points[] = Geometry::decodePoint($partPoint); } diff --git a/main/exercise/answer.class.php b/main/exercise/answer.class.php index e8839125d1..1f73e06edb 100755 --- a/main/exercise/answer.class.php +++ b/main/exercise/answer.class.php @@ -1011,9 +1011,11 @@ class Answer public function isCorrectByAutoId($needle) { $key = 0; - foreach ($this->autoId as $autoIdKey => $autoId) { - if ($autoId == $needle) { - $key = $autoIdKey; + if (is_array($this->autoId)) { + foreach ($this->autoId as $autoIdKey => $autoId) { + if ($autoId == $needle) { + $key = $autoIdKey; + } } } diff --git a/main/exercise/calculated_answer.class.php b/main/exercise/calculated_answer.class.php index a27a3aeb7b..d4d8ac927b 100644 --- a/main/exercise/calculated_answer.class.php +++ b/main/exercise/calculated_answer.class.php @@ -173,7 +173,7 @@ class CalculatedAnswer extends Question $form->addButtonSave($text, 'submitQuestion'); if (!empty($this->id)) { - $form -> setDefaults($defaults); + $form->setDefaults($defaults); } else { if ($this->isContent == 1) { $form->setDefaults($defaults); diff --git a/main/exercise/exercise.class.php b/main/exercise/exercise.class.php index eb39d94681..8cc795a49c 100755 --- a/main/exercise/exercise.class.php +++ b/main/exercise/exercise.class.php @@ -1850,8 +1850,8 @@ class Exercise */ public function delete() { - $TBL_EXERCISES = Database::get_course_table(TABLE_QUIZ_TEST); - $sql = "UPDATE $TBL_EXERCISES SET active='-1' + $table = Database::get_course_table(TABLE_QUIZ_TEST); + $sql = "UPDATE $table SET active='-1' WHERE c_id = ".$this->course_id." AND id = ".intval($this->id); Database::query($sql); @@ -1870,6 +1870,8 @@ class Exercise api_get_user_id() ); + Skill::deleteSkillsFromItem($this->iId, ITEM_TYPE_EXERCISE); + if (api_get_setting('search_enabled') == 'true' && extension_loaded('xapian') ) { @@ -1936,7 +1938,6 @@ class Exercise ); $skillList = []; - if ($type == 'full') { //Can't modify a DirectFeedback question if ($this->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_DIRECT) { @@ -2499,7 +2500,7 @@ class Exercise } } - //$skillList = Skill::addSkillsToForm($form, ITEM_TYPE_EXERCISE, $this->iId); + $skillList = Skill::addSkillsToForm($form, ITEM_TYPE_EXERCISE, $this->iId); $form->addElement('html', '](edit_document.php?'.api_get_cidreq().'&id='.$document_id.'&'.api_
Display::return_icon('edit.png', get_lang('Rename').'/'.get_lang('Comment'), '', ICON_SIZE_MEDIUM).'</a>';
echo '</div>';
-///pixlr
+// pixlr
$title = $file; //disk name. No sql name because pixlr return this when save
-$pixlr_code_translation_table = ['' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn'];
+
$langpixlr = api_get_language_isocode();
$langpixlr = isset($pixlr_code_translation_table[$langpixlr]) ? $pixlredit_code_translation_table[$langpixlr] : $langpixlr;
$loc = $langpixlr; // deprecated ?? TODO:check pixlr read user browser
@@ -212,12 +212,12 @@ $pixlr_url = '//pixlr.com/editor/?title='.$title.'&image='.$image.'&loc='.$loc.'
<script>
document.write ('<iframe id=){kind=link}