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 - flint fixes

Browse Source
pull/2585/head
Julio 7 years ago
parent 163b788b0a
commit e6a3ef2940
11 changed files with 27 additions and 31 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. 1
      main/coursecopy/create_backup.php
  2. 2
      main/inc/lib/course.lib.php
  3. 2
      main/inc/lib/exercise.lib.php
  4. 2
      main/inc/lib/plugin.class.php
  5. 2
      main/inc/lib/userportal.lib.php
  6. 8
      main/mySpace/myStudents.php
  7. 4
      main/survey/create_new_survey.php
  8. 1
      plugin/buycourses/lang/english.php
  9. 21
      src/Chamilo/CourseBundle/Component/CourseCopy/CourseBuilder.php
  10. 1
      src/Chamilo/CourseBundle/Component/CourseCopy/CourseRestorer.php
  11. 14
      src/Chamilo/CourseBundle/Component/CourseCopy/CourseSelectForm.php

1
main/coursecopy/create_backup.php
Unescape View File

@ -115,4 +115,3 @@ if (Security::check_token('post') &&
}
Display::display_footer();

2
main/inc/lib/course.lib.php
Unescape View File

@ -4395,7 +4395,7 @@ class CourseManager
$params['title'] = $session_title;
$params['special'] = $special;
if (api_get_setting('display_coursecode_in_courselist') === 'true') {
$params['visual_code'] = '(' . $course_info['visual_code'] . ')';
$params['visual_code'] = '('.$course_info['visual_code'].')';
}
$params['extra'] = '';
$html = $params;

2
main/inc/lib/exercise.lib.php
Unescape View File

@ -2493,7 +2493,7 @@ HOTSPOT;
* @param bool $hidePercentageSign hide "%" sign
* @param string $decimalSeparator
* @param string $thousandSeparator
* @param bool $roundValues This option rounds the float values into a int using ceil()
* @param bool $roundValues This option rounds the float values into a int using ceil()
*
* @return string an html with the score modified
*/

2
main/inc/lib/plugin.class.php
Unescape View File

