Changing settings naming.

1.10.x
Julio Montoya 11 years ago
parent 9fae0e32b3
commit a051da8da8
  1. 17
      main/admin/course_add.php
  2. 2
      main/admin/course_list.php
  3. 4
      main/admin/user_list.php
  4. 10
      main/announcements/announcements.php
  5. 2
      main/calendar/agenda_js.php
  6. 2
      main/chat/chat.php
  7. 5
      main/course_home/vertical_activity.php
  8. 2
      main/course_info/delete_course.php
  9. 2
      main/cron/import_csv.php
  10. 8
      main/cron/user_import/resend_email_with_new_password.php
  11. 4
      main/gradebook/gradebook.php
  12. 8
      main/inc/ajax/admin.ajax.php
  13. 2
      main/inc/ajax/course_home.ajax.php
  14. 4
      main/inc/lib/api.lib.php
  15. 8
      main/inc/lib/certificate.lib.php
  16. 60
      main/inc/lib/course.lib.php
  17. 3
      main/inc/lib/course_home.lib.php
  18. 40
      main/inc/lib/course_request.lib.php
  19. 4
      main/inc/lib/display.lib.php
  20. 4
      main/inc/lib/document.lib.php
  21. 12
      main/inc/lib/events_email.class.php
  22. 7
      main/inc/lib/grade_model.lib.php
  23. 18
      main/inc/lib/login.lib.php
  24. 8
      main/inc/lib/notification.lib.php
  25. 4
      main/inc/lib/pdf.lib.php
  26. 2
      main/inc/lib/plugin.class.php
  27. 4
      main/inc/lib/sessionmanager.lib.php
  28. 18
      main/inc/lib/usermanager.lib.php
  29. 534
      main/install/index.php
  30. 48
      main/install/install.lib.php
  31. 10
      main/mySpace/myspace.lib.php
  32. 2
      main/newscorm/openoffice_document.class.php
  33. 14
      main/user/user_add.php
  34. 4
      main/webservices/registration.soap.php
  35. 4
      main/wiki/wiki.inc.php
  36. 2
      main/work/upload.php
  37. 6
      main/work/work.lib.php
  38. 2
      src/Chamilo/CoreBundle/Controller/IndexController.php
  39. 57
      src/Chamilo/CoreBundle/Framework/PageController.php
  40. 22
      src/Chamilo/CoreBundle/Framework/Template.php
  41. 27
      src/Chamilo/CoreBundle/Migrations/Data/ORM/LoadSettingsData.php
  42. 3
      src/Chamilo/CoreBundle/Settings/AdminSettingsSchema.php
  43. 4
      src/Chamilo/CoreBundle/Settings/AgendaSettingsSchema.php
  44. 4
      src/Chamilo/CourseBundle/Controller/Home/HomeController.php

@ -123,18 +123,21 @@ $form->add_progress_bar();
$form->addElement('style_submit_button', 'submit', get_lang('CreateCourse'), 'class="add"');
// Set some default values.
$values['course_language'] = api_get_setting('platformLanguage');
$values['disk_quota'] = round(api_get_setting('default_document_quotum')/1024/1024, 1);
$values['course_language'] = Container::getTranslator()->getLocale();
$default_course_visibility = api_get_setting('courses_default_creation_visibility');
// api_get_setting('platformLanguage');
$values['disk_quota'] = round(api_get_setting('document.default_document_quotum')/1024/1024, 1);
$default_course_visibility = api_get_setting('course.courses_default_creation_visibility');
if (isset($default_course_visibility)) {
$values['visibility'] = api_get_setting('courses_default_creation_visibility');
$values['visibility'] = api_get_setting('course.courses_default_creation_visibility');
} else {
$values['visibility'] = COURSE_VISIBILITY_OPEN_PLATFORM;
$values['visibility'] = COURSE_VISIBILITY_OPEN_PLATFORM;
}
$values['subscribe'] = 1;
$values['unsubscribe'] = 0;
$values['subscribe'] = 1;
$values['unsubscribe'] = 0;
$form->setDefaults($values);

