Merge remote-tracking branch 'origin/1.10.x' into 1.11.x

ofaj
Julio 9 years ago
commit 5bbf95e81d
  1. 2
      main/admin/group_edit.php
  2. 21
      main/coursecopy/classes/CourseSelectForm.class.php
  3. 2
      main/document/create_document.php
  4. 5
      main/document/document.php
  5. 8
      main/document/edit_document.php
  6. 2
      main/document/slideshow.php
  7. 8
      main/exercice/calculated_answer.class.php
  8. 6
      main/exercice/exercise.php
  9. 2
      main/exercice/fill_blanks.class.php
  10. 2
      main/exercice/global_multiple_answer.class.php
  11. 5
      main/exercice/hotspot_admin.inc.php
  12. 2
      main/forum/forumfunction.inc.php
  13. 2
      main/gradebook/gradebook.php
  14. 9
      main/gradebook/index.php
  15. 13
      main/gradebook/lib/GradebookUtils.php
  16. 53
      main/gradebook/lib/fe/displaygradebook.php
  17. 26
      main/gradebook/lib/fe/resulttable.class.php
  18. 1
      main/inc/lib/api.lib.php
  19. 70
      main/inc/lib/blog.lib.php
  20. 15
      main/inc/lib/display.lib.php
  21. 5
      main/inc/lib/document.lib.php
  22. 34
      main/inc/lib/exercise_show_functions.lib.php
  23. 2
      main/inc/lib/search/tool_processors/document_processor.class.php
  24. 2
      main/inc/lib/search/tool_processors/link_processor.class.php
  25. 10
      main/inc/lib/statsUtils.lib.inc.php
  26. 10
      main/inc/lib/upload.xajax.php
  27. 22
      main/inc/lib/usermanager.lib.php
  28. 27
      main/newscorm/learnpath.class.php
  29. 2
      main/newscorm/lp_edit.php
  30. 9
      main/newscorm/lp_list_search.php
  31. 5
      main/newscorm/resourcelinker.inc.php
  32. 6
      main/newscorm/scorm_api.php
  33. 32
      main/permissions/permissions_functions.inc.php
  34. 6
      main/resourcelinker/resourcelinker.inc.php
  35. 3
      main/session/resume_session.php
  36. 4
      main/social/friends.php
  37. 35
      main/social/search.php
  38. 4
      main/survey/survey.php
  39. 21
      main/tracking/lp_results_by_user.php
  40. 20
      main/upload/upload.document.php
  41. 2
      main/upload/upload_ppt.php
  42. 22
      main/upload/upload_word.php
  43. 7
      main/user/user.php

@ -145,7 +145,7 @@ Display::display_header($tool_name);
$image_path = GroupPortalManager::get_group_picture_path_by_id($group_id, 'web');
$image_dir = $image_path['dir'];
$image = $image_path['file'];
$image_file = ($image != '' ? $image_dir.$image : api_get_path(WEB_CODE_PATH).'img/unknown_group.jpg');
$image_file = ($image != '' ? $image_dir.$image : Display::returnIconPath('unknown_group.jpg'));
$image_size = api_getimagesize($image_file);
$img_attributes = 'src="'.$image_file.'?rand='.time().'" '

