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.

Browse Source
pull/2487/head
jmontoyaa 8 years ago
parent cacd67c14c
commit 8d3cb10249
5 changed files with 241 additions and 111 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. 35
      main/admin/filler.php
  2. 10
      main/admin/system_status.php
  3. 66
      main/dropbox/dropbox_init.inc.php
  4. 53
      main/dropbox/index.php
  5. 188
      main/exercise/exercise.class.php

35
main/admin/filler.php
Unescape View File

@ -2,10 +2,10 @@
/* For licensing terms, see /license.txt */
/**
* Index of the admin tools
*
* @package chamilo.admin
*/
* Index of the admin tools
*
* @package chamilo.admin
*/
// resetting the course id
$cidReset = true;
@ -53,8 +53,9 @@ if (count($output) > 0) {
$result .= '<table>';
foreach ($output as $line) {
$result .= '<tr>';
$result .= '<td class="filler-report-data-init">'.$line['line-init'].' </td><td class="filler-report-data">'.$line['line-info'].'</td>';
$result .= '</tr>';
$result .= '<td class="filler-report-data-init">'.$line['line-init'].' </td>
<td class="filler-report-data">'.$line['line-info'].'</td>';
$result .= '</tr>';
}
$result .= '</table>';
$result .= '</div>';
@ -63,11 +64,27 @@ if (count($output) > 0) {
?>
<div id="datafiller" class="panel panel-default">
<div class="panel-body">
<h4><?php echo Display::return_icon('bug.png', get_lang('DataFiller'), null, ICON_SIZE_MEDIUM).' '.get_lang('DataFiller')?></h4>
<h4><?php
echo Display::return_icon('bug.png', get_lang('DataFiller'), null, ICON_SIZE_MEDIUM).' '.get_lang('DataFiller');
?>
</h4>
<div class="description"><?php echo get_lang('ThisSectionIsOnlyVisibleOnSourceInstalls'); ?></div>
<ul class="fillers">
<li><a href="filler.php?fill=users"><?php echo Display::return_icon('user.png', get_lang('FillUsers'), null, ICON_SIZE_SMALL).' '.get_lang('FillUsers'); ?></a></li>
<li><a href="filler.php?fill=courses"><?php echo Display::return_icon('new-course.png', get_lang('FillCourses'), null, ICON_SIZE_SMALL).' '.get_lang('FillCourses'); ?></a></li>
<li>
<a href="filler.php?fill=users">
<?php
echo Display::return_icon('user.png', get_lang('FillUsers'), null, ICON_SIZE_SMALL).
' '.get_lang('FillUsers');
?>
</a></li>
<li>
<a href="filler.php?fill=courses">
<?php
echo Display::return_icon('new-course.png', get_lang('FillCourses'), null, ICON_SIZE_SMALL).' '.
get_lang('FillCourses');
?>
</a>
</li>
</ul>
</div>
</div>

10
main/admin/system_status.php
Unescape View File

@ -1,9 +1,9 @@
<?php
/* For licensing terms, see /license.txt */
/**
* @package chamilo.admin
* @author Julio Montoya <gugli100@gmail.com>
*/
* @package chamilo.admin
* @author Julio Montoya <gugli100@gmail.com>
*/
$cidReset = true;
require_once __DIR__.'/../inc/global.inc.php';
@ -12,7 +12,7 @@ $this_section = SECTION_PLATFORM_ADMIN;
// User permissions
api_protect_admin_script();
$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
Display :: display_header(get_lang('SystemStatus'));
Display::display_header(get_lang('SystemStatus'));
$diag = new Diagnoser();
$diag->show_html();
Display :: display_footer();
Display:: display_footer();

66
main/dropbox/dropbox_init.inc.php
Unescape View File

@ -17,51 +17,72 @@ use ChamiloSession as Session;
* @package chamilo.dropbox
*
* @todo complete refactoring. Currently there are about at least 3 sql queries needed for every individual dropbox document.
* first we find all the documents that were sent (resp. received) by the user
* then for every individual document the user(s)information who received (resp. sent) the document is searched
* then for every individual document the feedback is retrieved
* @todo the implementation of the dropbox categories could (on the database level) have been done more elegantly by storing the category
* in the dropbox_person table because this table stores the relationship between the files (sent OR received) and the users
* first we find all the documents that were sent (resp. received) by the user
* then for every individual document the user(s)information who received (resp. sent) the document is searched
* then for every individual document the feedback is retrieved
* @todo
* the implementation of the dropbox categories could (on the database level) have been done more elegantly by storing the category
* in the dropbox_person table because this table stores the relationship between the files (sent OR received) and the users
*/
/**
HISTORY
Version 1.1
------------
- dropbox_init1.inc.php: changed include statements to require statements. This way if a file is not found, it stops the execution of a script instead of continuing with warnings.
- dropbox_init1.inc.php: the include files "claro_init_global.inc.php" & "debug.lib.inc.php" are first checked for their existence before including them. If they don't exist, in the .../include dir, they get loaded from the .../inc dir. This change is necessary because the UCL changed the include dir to inc.
- dropbox_init1.inc.php: the databasetable name in the variable $dropbox_cnf["introTbl"] is chnged from "introduction" to "tool_intro"
- dropbox_init1.inc.php: changed include statements to require statements.
This way if a file is not found, it stops the execution of a script instead of continuing with warnings.
- dropbox_init1.inc.php: the include files "claro_init_global.inc.php" & "debug.lib.inc.php" are first checked for
their existence before including them. If they don't exist, in the .../include dir,
they get loaded from the .../inc dir. This change is necessary because the UCL changed the include dir to inc.
- dropbox_init1.inc.php: the databasetable name in the variable $dropbox_cnf["introTbl"]
is changed from "introduction" to "tool_intro"
- install.php: after submit, checks if the database uses accueil or tool_list as a tablename
- index.php: removed the behaviour of only the teachers that are allowed to delete entries
- index.php: added field "lastUploadDate" in table dropbox_file to store information about last update when resubmiting a file
- index.php: added field "lastUploadDate" in table dropbox_file to store information
about last update when resubmiting a file
- dropbox.inc.php: added $lang["lastUpdated"]
- index.php: entries in received list show when file was last updated if it is updated
- index.php: entries in sent list show when file was last resent if it was resent
- index.php: add POST-variable to the upload form with overwrite data when user decides to overwrite the previous sent file with new file
- index.php: add POST-variable to the upload form with overwrite data when
user decides to overwrite the previous sent file with new file
- dropbox_submit.php: add sanity checks on POST['overwrite'] data
- index.php: remove title field in upload form
- dropbox_init1.inc.php: added $dropbox_cnf["version"] variable
- dropbox_class.inc.php: add $this->lastUploadDate to Dropbox_work class
- dropbox.inc.php: added $lang['emptyTable']
- index.php: if the received or sent list is empty, a message is displayed
- dropbox_download.php: the $file var is set equal to the title-field of the filetable. So not constructed anymore by substracting the username from the filename
- dropbox_download.php: the $file var is set equal to the title-field of the filetable.
So not constructed anymore by substracting the username from the filename
- index.php: add check to see if column lastUploadDate exists in filetable
- index.php: moved javascripts from dropbox_init2.inc.php to index.php
- index.php: when specifying an uploadfile in the form, a checkbox allowing the user to overwrite a previously sent file is shown when the specified file has the same name as a previously uploaded file of that user.
- index.php: assign all the metadata (author, description, date, recipient, sender) of an entry in a list to the class="dropbox_detail" and add css to html-header
- index.php: when specifying an uploadfile in the form, a checkbox allowing the user to overwrite a
previously sent file is shown when the specified file has the same name as a previously uploaded file of that user.
- index.php: assign all the metadata (author, description, date, recipient, sender) of an
entry in a list to the class="dropbox_detail" and add css to html-header
- index.php: assign all dates of entries in list to the class="dropbox_date" and add CSS
- index.php: assign all persons in entries of list to the class="dropbox_person" and add CSS
- dropbox.inc.php: added $lang['dropbox_version'] to indicate the lates version. This must be equal to the $dropbox_cnf['version'] variable.
- dropbox_init1.inc.php: if the newest lang file isn't loaded by claro_init_global.inc.php from the .../lang dir it will be loaded locally from the .../plugin/dropbox/ dir. This way an administrator must not install the dropbox.inc.php in the .../lang/english dir, but he can leave it in the local .../plugin/dropbox/ dir. However if you want to present multiple language translations of the file you must still put the file in the /lang/ dir, because there is no language management system inside the .../plugin/dropbox dir.
- mime.inc.php: created this file. It contains an array $mimetype with all the mimetypes that are used by dropbox_download.php to give hinst to the browser during download about content
- dropbox.inc.php: added $lang['dropbox_version'] to indicate the lates version.
This must be equal to the $dropbox_cnf['version'] variable.
- dropbox_init1.inc.php: if the newest lang file isn't loaded by claro_init_global.inc.php
from the .../lang dir it will be loaded locally from the .../plugin/dropbox/ dir.
This way an administrator must not install the dropbox.inc.php in the .../lang/english dir,
but he can leave it in the local .../plugin/dropbox/ dir.
However if you want to present multiple language translations of the file you must still
put the file in the /lang/ dir, because there is no language management system inside the .../plugin/dropbox dir.
- mime.inc.php: created this file. It contains an array $mimetype with all the mimetypes
that are used by dropbox_download.php to give hinst to the browser during download about content
- dropbox_download.php: remove https specific headers because they're not necessary
- dropbox_download.php: use application/octet-stream as the default mime and inline as the default Content-Disposition
- dropbox.inc.php: add lang vars for "order by" action
- dropbox_class.inc.php: add methods orderSentWork, orderReceivedWork en _cmpWork and propery _orderBy to class Dropbox_person to take care of sorting
- index.php: add selectionlist to headers of sent/received lists to select "order by" and add code to keep selected value in sessionvar.
- index.php: moved part of a <a> hyperlink to previous line to remove the underlined space between symbol and title of a work entry in the sent/received list
- dropbox_class.inc.php: add methods orderSentWork, orderReceivedWork en _cmpWork and
propery _orderBy to class Dropbox_person to take care of sorting
- index.php: add selectionlist to headers of sent/received lists to select "order by"
and add code to keep selected value in sessionvar.
- index.php: moved part of a <a> hyperlink to previous line to remove the underlined space between
symbol and title of a work entry in the sent/received list
- index.php: add filesize info in sent/received lists
- dropbox_submit.php: resubmit prevention only for GET action, because it gives some annoying behaviour in POST situation: white screen in IE6
- dropbox_submit.php: resubmit prevention only for GET action, because it gives some annoying behaviour in POST
* situation: white screen in IE6
Version 1.2
-----------
@ -310,7 +331,6 @@ if (($postAction == 'download_received' || $postAction == 'download_sent') and !
* AUTHORISATION SECTION
* Prevents access of all users that are not course members
*/
if ((!$is_allowed_in_course || !$is_course_member) &&
!api_is_allowed_to_edit(null, true)
) {
@ -354,10 +374,6 @@ if ($view == 'sent' || empty($view)) {
$nameTools = get_lang('AddNewCategory');
}
if ($action == 'add') {
/*$interbreadcrumb[] = array(
'url' => api_get_path(WEB_CODE_PATH).'dropbox/index.php?view=sent&'.api_get_cidreq(),
'name' => get_lang('SentFiles'),
);*/
$nameTools = get_lang('UploadNewFile');
}

53
main/dropbox/index.php
Unescape View File

@ -100,7 +100,10 @@ if (isset($_POST['StoreCategory'])) {
echo Display::return_message($return_information['message'], 'confirmation');
}
if ($return_information['type'] == 'error') {
echo Display::return_message(get_lang('FormHasErrorsPleaseComplete').'<br />'.$return_information['message'], 'error');
echo Display::return_message(
get_lang('FormHasErrorsPleaseComplete').'<br />'.$return_information['message'],
'error'
);
display_addcategory_form($_POST['category_name'], $_POST['edit_id'], $postAction);
}
}
@ -154,7 +157,9 @@ if (($action == 'deletereceivedfile' || $action == 'deletesentfile') && isset($_
}
// Delete a category
if (($action == 'deletereceivedcategory' || $action == 'deletesentcategory') && isset($_GET['id']) && is_numeric($_GET['id'])) {
if (($action == 'deletereceivedcategory' || $action == 'deletesentcategory') &&
isset($_GET['id']) && is_numeric($_GET['id'])
) {
if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
api_not_allowed();
}
@ -163,7 +168,8 @@ if (($action == 'deletereceivedcategory' || $action == 'deletesentcategory') &&
}
// Do an action on multiple files
// only the download has is handled separately in dropbox_init_inc.php because this has to be done before the headers are sent
// only the download has is handled separately in
// dropbox_init_inc.php because this has to be done before the headers are sent
// (which also happens in dropbox_init.inc.php
if (!isset($_POST['feedback']) && (
strstr($postAction, 'move_received') ||
@ -225,22 +231,28 @@ if ($action != 'add') {
if (api_get_session_id() == 0) {
echo '<div class="actions">';
if ($view_dropbox_category_received != 0 && api_is_allowed_to_session_edit(false, true)) {
echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category=0&view_sent_category='.$viewSentCategory.'&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'), '', ICON_SIZE_MEDIUM)."</a>";
echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category=0&view_sent_category='.$viewSentCategory.'&view='.$view.'">'.
Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'), '', ICON_SIZE_MEDIUM).
"</a>";
echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_received]['cat_name']).'</strong> ';
$movelist[0] = 'Root'; // move_received selectbox content
} else {
echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addreceivedcategory&view='.$view.'">'.Display::return_icon('new_folder.png', get_lang('AddNewCategory'), '', ICON_SIZE_MEDIUM).'</a>';
echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addreceivedcategory&view='.$view.'">'.
Display::return_icon('new_folder.png', get_lang('AddNewCategory'), '', ICON_SIZE_MEDIUM).'</a>';
}
echo '</div>';
} else {
if (api_is_allowed_to_session_edit(false, true)) {
echo '<div class="actions">';
if ($view_dropbox_category_received != 0 && api_is_allowed_to_session_edit(false, true)) {
echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category=0&view_sent_category='.$viewSentCategory.'&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'), '', ICON_SIZE_MEDIUM)."</a>";
echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category=0&view_sent_category='.$viewSentCategory.'&view='.$view.'">'.
Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'), '', ICON_SIZE_MEDIUM)."</a>";
echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_received]['cat_name']).'</strong> ';
$movelist[0] = 'Root'; // move_received selectbox content
} else {
echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addreceivedcategory&view='.$view.'">'.Display::return_icon('new_folder.png', get_lang('AddNewCategory'), '', ICON_SIZE_MEDIUM).'</a>';
echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addreceivedcategory&view='.$view.'">'.
Display::return_icon('new_folder.png', get_lang('AddNewCategory'), '', ICON_SIZE_MEDIUM).
'</a>';
}
echo '</div>';
}
@ -259,10 +271,13 @@ if ($action != 'add') {
if (api_get_session_id() == 0) {
echo '<div class="actions">';
if ($view_dropbox_category_sent != 0) {
echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category=0&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'), '', ICON_SIZE_MEDIUM)."</a>";
echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category=0&view='.$view.'">'.
Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'), '', ICON_SIZE_MEDIUM).
"</a>";
echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_sent]['cat_name']).'</strong> ';
} else {
echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=addsentcategory\">".Display::return_icon('new_folder.png', get_lang('AddNewCategory'), '', ICON_SIZE_MEDIUM)."</a>\n";
echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=addsentcategory\">".
Display::return_icon('new_folder.png', get_lang('AddNewCategory'), '', ICON_SIZE_MEDIUM)."</a>\n";
}
if (empty($viewSentCategory)) {
echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=add\">".
@ -458,12 +473,17 @@ if ($action != 'add') {
// The icon of the category
$link_open = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$category['cat_id'].'&view_sent_category='.$viewSentCategory.'&view='.$view.'">';
$dropbox_category_data[] = $link_open.DocumentManager::build_document_icon_tag('folder', $category['cat_name']).'</a>';
$dropbox_category_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&cat_id='.$category['cat_id'].'&action=downloadcategory&sent_received=received">'.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'), ICON_SIZE_SMALL).'</a>'.$link_open.$category['cat_name'].'</a>';
$dropbox_category_data[] =
'<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&cat_id='.$category['cat_id'].'&action=downloadcategory&sent_received=received">'.
Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'), ICON_SIZE_SMALL).'</a>'.$link_open.$category['cat_name'].'</a>';
$dropbox_category_data[] = '';
$dropbox_category_data[] = '';
$dropbox_category_data[] = '';
$dropbox_category_data[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=editcategory&id='.$category['cat_id'].'">'.Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>
<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletereceivedcategory&id='.$category['cat_id'].'" onclick="javascript: return confirmation(\''.Security::remove_XSS($category['cat_name']).'\');">'.Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
$dropbox_category_data[] =
'<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=editcategory&id='.$category['cat_id'].'">'.
Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>
<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletereceivedcategory&id='.$category['cat_id'].'" onclick="javascript: return confirmation(\''.Security::remove_XSS($category['cat_name']).'\');">'.
Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
}
if (is_array($dropbox_category_data) && count($dropbox_category_data) > 0) {
$dropbox_data_recieved[] = $dropbox_category_data;
@ -631,14 +651,15 @@ if ($action != 'add') {
// This is where the checkbox icon for the files appear.
$link_open = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$category['cat_id'].'&view='.$view.'">';
$dropbox_category_data[] = $link_open.DocumentManager::build_document_icon_tag('folder', Security::remove_XSS($category['cat_name'])).'</a>';
$dropbox_category_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&cat_id='.$category['cat_id'].'&action=downloadcategory&sent_received=sent">'.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'), ICON_SIZE_SMALL).'</a>'.$link_open.Security::remove_XSS($category['cat_name']).'</a>';
$dropbox_category_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&cat_id='.$category['cat_id'].'&action=downloadcategory&sent_received=sent">'.
Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'), ICON_SIZE_SMALL).'</a>'.$link_open.Security::remove_XSS($category['cat_name']).'</a>';
$dropbox_category_data[] = '';
$dropbox_category_data[] = '';
$dropbox_category_data[] = '';
$dropbox_category_data[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=editcategory&id='.$category['cat_id'].'">'.
Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>
<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletesentcategory&id='.$category['cat_id'].'" onclick="javascript: return confirmation(\''.Security::remove_XSS($category['cat_name']).'\');">'.
Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>
<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletesentcategory&id='.$category['cat_id'].'" onclick="javascript: return confirmation(\''.Security::remove_XSS($category['cat_name']).'\');">'.
Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
}
if (is_array($dropbox_category_data) && count($dropbox_category_data) > 0) {
$dropbox_data_sent[] = $dropbox_category_data;

188
main/exercise/exercise.class.php
Unescape View File

@ -2048,32 +2048,109 @@ class Exercise
if ($this->selectNbrQuestions() == 0) {
// feedback type
$radios_feedback = array();
$radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('ExerciseAtTheEndOfTheTest'), '0', array('id' =>'exerciseType_0', 'onclick' => 'check_feedback()'));
$radios_feedback[] = $form->createElement(
'radio',
'exerciseFeedbackType',
null,
get_lang('ExerciseAtTheEndOfTheTest'),
'0',
array('id' => 'exerciseType_0', 'onclick' => 'check_feedback()')
);
if (api_get_setting('enable_quiz_scenario') == 'true') {
$radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('DirectFeedback'), '1', array('id' =>'exerciseType_1', 'onclick' => 'check_direct_feedback()'));
$radios_feedback[] = $form->createElement(
'radio',
'exerciseFeedbackType',
null,
get_lang('DirectFeedback'),
'1',
array('id' => 'exerciseType_1', 'onclick' => 'check_direct_feedback()')
);
}
$radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('NoFeedback'), '2', array('id' =>'exerciseType_2'));
$form->addGroup($radios_feedback, null, array(get_lang('FeedbackType'), get_lang('FeedbackDisplayOptions')));
$radios_feedback[] = $form->createElement(
'radio',
'exerciseFeedbackType',
null,
get_lang('NoFeedback'),
'2',
array('id' => 'exerciseType_2')
);
$form->addGroup(
$radios_feedback,
null,
array(get_lang('FeedbackType'), get_lang('FeedbackDisplayOptions'))
);
//$form->addElement('select', 'exerciseFeedbackType',get_lang('FeedbackType'),$feedback_option,'onchange="javascript:feedbackselection()"');
$radios_results_disabled = array();
$radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('ShowScoreAndRightAnswer'), '0', array('id'=>'result_disabled_0'));
$radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'), '1', array('id'=>'result_disabled_1', 'onclick' => 'check_results_disabled()'));
$radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('OnlyShowScore'), '2', array('id'=>'result_disabled_2', 'onclick' => 'check_results_disabled()'));
$radios_results_disabled[] = $form->createElement(
'radio',
'results_disabled',
null,
get_lang('ShowScoreAndRightAnswer'),
'0',
array('id' => 'result_disabled_0')
);
$radios_results_disabled[] = $form->createElement(
'radio',
'results_disabled',
null,
get_lang('DoNotShowScoreNorRightAnswer'),
'1',
array('id' => 'result_disabled_1', 'onclick' => 'check_results_disabled()')
);
$radios_results_disabled[] = $form->createElement(
'radio',
'results_disabled',
null,
get_lang('OnlyShowScore'),
'2',
array('id' => 'result_disabled_2', 'onclick' => 'check_results_disabled()')
);
$form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'), '');
// Type of questions disposition on page
$radios = array();
$radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SimpleExercise'), '1');
$radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SequentialExercise'), '2');
$radios[] = $form->createElement(
'radio',
'exerciseType',
null,
get_lang('SequentialExercise'),
'2'
);
$form->addGroup($radios, null, get_lang('ExerciseType'));
} else {
//Show options freeze
$radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('ShowScoreAndRightAnswer'), '0', array('id'=>'result_disabled_0'));
$radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'), '1', array('id'=>'result_disabled_1', 'onclick' => 'check_results_disabled()'));
$radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('OnlyShowScore'), '2', array('id'=>'result_disabled_2', 'onclick' => 'check_results_disabled()'));
$result_disable_group = $form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'));
$radios_results_disabled[] = $form->createElement(
'radio',
'results_disabled',
null,
get_lang('ShowScoreAndRightAnswer'),
'0',
array('id' => 'result_disabled_0')
);
$radios_results_disabled[] = $form->createElement(
'radio',
'results_disabled',
null,
get_lang('DoNotShowScoreNorRightAnswer'),
'1',
array('id' => 'result_disabled_1', 'onclick' => 'check_results_disabled()')
);
$radios_results_disabled[] = $form->createElement(
'radio',
'results_disabled',
null,
get_lang('OnlyShowScore'),
'2',
array('id' => 'result_disabled_2', 'onclick' => 'check_results_disabled()')
);
$result_disable_group = $form->addGroup(
$radios_results_disabled,
null,
get_lang('ShowResultsToStudents')
);
$result_disable_group->freeze();
//we force the options to the DirectFeedback exercisetype
@ -2621,7 +2698,7 @@ class Exercise
$this->save($type);
}
function search_engine_save()
public function search_engine_save()
{
if ($_POST['index_document'] != 1) {
return;
@ -2666,7 +2743,7 @@ class Exercise
$di = new ChamiloIndexer();
isset($_POST['language']) ? $lang = Database::escape_string($_POST['language']) : $lang = 'english';
$di->connectDb(NULL, NULL, $lang);
$di->connectDb(null, null, $lang);
$di->addChunk($ic_slide);
//index and return search engine document id
@ -2681,7 +2758,7 @@ class Exercise
}
}
function search_engine_edit()
public function search_engine_edit()
{
// update search enchine and its values table if enabled
if (api_get_setting('search_enabled') == 'true' && extension_loaded('xapian')) {
@ -2762,7 +2839,9 @@ class Exercise
if (api_get_setting('search_enabled') == 'true' && extension_loaded('xapian')) {
$course_id = api_get_course_id();
$tbl_se_ref = Database::get_main_table(TABLE_MAIN_SEARCH_ENGINE_REF);
$sql = 'SELECT * FROM %s WHERE course_code=\'%s\' AND tool_id=\'%s\' AND ref_id_high_level=%s AND ref_id_second_level IS NULL LIMIT 1';
$sql = 'SELECT * FROM %s
WHERE course_code=\'%s\' AND tool_id=\'%s\' AND ref_id_high_level=%s AND ref_id_second_level IS NULL
LIMIT 1';
$sql = sprintf($sql, $tbl_se_ref, $course_id, TOOL_QUIZ, $this->id);
$res = Database::query($sql);
if (Database::num_rows($res) > 0) {
@ -2785,7 +2864,9 @@ class Exercise
}
}
}
$sql = 'DELETE FROM %s WHERE course_code=\'%s\' AND tool_id=\'%s\' AND ref_id_high_level=%s AND ref_id_second_level IS NULL LIMIT 1';
$sql = 'DELETE FROM %s
WHERE course_code=\'%s\' AND tool_id=\'%s\' AND ref_id_high_level=%s AND ref_id_second_level IS NULL
LIMIT 1';
$sql = sprintf($sql, $tbl_se_ref, $course_id, TOOL_QUIZ, $this->id);
Database::query($sql);
@ -2895,7 +2976,7 @@ class Exercise
$exercise_obj->save();
$new_exercise_id = $exercise_obj->selectId();
$question_list = $exercise_obj->selectQuestionList();
$question_list = $exercise_obj->selectQuestionList();
if (!empty($question_list)) {
//Question creation
@ -3426,15 +3507,14 @@ class Exercise
$orderedHotspots = [];
if ($answerType == HOT_SPOT || $answerType == ANNOTATION) {
$orderedHotspots = $em
->getRepository('ChamiloCoreBundle:TrackEHotspot')
->findBy([
'hotspotQuestionId' => $questionId,
'cId' => $course_id,
'hotspotExeId' => $exeId
],
['hotspotAnswerId' => 'ASC']
);
$orderedHotspots = $em->getRepository('ChamiloCoreBundle:TrackEHotspot')->findBy(
[
'hotspotQuestionId' => $questionId,
'cId' => $course_id,
'hotspotExeId' => $exeId,
],
['hotspotAnswerId' => 'ASC']
);
}
if ($debug) error_log('Start answer loop ');
@ -3681,7 +3761,7 @@ class Exercise
$last = count($pre_array) - 1;
$is_set_switchable = explode('@', $pre_array[$last]);
$switchable_answer_set = false;
if (isset ($is_set_switchable[1]) && $is_set_switchable[1] == 1) {
if (isset($is_set_switchable[1]) && $is_set_switchable[1] == 1) {
$switchable_answer_set = true;
}
$answer = '';
@ -3975,9 +4055,7 @@ class Exercise
}
// adds the correct word, followed by ] to close the blank
if (
$this->results_disabled != EXERCISE_FEEDBACK_TYPE_EXAM
) {
if ($this->results_disabled != EXERCISE_FEEDBACK_TYPE_EXAM) {
$answer .= ' / <font color="green"><b>'.$realCorrectTags[$i].'</b></font>';
}
@ -4388,24 +4466,21 @@ class Exercise
if ($debug) error_log('Showing questions $from '.$from);
if ($from == 'exercise_result') {
//display answers (if not matching type, or if the answer is correct)
if (
!in_array($answerType, [MATCHING, DRAGGABLE, MATCHING_DRAGGABLE]) ||
if (!in_array($answerType, [MATCHING, DRAGGABLE, MATCHING_DRAGGABLE]) ||
$answerCorrect
) {
if (
in_array(
$answerType,
array(
UNIQUE_ANSWER,
UNIQUE_ANSWER_IMAGE,
UNIQUE_ANSWER_NO_OPTION,
MULTIPLE_ANSWER,
MULTIPLE_ANSWER_COMBINATION,
GLOBAL_MULTIPLE_ANSWER,
READING_COMPREHENSION,
)
if (in_array(
$answerType,
array(
UNIQUE_ANSWER,
UNIQUE_ANSWER_IMAGE,
UNIQUE_ANSWER_NO_OPTION,
MULTIPLE_ANSWER,
MULTIPLE_ANSWER_COMBINATION,
GLOBAL_MULTIPLE_ANSWER,
READING_COMPREHENSION,
)
) {
)) {
ExerciseShowFunctions::display_unique_or_multiple_answer(
$feedback_type,
$answerType,
@ -4611,8 +4686,7 @@ class Exercise
}
// if pass
if (
$final_overlap >= $threadhold1 &&
if ($final_overlap >= $threadhold1 &&
$final_missing <= $threadhold3 &&
$final_excess <= $threadhold2
) {
@ -4671,7 +4745,8 @@ class Exercise
$url_hotspot = $destination_items[4];
}
}
} else { // the first delineation feedback
} else {
// the first delineation feedback
if ($debug > 0) {
error_log(__LINE__.' first', 0);
}
@ -4710,7 +4785,7 @@ class Exercise
//no break
case MULTIPLE_ANSWER:
//no break
case GLOBAL_MULTIPLE_ANSWER :
case GLOBAL_MULTIPLE_ANSWER:
//no break
case MULTIPLE_ANSWER_COMBINATION:
//no break
@ -4843,7 +4918,8 @@ class Exercise
break;
case ORAL_EXPRESSION:
echo '<tr>
<td valign="top">' . ExerciseShowFunctions::display_oral_expression_answer(
<td valign="top">'.
ExerciseShowFunctions::display_oral_expression_answer(
$feedback_type,
$choice,
$exeId,
@ -5338,7 +5414,6 @@ class Exercise
// Store results directly in the database
// For all in one page exercises, the results will be
// stored by exercise_results.php (using the session)
if ($saved_results) {
if ($debug) error_log("Save question results $saved_results");
if ($debug) error_log(print_r($choice, 1));
@ -5690,7 +5765,6 @@ class Exercise
* @param array $question_list_answers
* @param string $origin
* @param int $exe_id
* @return null
*/
private function send_notification_for_open_questions(
$question_list_answers,
@ -5780,7 +5854,9 @@ class Exercise
* @param array $question_list_answers
* @param string $origin
* @param int $exe_id
* @return null
* @param array $user_info
* @param string $url_email
* @param array $teachers
*/
private function send_notification_for_oral_questions(
$question_list_answers,
@ -7231,13 +7307,13 @@ class Exercise
<div id="ajaxquestiondiv'.$questionId.'"></div>';
echo $script;
} else {
global $origin;
$question_obj = Question::read($questionId);
$user_choice = isset($attemptList[$questionId]) ? $attemptList[$questionId] : null;
$remind_highlight = null;
//Hides questions when reviewing a ALL_ON_ONE_PAGE exercise see #4542 no_remind_highlight class hide with jquery
// Hides questions when reviewing a ALL_ON_ONE_PAGE exercise
// see #4542 no_remind_highlight class hide with jquery
if ($this->type == ALL_ON_ONE_PAGE && isset($_GET['reminder']) && $_GET['reminder'] == 2) {
$remind_highlight = 'no_remind_highlight';
if (in_array($question_obj->type, Question::question_type_no_review())) {

Write Preview
Loading…
Cancel
Save