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

Fix default values

Browse Source
ofaj
jmontoyaa 10 years ago
parent 5b8fd7cf15
commit acc912da77
10 changed files with 39 additions and 24 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. 2
      main/course_info/infocours.php
  2. 9
      main/dropbox/dropbox_class.inc.php
  3. 10
      main/exercice/answer.class.php
  4. 6
      main/forum/forumfunction.inc.php
  5. 3
      main/inc/lib/attendance.lib.php
  6. 4
      main/inc/lib/blog.lib.php
  7. 2
      main/inc/lib/course.lib.php
  8. 2
      main/inc/lib/fileDisplay.lib.php
  9. 7
      main/inc/lib/usermanager.lib.php
  10. 18
      main/wiki/wiki.inc.php

2
main/course_info/infocours.php
Unescape View File

@ -553,7 +553,7 @@ if ($form->validate() && is_settings_editable()) {
'activate_legal'
);
$activeLegal = isset($updateValues['activate_legal']) ? $updateValues['activate_legal'] : '';
$activeLegal = isset($updateValues['activate_legal']) ? $updateValues['activate_legal'] : 0;
$table_course = Database :: get_main_table(TABLE_MAIN_COURSE);
$params = [

9
main/dropbox/dropbox_class.inc.php
Unescape View File

@ -148,9 +148,10 @@ class Dropbox_Work
'upload_date' => $this->upload_date,
'last_upload_date' => $this->last_upload_date,
'session_id' => api_get_session_id(),
'cat_id' => 0
];
$this->id = Database::insert($dropbox_cnf['tbl_file'], $params);
$this->id = Database::insert($dropbox_cnf['tbl_file'], $params);
if ($this->id) {
$sql = "UPDATE ".$dropbox_cnf['tbl_file']." SET id = iid WHERE iid = {$this->id}";
Database::query($sql);
@ -314,12 +315,14 @@ class Dropbox_SentWork extends Dropbox_Work
$session_id = api_get_session_id();
$uploader_id = $this->uploader_id;
$user = api_get_user_id();
$now = api_get_utc_datetime();
// Insert data in dropbox_post and dropbox_person table for each recipient
foreach ($this->recipients as $rec) {
$file_id = (int)$this->id;
$user_id = (int)$rec['id'];
$sql = "INSERT INTO $table_post (c_id, file_id, dest_user_id, session_id)
VALUES ($course_id, $file_id, $user_id, $session_id)";
$sql = "INSERT INTO $table_post (c_id, file_id, dest_user_id, session_id, feedback_date, cat_id)
VALUES ($course_id, $file_id, $user_id, $session_id, '$now', 0)";
Database::query($sql);
// If work already exists no error is generated

10
main/exercice/answer.class.php
Unescape View File

@ -275,7 +275,7 @@ class Answer
*/
public function selectAutoId($id)
{
return isset($this->autoId[$id]) ? $this->autoId[$id] : null;
return isset($this->autoId[$id]) ? $this->autoId[$id] : 0;
}
/**
@ -572,12 +572,13 @@ class Answer
$params = [
'answer' => $answer,
'comment' => $comment,
'correct' => $correct,
'correct' => intval($correct),
'ponderation' => $weighting,
'position' => $position,
'destination' => $destination,
'hotspot_coordinates' => $hotspot_coordinates,
'hotspot_type' => $hotspot_type,
'hotspot_type' => $hotspot_type
];
Database::update($answerTable, $params, ['id_auto = ?' => $autoId]);
@ -610,10 +611,11 @@ class Answer
if (!isset($this->position[$i])) {
$params = [
'id_auto' => $autoId,
'c_id' => $c_id,
'question_id' => $questionId,
'answer' => $answer,
'correct' => $correct,
'correct' => intval($correct),
'comment' => $comment,
'ponderation' => $weighting,
'position' => $position,

6
main/forum/forumfunction.inc.php
Unescape View File

@ -593,6 +593,7 @@ function store_forumcategory($values, $courseInfo = array(), $showMessage = true
*/
function store_forum($values, $courseInfo = array(), $returnId = false)
{
$now = api_get_utc_datetime();
$courseInfo = empty($courseInfo) ? api_get_course_info() : $courseInfo;
$course_id = $courseInfo['real_id'];
$session_id = api_get_session_id();
@ -729,7 +730,9 @@ function store_forum($values, $courseInfo = array(), $returnId = false)
'forum_group_public_private'=> isset($values['public_private_group_forum_group']['public_private_group_forum']) ? $values['public_private_group_forum_group']['public_private_group_forum'] : null,
'forum_order'=> isset($new_max) ? $new_max : null,
'session_id'=> $session_id,
'lp_id' => isset($values['lp_id']) ? intval($values['lp_id']) : 0
'lp_id' => isset($values['lp_id']) ? intval($values['lp_id']) : 0,
'locked' => 0,
'forum_id' => 0
];
$last_id = Database::insert($table_forums, $params);
if ($last_id > 0) {
@ -3267,6 +3270,7 @@ function store_reply($current_forum, $values)
'thread_id' => $values['thread_id'],
'forum_id' => $values['forum_id'],
'poster_id' => api_get_user_id(),
'post_id' => 0,
'post_date' => $post_date,
'post_notification' => isset($values['post_notification']) ? $values['post_notification'] : null,
'post_parent_id' => isset($values['post_parent_id']) ? $values['post_parent_id'] : null,

3
main/inc/lib/attendance.lib.php
Unescape View File

@ -1584,7 +1584,8 @@ class Attendance
$params = array(
'c_id' => $course_id,
'date_time' => $this->date_time,
'attendance_id' => $attendance_id
'attendance_id' => $attendance_id,
'done_attendance' => 0
);
$id = Database::insert($tbl_attendance_calendar, $params);

4
main/inc/lib/blog.lib.php
Unescape View File

@ -167,8 +167,8 @@ class Blog
}
// Put it on course homepage
$sql = "INSERT INTO $tbl_tool (c_id, name, link, image, visibility, admin, address, added_tool, session_id)
VALUES ($course_id, '".Database::escape_string($title)."','blog/blog.php?blog_id=".(int)$this_blog_id."','blog.gif','1','0','pastillegris.gif',0,'$session_id')";
$sql = "INSERT INTO $tbl_tool (c_id, name, link, image, visibility, admin, address, added_tool, session_id, target)
VALUES ($course_id, '".Database::escape_string($title)."','blog/blog.php?blog_id=".(int)$this_blog_id."','blog.gif','1','0','pastillegris.gif',0,'$session_id', '')";
Database::query($sql);
$toolId = Database::insert_id();

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

@ -5040,7 +5040,7 @@ class CourseManager
// Create
Database::insert(
$courseSettingTable,
array('value' => $value, 'c_id' => $courseId, 'variable' => $variable)
['title' => $variable, 'value' => $value, 'c_id' => $courseId, 'variable' => $variable]
);
}
return true;

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

@ -287,7 +287,7 @@ function get_total_folder_size($path, $can_see_invisible = false)
$visibility_rule = ' props.visibility ' . ($can_see_invisible ? '<> 2' : '= 1');
$sql = "SELECT SUM(table1.size) FROM (
SELECT size
SELECT props.ref, size
FROM $table_itemproperty AS props, $table_document AS docs
WHERE
docs.c_id = $course_id AND

7
main/inc/lib/usermanager.lib.php
Unescape View File

@ -2727,7 +2727,8 @@ class UserManager
$sql = "SELECT DISTINCT
c.visibility,
c.id as real_id
c.id as real_id,
sc.position
FROM $tbl_session_course_user as scu
INNER JOIN $tbl_session_course sc
ON (scu.session_id = sc.session_id AND scu.c_id = sc.c_id)
@ -2754,7 +2755,9 @@ class UserManager
if (api_is_allowed_to_create_course()) {
$sql = "SELECT DISTINCT
c.visibility, c.id as real_id
c.visibility,
c.id as real_id,
sc.position
FROM $tbl_session_course_user as scu
INNER JOIN $tbl_session as s
ON (scu.session_id = s.id)

18
main/wiki/wiki.inc.php
Unescape View File

@ -280,8 +280,8 @@ class Wiki
'fprogress1' => '',
'fprogress2' => '',
'fprogress3' => '',
'max_text' => '',
'max_version' => '',
'max_text' => 0,
'max_version' => 0,
'delayedsubmit' => '',
'assignment' => 0
);
@ -360,7 +360,9 @@ class Wiki
'session_id' => $session_id,
'page_id' => $values['page_id'],
'editlock' => 0,
'is_editing' => 0
'is_editing' => 0,
'time_edit' => $time,
'tag' => ''
];
$id = Database::insert($tbl_wiki, $params);
@ -398,8 +400,8 @@ class Wiki
'fprogress1' => $_clean['fprogress1'],
'fprogress2' => $_clean['fprogress2'],
'fprogress3' => $_clean['fprogress3'],
'max_text' => $_clean['max_text'],
'max_version' => $_clean['max_version'],
'max_text' => intval($_clean['max_text']),
'max_version' => intval($_clean['max_version']),
'startdate_assig' => $_clean['startdate_assig'],
'enddate_assig' => $_clean['enddate_assig'],
'delayedsubmit' => $_clean['delayedsubmit']
@ -415,8 +417,8 @@ class Wiki
'fprogress1' => $_clean['fprogress1'],
'fprogress2' => $_clean['fprogress2'],
'fprogress3' => $_clean['fprogress3'],
'max_text' => $_clean['max_text'],
'max_version' => $_clean['max_version'],
'max_text' => intval($_clean['max_text']),
'max_version' => intval($_clean['max_version']),
'startdate_assig' => $_clean['startdate_assig'],
'enddate_assig' => $_clean['enddate_assig'],
'delayedsubmit' => $_clean['delayedsubmit']
@ -4950,7 +4952,7 @@ class Wiki
}
}
if (!empty($row['max_text']) && $row['max_text']<=self::word_count($row['content'])) {
if (!empty($row['max_text']) && $row['max_text'] <= self::word_count($row['content'])) {
$message = get_lang('HasReachedMaxNumWords');
Display::addFlash(
Display::return_message(

Write Preview
Loading…
Cancel
Save