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 9 years ago
parent a552277873
commit dc3b8cccf9
3 changed files with 9 additions and 17 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. 6
      main/inc/email_editor.php
  2. 5
      main/inc/global_error_message.inc.php
  3. 15
      main/inc/introductionSection.inc.php

6
main/inc/email_editor.php
Unescape View File

@ -1,6 +1,8 @@
<?php <?php
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
use ChamiloSession as Session;
/** /**
* This script contains the code to edit and send an e-mail to one of * This script contains the code to edit and send an e-mail to one of
* the platform's users. * the platform's users.
@ -10,8 +12,6 @@
* @author Julio Montoya <gugli100@gmail.com> Updating form with formvalidator * @author Julio Montoya <gugli100@gmail.com> Updating form with formvalidator
*/ */
use ChamiloSession as Session;
require_once '../inc/global.inc.php'; require_once '../inc/global.inc.php';
if (empty($_user['user_id'])) { if (empty($_user['user_id'])) {
@ -31,12 +31,10 @@ $form->addElement('text', 'email_address', get_lang('EmailDestination'));
$form->addElement('text', 'email_title', get_lang('EmailTitle')); $form->addElement('text', 'email_title', get_lang('EmailTitle'));
$form->freeze('email_address'); $form->freeze('email_address');
$form->addElement('textarea', 'email_text', get_lang('EmailText'), array('rows' => '6')); $form->addElement('textarea', 'email_text', get_lang('EmailText'), array('rows' => '6'));
$form->addRule('email_address', get_lang('ThisFieldIsRequired'), 'required'); $form->addRule('email_address', get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('email_title', get_lang('ThisFieldIsRequired'), 'required'); $form->addRule('email_title', get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('email_text', get_lang('ThisFieldIsRequired'), 'required'); $form->addRule('email_text', get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('email_address', get_lang('EmailWrong'), 'email'); $form->addRule('email_address', get_lang('EmailWrong'), 'email');
$form->addButtonSend(get_lang('SendMail')); $form->addButtonSend(get_lang('SendMail'));
switch ($action) { switch ($action) {

5
main/inc/global_error_message.inc.php
Unescape View File

@ -49,7 +49,6 @@ $TechnicalIssuesTitle = 'Technical issues';
$TechnicalIssuesDescription = 'This portal is currently experiencing technical issues. Please report this to the portal administrator. Thank you for your help.'; $TechnicalIssuesDescription = 'This portal is currently experiencing technical issues. Please report this to the portal administrator. Thank you for your help.';
if (is_int($global_error_code) && $global_error_code > 0) { if (is_int($global_error_code) && $global_error_code > 0) {
if (class_exists('Template') && function_exists('api_get_configuration_value')) { if (class_exists('Template') && function_exists('api_get_configuration_value')) {
$theme = Template::getThemeFallback().'/'; $theme = Template::getThemeFallback().'/';
} else { } else {
@ -58,7 +57,7 @@ if (is_int($global_error_code) && $global_error_code > 0) {
$root_rel = ''; $root_rel = '';
$installation_guide_url = $root_rel.'documentation/installation_guide.html'; $installation_guide_url = $root_rel.'documentation/installation_guide.html';
$css_path = 'app/Resources/public/css/'; $css_path = 'app/Resources/public/css/';
$css_web_assets = 'web/assets/'; $css_web_assets = 'web/assets/';
$css_web_path = 'web/css/'; $css_web_path = 'web/css/';
@ -251,7 +250,7 @@ if (is_int($global_error_code) && $global_error_code > 0) {
</html> </html>
EOM; EOM;
} else { } else {
$global_error_message_page = $global_error_message_page =
<<<EOM <<<EOM
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>

15
main/inc/introductionSection.inc.php
Unescape View File

@ -96,7 +96,6 @@ if ($intro_editAllowed) {
} }
Database::getManager()->persist($toolIntro); Database::getManager()->persist($toolIntro);
Database::getManager()->flush(); Database::getManager()->flush();
Display::addFlash( Display::addFlash(
Display::return_message( Display::return_message(
get_lang('IntroductionTextUpdated'), get_lang('IntroductionTextUpdated'),
@ -164,10 +163,9 @@ if (!empty($session_id)) {
} }
} }
$intro_content = Security::remove_XSS($intro_content); $intro_content = Security::remove_XSS($intro_content, COURSEMANAGER);
/* Determines the correct display */ /* Determines the correct display */
if ($intro_cmdEdit || $intro_cmdAdd) { if ($intro_cmdEdit || $intro_cmdAdd) {
$intro_dispDefault = false; $intro_dispDefault = false;
$intro_dispForm = true; $intro_dispForm = true;
@ -190,7 +188,7 @@ if ($intro_dispForm) {
$default['intro_content'] = $intro_content; $default['intro_content'] = $intro_content;
$form->setDefaults($default); $form->setDefaults($default);
$introduction_section .= '<div id="courseintro" style="width: 98%">'; $introduction_section .= '<div id="courseintro" style="width: 98%">';
$introduction_section .= $form->return_form(); $introduction_section .= $form->returnForm();
$introduction_section .= '</div>'; $introduction_section .= '</div>';
} }
@ -209,7 +207,7 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {
$thematic_advance_info = $thematic->get_thematic_advance_list($last_done_advance); $thematic_advance_info = $thematic->get_thematic_advance_list($last_done_advance);
$subTitle1 = get_lang('CurrentTopic'); $subTitle1 = get_lang('CurrentTopic');
$class1 = ' current'; $class1 = ' current';
} else if($displayMode == '2') { } else if ($displayMode == '2') {
// Show only the two next course progress steps // Show only the two next course progress steps
// $information_title = get_lang('InfoAboutNextAdvanceNotDone'); // $information_title = get_lang('InfoAboutNextAdvanceNotDone');
$last_done_advance = $thematic->get_next_thematic_advance_not_done(); $last_done_advance = $thematic->get_next_thematic_advance_not_done();
@ -217,7 +215,7 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {
$thematic_advance_info = $thematic->get_thematic_advance_list($last_done_advance); $thematic_advance_info = $thematic->get_thematic_advance_list($last_done_advance);
$thematic_advance_info2 = $thematic->get_thematic_advance_list($next_advance_not_done); $thematic_advance_info2 = $thematic->get_thematic_advance_list($next_advance_not_done);
$subTitle1 = $subTitle2 = get_lang('NextTopic'); $subTitle1 = $subTitle2 = get_lang('NextTopic');
} else if($displayMode == '3') { } else if ($displayMode == '3') {
// Show the current and next course progress steps // Show the current and next course progress steps
// $information_title = get_lang('InfoAboutLastDoneAdvanceAndNextAdvanceNotDone'); // $information_title = get_lang('InfoAboutLastDoneAdvanceAndNextAdvanceNotDone');
$last_done_advance = $thematic->get_last_done_thematic_advance(); $last_done_advance = $thematic->get_last_done_thematic_advance();
@ -232,8 +230,7 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {
if (!empty($thematic_advance_info)) { if (!empty($thematic_advance_info)) {
$thematic_advance = get_lang('CourseThematicAdvance'); $thematic_advance = get_lang('CourseThematicAdvance');
$thematicScore = $thematic->get_total_average_of_thematic_advances() . '%'; $thematicScore = $thematic->get_total_average_of_thematic_advances() . '%';
$thematicUrl = api_get_path(WEB_CODE_PATH) . $thematicUrl = api_get_path(WEB_CODE_PATH).'course_progress/index.php?action=thematic_details&'.api_get_cidreq();
'course_progress/index.php?action=thematic_details&'.api_get_cidreq();
$thematic_info = $thematic->get_thematic_list( $thematic_info = $thematic->get_thematic_list(
$thematic_advance_info['thematic_id'] $thematic_advance_info['thematic_id']
); );
@ -283,8 +280,6 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {
</div> </div>
</div>'; </div>';
} }
$thematicPanel = '<div class="row">'; $thematicPanel = '<div class="row">';
$thematicPanel .= '<div class="col-md-2">' . $infoUser . '</div>'; $thematicPanel .= '<div class="col-md-2">' . $infoUser . '</div>';
$thematicPanel .= '<div class="col-md-10"><div class="row">' . $thematicItemOne . $thematicItemTwo . '</div></div>'; $thematicPanel .= '<div class="col-md-10"><div class="row">' . $thematicItemOne . $thematicItemTwo . '</div></div>';

Write Preview
Loading…
Cancel
Save