chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Feature #3287 - Replacement call of the deprecated function get_setting() with api_get_setting(). The function get_setting() will be deleted in the main API in Dokeos 1.8.7, the this task #3287 will be closed. Nothing is to be tested at the moment.

Browse Source
skala
Ivan Tcholakov 16 years ago
parent 0672baa8ab
commit 0f78b8955b
45 changed files with 152 additions and 150 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 20
      index.php
  2. 2
      main/admin/configure_homepage.php
  3. 4
      main/admin/course_add.php
  4. 2
      main/admin/course_create_content.php
  5. 2
      main/admin/course_information.php
  6. 4
      main/admin/index.php
  7. 8
      main/admin/session_import.php
  8. 10
      main/admin/user_add.php
  9. 12
      main/admin/user_edit.php
  10. 4
      main/admin/user_import.php
  11. 12
      main/auth/courses.php
  12. 34
      main/auth/inscription.php
  13. 2
      main/auth/lostPassword.php
  14. 24
      main/auth/lost_password.lib.php
  15. 10
      main/calendar/myagenda.php
  16. 6
      main/course_home/course_home.php
  17. 2
      main/course_info/delete_course.php
  18. 2
      main/create_course/add_course.php
  19. 2
      main/document/document.inc.php
  20. 2
      main/document/document.php
  21. 2
      main/document/edit_document.php
  22. 2
      main/document/upload.php
  23. 2
      main/dropbox/dropbox_functions.inc.php
  24. 6
      main/group/group.php
  25. 4
      main/group/group_category.php
  26. 12
      main/group/group_creation.php
  27. 2
      main/group/group_overview.php
  28. 8
      main/inc/footer.inc.php
  29. 4
      main/inc/lib/course.lib.php
  30. 4
      main/inc/lib/document.lib.php
  31. 4
      main/inc/lib/main_api.lib.php
  32. 6
      main/inc/local.inc.php
  33. 8
      main/mySpace/user_add.php
  34. 2
      main/newscorm/lp_content.php
  35. 2
      main/newscorm/lp_view.php
  36. 8
      main/social/profile.php
  37. 2
      main/upload/upload.document.php
  38. 2
      main/user/user.php
  39. 2
      main/user/userInfo.php
  40. 12
      main/user/user_add.php
  41. 4
      main/webservices/registration.soap.php
  42. 12
      main/wiki/wiki.inc.php
  43. 12
      main/work/work.php
  44. 6
      tests/main/auth/lost_password.lib.test.php
  45. 10
      user_portal.php

20
index.php
Unescape View File

