Minor - Code indentation - refs #7218

1.9.x
Yannick Warnier 12 years ago
parent 13a5fbc5b7
commit 8b10f6d1c9
  1. 369
      main/inc/introductionSection.inc.php

@ -22,7 +22,7 @@
* @package chamilo.include
*/
/* Constants and variables */
/* Constants and variables */
$TBL_INTRODUCTION = Database::get_course_table(TABLE_TOOL_INTRO);
$intro_editAllowed = $is_allowed_to_edit;
@ -52,6 +52,7 @@ $height = '300';
// The global variable $fck_attribute has been deprecated. It stays here for supporting old external code.
global $fck_attribute;
if (is_array($fck_attribute)) {
if (isset($fck_attribute['ToolbarSet'])) {
$toolbar_set = $fck_attribute['ToolbarSet'];
@ -145,167 +146,182 @@ if (!empty($session_id)) {
/* Determines the correct display */
if ($intro_cmdEdit || $intro_cmdAdd) {
$intro_dispDefault = false;
$intro_dispForm = true;
$intro_dispCommand = false;
$intro_dispDefault = false;
$intro_dispForm = true;
$intro_dispCommand = false;
} else {
$intro_dispDefault = true;
$intro_dispForm = false;
if ($intro_editAllowed) {
$intro_dispCommand = true;
} else {
$intro_dispCommand = false;
}
$intro_dispDefault = true;
$intro_dispForm = false;
if ($intro_editAllowed) {
$intro_dispCommand = true;
} else {
$intro_dispCommand = false;
}
}
/* Executes the display */
// display thematic advance inside a postit
if ($intro_dispForm) {
$default['intro_content'] = $intro_content;
$form->setDefaults($default);
$introduction_section .= '<div id="courseintro" style="width: 98%">';
$introduction_section .= $form->return_form();
$introduction_section .= '</div>';
$default['intro_content'] = $intro_content;
$form->setDefaults($default);
$introduction_section .= '<div id="courseintro" style="width: 98%">';
$introduction_section .= $form->return_form();
$introduction_section .= '</div>';
}
$thematic_description_html = '';
if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {
$thematic = new Thematic();
$thematic = new Thematic();
$displayMode = api_get_course_setting('display_info_advance_inside_homecourse');
if ($displayMode == '1') {
//$information_title = get_lang('InfoAboutLastDoneAdvance');
$last_done_advance = $thematic->get_last_done_thematic_advance();
$thematic_advance_info = $thematic->get_thematic_advance_list($last_done_advance);
if ($displayMode == '1') {
//$information_title = get_lang('InfoAboutLastDoneAdvance');
$last_done_advance = $thematic->get_last_done_thematic_advance();
$thematic_advance_info = $thematic->get_thematic_advance_list($last_done_advance);
$subTitle1 = get_lang('CurrentTopic');
} else if($displayMode == '2') {
} else if($displayMode == '2') {
//$information_title = get_lang('InfoAboutNextAdvanceNotDone');
$last_done_advance = $thematic->get_next_thematic_advance_not_done();
$next_advance_not_done = $thematic->get_next_thematic_advance_not_done(2);
$thematic_advance_info = $thematic->get_thematic_advance_list($last_done_advance);
$next_advance_not_done = $thematic->get_next_thematic_advance_not_done(2);
$thematic_advance_info = $thematic->get_thematic_advance_list($last_done_advance);
$thematic_advance_info2 = $thematic->get_thematic_advance_list($next_advance_not_done);
$subTitle1 = $subTitle2 = get_lang('NextTopic');
} else if($displayMode == '3') {
//$information_title = get_lang('InfoAboutLastDoneAdvanceAndNextAdvanceNotDone');
$last_done_advance = $thematic->get_last_done_thematic_advance();
$next_advance_not_done = $thematic->get_next_thematic_advance_not_done();
$thematic_advance_info = $thematic->get_thematic_advance_list($last_done_advance);
$thematic_advance_info2 = $thematic->get_thematic_advance_list($next_advance_not_done);
} else if($displayMode == '3') {
//$information_title = get_lang('InfoAboutLastDoneAdvanceAndNextAdvanceNotDone');
$last_done_advance = $thematic->get_last_done_thematic_advance();
$next_advance_not_done = $thematic->get_next_thematic_advance_not_done();
$thematic_advance_info = $thematic->get_thematic_advance_list($last_done_advance);
$thematic_advance_info2 = $thematic->get_thematic_advance_list($next_advance_not_done);
$subTitle1 = get_lang('CurrentTopic');
$subTitle2 = get_lang('NextTopic');
}
if (!empty($thematic_advance_info)) {
/*$thematic_advance = get_lang('CourseThematicAdvance').'&nbsp;'.$thematic->get_total_average_of_thematic_advances().'%';*/
$thematic_advance = get_lang('CourseThematicAdvance');
$thematicScore = $thematic->get_total_average_of_thematic_advances().'%';
$thematicUrl = api_get_path(WEB_CODE_PATH).'course_progress/index.php?action=thematic_details&'.api_get_cidreq();
if (api_is_allowed_to_edit(null, true)) {
//$thematic_advance = '<a href="'.api_get_path(WEB_CODE_PATH).'course_progress/index.php?action=thematic_details&'.api_get_cidreq().'">'.get_lang('CourseThematicAdvance').'&nbsp;'.$thematic->get_total_average_of_thematic_advances().'%</a>';
}
$thematic_info = $thematic->get_thematic_list($thematic_advance_info['thematic_id']);
$thematic_advance_info['start_date'] = api_get_local_time($thematic_advance_info['start_date']);
$thematic_advance_info['start_date'] = api_format_date($thematic_advance_info['start_date'], DATE_TIME_FORMAT_LONG);
$userInfo = $_SESSION['_user'];
$courseInfo = api_get_course_info();
//die('<pre>'.print_r($courseInfo,1).'</pre>');
$thematic_description_html = '<div class="thematic-postit">
<div class="row-fluid"><div class="span12">
<div class="accordion" id="progress-bar-course">
<div class="accordion-group">
<div class="accordion-heading">
<div class="title-accordion">
<div class="row-fluid score-thematic">
<div class="span8">';
$thematic_description_html.='<div class="span6 name-student"><h2>'.$userInfo['firstName'].'</h2><h3>'.$userInfo['lastName'].'</h3></div>
<div class="span2 score"><h1>'.$thematicScore.'</h1></div>
<div class="span4"><h3>'.$thematic_advance.'</h3><p>'.$courseInfo['name'].'</p></div></div>';
$thematic_description_html.='<div class="span4">
<a id="thematic-hidden" class="btn btn-small btn-primary accordion-toggle btn-show-thematic" href="#pross" data-toggle="collapse" data-parent="#progress-bar-course">
'.get_lang('SeeDetail').'
</a>
<a id="thematic-show" class="btn btn-small accordion-toggle btn-hidden-thematic" href="#pross" data-toggle="collapse" data-parent="#progress-bar-course" style="display:none;">
'.get_lang('Hide').'
</a>
</div>
</div>
</div>
</div>';
$thematic_description_html.='<div class="accordion-body collapse in" id="pross" style="height:auto;">
<div class="accordion-inner">
<div class="row-fluid">
<div class="span4">
<div class="row-fluid">
<div class="span4">
<div class="thumbnail">
<img src="'.$userInfo['avatar'].'" class="img-polaroid">
</div>
</div>
<div class="span8">
<div class="info-progress">
<div class="tittle-score">'.$thematic_advance.'&nbsp;'.$thematicScore.'</div>
<div class="progress progress-striped">
<div class="bar" style="width: '.$thematicScore.';"></div>
</div>
<a href="'.$thematicUrl.'" class="btn btn-info">'.get_lang('ShowFullCourseAdvance').'</a>
</div>
</div>
</div>
</div>';
$thematic_description_html.='<div class="span8">
<div class="row-fluid">';
$thematic_description_html.='<div class="span6 items-progress">
<div class="topics">'.$subTitle1.'</div>
<p class="title_topics">'.$thematic_info['title'].'</p>
<p class="date">'.$thematic_advance_info['start_date'].'</p>
<h3 class="title">'.$thematic_advance_info['content'].'</h3>
<p class="time">'.get_lang('DurationInHours').' : '.$thematic_advance_info['duration'].' - <a href="'.$thematicUrl.'">'.get_lang('SeeDetail').'</a></p>
</div>';
/*$thematic_description_html = '<div class="thematic-postit">
<div class="thematic-postit-top"><h3><a class="thematic-postit-head" style="" href="#"> '.$thematic_advance.'</h3></a></div>
<div class="thematic-postit-center" style="display:none">';
$thematic_description_html .= '<div><strong>'.$thematic_info['title'].'</strong></div>';
$thematic_description_html .= '<div style="font-size:8pt;"><strong>'.$thematic_advance_info['start_date'].'</strong></div>';
$thematic_description_html .= '<div>'.$thematic_advance_info['content'].'</div>';
$thematic_description_html .= '<div>'.get_lang('DurationInHours').' : '.$thematic_advance_info['duration'].'</div>';
*/
if (!empty($thematic_advance_info2)){
$thematic_info2 = $thematic->get_thematic_list($thematic_advance_info2['thematic_id']);
$thematic_advance_info2['start_date'] = api_get_local_time($thematic_advance_info2['start_date']);
$thematic_advance_info2['start_date'] = api_format_date($thematic_advance_info2['start_date'], DATE_TIME_FORMAT_LONG);
$thematic_description_html.='<div class="span6 items-progress">
<div class="topics">'.$subTitle2.'</div>
<p class="title_topics">'.$thematic_info['title'].'</p>
<p class="date">'.$thematic_advance_info2['start_date'].'</p>
<h3 class="title">'.$thematic_advance_info2['content'].'</h3>
<p class="time">'.get_lang('DurationInHours').' : '.$thematic_advance_info2['duration'].' - <a href="'.$thematicUrl.'">'.get_lang('SeeDetail').'</a></p>
</div>';
/*$thematic_description_html .= '<div><strong>'.$thematic_info2['title'].'</strong></div>';
$thematic_description_html .= '<div style="font-size:8pt;"><strong>'.$thematic_advance_info2['start_date'].'</strong></div>';
$thematic_description_html .= '<div>'.$thematic_advance_info2['content'].'</div>';
$thematic_description_html .= '<div>'.get_lang('DurationInHours').' : '.$thematic_advance_info2['duration'].'</div>';
$thematic_description_html .= '<br />';*/
}
$thematic_description_html.='</div></div></div></div></div></div></div></div></div></div>';
/*$thematic_description_html .= '</div>
<div class="thematic-postit-bottom"></div>
</div>';*/
}
if (!empty($thematic_advance_info)) {
/*$thematic_advance = get_lang('CourseThematicAdvance').'&nbsp;'.$thematic->get_total_average_of_thematic_advances().'%';*/
$thematic_advance = get_lang('CourseThematicAdvance');
$thematicScore = $thematic->get_total_average_of_thematic_advances(
) . '%';
$thematicUrl = api_get_path(
WEB_CODE_PATH
) . 'course_progress/index.php?action=thematic_details&' . api_get_cidreq(
);
if (api_is_allowed_to_edit(null, true)) {
//$thematic_advance = '<a href="'.api_get_path(WEB_CODE_PATH).'course_progress/index.php?action=thematic_details&'.api_get_cidreq().'">'.get_lang('CourseThematicAdvance').'&nbsp;'.$thematic->get_total_average_of_thematic_advances().'%</a>';
}
$thematic_info = $thematic->get_thematic_list(
$thematic_advance_info['thematic_id']
);
$thematic_advance_info['start_date'] = api_get_local_time(
$thematic_advance_info['start_date']
);
$thematic_advance_info['start_date'] = api_format_date(
$thematic_advance_info['start_date'],
DATE_TIME_FORMAT_LONG
);
$userInfo = $_SESSION['_user'];
$courseInfo = api_get_course_info();
//die('<pre>'.print_r($courseInfo,1).'</pre>');
$thematic_description_html =
'<div class="thematic-postit">
<div class="row-fluid"><div class="span12">
<div class="accordion" id="progress-bar-course">
<div class="accordion-group">
<div class="accordion-heading">
<div class="title-accordion">
<div class="row-fluid score-thematic">
<div class="span8">';
$thematic_description_html .=
'<div class="span6 name-student">
<h2>' . $userInfo['firstName'] . '</h2>
<h3>' . $userInfo['lastName'] . '</h3>
</div>
<div class="span2 score">
<h1>' . $thematicScore . '</h1>
</div>
<div class="span4">
<h3>' . $thematic_advance . '</h3>
<p>' . $courseInfo['name'] . '</p>
</div>
</div>';
$thematic_description_html .=
'<div class="span4">
<a id="thematic-hidden" class="btn btn-small btn-primary accordion-toggle btn-show-thematic" href="#pross" data-toggle="collapse" data-parent="#progress-bar-course">
' . get_lang('SeeDetail') . '
</a>
<a id="thematic-show" class="btn btn-small accordion-toggle btn-hidden-thematic" href="#pross" data-toggle="collapse" data-parent="#progress-bar-course" style="display:none;">
' . get_lang('Hide') . '
</a>
</div>
</div>
</div>
</div>';
$thematic_description_html .=
'<div class="accordion-body collapse in" id="pross" style="height:auto;">
<div class="accordion-inner">
<div class="row-fluid">
<div class="span4">
<div class="row-fluid">
<div class="span4">
<div class="thumbnail">
<img src="' . $userInfo['avatar'] . '" class="img-polaroid">
</div>
</div>
<div class="span8">
<div class="info-progress">
<div class="tittle-score">' . $thematic_advance . '&nbsp;' . $thematicScore .'
</div>
<div class="progress progress-striped">
<div class="bar" style="width: ' . $thematicScore . ';"></div>
</div>
<a href="' . $thematicUrl . '" class="btn btn-info">' . get_lang('ShowFullCourseAdvance') . '</a>
</div>
</div>
</div>
</div>';
$thematic_description_html .=
'<div class="span8">
<div class="row-fluid">';
$thematic_description_html .=
'<div class="span6 items-progress">
<div class="topics">' . $subTitle1 . '</div>
<p class="title_topics">' . $thematic_info['title'] . '</p>
<p class="date">' . $thematic_advance_info['start_date'] . '</p>
<h3 class="title">' . $thematic_advance_info['content'] . '</h3>
<p class="time">' . get_lang('DurationInHours') . ' : ' . $thematic_advance_info['duration'] . ' - <a href="' . $thematicUrl . '">' . get_lang('SeeDetail') . '</a></p>
</div>';
if (!empty($thematic_advance_info2)) {
$thematic_info2 = $thematic->get_thematic_list($thematic_advance_info2['thematic_id']);
$thematic_advance_info2['start_date'] = api_get_local_time($thematic_advance_info2['start_date']);
$thematic_advance_info2['start_date'] = api_format_date($thematic_advance_info2['start_date'], DATE_TIME_FORMAT_LONG);
$thematic_description_html .=
'<div class="span6 items-progress">
<div class="topics">'.$subTitle2.'</div>
<p class="title_topics">'.$thematic_info['title'].'</p>
<p class="date">'.$thematic_advance_info2['start_date'].'</p>
<h3 class="title">'.$thematic_advance_info2['content'].'</h3>
<p class="time">'.get_lang('DurationInHours').' : '.$thematic_advance_info2['duration'].' - <a href="'.$thematicUrl.'">'.get_lang('SeeDetail').'</a></p>
</div>';
}
$thematic_description_html.=
'</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>';
}
}
$introduction_section .= '<div class="row course-tools-intro"><div class="span12">';
@ -313,48 +329,65 @@ $introduction_section .= $thematic_description_html;
$introduction_section .= '</div>';
$introduction_section .= '<div class="home-course-intro span12"><div class="page-course">';
if ($intro_dispDefault) {
$intro_content = $intro_content;
$intro_content = $intro_content;
if (!empty($intro_content)) {
$introduction_section.='<div class="page-course-intro">';
$introduction_section .= $intro_content;
$introduction_section.='</div>';
}
if (!empty($intro_content)) {
$introduction_section.='<div class="page-course-intro">';
$introduction_section .= $intro_content;
$introduction_section.='</div>';
}
}
$introduction_section .= '</div></div>';
if ($intro_dispCommand) {
if (empty($intro_content)) {
// Displays "Add intro" commands
$introduction_section .= '<div id="courseintro_empty">';
if (!empty ($GLOBALS['_cid'])) {
$introduction_section .= "<a href=\"".api_get_self()."?".api_get_cidreq()."&amp;intro_cmdAdd=1\">";
if (empty($intro_content)) {
// Displays "Add intro" commands
$introduction_section .= '<div id="courseintro_empty">';
if (!empty ($GLOBALS['_cid'])) {
$introduction_section .= "<a href=\"".api_get_self()."?".api_get_cidreq()."&amp;intro_cmdAdd=1\">";
$introduction_section .= Display::return_icon('introduction_add.gif', get_lang('AddIntro')).' ';
$introduction_section .= "</a>";
} else {
$introduction_section .= "<a href=\"".api_get_self()."?intro_cmdAdd=1\">\n".get_lang('AddIntro')."</a>";
}
$introduction_section .= "</div>";
} else {
// Displays "edit intro && delete intro" commands
$introduction_section .= '<div id="courseintro_empty">';
if (!empty ($GLOBALS['_cid'])) {
$introduction_section .= "<a href=\"".api_get_self()."?".api_get_cidreq()."&amp;intro_cmdEdit=1\">".Display::return_icon('edit.png',get_lang('Modify'),'',ICON_SIZE_SMALL)."</a>";
$introduction_section .= "<a href=\"".api_get_self()."?".api_get_cidreq()."&amp;intro_cmdDel=1\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset))."')) return false;\">".Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL)."</a>";
} else {
$introduction_section .= "<a href=\"".api_get_self()."?intro_cmdEdit=1\">".Display::return_icon('edit.png',get_lang('Modify'),'',ICON_SIZE_SMALL)."</a>";
$introduction_section .= "<a href=\"".api_get_self()."?intro_cmdDel=1\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset))."')) return false;\">".Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL)."</a>";
}
$introduction_section .= "</div>";
$introduction_section .= "</a>";
} else {
$introduction_section .= "<a href=\"".api_get_self()."?intro_cmdAdd=1\">\n".get_lang('AddIntro')."</a>";
}
$introduction_section .= "</div>";
} else {
// Displays "edit intro && delete intro" commands
$introduction_section .= '<div id="courseintro_empty">';
if (!empty ($GLOBALS['_cid'])) {
$introduction_section .=
"<a href=\"".api_get_self()."?".api_get_cidreq()."&amp;intro_cmdEdit=1\">".
Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).
"</a>";
$introduction_section .=
"<a href=\"".api_get_self()."?".api_get_cidreq()."&amp;intro_cmdDel=1\" onclick=\"javascript:
if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)).
"')) return false;\">".
Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).
"</a>";
} else {
$introduction_section .=
"<a href=\"".api_get_self()."?intro_cmdEdit=1\">".
Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).
"</a>";
$introduction_section .=
"<a href=\"".api_get_self()."?intro_cmdDel=1\" onclick=\"javascript:
if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)).
"')) return false;\">".
Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).
"</a>";
}
$introduction_section .= "</div>";
// Fix for chrome XSS filter for videos in iframes - BT#7930
$browser = api_get_navigator();
if (strpos($introduction_section, '<iframe') !== false && $browser['name'] == 'Chrome') {
header('X-XSS-Protection: 0');
}
}
}
}
$introduction_section .= '</div>';

Loading…
Cancel
Save