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

Update queries using iid.

Browse Source
1.10.x
Julio Montoya 10 years ago
parent 2738abd54a
commit 2ce3a2367e
7 changed files with 67 additions and 57 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. 22
      main/inc/lib/agenda.lib.php
  2. 57
      main/inc/lib/groupmanager.lib.php
  3. 11
      main/inc/lib/notebook.lib.php
  4. 31
      main/wiki/wiki.inc.php
  5. 1
      src/Chamilo/CourseBundle/Entity/CCalendarEventRepeat.php
  6. 1
      src/Chamilo/CourseBundle/Entity/CSurveyInvitation.php
  7. 1
      src/Chamilo/CourseBundle/Entity/CWikiConf.php

22
main/inc/lib/agenda.lib.php
Unescape View File

@ -181,6 +181,9 @@ class Agenda
$id = Database::insert($this->tbl_course_agenda, $attributes);
if ($id) {
$sql = "UPDATE ".$this->tbl_course_agenda." SET id = $id WHERE iid = $id";
Database::query($sql);
$groupId = api_get_group_id();
if (!empty($usersToSend)) {
@ -2066,13 +2069,18 @@ class Agenda
"VALUES ($course_id, '".$file_name."', '".$comment."', '".$new_file_name."' , '".$eventId."', '".$size."' )";
Database::query($sql);
$id = Database::insert_id();
api_item_property_update(
$courseInfo,
'calendar_event_attachment',
$id,
'AgendaAttachmentAdded',
api_get_user_id()
);
if ($id) {
$sql = "UPDATE $agenda_table_attachment SET id = $id WHERE iid = $id";
Database::query($sql);
api_item_property_update(
$courseInfo,
'calendar_event_attachment',
$id,
'AgendaAttachmentAdded',
api_get_user_id()
);
}
}
}
}

57
main/inc/lib/groupmanager.lib.php
Unescape View File