@ -120,7 +120,7 @@ if (isset($_GET['submitAuth']) && $_GET['submitAuth'] == 1) {
die();
}
//Delete session neccesary for legal terms
if (get_setting('allow_terms_conditions')=='true') {
if (api_get_setting('allow_terms_conditions')=='true') {
unset($_SESSION['update_term_and_condition']);
unset($_SESSION['info_current_user']);
}
@ -207,7 +207,7 @@ if (!empty ($_GET['include']) && preg_match('/^[a-zA-Z0-9_-]*\.html$/',$_GET['in
} elseif(!empty($_SESSION['_user']['language'])) {
$user_selected_language=$_SESSION['_user']['language'];
} else {
$user_selected_language=get_setting('platformLanguage');
$user_selected_language=api_get_setting('platformLanguage');
}
if(!file_exists($home.'home_news_'.$user_selected_language.'.html')) {
@ -380,10 +380,10 @@ function display_anonymous_right_menu() {
}
if (api_get_setting('allow_lostpassword') == 'true' OR api_get_setting('allow_registration') == 'true') {
echo '<div class="menusection"><span class="menusectioncaption">'.get_lang('MenuUser').'</span><ul class="menulist">';
if (get_setting('allow_registration') <> 'false') {
if (api_get_setting('allow_registration') <> 'false') {
echo '<li><a href="main/auth/inscription.php">'.get_lang('Reg').'</a></li>';
}
if (get_setting('allow_lostpassword') == 'true') {
if (api_get_setting('allow_lostpassword') == 'true') {
display_lost_password_info();
}
echo '</ul></div>';
@ -740,13 +740,13 @@ function display_anonymous_course_list() {
$courses_shown++;
$courses_list_string .= "<li>\n";
$courses_list_string .= "<a href=\"".$web_course_path.$course['directory']."/\">".$course['title']."</a><br />";
if (get_setting("display_coursecode_in_courselist") == "true") {
if (api_get_setting("display_coursecode_in_courselist") == "true") {
$courses_list_string .= $course['visual_code'];
}
if (get_setting("display_coursecode_in_courselist") == "true" AND get_setting("display_teacher_in_courselist") == "true") {
if (api_get_setting("display_coursecode_in_courselist") == "true" AND api_get_setting("display_teacher_in_courselist") == "true") {
$courses_list_string .= " - ";
}
if (get_setting("display_teacher_in_courselist") == "true") {
if (api_get_setting("display_teacher_in_courselist") == "true") {
$courses_list_string .= $course['tutor_name'];
}
if (api_get_setting('show_different_course_language') == 'true' && $course['course_language'] <> api_get_setting('platformLanguage')) {
@ -781,13 +781,13 @@ function display_anonymous_course_list() {
OR api_is_platform_admin()) {
$courses_list_string .="</a><br />";
}
if (get_setting("display_coursecode_in_courselist") == "true") {
if (api_get_setting("display_coursecode_in_courselist") == "true") {
$courses_list_string .= $course['visual_code'];
}
if (get_setting("display_coursecode_in_courselist") == "true" AND get_setting("display_teacher_in_courselist") == "true") {
if (api_get_setting("display_coursecode_in_courselist") == "true" AND api_get_setting("display_teacher_in_courselist") == "true") {
$courses_list_string .= " - ";
}
if (get_setting("display_teacher_in_courselist") == "true")
if (api_get_setting("display_teacher_in_courselist") == "true")
{
$courses_list_string .= $course['tutor_name'];
}

2
main/admin/configure_homepage.php
Unescape View File

@ -90,7 +90,7 @@ if(!empty($_SESSION['user_language_choice'])) {
} elseif(!empty($_SESSION['_user']['language'])) {
$lang=$_SESSION['_user']['language'];
} else {
$lang=get_setting('platformLanguage');
$lang=api_get_setting('platformLanguage');
}
// ----- Ensuring availability of main files in the corresponding language -----

4
main/admin/course_add.php
Unescape View File

@ -131,8 +131,8 @@ $form->addRule('disk_quota',get_lang('ThisFieldShouldBeNumeric'),'numeric');
$form->add_progress_bar();
$form->addElement('style_submit_button','submit', get_lang('CreateCourse'),'class="add"');
// Set some default values
$values['course_language'] = get_setting('platformLanguage');
$values['disk_quota'] = get_setting('default_document_quotum');
$values['course_language'] = api_get_setting('platformLanguage');
$values['disk_quota'] = api_get_setting('default_document_quotum');
$values['visibility'] = COURSE_VISIBILITY_OPEN_PLATFORM;
$values['subscribe'] = 1;
$values['unsubscribe'] = 0;

2
main/admin/course_create_content.php
Unescape View File

@ -47,7 +47,7 @@ $tool_name = get_lang('DummyCourseCreator');
$interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
Display::display_header($tool_name);
//api_display_tool_title($tool_name);
if( get_setting('server_type') != 'test')
if(api_get_setting('server_type') != 'test')
{
echo get_lang('DummyCourseOnlyOnTestServer');
}

2
main/admin/course_information.php
Unescape View File

@ -75,7 +75,7 @@ Display::display_header($tool_name);
<a href="<?php echo api_get_path(WEB_COURSE_PATH).$course->directory; ?>"><?php Display::display_icon('course_home.gif'); ?> <?php echo api_get_path(WEB_COURSE_PATH).$course->directory; ?></a>
<br/>
<?php
if( get_setting('server_type') == 'test')
if(api_get_setting('server_type') == 'test')
{
?>
<a href="course_create_content.php?course_code=<?php echo $course->code ?>"><?php echo get_lang('AddDummyContentToCourse') ?></a>

4
main/admin/index.php
Unescape View File

@ -160,11 +160,11 @@ if(api_is_platform_admin()) {
echo '<li><a href="access_urls.php">'.get_lang('ConfigureMultipleAccessURLs').'</a></li>';
}
if (get_setting('allow_reservation')=='true') {
if (api_get_setting('allow_reservation')=='true') {
echo '<li><a href="../reservation/m_category.php">'.get_lang('BookingSystem').'</a></li>';
}
if (get_setting('allow_terms_conditions')=='true') {
if (api_get_setting('allow_terms_conditions')=='true') {
echo '<li><a href="legal_add.php">'.get_lang('TermsAndConditions').'</a></li>';
}

8
main/admin/session_import.php
Unescape View File

@ -118,10 +118,10 @@ if ($_POST['formSent']) {
// send an email to users
if($sendMail) {
$recipient_name = $firstname.' '.$lastname;
$emailsubject = '['.get_setting('siteName').'] '.get_lang('YourReg').' '.get_setting('siteName');
$emailbody="[NOTE:] ".get_lang('ThisIsAutomaticEmailNoReply').".\n\n".get_lang('langDear')." $firstname $lastname,\n\n".get_lang('langYouAreReg')." ". get_setting('siteName') ." ".get_lang('langSettings')." $username\n". get_lang('langPass')." : $password\n\n".get_lang('langAddress') ." ". get_lang('langIs') ." ". $serverAddress ."\n\n".get_lang('YouWillSoonReceiveMailFromCoach')."\n\n". get_lang('langProblem'). "\n\n". get_lang('langFormula');
$sender_name = get_setting('administratorName').' '.get_setting('administratorSurname');
$email_admin = get_setting('emailAdministrator');
$emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg').' '.api_get_setting('siteName');
$emailbody="[NOTE:] ".get_lang('ThisIsAutomaticEmailNoReply').".\n\n".get_lang('langDear')." $firstname $lastname,\n\n".get_lang('langYouAreReg')." ".api_get_setting('siteName') ." ".get_lang('langSettings')." $username\n". get_lang('langPass')." : $password\n\n".get_lang('langAddress') ." ". get_lang('langIs') ." ". $serverAddress ."\n\n".get_lang('YouWillSoonReceiveMailFromCoach')."\n\n". get_lang('langProblem'). "\n\n". get_lang('langFormula');
$sender_name = api_get_setting('administratorName').' '.api_get_setting('administratorSurname');
$email_admin = api_get_setting('emailAdministrator');
@api_mail($recipient_name, $email, $emailsubject, $emailbody, $sender_name,$email_admin);
}
} else {

10
main/admin/user_add.php
Unescape View File

@ -410,20 +410,20 @@ if( $form->validate())
if (!empty ($email) && $send_mail)
{
$recipient_name = $firstname.' '.$lastname;
$emailsubject = '['.get_setting('siteName').'] '.get_lang('YourReg').' '.get_setting('siteName');
$emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg').' '.api_get_setting('siteName');
$sender_name = get_setting('administratorName').' '.get_setting('administratorSurname');
$email_admin = get_setting('emailAdministrator');
$sender_name = api_get_setting('administratorName').' '.api_get_setting('administratorSurname');
$email_admin = api_get_setting('emailAdministrator');
if ($_configuration['multiple_access_urls']==true) {
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1 ){
$url = api_get_access_url($access_url_id);
$emailbody=get_lang('Dear')." ".stripslashes("$firstname $lastname").",\n\n".get_lang('YouAreReg')." ". get_setting('siteName') ." ".get_lang('Settings')." ". $username ."\n". get_lang('Pass')." : ".stripslashes($password)."\n\n" .get_lang('Address') ." ". get_setting('siteName') ." ". get_lang('Is') ." : ". $url['url'] ."\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');
$emailbody=get_lang('Dear')." ".stripslashes("$firstname $lastname").",\n\n".get_lang('YouAreReg')." ".api_get_setting('siteName') ." ".get_lang('Settings')." ". $username ."\n". get_lang('Pass')." : ".stripslashes($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_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');
}
}
else {
$emailbody=get_lang('Dear')." ".stripslashes("$firstname $lastname").",\n\n".get_lang('YouAreReg')." ". get_setting('siteName') ." ".get_lang('Settings')." ". $username ."\n". get_lang('Pass')." : ".stripslashes($password)."\n\n" .get_lang('Address') ." ". get_setting('siteName') ." ". get_lang('Is') ." : ". $_configuration['root_web'] ."\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');
$emailbody=get_lang('Dear')." ".stripslashes("$firstname $lastname").",\n\n".get_lang('YouAreReg')." ".api_get_setting('siteName') ." ".get_lang('Settings')." ". $username ."\n". get_lang('Pass')." : ".stripslashes($password)."\n\n" .get_lang('Address') ." ". api_get_setting('siteName') ." ". get_lang('Is') ." : ". $_configuration['root_web'] ."\n\n". get_lang('Problem'). "\n\n". get_lang('Formula').",\n\n".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');
}

12
main/admin/user_edit.php
Unescape View File

@ -447,23 +447,23 @@ if( $form->validate())
if (!empty ($email) && $send_mail)
{
$recipient_name = $firstname.' '.$lastname;
$emailsubject = '['.get_setting('siteName').'] '.get_lang('YourReg').' '.get_setting('siteName');
$sender_name = get_setting('administratorName').' '.get_setting('administratorSurname');
$email_admin = get_setting('emailAdministrator');
$emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg').' '.api_get_setting('siteName');
$sender_name = api_get_setting('administratorName').' '.api_get_setting('administratorSurname');
$email_admin = api_get_setting('emailAdministrator');
if ($_configuration['multiple_access_urls']==true) {
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1 ){
$url = api_get_access_url($access_url_id);
$emailbody=get_lang('Dear')." ".stripslashes("$firstname $lastname").",\n\n".get_lang('YouAreReg')." ". get_setting('siteName') ." ".get_lang('Settings')." ". $username ."\n". get_lang('Pass')." : ".stripslashes($password)."\n\n" .get_lang('Address') ." ". get_setting('siteName') ." ". get_lang('Is') ." : ". $url['url'] ."\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');
$emailbody=get_lang('Dear')." ".stripslashes("$firstname $lastname").",\n\n".get_lang('YouAreReg')." ". api_get_setting('siteName') ." ".get_lang('Settings')." ". $username ."\n". get_lang('Pass')." : ".stripslashes($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_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');
}
}
else {
$emailbody=get_lang('Dear')." ".stripslashes("$firstname $lastname").",\n\n".get_lang('YouAreReg')." ". get_setting('siteName') ." ".get_lang('Settings')." ". $username ."\n". get_lang('Pass')." : ".stripslashes($password)."\n\n" .get_lang('Address') ." ". get_setting('siteName') ." ". get_lang('Is') ." : ". $_configuration['root_web'] ."\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');
$emailbody=get_lang('Dear')." ".stripslashes("$firstname $lastname").",\n\n".get_lang('YouAreReg')." ". api_get_setting('siteName') ." ".get_lang('Settings')." ". $username ."\n". get_lang('Pass')." : ".stripslashes($password)."\n\n" .get_lang('Address') ." ". api_get_setting('siteName') ." ". get_lang('Is') ." : ". $_configuration['root_web'] ."\n\n". get_lang('Problem'). "\n\n". get_lang('Formula').",\n\n".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("$firstname $lastname").",\n\n".get_lang('YouAreReg')." ". get_setting('siteName') ." ".get_lang('Settings')." ". $username;
$emailbody = get_lang('Dear')." ".stripslashes("$firstname $lastname").",\n\n".get_lang('YouAreReg')." ". api_get_setting('siteName') ." ".get_lang('Settings')." ". $username;
// Send password by e-mail if it has been modified, even if encrypted in DB (it doesn't make sense to send an e-mail with login info without the password, even if the password is encrypted)
if($reset_password > 0)
{

4
main/admin/user_import.php
Unescape View File

@ -169,8 +169,8 @@ function save_data($users) {
$recipient_name = $user['FirstName'].' '.$user['LastName'];
$emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg').' '.api_get_setting('siteName');
$emailbody = get_lang('Dear').$user['FirstName'].' '.$user['LastName'].",\n\n".get_lang('YouAreReg')." ".api_get_setting('siteName')." ".get_lang('Settings')." $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_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')."";
$sender_name = get_setting('administratorName').' '.get_setting('administratorSurname');
$email_admin = get_setting('emailAdministrator');
$sender_name = api_get_setting('administratorName').' '.api_get_setting('administratorSurname');
$email_admin = api_get_setting('emailAdministrator');
@api_mail($recipient_name, $user['Email'], $emailsubject, $emailbody, $sender_name,$email_admin);
}

12
main/auth/courses.php
Unescape View File

@ -485,13 +485,13 @@ function display_subscribe_to_courses($courses)
echo "\t<tr>\n";
echo "\t\t<td>\n";
echo "<b>".$course['title']."</b><br />";
if (get_setting("display_coursecode_in_courselist") == "true") {
if (api_get_setting("display_coursecode_in_courselist") == "true") {
echo $course['visual_code'];
}
if (get_setting("display_coursecode_in_courselist") == "true" AND get_setting("display_teacher_in_courselist") == "true") {
if (api_get_setting("display_coursecode_in_courselist") == "true" AND api_get_setting("display_teacher_in_courselist") == "true") {
echo " - ";
}
if (get_setting("display_teacher_in_courselist") == "true")
if (api_get_setting("display_teacher_in_courselist") == "true")
{
echo $course['tutor'];
}
@ -839,15 +839,15 @@ function display_courses_in_category($user_category_id, $showicons)
echo "\t\t<td>\n";
echo '<a name="course'.$course['code'].'"></a>'; // display an internal anchor.
echo "<b>".$course['title']."</b><br />";
if (get_setting("display_coursecode_in_courselist") == "true")
if (api_get_setting("display_coursecode_in_courselist") == "true")
{
echo $course['visual_code'];
}
if (get_setting("display_coursecode_in_courselist") == "true" AND get_setting("display_teacher_in_courselist") == "true")
if (api_get_setting("display_coursecode_in_courselist") == "true" AND api_get_setting("display_teacher_in_courselist") == "true")
{
echo " - ";
}
if (get_setting("display_teacher_in_courselist") == "true")
if (api_get_setting("display_teacher_in_courselist") == "true")
{
echo $course['tutor'];
}

34
main/auth/inscription.php
Unescape View File

@ -22,7 +22,7 @@ require_once(api_get_path(INCLUDE_PATH).'lib/legal.lib.php');
//require_once (api_get_path(LIBRARY_PATH).'image.lib.php');
// Load terms & conditions from the current lang
if (get_setting('allow_terms_conditions')=='true') {
if (api_get_setting('allow_terms_conditions')=='true') {
$get = array_keys($_GET);
if (isset($get)) {
if ($get[0]=='legal'){
@ -58,11 +58,11 @@ echo '<div class="actions-title">';
echo $tool_name;
echo '</div>';
// Forbidden to self-register
if (get_setting('allow_registration') == 'false') {
if (api_get_setting('allow_registration') == 'false') {
api_not_allowed();
}
//api_display_tool_title($tool_name);
if (get_setting('allow_registration')=='approval') {
if (api_get_setting('allow_registration')=='approval') {
Display::display_normal_message(get_lang('YourAccountHasToBeApproved'));
}
//if openid was not found
@ -71,7 +71,7 @@ if (!empty($_GET['openid_msg']) && $_GET['openid_msg'] == 'idnotfound') {
}
$form = new FormValidator('registration');
if (get_setting('allow_terms_conditions')=='true') {
if (api_get_setting('allow_terms_conditions')=='true') {
if (!isset($_SESSION['update_term_and_condition'][1])) {
$display_all_form=true;
} else {
@ -133,11 +133,11 @@ if (api_get_setting('registration', 'phone') == 'true')
}*/
// LANGUAGE
if (get_setting('registration', 'language') == 'true') {
if (api_get_setting('registration', 'language') == 'true') {
$form->addElement('select_language', 'language', get_lang('Language'));
}
// STUDENT/TEACHER
if (get_setting('allow_registration_as_teacher') <> 'false') {
if (api_get_setting('allow_registration_as_teacher') <> 'false') {
$form->addElement('radio', 'status', get_lang('Status'), get_lang('RegStudent'), STUDENT);
$form->addElement('radio', 'status', null, get_lang('RegAdmin'), COURSEMANAGER);
}
@ -279,7 +279,7 @@ foreach ($extra as $id => $field_details) {
}
//------------ Terms and conditions
if (get_setting('allow_terms_conditions')=='true') {
if (api_get_setting('allow_terms_conditions')=='true') {
//$language = api_get_setting('platformLanguage');
$language = api_get_interface_language();
$language = api_get_language_id($language);
@ -358,7 +358,7 @@ if ($form->validate()) {
$values['username'] = api_substr($values['username'],0,20); //make *sure* the login isn't too long
if (get_setting('allow_registration_as_teacher') == 'false') {
if (api_get_setting('allow_registration_as_teacher') == 'false') {
$values['status'] = STUDENT;
}
@ -366,7 +366,7 @@ if ($form->validate()) {
$user_id = UserManager::create_user($values['firstname'],$values['lastname'],$values['status'],$values['email'],$values['username'],$values['pass1'],$values['official_code'], $values['language'],$values['phone'],$picture_uri);
// Terms & Conditions
if (get_setting('allow_terms_conditions')=='true') {
if (api_get_setting('allow_terms_conditions')=='true') {
// update the terms & conditions
if (isset($values['legal_accept_type'])) {
$cond_array = explode(':',$values['legal_accept_type']);
@ -428,7 +428,7 @@ if ($form->validate()) {
}
// if there is a default duration of a valid account then we have to change the expiration_date accordingly
if (get_setting('account_valid_duration')<>'')
if (api_get_setting('account_valid_duration')<>'')
{
$sql = "UPDATE ".Database::get_main_table(TABLE_MAIN_USER)."
SET expiration_date='registration_date+1' WHERE user_id='".$user_id."'";
@ -436,7 +436,7 @@ if ($form->validate()) {
}
// if the account has to be approved then we set the account to inactive, sent a mail to the platform admin and exit the page.
if (get_setting('allow_registration')=='approval')
if (api_get_setting('allow_registration')=='approval')
{
$TABLE_USER= Database::get_main_table(TABLE_MAIN_USER);
// 1. set account inactive
@ -466,8 +466,8 @@ if ($form->validate()) {
$emailbody .=get_lang('Status').': '.$values['status']."\n\n";
$emailbody .=get_lang('ManageUser').': '.api_get_path(WEB_CODE_PATH).'admin/user_edit.php?user_id='.$user_id;
$sender_name = get_setting('administratorName').' '.get_setting('administratorSurname');
$email_admin = get_setting('emailAdministrator');
$sender_name = api_get_setting('administratorName').' '.api_get_setting('administratorSurname');
$email_admin = api_get_setting('emailAdministrator');
@api_mail('', $emailto, $emailsubject, $emailbody, $sender_name,$email_admin);
}
@ -508,7 +508,7 @@ if ($form->validate()) {
$email = $values['email'];
$emailfromaddr = api_get_setting('emailAdministrator');
$emailfromname = api_get_setting('siteName');
$emailsubject = "[".get_setting('siteName')."] ".get_lang('YourReg')." ".get_setting('siteName');
$emailsubject = "[".api_get_setting('siteName')."] ".get_lang('YourReg')." ".api_get_setting('siteName');
// The body can be as long as you wish, and any combination of text and variables
$portal_url = $_configuration['root_web'];
@ -520,12 +520,12 @@ if ($form->validate()) {
}
}
$emailbody = get_lang('Dear')." ".stripslashes(Security::remove_XSS($recipient_name)).",\n\n".get_lang('YouAreReg')." ".get_setting('siteName')." ".get_lang('Settings')." ".$values['username']."\n".get_lang('Pass')." : ".stripslashes($values['pass1'])."\n\n".get_lang('Address')." ".get_setting('siteName')." ".get_lang('Is')." : ".$portal_url."\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');
$emailbody = get_lang('Dear')." ".stripslashes(Security::remove_XSS($recipient_name)).",\n\n".get_lang('YouAreReg')." ".api_get_setting('siteName')." ".get_lang('Settings')." ".$values['username']."\n".get_lang('Pass')." : ".stripslashes($values['pass1'])."\n\n".get_lang('Address')." ".api_get_setting('siteName')." ".get_lang('Is')." : ".$portal_url."\n\n".get_lang('Problem')."\n\n".get_lang('Formula').",\n\n".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');
// Here we are forming one large header line
// Every header must be followed by a \n except the last
$sender_name = get_setting('administratorName').' '.get_setting('administratorSurname');
$email_admin = get_setting('emailAdministrator');
$sender_name = api_get_setting('administratorName').' '.api_get_setting('administratorSurname');
$email_admin = api_get_setting('emailAdministrator');
@api_mail($recipient_name, $email, $emailsubject, $emailbody, $sender_name,$email_admin);
}
}

2
main/auth/lostPassword.php
Unescape View File

@ -26,7 +26,7 @@ $tool_name = get_lang('LostPassword');
Display :: display_header($tool_name);
// Forbidden to retrieve the lost password
if (get_setting('allow_lostpassword') == "false")
if (api_get_setting('allow_lostpassword') == "false")
{
api_not_allowed();
}

24
main/auth/lost_password.lib.php
Unescape View File

@ -10,10 +10,10 @@
function get_email_headers()
{
global $charset;
$emailHeaders = "From: \"".addslashes(get_setting('administratorSurname')." ".get_setting('administratorName'))."\" <".get_setting('emailAdministrator').">\n";
$emailHeaders .= "Reply-To: ".get_setting('emailAdministrator')."\n";
$emailHeaders .= "Return-Path: ".get_setting('emailAdministrator')."\n";
$emailHeaders .= "X-Sender: ".get_setting('emailAdministrator')."\n";
$emailHeaders = "From: \"".addslashes(api_get_setting('administratorSurname')." ".api_get_setting('administratorName'))."\" <".api_get_setting('emailAdministrator').">\n";
$emailHeaders .= "Reply-To: ".api_get_setting('emailAdministrator')."\n";
$emailHeaders .= "Return-Path: ".api_get_setting('emailAdministrator')."\n";
$emailHeaders .= "X-Sender: ".api_get_setting('emailAdministrator')."\n";
$emailHeaders .= "X-Mailer: PHP / ".phpversion()."\n";
$emailHeaders .= "Content-Type: text/plain;\n\tcharset=\"".$charset."\"\n";
$emailHeaders .= "Mime-Version: 1.0";
@ -71,7 +71,7 @@ function send_password_to_user($user)
global $charset;
global $_configuration;
$emailHeaders = get_email_headers(); // Email Headers
$emailSubject = "[".get_setting('siteName')."] ".get_lang('LoginRequest'); // SUBJECT
$emailSubject = "[".api_get_setting('siteName')."] ".get_lang('LoginRequest'); // SUBJECT
$userAccountList = get_user_account_list($user); // BODY
$portal_url = $_configuration['root_web'];
if ($_configuration['multiple_access_urls']==true) {
@ -85,13 +85,13 @@ function send_password_to_user($user)
$emailBody = get_lang('YourAccountParam')." ".$portal_url."\n\n$userAccountList";
// SEND MESSAGE
$emailTo = $user[0]["email"];
$sender_name = get_setting('administratorName').' '.get_setting('administratorSurname');
$email_admin = get_setting('emailAdministrator');
$sender_name = api_get_setting('administratorName').' '.api_get_setting('administratorSurname');
$email_admin = api_get_setting('emailAdministrator');
if (@api_mail('', $emailTo, $emailSubject, $emailBody, $sender_name,$email_admin)==1) {
Display::display_confirmation_message(get_lang('YourPasswordHasBeenEmailed'));
} else {
$message = get_lang('SystemUnableToSendEmailContact') . Display :: encrypted_mailto_link(get_setting('emailAdministrator'), get_lang('PlatformAdmin')).".</p>";
$message = get_lang('SystemUnableToSendEmailContact') . Display :: encrypted_mailto_link(api_get_setting('emailAdministrator'), get_lang('PlatformAdmin')).".</p>";
Display::display_error_message($message, false);
}
}
@ -108,7 +108,7 @@ function handle_encrypted_password($user)
global $charset;
global $_configuration;
$emailHeaders = get_email_headers(); // Email Headers
$emailSubject = "[".get_setting('siteName')."] ".get_lang('LoginRequest'); // SUBJECT
$emailSubject = "[".api_get_setting('siteName')."] ".get_lang('LoginRequest'); // SUBJECT
$userAccountList = get_user_account_list($user, true); // BODY
$emailTo = $user[0]["email"];
$secretword = get_secret_word($emailTo);
@ -116,8 +116,8 @@ function handle_encrypted_password($user)
$emailBody .= "-----------------------------------------------\n".$userAccountList."\n-----------------------------------------------\n\n";
$emailBody .=get_lang('PasswordEncryptedForSecurity');
$emailBody .="\n\n".get_lang('Formula').",\n".get_lang('PlataformAdmin');
$sender_name = get_setting('administratorName').' '.get_setting('administratorSurname');
$email_admin = get_setting('emailAdministrator');
$sender_name = api_get_setting('administratorName').' '.api_get_setting('administratorSurname');
$email_admin = api_get_setting('emailAdministrator');
if (@api_mail('', $emailTo, $emailSubject, $emailBody, $sender_name,$email_admin)==1)
{
@ -125,7 +125,7 @@ function handle_encrypted_password($user)
}
else
{
$message = get_lang('SystemUnableToSendEmailContact') . Display :: encrypted_mailto_link(get_setting('emailAdministrator'), get_lang('PlatformAdmin')).".</p>";
$message = get_lang('SystemUnableToSendEmailContact') . Display :: encrypted_mailto_link(api_get_setting('emailAdministrator'), get_lang('PlatformAdmin')).".</p>";
Display::display_error_message($message, false);
}
}

10
main/calendar/myagenda.php
Unescape View File

@ -219,7 +219,7 @@ if (isset ($_user['user_id']))
echo "\t<a href=\"".api_get_self()."?action=view&amp;view=month\">".Display::return_icon('calendar_month.gif', get_lang('MonthView'))." ".get_lang('MonthView')."</a> \n";
echo "\t<a href=\"".api_get_self()."?action=view&amp;view=week\">".Display::return_icon('calendar_week.gif', get_lang('WeekView'))." ".get_lang('WeekView')."</a> \n";
echo "\t<a href=\"".api_get_self()."?action=view&amp;view=day\">".Display::return_icon('calendar_day.gif', get_lang('DayView'))." ".get_lang('DayView')."</a> \n";
if (get_setting('allow_personal_agenda') == 'true')
if (api_get_setting('allow_personal_agenda') == 'true')
{
echo "\t<a href=\"".api_get_self()."?action=add_personal_agenda_item\">".Display::return_icon('calendar_personal_add.gif', get_lang('AddPersonalItem'))." ".get_lang('AddPersonalItem')."</a> \n";
echo "\t<a href=\"".api_get_self()."?action=view&amp;view=personal\">".Display::return_icon('calendar_personal.gif', get_lang('ViewPersonalItem'))." ".get_lang('ViewPersonalItem')."</a> \n";
@ -232,7 +232,7 @@ if (isset ($_user['user_id']))
echo "<td width=\"220\" valign=\"top\">";
$agendaitems = get_myagendaitems($courses_dbs, $month, $year);
$agendaitems = get_global_agenda_items($agendaitems, $day, $month, $year, $week, "month_view");
if (get_setting('allow_personal_agenda') == 'true')
if (api_get_setting('allow_personal_agenda') == 'true')
{
$agendaitems = get_personal_agenda_items($agendaitems, $day, $month, $year, $week, "month_view");
}
@ -249,7 +249,7 @@ if (isset ($_user['user_id']))
case "month_view" :
$agendaitems = get_myagendaitems($courses_dbs, $month, $year);
$agendaitems = get_global_agenda_items($agendaitems, $day, $month, $year, $week, "month_view");
if (get_setting("allow_personal_agenda") == "true")
if (api_get_setting("allow_personal_agenda") == "true")
{
$agendaitems = get_personal_agenda_items($agendaitems, $day, $month, $year, $week, "month_view");
}
@ -258,7 +258,7 @@ if (isset ($_user['user_id']))
case "week_view" :
$agendaitems = get_week_agendaitems($courses_dbs, $month, $year, $week);
$agendaitems = get_global_agenda_items($agendaitems, $day, $month, $year, $week, "week_view");
if (get_setting("allow_personal_agenda") == "true")
if (api_get_setting("allow_personal_agenda") == "true")
{
$agendaitems = get_personal_agenda_items($agendaitems, $day, $month, $year, $week, "week_view");
}
@ -267,7 +267,7 @@ if (isset ($_user['user_id']))
case "day_view" :
$agendaitems = get_day_agendaitems($courses_dbs, $month, $year, $day);
$agendaitems = get_global_agenda_items($agendaitems, $day, $month, $year, $week, "day_view");
if (get_setting("allow_personal_agenda") == "true")
if (api_get_setting("allow_personal_agenda") == "true")
{
$agendaitems = get_personal_agenda_items($agendaitems, $day, $month, $year, $week, "day_view");
}

6
main/course_home/course_home.php
Unescape View File

@ -278,15 +278,15 @@ Display::display_introduction_section(TOOL_COURSE_HOMEPAGE, array(
the platform administration section
-----------------------------------------------------------
*/
if(get_setting('homepage_view') == "activity")
if(api_get_setting('homepage_view') == "activity")
{
include('activity.php');
}
elseif(get_setting('homepage_view') == "2column")
elseif(api_get_setting('homepage_view') == "2column")
{
include('2column.php');
}
elseif(get_setting('homepage_view') == "3column")
elseif(api_get_setting('homepage_view') == "3column")
{
include('3column.php');
}

2
main/course_info/delete_course.php
Unescape View File

@ -62,7 +62,7 @@ if (isset($_GET['delete']) && $_GET['delete'] == 'yes')
unset ($_cid);
$noPHP_SELF = true;
$message = get_lang('Course')." &quot;".$currentCourseName."&quot; "."(".$currentCourseCode.") ".get_lang('HasDel');
$message .= "<br /><br /><a href=\"../../index.php\">".get_lang('BackHome')." ".get_setting('siteName')."</a>";
$message .= "<br /><br /><a href=\"../../index.php\">".get_lang('BackHome')." ".api_get_setting('siteName')."</a>";
} // end if $delete
else

2
main/create_course/add_course.php
Unescape View File

@ -90,7 +90,7 @@ $form->add_progress_bar();
if (isset($_user["language"]) && $_user["language"]!="") {
$values['course_language'] = $_user["language"];
} else {
$values['course_language'] = get_setting('platformLanguage');
$values['course_language'] = api_get_setting('platformLanguage');
}
$values['tutor_name'] = $_user['firstName']." ".$_user['lastName'];

2
main/document/document.inc.php
Unescape View File

@ -47,7 +47,7 @@
function build_directory_selector($folders,$curdirpath,$group_dir='',$changeRenderer=false)
{
$folder_titles = array();
if(get_setting('use_document_title') == 'true')
if(api_get_setting('use_document_title') == 'true')
{
if (is_array($folders))
{

2
main/document/document.php
Unescape View File

@ -722,7 +722,7 @@ if(isset($docs_and_folders) && is_array($docs_and_folders))
//*************************************************************************************************
//do we need the title field for the document name or not?
//we get the setting here, so we only have to do it once
$use_document_title = get_setting('use_document_title');
$use_document_title = api_get_setting('use_document_title');
//create a sortable table with our data
$sortable_data = array();

2
main/document/edit_document.php
Unescape View File

@ -170,7 +170,7 @@ $html_editor_config = array(
'BaseHref' => api_get_path('WEB_COURSE_PATH').$_course['path'].'/document'.$dir
);
$use_document_title = (get_setting('use_document_title')=='true')?true:false;
$use_document_title = (api_get_setting('use_document_title')=='true') ? true : false;
$noPHP_SELF=true;
/*

2
main/document/upload.php
Unescape View File

@ -533,7 +533,7 @@ $form->addElement('hidden','curdirpath',$path);
$form->addElement('file','user_upload',get_lang('File'),'id="user_upload" size="45"');
if(get_setting('use_document_title')=='true')
if(api_get_setting('use_document_title')=='true')
{
$form->addElement('text','title',get_lang('Title'),'size="20" style="width:300px;"');
$form->addElement('textarea','comment',get_lang('Comment'),'wrap="virtual" style="width:300px;"');

2
main/dropbox/dropbox_functions.inc.php
Unescape View File

@ -1023,7 +1023,7 @@ function store_add_dropbox()
api_mail($recipent_temp['lastname'].' '.$recipent_temp['firstname'],$recipent_temp['email'],
get_lang('NewDropboxFileUploaded'),
get_lang('NewDropboxFileUploadedContent').' '.api_get_path(WEB_CODE_PATH).'dropbox/index.php?cidReq='.$_course['sysCode']."\n\n".$_user['firstName']." ".$_user['lastName']."\n". get_lang('Email') ." : ".$_user['mail'], $_user['firstName']." ".$_user['lastName'],$_user['mail']);
//get_lang('NewDropboxFileUploadedContent').' '.api_get_path(WEB_CODE_PATH).'dropbox/index.php?cidReq='.$_course['sysCode']."\n\n".get_setting('administratorName')." ".get_setting('administratorSurname')."\n". get_lang('Manager'). " ".get_setting('siteName')."\n" .get_lang('Email') ." : ".get_setting('emailAdministrator'),get_setting('administratorName')." ".get_setting('administratorSurname'),get_setting('emailAdministrator'));
//get_lang('NewDropboxFileUploadedContent').' '.api_get_path(WEB_CODE_PATH).'dropbox/index.php?cidReq='.$_course['sysCode']."\n\n".api_get_setting('administratorName')." ".api_get_setting('administratorSurname')."\n". get_lang('Manager'). " ".api_get_setting('siteName')."\n" .get_lang('Email') ." : ".api_get_setting('emailAdministrator'),api_get_setting('administratorName')." ".api_get_setting('administratorSurname'),api_get_setting('emailAdministrator'));
}
}

6
main/group/group.php
Unescape View File

@ -204,7 +204,7 @@ if (api_is_allowed_to_edit(false,true))
echo Display::return_icon('group.gif', get_lang('GroupOverview')) .'<a href="group_overview.php?'.api_get_cidreq().'">'.get_lang('GroupOverview').'</a>&nbsp;';
}
if (get_setting('allow_group_categories') == 'true') {
if (api_get_setting('allow_group_categories') == 'true') {
echo Display::return_icon('folder_new.gif', get_lang('AddCategory')) . '<a href="group_category.php?'.api_get_cidreq().'&action=add_category">'.get_lang('AddCategory').'</a>&nbsp;';
} else {
//echo '<a href="group_category.php?'.api_get_cidreq().'&id=2">'.Display::return_icon('edit_group.gif').'&nbsp;'.get_lang('PropModify').'</a>&nbsp;';
@ -215,7 +215,7 @@ if (api_is_allowed_to_edit(false,true))
//echo '<a href="group_creation.php?'.api_get_cidreq().'">'.Display::return_icon('group_add_big.gif').'&nbsp;'.get_lang('NewGroupCreate').'</a>&nbsp;';
}
$group_cats = GroupManager :: get_categories();
if (get_setting('allow_group_categories') == 'true' && count($group_cats) > 1)
if (api_get_setting('allow_group_categories') == 'true' && count($group_cats) > 1)
{
//echo '<p><a href="?'.api_get_cidreq().'&show_all=1">'.get_lang('ShowAll').'</a></p>';
echo Display::return_icon('group.gif').' <a href="?'.api_get_cidreq().'&show_all=1">'.get_lang('ShowAll').'</a>';
@ -229,7 +229,7 @@ foreach ($group_cats as $index => $category)
global $charset;
$group_list = array ();
$in_category = false;
if (get_setting('allow_group_categories') == 'true')
if (api_get_setting('allow_group_categories') == 'true')
{
if (isset ($_GET['show_all']) || (isset ($_GET['category']) && $_GET['category'] == $category['id']))
{

4
main/group/group_category.php
Unescape View File

@ -70,7 +70,7 @@ function check_groups_per_user($value)
return true;
}
if (get_setting('allow_group_categories') == 'true')
if (api_get_setting('allow_group_categories') == 'true')
{
if (isset ($_GET['id']))
{
@ -116,7 +116,7 @@ else
$form->addElement('html', '</div>');
// If categories allowed, show title & description field
if (get_setting('allow_group_categories') == 'true')
if (api_get_setting('allow_group_categories') == 'true')
{
$form->add_textfield('title', get_lang('Title'));
$form->addElement('textarea', 'description', get_lang('Description'),array('cols'=>50,'rows'=>6));

12
main/group/group_creation.php
Unescape View File

@ -75,7 +75,7 @@ if (isset ($_POST['action']))
{
$group['places'] = $_POST['group_0_places'];
}
if (get_setting('allow_group_categories') == 'false')
if (api_get_setting('allow_group_categories') == 'false')
{
$group['category'] = DEFAULT_GROUP_CATEGORY;
}
@ -223,7 +223,7 @@ EOT;
// Table heading
$group_el = array ();
$group_el[] = & $form->createElement('static', null, null, '<b>'.get_lang('GroupName').'</b>');
if (get_setting('allow_group_categories') == 'true')
if (api_get_setting('allow_group_categories') == 'true')
{
$group_el[] = & $form->createElement('static', null, null, '<b>'.get_lang('GroupCategory').'</b>');
}
@ -235,7 +235,7 @@ EOT;
{
$group_el = array ();
$group_el[] = & $form->createElement('static', null, null, ' ');
if (get_setting('allow_group_categories') == 'true')
if (api_get_setting('allow_group_categories') == 'true')
{
$group_el[] = & $form->createElement('checkbox', 'same_category', null, get_lang('SameForAll'), array ('onclick' => "javascript:switch_state('category')"));
}
@ -248,7 +248,7 @@ EOT;
{
$group_el = array ();
$group_el[] = & $form->createElement('text', 'group_'.$group_number.'_name');
if (get_setting('allow_group_categories') == 'true')
if (api_get_setting('allow_group_categories') == 'true')
{
$group_el[] = & $form->createElement('select', 'group_'.$group_number.'_category', null, $cat_options, array ('id' => 'category_'.$group_number));
}
@ -310,7 +310,7 @@ else
/*
* Show form to generate subgroups
*/
if (get_setting('allow_group_categories') == 'true' && count(GroupManager :: get_group_list()) > 0)
if (api_get_setting('allow_group_categories') == 'true' && count(GroupManager :: get_group_list()) > 0)
{
$base_group_options = array ();
$groups = GroupManager :: get_group_list();
@ -365,7 +365,7 @@ else
$create_class_groups_form = new FormValidator('create_class_groups_form');
$create_class_groups_form->addElement('hidden', 'action');
if (get_setting('allow_group_categories') == 'true')
if (api_get_setting('allow_group_categories') == 'true')
{
$group_categories = GroupManager :: get_categories();
$cat_options = array ();

2
main/group/group_overview.php
Unescape View File

@ -112,7 +112,7 @@ else
echo '<div class="actions">';
echo Display::return_icon('groupadd.gif', get_lang('NewGroupCreate')) . '<a href="group_creation.php?'.api_get_cidreq().'">'.get_lang('NewGroupCreate').'</a>';
echo Display::return_icon('group.gif', get_lang('Groups')) .'<a href="group.php?'.api_get_cidreq().'">'.get_lang('Groups').'</a>';
if (get_setting('allow_group_categories') == 'true') {
if (api_get_setting('allow_group_categories') == 'true') {
echo Display::return_icon('folder_new.gif', get_lang('AddCategory')) . '<a href="group_category.php?'.api_get_cidreq().'&action=add_category">'.get_lang('AddCategory').'</a>&nbsp;';
} else {
//echo '<a href="group_category.php?'.api_get_cidreq().'&id=2">'.Display::return_icon('edit_group.gif').'&nbsp;'.get_lang('PropModify').'</a>&nbsp;';

8
main/inc/footer.inc.php
Unescape View File

@ -57,14 +57,14 @@ if (api_is_platform_admin()) {
*/
api_plugin('footer');
if (get_setting('show_administrator_data')=='true') {
if (api_get_setting('show_administrator_data')=='true') {
// Platform manager
echo '<span id="platformmanager">', get_lang('Manager'), ' : ', Display::encrypted_mailto_link(get_setting('emailAdministrator'), get_setting('administratorName').' '.get_setting('administratorSurname'));
echo '<span id="platformmanager">', get_lang('Manager'), ' : ', Display::encrypted_mailto_link(api_get_setting('emailAdministrator'), api_get_setting('administratorName').' '.api_get_setting('administratorSurname'));
}
if (get_setting('show_tutor_data')=='true'){
if (api_get_setting('show_tutor_data')=='true'){
// course manager
$id_course=api_get_course_id();
@ -83,7 +83,7 @@ if (get_setting('show_tutor_data')=='true'){
}
if (get_setting('show_teacher_data')=='true') {
if (api_get_setting('show_teacher_data')=='true') {
// course manager
$id_course=api_get_course_id();
if (isset($id_course) && $id_course!=-1) {

4
main/inc/lib/course.lib.php
Unescape View File

@ -1886,8 +1886,8 @@ class CourseManager {
$emailbody .=get_lang('FirstName').': '.$student['firstname']."\n";
$emailbody .=get_lang('Email').': '.$student['email']."\n\n";
$recipient_name = $tutor['firstname'].' '.$tutor['lastname'];
$sender_name = get_setting('administratorName').' '.get_setting('administratorSurname');
$email_admin = get_setting('emailAdministrator');
$sender_name = api_get_setting('administratorName').' '.api_get_setting('administratorSurname');
$email_admin = api_get_setting('emailAdministrator');
@api_mail($recipient_name, $emailto, $emailsubject, $emailbody, $sender_name,$email_admin);
}
}

4
main/inc/lib/document.lib.php
Unescape View File

@ -48,7 +48,7 @@
define("DISK_QUOTA_FIELD", "disk_quota"); //name of the database field
/** default quota for the course documents folder */
define("DEFAULT_DOCUMENT_QUOTA", get_setting('default_document_quotum'));
define("DEFAULT_DOCUMENT_QUOTA", api_get_setting('default_document_quotum'));
/*
==============================================================================
@ -801,7 +801,7 @@ class DocumentManager {
$new_path = $path.'_DELETED_'.$document_id;
if ($document_id)
{
if (get_setting('permanently_remove_deleted_files') == 'true') //deleted files are *really* deleted
if (api_get_setting('permanently_remove_deleted_files') == 'true') //deleted files are *really* deleted
{
$what_to_delete_sql = "SELECT id FROM ".$TABLE_DOCUMENT." WHERE path='".$path."' OR path LIKE BINARY '".$path."/%'";
//get all id's of documents that are deleted

4
main/inc/lib/main_api.lib.php
Unescape View File

@ -1197,8 +1197,10 @@ class api_failure
CONFIGURATION SETTINGS
==============================================================================
*/
/**
* DEPRECATED, use api_get_setting instead
* TODO: To be removed for Dokeos 1.8.7.
*/
function get_setting($variable, $key = NULL) {
global $_setting;
@ -3557,7 +3559,7 @@ function api_get_tools_lists ($my_tool=null) {
*/
function api_check_term_condition($user_id) {
$return = false;
if (get_setting('allow_terms_conditions')=='true') {
if (api_get_setting('allow_terms_conditions')=='true') {
require_once api_get_path(LIBRARY_PATH).'legal.lib.php';
$t_uf = Database::get_main_table(TABLE_MAIN_USER_FIELD);
$t_ufv = Database::get_main_table(TABLE_MAIN_USER_FIELD_VALUES);

6
main/inc/local.inc.php
Unescape View File

@ -207,7 +207,7 @@ if (!empty($_SESSION['_user']['user_id']) && ! ($login || $logout)) {
//$_SESSION['info_current_user'][1] is user name
//$_SESSION['info_current_user'][2] is current password encrypted
//$_SESSION['update_term_and_condition'][1] is current user id, of user in session
if (get_setting('allow_terms_conditions')=='true') {
if (api_get_setting('allow_terms_conditions')=='true') {
if (isset($_POST['login']) && isset($_POST['password']) && isset($_SESSION['update_term_and_condition'][1])) {
$user_id=$_SESSION['update_term_and_condition'][1]; // user id
@ -269,7 +269,7 @@ if (get_setting('allow_terms_conditions')=='true') {
/*if ($userPasswordCrypted) {
$password = md5($password);
} */
if (get_setting('allow_terms_conditions')=='true') {
if (api_get_setting('allow_terms_conditions')=='true') {
if (isset($_POST['password']) && isset($_SESSION['info_current_user'][2]) && $_POST['password']==$_SESSION['info_current_user'][2]) {
$password=$_POST['password'];
} else {
@ -278,7 +278,7 @@ if (get_setting('allow_terms_conditions')=='true') {
} else {
$password = api_get_encrypted_password($password);
}
if (get_setting('allow_terms_conditions')=='true') {
if (api_get_setting('allow_terms_conditions')=='true') {
if ($password == $uData['password'] AND (trim($login) == $uData['username'])) {
$temp_user_id = $uData['user_id'];
$term_and_condition_status=api_check_term_condition($temp_user_id);//false or true

8
main/mySpace/user_add.php
Unescape View File

@ -377,9 +377,9 @@ if( $form->validate())
if (!empty ($email) && $send_mail)
{
$emailto = '"'.$firstname.' '.$lastname.'" <'.$email.'>';
$emailsubject = '['.get_setting('siteName').'] '.get_lang('YourReg').' '.get_setting('siteName');
$emailheaders = 'From: '.get_setting('administratorName').' '.get_setting('administratorSurname').' <'.get_setting('emailAdministrator').">\n";
$emailheaders .= 'Reply-To: '.get_setting('emailAdministrator');
$emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg').' '.api_get_setting('siteName');
$emailheaders = 'From: '.api_get_setting('administratorName').' '.api_get_setting('administratorSurname').' <'.api_get_setting('emailAdministrator').">\n";
$emailheaders .= 'Reply-To: '.api_get_setting('emailAdministrator');
$portal_url = $_configuration['root_web'];
if ($_configuration['multiple_access_urls']==true) {
@ -389,7 +389,7 @@ if( $form->validate())
$portal_url = $url['url'];
}
}
$emailbody=get_lang('Dear')." ".stripslashes("$firstname $lastname").",\n\n".get_lang('YouAreReg')." ". get_setting('siteName') ." ".get_lang('Settings')." ". $username ."\n". get_lang('Pass')." : ".stripslashes($password)."\n\n" .get_lang('Address') ." ". get_setting('siteName') ." ". get_lang('Is') ." : ".$portal_url."\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');
$emailbody=get_lang('Dear')." ".stripslashes("$firstname $lastname").",\n\n".get_lang('YouAreReg')." ". api_get_setting('siteName') ." ".get_lang('Settings')." ". $username ."\n". get_lang('Pass')." : ".stripslashes($password)."\n\n" .get_lang('Address') ." ". api_get_setting('siteName') ." ". get_lang('Is') ." : ".$portal_url."\n\n". get_lang('Problem'). "\n\n". get_lang('Formula').",\n\n".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');
@api_send_mail($emailto, $emailsubject, $emailbody, $emailheaders);
}
Security::clear_token();

2
main/newscorm/lp_content.php
Unescape View File

@ -89,7 +89,7 @@ if (!empty($gradebook) && $gradebook=='view') {
$nameTools = $_SESSION['oLP']->get_name();
$interbreadcrumb[]= array ("url"=>"./lp_list.php", "name"=> get_lang('Doc'));
//update global setting to avoid displaying right menu
$save_setting = get_setting("show_navigation_menu");
$save_setting = api_get_setting("show_navigation_menu");
global $_setting;
$_setting['show_navigation_menu'] = false;
if($debug>0){error_log('New LP - In lp_content.php - Loading '.$src,0);}

2
main/newscorm/lp_view.php
Unescape View File

@ -217,7 +217,7 @@ if ($type_quiz && !empty($_REQUEST['exeId']) && isset($_GET['lp_id']) && isset($
$_SESSION['oLP']->set_previous_item($lp_item_id);
$nameTools = Security :: remove_XSS(api_convert_encoding($_SESSION['oLP']->get_name(), $charset, api_get_system_encoding()));
$save_setting = get_setting("show_navigation_menu");
$save_setting = api_get_setting("show_navigation_menu");
global $_setting;
$_setting['show_navigation_menu'] = 'false';
$scorm_css_header=true;

8
main/social/profile.php
Unescape View File

@ -304,16 +304,16 @@ function get_logged_user_course_html($my_course, $count) {
// show the course_code and teacher if chosen to display this
// we dont need this!
/*
if (get_setting('display_coursecode_in_courselist') == 'true' OR get_setting('display_teacher_in_courselist') == 'true') {
if (api_get_setting('display_coursecode_in_courselist') == 'true' OR api_get_setting('display_teacher_in_courselist') == 'true') {
$result .= '<br />';
}
if (get_setting('display_coursecode_in_courselist') == 'true') {
if (api_get_setting('display_coursecode_in_courselist') == 'true') {
$result .= $course_display_code;
}
if (get_setting('display_coursecode_in_courselist') == 'true' AND get_setting('display_teacher_in_courselist') == 'true') {
if (api_get_setting('display_coursecode_in_courselist') == 'true' AND api_get_setting('display_teacher_in_courselist') == 'true') {
$result .= ' &ndash; ';
}
if (get_setting('display_teacher_in_courselist') == 'true') {
if (api_get_setting('display_teacher_in_courselist') == 'true') {
$result .= $course_teacher;
if(!empty($course_teacher_email)) {
$result .= ' ('.$course_teacher_email.')';

2
main/upload/upload.document.php
Unescape View File

@ -187,7 +187,7 @@ else { //give them a link to create a directory
</td>
</tr>
<?php
if(get_setting('use_document_title')=='true')
if(api_get_setting('use_document_title')=='true')
{
?>
<tr>

2
main/user/user.php
Unescape View File

@ -596,7 +596,7 @@ if ( !empty($_GET['keyword']) && !empty($_GET['submit']) ) {
echo '<br/>'.get_lang('SearchResultsFor').' <span style="font-style: italic ;"> '.$keyword_name.' </span><br>';
}
if ( get_setting('allow_user_headings') == 'true' && $is_courseAdmin && api_is_allowed_to_edit() && $origin != 'learnpath') { // only course administrators see this line
if (api_get_setting('allow_user_headings') == 'true' && $is_courseAdmin && api_is_allowed_to_edit() && $origin != 'learnpath') { // only course administrators see this line
echo "<div align=\"right\">", "<form method=\"post\" action=\"userInfo.php\">", get_lang("CourseAdministratorOnly"), " : ", "<input type=\"submit\" name=\"viewDefList\" value=\"".get_lang("DefineHeadings")."\" />", "</form>", "</div>\n";
}

2
main/user/userInfo.php
Unescape View File

@ -563,7 +563,7 @@ elseif ($displayMode == "viewContentList") // default display
Display :: display_normal_message(get_lang('ThisStudentIsSubscribeThroughASession'));
}
if (get_setting('allow_user_headings') == 'true' && $allowedToEditDef) // only course administrators see this line
if (api_get_setting('allow_user_headings') == 'true' && $allowedToEditDef) // only course administrators see this line
{
echo "<div align=right>",
"<form method=\"post\" action=\"".api_get_self()."\">",

12
main/user/user_add.php
Unescape View File

@ -197,17 +197,17 @@ if($register)
$emailto = "$lastname_form $firstname_form <$email_form>";
$emailfromaddr = $administratorEmail;
$emailfromname = api_get_setting('siteName');
$emailsubject = get_lang('YourReg').' '.get_setting('siteName');
$emailsubject = get_lang('YourReg').' '.api_get_setting('siteName');
$emailheaders = "From: ".get_setting('administratorSurname')." ".get_setting('administratorName')." <".$administratorEmail.">\n";
$emailheaders = "From: ".api_get_setting('administratorSurname')." ".api_get_setting('administratorName')." <".$administratorEmail.">\n";
$emailheaders .= "Reply-To: ".$administratorEmail."\n";
$emailheaders .= "Return-Path: ".$administratorEmail."\n";
$emailheaders .= "charset: ".$charset."\n";
$emailheaders .= "X-Mailer: PHP/" . phpversion() . "\n";
$emailheaders .= "X-Sender-IP: $REMOTE_ADDR"; // (small security precaution...)
$recipient_name = $firstname_form.' '.$lastname_form;
$sender_name = get_setting('administratorName').' '.get_setting('administratorSurname');
$email_admin = get_setting('emailAdministrator');
$sender_name = api_get_setting('administratorName').' '.api_get_setting('administratorSurname');
$email_admin = api_get_setting('emailAdministrator');
$portal_url = $_configuration['root_web'];
if ($_configuration['multiple_access_urls']==true) {
@ -220,12 +220,12 @@ if($register)
if ($courseRegSucceed)
{
$emailbody = get_lang('Dear')." ".stripslashes("$firstname_form $lastname_form").",\n".get_lang('OneResp')." $currentCourseName ".get_lang('RegYou')." ".get_setting('siteName')." ".get_lang('Settings')." $username_form\n".get_lang('Pass').": $password_form\n".get_lang('Address')." ".get_setting('siteName')." ".get_lang('Is').": ".$portal_url."\n".get_lang('Problem')."\n".get_lang('Formula').",\n".get_setting('administratorSurname')." ".get_setting('administratorName')."\n".get_lang('Manager')." ".get_setting('siteName')." \nT. ".get_setting('administratorTelephone')."\n".get_lang('Email').": ".get_setting('emailAdministrator')."\n";
$emailbody = get_lang('Dear')." ".stripslashes("$firstname_form $lastname_form").",\n".get_lang('OneResp')." $currentCourseName ".get_lang('RegYou')." ".api_get_setting('siteName')." ".get_lang('Settings')." $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_setting('administratorSurname')." ".api_get_setting('administratorName')."\n".get_lang('Manager')." ".api_get_setting('siteName')." \nT. ".api_get_setting('administratorTelephone')."\n".get_lang('Email').": ".api_get_setting('emailAdministrator')."\n";
$message = get_lang('TheU')." ".stripslashes("$firstname_form $lastname_form")." ".get_lang('AddedToCourse')."<a href=\"user.php\">".get_lang('BackUser')."</a>\n";
}
else
{
$emailbody = get_lang('Dear')." $firstname_form $lastname_form,\n ".get_lang('YouAreReg')." ".get_setting('siteName')." ".get_lang('Settings')." $username_form\n".get_lang('Pass').": $password_form\n".get_lang('Address')." ".get_setting('siteName')." ".get_lang('Is').": ".$portal_url."\n".get_lang('Problem')."\n".get_lang('Formula').",\n".get_setting('administratorSurname')." ".get_setting('administratorName')."\n".get_lang('Manager')." ".get_setting('siteName')." \nT. ".get_setting('administratorTelephone')."\n".get_lang('Email').": ".get_setting('emailAdministrator')."\n";
$emailbody = get_lang('Dear')." $firstname_form $lastname_form,\n ".get_lang('YouAreReg')." ".api_get_setting('siteName')." ".get_lang('Settings')." $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_setting('administratorSurname')." ".api_get_setting('administratorName')."\n".get_lang('Manager')." ".api_get_setting('siteName')." \nT. ".api_get_setting('administratorTelephone')."\n".get_lang('Email').": ".api_get_setting('emailAdministrator')."\n";
$message = stripslashes("$firstname_form $lastname_form")." ".get_lang('AddedU');
}

4
main/webservices/registration.soap.php
Unescape View File

@ -2056,7 +2056,7 @@ function DokeosWSCreateCourse($params) {
if (isset($_user["language"]) && $_user["language"]!="") {
$values['course_language'] = $_user["language"];
} else {
$values['course_language'] = get_setting('platformLanguage');
$values['course_language'] = api_get_setting('platformLanguage');
}
$values['tutor_name'] = $_user['firstName']." ".$_user['lastName'];
@ -2275,7 +2275,7 @@ function DokeosWSCreateCourseByTitle($params) {
if (isset($_user["language"]) && $_user["language"]!="") {
$values['course_language'] = $_user["language"];
} else {
$values['course_language'] = get_setting('platformLanguage');
$values['course_language'] = api_get_setting('platformLanguage');
}
$values['tutor_name'] = $_user['firstName']." ".$_user['lastName'];

12
main/wiki/wiki.inc.php
Unescape View File

@ -1736,13 +1736,13 @@ function check_emailcue($id_or_ref, $type, $lastime='', $lastuser='')
{
if(empty($charset)){$charset='ISO-8859-1';}
$headers = 'Content-Type: text/html; charset='. $charset;
$userinfo=Database::get_user_info_from_id($row['user_id']); //$row['user_id'] obtained from tbl_wiki_mailcue
$name_to=$userinfo['firstname'].' '.$userinfo['lastname'];
$email_to=$userinfo['email'];
$sender_name=get_setting('emailAdministrator');
$sender_email=get_setting('emailAdministrator');
$userinfo = Database::get_user_info_from_id($row['user_id']); //$row['user_id'] obtained from tbl_wiki_mailcue
$name_to = $userinfo['firstname'].' '.$userinfo['lastname'];
$email_to = $userinfo['email'];
$sender_name = api_get_setting('emailAdministrator');
$sender_email = api_get_setting('emailAdministrator');
$email_subject = get_lang('EmailWikiChanges').' - '.$_course['official_code'];
$email_body= get_lang('DearUser').' '.$userinfo['firstname'].' '.$userinfo['lastname'].',<br /><br />';
$email_body = get_lang('DearUser').' '.$userinfo['firstname'].' '.$userinfo['lastname'].',<br /><br />';
$email_body .= $emailtext.' <strong>'.$_course['name'].' - '.$group_name.'</strong><br /><br /><br />';
$email_body .= $email_user_author.' ('.$email_date_changes.')<br /><br /><br />';
$email_body .= $email_assignment.'<br /><br /><br />';

12
main/work/work.php
Unescape View File

@ -1008,14 +1008,14 @@ if (!empty($_POST['submitWork']) && !empty($succeed) && !$id) {
if (count($emailto) > 0) {
$emailto = implode(',', $emailto);
$emailfromaddr = get_setting('emailAdministrator');
$emailfromname = get_setting('siteName');
$emailsubject = "[" . get_setting('siteName') . "] ";
$sender_name = get_setting('administratorName').' '.get_setting('administratorSurname');
$email_admin = get_setting('emailAdministrator');
$emailfromaddr = api_get_setting('emailAdministrator');
$emailfromname = api_get_setting('siteName');
$emailsubject = "[" . api_get_setting('siteName') . "] ";
$sender_name = api_get_setting('administratorName').' '.api_get_setting('administratorSurname');
$email_admin = api_get_setting('emailAdministrator');
// The body can be as long as you wish, and any combination of text and variables
$emailbody = get_lang('SendMailBody').' '.api_get_path(WEB_CODE_PATH)."work/work.php?".api_get_cidreq()."&amp;curdirpath=".$my_cur_dir_path." (" . stripslashes($title) . ")\n\n" . get_setting('administratorName') . " " . get_setting('administratorSurname') . "\n" . get_lang('Manager') . " " . get_setting('siteName') . "\n" . get_lang('Email') . " : " . get_setting('emailAdministrator');
$emailbody = get_lang('SendMailBody').' '.api_get_path(WEB_CODE_PATH)."work/work.php?".api_get_cidreq()."&amp;curdirpath=".$my_cur_dir_path." (" . stripslashes($title) . ")\n\n" . api_get_setting('administratorName') . " " . api_get_setting('administratorSurname') . "\n" . get_lang('Manager') . " " . api_get_setting('siteName') . "\n" . get_lang('Email') . " : " . api_get_setting('emailAdministrator');
// Here we are forming one large header line
// Every header must be followed by a \n except the last

6
tests/main/auth/lost_password.lib.test.php
Unescape View File

@ -41,7 +41,7 @@ class TestLostPassword extends UnitTestCase {
ob_start();
$user=array('abc');
$emailHeaders = get_email_headers(); // Email Headers
$emailSubject = "[".get_setting('siteName')."] ".get_lang('LoginRequest'); // SUBJECT
$emailSubject = "[".api_get_setting('siteName')."] ".get_lang('LoginRequest'); // SUBJECT
$userAccountList = get_user_account_list($user, true); // BODY
$emailTo = $user[0]["email"];
$secretword = get_secret_word($emailTo);
@ -49,8 +49,8 @@ class TestLostPassword extends UnitTestCase {
$emailBody .= "-----------------------------------------------\n".$userAccountList."\n-----------------------------------------------\n\n";
$emailBody .=get_lang('PasswordEncryptedForSecurity');
$emailBody .="\n\n".get_lang('Formula').",\n".get_lang('PlataformAdmin');
$sender_name = get_setting('administratorName').' '.get_setting('administratorSurname');
$email_admin = get_setting('emailAdministrator');
$sender_name = api_get_setting('administratorName').' '.api_get_setting('administratorSurname');
$email_admin = api_get_setting('emailAdministrator');
$res=handle_encrypted_password($user);
if(!is_array($res))$this->assertTrue(is_null($res));
ob_end_clean();

10
user_portal.php
Unescape View File

@ -459,16 +459,16 @@ function get_logged_user_course_html($my_course) {
$result .= $course_display_title." "." ".get_lang('CourseClosed')."";
}
// show the course_code and teacher if chosen to display this
if (get_setting('display_coursecode_in_courselist') == 'true' OR get_setting('display_teacher_in_courselist') == 'true') {
if (api_get_setting('display_coursecode_in_courselist') == 'true' OR api_get_setting('display_teacher_in_courselist') == 'true') {
$result .= '<br />';
}
if (get_setting('display_coursecode_in_courselist') == 'true') {
if (api_get_setting('display_coursecode_in_courselist') == 'true') {
$result .= $course_display_code;
}
if (get_setting('display_coursecode_in_courselist') == 'true' AND get_setting('display_teacher_in_courselist') == 'true') {
if (api_get_setting('display_coursecode_in_courselist') == 'true' AND api_get_setting('display_teacher_in_courselist') == 'true') {
$result .= ' &ndash; ';
}
if (get_setting('display_teacher_in_courselist') == 'true') {
if (api_get_setting('display_teacher_in_courselist') == 'true') {
$result .= $course_teacher;
if(!empty($course_teacher_email)) {
$result .= ' ('.$course_teacher_email.')';
@ -972,7 +972,7 @@ if (isset($_plugins['mycourses_menu']) && is_array($_plugins['mycourses_menu']))
echo '</div>';
}
if (get_setting('allow_reservation')=='true' && api_is_allowed_to_create_course() ){
if (api_get_setting('allow_reservation')=='true' && api_is_allowed_to_create_course() ){
//include_once('main/reservation/rsys.php');
echo '<div class="menusection">';
echo '<span class="menusectioncaption">'.get_lang('Booking').'</span>';

Write Preview
Loading…
Cancel
Save