@ -335,7 +335,7 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
</script>';
$actions .= '<div class="pull-right">';
$actions .= '<a href="course_add.php">'.Display::return_icon('new_course.png', get_lang('AddCourse'),'',ICON_SIZE_MEDIUM).'</a> ';
if (api_get_setting('course_validation') == 'true') {
if (api_get_setting('course.course_validation') == 'true') {
$actions .= '<a href="course_request_review.php">'.Display::return_icon('course_request_pending.png', get_lang('ReviewCourseRequests'),'',ICON_SIZE_MEDIUM).'</a>';
}
$actions .= '</div>';

@ -820,8 +820,8 @@ echo $form.$table_result.$extra_search_options;
/*var_dump(Container::getSettingsManager()->getSetting('platform
.administrator_name'));
$sender_name = api_get_person_name(
api_get_setting('administratorName'),
api_get_setting('administratorSurname'),
api_get_setting('platform.administrator_name'),
api_get_setting('platform.administrator_surname'),
null,
PERSON_NAME_EMAIL_ADDRESS
); var_dump($sender_name);*/

@ -523,8 +523,8 @@ if ($display_form) {
if (isset($_GET['remind_inactive'])) {
$email_ann = '1';
$_SESSION['select_groupusers'] = "show";
$content_to_modify = sprintf(get_lang('RemindInactiveLearnersMailContent'), api_get_setting('siteName'), 7);
$title_to_modify = sprintf(get_lang('RemindInactiveLearnersMailSubject'), api_get_setting('siteName'));
$content_to_modify = sprintf(get_lang('RemindInactiveLearnersMailContent'), api_get_setting('platform.site_name'), 7);
$title_to_modify = sprintf(get_lang('RemindInactiveLearnersMailSubject'), api_get_setting('platform.site_name'));
} elseif (isset($_GET['remindallinactives']) && $_GET['remindallinactives'] == 'true') {
// we want to remind inactive users. The $_GET['since'] parameter determines which users have to be warned (i.e the users who have been inactive for x days or more
$since = isset($_GET['since']) ? intval($_GET['since']) : 6;
@ -537,16 +537,16 @@ if ($display_form) {
// setting the variables for the form elements: the message has to be sent by email
$email_ann = '1';
// setting the variables for the form elements: the title of the email
$title_to_modify = sprintf(get_lang('RemindInactiveLearnersMailSubject'), api_get_setting('siteName'));
$title_to_modify = sprintf(get_lang('RemindInactiveLearnersMailSubject'), api_get_setting('platform.site_name'));
// setting the variables for the form elements: the message of the email
$content_to_modify = sprintf(
get_lang('RemindInactiveLearnersMailContent'),
api_get_setting('siteName'),
api_get_setting('platform.site_name'),
$since
);
// when we want to remind the users who have never been active then we have a different subject and content for the announcement
if ($_GET['since'] == 'never') {
$title_to_modify = sprintf(get_lang('RemindInactiveLearnersMailSubject'), api_get_setting('siteName'));
$title_to_modify = sprintf(get_lang('RemindInactiveLearnersMailSubject'), api_get_setting('platform.site_name'));
$content_to_modify = get_lang('YourAccountIsActiveYouCanLoginAndCheckYourCourses');
}
}

@ -155,7 +155,7 @@ if ($type == 'course' && !empty($group_id)) {
$type_label = get_lang('GroupCalendar');
}
$defaultView = api_get_setting('default_calendar_view');
$defaultView = api_get_setting('agenda.default_calendar_view');
if (empty($defaultView)) {
$defaultView = 'month';

@ -52,7 +52,7 @@ $cidreq = Security::remove_XSS($_GET['cidReq']);
<meta charset="<?php echo api_get_system_encoding(); ?>" />
<link rel="stylesheet" type="text/css" href="<?php echo api_get_path(WEB_CSS_PATH); ?>chat.css">
<?php
echo'<title>'.get_lang('Chat').' - '.$mycourseid.' - '.api_get_setting('siteName').'</title>';
echo'<title>'.get_lang('Chat').' - '.$mycourseid.' - '.api_get_setting('platform.site_name').'</title>';
$groupId = api_get_group_id();

@ -63,7 +63,8 @@ if (api_is_allowed_to_edit(null, true) && !api_is_coach()) {
<div class="confirmation-message" id="id_confirmation_message" style="display:none"></div></div>';
$content .= '<div id="activity-3col">';
if (api_get_setting('show_session_data') == 'true' && $session_id > 0) {
if (api_get_setting('session.show_session_data') == 'true' && $session_id >
0) {
$content .= '<div class="courseadminview-activity-3col"><span class="viewcaption">'.get_lang('SessionData').'</span>
<table width="100%">'.CourseHome::show_session_data($session_id).'</table>
</div>';
@ -85,7 +86,7 @@ if (api_is_allowed_to_edit(null, true) && !api_is_coach()) {
$content .= '</div>';
} elseif (api_is_coach()) {
if (api_get_setting('show_session_data') == 'true' && $session_id > 0) {
if (api_get_setting('session.show_session_data') == 'true' && $session_id > 0) {
$content .= '<div class="courseadminview-activity-3col"><span class="viewcaption">'.get_lang('SessionData').'</span>
<table width="100%">';
$content .= CourseHome::show_session_data($session_id);

@ -42,7 +42,7 @@ if (isset($_GET['delete']) && $_GET['delete'] == 'yes') {
$noPHP_SELF = true;
$message = '<h2>'.get_lang('Course').' : '.$current_course_name.' ('.$current_course_code.') </h2>';
$message .=get_lang('HasDel');
$message .= '<br /><br /><a href="../../index.php">'.get_lang('BackHome').' '.api_get_setting('siteName').'</a>';
$message .= '<br /><br /><a href="../../index.php">'.get_lang('BackHome').' '.api_get_setting('platform.site_name').'</a>';
} else {
$message = '<h3>'.get_lang('Course').' : '.$current_course_name.' ('.$current_course_code.') </h3>';

@ -817,7 +817,7 @@ if (!is_array($emails)) {
$emails = array($emails);
}
$subject = "Cron main/cron/import_csv.php ".date('Y-m-d h:i:s');
$from = api_get_setting('emailAdministrator');
$from = api_get_setting('platform.administrator_email');
/*
if (!empty($emails)) {
foreach ($emails as $email) {

@ -52,10 +52,10 @@ foreach ($list as $mail) {
}
//This comes from main/admin/user_import.php::save_data() slightly modified
$recipient_name = api_get_person_name($user['FirstName'], $user['LastName'], null, PERSON_NAME_EMAIL_ADDRESS);
$emailsubject = '[' . api_get_setting('siteName') . '] ' . get_lang('YourReg', null, $l) . ' ' . api_get_setting('siteName');
$emailbody = get_lang('Dear', null, $l) . ' ' . api_get_person_name($user['FirstName'], $user['LastName']) . ",\n\n" . get_lang('YouAreReg', null, $l) . " " . api_get_setting('siteName') . " " . get_lang('WithTheFollowingSettings', null, $l) . "\n\n" . get_lang('Username', null, $l) . " : " . $user['UserName'] . "\n" . get_lang('Pass', null, $l) . " : " . $user['Password'] . "\n\n" . get_lang('Address', null, $l) . " " . api_get_setting('siteName') . " " . get_lang('Is', null, $l) . " : " . api_get_path(WEB_PATH) . " \n\n" . get_lang('Problem', null, $l) . "\n\n" . get_lang('Formula', null, $l) . ",\n\n" . api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname')) . "\n" . get_lang('Manager', null, $l) . " " . api_get_setting('siteName') . "\nT. " . api_get_setting('administratorTelephone') . "\n" . get_lang('Email', null, $l) . " : " . api_get_setting('emailAdministrator') . "";
$sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
$email_admin = api_get_setting('emailAdministrator');
$emailsubject = '[' . api_get_setting('platform.site_name') . '] ' . get_lang('YourReg', null, $l) . ' ' . api_get_setting('platform.site_name');
$emailbody = get_lang('Dear', null, $l) . ' ' . api_get_person_name($user['FirstName'], $user['LastName']) . ",\n\n" . get_lang('YouAreReg', null, $l) . " " . api_get_setting('platform.site_name') . " " . get_lang('WithTheFollowingSettings', null, $l) . "\n\n" . get_lang('Username', null, $l) . " : " . $user['UserName'] . "\n" . get_lang('Pass', null, $l) . " : " . $user['Password'] . "\n\n" . get_lang('Address', null, $l) . " " . api_get_setting('platform.site_name') . " " . get_lang('Is', null, $l) . " : " . api_get_path(WEB_PATH) . " \n\n" . get_lang('Problem', null, $l) . "\n\n" . get_lang('Formula', null, $l) . ",\n\n" . api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname')) . "\n" . get_lang('Manager', null, $l) . " " . api_get_setting('platform.site_name') . "\nT. " . api_get_setting('administratorTelephone') . "\n" . get_lang('Email', null, $l) . " : " . api_get_setting('platform.administrator_email') . "";
$sender_name = api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname'), null, PERSON_NAME_EMAIL_ADDRESS);
$email_admin = api_get_setting('platform.administrator_email');
@api_mail_html($recipient_name, $user['Email'], $emailsubject, $emailbody, $sender_name, $email_admin);
echo "[OK] Sent to $mail with new password $pass (encrypted:$crypass)... w/ subject: $emailsubject\n";
}

@ -535,8 +535,8 @@ if (!empty($keyword)) {
$scoretotal_display = (isset($scoretotal) ? $scoredisplay->display_score($scoretotal,SCORE_PERCENT) : get_lang('NoResultsAvailable'));
//prepare all necessary variables:
$organization_name = api_get_setting('Institution');
$portal_name = api_get_setting('siteName');
$organization_name = api_get_setting('platform.institution');
$portal_name = api_get_setting('platform.site_name');
$stud_fn = $user['firstname'];
$stud_ln = $user['lastname'];
$certif_text = sprintf(get_lang('CertificateWCertifiesStudentXFinishedCourseYWithGradeZ'),$organization_name,$stud_fn.' '.$stud_ln,$category[0]->get_name(),$scorecourse_display);

@ -113,8 +113,8 @@ function check_system_version()
$data = array(
'url' => api_get_path(WEB_PATH),
'campus' => api_get_setting('siteName'),
'contact' => api_get_setting('emailAdministrator'),
'campus' => api_get_setting('platform.site_name'),
'contact' => api_get_setting('platform.administrator_email'),
'version' => $system_version,
'numberofcourses' => $number_of_courses,
'numberofusers' => $number_of_users,
@ -123,9 +123,9 @@ function check_system_version()
//The donotlistcampus setting recovery should be improved to make
// it true by default - this does not affect numbers counting
'donotlistcampus' => api_get_setting('donotlistcampus'),
'organisation' => api_get_setting('Institution'),
'organisation' => api_get_setting('platform.institution'),
'language' => api_get_setting('platformLanguage'),
'adminname' => api_get_setting('administratorName').' '.api_get_setting('administratorSurname'),
'adminname' => api_get_setting('platform.administrator_name').' '.api_get_setting('platform.administrator_surname'),
);
$res = api_http_request('version.chamilo.org', 80, '/version.php', $data);

@ -18,7 +18,7 @@ switch ($action) {
$tool_visibility = $tool_info['visibility'];
$tool_image = $tool_info['image'];
if (api_get_setting('homepage_view') != 'activity_big') {
if (api_get_setting('course.homepage_view') != 'activity_big') {
$new_image = Display::return_icon(str_replace('.gif','_na.gif', $tool_image), null, null, null, null, true);
$tool_image = Display::return_icon($tool_image, null, null, null, null, true);
} else {

@ -3854,7 +3854,7 @@ function api_time_to_hms($seconds) {
function api_get_permissions_for_new_directories() {
static $permissions;
if (!isset($permissions)) {
$permissions = trim(api_get_setting('permissions_for_new_directories'));
$permissions = trim(api_get_setting('document.permissions_for_new_directories'));
// The default value 0777 is according to that in the platform administration panel after fresh system installation.
$permissions = octdec(!empty($permissions) ? $permissions : '0777');
}
@ -3869,7 +3869,7 @@ function api_get_permissions_for_new_directories() {
function api_get_permissions_for_new_files() {
static $permissions;
if (!isset($permissions)) {
$permissions = trim(api_get_setting('permissions_for_new_files'));
$permissions = trim(api_get_setting('document.permissions_for_new_files'));
// The default value 0666 is according to that in the platform administration panel after fresh system installation.
$permissions = octdec(!empty($permissions) ? $permissions : '0666');
}

@ -25,7 +25,7 @@ class Certificate extends Model
public $qr_file = null;
public $sys_qr_file = null;
public $user_id;
/* If true every time we enter to the certificate URL
we would generate a new certificate (good thing because we can edit the
certificate and all users will have the latest certificate bad because we
@ -159,8 +159,8 @@ class Certificate extends Model
$scorecourse_display = (isset($scorecourse) ? $scoredisplay->display_score($scorecourse,SCORE_AVERAGE) : get_lang('NoResultsAvailable'));
//Prepare all necessary variables:
$organization_name = api_get_setting('Institution');
//$portal_name = api_get_setting('siteName');
$organization_name = api_get_setting('platform.institution');
//$portal_name = api_get_setting('platform.site_name');
$stud_fn = $user['firstname'];
$stud_ln = $user['lastname'];
@ -385,4 +385,4 @@ class Certificate extends Model
{
return api_get_path(WEB_PUBLIC_PATH).'certificates/'.$id;
}
}
}

@ -174,7 +174,8 @@ class CourseManager
$eval->add();
}
}
if (api_get_setting('gradebook_enable_grade_model') == 'true') {
if (api_get_setting('gradebook.gradebook_enable_grade_model') == 'true') {
//Create gradebook_category for the new course and add a gradebook model for the course
if (isset($params['gradebook_model_id']) && !empty($params['gradebook_model_id']) && $params['gradebook_model_id'] != '-1') {
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/gradebook_functions.inc.php';
@ -2010,8 +2011,8 @@ class CourseManager
}
$emailbody .= get_lang('Email').': '.$student['email']."\n\n";
$recipient_name = api_get_person_name($tutor['firstname'], $tutor['lastname'], null, PERSON_NAME_EMAIL_ADDRESS);
$sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
$email_admin = api_get_setting('emailAdministrator');
$sender_name = api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname'), null, PERSON_NAME_EMAIL_ADDRESS);
$email_admin = api_get_setting('platform.administrator_email');
@api_mail($recipient_name, $emailto, $emailsubject, $emailbody, $sender_name,$email_admin);
}
}
@ -2818,10 +2819,11 @@ class CourseManager
$course_title = $course_info['title']." ".Display::tag('span',get_lang('CourseClosed'), array('class'=>'item_closed'));
}
if (api_get_setting('display_coursecode_in_courselist') == 'true') {
if (api_get_setting('course.display_coursecode_in_courselist')
== 'true') {
$course_title .= ' ('.$course_info['visual_code'].') ';
}
if (api_get_setting('display_teacher_in_courselist') == 'true') {
if (api_get_setting('course.display_teacher_in_courselist') == 'true') {
$params['teachers'] = CourseManager::get_teacher_list_from_course_code_to_string($course['real_id'], self::USER_SEPARATOR, true);
}
$course_title .= '&nbsp;';
@ -2972,10 +2974,10 @@ class CourseManager
}
// Start displaying the course block itself
if (api_get_setting('display_coursecode_in_courselist') == 'true') {
if (api_get_setting('course.display_coursecode_in_courselist') == 'true') {
$course_title .= ' ('.$course_info['visual_code'].') ';
}
if (api_get_setting('display_teacher_in_courselist') == 'true') {
if (api_get_setting('course.display_teacher_in_courselist') == 'true') {
$teachers = CourseManager::get_teacher_list_from_course_code_to_string($course['real_id'], self::USER_SEPARATOR, true);
}
@ -3141,11 +3143,11 @@ class CourseManager
// Start displaying the course block itself
if (api_get_setting('display_coursecode_in_courselist') == 'true') {
if (api_get_setting('course.display_coursecode_in_courselist') == 'true') {
$course_title .= ' ('.$course_info['visual_code'].') ';
}
$teachers = null;
if (api_get_setting('display_teacher_in_courselist') == 'true') {
if (api_get_setting('course.display_teacher_in_courselist') == 'true') {
$teachers = $course_info['teacher_list_formatted'];
}
@ -3316,10 +3318,10 @@ class CourseManager
}
// Start displaying the course block itself
if (api_get_setting('display_coursecode_in_courselist') == 'true') {
if (api_get_setting('course.display_coursecode_in_courselist') == 'true') {
$course_title .= ' ('.$course_info['visual_code'].') ';
}
if (api_get_setting('display_teacher_in_courselist') == 'true') {
if (api_get_setting('course.display_teacher_in_courselist') == 'true') {
$teachers = CourseManager::get_teacher_list_from_course_code_to_string($course['real_id'], self::USER_SEPARATOR, true);
}
@ -3434,11 +3436,11 @@ class CourseManager
}
}
if (api_get_setting('display_coursecode_in_courselist') == 'true') {
if (api_get_setting('course.display_coursecode_in_courselist') == 'true') {
$session_title .= ' ('.$course_info['visual_code'].') ';
}
if (api_get_setting('display_teacher_in_courselist') == 'true') {
if (api_get_setting('course.display_teacher_in_courselist') == 'true') {
$teacher_list = CourseManager::get_teacher_list_from_course_code_to_string($course_info['real_id'], self::USER_SEPARATOR, true);
$course_coachs = CourseManager::get_coachs_from_course_to_string($course_info['id_session'], $course_info['real_id'], self::USER_SEPARATOR, true);
$params['teachers'] = $teacher_list;
@ -4382,7 +4384,8 @@ class CourseManager
$settingsManager->setCourse($course);
foreach ($toolList as $tool) {
$visibility = Text::string2binary(api_get_setting('course_create_active_tools', $tool->getName()));
$visibility = Text::string2binary(api_get_setting
('course.course_create_active_tools', $tool->getName()));
$toolObject = new CTool();
$toolObject->setName($tool->getName())
->setCategory($tool->getCategory())
@ -4403,17 +4406,17 @@ class CourseManager
/* Course tools */
if (api_get_setting('service_visio', 'active') == 'true') {
/*if (api_get_setting('service_visio', 'active') == 'true') {
$mycheck = api_get_setting('service_visio', 'visio_host');
if (!empty($mycheck)) {
//Database::query("INSERT INTO $toolTable VALUES ($course_id, NULL, '" . TOOL_VISIO_CONFERENCE . "','conference/index.php?type=conference','visio_meeting.gif','1','0','squaregrey.gif','NO','_self','interaction','0', '', '')");
//Database::query("INSERT INTO $toolTable VALUES ($course_id, NULL, '" . TOOL_VISIO_CLASSROOM . "','conference/index.php?type=classroom','visio.gif','1','0','squaregrey.gif','NO','_self','authoring','0', '', '')");
}
}
}*/
if (api_get_setting('search_enabled') == 'true') {
/*if (api_get_setting('search_enabled') == 'true') {
//Database::query("INSERT INTO $toolTable VALUES ($course_id, NULL, '" . TOOL_SEARCH. "','search/','info.gif','".Text::string2binary(api_get_setting('course_create_active_tools', 'enable_search')) . "','0','search.gif','NO','_self','authoring','0', '', '')");
}
}*/
// Blogs (Kevin Van Den Haute :: kevin@develop-it.be)
/*$sql = "INSERT INTO $toolTable VALUES ($course_id, NULL,'" . TOOL_BLOGS . "','blog/blog_admin.php','blog_admin.gif','" . Text::string2binary(api_get_setting('course_create_active_tools', 'blogs')) . "','1','squaregrey.gif','NO','_self','admin','0', '', '')";
@ -4454,7 +4457,7 @@ class CourseManager
VALUES ($course_id, '2', '".Database::escape_string(get_lang('DefaultGroupCategory')) . "', '', '8', '0', '0', '0', '0');");
/* Example Material */
$language_interface = api_get_setting('platformLanguage');
$language_interface = Container::getTranslator()->getLocale();
// Example material should be in the same language as the course is.
$language_interface_original = $language_interface;
@ -4773,14 +4776,15 @@ class CourseManager
$directory = isset($params['directory']) ? $params['directory'] : null;
$tutor_name = isset($params['tutor_name']) ? $params['tutor_name'] : null;
$category_code = isset($params['category_code']) ? $params['category_code'] : null;
$course_language = isset($params['course_language']) && !empty($params['course_language']) ? $params['course_language'] : api_get_setting('platformLanguage');
$defaultLanguage = Container::getTranslator()->getLocale();
$course_language = isset($params['course_language']) && !empty($params['course_language']) ? $params['course_language'] : $defaultLanguage;
$user_id = empty($params['user_id']) ? api_get_user_id() : intval($params['user_id']);
$department_name = isset($params['department_name']) ? $params['department_name'] : null;
$department_url = isset($params['department_url']) ? $params['department_url'] : null;
$disk_quota = isset($params['disk_quota']) ? $params['disk_quota'] : null;
if (!isset($params['visibility'])) {
$default_course_visibility = api_get_setting('courses_default_creation_visibility');
$default_course_visibility = api_get_setting('course.courses_default_creation_visibility');
if (isset($default_course_visibility)) {
$visibility = $default_course_visibility;
} else {
@ -4832,7 +4836,7 @@ class CourseManager
}
if (empty($disk_quota)) {
$disk_quota = api_get_setting('default_document_quotum');
$disk_quota = api_get_setting('document.default_document_quotum');
}
$time = api_get_utc_datetime();
@ -4902,12 +4906,14 @@ class CourseManager
$settingsManager = Container::getCourseSettingsManager();
$schemas = $settingsManager->getSchemas();
$schemas = array_keys($schemas);
/**
* @var string $key
* @var \Sylius\Bundle\SettingsBundle\Schema\SchemaInterface $schema
*/
foreach ($schemas as $schema) {
$settings = $settingsManager->loadSettings($schema);
$settingsManager->setCourse($course);
$settingsManager->saveSettings($schema, $settings);
}
@ -4964,13 +4970,13 @@ class CourseManager
$user_id = api_get_user_id();
Event::addEvent(LOG_COURSE_CREATE, LOG_COURSE_CODE, $code, api_get_utc_datetime(), $user_id, $code);
$send_mail_to_admin = api_get_setting('send_email_to_admin_when_create_course');
$send_mail_to_admin = api_get_setting('course.send_email_to_admin_when_create_course');
// @todo Improve code to send to all current portal administrators.
if ($send_mail_to_admin == 'true') {
$siteName = api_get_setting('siteName');
$recipient_email = api_get_setting('emailAdministrator');
$recipient_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'));
$iname = api_get_setting('Institution');
$siteName = api_get_setting('platform.site_name');
$recipient_email = api_get_setting('platform.administrator_email');
$recipient_name = api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname'));
$iname = api_get_setting('platform.institution');
$subject = get_lang('NewCourseCreatedIn').' '.$siteName.' - '.$iname;
$body = get_lang('Dear').' '.$recipient_name.",\n\n".get_lang('MessageOfNewCourseToAdmin').' '.$siteName.' - '.$iname."\n";

@ -416,7 +416,6 @@ class CourseHome
// Condition for the session
$session_id = api_get_session_id();
$course_id = api_get_course_int_id();
var_dump($course_id);
$condition_session = api_get_session_condition($session_id, true, true);
//$studentView = isset($_SESSION['studentview']) ? $_SESSION['studentview'] : null;
@ -595,7 +594,7 @@ class CourseHome
public static function show_tools_category($urlGenerator, $toolList, $rows = false)
{
$rowDiv = '<div class="row">';
$theme = api_get_setting('homepage_view');
$theme = api_get_setting('course.homepage_view');
if ($theme == 'vertical_activity') {
//ordering by get_lang name

@ -116,7 +116,7 @@ class CourseRequestManager {
//$email_language = api_get_interface_language();
$email_language = api_get_setting('platformLanguage');
$email_subject = sprintf(get_lang('CourseRequestEmailSubject', null, $email_language), '['.api_get_setting('siteName').']', $code);
$email_subject = sprintf(get_lang('CourseRequestEmailSubject', null, $email_language), '['.api_get_setting('platform.site_name').']', $code);
$email_body = get_lang('CourseRequestMailOpening', null, $email_language)."\n\n";
$email_body .= get_lang('CourseName', null, $email_language).': '.$title."\n";
@ -138,8 +138,8 @@ class CourseRequestManager {
$sender_name_teacher = api_get_person_name($user_info['firstname'], $user_info['lastname'], null, PERSON_NAME_EMAIL_ADDRESS);
$sender_email_teacher = $user_info['mail'];
$recipient_name_admin = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
$recipient_email_admin = api_get_setting('emailAdministrator');
$recipient_name_admin = api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname'), null, PERSON_NAME_EMAIL_ADDRESS);
$recipient_email_admin = api_get_setting('platform.administrator_email');
@api_mail($recipient_name_admin, $recipient_email_admin, $email_subject, $email_body_admin, $sender_name_teacher, $sender_email_teacher);
@ -149,8 +149,8 @@ class CourseRequestManager {
$email_body_teacher .= api_get_person_name($user_info['firstname'], $user_info['lastname'], null, null, $email_language).",\n\n";
$email_body_teacher .= $email_body;
$email_body_teacher .= "\n".get_lang('Formula', null, $email_language)."\n";
$email_body_teacher .= api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, null, $email_language)."\n";
$email_body_teacher .= get_lang('Manager', null, $email_language).' '.api_get_setting('siteName')."\n";
$email_body_teacher .= api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname'), null, null, $email_language)."\n";
$email_body_teacher .= get_lang('Manager', null, $email_language).' '.api_get_setting('platform.site_name')."\n";
$email_body_teacher .= get_lang('Phone', null, $email_language).': '.api_get_setting('administratorTelephone')."\n";
$email_body_teacher .= get_lang('Email', null, $email_language).': '.api_get_setting('emailAdministrator', null, $email_language)."\n";
$email_body_teacher .= "\n".get_lang('CourseRequestLegalNote', null, $email_language)."\n";
@ -367,20 +367,20 @@ class CourseRequestManager {
// E-mail language: The platform language seems to be the best choice
$email_language = api_get_setting('platformLanguage');
$email_subject = sprintf(get_lang('CourseRequestAcceptedEmailSubject', null, $email_language), '['.api_get_setting('siteName').']', $course_info['code']);
$email_subject = sprintf(get_lang('CourseRequestAcceptedEmailSubject', null, $email_language), '['.api_get_setting('platform.site_name').']', $course_info['code']);
$email_body = get_lang('Dear', null, $email_language).' ';
$email_body .= api_get_person_name($user_info['firstname'], $user_info['lastname'], null, null, $email_language).",\n\n";
$email_body .= sprintf(get_lang('CourseRequestAcceptedEmailText', null, $email_language), $wanted_code, $course_info['code'], api_get_path(WEB_COURSE_PATH).$course_info['directory'].'/')."\n";
$email_body .= "\n".get_lang('Formula', null, $email_language)."\n";
$email_body .= api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, null, $email_language)."\n";
$email_body .= get_lang('Manager', null, $email_language).' '.api_get_setting('siteName')."\n";
$email_body .= api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname'), null, null, $email_language)."\n";
$email_body .= get_lang('Manager', null, $email_language).' '.api_get_setting('platform.site_name')."\n";
$email_body .= get_lang('Phone', null, $email_language).': '.api_get_setting('administratorTelephone')."\n";
$email_body .= get_lang('Email', null, $email_language).': '.api_get_setting('emailAdministrator', null, $email_language)."\n";
$email_body .= "\n".get_lang('CourseRequestLegalNote', null, $email_language)."\n";
$sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
$sender_email = api_get_setting('emailAdministrator');
$sender_name = api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname'), null, PERSON_NAME_EMAIL_ADDRESS);
$sender_email = api_get_setting('platform.administrator_email');
$recipient_name = api_get_person_name($user_info['firstname'], $user_info['lastname'], null, PERSON_NAME_EMAIL_ADDRESS);
$recipient_email = $user_info['mail'];
$extra_headers = 'Bcc: '.$sender_email;
@ -430,20 +430,20 @@ class CourseRequestManager {
//$email_language = api_get_interface_language();
$email_language = api_get_setting('platformLanguage');
$email_subject = sprintf(get_lang('CourseRequestRejectedEmailSubject', null, $email_language), '['.api_get_setting('siteName').']', $code);
$email_subject = sprintf(get_lang('CourseRequestRejectedEmailSubject', null, $email_language), '['.api_get_setting('platform.site_name').']', $code);
$email_body = get_lang('Dear', null, $email_language).' ';
$email_body .= api_get_person_name($user_info['firstname'], $user_info['lastname'], null, null, $email_language).",\n\n";
$email_body .= sprintf(get_lang('CourseRequestRejectedEmailText', null, $email_language), $code)."\n";
$email_body .= "\n".get_lang('Formula', null, $email_language)."\n";
$email_body .= api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, null, $email_language)."\n";
$email_body .= get_lang('Manager', null, $email_language).' '.api_get_setting('siteName')."\n";
$email_body .= api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname'), null, null, $email_language)."\n";
$email_body .= get_lang('Manager', null, $email_language).' '.api_get_setting('platform.site_name')."\n";
$email_body .= get_lang('Phone', null, $email_language).': '.api_get_setting('administratorTelephone')."\n";
$email_body .= get_lang('Email', null, $email_language).': '.api_get_setting('emailAdministrator', null, $email_language)."\n";
$email_body .= "\n".get_lang('CourseRequestLegalNote', null, $email_language)."\n";
$sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
$sender_email = api_get_setting('emailAdministrator');
$sender_name = api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname'), null, PERSON_NAME_EMAIL_ADDRESS);
$sender_email = api_get_setting('platform.administrator_email');
$recipient_name = api_get_person_name($user_info['firstname'], $user_info['lastname'], null, PERSON_NAME_EMAIL_ADDRESS);
$recipient_email = $user_info['mail'];
$extra_headers = 'Bcc: '.$sender_email;
@ -493,20 +493,20 @@ class CourseRequestManager {
//$email_language = api_get_interface_language();
$email_language = api_get_setting('platformLanguage');
$email_subject = sprintf(get_lang('CourseRequestAskInfoEmailSubject', null, $email_language), '['.api_get_setting('siteName').']', $code);
$email_subject = sprintf(get_lang('CourseRequestAskInfoEmailSubject', null, $email_language), '['.api_get_setting('platform.site_name').']', $code);
$email_body = get_lang('Dear', null, $email_language).' ';
$email_body .= api_get_person_name($user_info['firstname'], $user_info['lastname'], null, null, $email_language).",\n\n";
$email_body .= sprintf(get_lang('CourseRequestAskInfoEmailText', null, $email_language), $code)."\n";
$email_body .= "\n".get_lang('Formula', null, $email_language)."\n";
$email_body .= api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, null, $email_language)."\n";
$email_body .= get_lang('Manager', null, $email_language).' '.api_get_setting('siteName')."\n";
$email_body .= api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname'), null, null, $email_language)."\n";
$email_body .= get_lang('Manager', null, $email_language).' '.api_get_setting('platform.site_name')."\n";
$email_body .= get_lang('Phone', null, $email_language).': '.api_get_setting('administratorTelephone')."\n";
$email_body .= get_lang('Email', null, $email_language).': '.api_get_setting('emailAdministrator', null, $email_language)."\n";
$email_body .= "\n".get_lang('CourseRequestLegalNote', null, $email_language)."\n";
$sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
$sender_email = api_get_setting('emailAdministrator');
$sender_name = api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname'), null, PERSON_NAME_EMAIL_ADDRESS);
$sender_email = api_get_setting('platform.administrator_email');
$recipient_name = api_get_person_name($user_info['firstname'], $user_info['lastname'], null, PERSON_NAME_EMAIL_ADDRESS);
$recipient_email = $user_info['mail'];
$extra_headers = 'Bcc: '.$sender_email;

@ -119,7 +119,7 @@ class Display
$courseInfo = api_get_course_info();
$introduction_section = null;
if (api_get_setting('enable_tool_introduction') == 'true' || $tool == TOOL_COURSE_HOMEPAGE) {
if (api_get_setting('course.enable_tool_introduction') == 'true' || $tool == TOOL_COURSE_HOMEPAGE) {
$introduction_section = null;
$TBL_INTRODUCTION = Database::get_course_table(TABLE_TOOL_INTRO);
$session_id = api_get_session_id();
@ -650,7 +650,7 @@ class Display
public static function get_platform_home_link_html($name = '')
{
if ($name == '') {
$name = api_get_setting('siteName');
$name = api_get_setting('platform.site_name');
}
return '<a href="'.api_get_path(WEB_PATH).'index.php">'.$name.'</a>';
}

@ -1565,8 +1565,8 @@ class DocumentManager
$course_info = api_get_course_info($course_id);
//info portal
$organization_name = api_get_setting('Institution');
$portal_name = api_get_setting('siteName');
$organization_name = api_get_setting('platform.institution');
$portal_name = api_get_setting('platform.site_name');
//Extra user data information
$extra_user_info_data = UserManager::get_extra_user_data($user_id, false, false, false, true);

@ -36,14 +36,14 @@ class EventsMail
global $event_config;
// common variable for every mail sent
$sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
$email_admin = api_get_setting('emailAdministrator');
$sender_name = api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname'), null, PERSON_NAME_EMAIL_ADDRESS);
$email_admin = api_get_setting('platform.administrator_email');
// basic keys
$event_data["sitename"] = api_get_setting('siteName');
$event_data["administrator_name"] = api_get_setting('administratorName');
$event_data["administrator_surname"] = api_get_setting('administratorSurname');
$event_data["sitename"] = api_get_setting('platform.site_name');
$event_data["administrator_name"] = api_get_setting('platform.administrator_name');
$event_data["administrator_surname"] = api_get_setting('platform.administrator_surname');
$event_data["administrator_phone"] = api_get_setting('administratorTelephone');
$event_data["administrator_email"] = api_get_setting('emailAdministrator');
$event_data["administrator_email"] = api_get_setting('platform.administrator_email');
$event_data["portal"] = api_get_path(WEB_PATH);
// Fill the array's cells with info regarding the user that fired the event

@ -287,11 +287,12 @@ class GradeModel extends Model
public function fill_grade_model_select_in_form(&$form, $name = 'gradebook_model_id', $default_value = null)
{
if (api_get_setting('gradebook_enable_grade_model') == 'false') {
if (api_get_setting('gradebook.gradebook_enable_grade_model') ==
'false') {
return false;
}
if (api_get_setting('teachers_can_change_grade_model_settings') == 'true' || api_is_platform_admin()) {
if (api_get_setting('gradebook.teachers_can_change_grade_model_settings') == 'true' || api_is_platform_admin()) {
$grade_models = $this->get_all();
$grade_model_options = array('-1' => get_lang('None'));
if (!empty($grade_models)) {
@ -300,7 +301,7 @@ class GradeModel extends Model
}
}
$form->addElement('select', $name, get_lang('GradeModel'), $grade_model_options);
$default_platform_setting = api_get_setting('gradebook_default_grade_model_id');
$default_platform_setting = api_get_setting('gradebook.gradebook_default_grade_model_id');
$default = -1;

@ -80,7 +80,7 @@ class Login
*/
public static function send_password_to_user($user, $by_username = false) {
global $_configuration;
$email_subject = "[" . api_get_setting('siteName') . "] " . get_lang('LoginRequest'); // SUBJECT
$email_subject = "[" . api_get_setting('platform.site_name') . "] " . get_lang('LoginRequest'); // SUBJECT
if ($by_username) { // Show only for lost password
$user_account_list = self::get_user_account_list($user, false, $by_username); // BODY
@ -101,13 +101,13 @@ class Login
$email_body = get_lang('YourAccountParam') . " " . $portal_url . "\n\n$user_account_list";
// SEND MESSAGE
$sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
$email_admin = api_get_setting('emailAdministrator');
$sender_name = api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname'), null, PERSON_NAME_EMAIL_ADDRESS);
$email_admin = api_get_setting('platform.administrator_email');
if (api_mail_html('', $email_to, $email_subject, $email_body, $sender_name, $email_admin) == 1) {
return get_lang('YourPasswordHasBeenReset');
} else {
$admin_email = Display :: encrypted_mailto_link(api_get_setting('emailAdministrator'), api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname')));
$admin_email = Display :: encrypted_mailto_link(api_get_setting('platform.administrator_email'), api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname')));
return sprintf(get_lang('ThisPlatformWasUnableToSendTheEmailPleaseContactXForMoreInformation'), $admin_email);
}
}
@ -122,7 +122,7 @@ class Login
*/
public static function handle_encrypted_password($user, $by_username = false) {
global $_configuration;
$email_subject = "[" . api_get_setting('siteName') . "] " . get_lang('LoginRequest'); // SUBJECT
$email_subject = "[" . api_get_setting('platform.site_name') . "] " . get_lang('LoginRequest'); // SUBJECT
if ($by_username) { // Show only for lost password
$user_account_list = self::get_user_account_list($user, true, $by_username); // BODY
@ -137,10 +137,10 @@ class Login
$email_body .= $user_account_list . "\n-----------------------------------------------\n\n";
$email_body .= get_lang('PasswordEncryptedForSecurity');
$email_body .= "\n\n" . get_lang('Formula') . ",\n" . api_get_setting('administratorName') . " " . api_get_setting('administratorSurname') . "\n" . get_lang('PlataformAdmin') . " - " . api_get_setting('siteName');
$email_body .= "\n\n" . get_lang('Formula') . ",\n" . api_get_setting('platform.administrator_name') . " " . api_get_setting('platform.administrator_surname') . "\n" . get_lang('PlataformAdmin') . " - " . api_get_setting('platform.site_name');
$sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
$email_admin = api_get_setting('emailAdministrator');
$sender_name = api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname'), null, PERSON_NAME_EMAIL_ADDRESS);
$email_admin = api_get_setting('platform.administrator_email');
if (@api_mail_html('', $email_to, $email_subject, $email_body, $sender_name, $email_admin) == 1) {
@ -150,7 +150,7 @@ class Login
Display::display_confirmation_message(get_lang('YourPasswordHasBeenEmailed'));
}
} else {
$admin_email = Display :: encrypted_mailto_link(api_get_setting('emailAdministrator'), api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname')));
$admin_email = Display :: encrypted_mailto_link(api_get_setting('platform.administrator_email'), api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname')));
$message = sprintf(get_lang('ThisPlatformWasUnableToSendTheEmailPleaseContactXForMoreInformation'), $admin_email);
if (CustomPages::enabled()) {

@ -66,14 +66,14 @@ class Notification extends Model
$this->table = Database::get_main_table(TABLE_NOTIFICATION);
$this->sender_email = api_get_setting('noreply_email_address');
$this->sender_name = api_get_setting('siteName');
$this->sender_name = api_get_setting('platform.site_name');
// If no-reply email doesn't exist use the admin email
if (empty($this->sender_email)) {
$this->sender_email = api_get_setting('emailAdministrator');
$this->sender_email = api_get_setting('platform.administrator_email');
$this->sender_name = api_get_person_name(
api_get_setting('administratorName'),
api_get_setting('administratorSurname'),
api_get_setting('platform.administrator_name'),
api_get_setting('platform.administrator_surname'),
null,
PERSON_NAME_EMAIL_ADDRESS
);

@ -56,7 +56,7 @@ class PDF
// Assignments.
Display::$global_template->assign('pdf_content', $content);
$organization = api_get_setting('Institution');
$organization = api_get_setting('platform.institution');
$img = api_get_path(SYS_CSS_PATH).'themes/'.api_get_visual_theme().'/images/header-logo.png';
if (file_exists($img)) {
$img = api_get_path(WEB_CSS_PATH).'themes/'.api_get_visual_theme().'/images/header-logo.png';
@ -456,7 +456,7 @@ class PDF
$this->pdf->defaultfooterfontsize = 12; // in pts
$this->pdf->defaultfooterfontstyle = B; // blank, B, I, or BI
$this->pdf->defaultfooterline = 1; // 1 to include line below header/above footer
$platform_name = api_get_setting('Institution');
$platform_name = api_get_setting('platform.institution');
$left_content = $platform_name;
$center_content = '';
$right_content = '{PAGENO} / {nb}';

@ -365,7 +365,7 @@ class Plugin
$result = Database::query($sql);
if (!Database::num_rows($result)) {
$tool_link = "$plugin_name/start.php";
$visibility = string2binary(api_get_setting('course_create_active_tools', $plugin_name));
$visibility = string2binary(api_get_setting('course.course_create_active_tools', $plugin_name));
$sql = "INSERT INTO $t_tool VALUES
($courseId, NULL, '$plugin_name', '$tool_link', '$plugin_name.png',' ".$visibility."','0', 'squaregrey.gif','NO','_self','plugin','0')";
Database::query($sql);

@ -84,7 +84,7 @@ class SessionManager
$user_info = api_get_user_info(1);
$complete_name = $user_info['firstname'].' '.$user_info['lastname'];
$subject = api_get_setting('siteName').' - '.get_lang('ANewSessionWasCreated');
$subject = api_get_setting('platform.site_name').' - '.get_lang('ANewSessionWasCreated');
$message = get_lang('ANewSessionWasCreated')." <br /> ".get_lang('NameOfTheSession').' : '.$name;
api_mail_html($complete_name, $user_info['email'], $subject, $message);
*
@ -820,7 +820,7 @@ class SessionManager
if (!in_array($user_id, $existingUsers)) {
$subject = '['.get_setting('siteName').'] '.get_lang('YourReg').' '.get_setting('siteName');
$user_info = api_get_user_info($user_id);
$content = get_lang('Dear')." ".stripslashes($user_info['complete_name']).",\n\n".sprintf(get_lang('YouAreRegisterToSessionX'), $session_name) ." \n\n" .get_lang('Address') ." ". api_get_setting('siteName') ." ". get_lang('Is') ." : ". api_get_path(WEB_PATH) ."\n\n". get_lang('Problem'). "\n\n". get_lang('Formula').",\n\n".get_setting('administratorName')." ".get_setting('administratorSurname')."\n". get_lang('Manager'). " ".get_setting('siteName')."\nT. ".get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".get_setting('emailAdministrator');
$content = get_lang('Dear')." ".stripslashes($user_info['complete_name']).",\n\n".sprintf(get_lang('YouAreRegisterToSessionX'), $session_name) ." \n\n" .get_lang('Address') ." ". api_get_setting('platform.site_name') ." ". get_lang('Is') ." : ". api_get_path(WEB_PATH) ."\n\n". get_lang('Problem'). "\n\n". get_lang('Formula').",\n\n".get_setting('administratorName')." ".get_setting('administratorSurname')."\n". get_lang('Manager'). " ".get_setting('siteName')."\nT. ".get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".get_setting('emailAdministrator');
MessageManager::send_message($user_id, $subject, $content, array(), array(), null, null, null, null, null);
}
}

@ -839,24 +839,24 @@ class UserManager
Container::getUserManager()->updateUser($user, true);
if (!empty($email) && $send_email) {
$recipient_name = api_get_person_name($firstname, $lastname, null, PERSON_NAME_EMAIL_ADDRESS);
$emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg').' '.api_get_setting('siteName');
$emailsubject = '['.api_get_setting('platform.site_name').'] '.get_lang('YourReg').' '.api_get_setting('platform.site_name');
$sender_name = api_get_person_name(
api_get_setting('administratorName'),
api_get_setting('administratorSurname'),
api_get_setting('platform.administrator_name'),
api_get_setting('platform.administrator_surname'),
null,
PERSON_NAME_EMAIL_ADDRESS
);
$email_admin = api_get_setting('emailAdministrator');
$email_admin = api_get_setting('platform.administrator_email');
$emailbody = null;
if ($_configuration['multiple_access_urls']) {
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {
$url = api_get_current_access_url_info();
$emailbody = get_lang('Dear')." ".stripslashes(api_get_person_name($firstname, $lastname)).",\n\n".get_lang('YouAreReg')." ". api_get_setting('siteName') ." ".get_lang('WithTheFollowingSettings')."\n\n".get_lang('Username')." : ". $username . (($reset_password > 0) ? "\n". get_lang('Pass')." : ".stripslashes($original_password) : "") . "\n\n" .get_lang('Address') ." ". api_get_setting('siteName') ." ". get_lang('Is') ." : ". $url['url'] ."\n\n". get_lang('Problem'). "\n\n". get_lang('Formula').",\n\n".api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n". get_lang('Manager'). " ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".api_get_setting('emailAdministrator');
$emailbody = get_lang('Dear')." ".stripslashes(api_get_person_name($firstname, $lastname)).",\n\n".get_lang('YouAreReg')." ". api_get_setting('platform.site_name') ." ".get_lang('WithTheFollowingSettings')."\n\n".get_lang('Username')." : ". $username . (($reset_password > 0) ? "\n". get_lang('Pass')." : ".stripslashes($original_password) : "") . "\n\n" .get_lang('Address') ." ". api_get_setting('platform.site_name') ." ". get_lang('Is') ." : ". $url['url'] ."\n\n". get_lang('Problem'). "\n\n". get_lang('Formula').",\n\n".api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname'))."\n". get_lang('Manager'). " ".api_get_setting('platform.site_name')."\nT. ".api_get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".api_get_setting('platform.administrator_email');
}
} else {
$emailbody=get_lang('Dear')." ".stripslashes(api_get_person_name($firstname, $lastname)).",\n\n".get_lang('YouAreReg')." ". api_get_setting('siteName') ." ".get_lang('WithTheFollowingSettings')."\n\n".get_lang('Username')." : ". $username . (($reset_password > 0) ? "\n". get_lang('Pass')." : ".stripslashes($original_password) : "") . "\n\n" .get_lang('Address') ." ". api_get_setting('siteName') ." ". get_lang('Is') ." : ". api_get_path(WEB_PUBLIC_PATH) ."\n\n". get_lang('Problem'). "\n\n". get_lang('Formula').",\n\n".api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n". get_lang('Manager'). " ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".api_get_setting('emailAdministrator');
$emailbody=get_lang('Dear')." ".stripslashes(api_get_person_name($firstname, $lastname)).",\n\n".get_lang('YouAreReg')." ". api_get_setting('platform.site_name') ." ".get_lang('WithTheFollowingSettings')."\n\n".get_lang('Username')." : ". $username . (($reset_password > 0) ? "\n". get_lang('Pass')." : ".stripslashes($original_password) : "") . "\n\n" .get_lang('Address') ." ". api_get_setting('platform.site_name') ." ". get_lang('Is') ." : ". api_get_path(WEB_PUBLIC_PATH) ."\n\n". get_lang('Problem'). "\n\n". get_lang('Formula').",\n\n".api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname'))."\n". get_lang('Manager'). " ".api_get_setting('platform.site_name')."\nT. ".api_get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".api_get_setting('platform.administrator_email');
}
api_mail_html($recipient_name, $email, $emailsubject, $emailbody, $sender_name, $email_admin);
}
@ -892,13 +892,13 @@ class UserManager
if ($send_email_if_activated) {
$user_info = api_get_user_info($user_id);
$recipient_name = api_get_person_name($user_info['firstname'], $user_info['lastname'], null, PERSON_NAME_EMAIL_ADDRESS);
$emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg').' '.api_get_setting('siteName');
$emailsubject = '['.api_get_setting('platform.site_name').'] '.get_lang('YourReg').' '.api_get_setting('platform.site_name');
$emailbody=get_lang('Dear')." ".stripslashes($recipient_name).",\n\n";
$emailbody.=sprintf(get_lang('YourAccountOnXHasJustBeenApprovedByOneOfOurAdministrators'), api_get_setting('siteName'))."\n";
$emailbody.=sprintf(get_lang('YourAccountOnXHasJustBeenApprovedByOneOfOurAdministrators'), api_get_setting('platform.site_name'))."\n";
$emailbody.=sprintf(get_lang('YouCanNowLoginAtXUsingTheLoginAndThePasswordYouHaveProvided'), api_get_path(WEB_PATH)).",\n\n";
$emailbody.=get_lang('HaveFun')."\n\n";
$emailbody.=get_lang('Problem'). "\n\n". get_lang('Formula');
$emailbody.= api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n". get_lang('Manager'). " ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".api_get_setting('emailAdministrator');
$emailbody.= api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname'))."\n". get_lang('Manager'). " ".api_get_setting('platform.site_name')."\nT. ".api_get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".api_get_setting('platform.administrator_email');
MessageManager::send_message_simple($user_id, $emailsubject, $emailbody);
}

@ -1,534 +0,0 @@
<?php
/* For licensing terms, see /license.txt */
/**
* Chamilo installation
* This script could be loaded via browser using the URL: main/install/index.php
* or via CM
*
* @package chamilo.install
*/
require_once __DIR__.'/../../vendor/autoload.php';
require_once __DIR__.'/../inc/lib/api.lib.php';
require_once __DIR__.'/install.lib.php';
$versionData = require_once __DIR__.'/version.php';
error_reporting(-1);
ini_set('display_errors', '1');
set_time_limit(0);
use Symfony\Component\Console\Output\Output;
use Symfony\Component\HttpFoundation\Request;
use Chamilo\Component\Console\Output\BufferedOutput;
use Chamilo\Framework\Application;
use Chash\Command\Installation\InstallCommand;
use Chash\Command\Installation\UpgradeCommand;
$app = new Application();
// Setting paths
$app['path.base'] = dirname(dirname(__DIR__)).'/';
$app['path.app'] = $app['path.base'].'src/Chamilo/';
$app['path.config'] = $app['path.base'].'config/';
$app->bindInstallPaths(require $app['path.app'].'paths.php');
$app->readConfigurationFiles();
$app['path.data'] = isset($_configuration['path.data']) ? $_configuration['path.data'] : $app['path.data'];
$app['path.courses'] = isset($_configuration['path.courses']) ? $_configuration['path.courses'] : $app['path.courses'];
$app['path.logs'] = isset($_configuration['path.logs']) ? $_configuration['path.logs'] : $app['path.logs'];
$app['path.temp'] = isset($_configuration['path.temp']) ? $_configuration['path.temp'] : $app['path.temp'];
// Registering services
$app['debug'] = true;
$app->register(new Silex\Provider\UrlGeneratorServiceProvider());
$app->register(new Silex\Provider\FormServiceProvider());
$app->register(new Silex\Provider\SessionServiceProvider());
$app->register(new Silex\Provider\DoctrineServiceProvider());
$app->register(new Silex\Provider\TranslationServiceProvider());
$app['translator'] = $app->share($app->extend('translator', function ($translator, $app) {
/*$translator->addLoader('pofile', new PoFileLoader());
$file = 'main/locale/'.$locale.'.po';
$translator->addResource('pofile', $file, $locale);*/
/*$translator->addLoader('yaml', new Symfony\Component\Translation\Loader\YamlFileLoader());
$translator->addResource('yaml', __DIR__.'/lang/fr.yml', 'fr');
$translator->addResource('yaml', __DIR__.'/lang/en.yml', 'en');
$translator->addResource('yaml', __DIR__.'/lang/es.yml', 'es');*/
return $translator;
}));
$app->register(
new Silex\Provider\TwigServiceProvider(),
array(
'twig.path' => array(
'templates'
),
// twitter bootstrap form twig templates
//'twig.form.templates' => array('form_div_layout.html.twig', '../template/default/form/form_custom_template.tpl'),
'twig.options' => array(
'debug' => $app['debug'],
'charset' => 'utf-8',
'strict_variables' => false,
'autoescape' => true,
//'cache' => $app['debug'] ? false : $app['twig.cache.path'],
'cache' => false, // no cache during installation sorry
'optimizations' => -1, // turn on optimizations with -1
)
)
);
use Knp\Provider\ConsoleServiceProvider;
$app->register(new ConsoleServiceProvider(), array(
'console.name' => 'Chamilo',
'console.version' => '1.0.0',
'console.project_directory' => __DIR__.'/..'
));
// Adding commands.
/** @var Knp\Console\Application $console */
$console = $app['console'];
$console->addCommands(
array(
// DBAL Commands.
new \Doctrine\DBAL\Tools\Console\Command\RunSqlCommand(),
new \Doctrine\DBAL\Tools\Console\Command\ImportCommand(),
// Migrations Commands.
new \Doctrine\DBAL\Migrations\Tools\Console\Command\DiffCommand(),
new \Doctrine\DBAL\Migrations\Tools\Console\Command\ExecuteCommand(),
new \Doctrine\DBAL\Migrations\Tools\Console\Command\GenerateCommand(),
new \Doctrine\DBAL\Migrations\Tools\Console\Command\MigrateCommand(),
new \Doctrine\DBAL\Migrations\Tools\Console\Command\StatusCommand(),
new \Doctrine\DBAL\Migrations\Tools\Console\Command\VersionCommand(),
// Chash commands.
new UpgradeCommand(),
new InstallCommand(),
new Chash\Command\Files\CleanCoursesFilesCommand(),
new Chash\Command\Files\CleanTempFolderCommand(),
new Chash\Command\Files\CleanConfigFilesCommand(),
new Chash\Command\Files\MailConfCommand(),
new Chash\Command\Files\SetPermissionsAfterInstallCommand(),
new Chash\Command\Files\GenerateTempFileStructureCommand(),
)
);
$helpers = array(
'configuration' => new Chash\Helpers\ConfigurationHelper()
);
$helperSet = $console->getHelperSet();
foreach ($helpers as $name => $helper) {
$helperSet->set($helper, $name);
}
$blockInstallation = function () use ($app) {
if (file_exists($app['path.config'].'configuration.php')) {
return $app->abort(500, "A Chamilo installation was found. You can't reinstall.");
}
$defaultTimeZone = ini_get('date.timezone');
if (empty($defaultTimeZone)) {
$app->abort(500, "Please set your 'date.timezone' setting in your php.ini file");
}
// Check the PHP version.
if (api_check_php_version() == false) {
$app->abort(500, "Incorrect PHP version.");
}
if (api_check_php_version() == false) {
$app->abort(500, "Incorrect PHP version.");
}
// @todo move this in the req page
if (extension_loaded('json') == false) {
$app->abort(500, "php5-json extension must be installed.");
}
};
// Controllers
$app->match('/', function () use ($app) {
// in order to get a list of countries
//var_dump(Symfony\Component\Intl\Intl::getRegionBundle()->getCountryNames());
$languages = array(
'english' => 'english',
'spanish' => 'spanish',
'french' => 'french'
);
$request = $app['request'];
$form = $app['form.factory']->createBuilder('form')
->add('languages', 'choice', array(
'choices' => $languages,
'required' => true,
))
->add('continue', 'submit', array('attr' => array('class' => 'btn')))
->getForm();
if ('POST' == $request->getMethod()) {
$url = $app['url_generator']->generate('requirements');
return $app->redirect($url);
}
return $app['twig']->render(
'index.tpl',
array('form' => $form->createView())
);
})
->bind('root') // need because api_get_path()
->before($blockInstallation);
$app->match('/requirements', function () use ($app) {
$allowedToContinue = checkRequiredSettings();
$request = $app['request'];
$builder = $app['form.factory']->createBuilder('form');
if ($allowedToContinue) {
$builder->add('continue', 'submit', array('attr' => array('class' => 'btn btn-default')));
} else {
$message = $app['translator']->trans("You need to check your server settings.");
$app['session']->getFlashBag()->add('error', $message);
}
$form = $builder->getForm();
//$req = display_requirements($app, 'new');
if (phpversion() < REQUIRED_PHP_VERSION) {
$phpError = '<strong><font color="red">'.translate('PHPVersionError').'</font></strong>';
} else {
$phpError = '<strong><font color="green">'.translate('PHPVersionOK').' '.phpversion().'</font></strong>';
}
if ('POST' == $request->getMethod()) {
$url = $app['url_generator']->generate('check-database');
return $app->redirect($url);
}
$requirements = drawRequirements($app['translator']);
$options = drawOptions($app['translator']);
$permissions = drawPermissionsSettings($app);
return $app['twig']->render(
'requirements.tpl',
array(
'form' => $form->createView(),
'required_php_version' => REQUIRED_PHP_VERSION,
'required_php_version_validation' => phpversion() < REQUIRED_PHP_VERSION,
'php_version' => phpversion(),
'requirements' => $requirements,
'options' => $options,
'permissions' => $permissions,
'php_error' => $phpError,
'allow_to_continue' => $allowedToContinue
)
);
})->bind('requirements');
$app->match('/check-database', function () use ($app) {
/** @var Request $request */
$request = $app['request'];
$command = $app['console']->get('chamilo:install');
$data = $command->getDatabaseSettingsParams();
$builder = $app['form.factory']->createBuilder('form');
foreach ($data as $key => $value) {
$value['attributes'] = isset($value['attributes']) && is_array($value['attributes']) ? $value['attributes'] : array();
$builder->add($key, $value['type'], $value['attributes']);
}
$builder->add('check', 'submit', array('attr' => array('class' => 'btn')));
$form = $builder->getForm();
if ('POST' == $request->getMethod()) {
$form->bind($request);
if ($form->isValid()) {
$parameters = $form->getData();
/** @var InstallCommand $command */
$command = $app['console']->get('chamilo:install');
$command->setDatabaseSettings($parameters);
$connection = $command->getUserAccessConnectionToHost();
try {
$sm = $connection->getSchemaManager();
$databases = $sm->listDatabases();
if (in_array($parameters['dbname'], $databases)) {
$message = $app['translator']->trans(
'The database "%s" being used and is going to be deleted!!',
array('%s' => $parameters['dbname'])
);
$app['session']->getFlashBag()->add('warning', $message);
} else {
$message = $app['translator']->trans(
'A database "%s" is going to be created',
array('%s' => $parameters['dbname'])
);
$app['session']->getFlashBag()->add('warning', $message);
}
$app['session']->getFlashBag()->add('success', 'Connection ok!');
$app['session']->set('database_settings', $parameters);
$url = $app['url_generator']->generate('portal-settings');
return $app->redirect($url);
} catch (Exception $e) {
$app['session']->getFlashBag()->add(
'success',
'Connection error !'.$e->getMessage()
);
}
}
}
return $app['twig']->render(
'check-database.tpl',
array('form' => $form->createView())
);
})->bind('check-database');
$app->match('/portal-settings', function () use ($app) {
/** @var Request $request */
$request = $app['request'];
/** @var InstallCommand $command */
$command = $app['console']->get('chamilo:install');
$builder = $app['form.factory']->createBuilder('form');
$data = $command->getPortalSettingsParams();
$data['institution_url']['attributes']['data'] = str_replace('main/install/', '', $request->getUriForPath('/'));
$permissionNewDir = $app['session']->get('permissions_for_new_directories');
if ($permissionNewDir) {
$data['permissions_for_new_directories']['attributes']['data'] = $permissionNewDir;
}
$permissionNewFiles = $app['session']->get('permissions_for_new_files');
if ($permissionNewFiles) {
$data['permissions_for_new_files']['attributes']['data'] = $permissionNewFiles;
}
foreach ($data as $key => $value) {
$value['attributes'] = isset($value['attributes']) && is_array($value['attributes']) ? $value['attributes'] : array();
$builder->add($key, $value['type'], $value['attributes']);
}
$builder->add('continue', 'submit', array('attr' => array('class' => 'btn')));
$form = $builder->getForm();
if ('POST' == $request->getMethod()) {
$form->bind($request);
if ($form->isValid()) {
$data = $form->getData();
/* Drive-by sanitizing of the site URL:
* Remove excessive trailing slashes that could break the
* RewriteBase in .htaccess.
*
* See writeHtaccess() in
* vendor/chamilo/chash/src/Chash/Command/Installation/CommonCommand.php
*/
$data['institution_url'] = rtrim($data['institution_url'], '/').'/';
$app['session']->set('portal_settings', $data);
$url = $app['url_generator']->generate('admin-settings');
return $app->redirect($url);
}
}
return $app['twig']->render('settings.tpl', array('form' => $form->createView()));
})->bind('portal-settings');
// Admin settings.
$app->match('/admin-settings', function () use ($app) {
$request = $app['request'];
/** @var InstallCommand $command */
$command = $app['console']->get('chamilo:install');
$data = $command->getAdminSettingsParams();
$builder = $app['form.factory']->createBuilder('form', $data);
foreach ($data as $key => $value) {
$builder->add($key, $value['type'], $value['attributes']);
}
$builder->add('continue', 'submit', array('attr' => array('class' => 'btn')));
$form = $builder->getForm();
if ('POST' == $request->getMethod()) {
$form->bind($request);
if ($form->isValid()) {
$data = $form->getData();
$app['session']->set('admin_settings', $data);
$url = $app['url_generator']->generate('resume');
return $app->redirect($url);
}
}
return $app['twig']->render('settings.tpl', array('form' => $form->createView()));
})->bind('admin-settings');
// Resume before installing.
$app->match('/resume', function () use ($app) {
$request = $app['request'];
$data = array();
$portalSettings = $app['session']->get('portal_settings');
$databaseSettings = $app['session']->get('database_settings');
$adminSettings = $app['session']->get('admin_settings');
if (!empty($portalSettings) && !empty($databaseSettings) && !empty($adminSettings)) {
$form = $app['form.factory']->createBuilder('form', $data)
->add(
'install',
'submit',
array(
'label' => 'Install',
'attr' => array('class' => 'btn btn-success')
)
)
->getForm();
if ('POST' == $request->getMethod()) {
$url = $app['url_generator']->generate('installing');
return $app->redirect($url);
}
return $app['twig']->render(
'resume.tpl',
array(
'form' => $form->createView(),
'portal_settings' => $portalSettings,
'database_settings' => $databaseSettings,
'admin_settings' => $adminSettings
)
);
} else {
$url = $app['url_generator']->generate('check-database');
return $app->redirect($url);
}
})->bind('resume');
// Installation process.
$app->match('/installing', function () use ($app, $versionData) {
$portalSettings = $app['session']->get('portal_settings');
$adminSettings = $app['session']->get('admin_settings');
$databaseSettings = $app['session']->get('database_settings');
/** @var InstallCommand $command */
$command = $app['console']->get('chamilo:install');
$def = $command->getDefinition();
$input = new Symfony\Component\Console\Input\ArrayInput(
array(
'name',
'path' => realpath(__DIR__.'/../../').'/',
'version' => $versionData['version']
),
$def
);
$output = new BufferedOutput();
$command->setPortalSettings($portalSettings);
$command->setDatabaseSettings($databaseSettings);
$command->setAdminSettings($adminSettings);
$result = $command->run($input, $output);
if ($result == 1) {
$output = $output->getBuffer();
$app['session']->getFlashBag()->add('success', 'Installation finished');
$app['session']->set('output', $output);
$url = $app['url_generator']->generate('finish');
return $app->redirect($url);
} else {
$app['session']->getFlashBag()->add(
'error',
'There was an error during installation, please check your settings.'
);
$app['session']->getFlashBag()->add('error', $output->lastMessage);
$url = $app['url_generator']->generate('check-database');
return $app->redirect($url);
}
})->bind('installing');
// Finish installation.
$app->get('/finish', function () use ($app) {
$output = $app['session']->get('output');
$message = $app['translator']->trans(
'To protect your site, make the whole %s directory read-only (chmod 0555 on Unix/Linux)',
array('%s' => $app['path.config'])
);
$app['session']->getFlashBag()->add('warning', $message);
$message = $app['translator']->trans(
'Delete the %s directory.',
array('%s' => $app['path.base'].'install')
);
$app['session']->getFlashBag()->add('warning', $message);
return $app['twig']->render('finish.tpl', array('output' => $output));
})->bind('finish');
// Middlewares.
$app->before(
function () use ($app) {
}
);
// Errors
/*
$app->error(function (\Exception $e, $code) use ($app) {
switch ($code) {
case 404:
$message = 'The requested page could not be found.';
break;
default:
// $message = 'We are sorry, but something went terribly wrong.';
$message = $e->getMessage();
}
$app['twig']->addGlobal('code', $code);
$app['twig']->addGlobal('message', $message);
return $app['twig']->render('error.tpl');
});
*/
if (PHP_SAPI == 'cli') {
$console->run();
} else {
$app->run();
}

@ -1,29 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
/**
* Chamilo LMS
* This file contains functions used by the install and upgrade scripts.
*/
/**
* Check if current system is allowed to install
* @return bool
*/
function checkRequiredSettings()
{
$requirements = getRequirements();
$requiredSettings = $requirements['required'];
foreach ($requiredSettings as $extension => $options) {
if (!extension_loaded($extension)) {
return false;
}
}
return true;
}
/**
* @param Symfony\Component\Translation\Translator $translator
@ -109,31 +86,6 @@ function drawOptions($translator)
function getRequirements()
{
return
array(
'required' => array(
//'session' => array('url' => 'http://php.net/manual/en/book.session.php', 'recommend' => Display::label('OFF', 'success')),
'mysql' => array('url' => 'http://php.net/manual/en/book.mysql.php'),
'curl' => array('url' => 'http://php.net/manual/fr/book.curl.php'),
'zlib' => array('url' => 'http://php.net/manual/en/book.zlib.php'),
'pcre' => array('url' => 'http://php.net/manual/en/book.pcre.php'),
'xml' => array('url' => 'http://php.net/manual/en/book.xml.php'),
'mbstring' => array('url' => 'http://php.net/manual/en/book.mbstring.php'),
'iconv' => array('url' => 'http://php.net/manual/en/book.iconv.php'),
'intl' => array('url' => 'http://php.net/manual/en/book.intl.php'),
'gd' => array('url' => 'http://php.net/manual/en/book.image.php'),
'json' => array('url' => 'http://php.net/manual/en/book.json.php')
),
'optional' => array(
'imagick' => array('url' => 'http://php.net/manual/en/book.imagick.php'),
'ldap' => array('url' => 'http://php.net/manual/en/book.ldap.php'),
'xapian' => array('url' => 'http://php.net/manual/en/book.xapian.php')
)
);
}
/**
* @param Symfony\Component\Translation\Translator $translator
* @return array

@ -1680,15 +1680,13 @@ class MySpace {
// Sending emails
if ($sendMail) {
$i = 0;
$from = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
$fromEmail = api_get_setting('emailAdministrator');
$from = api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname'), null, PERSON_NAME_EMAIL_ADDRESS);
$fromEmail = api_get_setting('platform.administrator_email');
foreach ($users as $user) {
$emailto = api_get_person_name($user['FirstName'], $user['LastName'], null, PERSON_NAME_EMAIL_ADDRESS).' <'.$user['Email'].'>';
$emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg').' '.api_get_setting('siteName');
$emailbody = get_lang('Dear').' '.api_get_person_name($user['FirstName'], $user['LastName']).",\n\n".get_lang('YouAreReg')." ".api_get_setting('siteName')." ".get_lang('WithTheFollowingSettings')."\n\n".get_lang('Username')." : $user[UserName]\n".get_lang('Pass')." : $user[Password]\n\n".get_lang('Address')." ".api_get_setting('siteName')." ".get_lang('Is')." : ".api_get_path(WEB_PATH)." \n\n".get_lang('Problem')."\n\n".get_lang('Formula').",\n\n".api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n".get_lang('Manager')." ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n".get_lang('Email')." : ".api_get_setting('emailAdministrator');
//$emailheaders = 'From: '.api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS).' <'.api_get_setting('emailAdministrator').">\n";
//$emailheaders .= 'Reply-To: '.api_get_setting('emailAdministrator');
$emailsubject = '['.api_get_setting('platform.site_name').'] '.get_lang('YourReg').' '.api_get_setting('platform.site_name');
$emailbody = get_lang('Dear').' '.api_get_person_name($user['FirstName'], $user['LastName']).",\n\n".get_lang('YouAreReg')." ".api_get_setting('platform.site_name')." ".get_lang('WithTheFollowingSettings')."\n\n".get_lang('Username')." : $user[UserName]\n".get_lang('Pass')." : $user[Password]\n\n".get_lang('Address')." ".api_get_setting('platform.site_name')." ".get_lang('Is')." : ".api_get_path(WEB_PATH)." \n\n".get_lang('Problem')."\n\n".get_lang('Formula').",\n\n".api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname'))."\n".get_lang('Manager')." ".api_get_setting('platform.site_name')."\nT. ".api_get_setting('administratorTelephone')."\n".get_lang('Email')." : ".api_get_setting('platform.administrator_email');
api_mail_html($emailto, $recipient_email, $emailsubject, $emailbody, $from, $fromEmail);

@ -82,7 +82,7 @@ abstract class OpenofficeDocument extends learnpath
if ($ppt2lp_host == 'localhost') {
move_uploaded_file($file['tmp_name'], $this->base_work_dir.'/'.$this->file_path);
//var_dump( $this->base_work_dir.$this->created_dir.$this->file_path);
$perm = api_get_setting('permissions_for_new_files');
$perm = api_get_setting('document.permissions_for_new_files');
if (IS_WINDOWS_OS) { // IS_WINDOWS_OS has been defined in api.lib.php
$converter_path = str_replace('/', '\\', api_get_path(SYS_PATH).'main/inc/lib/ppt2png');

@ -167,18 +167,18 @@ if($register) {
$emailto = "$lastname_form $firstname_form <$email_form>";
$emailfromaddr = $administratorEmail;
$emailfromname = api_get_setting('siteName');
$emailsubject = get_lang('YourReg').' '.api_get_setting('siteName');
$emailfromname = api_get_setting('platform.site_name');
$emailsubject = get_lang('YourReg').' '.api_get_setting('platform.site_name');
$emailheaders = "From: ".api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS)." <".$administratorEmail.">\n";
$emailheaders = "From: ".api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname'), null, PERSON_NAME_EMAIL_ADDRESS)." <".$administratorEmail.">\n";
$emailheaders .= "Reply-To: ".$administratorEmail."\n";
$emailheaders .= "Return-Path: ".$administratorEmail."\n";
$emailheaders .= "charset: ".api_get_system_encoding()."\n";
$emailheaders .= "X-Mailer: PHP/" . phpversion() . "\n";
$emailheaders .= "X-Sender-IP: $REMOTE_ADDR"; // (small security precaution...)
$recipient_name = api_get_person_name($firstname_form, $lastname_form, null, PERSON_NAME_EMAIL_ADDRESS);
$sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
$email_admin = api_get_setting('emailAdministrator');
$sender_name = api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname'), null, PERSON_NAME_EMAIL_ADDRESS);
$email_admin = api_get_setting('platform.administrator_email');
$portal_url = api_get_path(WEB_PUBLIC_PATH);
if ($_configuration['multiple_access_urls']) {
@ -191,12 +191,12 @@ if($register) {
if ($courseRegSucceed)
{
$emailbody = get_lang('Dear')." ".stripslashes(api_get_person_name($firstname_form, $lastname_form)).",\n".get_lang('OneResp')." $currentCourseName ".get_lang('RegYou')." ".api_get_setting('siteName')." ".get_lang('WithTheFollowingSettings')."\n\n".get_lang('Username')." : $username_form\n".get_lang('Pass').": $password_form\n".get_lang('Address')." ".api_get_setting('siteName')." ".get_lang('Is').": ".$portal_url."\n".get_lang('Problem')."\n".get_lang('Formula').",\n".api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n".get_lang('Manager')." ".api_get_setting('siteName')." \nT. ".api_get_setting('administratorTelephone')."\n".get_lang('Email').": ".api_get_setting('emailAdministrator')."\n";
$emailbody = get_lang('Dear')." ".stripslashes(api_get_person_name($firstname_form, $lastname_form)).",\n".get_lang('OneResp')." $currentCourseName ".get_lang('RegYou')." ".api_get_setting('platform.site_name')." ".get_lang('WithTheFollowingSettings')."\n\n".get_lang('Username')." : $username_form\n".get_lang('Pass').": $password_form\n".get_lang('Address')." ".api_get_setting('platform.site_name')." ".get_lang('Is').": ".$portal_url."\n".get_lang('Problem')."\n".get_lang('Formula').",\n".api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname'))."\n".get_lang('Manager')." ".api_get_setting('platform.site_name')." \nT. ".api_get_setting('administratorTelephone')."\n".get_lang('Email').": ".api_get_setting('platform.administrator_email')."\n";
$message = get_lang('TheU')." ".stripslashes(api_get_person_name($firstname_form, $lastname_form))." ".get_lang('AddedToCourse')."<a href=\"user.php\">".get_lang('BackUser')."</a>\n";
}
else
{
$emailbody = get_lang('Dear')." ".api_get_person_name($firstname_form, $lastname_form).",\n ".get_lang('YouAreReg')." ".api_get_setting('siteName')." ".get_lang('WithTheFollowingSettings')."\n\n".get_lang('Username')." : $username_form\n".get_lang('Pass').": $password_form\n".get_lang('Address')." ".api_get_setting('siteName')." ".get_lang('Is').": ".$portal_url."\n".get_lang('Problem')."\n".get_lang('Formula').",\n".api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n".get_lang('Manager')." ".api_get_setting('siteName')." \nT. ".api_get_setting('administratorTelephone')."\n".get_lang('Email').": ".api_get_setting('emailAdministrator')."\n";
$emailbody = get_lang('Dear')." ".api_get_person_name($firstname_form, $lastname_form).",\n ".get_lang('YouAreReg')." ".api_get_setting('platform.site_name')." ".get_lang('WithTheFollowingSettings')."\n\n".get_lang('Username')." : $username_form\n".get_lang('Pass').": $password_form\n".get_lang('Address')." ".api_get_setting('platform.site_name')." ".get_lang('Is').": ".$portal_url."\n".get_lang('Problem')."\n".get_lang('Formula').",\n".api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname'))."\n".get_lang('Manager')." ".api_get_setting('platform.site_name')." \nT. ".api_get_setting('administratorTelephone')."\n".get_lang('Email').": ".api_get_setting('platform.administrator_email')."\n";
$message = stripslashes(api_get_person_name($firstname_form, $lastname_form))." ".get_lang('AddedU');
}

@ -2492,8 +2492,8 @@ function WSCreateCourseByTitle($params)
$title = $course_param['title'];
$category_code = 'LANG'; // TODO: A hard-coded value.
$wanted_code = '';
$tutor_firstname = api_get_setting('administratorName');
$tutor_lastname = api_get_setting('administratorSurname');
$tutor_firstname = api_get_setting('platform.administrator_name');
$tutor_lastname = api_get_setting('platform.administrator_surname');
$course_language = 'spanish'; // TODO: Incorrect default value, it should 'english'.
if (!empty($course_param['course_language'])) {
$course_language = $course_param['course_language'];

@ -1558,8 +1558,8 @@ class Wiki
$userinfo = api_get_user_info($row['user_id']); //$row['user_id'] obtained from tbl_wiki_mailcue
$name_to = $userinfo['complete_name'];
$email_to = $userinfo['email'];
$sender_name = api_get_setting('emailAdministrator');
$sender_email = api_get_setting('emailAdministrator');
$sender_name = api_get_setting('platform.administrator_email');
$sender_email = api_get_setting('platform.administrator_email');
$email_subject = get_lang('EmailWikiChanges').' - '.$_course['official_code'];
$email_body = get_lang('DearUser').' '.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).',<br /><br />';
if($session_id==0){

@ -299,7 +299,7 @@ if ($form->validate()) {
$user_list = CourseManager::get_user_list_from_course_code(api_get_course_id(), $session_id, null, null, 2);
}
$subject = "[" . api_get_setting('siteName') . "] ".get_lang('SendMailBody')."\n".get_lang('CourseName')." : ".$_course['name']." ";
$subject = "[" . api_get_setting('platform.site_name') . "] ".get_lang('SendMailBody')."\n".get_lang('CourseName')." : ".$_course['name']." ";
foreach ($user_list as $user_data) {
$to_user_id = $user_data['user_id'];

@ -1872,12 +1872,12 @@ function get_work_user_list($start, $limit, $column, $direction, $work_id, $wher
function send_reminder_users_without_publication($task_data)
{
global $_course;
$sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
$sender_name = api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname'), null, PERSON_NAME_EMAIL_ADDRESS);
$task_id = $task_data['id'];
$task_title = !empty($task_data['title']) ? $task_data['title'] : basename($task_data['url']);
$subject = '[' . api_get_setting('siteName') . '] ';
$subject = '[' . api_get_setting('platform.site_name') . '] ';
// The body can be as long as you wish, and any combination of text and variables
@ -1914,7 +1914,7 @@ function send_email_on_homework_creation($course_id) {
} else {
$students = CourseManager::get_student_list_from_course_code($course_id, true, $session_id);
}
$emailsubject = '[' . api_get_setting('siteName') . '] '.get_lang('HomeworkCreated');
$emailsubject = '[' . api_get_setting('platform.site_name') . '] '.get_lang('HomeworkCreated');
$currentUser = api_get_user_info(api_get_user_id());
if (!empty($students)) {
foreach($students as $student) {

@ -153,7 +153,7 @@ class IndexController extends BaseController
/*var_dump($settingManager->getSetting('platform.institution'));
$settings = $settingManager->loadSettings('platform');
var_dump($settings->get('institution'));
var_dump(api_get_setting('institution'));*/
var_dump(api_get_setting('platform.institution'));*/
$pageController->returnSkillsLinks();

@ -47,7 +47,7 @@ class PageController
}
$img_array = UserManager::get_picture_user($user_id, $img_array['file'], 100, USER_IMAGE_SIZE_ORIGINAL);
$profile_content = null;
if (api_get_setting('allow_social_tool') == 'true') {
if (api_get_setting('social.allow_social_tool') == 'true') {
if (!$no_image) {
$profile_content .= '<a style="text-align:center" href="'.api_get_path(WEB_CODE_PATH).'social/home.php">
<img src="'.$img_array['file'].'"></a>';
@ -73,7 +73,8 @@ class PageController
$show_course_link = false;
$display_add_course_link = false;
if ((api_get_setting('allow_users_to_create_courses') == 'true' && api_is_allowed_to_create_course() ||
if ((api_get_setting('course.allow_users_to_create_courses') == 'true'
&& api_is_allowed_to_create_course() ||
api_is_platform_admin())
) {
$display_add_course_link = true;
@ -82,7 +83,8 @@ class PageController
if (api_is_platform_admin() || api_is_course_admin() || api_is_allowed_to_create_course()) {
$show_course_link = true;
} else {
if (api_get_setting('allow_students_to_browse_courses') == 'true') {
if (api_get_setting('display.allow_students_to_browse_courses') ==
'true') {
$show_course_link = true;
}
}
@ -93,7 +95,8 @@ class PageController
if ($display_add_course_link) {
$my_account_content[] = array(
'href' => api_get_path(WEB_CODE_PATH).'create_course/add_course.php',
'title' => api_get_setting('course_validation') == 'true' ? get_lang('CreateCourseRequest') : get_lang(
'title' => api_get_setting('course.course_validation') ==
'true' ? get_lang('CreateCourseRequest') : get_lang(
'CourseCreate'
)
);
@ -147,7 +150,8 @@ class PageController
$showSessionBlock = true;
}
if (api_get_setting('allow_teachers_to_create_sessions') == 'true' && api_is_allowed_to_create_course()) {
if (api_get_setting('session.allow_teachers_to_create_sessions') ==
'true' && api_is_allowed_to_create_course()) {
$showSessionBlock = true;
}
@ -170,8 +174,8 @@ class PageController
*/
public function setProfileBlock()
{
if (api_get_setting('allow_message_tool') == 'true') {
if (api_get_setting('allow_social_tool') == 'true') {
if (api_get_setting('message.allow_message_tool') == 'true') {
if (api_get_setting('social.allow_social_tool') == 'true') {
$this->show_right_block(get_lang('Profile'), array(), 'profile_social_block');
} else {
$this->show_right_block(get_lang('Profile'), array(), 'profile_block');
@ -247,14 +251,15 @@ class PageController
*/
public function returnSkillsLinks()
{
if (api_get_setting('allow_skills_tool') == 'true') {
if (api_get_setting('skill.allow_skills_tool') == 'true') {
$content = array();
$content[] = array(
'title' => get_lang('MySkills'),
'href' => api_get_path(WEB_CODE_PATH).'social/skills_wheel.php'
);
if (api_get_setting('allow_hr_skills_management') == 'true' || api_is_platform_admin()) {
if (api_get_setting('skill.allow_hr_skills_management') == 'true'
|| api_is_platform_admin()) {
$content[] = array(
'title' => get_lang('ManageSkills'),
'href' => api_get_path(WEB_CODE_PATH).'admin/skills_wheel.php'
@ -327,7 +332,7 @@ class PageController
public function return_search_block()
{
$html = '';
if (api_get_setting('search_enabled') == 'true') {
if (api_get_setting('search.search_enabled') == 'true') {
$html .= '<div class="searchbox">';
$search_btn = get_lang('Search');
$search_content = '<br />
@ -763,15 +768,16 @@ class PageController
$courses_list_string .= "<li>\n";
$courses_list_string .= '<a href="'.$web_course_path.$course['directory'].'/">'.$course['title'].'</a><br />';
$course_details = array();
if (api_get_setting('display_coursecode_in_courselist') == 'true') {
if (api_get_setting('course.display_coursecode_in_courselist') ==
'true') {
$course_details[] = $course['visual_code'];
}
if (api_get_setting('display_teacher_in_courselist') == 'true') {
if (api_get_setting('course.display_teacher_in_courselist') ==
'true') {
$course_details[] = $course['tutor_name'];
}
if (api_get_setting(
'show_different_course_language'
) == 'true' && $course['course_language'] != api_get_setting('platformLanguage')
if (api_get_setting('display.show_different_course_language') ==
'true' && $course['course_language'] != api_get_setting('platformLanguage')
) {
$course_details[] = $course['course_language'];
}
@ -813,18 +819,13 @@ class PageController
$courses_list_string .= '</a><br />';
}
$course_details = array();
if (api_get_setting('display_coursecode_in_courselist') == 'true') {
if (api_get_setting('course.display_coursecode_in_courselist') == 'true') {
$course_details[] = $course['visual_code'];
}
// if (api_get_setting('display_coursecode_in_courselist') == 'true' && api_get_setting('display_teacher_in_courselist') == 'true') {
// $courses_list_string .= ' - ';
// }
if (api_get_setting('display_teacher_in_courselist') == 'true') {
if (api_get_setting('course.display_teacher_in_courselist') == 'true') {
$course_details[] = $course['tutor_name'];
}
if (api_get_setting(
'show_different_course_language'
) == 'true' && $course['course_language'] != api_get_setting('platformLanguage')
if (api_get_setting('display.show_different_course_language') == 'true' && $course['course_language'] != api_get_setting('platformLanguage')
) {
$course_details[] = $course['course_language'];
}
@ -874,7 +875,7 @@ class PageController
if (empty($user_id)) {
return false;
}
$loadDirs = api_get_setting('show_documents_preview') == 'true' ? true : false;
$loadDirs = api_get_setting('document.show_documents_preview') == 'true' ? true : false;
$start = ($page - 1) * $this->maxPerPage;
$nbResults = (int)CourseManager::displayPersonalCourseCategories($user_id, $filter, $loadDirs, true);
@ -911,7 +912,7 @@ class PageController
return false;
}
$loadDirs = api_get_setting('show_documents_preview') == 'true' ? true : false;
$loadDirs = api_get_setting('document.show_documents_preview') == 'true' ? true : false;
$start = ($page - 1) * $this->maxPerPage;
$nbResults = CourseManager::displaySpecialCourses($user_id, $filter, $loadDirs, true);
@ -951,7 +952,7 @@ class PageController
return false;
}
$loadDirs = api_get_setting('show_documents_preview') == 'true' ? true : false;
$loadDirs = api_get_setting('document.show_documents_preview') == 'true' ? true : false;
$start = ($page - 1) * $this->maxPerPage;
$nbResults = CourseManager::displayCourses($user_id, $filter, $loadDirs, true);
@ -1013,7 +1014,7 @@ class PageController
}
}
$load_directories_preview = api_get_setting('show_documents_preview') == 'true' ? true : false;
$load_directories_preview = api_get_setting('document.show_documents_preview') == 'true' ? true : false;
$sessions_with_category = $html;
if (isset($session_categories) && !empty($session_categories)) {
@ -1270,7 +1271,7 @@ class PageController
}
}
$load_directories_preview = api_get_setting('show_documents_preview') == 'true' ? true : false;
$load_directories_preview = api_get_setting('document.show_documents_preview') == 'true' ? true : false;
$sessions_with_no_category = $html;

@ -398,8 +398,8 @@ class Template
$_s = array(
'software_name' => api_get_software_name(),
'system_version' => $version,
'site_name' => api_get_setting('siteName'),
'institution' => api_get_setting('Institution')
'site_name' => api_get_setting('platform.site_name'),
'institution' => api_get_setting('platform.institution')
);
$this->assign('_s', $_s);
}
@ -612,8 +612,8 @@ class Template
$title_list = array();
$title_list[] = api_get_setting('Institution');
$title_list[] = api_get_setting('siteName');
$title_list[] = api_get_setting('platform.institution');
$title_list[] = api_get_setting('platform.site_name');
if (!empty($course_title)) {
$title_list[] = $course_title;
@ -707,8 +707,8 @@ class Template
}
$this->assign('message_link', $messageUrl);
$institution = api_get_setting('Institution');
$portal_name = empty($institution) ? api_get_setting('siteName') : $institution;
$institution = api_get_setting('platform.institution');
$portal_name = empty($institution) ? api_get_setting('platform.site_name') : $institution;
$this->assign('portal_name', $portal_name);
@ -755,8 +755,8 @@ class Template
if (api_get_setting('show_administrator_data') == 'true') {
//Administrator name
$administrator_data = get_lang('Manager').' : '.Display::encrypted_mailto_link(
api_get_setting('emailAdministrator'),
api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))
api_get_setting('platform.administrator_email'),
api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname'))
);
$this->assign('administrator_name', $administrator_data);
}
@ -1116,9 +1116,9 @@ class Template
$html = '';
$logo = api_get_path(SYS_CSS_PATH).'themes/'.$theme.'/images/header-logo.png';
$site_name = api_get_setting('siteName');
$site_name = api_get_setting('platform.site_name');
if (file_exists($logo)) {
$site_name = api_get_setting('Institution').' - '.$site_name;
$site_name = api_get_setting('platform.institution').' - '.$site_name;
$html .= '<div id="logo">';
$image_url = api_get_path(WEB_CSS_PATH).$theme.'/images/header-logo.png';
$logo = Display::img($image_url, $site_name, array('title' => $site_name));
@ -1127,7 +1127,7 @@ class Template
} else {
$html .= '<a href="'.api_get_path(WEB_PATH).'index.php" target="_top">'.$site_name.'</a>';
$iurl = api_get_setting('InstitutionUrl');
$iname = api_get_setting('Institution');
$iname = api_get_setting('platform.institution');
if (!empty($iname)) {
$html .= '-&nbsp;<a href="'.$iurl.'" target="_top">'.$iname.'</a>';

@ -3946,18 +3946,6 @@ class LoadSettingsData extends AbstractFixture implements
$manager->persist($setting);
$setting = new SettingsCurrent();
$setting->setVariable('teachers_can_change_grade_model_settings');
$setting->setSubkey('');
$setting->setType('radio');
$setting->setCategory('Gradebook');
$setting->setSelectedValue('true');
$setting->setTitle('TeachersCanChangeGradeModelSettingsTitle');
$setting->setComment('TeachersCanChangeGradeModelSettingsComment');
$setting->setScope('');
$setting->setSubkeytext('');
$setting->setAccessUrlChangeable('1');
$manager->persist($setting);
$setting = new SettingsCurrent();
@ -6567,21 +6555,6 @@ class LoadSettingsData extends AbstractFixture implements
$option->setDisplayText('No');
$manager->persist($option);
$option = new SettingsOptions();
$option->setVariable('teachers_can_change_grade_model_settings');
$option->setValue('true');
$option->setDisplayText('Yes');
$manager->persist($option);
$option = new SettingsOptions();
$option->setVariable('teachers_can_change_grade_model_settings');
$option->setValue('false');
$option->setDisplayText('No');
$manager->persist($option);
$option = new SettingsOptions();
$option->setVariable('gradebook_locking_enabled');
$option->setValue('true');

@ -29,8 +29,7 @@ class AdminSettingsSchema implements SchemaInterface
'administrator_email' => array('string'),
'administrator_name' => array('string'),
'administrator_surname' => array('string'),
'administrator_phone' => array('string'),
//'default_calendar_view' => array('string'),
'administrator_phone' => array('string')
))
;
}

@ -24,14 +24,14 @@ class AgendaSettingsSchema implements SchemaInterface
'display_mini_month_calendar' => '',
'display_upcoming_events' => '',
'number_of_upcoming_events' => '0',
//'default_calendar_view' => '',
'default_calendar_view' => '',
))
->setAllowedTypes(array(
'allow_personal_agenda' => array('string'),
'display_mini_month_calendar' => array('string'),
'display_upcoming_events' => array('string'),
'number_of_upcoming_events' => array('string'),
//'default_calendar_view' => array('string'),
'default_calendar_view' => array('string'),
))
;
}

@ -91,7 +91,7 @@ class HomeController extends ToolBaseController
}
$homeView = api_get_setting('homepage_view');
$homeView = api_get_setting('course.homepage_view');
$homeView = 'activity_big';
if ($homeView == 'activity' || $homeView == 'activity_big') {
@ -113,7 +113,7 @@ class HomeController extends ToolBaseController
);
$sessionInfo = null;
if (api_get_setting('show_session_data') == 'true' && $sessionId) {
if (api_get_setting('session.show_session_data') == 'true' && $sessionId) {
$sessionInfo = CourseHome::show_session_data($sessionId);
}

Loading…
Cancel
Save