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

Droping course tables during a new installation "can create attendance_sheet_log" bug

Browse Source
skala
Julio Montoya 14 years ago
parent 4b35f1d5bf
commit a5b640151c
6 changed files with 27 additions and 53 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. 68
      main/inc/lib/add_course.lib.inc.php
  2. 1
      main/inc/lib/database.lib.php
  3. 2
      main/install/db_main.sql
  4. 1
      main/install/index.php
  5. 1
      main/install/install.lib.php
  6. 7
      main/install/install_db.inc.php

68
main/inc/lib/add_course.lib.inc.php
Unescape View File

@ -74,21 +74,6 @@ function define_course_keys($wanted_code, $prefix_for_all = '', $prefix_for_base
$try_new_fsc_id ++;
$final_suffix['CourseId'] = substr(md5(uniqid(rand())), 0, 4);
}
/*
if ($_configuration['single_database']) {
$query = "SHOW TABLES FROM ".$_configuration['main_database']." LIKE '".$_configuration['table_prefix'].$keys_course_db_name.$_configuration['db_glue']."%'";
$result = Database::query($query);
} else {
$query = "SHOW DATABASES LIKE '$keys_course_db_name'";
$result = Database::query($query);
}
if (Database::num_rows($result)) {
$keys_are_unique = false;
$try_new_fsc_db ++;
$final_suffix['CourseDb'] = substr('_'.md5(uniqid(rand())), 0, 4);
}*/
if (file_exists(api_get_path(SYS_COURSE_PATH).$keys_course_repository)) {
$keys_are_unique = false;
$try_new_fsc_dir ++;
@ -99,15 +84,9 @@ function define_course_keys($wanted_code, $prefix_for_all = '', $prefix_for_base
return $keys;
}
}
/*
// Db name can't begin with a number.
if (stripos('abcdefghijklmnopqrstuvwxyz', $keys_course_db_name[0]) === false) {
$keys_course_db_name = $prefixAntiNumber . $keys_course_db_name;
}*/
$keys['currentCourseCode'] = $keys_course_code;
$keys['currentCourseId'] = $keys_course_id;
//$keys['currentCourseDbName'] = $keys_course_db_name;
$keys['currentCourseRepository'] = $keys_course_repository;
return $keys;
@ -185,15 +164,11 @@ function get_course_tables() {
$tables[]= 'tool';
$tables[]= 'tool_intro';
// Group tool
$tables[]= 'group_info';
$tables[]= 'group_category';
$tables[]= 'group_rel_user';
$tables[]= 'group_rel_tutor';
$tables[]= 'item_property';
$tables[]= 'userinfo_content';
$tables[]= 'userinfo_def';
$tables[]= 'course_description';
@ -264,7 +239,6 @@ function get_course_tables() {
$tables[]= 'wiki_conf';
$tables[]= 'wiki_discuss';
$tables[]= 'wiki_mailcue';
//$tables[]= 'audiorecorder';
$tables[]= 'course_setting';
$tables[]= 'glossary';
$tables[]= 'notebook';
@ -276,18 +250,26 @@ function get_course_tables() {
$tables[]= 'thematic';
$tables[]= 'thematic_plan';
$tables[]= 'thematic_advance';
$tables[]= 'metadata';
return $tables;
return $tables;
}
/* Executed only before create_course_tables() */
function drop_course_tables() {
$list = get_course_tables();
foreach ($list as $table) {
$sql = "DROP TABLE IF EXISTS ".DB_COURSE_PREFIX.$table;
Database::query($sql);
}
}
/**
* Creates all the necessary tables for a new course
*/
function update_db_course($course_db_name = null) {
global $_configuration;
$charset_clause = ' DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci';
function create_course_tables($course_db_name = null) {
global $_configuration;
$charset_clause = ' DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci';
$use_one_db = true;
if ($use_one_db) {
@ -302,24 +284,19 @@ function update_db_course($course_db_name = null) {
//@todo define the backticks inside those table names directly (instead of adding them afterwards)
$tbl_course_homepage = $course_db_name . 'tool';
$TABLEINTROS = $course_db_name . 'tool_intro';
// Group tool
$TABLEGROUPS = $course_db_name . 'group_info';
$TABLEGROUPCATEGORIES = $course_db_name . 'group_category';
$TABLEGROUPUSER = $course_db_name . 'group_rel_user';
$TABLEGROUPTUTOR = $course_db_name . 'group_rel_tutor';
$TABLEITEMPROPERTY = $course_db_name . 'item_property';
$TABLETOOLUSERINFOCONTENT = $course_db_name . 'userinfo_content';
$TABLETOOLUSERINFODEF = $course_db_name . 'userinfo_def';
$TABLETOOLCOURSEDESC = $course_db_name . 'course_description';
$TABLETOOLAGENDA = $course_db_name . 'calendar_event';
$TABLETOOLAGENDAREPEAT = $course_db_name . 'calendar_event_repeat';
$TABLETOOLAGENDAREPEATNOT = $course_db_name . 'calendar_event_repeat_not';
$TABLETOOLAGENDAATTACHMENT = $course_db_name . 'calendar_event_attachment';
// Announcements
$TABLETOOLANNOUNCEMENTS = $course_db_name . 'announcement';
$TABLETOOLANNOUNCEMENTSATTACHMENT = $course_db_name . 'announcement_attachment';
@ -360,8 +337,7 @@ function update_db_course($course_db_name = null) {
$TABLEQUIZQUESTION = $course_db_name . 'quiz_rel_question';
$TABLEQUIZQUESTIONLIST = $course_db_name . 'quiz_question';
$TABLEQUIZANSWERSLIST = $course_db_name . 'quiz_answer';
$TABLEQUIZQUESTIONOPTION = $course_db_name . 'quiz_question_option';
$TABLEQUIZQUESTIONOPTION = $course_db_name . 'quiz_question_option';
$table_quiz_question_category = $course_db_name . 'quiz_question_category';
$table_quiz_question_rel_category = $course_db_name . 'quiz_question_rel_category';
@ -415,9 +391,6 @@ function update_db_course($course_db_name = null) {
$TABLEWIKIDISCUSS = $course_db_name . 'wiki_discuss';
$TABLEWIKIMAILCUE = $course_db_name . 'wiki_mailcue';
// audiorecorder
//$TABLEAUDIORECORDER = $course_db_name . 'audiorecorder';
// Course settings
$TABLESETTING = $course_db_name . 'course_setting';
@ -437,8 +410,7 @@ function update_db_course($course_db_name = null) {
// Thematic
$TBL_THEMATIC = $course_db_name . 'thematic';
$TBL_THEMATIC_PLAN = $course_db_name . 'thematic_plan';
$TBL_THEMATIC_ADVANCE = $course_db_name . 'thematic_advance';
$TBL_THEMATIC_ADVANCE = $course_db_name . 'thematic_advance';
$TBL_METADATA = $course_db_name . 'metadata';
$add_to_all_tables = ' c_id INT NOT NULL, ';
@ -519,7 +491,7 @@ function update_db_course($course_db_name = null) {
)" . $charset_clause;
Database::query($sql);
/* Forum tool */
/* Forum tool */
// Forum Category
$sql = "

1
main/inc/lib/database.lib.php
Unescape View File

@ -696,6 +696,7 @@ class Database {
if (strpos($query, 'c_')) {
//Check if the table contains inner joins
if (
strpos($query, 'DROP TABLE IF EXISTS') === false &&
strpos($query, 'thematic_advance') === false &&
strpos($query, 'thematic_plan') === false &&
strpos($query, 'track_c_countries') === false &&

2
main/install/db_main.sql
Unescape View File

@ -1190,7 +1190,7 @@ VALUES
('cas_add_user_activate', 'extldap', 'casAddUserActivateLDAP'),
('update_user_info_cas_with_ldap', 'true', 'Yes'),
('update_user_info_cas_with_ldap', 'false', 'No'),
('teachers_can_change_score_settings', 'false', 'Yes'),
('teachers_can_change_score_settings', 'true', 'Yes'),
('teachers_can_change_score_settings', 'false', 'No');

1
main/install/index.php
Unescape View File

@ -800,7 +800,6 @@ if ($_POST['step2']) {
break;
}
} else {
set_file_folder_permissions();
database_server_connect();

1
main/install/install.lib.php
Unescape View File

@ -2053,5 +2053,4 @@ function locking_settings() {
$sql = "UPDATE $table SET access_url_locked = 1 WHERE variable = '$setting'";
Database::query($sql);
}
}

7
main/install/install_db.inc.php
Unescape View File

@ -8,7 +8,8 @@
* @package chamilo.install
*/
// This page can only be access through including from the install script.
/* This page is called only during a NEW chamilo installation */
/* This page can only be access through including from the install script. */
if (!defined('SYSTEM_INSTALLATION')) {
echo 'You are not allowed here!';
@ -117,7 +118,9 @@ load_main_database($installation_settings);
//Adds the c_XXX courses tables see #3910
require_once api_get_path(LIBRARY_PATH).'add_course.lib.inc.php';
update_db_course();
drop_course_tables();
create_course_tables();
load_database_script('db_stats.sql');

Write Preview
Loading…
Cancel
Save