@ -196,6 +196,9 @@ class GroupManager
$lastId = Database::insert_id();
if ($lastId) {
$sql = "UPDATE $table_group SET id = $lastId WHERE iid = $lastId";
Database::query($sql);
$desired_dir_name= '/'.replace_dangerous_char($name,'strict').'_groupdocs';
$my_path = api_get_path(SYS_COURSE_PATH) . $currentCourseRepository . '/document';
@ -314,41 +317,6 @@ class GroupManager
}
}
/**
* Create groups from all virtual courses in the given course.
* @deprecated
*/
public static function create_groups_from_virtual_courses()
{
self :: delete_category(self::VIRTUAL_COURSE_CATEGORY);
$id = self :: create_category(get_lang('GroupsFromVirtualCourses'), '', self::TOOL_NOT_AVAILABLE, self::TOOL_NOT_AVAILABLE, 0, 0, 1, 1);
$table_group_cat = Database :: get_course_table(TABLE_GROUP_CATEGORY);
$course_id = api_get_course_int_id();
$sql = "UPDATE ".$table_group_cat." SET id=".self::VIRTUAL_COURSE_CATEGORY." WHERE c_id = $course_id AND id=$id";
Database::query($sql);
$course = api_get_course_info();
$course['code'] = $course['sysCode'];
$course['title'] = $course['name'];
$virtual_courses = CourseManager :: get_virtual_courses_linked_to_real_course($course['sysCode']);
$group_courses = $virtual_courses;
$group_courses[] = $course;
$ids = array ();
foreach ($group_courses as $index => $group_course) {
$users = CourseManager :: get_user_list_from_course_code($group_course['code']);
$members = array ();
foreach ($users as $index => $user) {
if ($user['status'] == 5 && $user['tutor_id'] == 0) {
$members[] = $user['user_id'];
}
}
$id = self :: create_group($group_course['code'], self::VIRTUAL_COURSE_CATEGORY, 0, count($members));
self :: subscribe_users($members, $id);
$ids[] = $id;
}
return $ids;
}
/**
* Create a group for every class subscribed to the current course
* @param int $category_id The category in which the groups should be created
@ -446,9 +414,9 @@ class GroupManager
$sql = "DELETE FROM ".$forum_table."
WHERE c_id = $course_id AND forum_of_group IN ('".implode("' , '", $group_ids)."')";
Database::query($sql);
$result = Database::query($sql);
return Database::affected_rows();
return Database::affected_rows($result);
}
/**
@ -835,12 +803,18 @@ class GroupManager
max_student = '".Database::escape_string($maximum_number_of_students)."' ";
Database::query($sql);
$categoryId = Database::insert_id();
// @todo check if this code do something ... virtual course category?
if ($categoryId == self::VIRTUAL_COURSE_CATEGORY) {
$sql = "UPDATE ".$table_group_category." SET id = ". ($categoryId +1)."
WHERE c_id = $course_id AND id = $categoryId";
Database::query($sql);
return $categoryId +1;
$categoryId = $categoryId +1;
}
$sql = "UPDATE $table_group_category SET id = $categoryId WHERE iid = $categoryId";
Database::query($sql);
return $categoryId;
}
@ -1545,11 +1519,12 @@ class GroupManager
$group_id = intval($group_id);
$sql = "INSERT INTO ".$table_group_user." (c_id, user_id, group_id)
VALUES ('$course_id', '".$user_id."', '".$group_id."')";
$result &= Database::query($sql);
Database::query($sql);
}
}
}
return $result;
return true;
}
/**
@ -1572,7 +1547,7 @@ class GroupManager
$group_id = intval($group_id);
if (self::can_user_subscribe($user_id, $group_id)) {
$sql = "INSERT INTO " . $table_group_tutor . " (c_id, user_id, group_id)
VALUES ('$course_id', '" . $user_id . "', '" . $group_id . "')";
VALUES ('$course_id', '" . $user_id . "', '" . $group_id . "')";
$result &= Database::query($sql);
}
}

11
main/inc/lib/notebook.lib.php
Unescape View File

@ -71,8 +71,17 @@ class NotebookManager
$id = Database::insert_id();
if ($id > 0) {
$sql = "UPDATE $t_notebook SET notebook_id = $id WHERE iid = $id";
Database::query($sql);
//insert into item_property
api_item_property_update(api_get_course_info(), TOOL_NOTEBOOK, $id, 'NotebookAdded', api_get_user_id());
api_item_property_update(
api_get_course_info(),
TOOL_NOTEBOOK,
$id,
'NotebookAdded',
api_get_user_id()
);
}
if (!empty($affected_rows)) {

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

@ -331,6 +331,9 @@ class Wiki
$id = Database::insert_id();
if ($id > 0) {
$sql = "UPDATE $tbl_wiki SET id = $insertId WHERE iid = $insertId";
Database::query($sql);
//insert into item_property
api_item_property_update(
api_get_course_info(),
@ -343,14 +346,18 @@ class Wiki
}
if ($_clean['page_id'] == 0) {
$sql='UPDATE '.$tbl_wiki.' SET page_id="'.$id.'" WHERE c_id = '.$course_id.' AND id="'.$id.'"';
$sql = 'UPDATE '.$tbl_wiki.' SET page_id="'.$id.'" WHERE c_id = '.$course_id.' AND id="'.$id.'"';
Database::query($sql);
}
//update wiki config
if ($values['reflink'] == 'index' && $_clean['version'] == 1 ) {
$sql = "INSERT INTO ".$tbl_wiki_conf." (c_id, page_id, task, feedback1, feedback2, feedback3, fprogress1, fprogress2, fprogress3, max_text, max_version, startdate_assig, enddate_assig, delayedsubmit)
VALUES ($course_id, '".$id."','".$_clean['task']."','".$_clean['feedback1']."','".$_clean['feedback2']."','".$_clean['feedback3']."','".$_clean['fprogress1']."','".$_clean['fprogress2']."','".$_clean['fprogress3']."','".$_clean['max_text']."','".$_clean['max_version']."','".$_clean['startdate_assig']."','".$_clean['enddate_assig']."','".$_clean['delayedsubmit']."')";
VALUES ($course_id, '".$id."','".$_clean['task']."','".$_clean['feedback1']."','".$_clean['feedback2']."','".$_clean['feedback3']."','".$_clean['fprogress1']."','".$_clean['fprogress2']."','".$_clean['fprogress3']."','".$_clean['max_text']."','".$_clean['max_version']."','".$_clean['startdate_assig']."','".$_clean['enddate_assig']."','".$_clean['delayedsubmit']."')";
Database::query($sql);
$sql = "UPDATE $tbl_wiki_conf SET page_id = $survey_id WHERE iid = $survey_id";
Database::query($sql);
} else {
$sql = 'UPDATE '.$tbl_wiki_conf.' SET
task="'.$_clean['task'].'",
@ -368,9 +375,10 @@ class Wiki
WHERE
page_id = "'.$_clean['page_id'].'" AND
c_id = '.$course_id;
Database::query($sql);
}
Database::query($sql);
api_item_property_update($_course, 'wiki', $id, 'WikiAdded', api_get_user_id(), $groupId);
self::check_emailcue($_clean['reflink'], 'P', $dtime, $_clean['user_id']);
$this->setWikiData($id);
@ -419,8 +427,21 @@ class Wiki
Database::query($sql);
$id = Database::insert_id();
api_item_property_update($_course, 'wiki', $id, 'WikiAdded', api_get_user_id(), $r_group_id);
self::check_emailcue($r_reflink, 'P', $r_dtime, $r_user_id);
if ($id) {
$sql = "UPDATE $tbl_wiki SET id = $id WHERE iid = $id";
Database::query($sql);
api_item_property_update(
$_course,
'wiki',
$id,
'WikiAdded',
api_get_user_id(),
$r_group_id
);
self::check_emailcue($r_reflink, 'P', $r_dtime, $r_user_id);
}
return get_lang('PageRestored');
}

1
src/Chamilo/CourseBundle/Entity/CCalendarEventRepeat.php
Unescape View File

@ -29,7 +29,6 @@ class CCalendarEventRepeat
*/
private $calId;
/**
* @var integer
*

1
src/Chamilo/CourseBundle/Entity/CSurveyInvitation.php
Unescape View File

@ -37,7 +37,6 @@ class CSurveyInvitation
*/
private $surveyInvitationId;
/**
* @var string
*

1
src/Chamilo/CourseBundle/Entity/CWikiConf.php
Unescape View File

@ -38,7 +38,6 @@ class CWikiConf
private $pageId;
/**
* @var string
*

Write Preview
Loading…
Cancel
Save