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

Adding c_ids

Browse Source
skala
Julio Montoya 14 years ago
parent ad3da52043
commit 5101838e00
9 changed files with 46 additions and 40 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
      main/coursecopy/classes/CourseRecycler.class.php
  2. 4
      main/coursecopy/classes/CourseRestorer.class.php
  3. 12
      main/inc/lib/fckeditor/fcktemplates.xml.php
  4. 4
      main/install/index.php
  5. 8
      main/newscorm/resourcelinker.inc.php
  6. 26
      main/resourcelinker/resourcelinker.inc.php
  7. 5
      main/tracking/exams.php
  8. 5
      main/tracking/lp_results_by_user.php
  9. 18
      main/webservices/registration.soap.php

4
main/coursecopy/classes/CourseRecycler.class.php
Unescape View File

@ -432,8 +432,8 @@ class CourseRecycler
*/ */
function recycle_attendance($session_id = 0) { function recycle_attendance($session_id = 0) {
if ($this->course->has_resources(RESOURCE_ATTENDANCE)) { if ($this->course->has_resources(RESOURCE_ATTENDANCE)) {
$table_attendance = Database :: get_course_table(TABLE_ATTENDANCE, $this->course->destination_db); $table_attendance = Database :: get_course_table(TABLE_ATTENDANCE);
$table_attendance_calendar = Database :: get_course_table(TABLE_ATTENDANCE_CALENDAR, $this->course->destination_db); $table_attendance_calendar = Database :: get_course_table(TABLE_ATTENDANCE_CALENDAR);
$resources = $this->course->resources; $resources = $this->course->resources;
foreach ($resources[RESOURCE_ATTENDANCE] as $last_id => $obj) { foreach ($resources[RESOURCE_ATTENDANCE] as $last_id => $obj) {

4
main/coursecopy/classes/CourseRestorer.class.php
Unescape View File

@ -955,7 +955,7 @@ class CourseRestorer
if (!empty($this->course->orig)) { if (!empty($this->course->orig)) {
$table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT, $this->course->orig); $table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT);
$sql = 'SELECT path, comment, size, filename FROM '.$table_attachment.' WHERE c_id = '.$this->destination_course_id.' AND agenda_id = '.$id; $sql = 'SELECT path, comment, size, filename FROM '.$table_attachment.' WHERE c_id = '.$this->destination_course_id.' AND agenda_id = '.$id;
$attachment_event = Database::query($sql); $attachment_event = Database::query($sql);
$attachment_event = Database::fetch_object($attachment_event); $attachment_event = Database::fetch_object($attachment_event);
@ -1045,7 +1045,7 @@ class CourseRestorer
//Copy announcement attachment file //Copy announcement attachment file
if (!empty($this->course->orig)) { if (!empty($this->course->orig)) {
$table_attachment = Database :: get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT, $this->course->orig); $table_attachment = Database :: get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
$sql = 'SELECT path, comment, size, filename FROM '.$table_attachment.' WHERE c_id = '.$this->destination_course_id.' AND announcement_id = '.$id; $sql = 'SELECT path, comment, size, filename FROM '.$table_attachment.' WHERE c_id = '.$this->destination_course_id.' AND announcement_id = '.$id;
$attachment_event = Database::query($sql); $attachment_event = Database::query($sql);

12
main/inc/lib/fckeditor/fcktemplates.xml.php
Unescape View File

@ -217,14 +217,18 @@ function load_personal_templates($user_id = 0) {
} }
$table_template = Database::get_main_table(TABLE_MAIN_TEMPLATES); $table_template = Database::get_main_table(TABLE_MAIN_TEMPLATES);
$table_document = Database::get_course_table(TABLE_DOCUMENT, $_course['dbName']); $table_document = Database::get_course_table(TABLE_DOCUMENT);
$course_id = api_get_course_int_id();
// The sql statement for getting all the user defined templates // The sql statement for getting all the user defined templates
$sql = "SELECT template.id, template.title, template.description, template.image, template.ref_doc, document.path $sql = "SELECT template.id, template.title, template.description, template.image, template.ref_doc, document.path
FROM ".$table_template." template, ".$table_document." document FROM ".$table_template." template, ".$table_document." document
WHERE user_id='".Database::escape_string($user_id)."' WHERE
AND course_code='".Database::escape_string(api_get_course_id())."' user_id='".Database::escape_string($user_id)."' AND
AND document.id = template.ref_doc"; course_code='".Database::escape_string(api_get_course_id())."' AND
document.c_id = $course_id AND
document.id = template.ref_doc";
$result_template = Database::query($sql); $result_template = Database::query($sql);

4
main/install/index.php
Unescape View File

@ -129,12 +129,12 @@ require_once __DIR__.'/version.php';
// A protection measure for already installed systems. // A protection measure for already installed systems.
if (is_already_installed_system()) { /*if (is_already_installed_system()) {
// The system has already been installed, so block re-installation. // The system has already been installed, so block re-installation.
$global_error_code = 6; $global_error_code = 6;
require '../inc/global_error_message.inc.php'; require '../inc/global_error_message.inc.php';
die(); die();
} }*/
/* STEP 1 : INITIALIZES FORM VARIABLES IF IT IS THE FIRST VISIT */ /* STEP 1 : INITIALIZES FORM VARIABLES IF IT IS THE FIRST VISIT */

8
main/newscorm/resourcelinker.inc.php
Unescape View File

@ -1103,8 +1103,8 @@ function get_addedresource_link_in_learnpath($type, $id, $id_in_path) {
break; break;
case 'Exercise': case 'Exercise':
$TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST,$_course['dbName']); $TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
$result = Database::query("SELECT * FROM $TBL_EXERCICES WHERE id=$id"); $result = Database::query("SELECT * FROM $TBL_EXERCICES WHERE c_id = $course_id AND id=$id");
$myrow = Database::fetch_array($result); $myrow = Database::fetch_array($result);
if ($builder == 'builder') { $origin = 'builder'; } if ($builder == 'builder') { $origin = 'builder'; }
@ -1122,9 +1122,9 @@ function get_addedresource_link_in_learnpath($type, $id, $id_in_path) {
break; break;
case 'HotPotatoes': case 'HotPotatoes':
$TBL_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT,$_course['dbName']); $TBL_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT);
$documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'; $documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
$result = Database::query("SELECT * FROM ".$TBL_DOCUMENT." WHERE id=$id"); $result = Database::query("SELECT * FROM ".$TBL_DOCUMENT." WHERE c_id = $course_id AND id=$id");
$myrow = Database::fetch_array($result); $myrow = Database::fetch_array($result);
$path = $myrow['path']; $path = $myrow['path'];
$name = GetQuizName($path, $documentPath); $name = GetQuizName($path, $documentPath);

26
main/resourcelinker/resourcelinker.inc.php
Unescape View File

@ -246,35 +246,37 @@ function display_addedresource_link($type, $id, $style='')
{ {
$styling = ' class="'.$style.'"'; $styling = ' class="'.$style.'"';
} }
$course_id = api_get_course_int_id();
switch ($type) switch ($type)
{ {
case 'Agenda': case 'Agenda':
$TABLEAGENDA = Database::get_course_table(TABLE_AGENDA,$_course['dbName']); $TABLEAGENDA = Database::get_course_table(TABLE_AGENDA);
$result = Database::query("SELECT * FROM $TABLEAGENDA WHERE id=$id"); $result = Database::query("SELECT * FROM $TABLEAGENDA WHERE c_id = $course_id AND id=$id");
$myrow = Database::fetch_array($result); $myrow = Database::fetch_array($result);
echo '<img src="../img/agenda.gif" align="middle" /> <a href="../calendar/agenda.php"'.$styling.'>'.$myrow['title']."</a><br />\n"; echo '<img src="../img/agenda.gif" align="middle" /> <a href="../calendar/agenda.php"'.$styling.'>'.$myrow['title']."</a><br />\n";
break; break;
case 'Ad_Valvas': case 'Ad_Valvas':
$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT,$_course['dbName']); $tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
$result = Database::query("SELECT * FROM $tbl_announcement WHERE id=$id"); $result = Database::query("SELECT * FROM $tbl_announcement WHERE c_id = $course_id AND id=$id");
$myrow = Database::fetch_array($result); $myrow = Database::fetch_array($result);
echo '<img src="../img/valves.gif" align="middle" /> <a href="../announcements/announcements.php"'.$styling.'>'.$myrow['title']."</a><br />\n"; echo '<img src="../img/valves.gif" align="middle" /> <a href="../announcements/announcements.php"'.$styling.'>'.$myrow['title']."</a><br />\n";
break; break;
case 'Link':Database::get_course_table(TABLE_LINK,$_course['dbName']); case 'Link':Database::get_course_table(TABLE_LINK);
$result = Database::query("SELECT * FROM $TABLETOOLLINK WHERE id=$id"); $result = Database::query("SELECT * FROM $TABLETOOLLINK WHERE c_id = $course_id AND id=$id");
$myrow = Database::fetch_array($result); $myrow = Database::fetch_array($result);
echo '<img src="../img/links.gif" align="middle" /> <a href="#" onclick="javascript:window.open(\'../link/link_goto.php?link_id='.$myrow['id'].'&amp;link_url='.urlencode($myrow['url'])."','MyWindow','width=500,height=400,top='+((screen.height-400)/2)+',left='+((screen.width-500)/2)+',scrollbars=1,resizable=1,menubar=1'); return false;\"".$styling.'>'.$myrow['title']."</a><br />\n"; echo '<img src="../img/links.gif" align="middle" /> <a href="#" onclick="javascript:window.open(\'../link/link_goto.php?link_id='.$myrow['id'].'&amp;link_url='.urlencode($myrow['url'])."','MyWindow','width=500,height=400,top='+((screen.height-400)/2)+',left='+((screen.width-500)/2)+',scrollbars=1,resizable=1,menubar=1'); return false;\"".$styling.'>'.$myrow['title']."</a><br />\n";
break; break;
case 'Exercise': case 'Exercise':
$TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST,$_course['dbName']); $TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
$result = Database::query("SELECT * FROM $TBL_EXERCICES WHERE id=$id"); $result = Database::query("SELECT * FROM $TBL_EXERCICES WHERE c_id = $course_id AND id=$id");
$myrow = Database::fetch_array($result); $myrow = Database::fetch_array($result);
echo '<img src="../img/quiz.gif" align="middle" /> <a href="../exercice/exercise_submit.php?exerciseId='.$myrow['id'].'"'.$styling.'>'.$myrow['title']."</a><br />\n"; echo '<img src="../img/quiz.gif" align="middle" /> <a href="../exercice/exercise_submit.php?exerciseId='.$myrow['id'].'"'.$styling.'>'.$myrow['title']."</a><br />\n";
break; break;
case 'Forum': case 'Forum':
$TBL_FORUMS = Database::get_course_table(TABLE_FORUM,$_course['dbName']); $TBL_FORUMS = Database::get_course_table(TABLE_FORUM);
$result = Database::query("SELECT * FROM $TBL_FORUMS WHERE forum_id=$id"); $result = Database::query("SELECT * FROM $TBL_FORUMS WHERE c_id = $course_id AND forum_id=$id");
$myrow = Database::fetch_array($result); $myrow = Database::fetch_array($result);
echo '<img src="../img/forum.gif" align="middle" /> <a href="../phpbb/viewforum.php?forum='.$myrow['forum_id'].'&amp;md5='.$myrow['md5'].'"'.$styling.'>'.$myrow['forum_name']."</a><br />\n"; echo '<img src="../img/forum.gif" align="middle" /> <a href="../phpbb/viewforum.php?forum='.$myrow['forum_id'].'&amp;md5='.$myrow['md5'].'"'.$styling.'>'.$myrow['forum_name']."</a><br />\n";
break; break;
@ -301,8 +303,8 @@ function display_addedresource_link($type, $id, $style='')
echo '<img src="../img/forum.gif" align="middle" /> <a href="../phpbb/viewtopic.php?topic='.$post->topic_id.'&amp;forum='.$post->forum_id.'"'.$styling.'>'.$post->post_title."</a><br />\n"; echo '<img src="../img/forum.gif" align="middle" /> <a href="../phpbb/viewtopic.php?topic='.$post->topic_id.'&amp;forum='.$post->forum_id.'"'.$styling.'>'.$post->post_title."</a><br />\n";
break; break;
case 'Document': case 'Document':
$dbTable = Database::get_course_table(TABLE_DOCUMENT,$_course['dbName']); $dbTable = Database::get_course_table(TABLE_DOCUMENT);
$result = Database::query("SELECT * FROM $dbTable WHERE id=$id"); $result = Database::query("SELECT * FROM $dbTable WHERE c_id = $course_id AND id=$id");
$myrow = Database::fetch_array($result); $myrow = Database::fetch_array($result);
$pathname = explode('/',$myrow['path']); // making a correct name for the link $pathname = explode('/',$myrow['path']); // making a correct name for the link
$last = count($pathname) - 1; // making a correct name for the link $last = count($pathname) - 1; // making a correct name for the link

5
main/tracking/exams.php
Unescape View File

@ -55,8 +55,9 @@ if ($global) {
$form->addElement('hidden','view','admin'); $form->addElement('hidden','view','admin');
} else { } else {
//Get exam lists //Get exam lists
$t_quiz = Database::get_course_table(TABLE_QUIZ_TEST,$_course['db_name']); $t_quiz = Database::get_course_table(TABLE_QUIZ_TEST);
$sqlExercices = " SELECT quiz.title,id FROM ".$t_quiz." AS quiz WHERE active='1' ORDER BY quiz.title ASC"; $course_id = api_get_course_int_id();
$sqlExercices = " SELECT quiz.title,id FROM ".$t_quiz." AS quiz WHERE c_id = $course_id AND active='1' ORDER BY quiz.title ASC";
$resultExercices = Database::query($sqlExercices); $resultExercices = Database::query($sqlExercices);
$exercise_list[0] = get_lang('All'); $exercise_list[0] = get_lang('All');
while($a_exercices = Database::fetch_array($resultExercices)) { while($a_exercices = Database::fetch_array($resultExercices)) {

5
main/tracking/lp_results_by_user.php
Unescape View File

@ -61,8 +61,9 @@ if ($global) {
$form->addElement('hidden','view','admin'); $form->addElement('hidden','view','admin');
} else { } else {
//Get exam lists //Get exam lists
$t_quiz = Database::get_course_table(TABLE_QUIZ_TEST,$_course['db_name']); $course_id = api_get_course_int_id();
$sqlExercices = " SELECT quiz.title,id FROM ".$t_quiz." AS quiz WHERE active='1' ORDER BY quiz.title ASC"; $t_quiz = Database::get_course_table(TABLE_QUIZ_TEST);
$sqlExercices = " SELECT quiz.title,id FROM ".$t_quiz." AS quiz WHERE c_id = $course_id AND active='1' ORDER BY quiz.title ASC";
$resultExercices = Database::query($sqlExercices); $resultExercices = Database::query($sqlExercices);
$exercise_list[0] = get_lang('All'); $exercise_list[0] = get_lang('All');
while($a_exercices = Database::fetch_array($resultExercices)) { while($a_exercices = Database::fetch_array($resultExercices)) {

18
main/webservices/registration.soap.php
Unescape View File

@ -2649,10 +2649,8 @@ function WSCourseDescription($params) {
} }
$course_ifo = api_get_course_info($course_code); $course_ifo = api_get_course_info($course_code);
$t_course_desc = Database::get_course_table(TABLE_COURSE_DESCRIPTION);
$t_course_desc = Database::get_course_table(TABLE_COURSE_DESCRIPTION, $course_ifo['dbName']); $sql = "SELECT * FROM $t_course_desc WHERE c_id = {$course_ifo['real_id']} ";
$sql = "SELECT * FROM $t_course_desc";
$result = Database::query($sql); $result = Database::query($sql);
$default_titles = array( $default_titles = array(
@ -2820,9 +2818,8 @@ function WSEditCourseDescription($params) {
} }
} }
$course_ifo = api_get_course_info($course_code); $course_info = api_get_course_info($course_code);
$t_course_desc = Database::get_course_table(TABLE_COURSE_DESCRIPTION);
$t_course_desc = Database::get_course_table(TABLE_COURSE_DESCRIPTION,$course_ifo['dbName']);
$course_desc_id = Database::escape_string($course_desc_id); $course_desc_id = Database::escape_string($course_desc_id);
$course_desc_title = Database::escape_string($course_desc_title); $course_desc_title = Database::escape_string($course_desc_title);
@ -2835,14 +2832,15 @@ function WSEditCourseDescription($params) {
} }
// Check whether data already exits into course_description table. // Check whether data already exits into course_description table.
$sql_check_id = "SELECT * FROM $t_course_desc WHERE id ='$course_desc_id'"; $sql_check_id = "SELECT * FROM $t_course_desc WHERE c_id = {$course_info['real_id']} AND id ='$course_desc_id'";
$res_check_id = Database::query($sql_check_id); $res_check_id = Database::query($sql_check_id);
if (Database::num_rows($res_check_id) > 0) { if (Database::num_rows($res_check_id) > 0) {
$sql = "UPDATE $t_course_desc SET title='$course_desc_title', content = '$course_desc_content' WHERE id = '".$course_desc_id."'"; $sql = "UPDATE $t_course_desc SET title='$course_desc_title', content = '$course_desc_content'
WHERE c_id = {$course_info['real_id']} AND id = '".$course_desc_id."'";
Database::query($sql); Database::query($sql);
} else { } else {
$sql = "INSERT IGNORE INTO $t_course_desc SET id = '".$course_desc_id."', title = '$course_desc_title', content = '$course_desc_content'"; $sql = "INSERT IGNORE INTO $t_course_desc SET c_id = {$course_info['real_id']} , id = '".$course_desc_id."', title = '$course_desc_title', content = '$course_desc_content'";
Database::query($sql); Database::query($sql);
} }

Write Preview
Loading…
Cancel
Save