diff --git a/main/coursecopy/classes/CourseRecycler.class.php b/main/coursecopy/classes/CourseRecycler.class.php
index 78c57c7333..264355823e 100644
--- a/main/coursecopy/classes/CourseRecycler.class.php
+++ b/main/coursecopy/classes/CourseRecycler.class.php
@@ -432,8 +432,8 @@ class CourseRecycler
*/
function recycle_attendance($session_id = 0) {
if ($this->course->has_resources(RESOURCE_ATTENDANCE)) {
- $table_attendance = Database :: get_course_table(TABLE_ATTENDANCE, $this->course->destination_db);
- $table_attendance_calendar = Database :: get_course_table(TABLE_ATTENDANCE_CALENDAR, $this->course->destination_db);
+ $table_attendance = Database :: get_course_table(TABLE_ATTENDANCE);
+ $table_attendance_calendar = Database :: get_course_table(TABLE_ATTENDANCE_CALENDAR);
$resources = $this->course->resources;
foreach ($resources[RESOURCE_ATTENDANCE] as $last_id => $obj) {
diff --git a/main/coursecopy/classes/CourseRestorer.class.php b/main/coursecopy/classes/CourseRestorer.class.php
index 149281c8b7..eab548898d 100644
--- a/main/coursecopy/classes/CourseRestorer.class.php
+++ b/main/coursecopy/classes/CourseRestorer.class.php
@@ -955,7 +955,7 @@ class CourseRestorer
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;
$attachment_event = Database::query($sql);
$attachment_event = Database::fetch_object($attachment_event);
@@ -1045,7 +1045,7 @@ class CourseRestorer
//Copy announcement attachment file
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;
$attachment_event = Database::query($sql);
diff --git a/main/inc/lib/fckeditor/fcktemplates.xml.php b/main/inc/lib/fckeditor/fcktemplates.xml.php
old mode 100755
new mode 100644
index dcd5aced9f..cdd4760c29
--- a/main/inc/lib/fckeditor/fcktemplates.xml.php
+++ b/main/inc/lib/fckeditor/fcktemplates.xml.php
@@ -217,14 +217,18 @@ function load_personal_templates($user_id = 0) {
}
$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
$sql = "SELECT template.id, template.title, template.description, template.image, template.ref_doc, document.path
FROM ".$table_template." template, ".$table_document." document
- WHERE user_id='".Database::escape_string($user_id)."'
- AND course_code='".Database::escape_string(api_get_course_id())."'
- AND document.id = template.ref_doc";
+ WHERE
+ user_id='".Database::escape_string($user_id)."' AND
+ 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);
diff --git a/main/install/index.php b/main/install/index.php
index 78ffe2d94b..edb096f701 100644
--- a/main/install/index.php
+++ b/main/install/index.php
@@ -129,12 +129,12 @@ require_once __DIR__.'/version.php';
// 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.
$global_error_code = 6;
require '../inc/global_error_message.inc.php';
die();
-}
+}*/
/* STEP 1 : INITIALIZES FORM VARIABLES IF IT IS THE FIRST VISIT */
diff --git a/main/newscorm/resourcelinker.inc.php b/main/newscorm/resourcelinker.inc.php
index 8051dc0587..ab3066d882 100644
--- a/main/newscorm/resourcelinker.inc.php
+++ b/main/newscorm/resourcelinker.inc.php
@@ -1103,8 +1103,8 @@ function get_addedresource_link_in_learnpath($type, $id, $id_in_path) {
break;
case 'Exercise':
- $TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST,$_course['dbName']);
- $result = Database::query("SELECT * FROM $TBL_EXERCICES WHERE id=$id");
+ $TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
+ $result = Database::query("SELECT * FROM $TBL_EXERCICES WHERE c_id = $course_id AND id=$id");
$myrow = Database::fetch_array($result);
if ($builder == 'builder') { $origin = 'builder'; }
@@ -1122,9 +1122,9 @@ function get_addedresource_link_in_learnpath($type, $id, $id_in_path) {
break;
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';
- $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);
$path = $myrow['path'];
$name = GetQuizName($path, $documentPath);
diff --git a/main/resourcelinker/resourcelinker.inc.php b/main/resourcelinker/resourcelinker.inc.php
index c5135c9264..2154e7ae2f 100644
--- a/main/resourcelinker/resourcelinker.inc.php
+++ b/main/resourcelinker/resourcelinker.inc.php
@@ -246,35 +246,37 @@ function display_addedresource_link($type, $id, $style='')
{
$styling = ' class="'.$style.'"';
}
+
+ $course_id = api_get_course_int_id();
switch ($type)
{
case 'Agenda':
- $TABLEAGENDA = Database::get_course_table(TABLE_AGENDA,$_course['dbName']);
- $result = Database::query("SELECT * FROM $TABLEAGENDA WHERE id=$id");
+ $TABLEAGENDA = Database::get_course_table(TABLE_AGENDA);
+ $result = Database::query("SELECT * FROM $TABLEAGENDA WHERE c_id = $course_id AND id=$id");
$myrow = Database::fetch_array($result);
echo '
'.$myrow['title']."
\n";
break;
case 'Ad_Valvas':
- $tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT,$_course['dbName']);
- $result = Database::query("SELECT * FROM $tbl_announcement WHERE id=$id");
+ $tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
+ $result = Database::query("SELECT * FROM $tbl_announcement WHERE c_id = $course_id AND id=$id");
$myrow = Database::fetch_array($result);
echo '
'.$myrow['title']."
\n";
break;
- case 'Link':Database::get_course_table(TABLE_LINK,$_course['dbName']);
- $result = Database::query("SELECT * FROM $TABLETOOLLINK WHERE id=$id");
+ case 'Link':Database::get_course_table(TABLE_LINK);
+ $result = Database::query("SELECT * FROM $TABLETOOLLINK WHERE c_id = $course_id AND id=$id");
$myrow = Database::fetch_array($result);
echo '
'.$myrow['title']."
\n";
break;
case 'Exercise':
- $TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST,$_course['dbName']);
- $result = Database::query("SELECT * FROM $TBL_EXERCICES WHERE id=$id");
+ $TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
+ $result = Database::query("SELECT * FROM $TBL_EXERCICES WHERE c_id = $course_id AND id=$id");
$myrow = Database::fetch_array($result);
echo '
'.$myrow['title']."
\n";
break;
case 'Forum':
- $TBL_FORUMS = Database::get_course_table(TABLE_FORUM,$_course['dbName']);
- $result = Database::query("SELECT * FROM $TBL_FORUMS WHERE forum_id=$id");
+ $TBL_FORUMS = Database::get_course_table(TABLE_FORUM);
+ $result = Database::query("SELECT * FROM $TBL_FORUMS WHERE c_id = $course_id AND forum_id=$id");
$myrow = Database::fetch_array($result);
echo '
'.$myrow['forum_name']."
\n";
break;
@@ -301,8 +303,8 @@ function display_addedresource_link($type, $id, $style='')
echo ' '.$post->post_title."
\n";
break;
case 'Document':
- $dbTable = Database::get_course_table(TABLE_DOCUMENT,$_course['dbName']);
- $result = Database::query("SELECT * FROM $dbTable WHERE id=$id");
+ $dbTable = Database::get_course_table(TABLE_DOCUMENT);
+ $result = Database::query("SELECT * FROM $dbTable WHERE c_id = $course_id AND id=$id");
$myrow = Database::fetch_array($result);
$pathname = explode('/',$myrow['path']); // making a correct name for the link
$last = count($pathname) - 1; // making a correct name for the link
diff --git a/main/tracking/exams.php b/main/tracking/exams.php
index c8d61cedaa..e240135229 100644
--- a/main/tracking/exams.php
+++ b/main/tracking/exams.php
@@ -55,8 +55,9 @@ if ($global) {
$form->addElement('hidden','view','admin');
} else {
//Get exam lists
- $t_quiz = Database::get_course_table(TABLE_QUIZ_TEST,$_course['db_name']);
- $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);
+ $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);
$exercise_list[0] = get_lang('All');
while($a_exercices = Database::fetch_array($resultExercices)) {
diff --git a/main/tracking/lp_results_by_user.php b/main/tracking/lp_results_by_user.php
index 4d01b5cc39..edee52e28a 100644
--- a/main/tracking/lp_results_by_user.php
+++ b/main/tracking/lp_results_by_user.php
@@ -61,8 +61,9 @@ if ($global) {
$form->addElement('hidden','view','admin');
} else {
//Get exam lists
- $t_quiz = Database::get_course_table(TABLE_QUIZ_TEST,$_course['db_name']);
- $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();
+ $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);
$exercise_list[0] = get_lang('All');
while($a_exercices = Database::fetch_array($resultExercices)) {
diff --git a/main/webservices/registration.soap.php b/main/webservices/registration.soap.php
index 501572ec55..81a18173d8 100644
--- a/main/webservices/registration.soap.php
+++ b/main/webservices/registration.soap.php
@@ -2649,10 +2649,8 @@ function WSCourseDescription($params) {
}
$course_ifo = api_get_course_info($course_code);
-
- $t_course_desc = Database::get_course_table(TABLE_COURSE_DESCRIPTION, $course_ifo['dbName']);
-
- $sql = "SELECT * FROM $t_course_desc";
+ $t_course_desc = Database::get_course_table(TABLE_COURSE_DESCRIPTION);
+ $sql = "SELECT * FROM $t_course_desc WHERE c_id = {$course_ifo['real_id']} ";
$result = Database::query($sql);
$default_titles = array(
@@ -2820,9 +2818,8 @@ function WSEditCourseDescription($params) {
}
}
- $course_ifo = api_get_course_info($course_code);
-
- $t_course_desc = Database::get_course_table(TABLE_COURSE_DESCRIPTION,$course_ifo['dbName']);
+ $course_info = api_get_course_info($course_code);
+ $t_course_desc = Database::get_course_table(TABLE_COURSE_DESCRIPTION);
$course_desc_id = Database::escape_string($course_desc_id);
$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.
- $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);
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);
} 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);
}