@ -682,7 +682,7 @@ class Plugin
$subkey .= $userFilter;
break;
}
}
}
$currentUrlId = api_get_current_access_url_id();
$attributes = [

2
main/inc/lib/userportal.lib.php
Unescape View File

@ -592,7 +592,7 @@ class IndexManager
}
$course_details = [];
if (api_get_setting('display_coursecode_in_courselist') == 'true') {
$course_details[] = '('. $course['visual_code'].')';
$course_details[] = '('.$course['visual_code'].')';
}
if (api_get_setting('display_teacher_in_courselist') === 'true') {
if (!empty($course['tutor_name'])) {

8
main/mySpace/myStudents.php
Unescape View File

@ -735,7 +735,7 @@ $userGroups = $userGroupManager->getNameListByUser(
<td align="right">
<?php
echo get_lang('Progress').' ';
Display::display_icon(
Display::display_icon(
'info3.gif',
get_lang('ScormAndLPProgressTotalAverage'),
['align' => 'absmiddle', 'hspace' => '3px']
@ -747,7 +747,7 @@ $userGroups = $userGroupManager->getNameListByUser(
<td align="right">
<?php
echo get_lang('Score').' ';
Display::display_icon(
Display::display_icon(
'info3.gif',
get_lang('ScormAndLPTestTotalAverage'),
['align' => 'absmiddle', 'hspace' => '3px']
@ -799,7 +799,7 @@ $userGroups = $userGroupManager->getNameListByUser(
</tbody>
</table>
<?php if (!empty($userGroups)) {
?>
?>
<table class="table table-striped table-hover">
<thead>
<tr>
@ -817,7 +817,7 @@ $userGroups = $userGroupManager->getNameListByUser(
</tbody>
</table>
<?php
} ?>
} ?>
</div>
</div>
<?php

4
main/survey/create_new_survey.php
Unescape View File

@ -319,8 +319,8 @@ if ($_GET['action'] == 'add') {
$form->addRule('survey_code', '', 'maxlength', 20);
}
$form->addRule('survey_title', get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('start_date', get_lang('InvalidDate'), $allowSurveyAvailabilityDatetime ? 'datetime': 'date');
$form->addRule('end_date', get_lang('InvalidDate'), $allowSurveyAvailabilityDatetime ? 'datetime': 'date');
$form->addRule('start_date', get_lang('InvalidDate'), $allowSurveyAvailabilityDatetime ? 'datetime' : 'date');
$form->addRule('end_date', get_lang('InvalidDate'), $allowSurveyAvailabilityDatetime ? 'datetime' : 'date');
$form->addRule(
['start_date', 'end_date'],
get_lang('StartDateShouldBeBeforeEndDate'),

1
plugin/buycourses/lang/english.php
Unescape View File

@ -160,4 +160,3 @@ $strings['BoughtBy'] = "BoughtBy";
$strings['PurchaserUser'] = "Purchaser user";
$strings['Pending'] = "Pending";
$strings['Names'] = "Names";

21
src/Chamilo/CourseBundle/Component/CourseCopy/CourseBuilder.php
Unescape View File

@ -157,10 +157,10 @@ class CourseBuilder
*
* @param int $session_id
* @param string $courseCode
* @param bool $withBaseContent true if you want to get the elements that exists in the course and
* in the session, (session_id = 0 or session_id = X)
* @param array $parseOnlyToolList
* @param array $toolsFromPost
* @param bool $withBaseContent true if you want to get the elements that exists in the course and
* in the session, (session_id = 0 or session_id = X)
* @param array $parseOnlyToolList
* @param array $toolsFromPost
*
* @return Course The course object structure
*/
@ -665,10 +665,10 @@ class CourseBuilder
/**
* Build the Quizzes.
*
* @param int $session_id Internal session ID
* @param int $courseId Internal course ID
* @param bool $withBaseContent Whether to include content from the course without session or not
* @param array $idList If you want to restrict the structure to only the given IDs
* @param int $session_id Internal session ID
* @param int $courseId Internal course ID
* @param bool $withBaseContent Whether to include content from the course without session or not
* @param array $idList If you want to restrict the structure to only the given IDs
* @param bool $buildOrphanQuestions
*/
public function build_quizzes(
@ -754,10 +754,9 @@ class CourseBuilder
/**
* Build the Quiz-Questions.
*
* @param int $courseId Internal course ID
* @param int $courseId Internal course ID
* @param array $questionList
* @param bool $buildOrphanQuestions
*
*/
public function build_quiz_questions($courseId = 0, $questionList = [], $buildOrphanQuestions = true)
{
@ -923,7 +922,7 @@ class CourseBuilder
/**
* @deprecated
* Build the orphan questions.
* Build the orphan questions
*/
public function build_quiz_orphan_questions()
{

1
src/Chamilo/CourseBundle/Component/CourseCopy/CourseRestorer.php
Unescape View File

@ -1909,7 +1909,6 @@ class CourseRestorer
Database::query($sql);
}
}
}
}
}

14
src/Chamilo/CourseBundle/Component/CourseCopy/CourseSelectForm.php
Unescape View File

@ -48,13 +48,14 @@ class CourseSelectForm
return $list;
}
/**
* Display the form.
*
* @param array $course
* @param array $hidden_fields hidden fields to add to the form
* @param bool $avoidSerialize the document array will be serialize.
* This is used in the course_copy.php file
* @param array $hidden_fields hidden fields to add to the form
* @param bool $avoidSerialize the document array will be serialize.
* This is used in the course_copy.php file
* @param bool $avoidCourseInForm
*/
public static function display_form(
@ -63,8 +64,7 @@ class CourseSelectForm
$avoidSerialize = false,
$avoidCourseInForm = false
) {
global $charset;
?>
global $charset; ?>
<script>
function exp(item) {
el = document.getElementById('div_'+item);
@ -486,8 +486,8 @@ class CourseSelectForm
/**
* Get the posted course.
*
* @param string $from who calls the function?
* It can be copy_course, create_backup, import_backup or recycle_course
* @param string $from who calls the function?
* It can be copy_course, create_backup, import_backup or recycle_course
* @param int $session_id
* @param string $course_code
* @param Course $postedCourse

Write Preview
Loading…
Cancel
Save