| '; - echo ' | '; @@ -399,7 +392,7 @@ class ExerciseShowFunctions echo ' | '; } - if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) { + if ($feedbackType != EXERCISE_FEEDBACK_TYPE_EXAM) { echo ''; if ($studentChoice) { $color = 'black'; @@ -444,7 +437,7 @@ class ExerciseShowFunctions */ public static function display_multiple_answer_true_false( $exercise, - $feedback_type, + $feedbackType, $answerType, $studentChoice, $answer, @@ -459,7 +452,7 @@ class ExerciseShowFunctions $hide_expected_answer = false; switch ($resultsDisabled) { case RESULT_DISABLE_SHOW_SCORE_ONLY: - if ($feedback_type == 0) { + if ($feedbackType == 0) { $hide_expected_answer = true; } break; @@ -471,29 +464,30 @@ class ExerciseShowFunctions } break; } - echo ' | |||||||
| '; + + $content = ' | |||||||||
| '; $course_id = api_get_course_int_id(); $new_options = Question::readQuestionOption($questionId, $course_id); // Your choice if (isset($new_options[$studentChoice])) { - echo get_lang($new_options[$studentChoice]['name']); + $content .= get_lang($new_options[$studentChoice]['name']); } else { - echo '-'; + $content .= '-'; } echo ' | '; // Expected choice if (!$hide_expected_answer) { if (isset($new_options[$answerCorrect])) { - echo get_lang($new_options[$answerCorrect]['name']); + $content .= get_lang($new_options[$answerCorrect]['name']); } else { - echo '-'; + $content .= '-'; } } else { - echo '-'; + $content .= '-'; } - echo ' | '; - echo $answer; - echo ' | '; + $content .= ''; + $content .= $answer; + $content .= ' | '; if ($exercise->showExpectedChoice()) { $status = Display::label(get_lang('Incorrect'), 'danger'); if (isset($new_options[$studentChoice])) { @@ -501,31 +495,35 @@ class ExerciseShowFunctions $status = Display::label(get_lang('Correct'), 'success'); } } - echo ''; - echo $status; - echo ' | '; + $content .= ''; + $content .= $status; + $content .= ' | '; } - if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) { - echo ''; - $color = "black"; + if ($feedbackType != EXERCISE_FEEDBACK_TYPE_EXAM) { + if ($resultsDisabled == RESULT_DISABLE_SHOW_ONLY_IN_CORRECT_ANSWER) { + if ($studentChoice != $answerCorrect) { + return ''; + } + } + $content .= ' | '; + $color = 'black'; if (isset($new_options[$studentChoice])) { if ($studentChoice == $answerCorrect) { - $color = "green"; + $color = 'green'; } if ($hide_expected_answer) { $color = ''; } - echo ''.nl2br($answerComment).''; - } - echo ' | '; - if ($ans == 1) { - $comm = Event::get_comments($id, $questionId); + $content .= ''.nl2br($answerComment).''; } + $content .= ''; } else { - echo ''; + $content .= ' | '; } - echo ' | '; echo $answer; echo ' | '; - echo $newOptions[$studentChoiceDegree]['name']; + if (isset($newOptions[$studentChoiceDegree])) { + echo $newOptions[$studentChoiceDegree]['name']; + } echo ' | '; $degreeInfo = $question->getResponseDegreeInfo( @@ -628,7 +628,7 @@ class ExerciseShowFunctions */ public static function display_multiple_answer_combination_true_false( $exercise, - $feedback_type, + $feedbackType, $answerType, $studentChoice, $answer, @@ -643,7 +643,7 @@ class ExerciseShowFunctions $hide_expected_answer = false; switch ($resultsDisabled) { case RESULT_DISABLE_SHOW_SCORE_ONLY: - if ($feedback_type == 0) { + if ($feedbackType == 0) { $hide_expected_answer = true; } break; @@ -694,7 +694,7 @@ class ExerciseShowFunctions echo ''; } - if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) { + if ($feedbackType != EXERCISE_FEEDBACK_TYPE_EXAM) { echo '';
//@todo replace this harcoded value
if ($studentChoice) {
@@ -718,21 +718,21 @@ class ExerciseShowFunctions
}
/**
- * @param $feedback_type
+ * @param $feedbackType
* @param $exe_id
* @param $questionId
* @param null $questionScore
* @param int $resultsDisabled
*/
public static function displayAnnotationAnswer(
- $feedback_type,
+ $feedbackType,
$exe_id,
$questionId,
$questionScore = null,
$resultsDisabled = 0
) {
$comments = Event::get_comments($exe_id, $questionId);
- if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) {
+ if ($feedbackType != EXERCISE_FEEDBACK_TYPE_EXAM) {
if ($questionScore <= 0 && empty($comments)) {
echo ' '.ExerciseLib::getNotCorrectedYetText(); } diff --git a/main/inc/lib/extra_field.lib.php b/main/inc/lib/extra_field.lib.php index d83ee253fe..b4303ececc 100755 --- a/main/inc/lib/extra_field.lib.php +++ b/main/inc/lib/extra_field.lib.php @@ -1771,7 +1771,8 @@ class ExtraField extends Model $form->addGeoLocationMapField( 'extra_'.$field_details['variable'], $field_details['display_text'], - $dataValue + $dataValue, + $hideGeoLocalizationDetails ); /*$form->addElement( diff --git a/main/inc/lib/groupmanager.lib.php b/main/inc/lib/groupmanager.lib.php index 7cb9280e13..4bb1b02fec 100755 --- a/main/inc/lib/groupmanager.lib.php +++ b/main/inc/lib/groupmanager.lib.php @@ -66,9 +66,11 @@ class GroupManager } /** + * @param int $courseId + * * @return array */ - public static function get_groups($courseId = null) + public static function get_groups($courseId = 0) { $table_group = Database::get_course_table(TABLE_GROUP); $courseId = !empty($courseId) ? (int) $courseId : api_get_course_int_id(); @@ -189,7 +191,7 @@ class GroupManager $course_id = $_course['real_id']; $currentCourseRepository = $_course['path']; $category = self::get_category($category_id); - $places = intval($places); + $places = (int) $places; // Default values $docState = self::TOOL_PRIVATE; @@ -247,7 +249,7 @@ class GroupManager self_registration_allowed = '".$selfRegAllowed."', self_unregistration_allowed = '".$selfUnregAllwoed."', $documentCondition - session_id='".intval($session_id)."'"; + session_id='".$session_id."'"; Database::query($sql); $lastId = Database::insert_id(); @@ -387,27 +389,31 @@ class GroupManager /** * Create a group for every class subscribed to the current course. * - * @param int $category_id The category in which the groups should be created + * @param int $categoryId The category in which the groups should be created * * @return array */ - public static function create_class_groups($category_id) + public static function create_class_groups($categoryId) { - $options['where'] = [" usergroup.course_id = ? " => api_get_course_int_id()]; + $options['where'] = [' usergroup.course_id = ? ' => api_get_course_int_id()]; $obj = new UserGroup(); $classes = $obj->getUserGroupInCourse($options); $group_ids = []; + foreach ($classes as $class) { - $users_ids = $obj->get_users_by_usergroup($class['id']); - $group_id = self::create_group( + $userList = $obj->get_users_by_usergroup($class['id']); + $groupId = self::create_group( $class['name'], - $category_id, + $categoryId, 0, - count($users_ids) + null ); - $groupInfo = self::get_group_properties($group_id); - self::subscribe_users($users_ids, $groupInfo); - $group_ids[] = $group_id; + + if ($groupId) { + $groupInfo = self::get_group_properties($groupId); + self::subscribe_users($userList, $groupInfo); + $group_ids[] = $groupId; + } } return $group_ids; @@ -544,17 +550,19 @@ class GroupManager public static function get_group_properties($group_id, $useIid = false) { $course_id = api_get_course_int_id(); - if (empty($group_id) || !is_int(intval($group_id))) { + $group_id = (int) $group_id; + + if (empty($group_id)) { return null; } $table_group = Database::get_course_table(TABLE_GROUP); $sql = "SELECT * FROM $table_group - WHERE c_id = $course_id AND id = ".intval($group_id); + WHERE c_id = $course_id AND id = ".$group_id; if ($useIid) { $sql = "SELECT * FROM $table_group - WHERE c_id = $course_id AND iid = ".intval($group_id); + WHERE c_id = $course_id AND iid = ".$group_id; } $db_result = Database::query($sql); $db_object = Database::fetch_object($db_result); @@ -642,7 +650,7 @@ class GroupManager return []; } $name = Database::escape_string($name); - $courseId = intval($courseId); + $courseId = (int) $courseId; $table_group = Database::get_course_table(TABLE_GROUP); $sql = "SELECT * FROM $table_group WHERE c_id = $courseId AND name LIKE '%$name%'"; @@ -698,8 +706,8 @@ class GroupManager ) { $table_group = Database::get_course_table(TABLE_GROUP); $table_forum = Database::get_course_table(TABLE_FORUM); - $categoryId = intval($categoryId); - $group_id = intval($group_id); + $categoryId = (int) $categoryId; + $group_id = (int) $group_id; $courseId = api_get_course_int_id(); $allowDocumentAccess = api_get_configuration_value('group_document_access'); @@ -723,7 +731,7 @@ class GroupManager self_registration_allowed = '".Database::escape_string($selfRegistrationAllowed)."', self_unregistration_allowed = '".Database::escape_string($selfUnRegistrationAllowed)."', $documentCondition - category_id = ".intval($categoryId)." + category_id = ".$categoryId." WHERE c_id = $courseId AND id=".$group_id; $result = Database::query($sql); @@ -1051,7 +1059,7 @@ class GroupManager $documentAccess ) { $table = Database::get_course_table(TABLE_GROUP_CATEGORY); - $id = intval($id); + $id = (int) $id; $courseId = api_get_course_int_id(); @@ -1544,9 +1552,10 @@ class GroupManager public static function is_self_registration_allowed($user_id, $groupInfo) { $course_id = api_get_course_int_id(); - if (!$user_id > 0) { + if (empty($user_id)) { return false; } + $groupIid = $groupInfo['iid']; $table = Database::get_course_table(TABLE_GROUP); if (isset($groupIid)) { @@ -1576,7 +1585,7 @@ class GroupManager */ public static function is_self_unregistration_allowed($user_id, $groupInfo) { - if (!$user_id > 0 || empty($groupInfo)) { + if (empty($user_id) || empty($groupInfo)) { return false; } $groupIid = $groupInfo['iid']; @@ -1917,7 +1926,7 @@ class GroupManager return false; } - if (!empty($groupId) > 0) { + if (!empty($groupId)) { $table_group_tutor = Database::get_course_table(TABLE_GROUP_TUTOR); $sql = "DELETE FROM $table_group_tutor WHERE group_id = $groupId AND c_id = $courseId"; @@ -3129,7 +3138,7 @@ class GroupManager case self::DOCUMENT_MODE_SHARE: // Default chamilo behaviour // Student can upload his own content, cannot modify another content. - $isMember = GroupManager::is_subscribed($userId, $groupInfo); + $isMember = self::is_subscribed($userId, $groupInfo); if ($isMember) { // No document to check, allow access to document feature. if (empty($documentInfoToBeCheck)) { diff --git a/main/inc/lib/javascript/hotspot/js/hotspot.js b/main/inc/lib/javascript/hotspot/js/hotspot.js index e64c80efc2..09d2e55312 100755 --- a/main/inc/lib/javascript/hotspot/js/hotspot.js +++ b/main/inc/lib/javascript/hotspot/js/hotspot.js @@ -764,11 +764,9 @@ window.HotspotQuestion = (function () { default: hotspot = SquareModel.decode(hotspotInfo); break; - case 'circle': hotspot = EllipseModel.decode(hotspotInfo); break; - case 'poly': hotspot = PolygonModel.decode(hotspotInfo); break; @@ -891,9 +889,7 @@ window.HotspotQuestion = (function () { }) .on('mousedown', 'circle, text', function (e) { e.preventDefault(); - isMoving = true; - if (e.target.tagName === 'circle') { //Hack to move correctly the hot spots if there are more than one HS question in same page answerIndex = $(e.target).next().html(); @@ -1141,16 +1137,14 @@ window.HotspotQuestion = (function () { modifyAnswers: parseInt(config.questionId) }); break; - case 'user': xhrQuestion = $.getJSON(config.relPath + 'exercise/hotspot_actionscript.as.php?' + _p.web_cid_query, { modifyAnswers: parseInt(config.questionId), exe_id: parseInt(config.exerciseId) }); break; - case 'solution': - //no break + //no break case 'preview': xhrQuestion = $.getJSON(config.relPath + 'exercise/hotspot_answers.as.php?' + _p.web_cid_query, { modifyAnswers: parseInt(config.questionId), diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php index 92baa58487..ec9fcdfe91 100755 --- a/main/inc/lib/social.lib.php +++ b/main/inc/lib/social.lib.php @@ -1826,13 +1826,17 @@ class SocialManager extends UserManager $formattedList .= ''; $formattedList .= ' ';
- $formattedList .= '';
$formattedList .= ' ';
@@ -3169,10 +3173,10 @@ class SocialManager extends UserManager
$html .= '';
$html .= $iconStatus;
$html .= ' ';
$html .= ''.$nameCompleteAuthor.''.$htmlReceiver.' ';
- $html .= ''.$date.' ';
+ $html .= ''.$date.' ';
$html .= '';
- $html .= ' |