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 - fix lang variables + format code

Browse Source
pull/3064/head
Julio 5 years ago
parent f345dd4462
commit 90bf4c3aa9
4 changed files with 71 additions and 71 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. 4
      public/main/admin/index.php
  2. 114
      public/main/exercise/exercise.class.php
  3. 2
      src/CoreBundle/Controller/Admin/AdminController.php
  4. 22
      src/CoreBundle/Menu/NavBuilder.php

4
public/main/admin/index.php
Unescape View File

@ -171,7 +171,7 @@ if (api_is_platform_admin()) {
$items[] = ['url' => 'course_export.php', 'label' => get_lang('Export courses')];
$items[] = ['url' => 'course_import.php', 'label' => get_lang('Import courses list')];
$items[] = ['url' => 'course_category.php', 'label' => get_lang('Courses categories')];
$items[] = ['url' => 'subscribe_user2course.php', 'label' => get_lang('Add a userToACourse')];
$items[] = ['url' => 'subscribe_user2course.php', 'label' => get_lang('Add a user to a course')];
$items[] = ['url' => 'course_user_import.php', 'label' => get_lang('Import users list')];
if (api_get_setting('gradebook_enable_grade_model') == 'true') {
@ -215,7 +215,7 @@ if (api_is_platform_admin()) {
name="keyword"
value=""
aria-label="'.get_lang('Search').'">
</div>
<button class="btn btn-primary mb-2" type="submit">
<em class="fa fa-search"></em> '.get_lang('Search').'

114
public/main/exercise/exercise.class.php
Unescape View File

@ -171,7 +171,7 @@ class Exercise
return false;
}
$sql = "SELECT * FROM $table
$sql = "SELECT * FROM $table
WHERE c_id = ".$this->course_id." AND id = ".$id;
$result = Database::query($sql);
@ -224,7 +224,7 @@ class Exercise
$sql = "SELECT lp_id, max_score
FROM $tableLpItem
WHERE
WHERE
c_id = {$this->course_id} AND
item_type = '".TOOL_QUIZ."' AND
path = '".$id."'";
@ -656,7 +656,7 @@ class Exercise
$TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION);
$sql = "SELECT q.iid
FROM $TBL_EXERCICE_QUESTION e
FROM $TBL_EXERCICE_QUESTION e
INNER JOIN $TBL_QUESTIONS q
ON (e.question_id = q.id AND e.c_id = ".$this->course_id." )
WHERE e.exercice_id = '".$this->id."' ";
@ -755,11 +755,11 @@ class Exercise
$TBL_EXERCICE_QUESTION = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION);
$TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION);
$sql = "SELECT count(q.id) as count
FROM $TBL_EXERCICE_QUESTION e
FROM $TBL_EXERCICE_QUESTION e
INNER JOIN $TBL_QUESTIONS q
ON (e.question_id = q.id AND e.c_id = q.c_id)
WHERE
e.c_id = {$this->course_id} AND
WHERE
e.c_id = {$this->course_id} AND
e.exercice_id = ".$this->id;
$result = Database::query($sql);
@ -786,11 +786,11 @@ class Exercise
// Getting question list from the order (question list drag n drop interface ).
$sql = "SELECT e.question_id
FROM $exerciseQuestionTable e
FROM $exerciseQuestionTable e
INNER JOIN $questionTable q
ON (e.question_id= q.id AND e.c_id = q.c_id)
WHERE
e.c_id = {$this->course_id} AND
WHERE
e.c_id = {$this->course_id} AND
e.exercice_id = '".$this->id."'
ORDER BY q.question";
$result = Database::query($sql);
@ -1144,11 +1144,11 @@ class Exercise
}
$sql = "SELECT e.question_id
FROM $quizRelQuestion e
FROM $quizRelQuestion e
INNER JOIN $question q
ON (e.question_id= q.id AND e.c_id = q.c_id)
WHERE
e.c_id = {$this->course_id} AND
WHERE
e.c_id = {$this->course_id} AND
e.exercice_id = '".Database::escape_string($this->id)."'
$randomLimit ";
$result = Database::query($sql);
@ -1193,12 +1193,12 @@ class Exercise
$TBL_EXERCICE_QUESTION = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION);
$TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION);
$sql = "SELECT q.id
FROM $TBL_EXERCICE_QUESTION e
FROM $TBL_EXERCICE_QUESTION e
INNER JOIN $TBL_QUESTIONS q
ON (e.question_id = q.id AND e.c_id = q.c_id)
WHERE
WHERE
q.id = $questionId AND
e.c_id = {$this->course_id} AND
e.c_id = {$this->course_id} AND
e.exercice_id = ".$this->id;
$result = Database::query($sql);
@ -1395,8 +1395,8 @@ class Exercise
if (@move_uploaded_file($sound['tmp_name'], $audioPath.'/'.$this->sound)) {
$sql = "SELECT 1 FROM $TBL_DOCUMENT
WHERE
c_id = ".$this->course_id." AND
WHERE
c_id = ".$this->course_id." AND
path = '".str_replace($documentPath, '', $audioPath).'/'.$this->sound."'";
$result = Database::query($sql);
@ -2625,10 +2625,10 @@ class Exercise
if ($form->getSubmitValue('update_title_in_lps') == 1) {
$courseId = api_get_course_int_id();
$table = Database::get_course_table(TABLE_LP_ITEM);
$sql = "SELECT * FROM $table
WHERE
c_id = $courseId AND
item_type = 'quiz' AND
$sql = "SELECT * FROM $table
WHERE
c_id = $courseId AND
item_type = 'quiz' AND
path = '".$this->id."'
";
$result = Database::query($sql);
@ -2636,7 +2636,7 @@ class Exercise
if (!empty($items)) {
foreach ($items as $item) {
$itemId = $item['iid'];
$sql = "UPDATE $table SET title = '".$this->title."'
$sql = "UPDATE $table SET title = '".$this->title."'
WHERE iid = $itemId AND c_id = $courseId ";
Database::query($sql);
}
@ -2792,7 +2792,7 @@ class Exercise
$course_id = api_get_course_id();
$tbl_se_ref = Database::get_main_table(TABLE_MAIN_SEARCH_ENGINE_REF);
$sql = 'SELECT * FROM %s
WHERE course_code=\'%s\' AND tool_id=\'%s\' AND ref_id_high_level=%s AND ref_id_second_level IS NULL
WHERE course_code=\'%s\' AND tool_id=\'%s\' AND ref_id_high_level=%s AND ref_id_second_level IS NULL
LIMIT 1';
$sql = sprintf($sql, $tbl_se_ref, $course_id, TOOL_QUIZ, $this->id);
$res = Database::query($sql);
@ -2815,8 +2815,8 @@ class Exercise
}
}
}
$sql = 'DELETE FROM %s
WHERE course_code=\'%s\' AND tool_id=\'%s\' AND ref_id_high_level=%s AND ref_id_second_level IS NULL
$sql = 'DELETE FROM %s
WHERE course_code=\'%s\' AND tool_id=\'%s\' AND ref_id_high_level=%s AND ref_id_second_level IS NULL
LIMIT 1';
$sql = sprintf($sql, $tbl_se_ref, $course_id, TOOL_QUIZ, $this->id);
Database::query($sql);
@ -2894,9 +2894,9 @@ class Exercise
// delete TRACK_E_EXERCISES table
$sql = "DELETE FROM $table_track_e_exercises
WHERE
c_id = ".api_get_course_int_id()." AND
exe_exo_id = ".$this->id." $sql_where AND
WHERE
c_id = ".api_get_course_int_id()." AND
exe_exo_id = ".$this->id." $sql_where AND
session_id = ".$sessionId;
Database::query($sql);
@ -3273,16 +3273,16 @@ class Exercise
close: function() {
window.location.href = '$url';
}
});
});
$('#clock_warning').dialog('open');
$('#counter_to_redirect').epiclock({
mode: $.epiclock.modes.countdown,
offset: {seconds: 5},
format: 's'
}).bind('timer', function () {
window.location.href = '$url';
}).bind('timer', function () {
window.location.href = '$url';
});
}
}
function onExpiredTimeExercise() {
$('#wrapper-clock').hide();
@ -3300,7 +3300,7 @@ class Exercise
offset: {seconds: time_left},
format: 'x:i:s',
renderer: 'minute'
}).bind('timer', function () {
}).bind('timer', function () {
onExpiredTimeExercise();
});
$('#submit_save').click(function () {});
@ -3340,7 +3340,7 @@ class Exercise
send_form();
}
});
$('#clock_warning').dialog('open');
$('#counter_to_redirect').epiclock({
mode: $.epiclock.modes.countdown,
@ -3670,9 +3670,9 @@ class Exercise
if ($from_database) {
$choice = [];
$choiceDegreeCertainty = [];
$sql = "SELECT answer
$sql = "SELECT answer
FROM $TBL_TRACK_ATTEMPT
WHERE
WHERE
exe_id = $exeId AND question_id = $questionId";
$result = Database::query($sql);
@ -4235,8 +4235,8 @@ class Exercise
case FREE_ANSWER:
if ($from_database) {
$sql = "SELECT answer, marks FROM $TBL_TRACK_ATTEMPT
WHERE
exe_id = $exeId AND
WHERE
exe_id = $exeId AND
question_id= ".$questionId;
$result = Database::query($sql);
$data = Database::fetch_array($result);
@ -4267,10 +4267,10 @@ class Exercise
break;
case ORAL_EXPRESSION:
if ($from_database) {
$query = "SELECT answer, marks
$query = "SELECT answer, marks
FROM $TBL_TRACK_ATTEMPT
WHERE
exe_id = $exeId AND
WHERE
exe_id = $exeId AND
question_id = $questionId
";
$resq = Database::query($query);
@ -4709,10 +4709,10 @@ class Exercise
break;
case ANNOTATION:
if ($from_database) {
$sql = "SELECT answer, marks
$sql = "SELECT answer, marks
FROM $TBL_TRACK_ATTEMPT
WHERE
exe_id = $exeId AND
WHERE
exe_id = $exeId AND
question_id = $questionId ";
$resq = Database::query($sql);
$data = Database::fetch_array($resq);
@ -6399,9 +6399,9 @@ class Exercise
{
$TBL_LP_ITEM = Database::get_course_table(TABLE_LP_ITEM);
$sql = "SELECT max_score FROM $TBL_LP_ITEM
WHERE
c_id = {$this->course_id} AND
item_type = '".TOOL_QUIZ."' AND
WHERE
c_id = {$this->course_id} AND
item_type = '".TOOL_QUIZ."' AND
path = '{$this->id}'";
$result = Database::query($sql);
if (Database::num_rows($result) > 0) {
@ -6744,8 +6744,8 @@ class Exercise
if (empty($exeId)) {
return false;
}
$sql = "UPDATE $table
SET questions_to_check = ''
$sql = "UPDATE $table
SET questions_to_check = ''
WHERE exe_id = $exeId ";
Database::query($sql);
@ -6769,8 +6769,8 @@ class Exercise
$questionListToString = Database::escape_string($questionListToString);
$table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
$sql = "UPDATE $table
SET questions_to_check = '$questionListToString'
$sql = "UPDATE $table
SET questions_to_check = '$questionListToString'
WHERE exe_id = $exeId";
Database::query($sql);
@ -6791,8 +6791,8 @@ class Exercise
if ($exercise_info) {
if (empty($exercise_info['questions_to_check'])) {
if ($action == 'add') {
$sql = "UPDATE $track_exercises
SET questions_to_check = '$question_id'
$sql = "UPDATE $track_exercises
SET questions_to_check = '$question_id'
WHERE exe_id = $exe_id ";
Database::query($sql);
}
@ -6829,8 +6829,8 @@ class Exercise
}
}
$value = Database::escape_string($remind_list_string);
$sql = "UPDATE $track_exercises
SET questions_to_check = '$value'
$sql = "UPDATE $track_exercises
SET questions_to_check = '$value'
WHERE exe_id = $exe_id ";
Database::query($sql);
}
@ -8136,7 +8136,7 @@ class Exercise
public function cleanCourseLaunchSettings()
{
$table = Database::get_course_table(TABLE_QUIZ_TEST);
$sql = "UPDATE $table SET autolaunch = 0
$sql = "UPDATE $table SET autolaunch = 0
WHERE c_id = ".$this->course_id." AND session_id = ".$this->sessionId;
Database::query($sql);
}
@ -8259,7 +8259,7 @@ class Exercise
$lpId = $lpId['lp_id'];
}
$sql = "SELECT *
$sql = "SELECT *
FROM $tblStats
WHERE
exe_exo_id = $exerciseId AND

2
src/CoreBundle/Controller/Admin/AdminController.php
Unescape View File

@ -191,7 +191,7 @@ class AdminController extends BaseController
];
$items[] = [
'url' => $adminUrl.'subscribe_user2course.php',
'label' => get_lang('Add a userToACourse'),
'label' => get_lang('Add a user to a course'),
];
$items[] = [
'url' => $adminUrl.'course_user_import.php',

22
src/CoreBundle/Menu/NavBuilder.php
Unescape View File

@ -95,7 +95,7 @@ class NavBuilder implements ContainerAwareInterface
$menu['courses']->addChild(
'courses',
[
'label' => $translator->trans('All my courses'),
'label' => $translator->trans('My courses'),
'route' => 'legacy_main',
'routeParameters' => ['name' => 'index/user_portal.php'],
]
@ -142,7 +142,7 @@ class NavBuilder implements ContainerAwareInterface
if ($checker->isGranted('ROLE_ADMIN')) {
$menu['courses']->addChild(
$translator->trans('Add Session'),
$translator->trans('Create session'),
[
'route' => 'legacy_main',
'routeParameters' => ['name' => 'session/session_add.php'],
@ -181,7 +181,7 @@ class NavBuilder implements ContainerAwareInterface
]
);
$menu['social']->addChild(
/*$menu['social']->addChild(
$translator->trans('My profile'),
[
'route' => 'legacy_main',
@ -194,7 +194,7 @@ class NavBuilder implements ContainerAwareInterface
'route' => 'legacy_main',
'routeParameters' => ['name' => 'social/profile.php'],
]
);
);*/
$menu['social']->addChild(
$translator->trans('Friends'),
[
@ -203,7 +203,7 @@ class NavBuilder implements ContainerAwareInterface
]
);
$menu['social']->addChild(
$translator->trans('Social Groups'),
$translator->trans('Groups'),
[
'route' => 'legacy_main',
'routeParameters' => ['name' => 'social/groups.php'],
@ -251,7 +251,7 @@ class NavBuilder implements ContainerAwareInterface
$menu['administrator']->addChild(
'userlist',
[
'label' => $translator->trans('User list'),
'label' => $translator->trans('Users'),
'route' => 'legacy_main',
'routeParameters' => ['name' => 'admin/user_list.php'],
]
@ -259,7 +259,7 @@ class NavBuilder implements ContainerAwareInterface
$menu['administrator']->addChild(
'courselist',
[
'label' => $translator->trans('Course list'),
'label' => $translator->trans('Courses'),
'route' => 'legacy_main',
'routeParameters' => ['name' => 'admin/course_list.php'],
]
@ -267,19 +267,19 @@ class NavBuilder implements ContainerAwareInterface
$menu['administrator']->addChild(
'sessionlist',
[
'label' => $translator->trans('Session list'),
'label' => $translator->trans('Sessions'),
'route' => 'legacy_main',
'routeParameters' => ['name' => 'session/session_list.php'],
]
);
$menu['administrator']->addChild(
/*$menu['administrator']->addChild(
'languages',
[
'label' => $translator->trans('Languages'),
'route' => 'legacy_main',
'routeParameters' => ['name' => 'admin/languages.php'],
]
);
);*/
$menu['administrator']->addChild(
'plugins',
[
@ -291,7 +291,7 @@ class NavBuilder implements ContainerAwareInterface
$menu['administrator']->addChild(
'settings',
[
'label' => $translator->trans('Advanced settings'),
'label' => $translator->trans('Settings'),
'uri' => $rootWeb.'admin/settings/platform',
]
);

Write Preview
Loading…
Cancel
Save