@ -44,11 +44,11 @@ class CourseSelectForm
el = document.getElementById('div_'+item);
if (el.style.display=='none'){
el.style.display='';
document.getElementById('img_'+item).src='../img/1.gif';
document.getElementById('img_'+item).src='<?php echo Display::returnIconPath('1.gif'); ?>';
}
else{
el.style.display='none';
document.getElementById('img_'+item).src='../img/0.gif';
document.getElementById('img_'+item).src='<?php echo Display::returnIconPath('O.gif'); ?>';
}
}
@ -147,8 +147,8 @@ class CourseSelectForm
}
echo '<script src="'.api_get_path(WEB_CODE_PATH).'inc/lib/javascript/upload.js" type="text/javascript"></script>';
echo '<script type="text/javascript">var myUpload = new upload(1000);</script>';
echo '<form method="post" id="upload_form" name="course_select_form" onsubmit="javascript: myUpload.start(\'dynamic_div\',\''.api_get_path(WEB_CODE_PATH).'img/progress_bar.gif\',\''.get_lang('PleaseStandBy', '').'\',\'upload_form\')">';
$icon = Display::returnIconPath('myprogress_bar.gif');
echo '<form method="post" id="upload_form" name="course_select_form" onsubmit="javascript: myUpload.start(\'dynamic_div\',\''.$icon.',\''.get_lang('PleaseStandBy', '').'\',\'upload_form\')">';
echo '<input type="hidden" name="action" value="course_select_form"/>';
if (!empty($hidden_fields['destination_course']) &&
@ -203,7 +203,7 @@ class CourseSelectForm
case RESOURCE_SCORM:
break;
default :
echo '<img id="img_'.$type.'" src="../img/1.gif" onclick="javascript:exp('."'$type'".');" />&nbsp;';
echo '<img id="img_'.$type.'" src="'.Display::returnIconPath('1.gif').'" onclick="javascript:exp('."'$type'".');" />&nbsp;';
echo '<b onclick="javascript:exp('."'$type'".');" >'.$resource_titles[$type].'</b><br />';
echo '<div id="div_'.$type.'">';
if ($type == RESOURCE_LEARNPATH) {
@ -244,7 +244,7 @@ class CourseSelectForm
if (!empty($forum_categories)) {
$type = RESOURCE_FORUMCATEGORY;
echo '<img id="img_'.$type.'" src="../img/1.gif" onclick="javascript:exp('."'$type'".');" />&nbsp;';
echo '<img id="img_'.$type.'" src="'.Display::returnIconPath('1.gif').'" onclick="javascript:exp('."'$type'".');" />&nbsp;';
echo '<b onclick="javascript:exp('."'$type'".');" >'.$resource_titles[RESOURCE_FORUM].'</b><br />';
echo '<div id="div_'.$type.'">';
@ -581,11 +581,11 @@ class CourseSelectForm
el = document.getElementById('div_'+item);
if (el.style.display=='none'){
el.style.display='';
document.getElementById('img_'+item).src='../img/1.gif';
document.getElementById('img_'+item).src='<?php echo Display::returnIconPath('1.gif'); ?>';
}
else{
el.style.display='none';
document.getElementById('img_'+item).src='../img/0.gif';
document.getElementById('img_'+item).src='<?php echo Display::returnIconPath('0.gif'); ?>';
}
}
function setCheckbox(type,value) {
@ -632,12 +632,13 @@ class CourseSelectForm
echo '<script src="'.api_get_path(WEB_CODE_PATH).'inc/lib/javascript/upload.js" type="text/javascript"></script>';
echo '<script type="text/javascript">var myUpload = new upload(1000);</script>';
echo '<form method="post" id="upload_form" name="course_select_form" onsubmit="myUpload.start(\'dynamic_div\',\''.api_get_path(WEB_CODE_PATH).'img/progress_bar.gif\',\''.get_lang('PleaseStandBy').'\',\'upload_form\')">';
$icon = Display::returnIconPath('progress_bar.gif');
echo '<form method="post" id="upload_form" name="course_select_form" onsubmit="myUpload.start(\'dynamic_div\',\''.$icon.'\',\''.get_lang('PleaseStandBy').'\',\'upload_form\')">';
echo '<input type="hidden" name="action" value="course_select_form"/>';
foreach ($list_course as $course){
foreach ($course->resources as $type => $resources) {
if (count($resources) > 0) {
echo '<img id="img_'.$course->code.'" src="../img/1.gif" onclick="javascript:exp('."'$course->code'".');" />';
echo '<img id="img_'.$course->code.'" src="'.Display::returnIconPath('1.gif').'" onclick="javascript:exp('."'$course->code'".');" />';
echo '<b onclick="javascript:exp('."'$course->code'".');" > '.$course->code.'</b><br />';
echo '<div id="div_'.$course->code.'">';
echo '<blockquote>';

@ -18,7 +18,7 @@ var hide_bar = function() {
$("#template_col").hide();
$("#doc_form").removeClass("col-md-9");
$("#doc_form").addClass("col-md-11");
$("#hide_bar_template").css({"background-image" : \'url("../img/hide2.png")\'})
$("#hide_bar_template").css({"background-image" : \'url("'.Display::returnIconPath('hide2.png').'")\'})
}
$(document).ready(function() {

@ -670,8 +670,9 @@ if (isset($_GET['curdirpath']) &&
echo '<style>body {background:none;}</style>
<style media="print" type="text/css"> #print_div { visibility:hidden; } </style>';
echo '<a href="javascript:window.print();" style="float:right; padding:4px;" id="print_div">
<img src="../img/printmgr.gif" alt="'.get_lang('Print').'"/>'.get_lang('Print').'</a>';
echo '<a href="javascript:window.print();" style="float:right; padding:4px;" id="print_div">';
echo Display::return_icon('printmgr.gif', get_lang('Print'));
echo '</a>';
if (is_file($qr_code_filename) && is_readable($qr_code_filename)) {
$new_content_html = str_replace(
'((certificate_barcode))',

@ -34,7 +34,7 @@ var hide_bar = function() {
$("#template_col").hide();
$("#doc_form").removeClass("col-md-9");
$("#doc_form").addClass("col-md-11");
$("#hide_bar_template").css({"background-image" : \'url("../img/hide2.png")\'})
$("#hide_bar_template").css({"background-image" : \'url("'.Display::returnIconPath('hide.png').'")\'})
}
$(document).ready(function() {
@ -139,9 +139,9 @@ $editorConfig = array(
);
if ($is_certificate_mode) {
$editorConfig['CreateDocumentDir'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/';
$editorConfig['CreateDocumentWebDir'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/';
$editorConfig['BaseHref'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir;
$editorConfig['CreateDocumentDir'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/';
$editorConfig['CreateDocumentWebDir'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/';
$editorConfig['BaseHref'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir;
}
$is_allowed_to_edit = api_is_allowed_to_edit(null, true) || $_SESSION['group_member_with_upload_rights']||

@ -440,7 +440,7 @@ if ($slide_id != 'all' && !empty($image_files_only)) {
if (initial_height>height || initial_width>width) {
document.getElementById('image').style.visibility='hidden';
document.getElementById('td_image').style.background='url(../img/loadingAnimation.gif) center no-repeat';
document.getElementById('td_image').style.background='url(<?php echo Display::returnIconPath('loadingAnimation.gif'); ?>) center no-repeat';
document.getElementById('image').onload = resizeImage;
window.onresize = resizeImage;
}

@ -12,8 +12,8 @@ use Webit\Util\EvalMath\EvalMath;
**/
class CalculatedAnswer extends Question
{
static $typePicture = 'calculated_answer.png';
static $explanationLangVar = 'CalculatedAnswer';
public static $typePicture = 'calculated_answer.png';
public static $explanationLangVar = 'CalculatedAnswer';
/**
* Constructor
@ -29,7 +29,7 @@ class CalculatedAnswer extends Question
* function which redefines Question::createAnswersForm
* @param FormValidator $form
*/
function createAnswersForm($form)
public function createAnswersForm($form)
{
$defaults = array();
@ -126,7 +126,7 @@ class CalculatedAnswer extends Question
$form->addElement(
'html_editor',
'answer',
'<img src="../img/fill_field.png">',
Display::returnIconPath('fill_field.png'),
array(
'id' => 'answer',
'onkeyup' => 'javascript: updateBlanks(this);'

@ -720,7 +720,9 @@ if (!empty($exercise_list)) {
$class_tip = 'link_tooltip';
}
//$class_tip = 'exercise_link';
$url = $move.'<a '.$alt_title.' class="'.$class_tip.'" id="tooltip_'.$row['id'].'" href="overview.php?'.api_get_cidreq().$myorigin.$mylpid.$mylpitemid.'&exerciseId='.$row['id'].'"><img src="../img/quiz.gif" /> '.$title.' </a>';
$url = $move.'<a '.$alt_title.' class="'.$class_tip.'" id="tooltip_'.$row['id'].'" href="overview.php?'.api_get_cidreq().$myorigin.$mylpid.$mylpitemid.'&exerciseId='.$row['id'].'">
'.Display::return_icon('quiz.gif', $row['title']).'
'.$title.' </a>';
$item = Display::tag('td', $url.' '.$session_img.$lp_blocked);
@ -1071,7 +1073,7 @@ if (isset($attribute['path']) && is_array($attribute['path'])) {
// prof only
if ($is_allowedToEdit) {
$item = Display::tag('td', '<img src="../img/hotpotatoes_s.png" alt="HotPotatoes" /> <a href="showinframes.php?file='.$path.'&cid='.api_get_course_id().'&uid='.$userId.'" '.(!$active ? 'class="invisible"' : '').' >'.$title.'</a> ');
$item = Display::tag('td', Display::return_icon('hotpotatoes_s.png', "HotPotatoes").'<a href="showinframes.php?file='.$path.'&cid='.api_get_course_id().'&uid='.$userId.'" '.(!$active ? 'class="invisible"' : '').' >'.$title.'</a> ');
$item .= Display::tag('td', '-');
$actions = Display::url(

@ -256,7 +256,7 @@ class FillBlanks extends Question
$form->addElement(
'html_editor',
'answer',
'<img src="../img/fill_field.png">',
Display::returnIconPath('fill_field.png'),
['id' => 'answer', 'onkeyup' => "javascript: updateBlanks(this);"],
array('ToolbarSet' => 'TestQuestionDescription')
);

@ -45,7 +45,7 @@ class GlobalMultipleAnswer extends Question
$html .='<th>' . get_lang('Comment') . '</th>';
$html .='</tr>';
$form->addElement('label', get_lang('Answers') . '<br /> <img src="../img/fill_field.png">', $html);
$form->addElement('label', get_lang('Answers') . '<br /> '.Display::returnIconPath('fill_field.png'), $html);
$defaults = array();
$correct = 0;
$answer = false;

@ -563,7 +563,10 @@ if ($modifyAnswers) {
);
}
Display::tag('h3', get_lang('Question') . ": " . $questionName . ' <img src="../img/info3.gif" title="' . strip_tags(get_lang('HotspotChoose')) . '" alt="' . strip_tags(get_lang('HotspotChoose')) . '" />');
Display::tag(
'h3',
get_lang('Question') . ": " . $questionName . Display::return_icon('info3.gif', strip_tags(get_lang('HotspotChoose')))
);
if (!empty($msgErr)) {
Display::display_normal_message($msgErr); //main API

@ -3728,7 +3728,7 @@ function display_user_image($user_id, $name, $origin = '')
if ($user_id != 0) {
return $link.'<img src="'.$userInfo['avatar'].'" alt="'.$name.'" title="'.$name.'" /></a>';
} else {
return $link.'<img src="'.api_get_path(WEB_CODE_PATH)."img/unknown.jpg".'" alt="'.$name.'" title="'.$name.'" /></a>';
return $link.Display::return_icon('unknown.jpg', $name).'</a>';
}
}

@ -561,8 +561,6 @@ if (!empty($keyword)) {
$pdf->line(50,50,790,50);
$pdf->line(50,550,790,550);
$pdf->ezSetY(450);
//@todo replace image
//$pdf->ezImage(api_get_path(SYS_CODE_PATH).'img/dokeos_logo_certif.png',1,400,'','center','');
$pdf->ezSetY(480);
$pdf->ezText($certif_text,28,array('justification'=>'center'));
//$pdf->ezSetY(750);

@ -24,14 +24,9 @@ $_SESSION['gradebook_dest'] = 'index.php';
$this_section = SECTION_COURSES;
/*
$htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/jqplot/jquery.jqplot.min.css');
$htmlHeadXtra[] = api_get_js('jqplot/jquery.jqplot.min.js');
$htmlHeadXtra[] = api_get_js('jqplot/plugins/jqplot.donutRenderer.min.js');*/
$htmlHeadXtra[] = '<script>
var show_icon = "../img/view_more_stats.gif";
var hide_icon = "../img/view_less_stats.gif";
var show_icon = "'.Display::returnIconPath('view_more_stats.gif').'";
var hide_icon = "'.Display::returnIconPath('view_less_stats.gif').'";
$(document).ready(function() {
$("body").on("click", ".view_children", function() {

@ -271,13 +271,6 @@ class GradebookUtils
'',
ICON_SIZE_SMALL
) . '</a>';
//no move ability for root categories
if ($cat->is_movable()) {
/* $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?movecat=' . $cat->get_id() . '&amp;selectcat=' . $selectcat . ' &amp;cidReq='.$cat->get_course_code().'">
<img src="../img/icons/22/move.png" border="0" title="' . get_lang('Move') . '" alt="" /></a>'; */
} else {
//$modify_icons .= '&nbsp;<img src="../img/deplacer_fichier_na.gif" border="0" title="' . get_lang('Move') . '" alt="" />';
}
if ($cat->is_locked() && !api_is_platform_admin()) {
$modify_icons .= Display::return_icon('delete_na.png', get_lang('DeleteAll'), '', ICON_SIZE_SMALL);
@ -357,8 +350,6 @@ class GradebookUtils
$modify_icons = '<a href="gradebook_edit_link.php?editlink=' . $link->get_id() . '&cidReq=' . $link->get_course_code() . '&id_session='.$link->get_session_id().'">' .
Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
}
//$modify_icons .= '&nbsp;<a href="' . api_get_self() . '?movelink=' . $link->get_id() . '&selectcat=' . $selectcat . '"><img src="../img/deplacer_fichier.gif" border="0" title="' . get_lang('Move') . '" alt="" /></a>';
$modify_icons .= '&nbsp;<a href="' . api_get_self() . '?visiblelink=' . $link->get_id() . '&' . $visibility_command . '=&selectcat=' . $selectcat . '&id_session='.$link->get_session_id(). ' ">' .
Display::return_icon($visibility_icon . '.png', get_lang('Visible'), '', ICON_SIZE_SMALL) . '</a>';
$modify_icons .= '&nbsp;<a href="gradebook_showlog_link.php?visiblelink=' . $link->get_id() . '&selectcat=' . $selectcat . '&cidReq=' . $link->get_course_code() . '&id_session='.$link->get_session_id(). '">' .
@ -712,7 +703,9 @@ class GradebookUtils
//add print header
if ($hide_print_button == false) {
$print = '<style media="print" type="text/css">#print_div {visibility:hidden;}</style>';
$print .= '<a href="javascript:window.print();" style="float:right; padding:4px;" id="print_div"><img src="' . api_get_path(WEB_CODE_PATH) . 'img/printmgr.gif" alt="' . get_lang('Print') . '" /> ' . get_lang('Print') . '</a>';
$print .= '<a href="javascript:window.print();" style="float:right; padding:4px;" id="print_div">';
$print .= Display::return_icon('printmgr.gif', get_lang('Print'));
$print .= '</a>';
}
// Add header

@ -109,10 +109,11 @@ class DisplayGradebook
}
if ($page != 'statistics') {
if (api_is_allowed_to_edit(null, true)) {
$evalinfo .= '<br /><a href="gradebook_statistics.php?' . api_get_cidreq() . '&selecteval=' . Security::remove_XSS($_GET['selecteval']) . '"> ' . Display::return_icon(('statistics.png'), get_lang('ViewStatistics'), '', ICON_SIZE_MEDIUM) . '</a>';
$evalinfo .= '<br /><a href="gradebook_statistics.php?' . api_get_cidreq() . '&selecteval=' . Security::remove_XSS($_GET['selecteval']) . '"> ' .
Display::return_icon('statistics.png', get_lang('ViewStatistics'), '', ICON_SIZE_MEDIUM) . '</a>';
}
}
$evalinfo .= '</td><td><img style="float:right; position:relative;" src="../img/tutorial.gif"></td></table>';
$evalinfo .= '</td><td>'.Display::return_icon('tutorial.gif', '', ['style' => 'float:right; position:relative;']).'</td></table>';
echo $evalinfo;
echo $header;
}
@ -144,7 +145,9 @@ class DisplayGradebook
}
$header .= '</td></select></form>';
if (!$catobj->get_id() == '0') {
$header .= '<td style="vertical-align: top;"><a href="' . api_get_self() . '?selectcat=' . $catobj->get_parent_id() . '"><img src="../img/gradebook.gif" border="0" alt="' . get_lang('Up') . '" /></a></td>';
$header .= '<td style="vertical-align: top;"><a href="' . api_get_self() . '?selectcat=' . $catobj->get_parent_id() . '">';
$header .= Display::return_icon('gradebook.gif', get_lang('Up'));
$header .= '</a></td>';
}
$header .= '<td style="vertical-align: top;">' . $simple_search_form->toHtml() . '</td>';
$header .= '<td style="vertical-align: top;">
@ -289,15 +292,11 @@ class DisplayGradebook
} else {
$header .= '<td></td>';
}
if ($is_course_admin && $message_resource === false && $_GET['selectcat'] != 0) {
/* $header .= '<td style="vertical-align: top;"><a href="gradebook_flatview.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() . '"><img src="../img/view_list.gif" alt="' . get_lang('FlatView') . '" /> ' . get_lang('FlatView') . '</a>';
if ($is_course_admin && $message_resource===false) {
$header .= '<td style="vertical-align: top;"><a href="gradebook_scoring_system.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() .'"><img src="../img/acces_tool.gif" alt="' . get_lang('ScoreEdit') . '" /> ' . get_lang('ScoreEdit') . '</a>';
} */
} elseif (!(isset($_GET['studentoverview']))) {
if ($message_resource === false) {
//$header .= '<td style="vertical-align: top;"><a href="'.api_get_self().'?'.api_get_cidreq().'&studentoverview=&selectcat=' . $catobj->get_id() . '"><img src="../img/view_list.gif" alt="' . get_lang('FlatView') . '" /> ' . get_lang('FlatView') . '</a>';
}
} else {
$header .= '<td style="vertical-align: top;"><a href="' . api_get_self() . '?' . api_get_cidreq() . '&studentoverview=&exportpdf=&selectcat=' . $catobj->get_id() . '" target="_blank">
'.Display::return_icon('pdf.png', get_lang('ExportPDF'), [], ICON_SIZE_MEDIUM).'
@ -317,36 +316,16 @@ class DisplayGradebook
$courseId = $courseInfo['real_id'];
$status_user = api_get_status_of_user_in_course($user_id, $courseId);
//$header .= '<a href="gradebook_add_cat.php?'.api_get_cidreq().'&selectcat=0"><img src="../img/folder_new.gif" alt="' . get_lang('AddGradebook') . '" /></a></td>';
if (api_is_allowed_to_edit(null, true)) {
if ($selectcat == '0') {
if ($show_add_qualification === true) {
}
if ($show_add_link) {
//$header .= '<td><a href="gradebook_add_eval.php?'.api_get_cidreq().'"><img src="../img/filenew.gif" alt="' . get_lang('NewEvaluation') . '" /> ' . get_lang('NewEvaluation') . '</a>';
}
} else {
if ($show_add_qualification === true && $message_resource === false) {
//$header .= '<a href="gradebook_add_cat.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() . '" ><img src="../img/folder_new.gif" alt="' . get_lang('NewSubCategory') . '" align="absmiddle" /> ' . get_lang('NewSubCategory') . '</a></td>';
}
$my_category = $catobj->shows_all_information_an_category($catobj->get_id());
$my_api_cidreq = api_get_cidreq();
if ($my_api_cidreq == '') {
$my_api_cidreq = 'cidReq=' . $my_category['course_code'];
}
if ($show_add_link && !$message_resource) {
//$header .= '<td><a href="gradebook_add_eval.php?'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() . '" >'.Display::return_icon('new_evaluation.png', get_lang('NewEvaluation'),'',ICON_SIZE_MEDIUM).'</a>';
$cats = Category :: load($selectcat);
if ($cats[0]->get_course_code() != null && !$message_resource) {
//$header .= '<td><a href="gradebook_add_link.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() . '"><img src="../img/link.gif" alt="' . get_lang('MakeLink') . '" align="absmiddle" /> ' . get_lang('MakeLink') . '</a>';
//$header .= '<td><a href="gradebook_add_link.php?'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() . '">'.Display::return_icon('new_online_evaluation.png', get_lang('MakeLink'),'',ICON_SIZE_MEDIUM).'</a>';
} else {
// $header .= '<td><a href="gradebook_add_link_select_course.php?'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() . '">'.Display::return_icon('new_online_evaluation.png', get_lang('MakeLink'),'',ICON_SIZE_MEDIUM).'</a>';
}
}
if (!$message_resource) {
$myname = $catobj->shows_all_information_an_category($catobj->get_id());
@ -364,10 +343,6 @@ class DisplayGradebook
//Right icons
$modify_icons = '<a href="gradebook_edit_cat.php?editcat=' . $catobj->get_id() . '&cidReq=' . $catobj->get_course_code() . '&id_session='.$catobj->get_session_id(). '">' . Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_MEDIUM) . '</a>';
//$modify_icons .= '<a href="../document/document.php?curdirpath=/certificates&'.$my_api_cidreq.'&origin=gradebook&selectcat=' . $catobj->get_id() . '">'.
//Display::return_icon('certificate.png', get_lang('AttachCertificate'),'',ICON_SIZE_MEDIUM).'</a>';
//hide or delete are not options available
//$modify_icons .= '&nbsp;<a href="' . api_get_self() . '?visiblecat=' . $catobj->get_id() . '&amp;' . $visibility_command . '=&amp;selectcat=0 ">'.Display::return_icon($visibility_icon.'.png', get_lang('Visible'),'',ICON_SIZE_MEDIUM).'</a>';
if ($catobj->get_name() != api_get_course_id()) {
$modify_icons .= '&nbsp;<a href="' . api_get_self() . '?deletecat=' . $catobj->get_id() . '&amp;selectcat=0&amp;cidReq=' . $catobj->get_course_code() . '" onclick="return confirmation();">' . Display::return_icon('delete.png', get_lang('DeleteAll'), '', ICON_SIZE_MEDIUM) . '</a>';
}
@ -530,14 +505,8 @@ class DisplayGradebook
$message_resource === false &&
isset($_GET['selectcat']) && $_GET['selectcat'] != 0
) {
/* $header .= '<td style="vertical-align: top;"><a href="gradebook_flatview.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() . '"><img src="../img/view_list.gif" alt="' . get_lang('FlatView') . '" /> ' . get_lang('FlatView') . '</a>';
if ($is_course_admin && $message_resource===false) {
$header .= '<td style="vertical-align: top;"><a href="gradebook_scoring_system.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() .'"><img src="../img/acces_tool.gif" alt="' . get_lang('ScoreEdit') . '" /> ' . get_lang('ScoreEdit') . '</a>';
} */
} elseif (!(isset($_GET['studentoverview']))) {
if ($message_resource === false) {
//$header .= '<td style="vertical-align: top;"><a href="'.api_get_self().'?'.api_get_cidreq().'&studentoverview=&selectcat=' . $catobj->get_id() . '"><img src="../img/view_list.gif" alt="' . get_lang('FlatView') . '" /> ' . get_lang('FlatView') . '</a>';
}
} else {
$header .= '<td style="vertical-align: top;"><a href="' . api_get_self() . '?' . api_get_cidreq() . '&studentoverview=&exportpdf=&selectcat=' . $catobj->get_id() . '" target="_blank">
'.Display::return_icon('pdf.png', get_lang('ExportPDF'), [], ICON_SIZE_MEDIUM).'

@ -59,14 +59,15 @@ class ResultTable extends SortableTable
/**
* Function used by SortableTable to get total number of items in the table
*/
function get_total_number_of_items () {
public function get_total_number_of_items ()
{
return $this->datagen->get_total_results_count();
}
/**
* Function used by SortableTable to generate the data to display
*/
function get_table_data ($from = 1, $per_page = null, $column = null, $direction = null, $sort = null) {
public function get_table_data($from = 1, $per_page = null, $column = null, $direction = null, $sort = null) {
$is_western_name_order = api_is_western_name_order();
$scoredisplay = ScoreDisplay :: instance();
@ -148,24 +149,27 @@ class ResultTable extends SortableTable
$edit_column .= ' <a href="' . api_get_self() . '?delete_mark=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
Display::return_icon('delete.png', get_lang('Delete'),'','22').'</a>';
}
if ($this->evaluation->get_course_code() == null) {
$edit_column.= '&nbsp;<a href="' . api_get_self() . '?resultdelete=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id() . '" onclick="return confirmationuser();">
<img src="../img/delete.gif" border="0" title="' . get_lang('Delete') . '" alt="" /></a>';
$edit_column.= '&nbsp;<a href="user_stats.php?userid=' . $item['id'] . '&selecteval=' . $this->evaluation->get_id() . '&'.api_get_cidreq().'">
<img src="../img/statistics.gif" width="17px" border="0" title="' . get_lang('Statistics') . '" alt="" /></a>';
$edit_column .= '&nbsp;<a href="' . api_get_self() . '?resultdelete=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id() . '" onclick="return confirmationuser();">';
$edit_column .= Display::return_icon('delete.png', get_lang('Delete'));
$edit_column .= '</a>';
$edit_column .= '&nbsp;<a href="user_stats.php?userid=' . $item['id'] . '&selecteval=' . $this->evaluation->get_id() . '&'.api_get_cidreq().'">';
$edit_column .= Display::return_icon('statistics.gif', get_lang('Statistics'));
$edit_column .= '</a>';
}
// Evaluation's origin is a link
if ($this->evaluation->get_category_id() < 0) {
$link = LinkFactory :: get_evaluation_link ($this->evaluation->get_id());
$link = LinkFactory::get_evaluation_link($this->evaluation->get_id());
$doc_url = $link->get_view_url($item['id']);
if ($doc_url != null) {
$edit_column .= '&nbsp;<a href="'. $doc_url . '" target="_blank">'
.'<img src="'. api_get_path(WEB_CODE_PATH) . 'img/link.gif" border="0" title="' . get_lang('OpenDocument') . '" alt="" />'
.'</a>';
$edit_column .= '&nbsp;<a href="'. $doc_url . '" target="_blank">';
$edit_column .= Display::return_icon('link.gif', get_lang('OpenDocument').'</a>';
}
}
return $edit_column;
}
}

@ -1455,7 +1455,6 @@ function _api_format_user($user, $add_password = false)
$avatarString = explode('?', $originalFile);
$result['avatar_no_query'] = reset($avatarString);
$result['avatar_small'] = $smallFile;
//$result['avatar_sys_path'] = api_get_path(SYS_CODE_PATH).'img/unknown.jpg';
if (isset($user['user_is_online'])) {
$result['user_is_online'] = $user['user_is_online'] == true ? 1 : 0;

@ -997,13 +997,19 @@ class Blog
$task_id = (isset($_GET['task_id']) && is_numeric($_GET['task_id'])) ? intval($_GET['task_id']) : 0;
if (api_is_allowed('BLOG_' . $blog_id, 'article_edit', $task_id))
$blog_post_actions .= '<a href="blog.php?action=edit_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&article_id=' . $blog_post['post_id'] . '&task_id=' . $task_id . '" title="' . get_lang('EditThisPost') . '"><img src="../img/edit.gif" /></a>';
if (api_is_allowed('BLOG_' . $blog_id, 'article_edit', $task_id)) {
$blog_post_actions .= '<a href="blog.php?action=edit_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&article_id=' . $blog_post['post_id'] . '&task_id=' . $task_id . '" title="' . get_lang('EditThisPost') . '">';
$blog_post_actions .= Display::return_icon('edit.png');
$blog_post_actions .= '</a>';
}
if (api_is_allowed('BLOG_' . $blog_id, 'article_delete', $task_id))
$blog_post_actions .= '<a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&do=delete_article&article_id=' . $blog_post['post_id'] . '&task_id=' . $task_id . '" title="' . get_lang('DeleteThisArticle') . '" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"><img src="../img/delete.gif" border="0" /></a>';
if (api_is_allowed('BLOG_' . $blog_id, 'article_delete', $task_id)) {
$blog_post_actions .= '<a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&do=delete_article&article_id=' . $blog_post['post_id'] . '&task_id=' . $task_id . '" title="' . get_lang('DeleteThisArticle') . '" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;">';
$blog_post_actions .= Display::return_icon('delete.png');
$blog_post_actions .= '</a>';
}
if(api_is_allowed('BLOG_' . $blog_id, 'article_rate'))
if (api_is_allowed('BLOG_' . $blog_id, 'article_rate'))
$rating_select = Blog::display_rating_form('post',$blog_id,$post_id);
$blog_post_text=stripslashes($blog_post_text);
@ -1222,8 +1228,19 @@ class Blog
$comment_text = make_clickable(stripslashes($comment['comment']));
$blog_comment_date = api_convert_and_format_date($comment['date_creation'], null, date_default_timezone_get());
$blog_comment_actions = "";
if(api_is_allowed('BLOG_' . $blog_id, 'article_comments_delete', $task_id)) { $blog_comment_actions .= '<a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&do=delete_comment&comment_id=' . $comment['comment_id'] . '&task_id=' . $task_id . '" title="' . get_lang('DeleteThisComment') . '" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"><img src="../img/delete.gif" border="0" /></a>'; }
if(api_is_allowed('BLOG_' . $blog_id, 'article_comments_rate')) { $rating_select = Blog::display_rating_form('comment', $blog_id, $post_id, $comment['comment_id']); }
if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_delete', $task_id)) {
$blog_comment_actions .= '<a href="blog.php?action=view_post&blog_id='.$blog_id.'&post_id='.$post_id.'&do=delete_comment&comment_id='.$comment['comment_id'].'&task_id='.$task_id.'" title="'.get_lang(
'DeleteThisComment'
).'" onclick="javascript:if(!confirm(\''.addslashes(
api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset)
).'\')) return false;">';
$blog_comment_actions .= Display::return_icon('delete.png');
$blog_comment_actions .= '</a>';
}
if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_rate')) {
$rating_select = Blog::display_rating_form('comment', $blog_id, $post_id, $comment['comment_id']);
}
if (!is_null($comment['task_id'])) {
$border_color = ' border-left: 3px solid #' . $comment['color'];
@ -1238,7 +1255,7 @@ class Blog
echo '<span class="blogpost_comment_date">' . $blog_comment_date . '</span>';
echo '<span class="blogpost_text">' . $comment_text . '</span>';
$file_name_array=get_blog_attachment($blog_id,$post_id, $comment['comment_id']);
$file_name_array = get_blog_attachment($blog_id,$post_id, $comment['comment_id']);
if (!empty($file_name_array)) {
echo '<br /><br />';
echo Display::return_icon('attachment.gif',get_lang('Attachment'));
@ -1363,10 +1380,15 @@ class Blog
global $color2;
echo '<div class="actions">';
echo '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $blog_id . '&do=add"><img src="../img/blog_newtasks.gif" border="0" align="middle" alt="'.get_lang('AddTasks').'" />' . get_lang('AddTasks') . '</a> ';
echo '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $blog_id . '&do=assign"><img src="../img/blog_task.gif" border="0" align="middle" alt="'.get_lang('AssignTasks').'" />' . get_lang('AssignTasks') . '</a>';
echo '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $blog_id . '&do=add">';
echo Display::return_icon('blog_newtasks.gif', get_lang('AddTasks'));
echo get_lang('AddTasks') . '</a> ';
echo '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $blog_id . '&do=assign">';
echo Display::return_icon('blog_task.gif', get_lang('AssignTasks'));
echo get_lang('AssignTasks') . '</a>';
?>
<a href="<?php echo api_get_self(); ?>?action=manage_rights&blog_id=<?php echo $blog_id ?>" title="<?php echo get_lang('ManageRights') ?>"><?php echo Display::return_icon('blog_admin_users.png', get_lang('RightsManager'),'',ICON_SIZE_SMALL). get_lang('RightsManager') ?></a>
<a href="<?php echo api_get_self(); ?>?action=manage_rights&blog_id=<?php echo $blog_id ?>" title="<?php echo get_lang('ManageRights') ?>">
<?php echo Display::return_icon('blog_admin_users.png', get_lang('RightsManager'),'',ICON_SIZE_SMALL). get_lang('RightsManager') ?></a>
<?php
echo '</div>';
@ -1403,19 +1425,19 @@ class Blog
$delete_confirm = ($task['system_task'] == '1') ? '' : 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"';
echo '<tr class="' . $css_class . '" valign="top">',
'<td width="240">' . Security::remove_XSS($task['title']) . '</td>',
'<td>' . Security::remove_XSS($task['description']) . '</td>',
'<td><span style="background-color: #' . $task['color'] . '">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></td>',
'<td width="50">',
'<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $task['blog_id'] . '&do=edit&task_id=' . $task['task_id'] . '">',
'<img src="../img/edit.gif" border="0" title="' . get_lang('EditTask') . '" />',
"</a>\n",
'<a href="' . $delete_link . '"',
$delete_confirm,
'><img src="../img/' . $delete_icon . '" border="0" title="' . $delete_title . '" />',
"</a>\n",
'</td>',
'</tr>';
'<td width="240">' . Security::remove_XSS($task['title']) . '</td>',
'<td>' . Security::remove_XSS($task['description']) . '</td>',
'<td><span style="background-color: #' . $task['color'] . '">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></td>',
'<td width="50">',
'<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $task['blog_id'] . '&do=edit&task_id=' . $task['task_id'] . '">',
'<img src="../img/edit.gif" border="0" title="' . get_lang('EditTask') . '" />',
"</a>\n",
'<a href="' . $delete_link . '"',
$delete_confirm,
'><img src="../img/' . $delete_icon . '" border="0" title="' . $delete_title . '" />',
"</a>\n",
'</td>',
'</tr>';
}
echo "</table>";
}

@ -738,15 +738,15 @@ class Display
$alternateWebCssPath = api_get_path(WEB_CSS_PATH);
$image = trim($image);
$size_extra = '';
if (isset($size)) {
$size = intval($size);
$size_extra = $size . '/';
} else {
$size = ICON_SIZE_SMALL;
}
$size_extra = $size . '/';
// Checking the img/ folder
$icon = $w_code_path.'img/'.$image;
@ -761,6 +761,11 @@ class Display
//Checking the main/img/icons/XXX/ folder
$icon = $w_code_path.'img/icons/'.$size_extra.$image;
}
} else {
if (is_file($code_path.'img/icons/'.$size_extra.$image)) {
// Checking the main/img/icons/XXX/ folder
$icon = $w_code_path.'img/icons/'.$size_extra.$image;
}
}
// Special code to enable SVG - refs #7359 - Needs more work
@ -768,7 +773,7 @@ class Display
// it checks if there is an SVG version. If so, it uses it.
// When moving this to production, the return_icon() calls should
// ask for the SVG version directly
$testServer = api_get_setting('server_type');
/*$testServer = api_get_setting('server_type');
if ($testServer == 'test' && $return_only_path == false) {
$svgImage = substr($image, 0, -3) . 'svg';
if (is_file($code_path . $theme . 'svg/' . $svgImage)) {
@ -783,7 +788,7 @@ class Display
if (empty($additional_attributes['width'])) {
$additional_attributes['width'] = $size;
}
}
}*/
$icon = api_get_cdn_path($icon);
@ -793,7 +798,7 @@ class Display
}
$img = self::img($icon, $alt_text, $additional_attributes);
if (SHOW_TEXT_NEAR_ICONS == true and !empty($alt_text)) {
if (SHOW_TEXT_NEAR_ICONS == true && !empty($alt_text)) {
if ($show_text) {
$img = "$img $alt_text";
}

@ -5778,8 +5778,9 @@ class DocumentManager
$certificate = get_lang('NoDefaultCertificate');
}
if (isset($_GET['selectcat'])) {
$modify_icons .= '&nbsp;<a href="' . api_get_self() . '?' . api_get_cidreq() . '&amp;curdirpath=' . $curdirpath . '&amp;selectcat=' . Security::remove_XSS($_GET['selectcat']) . '&amp;set_certificate=' . $id . '&amp;' . $sort_params . '">
<img src="../img/' . $visibility_icon_certificate . '.png" border="0" title="' . $certificate . '" alt="" /></a>';
$modify_icons .= '&nbsp;<a href="' . api_get_self() . '?' . api_get_cidreq() . '&amp;curdirpath=' . $curdirpath . '&amp;selectcat=' . intval($_GET['selectcat']) . '&amp;set_certificate=' . $id . '&amp;' . $sort_params . '">';
$modify_icons .= Display::return_icon($visibility_icon_certificate.'.png', $certificate);
$modify_icons .= '</a>';
if ($is_preview) {
$modify_icons .= '&nbsp;<a target="_blank" href="' . api_get_self() . '?' . api_get_cidreq() . '&amp;curdirpath=' . $curdirpath . '&amp;set_preview=' . $id . '&amp;' . $sort_params . '" >' .
Display::return_icon('preview_view.png', $preview, '', ICON_SIZE_SMALL) . '</a>';

@ -64,16 +64,16 @@ class ExerciseShowFunctions
* @param int Question ID
* @return void
*/
static function display_calculated_answer($feedback_type, $answer, $id, $questionId)
public static function display_calculated_answer($feedback_type, $answer, $id, $questionId)
{
if (empty($id)) {
echo '<tr><td>'. (Security::remove_XSS($answer)).'</td></tr>';
echo '<tr><td>'. Security::remove_XSS($answer).'</td></tr>';
} else {
?>
<tr>
<td>
<?php
echo (Security::remove_XSS($answer));
echo Security::remove_XSS($answer);
?>
</td>
@ -97,7 +97,7 @@ class ExerciseShowFunctions
* @param int Question ID
* @return void
*/
static function display_free_answer($feedback_type, $answer, $exe_id, $questionId, $questionScore = null)
public static function display_free_answer($feedback_type, $answer, $exe_id, $questionId, $questionScore = null)
{
$comments = Event::get_comments($exe_id, $questionId);
@ -117,7 +117,7 @@ class ExerciseShowFunctions
}
}
static function display_oral_expression_answer($feedback_type, $answer, $id, $questionId, $nano = null)
public static function display_oral_expression_answer($feedback_type, $answer, $id, $questionId, $nano = null)
{
if (isset($nano)) {
echo $nano->show_audio_file();
@ -236,7 +236,7 @@ class ExerciseShowFunctions
* @param boolean Whether to show the answer comment or not
* @return void
*/
static function display_unique_or_multiple_answer(
public static function display_unique_or_multiple_answer(
$feedback_type,
$answerType,
$studentChoice,
@ -253,19 +253,25 @@ class ExerciseShowFunctions
if ($feedback_type == 0 && $in_results_disabled == 2) {
$hide_expected_answer = true;
}
$icon = in_array($answerType, array(UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION)) ? 'radio':'checkbox';
$icon .= $studentChoice?'_on':'_off';
$icon .= '.gif';
$iconAnswer = in_array($answerType, array(UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION)) ? 'radio':'checkbox';
$iconAnswer .= $answerCorrect?'_on':'_off';
$iconAnswer .= '.gif';
?>
<tr>
<td width="5%">
<img src="../img/<?php echo (in_array($answerType, array(UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION))) ? 'radio':'checkbox'; echo $studentChoice?'_on':'_off'; ?>.gif"
border="0" alt="" />
<?php echo Display::return_icon($icon); ?>
</td>
<td width="5%">
<?php if (!$hide_expected_answer) { ?>
<img src="../img/<?php echo (in_array($answerType, array(UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION))) ? 'radio':'checkbox'; echo $answerCorrect?'_on':'_off'; ?>.gif" border="0" alt=" " />
<?php }
else {
<?php if (!$hide_expected_answer) {
echo Display::return_icon($iconAnswer);
} else {
echo "-";
}?>
} ?>
</td>
<td width="40%">
<?php
@ -320,7 +326,7 @@ class ExerciseShowFunctions
* @param boolean Whether to show the answer comment or not
* @return void
*/
static function display_multiple_answer_true_false(
public static function display_multiple_answer_true_false(
$feedback_type,
$answerType,
$studentChoice,

@ -91,7 +91,7 @@ class document_processor extends search_processor {
$url = sprintf($url, $course_path, $row['path']);
// Get the image path
$icon = choose_image(basename($row['path']));
$thumbnail = api_get_path(WEB_CODE_PATH) . 'img/' . $icon;
$thumbnail = Display::returnIconPath($icon);
$image = $thumbnail;
//FIXME: use big images
// get author

@ -111,7 +111,7 @@ class link_processor extends search_processor {
$url = api_get_path(WEB_PATH) . 'main/link/link.php?cidReq=%s';
$url = sprintf($url, $course_id_alpha);
// Get the image path
$thumbnail = api_get_path(WEB_CODE_PATH) . 'img/link.gif';
$thumbnail = Display::returnIconPath('link.png');
$image = $thumbnail; //FIXME: use big images
// get author
$author = '';

@ -240,18 +240,18 @@ class StatsUtils
echo "</td>
<td width='60%' style='padding-top: 3px;' align='center'>"
// display hitbar
. "<img src='../img/bar_1.gif' width='1' height='12' alt='$periodPiece : $cpt hits &ndash; $pourcent %' />";
. "<img src='".Display::returnIconPath('bar_1.gif')."' width='1' height='12' alt='$periodPiece : $cpt hits &ndash; $pourcent %' />";
if ($pourcent != 0) {
echo "<img src='../img/bar_1u.gif' width='$barwidth' height='12' alt='$periodPiece : $cpt hits &ndash; $pourcent %' />";
echo "<img src='".Display::returnIconPath('bar_1u.gif')."' width='$barwidth' height='12' alt='$periodPiece : $cpt hits &ndash; $pourcent %' />";
}
// display 100% bar
if ($pourcent != 100 && $pourcent != 0) {
echo "<img src='../img/bar_1m.gif' width='1' height='12' alt='$periodPiece : $cpt hits &ndash; $pourcent %' />";
echo "<img src='".Display::returnIconPath('bar_1m.gif')."' width='1' height='12' alt='$periodPiece : $cpt hits &ndash; $pourcent %' />";
}
if ($pourcent != 100) {
echo "<img src='../img/bar_1r.gif' width='" . ($maxSize - $barwidth) . "' height='12' alt='$periodPiece : $cpt hits &ndash; $pourcent %' />";
echo "<img src='".Display::returnIconPath('bar_1r.gif')."' width='" . ($maxSize - $barwidth) . "' height='12' alt='$periodPiece : $cpt hits &ndash; $pourcent %' />";
}
echo "<img src='../img/bar_1.gif' width='1' height='12' alt='$periodPiece : $cpt hits &ndash; $pourcent %' />
echo "<img src='".Display::returnIconPath('bar_1.gif')."' width='1' height='12' alt='$periodPiece : $cpt hits &ndash; $pourcent %' />
</td>
<td align='center' width='10%'>
$cpt

@ -22,12 +22,12 @@ function updateProgress($div_id, $upload_id, $waitAfterupload = false) {
$percent = intval($ul_info['bytes_uploaded']*100/$ul_info['bytes_total']);
if($waitAfterupload && $ul_info['est_sec']<2) {
$percent = 100;
$objResponse -> addAssign($div_id.'_label' , 'innerHTML', get_lang('UploadFile').' : '.$percent.' %');
$objResponse -> addAssign($div_id.'_waiter_frame','innerHTML','<img src="'.api_get_path(WEB_CODE_PATH).'img/progress_bar.gif" />');
$objResponse -> addScript('clearInterval("myUpload.__progress_bar_interval")');
$objResponse->addAssign($div_id.'_label' , 'innerHTML', get_lang('UploadFile').' : '.$percent.' %');
$objResponse->addAssign($div_id.'_waiter_frame','innerHTML', Display::return_icon('progress_bar.gif'));
$objResponse->addScript('clearInterval("myUpload.__progress_bar_interval")');
}
$objResponse -> addAssign($div_id.'_label' , 'innerHTML', get_lang('UploadFile').' : '.$percent.' %');
$objResponse -> addAssign($div_id.'_filled' , 'style.width', $percent.'%');
$objResponse->addAssign($div_id.'_label', 'innerHTML', get_lang('UploadFile').' : '.$percent.' %');
$objResponse->addAssign($div_id.'_filled', 'style.width', $percent.'%');
return $objResponse;
}

@ -1479,28 +1479,28 @@ class UserManager
$pictureWebFile = $imageWebPath['file'];
$pictureWebDir = $imageWebPath['dir'];
$pictureAnonymous = 'icons/128/unknown.png';
$pictureAnonymousSize = '128';
$gravatarSize = 22;
$realSizeName = 'small_';
switch ($size) {
case USER_IMAGE_SIZE_SMALL:
$pictureAnonymous = 'icons/22/unknown.png';
$pictureAnonymousSize = '22';
$realSizeName = 'small_';
$gravatarSize = 22;
break;
case USER_IMAGE_SIZE_MEDIUM:
$pictureAnonymous = 'icons/64/unknown.png';
$pictureAnonymousSize = '64';
$realSizeName = 'medium_';
$gravatarSize = 50;
break;
case USER_IMAGE_SIZE_ORIGINAL:
$pictureAnonymous = 'icons/128/unknown.png';
$pictureAnonymousSize = '128';
$realSizeName = '';
$gravatarSize = 108;
break;
case USER_IMAGE_SIZE_BIG:
$pictureAnonymous = 'icons/128/unknown.png';
$pictureAnonymousSize = '128';
$realSizeName = 'big_';
$gravatarSize = 200;
break;
@ -1508,7 +1508,7 @@ class UserManager
$gravatarEnabled = api_get_setting('gravatar_enabled');
$anonymousPath = api_get_path(WEB_CODE_PATH).'img/'.$pictureAnonymous;
$anonymousPath = Display::returnIconPath('unknown.png', $pictureAnonymousSize);
if ($pictureWebFile == 'unknown.jpg' || empty($pictureWebFile)) {
@ -1744,12 +1744,12 @@ class UserManager
$production_path = self::get_user_picture_path_by_id($user_id, 'web');
$production_dir = $production_path['dir'];
$del_image = api_get_path(WEB_CODE_PATH).'img/delete.png';
$add_image = api_get_path(WEB_CODE_PATH).'img/archive.png';
$del_image = Display::returnIconPath('delete.png');
$add_image = Display::returnIconPath('archive.png');
$del_text = get_lang('Delete');
$production_list = '';
if (count($productions) > 0) {
$production_list = '<div class="files-production"> <ul id="productions">';
$production_list = '<div class="files-production"><ul id="productions">';
foreach ($productions as $file) {
$production_list .= '<li><img src="'.$add_image.'" /><a href="'.$production_dir.urlencode($file).'" target="_blank">'.htmlentities($file).'</a>';
if ($showdelete) {
@ -1931,6 +1931,7 @@ class UserManager
if (!$force && !empty($_POST['remove_'.$extra_field])) {
return true; // postpone reading from the filesystem
}
$extra_files = self::get_user_extra_files($user_id, $extra_field);
if (empty($extra_files)) {
return false;
@ -1938,7 +1939,8 @@ class UserManager
$path_info = self::get_user_picture_path_by_id($user_id, 'web');
$path = $path_info['dir'];
$del_image = api_get_path(WEB_CODE_PATH).'img/delete.png';
$del_image = Display::returnIconPath('delete.png');
$del_text = get_lang('Delete');
$extra_file_list = '';
if (count($extra_files) > 0) {

@ -3176,28 +3176,17 @@ class learnpath
$i = 0;
foreach ($toc_list as $item) {
// TODO: Complete this
$icon_name = array (
'not attempted' => '../img/notattempted.gif',
'incomplete' => '../img/incomplete.png',
'failed' => '../img/delete.png',
'completed' => '../img/completed.png',
'passed' => '../img/passed.png',
'succeeded' => '../img/succeeded.png',
'browsed' => '../img/completed.png',
);
// Style Status
$class_name = array (
$class_name = [
'not attempted' => 'scorm_not_attempted',
'incomplete' => 'scorm_not_attempted',
'failed' => 'scorm_failed',
'completed' => 'scorm_completed',
'passed' => 'scorm_completed',
'succeeded' => 'scorm_completed',
'browsed' => 'scorm_completed',
);
'incomplete' => 'scorm_not_attempted',
'failed' => 'scorm_failed',
'completed' => 'scorm_completed',
'passed' => 'scorm_completed',
'succeeded' => 'scorm_completed',
'browsed' => 'scorm_completed',
];
$scorm_color_background = 'row_odd';
$style_item = '';

@ -231,7 +231,7 @@ if ($_SESSION['oLP']->get_hide_toc_frame() == 1) {
$form -> display();
echo '</div>';
echo '<div class="col-md-4" align="center">';
echo '<img src="../img/course_setting_layout.png" />';
echo Display::return_icon('course_setting_layout.png');
echo '</div>';
}
echo '</div>';

@ -125,7 +125,7 @@ if ($count > 0) {
foreach ($results as $result) {
// Fill the result array.
if (empty($result['thumbnail'])) {
$result['thumbnail'] = '../img/no_document_thumb.jpg';
$result['thumbnail'] = Display::returnIconPath('no_document_thumb.jpg');
}
if (!empty($result['url'])) {
@ -181,11 +181,14 @@ if (count($blocks) > 0) {
$search_link = '<a href="%ssearch/index.php?mode=%s&action=search&query=%s%s">';
$iconGallery = (($mode == 'gallery') ? 'ButtonGallOn' : 'ButtonGallOff').'.png';
$iconDefault = (($mode == 'default') ? 'ButtonListOn' : 'ButtonListOff').'.png';
$mode_selector = '<div id="mode-selector">';
$mode_selector .= sprintf($search_link, api_get_path(WEB_CODE_PATH), 'gallery', $_REQUEST['query'], $get_params);
$mode_selector .= '<img src="../img/'. (($mode=='gallery')?'ButtonGallOn':'ButtonGallOff') .'.png" /></a>';
$mode_selector .= Display::return_icon($iconGallery).'</a>';
$mode_selector .= sprintf($search_link, api_get_path(WEB_CODE_PATH), 'default', $_REQUEST['query'], $get_params);
$mode_selector .= '<img src="../img/'.(($mode=='default')?'ButtonListOn':'ButtonListOff').'.png" /></a>';
$mode_selector .= Display::return_icon($iconDefault).'</a>';
$mode_selector .= '</div>';
echo '<div id="search-results-container">';

@ -1843,11 +1843,6 @@ function rl_get_resource_name($course_code, $learnpath_id, $id_in_path)
$in_frames = in_array($ext, array('htm', 'html', 'gif', 'jpg', 'jpeg', 'png'));
$output = $filename;
break;
/*
case 'externallink':
$output = '<img src="../img/links.gif" align="middle" /> <a href="'.$id.'"'.$styling.' '.$target.'>'.$id."</a><br />\n";
break;
*/
}
return stripslashes($output);
}

@ -2213,7 +2213,7 @@ function attach_glossary_into_scorm(type) {
var openerId = this.id +'_opener';
var link = '<a id="'+openerId+'" href="#" class="generated btn">'+
'<div style="text-align: center"><img src="<?php echo api_get_path(WEB_CODE_PATH).'img/play-circle-8x.png'; ?>"/><br />If video does not work, try clicking here.</div></a>';
'<div style="text-align: center"><img src="<?php echo Display::returnIconPath('play-circle-8x.png'); ?>"/><br />If video does not work, try clicking here.</div></a>';
var embed = $("iframe").contents().find("#"+this.id).find('embed').first();
var hasHttp = embed.attr('src').indexOf("http");
@ -2252,7 +2252,7 @@ function attach_glossary_into_scorm(type) {
var randLetter = String.fromCharCode(65 + Math.floor(Math.random() * 26));
var uniqid = randLetter + Date.now();
var openerId = uniqid +'_opener';
var link = '<a id="'+openerId+'" class="generated" href="#">Open website <img src="<?php echo api_get_path(WEB_CODE_PATH).'img/link-external.png'; ?>"/></a>';
var link = '<a id="'+openerId+'" class="generated" href="#">Open website <img src="<?php echo Display::returnIconPath('link-external.png'); ?>"/></a>';
var embed = $(this);
var height = embed.attr('height');
var width = embed.attr('width');
@ -2317,7 +2317,7 @@ function attach_glossary_into_scorm(type) {
src = url+'&type=link&src='+src;
src = src.replace('https', 'http');
$(this).attr('href', src);
var myAnchor = $('<a><img src="<?php echo api_get_path(WEB_CODE_PATH).'img/link-external.png'; ?>"/></a>').attr("href", src).attr('target', '_blank').attr('class', 'generated');
var myAnchor = $('<a><img src="<?php echo Display::returnIconPath('link-external.png'); ?>"/></a>').attr("href", src).attr('target', '_blank').attr('class', 'generated');
$(this).after(myAnchor);
$(this).after('-');
}

@ -398,37 +398,7 @@ function display_role_list($current_course_roles, $current_platform_roles)
$course_id = api_get_course_int_id();
$coures_roles_table=Database::get_course_table(TABLE_ROLE);
$platform_roles_table=Database::get_main_table(TABLE_ROLE);
/*
// platform roles
$sql="SELECT * FROM $platform_roles_table";
$result=Database::query($sql);
while ($row=Database::fetch_array($result))
{
if(in_array($row['role_id'], $current_platform_roles))
{
$checked='checked';
$image='checkbox_on2.gif';
$action='revoke';
}
else
{
$checked='';
$image='wrong.gif';
$action='grant';
}
if($setting_visualisation=='checkbox')
{
echo "<input type=\"checkbox\" name=\"role*platform*".$row['role_id']."\" $checked>";
}
if($setting_visualisation=='image')
{
echo "<a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=$action&amp;role=".$row['role_id']."&amp;scope=platform\"><img src=\"../img/".$image."\" border=\"0\"/></a>";
}
echo $row['role_name']."<br />\n";
echo $row['role_comment']."<br />\n";
}
*/
// course roles
$sql="SELECT * FROM $coures_roles_table WHERE c_id = $course_id ";
$result=Database::query($sql);

@ -1603,12 +1603,6 @@ function display_resources($showdeleteimg)
if ($showdeleteimg==1)
{
//if (strstr($_SERVER['REQUEST_URI'],"?id="))
// { echo " <a href='".api_get_self()."?id=".$output['id']."&amp;"; }
//else
// { echo " <a href='".api_get_self()."?"; }
//action=$action&id=$id&
//echo "action=$action&amp;id=$id&amp;originalresource=no&amp;resourceaction=removeresource&amp;key=".key($addedresource)."'><img src='../img/delete.gif' border='0' alt='resource ".get_lang('Delete')."' /></a><br />";
echo "<a href=".api_get_self()."?showresources=true&amp;source_forum=".$_GET['source_forum']."&amp;resourceaction=removeresource&amp;locationkey=".key($addedresource)."&amp;source_id=$source_id&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no><img src='../img/delete.gif' border='0' alt='resource ".get_lang('Delete')."' /></a><br />";
}
echo '</td></tr>';

@ -329,13 +329,14 @@ if (!empty($userList)) {
}
$editUrl = null;
/*
if (isset($sessionInfo['duration']) && !empty($sessionInfo['duration'])) {
$editUrl = api_get_path(WEB_CODE_PATH) . 'session/session_user_edit.php?session_id=' . $sessionId . '&user_id=' . $userId;
$editUrl = Display::url(
Display::return_icon('agenda.png', get_lang('SessionDurationEdit')),
$editUrl
);
}
}*/
$table->setCellContents($row, 0, $userLink);
$link = $reportingLink.$courseUserLink.$removeLink.$addUserToUrlLink.$editUrl;

@ -53,7 +53,7 @@ function show_icon_delete(element_html) {
elem_id=$(element_html).attr("id");
id_elem=elem_id.split("_");
ident="#img_"+id_elem[1];
$(ident).attr("src","../img/delete.png");
$(ident).attr("src","'.Display::returnIconPath('delete.png').'");
$(ident).attr("alt","'.get_lang('Delete', '').'");
$(ident).attr("title","'.get_lang('Delete', '').'");
}
@ -62,7 +62,7 @@ function hide_icon_delete(element_html) {
elem_id=$(element_html).attr("id");
id_elem=elem_id.split("_");
ident="#img_"+id_elem[1];
$(ident).attr("src","../img/blank.gif");
$(ident).attr("src","'.Display::returnIconPath('blank.gif').'");
$(ident).attr("alt","");
$(ident).attr("title","");
}

@ -130,20 +130,17 @@ if ($query != '' || ($query_vars['search_type']=='1' && count($query_vars)>2) )
</div>
<div class="user-info">
<p>'.$user_info['complete_name'].'</p>
<div class="items-user-status">' . $status_icon . $user_icon . '</div>
<div class="items-user-status">' . $status_icon . $user_icon . '</div>
<div class="toolbar">
'.$invitations.'
</div>
</div>
</div>
</div>';
}
$results .= '</div></div>';
$results .= '</div>';
}
$results .= '</div>';
$visibility = array(true, true, true, true, true);
$results .= Display::return_sortable_grid(
@ -159,7 +156,14 @@ if ($query != '' || ($query_vars['search_type']=='1' && count($query_vars)>2) )
$totalUsers
);
$block_search .= Display::panelCollapse(get_lang('Users'), $results, 'search-friends', null, 'friends-acorderon', 'friends-collapse');
$block_search .= Display::panelCollapse(
get_lang('Users'),
$results,
'search-friends',
null,
'friends-acorderon',
'friends-collapse'
);
$grid_groups = array();
$block_groups = '<div id="whoisonline">';
@ -201,11 +205,10 @@ if ($query != '' || ($query_vars['search_type']=='1' && count($query_vars)>2) )
</div>
</div>
</div>';
}
$block_groups .= '</div></div></div>';
$block_groups .= '</div>';
}
$block_groups .= '</div>';
$visibility = array(true, true, true, true, true);
$block_groups .= Display::return_sortable_grid(
@ -220,8 +223,15 @@ if ($query != '' || ($query_vars['search_type']=='1' && count($query_vars)>2) )
array(),
$totalGroups
);
$block_search .= Display:: panelCollapse(get_lang('Groups'), $block_groups, 'search-groups', null, 'groups-acorderon', 'groups-collapse');
$block_search .= Display:: panelCollapse(
get_lang('Groups'),
$block_groups,
'search-groups',
null,
'groups-acorderon',
'groups-collapse'
);
}
$tpl = new Template($tool_name);
@ -232,7 +242,6 @@ $tpl->assign('social_search', $block_search);
$tpl->assign('search_form', $searchForm);
$formModalTpl = new Template();
//$formModalTpl->assign('message_form', MessageManager::generate_message_form('send_message'));
$formModalTpl->assign('invitation_form', MessageManager::generate_invitation_form('send_invitation'));
$formModals = $formModalTpl->fetch('default/social/form_modals.tpl');

@ -155,7 +155,9 @@ if ($survey_data['survey_type'] == 0) {
} else {
echo '<div class="panel panel-default">';
echo '<div class="panel-body">';
echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=personality&amp;survey_id='.$survey_id.'"><img src="../img/icons/22/yesno.png" /></a></div>';
echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=personality&amp;survey_id='.$survey_id.'">';
echo Display::return_icon("yesno.png");
echo '</a></div>';
echo '</div>';
echo '</div>';
}

@ -85,8 +85,13 @@ if (!$export_to_csv) {
echo '<div class="actions" style ="font-size:10pt;">';
if ($global) {
echo '<div style="float:right"> <a href="'.api_get_self().'?export=1&score='.$filter_score.'&exercise_id='.$exercise_id.'"><img align="absbottom" src="../img/csv.gif">&nbsp;'.get_lang('ExportAsCSV').'</a>' .
'<a href="javascript: void(0);" onclick="javascript: window.print()"><img align="absbottom" src="../img/printmgr.gif">&nbsp;'.get_lang('Print').'</a></div>';
echo '<div style="float:right"> <a href="'.api_get_self().'?export=1&score='.$filter_score.'&exercise_id='.$exercise_id.'">
'.Display::return_icon('csv.gif').'
&nbsp;'.get_lang('ExportAsCSV').'</a>' .
'<a href="javascript: void(0);" onclick="javascript: window.print()">
'.Display::return_icon('printmgr.gif').'
&nbsp;'.get_lang('Print').'</a>
</div>';
$menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=teacher">'.get_lang('TeacherInterface').'</a>';
if (api_is_platform_admin()) {
@ -110,7 +115,9 @@ if (!$export_to_csv) {
<a href="courseLog.php?'.api_get_cidreq().'&studentlist=false">'.get_lang('CourseTracking').'</a>&nbsp;|&nbsp';
echo '<a href="courseLog.php?'.api_get_cidreq().'&studentlist=resources">'.get_lang('ResourcesTracking').'</a>';
echo ' | '.get_lang('ExamTracking').'';
echo '<a href="'.api_get_self().'?export=1&score='.$filter_score.'&exercise_id='.$exercise_id.'"><img align="absbottom" src="../img/excel.gif">&nbsp;'.get_lang('ExportAsXLS').'</a><br /><br />';
echo '<a href="'.api_get_self().'?export=1&score='.$filter_score.'&exercise_id='.$exercise_id.'">
'.Display::return_icon('excel.gif').'
&nbsp;'.get_lang('ExportAsXLS').'</a><br /><br />';
}
echo '</div>';
@ -120,12 +127,12 @@ if (!$export_to_csv) {
$main_result = array();
$session_id = 0;
$user_list = array();
//Getting course list
foreach($course_list as $current_course ) {
// Getting course list
foreach ($course_list as $current_course ) {
$course_info = api_get_course_info($current_course['code']);
$_course = $course_info;
//Getting LP list
// Getting LP list
$list = new LearnpathList('', $current_course['code'], $session_id);
$lp_list = $list->get_flat_list();
@ -134,7 +141,7 @@ foreach($course_list as $current_course ) {
foreach ($lp_list as $lp_id =>$lp) {
$exercise_list = Event::get_all_exercises_from_lp($lp_id, $course_info['real_id']);
$attempt_result = array();
//Looping Chamilo Exercises in LP
// Looping Chamilo Exercises in LP
foreach ($exercise_list as $exercise) {
$exercise_stats = Event::get_all_exercise_event_from_lp(
$exercise['path'],

@ -162,7 +162,7 @@ if (isset($_GET['createdir'])) {
?>
<p>
<a href="<?php echo api_get_self(); ?>?path=<?php echo $path; ?>&amp;createdir=1">
<img src="../img/new_folder.gif" border="0" align="absmiddle" alt ="" />
<?php echo Display::return_icon('new_folder.gif'); ?>
<?php echo(get_lang('CreateDir'));?>
</a>
</p>
@ -185,15 +185,15 @@ if (isset($_GET['createdir'])) {
<input type="file" name="user_upload"/>
</td>
</tr>
<tr>
<td><?php echo get_lang('Title');?></td>
<td><input type="text" size="20" name="title" style="width:300px;"></td>
</tr>
<tr>
<td valign="top"><?php echo get_lang('Comment');?></td>
<td><textarea rows="3" cols="20" name="comment" wrap="virtual" style="width:300px;"></textarea></td>
</tr>
<tr>
<tr>
<td><?php echo get_lang('Title');?></td>
<td><input type="text" size="20" name="title" style="width:300px;"></td>
</tr>
<tr>
<td valign="top"><?php echo get_lang('Comment');?></td>
<td><textarea rows="3" cols="20" name="comment" wrap="virtual" style="width:300px;"></textarea></td>
</tr>
<tr>
<td valign="top">
<?php echo get_lang('Options'); ?>
</td>

@ -75,7 +75,7 @@ $div_upload_limit = get_lang('UploadMaxSize').' : '.ini_get('post_max_size');
$form = new FormValidator('upload_ppt', 'POST', '', '');
$form->addElement('header', get_lang("WelcomeOogieSubtitle"));
$form->addElement('html', Display::return_message($message, 'info', false));
$form->addElement('file', 'user_file', array('<img src="../img/powerpoint_big.gif" />', $div_upload_limit));
$form->addElement('file', 'user_file', array(Display::return_icon('powerpoint_big.gif'), $div_upload_limit));
$form->addElement('checkbox', 'take_slide_name', '', get_lang('TakeSlideName'));
if (api_get_setting('search_enabled') == 'true') {
require_once(api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php');

@ -15,7 +15,7 @@ $form_style= '<style>
width: 200px;
}
.convert_button{
background: url("../img/icons/22/learnpath.png") 0px 0px no-repeat;
background: url("'.Display::returnIconPath('learnpath.png').'") 0px 0px no-repeat;
padding: 2px 0px 2px 22px;
}
#dynamic_div_container{float:left;margin-right:10px;}
@ -81,7 +81,6 @@ $interbreadcrumb[]= array ("url"=>"../newscorm/lp_controller.php?action=list", "
$nameTools = get_lang("WoogieConversionPowerPoint");
Display :: display_header($nameTools);
//echo '<img src="../img/mascot.png"><br />';
echo '<span style="color: #5577af; font-size: 16px; font-family: Arial; margin-left: 10px;">'.get_lang("WelcomeWoogieSubtitle").'</span><br>';
$message = get_lang("WelcomeWoogieConverter");
echo '<br />';
@ -149,14 +148,19 @@ $user_file_template =
EOT;
$renderer->setCustomElementTemplate($user_file_template);
$form -> addElement ('file', 'user_file','<img src="../img/word_big.gif" align="absbottom" />');
if (api_get_setting('search_enabled')=='true') {
$form -> addElement ('checkbox', 'index_document','', get_lang('SearchFeatureDoIndexDocument'));
$form -> addElement ('html','<br />');
$form -> addElement ('html', get_lang('SearchFeatureDocumentLanguage').': &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'. api_get_languages_combo());
$form -> addElement ('html','<div class="sub-form">');
$form -> addElement ('file', 'user_file', Display::return_icon('word_big.gif'));
if (api_get_setting('search_enabled') == 'true') {
$form->addElement('checkbox', 'index_document', '', get_lang('SearchFeatureDoIndexDocument'));
$form->addElement('html', '<br />');
$form->addElement(
'html',
get_lang(
'SearchFeatureDocumentLanguage'
).': &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.api_get_languages_combo()
);
$form->addElement('html', '<div class="sub-form">');
foreach ($specific_fields as $specific_field) {
$form -> addElement ('text', $specific_field['code'], $specific_field['name'].' : ');
$form->addElement('text', $specific_field['code'], $specific_field['name'].' : ');
}
$form -> addElement ('html','</div>');
}

@ -746,7 +746,7 @@ function active_filter($active, $urlParams, $row)
/* you cannot lock yourself out otherwise you could disable all the accounts including your own => everybody is
locked out and nobody can change it anymore.*/
if ($row[0] <> $userId) {
$result = '<center><img src="../img/icons/16/'.$image.'.png" border="0" alt="'.get_lang(ucfirst($action)).'" title="'.get_lang(ucfirst($action)).'"/></center>';
$result = '<center><img src="'.Display::returnIconPath($image.'.png', 16).'" border="0" alt="'.get_lang(ucfirst($action)).'" title="'.get_lang(ucfirst($action)).'"/></center>';
}
return $result;
@ -770,10 +770,9 @@ function modify_filter($user_id, $row, $data)
$type = isset($_REQUEST['type']) ? intval($_REQUEST['type']) : STUDENT;
$result = "";
if ($is_allowed_to_track) {
$result .= '<a href="../mySpace/myStudents.php?'.api_get_cidreq().'&student='.$user_id.'&details=true&course='.$_course['id'].'&origin=user_course&id_session='.api_get_session_id().'" title="'.get_lang('Tracking').'" >
<img border="0" alt="'.get_lang('Tracking').'" src="../img/icons/22/stats.png" />
$result .= '<a href="../mySpace/myStudents.php?'.api_get_cidreq().'&student='.$user_id.'&details=true&course='.$_course['id'].'&origin=user_course&id_session='.api_get_session_id().'" title="'.get_lang('Tracking').'">
'.Display::return_icon('stats.png', get_lang('Tracking')).'
</a>';
}

Loading…
Cancel
Save