Move code into a class + loading conf files in global.inc.php

1.10.x
Julio Montoya 11 years ago
parent 3da23bd745
commit 0e085db739
  1. 2
      main/admin/course_edit.php
  2. 6
      main/admin/course_request_accepted.php
  3. 6
      main/admin/course_request_edit.php
  4. 6
      main/admin/course_request_rejected.php
  5. 6
      main/admin/course_request_review.php
  6. 67
      main/admin/event_type.php
  7. 3
      main/course_info/infocours.php
  8. 5
      main/create_course/add_course.php
  9. 2
      main/document/document.php
  10. 22
      main/inc/global.inc.php
  11. 5697
      main/inc/lib/add_course.lib.inc.php
  12. 43
      main/inc/lib/course.lib.php
  13. 4
      main/inc/lib/course_category.lib.php
  14. 4
      main/inc/lib/course_request.lib.php
  15. 5
      main/inc/lib/document.lib.php
  16. 17
      main/install/install_db.inc.php
  17. 234
      main/install/update-db-1.8.8-1.9.0.inc.php
  18. 2
      main/survey/survey.lib.php
  19. 1
      main/webservices/additional_webservices.php
  20. 3
      main/webservices/cm_webservice_course.php
  21. 7
      main/webservices/registration.soap.php
  22. 3
      main/webservices/webservice_course.php
  23. 3
      tests/main/announcements/announcements.inc.test.php
  24. 20
      tests/main/inc/lib/add_course.lib.inc.test.php

