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

Feature #539 - Various minor corrections.

Browse Source
skala
Ivan Tcholakov 15 years ago
parent 5a7f0bba43
commit 4e3f733fde
3 changed files with 16 additions and 20 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. 24
      main/admin/course_add.php
  2. 2
      main/create_course/add_course.php
  3. 10
      main/inc/lib/add_course.lib.inc.php

24
main/admin/course_add.php
Unescape View File

@ -137,25 +137,25 @@ if ($form->validate()) {
$course_language = $course['course_language'];
$exemplary_content = empty($course['exemplary_content']) ? false : true;
$disk_quota = $course['disk_quota'];
if (stripos($department_url, 'http://') === false) {
if (stripos($department_url, 'http://') === false && stripos($department_url, 'https://') === false) {
$department_url = 'http://'.$department_url;
}
if (trim($code) == '') {
$code = generate_course_code(api_substr($title, 0, $maxlength));
}
$keys = define_course_keys($code, '', $_configuration['db_prefix']);
if (sizeof($keys)) {
$currentCourseCode = $keys['currentCourseCode'];
$currentCourseId = $keys['currentCourseId'];
$currentCourseDbName = $keys['currentCourseDbName'];
$currentCourseRepository = $keys['currentCourseRepository'];
if (count($keys)) {
$current_course_code = $keys['currentCourseCode'];
$current_course_id = $keys['currentCourseId'];
$current_course_db_name = $keys['currentCourseDbName'];
$current_course_repository = $keys['currentCourseRepository'];
$expiration_date = time() + $firstExpirationDelay;
prepare_course_repository($currentCourseRepository, $currentCourseId);
update_Db_course($currentCourseDbName, $course_language);
$pictures_array=fill_course_repository($currentCourseRepository, $exemplary_content);
fill_Db_course($currentCourseDbName, $currentCourseRepository, $course_language,$pictures_array, $exemplary_content);
register_course($currentCourseId, $currentCourseCode, $currentCourseRepository, $currentCourseDbName, $tutor_name, $category, $title, $course_language, $teacher_id, $expiration_date, $course_teachers);
$sql = "UPDATE $table_course SET disk_quota = '".$disk_quota."', visibility = '".Database::escape_string($course['visibility'])."', subscribe = '".Database::escape_string($course['subscribe'])."', unsubscribe='".Database::escape_string($course['unsubscribe'])."' WHERE code = '".$currentCourseId."'";
prepare_course_repository($current_course_repository, $current_course_id);
update_Db_course($current_course_db_name);
$pictures_array = fill_course_repository($current_course_repository, $exemplary_content);
fill_Db_course($current_course_db_name, $current_course_repository, $course_language, $pictures_array, $exemplary_content);
register_course($current_course_id, $current_course_code, $current_course_repository, $current_course_db_name, $tutor_name, $category, $title, $course_language, $teacher_id, $expiration_date, $course_teachers);
$sql = "UPDATE $table_course SET disk_quota = '".$disk_quota."', visibility = '".Database::escape_string($course['visibility'])."', subscribe = '".Database::escape_string($course['subscribe'])."', unsubscribe='".Database::escape_string($course['unsubscribe'])."' WHERE code = '".$current_course_id."'";
Database::query($sql);
header('Location: course_list.php');
exit ();

2
main/create_course/add_course.php
Unescape View File

@ -237,7 +237,7 @@ if ($form->validate()) {
$expiration_date = time() + $firstExpirationDelay;
prepare_course_repository($directory, $code);
update_Db_course($db_name, $course_language);
update_Db_course($db_name);
$pictures_array = fill_course_repository($directory, $exemplary_content);
fill_Db_course($db_name, $directory, $course_language, $pictures_array, $exemplary_content);
register_course($code, $visual_code, $directory, $db_name, $tutor_name, $category_code, $title, $course_language, api_get_user_id(), $expiration_date);

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

@ -41,7 +41,7 @@ function create_course($wanted_code, $title, $tutor_name, $category_code, $cours
$expiration_date = time() + $first_expiration_delay;
prepare_course_repository($directory, $code);
update_Db_course($db_name, $course_language);
update_Db_course($db_name);
fill_course_repository($directory, $fill_with_exemplary_content);
fill_Db_course($db_name, $directory, $course_language, $fill_with_exemplary_content);
register_course($code, $visual_code, $directory, $db_name, $tutor_name, $category_code, $title, $course_language, $course_admin_id, $expiration_date);
@ -218,14 +218,10 @@ function prepare_course_repository($course_repository, $course_code) {
/**
* Creates all the necessary tables for a new course.
*/
function update_Db_course($course_db_name, $language = null) {
global $_configuration, $language_interface;
function update_Db_course($course_db_name) {
if (empty($language)) {
$language = $language_interface;
}
global $_configuration;
//$charset_clause = Database::make_charset_clause('UTF-8', $language); // A problematic choice, see Bug #825.
$charset_clause = ' DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci';
if (!$_configuration['single_database']) {

Write Preview
Loading…
Cancel
Save