@ -298,7 +298,7 @@ if ($form->validate()) {
$course_code = $course['code'];
$visual_code = $course['visual_code'];
$visual_code = generate_course_code($visual_code);
$visual_code = CourseManager::generate_course_code($visual_code);
// Check if the visual code is already used by *another* course
$visual_code_is_used = false;

@ -22,12 +22,6 @@ $this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script();
require_once api_get_path(LIBRARY_PATH).'add_course.lib.inc.php';
require_once api_get_path(CONFIGURATION_PATH).'course_info.conf.php';
// Including a configuration file.
require api_get_path(CONFIGURATION_PATH).'add_course.conf.php';
// A check whether the course validation feature is enabled.
$course_validation_feature = api_get_setting('course_validation') == 'true';

@ -17,12 +17,6 @@ $tool_name = get_lang('CourseRequestEdit');
api_protect_admin_script();
require_once api_get_path(LIBRARY_PATH).'add_course.lib.inc.php';
require_once api_get_path(CONFIGURATION_PATH).'course_info.conf.php';
// Including a configuration file.
require_once api_get_path(CONFIGURATION_PATH).'add_course.conf.php';
// A check whether the course validation feature is enabled.
$course_validation_feature = api_get_setting('course_validation') == 'true';

@ -22,12 +22,6 @@ $this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script();
require_once api_get_path(LIBRARY_PATH).'add_course.lib.inc.php';
require_once api_get_path(CONFIGURATION_PATH).'course_info.conf.php';
// Including a configuration file.
require api_get_path(CONFIGURATION_PATH).'add_course.conf.php';
// A check whether the course validation feature is enabled.
$course_validation_feature = api_get_setting('course_validation') == 'true';

@ -19,12 +19,6 @@ $this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script();
require_once api_get_path(LIBRARY_PATH).'add_course.lib.inc.php';
require_once api_get_path(CONFIGURATION_PATH).'course_info.conf.php';
// Including a configuration file.
require_once api_get_path(CONFIGURATION_PATH).'add_course.conf.php';
// The delete action should be deactivated in this page.
// Better reject the target request, after that you can delete it.
// see DELETE_ACTION_ENABLED constant in main_api.lib.php

@ -12,7 +12,6 @@ $language_file = array('admin');
$cidReset = true;
require_once '../inc/global.inc.php';
require_once '../inc/conf/events.conf.php';
$this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script();
@ -35,10 +34,10 @@ if ($action == 'modEventType') {
$users = explode(';', $eventUsers);
} else {
$users = array();
}
}
if (!empty($event_name)) {
$eventName = $event_name;
}
}
save_event_type_message($eventName, $users, $eventMessage, $eventSubject, $eventMessageLanguage, $activated);
header('location: event_controller.php');
exit;
@ -64,7 +63,7 @@ foreach ($users as $user) {
/**
* Header definition
*/
*/
$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
$interbreadcrumb[] = array('url' => 'event_controller.php', 'name' => get_lang('Events'));
$tool_name = get_lang('EventMessageManagement');
@ -84,16 +83,16 @@ echo Display::actions($action_array);
var eventsConfig = <?php echo json_encode($event_config) ?>;
var currentLanguage = <?php echo json_encode(api_get_interface_language()) ?>;
var flagContentHasChanged = false;
var key_lang = "<?php echo $key_lang ?>";
var key_lang = "<?php echo $key_lang ?>";
var event_type_name = "<?php echo $event_name ?>";
$(document).ready(function() {
$(document).ready(function() {
confirmMessage("eventList");
if (event_type_name != 0) {
$("#event_list_group").hide();
}
});
function ajax(params,func) {
$.ajax({
url: "<?php echo $ajaxPath ?>",
@ -103,27 +102,27 @@ echo Display::actions($action_array);
});
}
function refreshUsersList() {
function refreshUsersList() {
removeAllOption($('#usersList'));
$.each(usersList, function(ind,item) {
$.each(usersList, function(ind,item) {
addOption($('#usersList'), item.user_id, item.firstname + ' '+item.lastname);
});
});
}
function getCurrentEventTypeName() {
var name = false;
if (event_type_name != 0) {
return event_type_name;
} else {
return $('#eventList option:selected').first().attr('value');
}
}
function self_sent_lock(self_sent) {
if (self_sent == true) {
$(".registration_case").show();
$(".registration_case").show();
$("#usersList").attr('disabled', 'true');
$("#usersSubList").attr('disabled', 'true');
removeAllOption($('#usersSubList'));
@ -135,17 +134,17 @@ echo Display::actions($action_array);
}
function showEventType() {
cleanInput();
cleanInput();
currentEventName = getCurrentEventTypeName();
$("span#activated_checkbox").css("display", "inline"); // make checkbox visible
$('input[name=activated]').attr('checked', false);
var self_sent = false;
var self_sent = false;
if (typeof(eventsConfig[currentEventName])!='undefined') {
// if registration, only sent to self_user
if (eventsConfig[currentEventName].self_sent == true) {
if (eventsConfig[currentEventName].self_sent == true) {
self_sent = true;
}
}
@ -180,9 +179,9 @@ echo Display::actions($action_array);
$('#keys').append('<li>'+key+'</li>');
});
}
if (self_sent == false ) {
$.ajax({
url: '<?php echo $ajaxPath ?>?action=get_event_users&eventName=' +currentEventName,
dataType: 'json',
@ -190,8 +189,8 @@ echo Display::actions($action_array);
removeAllOption($('#usersSubList'));
refreshUsersList();
usersIds = new Array();
var json = jQuery.parseJSON(data);
$.each(json, function(ind,item) {
var json = jQuery.parseJSON(data);
$.each(json, function(ind,item) {
addOption($('#usersSubList'),item.user_id, item.firstname + ' '+item.lastname);
usersIds[ind] = item.value;
removeOption($('#usersList'),item.user_id);
@ -224,7 +223,7 @@ echo Display::actions($action_array);
select.find('option[value='+value+']').remove();
}
function removeAllOption(select) {
function removeAllOption(select) {
select.find('option').remove();
}
@ -267,8 +266,8 @@ echo Display::actions($action_array);
/**
* Asks if user want to abandon the changes he's done
*/
function confirmMessage(sender) {
function confirmMessage(sender) {
if (flagContentHasChanged == true) {
if (confirm(key_lang)) {
flagContentHasChanged = false;
@ -308,23 +307,23 @@ echo Display::actions($action_array);
<form method="POST" onSubmit="return submitForm(); ">
<div class="row">
<div class="span12" id="event_list_group">
<h4><?php echo get_lang('Events'); ?></h4>
<h4><?php echo get_lang('Events'); ?></h4>
<select class="span6" multiple="1" id="eventList" onchange="confirmMessage(this.name); return false;" name="eventList">
<?php
foreach ($event_config as $key => $config) {
echo '<option value="' . $key . '">' . $config['name_lang_var'] . '</option>';
}
?>
</select>
</select>
</div>
<div class="span4">
<h4><?php echo get_lang('Users'); ?></h4>
<select multiple="1" id="usersList" class="span3 registration_case"></select>
</div>
<div class="span4">
<div class="span4">
<div class="registration_case">
<button class="arrowr" onclick='moveUsers($("#usersList"),$("#usersSubList")); return false;'></button>
<br />
@ -336,13 +335,13 @@ echo Display::actions($action_array);
<h4><?php echo get_lang('ToBeWarnedUserList'); ?></h4>
<select class="span3" multiple="1" id="usersSubList" class="registration_case"></select>
</div>
</div>
</div>
<br />
<h2 id="eventNameTitle"></h2>
<span id="activated_checkbox">
<input type="checkbox" name="activated" value="1" />
<label for="activated" style="display:inline;"><?php echo get_lang('ActivateEvent'); ?></label>
<label for="activated" style="display:inline;"><?php echo get_lang('ActivateEvent'); ?></label>
</span>
<br />
<select id="languages" name="languages" style="margin-top:20px;" onclick='confirmMessage(this.name); return false;'>

@ -22,9 +22,6 @@ $this_section = SECTION_COURSES;
$nameTools = get_lang('ModifInfo');
/* Libraries */
require_once api_get_path(INCLUDE_PATH).'conf/course_info.conf.php';
api_protect_course_script(true);
api_block_anonymous_users();
$_course = api_get_course_info();

@ -33,9 +33,6 @@ if (api_get_setting('course_validation') == 'true' && !api_is_platform_admin())
$course_validation_feature = true;
}
// Require additional libraries.
require_once api_get_path(CONFIGURATION_PATH).'course_info.conf.php';
$htmlHeadXtra[] = '<script type="text/javascript">
function setFocus(){
$("#title").focus();
@ -192,7 +189,7 @@ if ($form->validate()) {
}
if ($wanted_code == '') {
$wanted_code = generate_course_code(api_substr($title, 0, CourseManager::MAX_COURSE_LENGTH_CODE));
$wanted_code = CourseManager::generate_course_code(api_substr($title, 0, CourseManager::MAX_COURSE_LENGTH_CODE));
}
// Check whether the requested course code has already been occupied.

@ -1285,7 +1285,7 @@ if ($is_allowed_to_edit ||
// Show them the form for the directory name
if (isset($_GET['createdir'])) {
$dirForm = create_dir_form($document_id);
$dirForm = DocumentManager::create_dir_form($document_id);
}
}

@ -327,14 +327,22 @@ require $includePath.'/local.inc.php';
$administrator['email'] = isset($administrator['email']) ? $administrator['email'] : 'admin@example.com';
$administrator['name'] = isset($administrator['name']) ? $administrator['name'] : 'Admin';
$mail_conf = api_get_path(CONFIGURATION_PATH).'mail.conf.php';
if (file_exists($mail_conf)) {
require_once $mail_conf;
}
// Including configuration files
$configurationFiles = array(
'mail.conf.php',
'profile.conf.php',
'course_info.conf.php',
'add_course.conf.php',
'events.conf.php',
'auth.conf.php',
'portfolio.conf.php'
);
$profileConf = api_get_path(CONFIGURATION_PATH).'profile.conf.php';
if (file_exists($profileConf)) {
require_once $profileConf;
foreach ($configurationFiles as $file) {
$file = api_get_path(CONFIGURATION_PATH).$file;
if (file_exists($file)) {
require_once $file;
}
}
if (api_get_setting('server_type') == 'test') {

File diff suppressed because it is too large Load Diff

@ -1,9 +1,6 @@
<?php
/* For licensing terms, see /license.txt*/
require_once api_get_path(CONFIGURATION_PATH).'add_course.conf.php';
require_once api_get_path(LIBRARY_PATH).'add_course.lib.inc.php';
/**
* Class CourseManager
*
@ -81,11 +78,11 @@ class CourseManager
if (empty($params['wanted_code'])) {
$params['wanted_code'] = $params['title'];
// Check whether the requested course code has already been occupied.
$params['wanted_code'] = generate_course_code(api_substr($params['title'], 0, self::MAX_COURSE_LENGTH_CODE));
$params['wanted_code'] = CourseManager::generate_course_code(api_substr($params['title'], 0, self::MAX_COURSE_LENGTH_CODE));
}
// Create the course keys
$keys = define_course_keys($params['wanted_code']);
$keys = AddCourse::define_course_keys($params['wanted_code']);
$params['exemplary_content'] = isset($params['exemplary_content']) ? $params['exemplary_content'] : false;
@ -98,12 +95,12 @@ class CourseManager
$course_info = api_get_course_info($params['code']);
if (empty($course_info)) {
$course_id = register_course($params);
$course_id = AddCourse::register_course($params);
$course_info = api_get_course_info_by_id($course_id);
if (!empty($course_info)) {
prepare_course_repository($course_info['directory'], $course_info['code']);
fill_db_course($course_id, $course_info['directory'], $course_info['course_language'], $params['exemplary_content']);
AddCourse::prepare_course_repository($course_info['directory'], $course_info['code']);
AddCourse::fill_db_course($course_id, $course_info['directory'], $course_info['course_language'], $params['exemplary_content']);
if (api_get_setting('gradebook_enable_grade_model') == 'true') {
//Create gradebook_category for the new course and add a gradebook model for the course
@ -2170,7 +2167,7 @@ class CourseManager
$expiration_date = time() + $firstExpirationDelay;
//END HACK ------------------------------------------------------------
register_course($course_sys_code, $course_screen_code, $course_repository, $course_db_name, $responsible_teacher, $faculty_shortname, $course_title, $course_language, $teacher_id, $expiration_date);
AddCourse::register_course($course_sys_code, $course_screen_code, $course_repository, $course_db_name, $responsible_teacher, $faculty_shortname, $course_title, $course_language, $teacher_id, $expiration_date);
//above was the normal course creation table update call,
//now one more thing: fill in the target_course_code field
@ -2296,7 +2293,7 @@ class CourseManager
$sql = "SELECT * FROM $table_course WHERE code='".$codeFiltered."'";
$res = Database::query($sql);
$course = Database::fetch_array($res);
$course_tables = get_course_tables();
$course_tables = AddCourse::get_course_tables();
//Cleaning c_x tables
if (!empty($course['id'])) {
@ -2437,7 +2434,7 @@ class CourseManager
$res = Database::query($sql);
$course = Database::fetch_array($res);
$course_tables = get_course_tables();
$course_tables = AddCourse::get_course_tables();
if (!empty($course['id'])) {
//Cleaning c_x tables
@ -4256,10 +4253,9 @@ class CourseManager
*/
public static function generate_nice_next_course_code($wanted_code)
{
require_once api_get_path(LIBRARY_PATH).'add_course.lib.inc.php';
$course_code_ok = !self::course_code_exists($wanted_code);
if (!$course_code_ok) {
$wanted_code = generate_course_code($wanted_code);
$wanted_code = CourseManager::generate_course_code($wanted_code);
$table = Database::get_main_table(TABLE_MAIN_COURSE);
$wanted_code = Database::escape_string($wanted_code);
$sql = "SELECT count(*) as count FROM $table WHERE code LIKE '$wanted_code%'";
@ -5355,4 +5351,25 @@ class CourseManager
return $col['title'];
}
}
/**
* Generates a course code from a course title
* @todo Such a function might be useful in other places too. It might be moved in the CourseManager class.
* @todo the function might be upgraded for avoiding code duplications (currently, it might suggest a code that is already in use)
* @param string A course title
* @param string The course title encoding (defaults to type defined globally)
* @return string A proposed course code
* @assert (null,null) === false
* @assert ('ABC_DEF', null) === 'ABCDEF'
* @assert ('ABC09*^[%A', null) === 'ABC09A'
*/
public static function generate_course_code($course_title, $encoding = null)
{
if (empty($encoding)) {
$encoding = api_get_system_encoding();
}
return substr(preg_replace('/[^A-Z0-9]/', '', strtoupper(api_transliterate($course_title, 'X', $encoding))), 0, CourseManager::MAX_COURSE_LENGTH_CODE);
}
}

@ -103,7 +103,7 @@ function addNode($code, $name, $canHaveCourses, $parent_id)
$name = trim(Database::escape_string($name));
$parent_id = intval($parent_id);
$canHaveCourses = Database::escape_string($canHaveCourses);
$code = generate_course_code($code);
$code = CourseManager::generate_course_code($code);
$result = Database::query("SELECT 1 FROM $tbl_category WHERE code='$code'");
if (Database::num_rows($result)) {
@ -192,7 +192,7 @@ function editNode($code, $name, $canHaveCourses, $old_code)
$old_code = Database::escape_string($old_code);
$canHaveCourses = Database::escape_string($canHaveCourses);
$code = generate_course_code($code);
$code = CourseManager::generate_course_code($code);
// Updating category
$sql = "UPDATE $tbl_category SET name='$name', code='$code', auth_course_child = '$canHaveCourses'
WHERE code = '$old_code'";

@ -86,7 +86,7 @@ class CourseRequestManager
$request_date = api_get_utc_datetime();
$status = COURSE_REQUEST_PENDING;
$info = 0;
$keys = define_course_keys($wanted_code, '');
$keys = AddCourse::define_course_keys($wanted_code, '');
if (!count($keys)) {
return false;
}
@ -268,7 +268,7 @@ class CourseRequestManager
if (self::course_code_exists($wanted_code)) {
return false;
}
$keys = define_course_keys($wanted_code, '');
$keys = AddCourse::define_course_keys($wanted_code, '');
if (count($keys)) {
$visual_code = $keys['currentCourseCode'];
$code = $keys['currentCourseId'];

@ -5015,7 +5015,7 @@ class DocumentManager
$ext = strtolower($ext[sizeof($ext) - 1]);
// HTML-files an some other types are shown in a frameset by default.
$is_browser_viewable_file = is_browser_viewable($ext);
$is_browser_viewable_file = self::is_browser_viewable($ext);
if ($is_browser_viewable_file) {
if ($ext == 'pdf' || in_array($ext, $webOdflist)) {
@ -5850,7 +5850,8 @@ class DocumentManager
* @param string $file_extension The filename extension of the document (it must be in lower case).
* @return bool Returns TRUE or FALSE.
*/
function is_browser_viewable($file_extension) {
public static function is_browser_viewable($file_extension)
{
static $allowed_extensions = array(
'htm', 'html', 'xhtml',
'gif', 'jpg', 'jpeg', 'png', 'tif', 'tiff',

@ -67,20 +67,20 @@ if (empty($mysqlUserDb) || $mysqlUserDb == 'mysql' || $mysqlUserDb == $dbPrefixF
if (!defined('CLI_INSTALLATION')) {
$result = Database::query("SHOW VARIABLES LIKE 'datadir'") or die(Database::error());
$mysqlRepositorySys = Database::fetch_array($result);
$mysqlRepositorySys = $mysqlRepositorySys['Value'];
$create_database = true;
if (database_exists($mysqlMainDb)) {
$create_database = false;
}
}
//Create database
if ($create_database) {
$sql = "CREATE DATABASE IF NOT EXISTS `$mysqlMainDb`";
Database::query($sql) or die(Database::error());
}
}
}
$mysqlStatsDb = $mysqlMainDb;
@ -116,12 +116,9 @@ $installation_settings['{HASHFUNCTIONMODE}'] = $encryptPassForm;
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';
drop_course_tables();
AddCourse::drop_course_tables();
create_course_tables();
AddCourse::create_course_tables();
load_database_script('db_stats.sql');

@ -34,7 +34,7 @@ if (defined('SYSTEM_INSTALLATION')) {
}
$_configuration['db_glue'] = get_config_param('dbGlu');
if ($singleDbForm) {
$_configuration['table_prefix'] = get_config_param('courseTablePrefix');
$_configuration['main_database'] = get_config_param('mainDbName');
@ -57,25 +57,25 @@ if (defined('SYSTEM_INSTALLATION')) {
// that we want to change the main databases as well...
$only_test = false;
if (defined('SYSTEM_INSTALLATION')) {
if ($singleDbForm) {
$dbStatsForm = $dbNameForm;
$dbScormForm = $dbNameForm;
$dbUserForm = $dbNameForm;
}
}
/**
* Update the databases "pre" migration
*/
include '../lang/english/create_course.inc.php';
if ($languageForm != 'english') {
// languageForm has been escaped in index.php
include '../lang/'.$languageForm.'/create_course.inc.php';
}
// Get the main queries list (m_q_list)
$m_q_list = get_sql_file_contents('migrate-db-'.$old_file_version.'-'.$new_file_version.'-pre.sql', 'main');
if (count($m_q_list) > 0) {
// Now use the $m_q_list
/**
@ -100,24 +100,24 @@ if (defined('SYSTEM_INSTALLATION')) {
}
}
}
if (INSTALL_TYPE_UPDATE == 'update') {
//Migrate classes to the new classes (usergroups)
$sql = "SELECT selected_value FROM $dbNameForm.settings_current WHERE variable='use_session_mode' ";
$result = iDatabase::query($sql);
$result = Database::fetch_array($result);
$session_mode = $result['selected_value'];
$session_mode = $result['selected_value'];
if ($session_mode == 'true') {
$sql = "UPDATE $dbNameForm.settings_current SET selected_value = 'true' WHERE variable='use_session_mode' ";
$sql = "UPDATE $dbNameForm.settings_current SET selected_value = 'true' WHERE variable='use_session_mode' ";
$result = iDatabase::query($sql);
$sql = "SELECT * FROM $dbNameForm.class";
$result = iDatabase::query($sql);
$count = 0;
$count = 0;
$new_table = "$dbNameForm.usergroup";
$classes_added = 0;
$mapping_classes = array();
@ -133,22 +133,22 @@ if (defined('SYSTEM_INSTALLATION')) {
}
}
}
$sql = "SELECT * FROM $dbNameForm.class_user";
$result = iDatabase::query($sql);
$new_table = "$dbNameForm.usergroup_rel_user";
if (Database::num_rows($result)) {
while ($row = iDatabase::fetch_array($result, 'ASSOC')) {
while ($row = iDatabase::fetch_array($result, 'ASSOC')) {
$values = array('usergroup_id' => $mapping_classes[$row['class_id']],
'user_id' => $row['user_id']);
iDatabase::insert($new_table, $values);
}
}
$sql = "SELECT * FROM $dbNameForm.course_rel_class";
$result = iDatabase::query($sql);
$new_table = "$dbNameForm.usergroup_rel_course";
if (Database::num_rows($result)) {
while ($row = iDatabase::fetch_array($result, 'ASSOC')) {
$course_code = $row['course_code'];
@ -162,11 +162,11 @@ if (defined('SYSTEM_INSTALLATION')) {
iDatabase::insert($new_table, $values);
}
}
Log::notice("#classes added $classes_added");
Log::notice("#classes added $classes_added");
}
}
// Get the stats queries list (s_q_list)
$s_q_list = get_sql_file_contents('migrate-db-'.$old_file_version.'-'.$new_file_version.'-pre.sql', 'stats');
@ -195,10 +195,10 @@ if (defined('SYSTEM_INSTALLATION')) {
}
}
}
//Moving Stats DB to the main DB
$stats_table = array(
$stats_table = array(
"track_c_browsers",
"track_c_countries",
"track_c_os",
@ -223,7 +223,7 @@ if (defined('SYSTEM_INSTALLATION')) {
"track_stored_values",
"track_stored_values_stack",
);
if ($dbNameForm != $dbStatsForm) {
iDatabase::select_db($dbStatsForm);
foreach ($stats_table as $stat_table) {
@ -232,10 +232,10 @@ if (defined('SYSTEM_INSTALLATION')) {
}
iDatabase::select_db($dbNameForm);
}
// Get the user queries list (u_q_list)
$u_q_list = get_sql_file_contents('migrate-db-'.$old_file_version.'-'.$new_file_version.'-pre.sql', 'user');
if (count($u_q_list) > 0) {
// Now use the $u_q_list
/**
@ -261,15 +261,15 @@ if (defined('SYSTEM_INSTALLATION')) {
}
}
}
//Moving user database to the main database
$users_tables = array(
"personal_agenda",
"personal_agenda_repeat",
"personal_agenda_repeat_not",
"user_course_category"
"user_course_category"
);
if ($dbNameForm != $dbUserForm) {
iDatabase::select_db($dbUserForm);
foreach ($users_tables as $table) {
@ -278,34 +278,32 @@ if (defined('SYSTEM_INSTALLATION')) {
}
iDatabase::select_db($dbNameForm);
}
}
}
//Adding admin user in the access_url_rel_user table
$sql = "SELECT user_id FROM admin WHERE user_id = 1";
$result = iDatabase::query($sql);
$has_user_id = Database::num_rows($result) > 0;
$sql = "SELECT * FROM access_url_rel_user WHERE user_id = 1 AND access_url_id = 1";
$result = iDatabase::query($sql);
$has_entry = Database::num_rows($result) > 0;
if ($has_user_id && !$has_entry) {
$sql = "INSERT INTO access_url_rel_user VALUES(1, 1)";
iDatabase::query($sql);
}
//Adds the c_XXX courses tables see #3910
require_once api_get_path(LIBRARY_PATH).'add_course.lib.inc.php';
global $_configuration;
drop_course_tables();
create_course_tables();
AddCourse::drop_course_tables();
AddCourse::create_course_tables();
$prefix = '';
if ($singleDbForm) {
$prefix = get_config_param('table_prefix');
}
Log::notice("Database prefix: '$prefix'");
// Get the courses databases queries list (c_q_list)
@ -323,9 +321,9 @@ if (defined('SYSTEM_INSTALLATION')) {
$res = iDatabase::query("SELECT id, code, db_name, directory, course_language, id as real_id FROM course WHERE target_course_code IS NULL ORDER BY code");
if ($res === false) { die('Error while querying the courses list in update_db-1.8.8-1.9.0.inc.php'); }
$errors = array();
if (iDatabase::num_rows($res) > 0) {
$i = 0;
$list = array();
@ -333,13 +331,13 @@ if (defined('SYSTEM_INSTALLATION')) {
$list[] = $row;
$i++;
}
foreach ($list as $row_course) {
if (!$singleDbForm) { // otherwise just use the main one
iDatabase::select_db($row_course['db_name']);
}
Log::notice('Course db ' . $row_course['db_name']);
// Now use the $c_q_list
foreach ($c_q_list as $query) {
if ($singleDbForm) {
@ -353,62 +351,62 @@ if (defined('SYSTEM_INSTALLATION')) {
Log::error('Error in '.$query.': '.iDatabase::error());
}
}
}
}
$work_table = $row_course['db_name'].".student_publication";
$item_table = $row_course['db_name'].".item_property";
if ($singleDbForm) {
$work_table = "$prefix{$row_course['db_name']}_student_publication";
$item_table = $row_course['db_name'].".item_property";
}
if (!$singleDbForm) {
// otherwise just use the main one
iDatabase::select_db($row_course['db_name']);
} else {
iDatabase::select_db($dbNameForm);
}
}
/* Start work fix */
/* Fixes the work subfolder and work with no parent issues */
//1. Searching for works with no parents
$sql = "SELECT * FROM $work_table WHERE parent_id = 0 AND filetype ='file'";
$result = Database::query($sql);
$work_list = array();
if (Database::num_rows($result)) {
while ($row = Database::fetch_array($result, 'ASSOC')) {
$work_list[] = $row;
}
}
$today = api_get_utc_datetime();
$user_id = 1;
$user_id = 1;
require_once api_get_path(SYS_CODE_PATH).'work/work.lib.php';
$sys_course_path = api_get_path(SYS_COURSE_PATH);
$course_dir = $sys_course_path . $row_course['directory'];
$base_work_dir = $course_dir . '/work';
$base_work_dir = $course_dir . '/work';
//2. Looping if there are works with no parents
if (!empty($work_list)) {
if (!empty($work_list)) {
$work_dir_created = array();
foreach ($work_list as $work) {
foreach ($work_list as $work) {
$session_id = intval($work['session_id']);
$group_id = intval($work['post_group_id']);
$work_key = $session_id.$group_id;
//Only create the folder once
if (!isset($work_dir_created[$work_key])) {
$dir_name = "default_tasks_".$group_id."_".$session_id;
//2.1 Creating a new work folder
$sql = "INSERT INTO $work_table SET
url = 'work/".$dir_name."',
@ -419,60 +417,60 @@ if (defined('SYSTEM_INSTALLATION')) {
accepted = '1',
filetype = 'folder',
post_group_id = '$group_id',
sent_date = '".$today."',
sent_date = '".$today."',
parent_id = '0',
qualificator_id = '',
user_id = '".$user_id."'";
qualificator_id = '',
user_id = '".$user_id."'";
iDatabase::query($sql);
$id = Database::insert_id();
//2.2 Adding the folder in item property
if ($id) {
//api_item_property_update($row_course, 'work', $id, 'DirectoryCreated', $user_id, $group_id, null, 0, 0 , $session_id);
//api_item_property_update($row_course, 'work', $id, 'DirectoryCreated', $user_id, $group_id, null, 0, 0 , $session_id);
$sql = "INSERT INTO $item_table (tool, ref, insert_date, insert_user_id, lastedit_date, lastedit_type, lastedit_user_id, to_group_id, visibility, id_session)
VALUES ('work','$id','$today', '$user_id', '$today', 'DirectoryCreated','$user_id', '$group_id', '1', '$session_id')";
iDatabase::query($sql);
$work_dir_created[$work_key] = $id;
$work_dir_created[$work_key] = $id;
create_unexisting_work_directory($base_work_dir, $dir_name);
$final_dir = $base_work_dir.'/'.$dir_name;
}
} else {
$final_dir = $base_work_dir.'/'.$dir_name;
}
//2.3 Updating the url
if (!empty($work_dir_created[$work_key])) {
$parent_id = $work_dir_created[$work_key];
$parent_id = $work_dir_created[$work_key];
$new_url = "work/".$dir_name.'/'.basename($work['url']);
$new_url = Database::escape_string($new_url);$sql = "UPDATE $work_table SET url = '$new_url', parent_id = $parent_id, contains_file = '1' WHERE id = {$work['id']}";
iDatabase::query($sql);
if (is_dir($final_dir)) {
$new_url = Database::escape_string($new_url);$sql = "UPDATE $work_table SET url = '$new_url', parent_id = $parent_id, contains_file = '1' WHERE id = {$work['id']}";
iDatabase::query($sql);
if (is_dir($final_dir)) {
rename($course_dir.'/'.$work['url'], $course_dir.'/'.$new_url);
}
}
}
}
}
//3.0 Moving subfolders to the root
$sql = "SELECT * FROM $work_table WHERE parent_id <> 0 AND filetype ='folder'";
$sql = "SELECT * FROM $work_table WHERE parent_id <> 0 AND filetype ='folder'";
$result = Database::query($sql);
$work_list = array();
if (Database::num_rows($result)) {
while ($row = Database::fetch_array($result, 'ASSOC')) {
$work_list[] = $row;
}
if (!empty($work_list)) {
foreach ($work_list as $work_folder) {
$folder_id = $work_folder['id'];
check_work($folder_id, $work_folder['url'], $work_table, $base_work_dir);
if (!empty($work_list)) {
foreach ($work_list as $work_folder) {
$folder_id = $work_folder['id'];
check_work($folder_id, $work_folder['url'], $work_table, $base_work_dir);
}
}
}
}
/* End of work fix */
//Course tables to be migrated
$table_list = array(
'announcement',
@ -561,40 +559,40 @@ if (defined('SYSTEM_INSTALLATION')) {
'wiki',
'wiki_conf',
'wiki_discuss',
'wiki_mailcue'
'wiki_mailcue'
);
Log::notice('<<<------- Loading DB course '.$row_course['db_name'].' -------->>');
//Install::message('<<<------- Loading DB course '.$row_course['db_name'].' -------->>');
$count = $old_count = 0;
foreach ($table_list as $table) {
$just_table_name = $table;
$old_table = $row_course['db_name'].".".$table;
if ($singleDbForm) {
$old_table = "$prefix{$row_course['db_name']}_".$table;
$just_table_name = "$prefix{$row_course['db_name']}_".$table;
}
$course_id = $row_course['id'];
$course_id = $row_course['id'];
$new_table = DB_COURSE_PREFIX.$table;
//Use the old database (if this is the case)
if (!$singleDbForm) {
// otherwise just use the main one
iDatabase::select_db($row_course['db_name']);
} else {
iDatabase::select_db($dbNameForm);
}
//Count of rows
//Count of rows
$sql = "SHOW TABLES LIKE '$just_table_name'";
$result = iDatabase::query($sql);
if (Database::num_rows($result)) {
$sql = "SELECT count(*) FROM $old_table";
$result = iDatabase::query($sql);
@ -604,27 +602,27 @@ if (defined('SYSTEM_INSTALLATION')) {
$old_count = $row[0];
} else {
Log::error("Count(*) in table $old_table failed");
}
}
Log::notice("# rows in $old_table: $old_count");
$sql = "SELECT * FROM $old_table";
$result = iDatabase::query($sql);
$count = 0;
/* Loads the main database */
iDatabase::select_db($dbNameForm);
while($row = iDatabase::fetch_array($result, 'ASSOC')) {
$row['c_id'] = $course_id;
$row['c_id'] = $course_id;
$id = iDatabase::insert($new_table, $row);
if (is_numeric($id)) {
$count++;
} else {
$errors[$old_table][] = $row;
$errors[$old_table][] = $row;
}
}
}
Log::notice("#rows inserted in $new_table: $count");
if ($old_count != $count) {
@ -649,7 +647,7 @@ if (defined('SYSTEM_INSTALLATION')) {
function check_work($folder_id, $work_url, $work_table, $base_work_dir) {
$uniq_id = uniqid();
//Looking for subfolders
$sql = "SELECT * FROM $work_table WHERE parent_id = $folder_id AND filetype ='folder'";
$sql = "SELECT * FROM $work_table WHERE parent_id = $folder_id AND filetype ='folder'";
$result = Database::query($sql);
if (Database::num_rows($result)) {
@ -659,7 +657,7 @@ function check_work($folder_id, $work_url, $work_table, $base_work_dir) {
}
//Moving the subfolder in the root
$new_url = '/'.basename($work_url).'_mv_'.$uniq_id;
$new_url = '/'.basename($work_url).'_mv_'.$uniq_id;
$new_url = Database::escape_string($new_url);
$sql = "UPDATE $work_table SET url = '$new_url', parent_id = 0 WHERE id = $folder_id";
iDatabase::query($sql);
@ -667,17 +665,17 @@ function check_work($folder_id, $work_url, $work_table, $base_work_dir) {
if (is_dir($base_work_dir.$work_url)) {
rename($base_work_dir.$work_url, $base_work_dir.$new_url);
//Rename all files inside the folder
$sql = "SELECT * FROM $work_table WHERE parent_id = $folder_id AND filetype ='file'";
//Rename all files inside the folder
$sql = "SELECT * FROM $work_table WHERE parent_id = $folder_id AND filetype ='file'";
$result = Database::query($sql);
if (Database::num_rows($result)) {
while ($row = Database::fetch_array($result, 'ASSOC')) {
$new_url = "work".$new_url.'/'.basename($row['url']);
while ($row = Database::fetch_array($result, 'ASSOC')) {
$new_url = "work".$new_url.'/'.basename($row['url']);
$new_url = Database::escape_string($new_url);
$sql = "UPDATE $work_table SET url = '$new_url', parent_id = $folder_id, contains_file = '1' WHERE id = {$row['id']}";
$sql = "UPDATE $work_table SET url = '$new_url', parent_id = $folder_id, contains_file = '1' WHERE id = {$row['id']}";
iDatabase::query($sql);
}
}
}
}
}

@ -331,7 +331,7 @@ class survey_manager
visible_results
) VALUES (
$course_id,
'".Database::escape_string(strtolower(generate_course_code(api_substr($values['survey_code'],0))))."',
'".Database::escape_string(strtolower(CourseManager::generate_course_code(api_substr($values['survey_code'],0))))."',
'".Database::escape_string($values['survey_title'])."',
'".Database::escape_string($values['survey_subtitle'])."',
'".intval($_user['user_id'])."',

@ -7,7 +7,6 @@
require_once '../inc/global.inc.php';
$libpath = api_get_path(LIBRARY_PATH);
require_once $libpath.'add_course.lib.inc.php';
/**
* Function to convert from ppt to png

@ -3,7 +3,6 @@
require_once(dirname(__FILE__).'/../inc/global.inc.php');
$libpath = api_get_path(LIBRARY_PATH);
require_once $libpath.'add_course.lib.inc.php';
require_once(dirname(__FILE__).'/cm_webservice.php');
/**
@ -107,7 +106,7 @@ class WSCMCourse extends WSCM
return $course_admin_id;
}
if($wanted_code == '') {
$wanted_code = generate_course_code($title);
$wanted_code = CourseManager::generate_course_code($title);
}
$result = create_course($wanted_code, $title, $tutor_name, $category_code, $language, $course_admin_id, $this->_configuration['db_prefix'], 0);
if (!$result) {

@ -5,7 +5,6 @@
*/
require_once '../inc/global.inc.php';
$libpath = api_get_path(LIBRARY_PATH);
require_once $libpath.'add_course.lib.inc.php';
$debug = false;
@ -2531,7 +2530,7 @@ function WSCreateCourseByTitle($params) {
$maxlength = 40 - $dbnamelength;
if (empty($wanted_code)) {
$wanted_code = generate_course_code(substr($title, 0, $maxlength));
$wanted_code = CourseManager::generate_course_code(substr($title, 0, $maxlength));
}
// Check if exits $x_course_code into user_field_values table.
@ -2570,7 +2569,7 @@ function WSCreateCourseByTitle($params) {
$values['tutor_name'] = api_get_person_name($_user['firstName'], $_user['lastName'], null, null, $values['course_language']);
$keys = define_course_keys($wanted_code, '', $_configuration['db_prefix']);
$keys = AddCourse::define_course_keys($wanted_code, '', $_configuration['db_prefix']);
$sql_check = sprintf('SELECT * FROM '.$table_course.' WHERE visual_code = "%s"', Database :: escape_string($wanted_code));
$result_check = Database::query($sql_check); // I don't know why this api function doesn't work...
@ -2767,7 +2766,7 @@ function WSEditCourse($params){
$maxlength = 40 - $dbnamelength;
if (empty($visual_code)) {
$visual_code = generate_course_code(substr($title, 0, $maxlength));
$visual_code = CourseManager::generate_course_code(substr($title, 0, $maxlength));
}
$disk_quota = '50000'; // TODO: A hard-coded value.

@ -5,7 +5,6 @@
*/
require_once(dirname(__FILE__).'/../inc/global.inc.php');
$libpath = api_get_path(LIBRARY_PATH);
require_once $libpath.'add_course.lib.inc.php';
require_once(dirname(__FILE__).'/webservice.php');
/**
@ -109,7 +108,7 @@ class WSCourse extends WS
return $course_admin_id;
}
if($wanted_code == '') {
$wanted_code = generate_course_code($title);
$wanted_code = CourseManager::generate_course_code($title);
}
$result = create_course($wanted_code, $title, $tutor_name, $category_code, $language, $course_admin_id, $this->_configuration['db_prefix'], 0);
if (!$result) {

@ -1,9 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
require_once api_get_path(LIBRARY_PATH).'add_course.lib.inc.php';
class TestAnnouncements extends UnitTestCase {
function TestAnnouncements(){

@ -43,7 +43,7 @@ class TestAddCourse extends UnitTestCase {
'course_language' =>'english',
'uidCreator'=> '1',
);
$res = register_course($course['courseSysCode'],$course['courseScreenCode'],
$res = AddCourse::register_course($course['courseSysCode'],$course['courseScreenCode'],
$course['courseRepository'],$course['courseDbName'],
$course['titular'],$course['category'],$course['title'],
$course['course_language'],$course['uidCreator'],
@ -58,21 +58,21 @@ class TestAddCourse extends UnitTestCase {
function TestGenerateCourseCode(){
global $charset;
$course_title = 'testcourse';
$res = generate_course_code($course_title);
$res = CourseManager::generate_course_code($course_title);
$this->assertTrue($res);
}
function TestDefineCourseKeys(){
global $prefixAntiNumber, $_configuration;
$wantedCode = generate_course_code($wantedCode);
$res = define_course_keys(generate_course_code($wantedCode), null, null, null,null, null);
$wantedCode = CourseManager::generate_course_code($wantedCode);
$res = AddCourse::define_course_keys(CourseManager::generate_course_code($wantedCode), null, null, null,null, null);
$this->assertTrue($res);
}
function TestBrowseFolders(){
$browse = array('path'=>'','file'=>'','media'=>'');
$res = browse_folders($browse['path'], $browse['files'],$browse['media']);
$res = AddCourse::browse_folders($browse['path'], $browse['files'],$browse['media']);
$this->assertFalse($res);
}
/*
@ -93,7 +93,7 @@ class TestAddCourse extends UnitTestCase {
*/
function TestLang2db(){
$string = 'test';
$res = lang2db($string);
$res = AddCourse::lang2db($string);
$this->assertTrue($res);
}
@ -109,13 +109,13 @@ class TestAddCourse extends UnitTestCase {
$courseRepository = 'testcourse';
$language = 'english';
$default_document_array ='testdocument';
$res = fill_db_course($courseDbName, $courseRepository, $language);
$res = AddCourse::fill_db_course($courseDbName, $courseRepository, $language);
$this->assertTrue($res === 0);
}
function TestString2Binary(){
$variable = true;
$res = string2binary($variable);
$res = AddCourse::string2binary($variable);
$this->assertTrue($res);
}
@ -134,4 +134,4 @@ class TestAddCourse extends UnitTestCase {
closedir($handle);
}
}
}
}

Loading…
Cancel
Save